Ignore:
Timestamp:
Jul 22, 2010, 7:56:02 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:
bb2b2c
Parents:
454065
Message:

converted RemoveAction to new createDialog() and uses selectedAtoms.

Location:
src/Actions/AtomAction
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/Actions/AtomAction/RemoveAction.cpp

    r454065 r5cb3cb  
    2323#include "UIElements/UIFactory.hpp"
    2424#include "UIElements/Dialog.hpp"
    25 #include "Actions/MapOfActions.hpp"
     25#include "UIElements/ValueStorage.hpp"
    2626
    2727const char AtomRemoveAction::NAME[] = "remove-atom";
     
    3434{}
    3535
     36Dialog* AtomRemoveAction::createDialog() {
     37  Dialog *dialog = UIFactory::getInstance().makeDialog();
     38
     39  dialog->queryEmpty(NAME, ValueStorage::getInstance().getDescription(NAME));
     40
     41  return dialog;
     42}
     43
    3644Action::state_ptr AtomRemoveAction::performCall() {
    37   Dialog *dialog = UIFactory::getInstance().makeDialog();
    3845  atom *first = NULL;
    3946
    40   dialog->queryAtom(NAME, &first, MapOfActions::getInstance().getDescription(NAME));
    41 
    42   if(dialog->display()) {
    43     delete dialog;
     47  std::vector<molecule *> molecules = World::getInstance().getAllMolecules();
     48  for (World::AtomSelectionIterator iter = World::getInstance().beginAtomSelection(); iter != World::getInstance().endAtomSelection(); ++iter) {
     49    first = iter->second;
    4450    DoLog(1) && (Log() << Verbose(1) << "Removing atom " << first->getId() << "." << endl);
    4551    // TODO: this is not necessary when atoms and their storing to file are handled by the World
    4652    // simply try to erase in every molecule found
    47     std::vector<molecule *> molecules = World::getInstance().getAllMolecules();
    4853    for (std::vector<molecule *>::iterator iter = molecules.begin();iter != molecules.end(); ++iter) {
    4954      (*iter)->erase(first);
    5055    }
    5156    World::getInstance().destroyAtom(first);
    52     return Action::success;
    53   } else {
    54     delete dialog;
    55     return Action::failure;
    5657  }
    57 
     58  return Action::success;
    5859}
    5960
  • src/Actions/AtomAction/RemoveAction.hpp

    r454065 r5cb3cb  
    2121  virtual const std::string getName();
    2222private:
     23  virtual Dialog * createDialog();
    2324  virtual Action::state_ptr performCall();
    2425  virtual Action::state_ptr performUndo(Action::state_ptr);
Note: See TracChangeset for help on using the changeset viewer.