Changeset 12098a for src

Timestamp:

Dec 14, 2012, 5:40:13 PM (12 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, 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:

97a858

Parents:

29ea65

git-author:

Michael Ankele <ankele@…> (11/23/12 13:57:12)

git-committer:

Frederik Heber <heber@…> (12/14/12 17:40:13)

Message:

Refactoring: use vector<Shape> instead of vector<Shape*> in RemoveShapeAction's state

Location:

src/Actions/ShapeAction

Files:

• RemoveShapeAction.cpp (modified) (2 diffs)
• RemoveShapeAction.def (modified) (1 diff)

src/Actions/ShapeAction/RemoveShapeAction.cpp

@@ -55 +55 @@
 
   std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
-  std::vector<Shape*> old_shapes;
+  std::vector<Shape> old_shapes;
 
   for (unsigned int i=0;i<selectedShapes.size();i++){
-    old_shapes.push_back(new Shape(*selectedShapes[i]));
+    old_shapes.push_back(*selectedShapes[i]);
     ShapeRegistry::getInstance().removeShape(selectedShapes[i]->getName());
   }
@@ -71 +71 @@
 
   for (unsigned int i=0;i<state->old_shapes.size();i++){
-    ShapeRegistry::getInstance().addShape(*state->old_shapes[i]);
-    ShapeRegistry::getInstance().selectShape(state->old_shapes[i]->getName());
+    ShapeRegistry::getInstance().addShape(state->old_shapes[i]);
+    ShapeRegistry::getInstance().selectShape(state->old_shapes[i].getName());
   }
 

src/Actions/ShapeAction/RemoveShapeAction.def

@@ -22 +22 @@
 #undef paramvalids
 
-#define statetypes (std::vector<Shape*>)
+#define statetypes (std::vector<Shape>)
 #define statereferences (old_shapes)