Changeset fdf198 for src/Actions


Ignore:
Timestamp:
Jul 22, 2010, 8:40:47 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:
09cf39
Parents:
e58fad1
Message:

converted SaveBondsAction to new createDialog().

Location:
src/Actions/MoleculeAction
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/Actions/MoleculeAction/SaveBondsAction.cpp

    re58fad1 rfdf198  
    1818#include "UIElements/UIFactory.hpp"
    1919#include "UIElements/Dialog.hpp"
    20 #include "Actions/MapOfActions.hpp"
     20#include "UIElements/ValueStorage.hpp"
    2121
    22 #include "atom.hpp"
    2322#include "bondgraph.hpp"
    2423#include "config.hpp"
    25 #include "defs.hpp"
    2624#include "log.hpp"
    2725#include "molecule.hpp"
    28 #include "vector.hpp"
    2926#include "verbose.hpp"
    3027#include "World.hpp"
     
    5350{}
    5451
     52Dialog* MoleculeSaveBondsAction::createDialog() {
     53  Dialog *dialog = UIFactory::getInstance().makeDialog();
     54
     55  dialog->queryString(NAME, ValueStorage::getInstance().getDescription(NAME));
     56}
     57
    5558Action::state_ptr MoleculeSaveBondsAction::performCall() {
    5659  string filename;
    57   Dialog *dialog = UIFactory::getInstance().makeDialog();
    5860  molecule *mol = NULL;
    5961
    60   dialog->queryString(NAME, &filename, MapOfActions::getInstance().getDescription(NAME));
    61   dialog->queryMolecule("molecule-by-id", &mol, MapOfActions::getInstance().getDescription("molecule-by-id"));
     62  ValueStorage::getInstance().queryCurrentValue(NAME, filename);
    6263
    63   if(dialog->display()) {
     64  for (World::MoleculeSelectionIterator iter = World::getInstance().beginMoleculeSelection(); iter != World::getInstance().endMoleculeSelection(); ++iter) {
     65    mol = iter->second;
    6466    DoLog(0) && (Log() << Verbose(0) << "Storing bonds to path " << filename << "." << endl);
    6567    World::getInstance().getConfig()->BG->ConstructBondGraph(mol);
    6668    // TODO: sollte stream, nicht filenamen direkt nutzen, besser fuer unit tests
    6769    mol->StoreBondsToFile(filename);
    68     delete dialog;
    69     return Action::success;
    7070  }
    71   delete dialog;
    72   return Action::failure;
     71  return Action::success;
    7372}
    7473
  • src/Actions/MoleculeAction/SaveBondsAction.hpp

    re58fad1 rfdf198  
    2424  virtual const std::string getName();
    2525private:
     26  virtual Dialog * createDialog();
    2627  virtual Action::state_ptr performCall();
    2728  virtual Action::state_ptr performUndo(Action::state_ptr);
Note: See TracChangeset for help on using the changeset viewer.