Changeset 8927ae

Timestamp:

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

Author:

Tillmann Crueger <crueger@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

1ca488

Parents:

29a4cc

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:

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

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;
+  }
+
+
 }