Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Actions/ParserAction/SetTremoloAtomdataAction.cpp

    rbe21fa rca331c  
    4141  FormatParser<tremolo> &parser = FormatParserStorage::getInstance().getParser<tremolo>();
    4242
    43   LOG(1, "Setting Tremolo's ATOMDATA to: '" << params.atomdata_string << "'");
     43  LOG(1, "Setting Tremolo's ATOMDATA to: '" << params.atomdata_string.get() << "'");
    4444
    45   parser.setAtomData(params.atomdata_string);
     45  const std::string old_atomdata = parser.getAtomData();
    4646
    47   return Action::success;
     47  if (params.atomdata_reset.get())
     48    parser.resetAtomData(params.atomdata_string.get());
     49  else
     50    parser.setAtomData(params.atomdata_string.get());
     51
     52  return Action::state_ptr(new ParserSetTremoloAtomdataState(old_atomdata, params));
    4853}
    4954
    5055Action::state_ptr ParserSetTremoloAtomdataAction::performUndo(Action::state_ptr _state) {
    51 //  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
     56  ParserSetTremoloAtomdataState *state = assert_cast<ParserSetTremoloAtomdataState*>(_state.get());
    5257
    53   return Action::failure;
    54 //  string newName = state->mol->getName();
    55 //  state->mol->setName(state->lastName);
    56 //
    57 //  return Action::state_ptr(new ParserLoadXyzState(state->mol,newName));
     58  FormatParser<tremolo> &parser = FormatParserStorage::getInstance().getParser<tremolo>();
     59  LOG(1, "INFO: Reverting to 'ATOMDATA " << state->old_atomdata << "'.");
     60  parser.resetAtomData(state->old_atomdata);
     61
     62  return Action::state_ptr(_state);
    5863}
    5964
    6065Action::state_ptr ParserSetTremoloAtomdataAction::performRedo(Action::state_ptr _state){
    61   return Action::failure;
     66  ParserSetTremoloAtomdataState *state = assert_cast<ParserSetTremoloAtomdataState*>(_state.get());
     67
     68  FormatParser<tremolo> &parser = FormatParserStorage::getInstance().getParser<tremolo>();
     69
     70  if (state->params.atomdata_reset.get())
     71    parser.resetAtomData(state->params.atomdata_string.get());
     72  else
     73    parser.setAtomData(state->params.atomdata_string.get());
     74
     75  return Action::state_ptr(_state);
    6276}
    6377
    6478bool ParserSetTremoloAtomdataAction::canUndo() {
    65   return false;
     79  return true;
    6680}
    6781
    6882bool ParserSetTremoloAtomdataAction::shouldUndo() {
    69   return false;
     83  return true;
    7084}
    7185/** =========== end of function ====================== */
Note: See TracChangeset for help on using the changeset viewer.