Changeset 1630ce

Timestamp:

Jan 13, 2010, 11:05:17 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

931903

Parents:

3896fc

Message:

Used new Query Infrastructure for SimpleAdd menupoint

File:

• molecuilder/src/menu.cpp (modified) (3 diffs)

molecuilder/src/menu.cpp

@@ -24 +24 @@
 #include "periodentafel.hpp"
 
+#include "UIElements/UIFactory.hpp"
+#include "UIElements/Dialog.hpp"
 #include "Menu/Menu.hpp"
 #include "Menu/TextMenu.hpp"
@@ -912 +914 @@
 
 void oldmenu::SimpleAddMolecules(MoleculeListClass *molecules) {
-  int src, dest;
+  //int src, dest;
   molecule *srcmol = NULL, *destmol = NULL;
-  {
+  /*{
     do {
       Log() << Verbose(0) << "Enter index of destination molecule: ";
@@ -927 +929 @@
     if ((src != -1) && (dest != -1))
       molecules->SimpleAdd(srcmol, destmol);
+  }*/
+  Dialog *dialog = UIFactory::get()->makeDialog();
+  dialog->queryMolecule("Enter index of destination molecule: ",&destmol, molecules);
+  dialog->queryMolecule("Enter index of source molecule to add from: ",&srcmol, molecules);
+  if(dialog->display()) {
+    molecules->SimpleAdd(srcmol, destmol);
+  }
+  else {
+    Log() << Verbose(0) << "Adding of Molecules canceled" << endl;
   }
 }