Changeset 792597 for src/Actions

Timestamp:

Jul 22, 2010, 9:16:38 PM (15 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:

aee3b1

Parents:

22e780

Message:

converted SetDefaultNameAction to new createDialog() and implemented Undo/Redo.

Location:

src/Actions/WorldAction

Files:

• SetDefaultNameAction.cpp (modified) (2 diffs)
• SetDefaultNameAction.hpp (modified) (1 diff)

src/Actions/WorldAction/SetDefaultNameAction.cpp

@@ -20 +20 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
+
+
+// memento to remember the state when undoing
+
+class WorldSetDefaultNameState : public ActionState {
+public:
+  WorldSetDefaultNameState(std::string _lastName) :
+    lastName(_lastName)
+  {}
+  std::string lastName;
+};
 
 const char WorldSetDefaultNameAction::NAME[] = "default-molname";
@@ -31 +42 @@
 {}
 
+Dialog* WorldSetDefaultNameAction::createDialog() {
+  Dialog *dialog = UIFactory::getInstance().makeDialog();
+
+  string defaultname = World::getInstance().getDefaultName();
+  ValueStorage::getInstance().setCurrentValue(NAME, defaultname);
+  dialog->queryString(NAME, MapOfActions::getInstance().getDescription(NAME));
+
+  return dialog;
+}
+
 Action::state_ptr WorldSetDefaultNameAction::performCall() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
   string defaultname;
 
   defaultname = World::getInstance().getDefaultName();
-  dialog->queryString(NAME, &defaultname, MapOfActions::getInstance().getDescription(NAME));
+  ValueStorage::getInstance().queryCurrentValue(NAME, defaultname);
 
-  if(dialog->display()) {
-    World::getInstance().setDefaultName(defaultname);
-    DoLog(0) && (Log() << Verbose(0) << "Default name of new molecules set to " << World::getInstance().getDefaultName() << "." << endl);
-    delete dialog;
-    return Action::success;
-  } else {
-    delete dialog;
-    return Action::failure;
-  }
+  World::getInstance().setDefaultName(defaultname);
+  DoLog(0) && (Log() << Verbose(0) << "Default name of new molecules set to " << World::getInstance().getDefaultName() << "." << endl);
+  return Action::success;
 }
 
 Action::state_ptr WorldSetDefaultNameAction::performUndo(Action::state_ptr _state) {
-//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
+  WorldSetDefaultNameState *state = assert_cast<WorldSetDefaultNameState*>(_state.get());
 
-  return Action::failure;
-//  string newName = state->mol->getName();
-//  state->mol->setName(state->lastName);
-//
-//  return Action::state_ptr(new ParserLoadXyzState(state->mol,newName));
+  string newName = World::getInstance().getDefaultName();
+  World::getInstance().setDefaultName(state->lastName);
+
+  return Action::state_ptr(new WorldSetDefaultNameState(newName));
 }
 
 Action::state_ptr WorldSetDefaultNameAction::performRedo(Action::state_ptr _state){
-  return Action::failure;
+  performUndo(_state);
 }
 
 bool WorldSetDefaultNameAction::canUndo() {
-  return false;
+  return true;
 }
 
 bool WorldSetDefaultNameAction::shouldUndo() {
-  return false;
+  return true;
 }
 

src/Actions/WorldAction/SetDefaultNameAction.hpp

@@ -21 +21 @@
   virtual const std::string getName();
 private:
+  virtual Dialog * createDialog();
   virtual Action::state_ptr performCall();
   virtual Action::state_ptr performUndo(Action::state_ptr);