Changes in src/UIElements/QT4/QTDialog.cpp [cd8e55:992fd7]

File:

• src/UIElements/QT4/QTDialog.cpp (modified) (10 diffs)

src/UIElements/QT4/QTDialog.cpp

@@ -21 +21 @@
 #include <Qt/qcombobox.h>
 
-#include "Helpers/MemDebug.hpp"
-
 #include "World.hpp"
 #include "periodentafel.hpp"
@@ -28 +26 @@
 #include "element.hpp"
 #include "molecule.hpp"
-#include "Descriptors/MoleculeIdDescriptor.hpp"
+#include "Helpers/MemDebug.hpp"
 
 
@@ -78 +76 @@
 /************************** Query Infrastructure ************************/
 
-void QTDialog::queryEmpty(char const*, string){
-  // TODO
-  ASSERT(false, "Not implemented yet");
-}
-
-void QTDialog::queryBoolean(char const*, bool*,string){
-  // TODO
-  ASSERT(false, "Not implemented yet");
-}
-
-void QTDialog::queryAtom(char const*, atom**, string){
-  // TODO
-  ASSERT(false, "Not implemented yet");
-}
-
-void QTDialog::queryBox(char const*, double**, string){
-  // TODO
-  ASSERT(false, "Not implemented yet");
-}
-
-
-void QTDialog::queryInt(const char *title, int *target,string)
+void QTDialog::queryInt(const char *title, int *target)
 {
   registerQuery(new IntQTQuery(title,target,inputLayout,this));
 }
 
