Changeset 0ac85c3 for src/Actions/UndoRedoHelpers.cpp

Timestamp:

Jan 29, 2015, 7:37:57 AM (11 years ago)

Author:

Frederik Heber <heber@…>

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, Candidate_v1.7.0, Candidate_v1.7.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:

27e464

Parents:

7b38d3 (diff), 4f2895 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'GUI_TesselatedLargeMolecules' into Candidate_v1.4.10

File:

• src/Actions/UndoRedoHelpers.cpp (modified) (3 diffs)

src/Actions/UndoRedoHelpers.cpp

@@ -52 +52 @@
 #include "WorldTime.hpp"
 
-bool MoleCuilder::AddAtomsFromAtomicInfo(std::vector<AtomicInfo> &atoms)
+bool MoleCuilder::AddAtomsFromAtomicInfo(const std::vector<AtomicInfo> &atoms)
 {
   size_t i=0;
@@ -69 +69 @@
     for (size_t j=0;j<i;++j)
       World::getInstance().destroyAtom(atoms[j].getId());
+    // and announce the failure
+    return false;
+  }
+  return true;
+}
+
+bool MoleCuilder::AddMoleculesFromAtomicInfo(std::map< moleculeId_t, std::vector<AtomicInfo> > &mol_atoms)
+{
+  bool status = true;
+  for (std::map< moleculeId_t, std::vector<AtomicInfo> >::const_iterator iter = mol_atoms.begin();
+      iter != mol_atoms.end(); ++iter) {
+    // re-create the atom
+    LOG(3, "DEBUG: Re-adding molecule " << iter->first << ".");
+    molecule *mol_Walker = World::getInstance().createMolecule();
+
+    // reset the mol id
+    bool status = true;
+    if (mol_Walker->getId() != iter->first)
+      status &= mol_Walker->changeId(iter->first);
+
+    // add all its atoms
+    status &= AddAtomsFromAtomicInfo(iter->second);
+  }
+  if (!status) {
+    // remove all molecules again
+    for (std::map< moleculeId_t, std::vector<AtomicInfo> >::const_iterator iter = mol_atoms.begin();
+        iter != mol_atoms.end(); ++iter) {
+      molecule * mol = World::getInstance().getMolecule(MoleculeById(iter->first));
+      if (mol != NULL)
+        removeAtomsinMolecule(mol);
+    }
     // and announce the failure
     return false;
@@ -173 +204 @@
   for (std::vector<moleculeId_t>::const_iterator iter = ids.begin();
       iter != ids.end(); ++iter) {
-    molecule * const mol = World::getInstance().getMolecule(MoleculeById(*iter));
+    molecule * mol = World::getInstance().getMolecule(MoleculeById(*iter));
     if (mol != NULL) {
-      mol->removeAtomsinMolecule();
-      World::getInstance().destroyMolecule(mol);
+      removeAtomsinMolecule(mol);
+      // molecules are automatically removed when empty
     }
   }