Changeset 931903 for molecuilder/src

Timestamp:

Jan 14, 2010, 1:49:42 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

41182a

Parents:

1630ce

git-author:

Tillmann Crueger <crueger@…> (01/13/10 11:14:43)

git-committer:

Tillmann Crueger <crueger@…> (01/14/10 13:49:42)

Message:

Made embeddMolecules menu-point use the new dialog framework

File:

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

molecuilder/src/menu.cpp

@@ -914 +914 @@
 
 void oldmenu::SimpleAddMolecules(MoleculeListClass *molecules) {
-  //int src, dest;
   molecule *srcmol = NULL, *destmol = NULL;
-  /*{
-    do {
-      Log() << Verbose(0) << "Enter index of destination molecule: ";
-      cin >> dest;
-      destmol = molecules->ReturnIndex(dest);
-    } while ((destmol == NULL) && (dest != -1));
-    do {
-      Log() << Verbose(0) << "Enter index of source molecule to add from: ";
-      cin >> src;
-      srcmol = molecules->ReturnIndex(src);
-    } while ((srcmol == NULL) && (src != -1));
-    if ((src != -1) && (dest != -1))
-      molecules->SimpleAdd(srcmol, destmol);
-  }*/
   Dialog *dialog = UIFactory::get()->makeDialog();
   dialog->queryMolecule("Enter index of destination molecule: ",&destmol, molecules);
@@ -937 +922 @@
   }
   else {
-    Log() << Verbose(0) << "Adding of Molecules canceled" << endl;
-  }
+    Log() << Verbose(0) << "Adding of molecules canceled" << endl;
+  }
+  delete dialog;
 }
 
 void oldmenu::embeddMolecules(MoleculeListClass *molecules) {
-  int src, dest;
   molecule *srcmol = NULL, *destmol = NULL;
-  do {
-    Log() << Verbose(0) << "Enter index of matrix molecule (the variable one): ";
-    cin >> src;
-    srcmol = molecules->ReturnIndex(src);
-  } while ((srcmol == NULL) && (src != -1));
-  do {
-    Log() << Verbose(0) << "Enter index of molecule to merge into (the fixed one): ";
-    cin >> dest;
-    destmol = molecules->ReturnIndex(dest);
-  } while ((destmol == NULL) && (dest != -1));
-  if ((src != -1) && (dest != -1))
+  Dialog *dialog = UIFactory::get()->makeDialog();
+  dialog->queryMolecule("Enter index of matrix molecule (the variable one): ",&srcmol,molecules);
+  dialog->queryMolecule("Enter index of molecule to merge into (the fixed one): ",&destmol,molecules);
+  if(dialog->display()) {
     molecules->EmbedMerge(destmol, srcmol);
+  }
+  else {
+    Log() << Verbose(0) << "embedding of molecules canceled" << endl;
+  }
+
+
 }