-void QTDialog::queryDouble(const char* title, double* target,string){
+void QTDialog::queryDouble(const char* title, double* target){
   registerQuery(new DoubleQTQuery(title,target,inputLayout,this));
 }
 
-void QTDialog::queryString(const char* title, std::string *target,string)
+void QTDialog::queryString(const char* title, std::string *target)
 {
   registerQuery(new StringQTQuery(title,target,inputLayout,this));
 }
 
-void QTDialog::queryStrings(const char* title, std::vector<std::string> *target,string)
-{
-  registerQuery(new StringsQTQuery(title,target,inputLayout,this));
-}
-
-void QTDialog::queryMolecule(const char *title,molecule **target,string)
-{
-  registerQuery(new MoleculeQTQuery(title,target,inputLayout,this));
-}
-
-void QTDialog::queryVector(const char* title, Vector *target,const double *const cellSize, bool check,string) {
+void QTDialog::queryMolecule(const char *title,molecule **target,MoleculeListClass *molecules)
+{
+  registerQuery(new MoleculeQTQuery(title,target,molecules,inputLayout,this));
+}
+
+void QTDialog::queryVector(const char* title, Vector *target,const double *const cellSize, bool check) {
   registerQuery(new VectorQTQuery(title,target,cellSize,check,inputLayout,this));
 }
 
-void QTDialog::queryElement(const char* title, std::vector<element *> *target,string){
+void QTDialog::queryElement(const char* title, const element **target){
   registerQuery(new ElementQTQuery(title,target,inputLayout,this));
 }
@@ -217 +189 @@
 }
 
-QTDialog::StringsQTQuery::StringsQTQuery(string _title,vector<string> *_target,QBoxLayout *_parent,QTDialog *_dialog) :
-    Dialog::StringsQuery(_title,_target),
-    parent(_parent)
-{
-  thisLayout = new QHBoxLayout();
-  titleLabel = new QLabel(QString(getTitle().c_str()));
-  inputBox = new QLineEdit();
-  parent->addLayout(thisLayout);
-  thisLayout->addWidget(titleLabel);
-  thisLayout->addWidget(inputBox);
-
-  pipe = new StringQTQueryPipe(&temp,_dialog);
-  pipe->update(inputBox->text());
-  connect(inputBox,SIGNAL(textChanged(const QString&)),pipe,SLOT(update(const QString&)));
-}
-
-QTDialog::StringsQTQuery::~StringsQTQuery()
-{
-  delete pipe;
-}
-
-// All values besides the empty string are valid
-bool QTDialog::StringsQTQuery::handle()
-{
-  // dissect by ","
-  string::iterator olditer = temp.begin();
-  for(string::iterator iter = temp.begin(); iter != temp.end(); ++iter) {
-    if (*iter == ' ') {
-      tmp.push_back(string(iter, olditer));
-      olditer = iter;
-    }
-  }
-  if (olditer != temp.begin())  // insert last part also
-    tmp.push_back(string(olditer, temp.end()));
-
-  return temp!="";
-}
-
-QTDialog::MoleculeQTQuery::MoleculeQTQuery(string _title, molecule **_target, QBoxLayout *_parent,QTDialog *_dialog) :
-    Dialog::MoleculeQuery(_title,_target),
-    parent(_parent)
-{
+QTDialog::MoleculeQTQuery::MoleculeQTQuery(string _title, molecule **_target, MoleculeListClass *_molecules, QBoxLayout *_parent,QTDialog *_dialog) :
+    Dialog::MoleculeQuery(_title,_target,_molecules),
+    parent(_parent)
+{
+  MoleculeList::iterator iter;
   thisLayout = new QHBoxLayout();
   titleLabel = new QLabel(QString(getTitle().c_str()));
   inputBox = new QComboBox();
   // add all molecules to the combo box
-  vector<molecule*> molecules = World::getInstance().getAllMolecules();
-  for(vector<molecule*>::iterator iter  = molecules.begin();
-      iter != molecules.end();
+  for(iter  = molecules->ListOfMolecules.begin();
+      iter != molecules->ListOfMolecules.end();
       ++iter) {
     stringstream sstr;
@@ -275 +209 @@
   thisLayout->addWidget(inputBox);
 
-  pipe = new MoleculeQTQueryPipe(&tmp,_dialog,inputBox);
+  pipe = new MoleculeQTQueryPipe(&tmp,_dialog,inputBox,_molecules);
   pipe->update(inputBox->currentIndex());
   connect(inputBox,SIGNAL(currentIndexChanged(int)),pipe,SLOT(update(int)));
@@ -329 +263 @@
 
 
-QTDialog::ElementQTQuery::ElementQTQuery(std::string _title, vector<element *> *_target, QBoxLayout *_parent, QTDialog *_dialog) :
+QTDialog::ElementQTQuery::ElementQTQuery(std::string _title, const element **_target, QBoxLayout *_parent, QTDialog *_dialog) :
     Dialog::ElementQuery(_title,_target),
     parent(_parent)
@@ -349 +283 @@
   thisLayout->addWidget(inputBox);
 
-  pipe = new ElementQTQueryPipe(&elements,_dialog,inputBox);
+  pipe = new ElementQTQueryPipe(&tmp,_dialog,inputBox);
   pipe->update(inputBox->currentIndex());
   connect(inputBox,SIGNAL(currentIndexChanged(int)),pipe,SLOT(update(int)));
@@ -404 +338 @@
 }
 
-MoleculeQTQueryPipe::MoleculeQTQueryPipe(molecule **_content, QTDialog *_dialog, QComboBox *_theBox) :
+MoleculeQTQueryPipe::MoleculeQTQueryPipe(molecule **_content, QTDialog *_dialog, QComboBox *_theBox, MoleculeListClass *_molecules) :
   content(_content),
   dialog(_dialog),
-  theBox(_theBox)
+  theBox(_theBox),
+  molecules(_molecules)
 {}
 
@@ -416 +351 @@
   QVariant data = theBox->itemData(newIndex);
   int idx = data.toInt();
-  (*content) = World::getInstance().getMolecule(MoleculeById(idx));
-  dialog->update();
-}
-
-ElementQTQueryPipe::ElementQTQueryPipe(std::vector<element *> *_content, QTDialog *_dialog, QComboBox *_theBox) :
+  (*content) = molecules->ReturnIndex(idx);
+  dialog->update();
+}
+
+ElementQTQueryPipe::ElementQTQueryPipe(const element **_content, QTDialog *_dialog, QComboBox *_theBox) :
   content(_content),
   dialog(_dialog),
   theBox(_theBox)
-{
-  content->resize(1);
-}
+{}
 
 ElementQTQueryPipe::~ElementQTQueryPipe()
@@ -434 +367 @@
   QVariant data = theBox->itemData(newIndex);
   int idx = data.toInt();
-  (*content)[0] = World::getInstance().getPeriode()->FindElement(idx);
-  dialog->update();
-}
-
+  (*content) = World::getInstance().getPeriode()->FindElement(idx);
+  dialog->update();
+}
+