Changeset 1020f0

Timestamp:

Dec 29, 2009, 12:56:55 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:

7c6f73

Parents:

8f113e

Message:

Extracted several methods from the EditMolecules Submenu.

Location:

src

Files:

• menu.cpp (modified) (3 diffs)
• menu.hpp (modified) (1 diff)

src/menu.cpp

@@ -898 +898 @@
 
 
+void oldmenu::createNewMolecule(periodentafel *periode,MoleculeListClass *molecules) {
+  molecule *mol = NULL;
+  mol = new molecule(periode);
+  molecules->insert(mol);
+};
+
+void oldmenu::loadFromXYZ(periodentafel *periode,MoleculeListClass *molecules){
+  molecule *mol = NULL;
+  Vector center;
+  char filename[MAXSTRINGSIZE];
+  Log() << Verbose(0) << "Format should be XYZ with: ShorthandOfElement\tX\tY\tZ" << endl;
+  mol = new molecule(periode);
+  do {
+    Log() << Verbose(0) << "Enter file name: ";
+    cin >> filename;
+  } while (!mol->AddXYZFile(filename));
+  mol->SetNameFromFilename(filename);
+  // center at set box dimensions
+  mol->CenterEdge(&center);
+  mol->cell_size[0] = center.x[0];
+  mol->cell_size[1] = 0;
+  mol->cell_size[2] = center.x[1];
+  mol->cell_size[3] = 0;
+  mol->cell_size[4] = 0;
+  mol->cell_size[5] = center.x[2];
+  molecules->insert(mol);
+}
+
+void oldmenu::changeName(MoleculeListClass *molecules){
+  char filename[MAXSTRINGSIZE];
+  molecule *mol = NULL;
+  int nr;
+  do {
+    Log() << Verbose(0) << "Enter index of molecule: ";
+    cin >> nr;
+    mol = molecules->ReturnIndex(nr);
+  } while (mol == NULL);
+  Log() << Verbose(0) << "Enter name: ";
+  cin >> filename;
+  strcpy(mol->name, filename);
+}
+
+void oldmenu::setMoleculeFilename(MoleculeListClass *molecules) {
+  char filename[MAXSTRINGSIZE];
+  int nr;
+  molecule *mol = NULL;
+  do {
+    Log() << Verbose(0) << "Enter index of molecule: ";
+    cin >> nr;
+    mol = molecules->ReturnIndex(nr);
+  } while (mol == NULL);
+  Log() << Verbose(0) << "Enter name: ";
+  cin >> filename;
+  mol->SetNameFromFilename(filename);
+}
+
+void oldmenu::parseXYZIntoMolecule(MoleculeListClass *molecules){
+  char filename[MAXSTRINGSIZE];
+  int nr;
+  molecule *mol = NULL;
+  mol = NULL;
+  do {
+   Log() << Verbose(0) << "Enter index of molecule: ";
+   cin >> nr;
+   mol = molecules->ReturnIndex(nr);
+  } while (mol == NULL);
+  Log() << Verbose(0) << "Format should be XYZ with: ShorthandOfElement\tX\tY\tZ" << endl;
+  do {
+   Log() << Verbose(0) << "Enter file name: ";
+   cin >> filename;
+  } while (!mol->AddXYZFile(filename));
+  mol->SetNameFromFilename(filename);
+};
+
+void oldmenu::eraseMolecule(MoleculeListClass *molecules){
+  int nr;
+  molecule *mol = NULL;
+  Log() << Verbose(0) << "Enter index of molecule: ";
+  cin >> nr;
+  for(MoleculeList::iterator ListRunner = molecules->ListOfMolecules.begin(); ListRunner != molecules->ListOfMolecules.end(); ListRunner++)
+    if (nr == (*ListRunner)->IndexNr) {
+      mol = *ListRunner;
+      molecules->ListOfMolecules.erase(ListRunner);
+      delete(mol);
+      break;
+    }
+};
+
+
 /** Submenu for creating new molecules.
  * \param *periode periodentafel
@@ -905 +994 @@
 {
   char choice;  // menu choice char
-  Vector center;
-  int nr, count;
-  molecule *mol = NULL;
 
   Log() << Verbose(0) << "==========EDIT MOLECULES=====================" << endl;
@@ -926 +1012 @@
       break;
     case 'c':
-      mol = new molecule(periode);
-      molecules->insert(mol);
+        createNewMolecule(periode,molecules);
       break;
 
     case 'l': // load from XYZ file
-      {
-        char filename[MAXSTRINGSIZE];
-        Log() << Verbose(0) << "Format should be XYZ with: ShorthandOfElement\tX\tY\tZ" << endl;
-        mol = new molecule(periode);
-        do {
-          Log() << Verbose(0) << "Enter file name: ";
-          cin >> filename;
-        } while (!mol->AddXYZFile(filename));
-        mol->SetNameFromFilename(filename);
-        // center at set box dimensions
-        mol->CenterEdge(&center);
-        mol->cell_size[0] = center.x[0];
-        mol->cell_size[1] = 0;
-        mol->cell_size[2] = center.x[1];
-        mol->cell_size[3] = 0;
-        mol->cell_size[4] = 0;
-        mol->cell_size[5] = center.x[2];
-        molecules->insert(mol);
-      }
+      loadFromXYZ(periode,molecules);
       break;
 
     case 'n':
-      {
-        char filename[MAXSTRINGSIZE];
-        do {
-          Log() << Verbose(0) << "Enter index of molecule: ";
-          cin >> nr;
-          mol = molecules->ReturnIndex(nr);
-        } while (mol == NULL);
-        Log() << Verbose(0) << "Enter name: ";
-        cin >> filename;
-        strcpy(mol->name, filename);
-      }
+      changeName(molecules);
       break;
 
     case 'N':
-      {
-        char filename[MAXSTRINGSIZE];
-        do {
-          Log() << Verbose(0) << "Enter index of molecule: ";
-          cin >> nr;
-          mol = molecules->ReturnIndex(nr);
-        } while (mol == NULL);
-        Log() << Verbose(0) << "Enter name: ";
-        cin >> filename;
-        mol->SetNameFromFilename(filename);
-      }
+      setMoleculeFilename(molecules);
       break;
 
     case 'p': // parse XYZ file
-      {
-        char filename[MAXSTRINGSIZE];
-        mol = NULL;
-        do {
-          Log() << Verbose(0) << "Enter index of molecule: ";
-          cin >> nr;
-          mol = molecules->ReturnIndex(nr);
-        } while (mol == NULL);
-        Log() << Verbose(0) << "Format should be XYZ with: ShorthandOfElement\tX\tY\tZ" << endl;
-        do {
-          Log() << Verbose(0) << "Enter file name: ";
-          cin >> filename;
-        } while (!mol->AddXYZFile(filename));
-        mol->SetNameFromFilename(filename);
-      }
+      parseXYZIntoMolecule(molecules);
       break;
 
     case 'r':
-      Log() << Verbose(0) << "Enter index of molecule: ";
-      cin >> nr;
-      count = 1;
-      for(MoleculeList::iterator ListRunner = molecules->ListOfMolecules.begin(); ListRunner != molecules->ListOfMolecules.end(); ListRunner++)
-        if (nr == (*ListRunner)->IndexNr) {
-          mol = *ListRunner;
-          molecules->ListOfMolecules.erase(ListRunner);
-          delete(mol);
-          break;
-        }
+      eraseMolecule(molecules);
       break;
   }

src/menu.hpp

@@ -26 +26 @@
   void SaveConfig(char *, config *, periodentafel *, MoleculeListClass *);
 
+  // Methods extracted from EditMolecules. Probably to be moved to moleculeListClass
+  void createNewMolecule(periodentafel *periode,MoleculeListClass *molecules);
+  void loadFromXYZ(periodentafel *periode,MoleculeListClass *molecules);
+  void changeName(MoleculeListClass *molecules);
+  void setMoleculeFilename(MoleculeListClass *molecules);
+  void parseXYZIntoMolecule(MoleculeListClass *molecules);
+  void eraseMolecule(MoleculeListClass *molecules);
+
 protected:
   void AddAtoms(periodentafel *, molecule *);