Ignore:
Timestamp:
Jul 23, 2010, 4:28:28 PM (14 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:
6bf52f
Parents:
655c98
git-author:
Frederik Heber <heber@…> (07/23/10 16:24:35)
git-committer:
Frederik Heber <heber@…> (07/23/10 16:28:28)
Message:

Actions can now be called non-interactively, MissingValueException thrown.

  • new exception MissingValue which is thrown when MapOfActions does not have a desired entry in CurrentValue map.
  • new enum Action::QueryOptions.
  • Action::call() has flag whether call should be interactive (popping up dialog) or not.
  • cleaned-up Makefile.am a bit ...
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Actions/Action.cpp

    r655c98 r4e145c  
    1313#include "Actions/ActionRegistry.hpp"
    1414#include "Actions/ActionHistory.hpp"
     15#include "Exceptions/MissingValueException.hpp"
     16#include "UIElements/Dialog.hpp"
    1517#include "Helpers/MemDebug.hpp"
     18
     19#include "log.hpp"
     20#include "verbose.hpp"
    1621
    1722using namespace std;
     
    4045}
    4146
    42 void Action::call(){
     47void Action::call(enum QueryOptions flag){
    4348  if(!isActive()){
    4449    return;
    4550  }
    4651  // forward to private virtual
    47   state_ptr state = performCall();
     52  if (flag == Interactive) {
     53    Dialog* dialog = createDialog();
     54    if (dialog != NULL) {
     55      dialog->display();
     56      delete(dialog);
     57    }
     58  }
     59  state_ptr state = Action::failure;
     60  try {
     61    state = performCall();
     62  } catch(MissingValueException&) {
     63    DoeLog(1) && (eLog() << Verbose(1) << "There is a value missing for action " << getName() << endl);
     64  };
     65
    4866  if(shouldUndo() && state != failure){
    4967    if(canUndo()){
Note: See TracChangeset for help on using the changeset viewer.