Changes in src/UIElements/Qt4/Query/QtQuery.hpp [7d9416:2c5765]

File:

• src/UIElements/Qt4/Query/QtQuery.hpp (modified) (18 diffs)

src/UIElements/Qt4/Query/QtQuery.hpp

@@ -16 +16 @@
 
 #include "Qt4/QtDialog.hpp"
-#include "Parameters/Parameter.hpp"
 
 class QHBoxLayout;
@@ -37 +36 @@
 class AtomsQtQueryPipe;
 class BooleanQtQueryPipe;
-class RealSpaceMatrixQtQueryPipe;
+class BoxQtQueryPipe;
 class DoubleQtQueryPipe;
 class DoublesQtQueryPipe;
@@ -57 +56 @@
 class QtDialog::AtomQtQuery : public Dialog::AtomQuery {
 public:
-  AtomQtQuery(Parameter<const atom *> &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
+  AtomQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~AtomQtQuery();
   virtual bool handle();
@@ -71 +70 @@
 class QtDialog::AtomsQtQuery : public Dialog::AtomsQuery {
 public:
-  AtomsQtQuery(Parameter<std::vector<const atom *> > &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
+  AtomsQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~AtomsQtQuery();
   virtual bool handle();
@@ -86 +85 @@
 class QtDialog::BooleanQtQuery : public Dialog::BooleanQuery {
 public:
-  BooleanQtQuery(Parameter<bool> &, std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
+  BooleanQtQuery(std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
   virtual ~BooleanQtQuery();
   virtual bool handle();
@@ -98 +97 @@
 };
 
-class QtDialog::RealSpaceMatrixQtQuery : public Dialog::RealSpaceMatrixQuery {
-public:
-  RealSpaceMatrixQtQuery(Parameter<RealSpaceMatrix> &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
-  virtual ~RealSpaceMatrixQtQuery();
+class QtDialog::BoxQtQuery : public Dialog::BoxQuery {
+public:
+  BoxQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
+  virtual ~BoxQtQuery();
   virtual bool handle();
 private:
@@ -109 +108 @@
   QTableWidget *inputTable;
 
-  RealSpaceMatrixQtQueryPipe *pipe;
+  BoxQtQueryPipe *pipe;
 };
 
 class QtDialog::DoubleQtQuery : public Dialog::DoubleQuery {
 public:
-  DoubleQtQuery(Parameter<double> &, std::string title,QBoxLayout *_parent,QtDialog *_dialog);
+  DoubleQtQuery(std::string title,QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~DoubleQtQuery();
   virtual bool handle();
@@ -128 +127 @@
 class QtDialog::DoublesQtQuery : public Dialog::DoublesQuery {
 public:
-  DoublesQtQuery(Parameter<std::vector<double> > &, std::string title,QBoxLayout *_parent,QtDialog *_dialog);
+  DoublesQtQuery(std::string title,QBoxLayout *_parent,QtDialog *_dialog);
   virtual ~DoublesQtQuery();
   virtual bool handle();
@@ -142 +141 @@
 class QtDialog::ElementQtQuery : public Dialog::ElementQuery {
 public:
-  ElementQtQuery(Parameter<const element *> &, std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
+  ElementQtQuery(std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
   virtual ~ElementQtQuery();
   virtual bool handle();
@@ -156 +155 @@
 class QtDialog::ElementsQtQuery : public Dialog::ElementsQuery {
 public:
-  ElementsQtQuery(Parameter<std::vector<const element *> > &, std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
+  ElementsQtQuery(std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
   virtual ~ElementsQtQuery();
   virtual bool handle();
@@ -183 +182 @@
 class QtDialog::FileQtQuery : public Dialog::FileQuery {
 public:
-  FileQtQuery(Parameter<boost::filesystem::path> &, std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
+  FileQtQuery(std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
   virtual ~FileQtQuery();
   virtual bool handle();
@@ -196 +195 @@
 };
 
-class QtDialog::IntQtQuery : public Dialog::IntQuery {
-public:
-  IntQtQuery(Parameter<int> &, std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
-  virtual ~IntQtQuery();
-  virtual bool handle();
-private:
-  QBoxLayout *parent;
-  QBoxLayout *thisLayout;
-  QLabel *titleLabel;
-  QSpinBox *inputBox;
-
-  IntQtQueryPipe *pipe;
-};
-
-class QtDialog::IntsQtQuery : public Dialog::IntsQuery {
-public:
-  IntsQtQuery(Parameter<std::vector<int> > &, std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
-  virtual ~IntsQtQuery();
+class QtDialog::FilesQtQuery : public Dialog::FilesQuery {
+public:
+  FilesQtQuery(std::string _title, QBoxLayout *_parent, QtDialog *_dialog);
+  virtual ~FilesQtQuery();
   virtual bool handle();
   void IntegerEntered(const QString&);
@@ -224 +209 @@
   QLabel *titleLabel;
 
-  QtQueryListPipe<int> *pipe;
-};
-
-class QtDialog::MoleculeQtQuery : public Dialog::MoleculeQuery {
-public:
-  MoleculeQtQuery(Parameter<const molecule *> &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
-  virtual ~MoleculeQtQuery();
-  virtual bool handle();
-private:
-  QBoxLayout *parent;
-  QBoxLayout *thisLayout;
-  QLabel *titleLabel;
-  QComboBox *inputBox;
-
-  MoleculeQtQueryPipe *pipe;
-};
-
-class QtDialog::MoleculesQtQuery : public Dialog::MoleculesQuery {
-public:
-  MoleculesQtQuery(Parameter<std::vector<const molecule *> > &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
-  virtual ~MoleculesQtQuery();
-  virtual bool handle();
-private:
-  QBoxLayout *parent;
-  QBoxLayout *thisLayout;
-  QLabel *titleLabel;
-  QComboBox *inputBox;
-
-  MoleculesQtQueryPipe *pipe;
-};
-
-class QtDialog::StringQtQuery : public Dialog::StringQuery {
-public:
-  StringQtQuery(Parameter<std::string> &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
-  virtual ~StringQtQuery();
-  virtual bool handle();
-private:
-  QBoxLayout *parent;
-  QBoxLayout *thisLayout;
-  QLabel *titleLabel;
-  QLineEdit *inputBox;
-
-  StringQtQueryPipe *pipe;
-};
-
-class QtDialog::StringsQtQuery : public Dialog::StringsQuery {
-public:
-  StringsQtQuery(Parameter<std::vector<std::string> > &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
-  virtual ~StringsQtQuery();
-  virtual bool handle();
-private:
-  QBoxLayout *parent;
-  QBoxLayout *thisLayout;
-  QLabel *titleLabel;
-  QLineEdit *inputBox;
-
-  QtQueryListPipe<std::string> *pipe;
-};
-
-class QtDialog::UnsignedIntQtQuery : public Dialog::UnsignedIntQuery {
-public:
-  UnsignedIntQtQuery(Parameter<unsigned int> &, std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
-  virtual ~UnsignedIntQtQuery();
+  QtQueryListPipe<boost::filesystem::path> *pipe;
+};
+
+class QtDialog::IntQtQuery : public Dialog::IntQuery {
+public:
+  IntQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
+  virtual ~IntQtQuery();
   virtual bool handle();
 private:
@@ -294 +223 @@
   QSpinBox *inputBox;
 
-  UnsignedIntQtQueryPipe *pipe;
-};
-
-class QtDialog::UnsignedIntsQtQuery : public Dialog::UnsignedIntsQuery {
-public:
-  UnsignedIntsQtQuery(Parameter<std::vector<unsigned int> > &, std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
-  virtual ~UnsignedIntsQtQuery();
+  IntQtQueryPipe *pipe;
+};
+
+class QtDialog::IntsQtQuery : public Dialog::IntsQuery {
+public:
+  IntsQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
+  virtual ~IntsQtQuery();
   virtual bool handle();
   void IntegerEntered(const QString&);
@@ -311 +240 @@
   QLabel *titleLabel;
 
+  QtQueryListPipe<int> *pipe;
+};
+
+class QtDialog::MoleculeQtQuery : public Dialog::MoleculeQuery {
+public:
+  MoleculeQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
+  virtual ~MoleculeQtQuery();
+  virtual bool handle();
+private:
+  QBoxLayout *parent;
+  QBoxLayout *thisLayout;
+  QLabel *titleLabel;
+  QComboBox *inputBox;
+
+  MoleculeQtQueryPipe *pipe;
+};
+
+class QtDialog::MoleculesQtQuery : public Dialog::MoleculesQuery {
+public:
+  MoleculesQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
+  virtual ~MoleculesQtQuery();
+  virtual bool handle();
+private:
+  QBoxLayout *parent;
+  QBoxLayout *thisLayout;
+  QLabel *titleLabel;
+  QComboBox *inputBox;
+
+  MoleculesQtQueryPipe *pipe;
+};
+
+class QtDialog::StringQtQuery : public Dialog::StringQuery {
+public:
+  StringQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
+  virtual ~StringQtQuery();
+  virtual bool handle();
+private:
+  QBoxLayout *parent;
+  QBoxLayout *thisLayout;
+  QLabel *titleLabel;
+  QLineEdit *inputBox;
+
+  StringQtQueryPipe *pipe;
+};
+
+class QtDialog::StringsQtQuery : public Dialog::StringsQuery {
+public:
+  StringsQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
+  virtual ~StringsQtQuery();
+  virtual bool handle();
+private:
+  QBoxLayout *parent;
+  QBoxLayout *thisLayout;
+  QLabel *titleLabel;
+  QLineEdit *inputBox;
+
+  QtQueryListPipe<std::string> *pipe;
+};
+
+class QtDialog::UnsignedIntQtQuery : public Dialog::UnsignedIntQuery {
+public:
+  UnsignedIntQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
+  virtual ~UnsignedIntQtQuery();
+  virtual bool handle();
+private:
+  QBoxLayout *parent;
+  QBoxLayout *thisLayout;
+  QLabel *titleLabel;
+  QSpinBox *inputBox;
+
+  UnsignedIntQtQueryPipe *pipe;
+};
+
+class QtDialog::UnsignedIntsQtQuery : public Dialog::UnsignedIntsQuery {
+public:
+  UnsignedIntsQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog);
+  virtual ~UnsignedIntsQtQuery();
+  virtual bool handle();
+  void IntegerEntered(const QString&);
+  void IntegerSelected();
+  void AddInteger();
+  void RemoveInteger();
+private:
+  QBoxLayout *parent;
+  QBoxLayout *thisLayout;
+  QLabel *titleLabel;
+
   QtQueryListPipe<unsigned int> *pipe;
 };
@@ -317 +333 @@
 class QtDialog::VectorQtQuery : public Dialog::VectorQuery {
 public:
-  VectorQtQuery(Parameter<Vector> &, std::string title,bool _check,QBoxLayout *,QtDialog *);
+  VectorQtQuery(std::string title,bool _check,QBoxLayout *,QtDialog *);
   virtual ~VectorQtQuery();
   virtual bool handle();
@@ -336 +352 @@
 class QtDialog::VectorsQtQuery : public Dialog::VectorsQuery {
 public:
-  VectorsQtQuery(Parameter<std::vector<Vector> > &, std::string title,bool _check,QBoxLayout *,QtDialog *);
+  VectorsQtQuery(std::string title,bool _check,QBoxLayout *,QtDialog *);
   virtual ~VectorsQtQuery();
   virtual bool handle();
@@ -353 +369 @@
 class QtDialog::RandomNumberDistribution_ParametersQtQuery : public Dialog::RandomNumberDistribution_ParametersQuery {
 public:
-  RandomNumberDistribution_ParametersQtQuery(Parameter<RandomNumberDistribution_Parameters> &, std::string title,QBoxLayout *,QtDialog *);
+  RandomNumberDistribution_ParametersQtQuery(std::string title,QBoxLayout *,QtDialog *);
   virtual ~RandomNumberDistribution_ParametersQtQuery();
   virtual bool handle();