source: src/Actions/MakroAction.cpp@ a2a2f7

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
Last change on this file since a2a2f7 was 237f93, checked in by Frederik Heber <heber@…>, 11 years ago

FIX: MolecularDynamicsAction now prepares normally not inside performCall().

  • added protected ActionSequence::removeAction() and pass-thru in MakroAction.
  • added MakroAction::fillOwnDialog(): We did not cleanly implement the MakroAction's dialogs before. We need to populate queries from the sequeence of Actions and from the MakroAction itself (e.g. for loop count). For the latter, we need another new function for this.
  • MolecularDynamicsAction removes output action from sequence if not desired.
  • removed (another) fillAllDialog from MakroAction::performCall(). This has been the source of doubly occuring dialogs (and dialog becoming ever larger on multiple calls).
  • MolecularDynamicsAction::prepare() also just uses ActionRegistry whose ref is passed as parameter and does not (directly) access ActionQueue.
  • Property mode set to 100644
File size: 4.0 KB
Line 
1/*
2 * Project: MoleCuilder
3 * Description: creates and alters molecular systems
4 * Copyright (C) 2010-2012 University of Bonn. All rights reserved.
5 * Copyright (C) 2013 Frederik Heber. All rights reserved.
6 *
7 *
8 * This file is part of MoleCuilder.
9 *
10 * MoleCuilder is free software: you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation, either version 2 of the License, or
13 * (at your option) any later version.
14 *
15 * MoleCuilder is distributed in the hope that it will be useful,
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 * GNU General Public License for more details.
19 *
20 * You should have received a copy of the GNU General Public License
21 * along with MoleCuilder. If not, see <http://www.gnu.org/licenses/>.
22 */
23
24/*
25 * MakroAction.cpp
26 *
27 * Created on: Dec 17, 2009
28 * Author: crueger
29 */
30
31// include config.h
32#ifdef HAVE_CONFIG_H
33#include <config.h>
34#endif
35
36#include "CodePatterns/MemDebug.hpp"
37
38#include <string>
39
40#include "Actions/MakroAction.hpp"
41#include "Actions/Action.hpp"
42#include "Actions/ActionExceptions.hpp"
43#include "Actions/ActionRegistry.hpp"
44#include "Actions/ActionSequence.hpp"
45#include "CodePatterns/Assert.hpp"
46#include "UIElements/Dialog.hpp"
47#include "UIElements/UIFactory.hpp"
48
49using namespace MoleCuilder;
50
51class MakroActionState : public ActionState{
52public:
53 MakroActionState(ActionSequence::stateSet _states) :
54 states(_states)
55 {}
56 virtual ~MakroActionState(){
57 // All contained states are destroyed by the shared ptrs
58 }
59
60 ActionSequence::stateSet states;
61};
62
63MakroAction::MakroAction(const ActionTrait &_trait,ActionSequence& _actions) :
64 Action(_trait),
65 actions(_actions)
66{
67}
68
69MakroAction::~MakroAction()
70{
71 // emptying the sequence is someone else responsibility
72// Action* action;
73// while((action=actions.removeLastAction())){
74// delete action;
75// }
76}
77
78void MakroAction::prepare(ActionRegistry &AR)
79{}
80
81void MakroAction::unprepare(ActionRegistry &AR)
82{}
83
84void MakroAction::setLoop(unsigned int _loop)
85{
86 actions.setLoop(_loop);
87}
88
89bool MakroAction::removeAction(const std::string &name)
90{
91 actions.removeAction(name);
92}
93
94Dialog* MakroAction::fillOwnDialog(Dialog *dialog) {
95 return dialog;
96}
97
98Dialog* MakroAction::fillDialog(Dialog *dialog) {
99 dialog = fillOwnDialog(dialog);
100 return actions.fillAllDialogs(dialog);
101}
102
103ActionState::ptr MakroAction::performCall(){
104// {
105// // create and run our dialog and also of all members of the sequence
106// Dialog* dialog = actions.fillAllDialogs(createDialog());
107// if (dialog->hasQueries()) {
108// if (!dialog->display())
109// // dialog error or aborted -> throw exception
110// throw ActionFailureException() << ActionNameString(getName());
111// }
112// delete(dialog);
113// }
114 ActionSequence::stateSet states = actions.callAll(true);
115 return ActionState::ptr(new MakroActionState(states));
116}
117
118ActionState::ptr MakroAction::performUndo(ActionState::ptr _state) {
119 MakroActionState *state = dynamic_cast<MakroActionState*>(_state.get());
120 ASSERT(state,"Type mismatch for the state of the MakroAction");
121 ActionSequence::stateSet states = actions.undoAll(state->states);
122 return ActionState::ptr(new MakroActionState(states));
123}
124
125ActionState::ptr MakroAction::performRedo(ActionState::ptr _state){
126 MakroActionState *state = dynamic_cast<MakroActionState*>(_state.get());
127 ASSERT(state,"Type mismatch for the state of the MakroAction");
128 ActionSequence::stateSet states = actions.redoAll(state->states);
129 return ActionState::ptr(new MakroActionState(states));
130}
131
132bool MakroAction::canUndo() {
133 return actions.canUndo();
134}
135
136bool MakroAction::shouldUndo() {
137 return actions.shouldUndo();
138}
139
140void MakroAction::outputAsCLI(std::ostream &ost) const
141{
142 actions.outputAsCLI(ost);
143}
144
145void MakroAction::outputAsPython(std::ostream &ost, const std::string &prefix) const
146{
147 actions.outputAsPython(ost, prefix);
148}
Note: See TracBrowser for help on using the repository browser.