Changeset a2a2f7 for src/Actions

Timestamp:

Apr 29, 2014, 12:42:43 PM (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, 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:

ae68b5

Parents:

c9db50

git-author:

Frederik Heber <heber@…> (02/01/14 15:42:09)

git-committer:

Frederik Heber <heber@…> (04/29/14 12:42:43)

Message:

Huge warning fix.

• fixed unused variables.
• fixed set but unused variables.
• fixed signed vs. unsigned int comparison.
• fixed static_warning_test<false, 98> (commented out _IMPLEMENT).

Location:

src/Actions

Files:

• ActionSequence.cpp (modified) (2 diffs)
• SelectionAction/Atoms/AtomByIdAction.cpp (modified) (2 diffs)
• SelectionAction/Atoms/NotAtomByIdAction.cpp (modified) (2 diffs)
• ShapeAction/RemoveShapeAction.cpp (modified) (1 diff)
• ShapeAction/StretchShapeAction.cpp (modified) (1 diff)

src/Actions/ActionSequence.cpp

@@ -92 +92 @@
 // Each action registers itself with the history
 void ActionSequence::callAll(){
-  for (int i=0;i<loop;++i)
+  for (size_t i=0;i<loop;++i)
     for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
       // we want to have a global bookkeeping for all actions in the sequence, so
@@ -105 +105 @@
 ActionSequence::stateSet ActionSequence::callAll(bool){
   stateSet states;
-  for (int i=0;i<loop;++i)
+  for (size_t i=0;i<loop;++i)
     for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
       // we want to have a global bookkeeping for all actions in the sequence, so

src/Actions/SelectionAction/Atoms/AtomByIdAction.cpp

@@ -60 +60 @@
     AtomMissing
   } status = NoStatus;
+
   const atomids_t atomids = params.atomids.get();
   atomids_t undoatomids;
@@ -95 +96 @@
       break;
   }
+  return Action::failure;
 }
 

src/Actions/SelectionAction/Atoms/NotAtomByIdAction.cpp

@@ -60 +60 @@
     AtomMissing
   } status = NoStatus;
+
   const atomids_t atomids = params.atomids.get();
   atomids_t undoatomids;
@@ -95 +96 @@
       break;
   }
+  return Action::failure;
 }
 

src/Actions/ShapeAction/RemoveShapeAction.cpp

@@ -79 +79 @@
 
 ActionState::ptr ShapeRemoveShapeAction::performRedo(ActionState::ptr _state){
-  ShapeRemoveShapeState *state = assert_cast<ShapeRemoveShapeState*>(_state.get());
+//  ShapeRemoveShapeState *state = assert_cast<ShapeRemoveShapeState*>(_state.get());
 
   std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();

src/Actions/ShapeAction/StretchShapeAction.cpp

@@ -93 +93 @@
   std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
 
-  Vector helper = params.center.get();
-  helper.ScaleAll(params.stretch.get());
-  Vector translation = params.center.get() - helper;
+  Vector helper = state->params.center.get();
+  helper.ScaleAll(state->params.stretch.get());
+  Vector translation = state->params.center.get() - helper;
 
   for (unsigned int i=0;i<selectedShapes.size();i++){
-    Shape s = translate(stretch(*selectedShapes[i], params.stretch.get()), translation);
+    Shape s = translate(stretch(*selectedShapes[i], state->params.stretch.get()), translation);
     std::string name = selectedShapes[i]->getName();
     s.setName(name);