Changeset 26b4d62 for src/Actions


Ignore:
Timestamp:
Jun 27, 2014, 9:32:03 PM (11 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, Candidate_v1.7.0, 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:
c73e35
Parents:
0b6b77
git-author:
Frederik Heber <heber@…> (06/19/14 13:56:27)
git-committer:
Frederik Heber <heber@…> (06/27/14 21:32:03)
Message:

All Actions now give correct failure status via STATUS() macro.

Location:
src/Actions
Files:
67 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/AnalysisAction/DipoleAngularCorrelationAction.cpp

    r0b6b77 r26b4d62  
    8383  std::vector<atom *> atoms = World::getInstance().getSelectedAtoms();
    8484  if (atoms.empty()) {
    85     ELOG(2, "Formula "+toString(DipoleFormula)+" selects no atoms.");
     85    STATUS("Formula "+toString(DipoleFormula)+" selects no atoms.");
    8686    return Action::failure;
    8787  }
    … …  
    139139
    140140  // exit
     141  STATUS("Dipole angular correlation calculation successful.");
    141142  return Action::success;
    142143}

  • src/Actions/AnalysisAction/DipoleCorrelationAction.cpp

    r0b6b77 r26b4d62  
    6767  DipoleCorrelationMap *correlationmap = NULL;
    6868  std::vector<molecule*> molecules = World::getInstance().getSelectedMolecules();
    69   LOG(0, "STATUS: There are " << molecules.size() << " selected molecules.");
     69  STATUS("There are "+toString(molecules.size())+" selected molecules.");
    7070  ASSERT(!params.periodic.get(), "AnalysisDipoleCorrelationAction() - periodic case not implemented.");
    7171  correlationmap = DipoleCorrelation(molecules);

  • src/Actions/AnalysisAction/SurfaceCorrelationAction.cpp

    r0b6b77 r26b4d62  
    8484  }
    8585  if ( atoms.size() == 0) {
    86     ELOG(1, "You have not select any atoms.");
     86    STATUS("You have not select any atoms.");
    8787    return Action::failure;
    8888  }

  • src/Actions/AtomAction/AddAction.cpp

    r0b6b77 r26b4d62  
    9393  }
    9494  if (first->getId() != state->id)
    95     if (!first->changeId(state->id))
     95    if (!first->changeId(state->id)) {
     96      STATUS("Could not change atom id "+toString(first->getId())+"->"+toString(state->id)+".");
    9697      return Action::failure;
     98    }
     99
    97100  return ActionState::ptr(_state);
    98101}

  • src/Actions/AtomAction/RemoveAction.cpp

    r0b6b77 r26b4d62  
    8181  if (AddAtomsFromAtomicInfo(state->Walkers))
    8282    return ActionState::ptr(_state);
    83   else
     83  else {
     84    STATUS("Failed to re-add removed atoms.");
    8485    return Action::failure;
     86  }
    8587}
    8688

  • src/Actions/AtomAction/RotateAroundOriginByAngleAction.cpp

    r0b6b77 r26b4d62  
    5959
    6060  // check whether Axis is valid
    61   if (params.Axis.get().IsZero())
     61  if (params.Axis.get().IsZero()) {
     62    STATUS("Specified Rotation axis is zero.");
    6263    return Action::failure;
     64  }
    6365
    6466  // convert from degrees to radian

  • src/Actions/AtomAction/SaveSelectedAtomsAction.cpp

    r0b6b77 r26b4d62  
    6363      FilenamePrefix = params.filename.get().stem().string();
    6464  } else {
    65     ELOG(1, "Output file does not have a suffix, cannot recognize format.");
     65    STATUS("Output file "+params.filename.get().string()+"does not have a suffix, cannot recognize format.");
    6666    return Action::failure;
    6767  }
    … …  
    7474    FormatParserStorage::getInstance().saveSelectedAtoms(output, FilenameSuffix);
    7575  } else {
    76     ELOG(1, "Could not open file " << params.filename.get() << ".");
     76    STATUS("Could not open file "+params.filename.get().string()+".");
     77    return Action::failure;
    7778  }
    7879  output.close();
    … …  
    8485//  ParserSaveXyzState *state = assert_cast<ParserSaveXyzState*>(_state.get());
    8586
    86   return Action::failure;
     87  return Action::success;
    8788//  string newName = state->mol->getName();
    8889//  state->mol->setName(state->lastName);
    … …  
    9293
    9394ActionState::ptr AtomSaveSelectedAtomsAction::performRedo(ActionState::ptr _state){
    94   return Action::failure;
     95  return Action::success;
    9596//  // Undo and redo have to do the same for this action
    9697//  return performUndo(_state);

  • src/Actions/BondAction/BondAddAction.cpp

    r0b6b77 r26b4d62  
    5858  // check preconditions
    5959  if (World::getInstance().countSelectedAtoms() != 2) {
    60     ELOG(1, "Exactly two atoms must be selected for BondAction Add.");
     60    STATUS("Exactly two atoms must be selected for BondAction Add.");
    6161    return Action::failure;
    6262  }
    6363  const std::vector<atom *> selected_atoms = World::getInstance().getSelectedAtoms();
    6464  if (selected_atoms[0]->IsBondedTo(WorldTime::getTime(), selected_atoms[1])) {
    65     ELOG(2, "There already is a bond in between the two selected atoms.");
     65    STATUS("There already is a bond in between the two selected atoms.");
    6666    return Action::failure;
    6767  }

  • src/Actions/BondAction/BondRemoveAction.cpp

    r0b6b77 r26b4d62  
    5858  // check preconditions
    5959  if (World::getInstance().countSelectedAtoms() != 2) {
    60     ELOG(1, "Exactly two atoms must be selected for BondAction Remove.");
     60    STATUS("Exactly two atoms must be selected for BondAction Remove.");
    6161    return Action::failure;
    6262  }
    6363  const std::vector<atom *> selected_atoms = World::getInstance().getSelectedAtoms();
    6464  if (!selected_atoms[0]->IsBondedTo(WorldTime::getTime(), selected_atoms[1])) {
    65     ELOG(2, "There is no bond in between the two selected atoms.");
     65    STATUS("There is no bond in between the two selected atoms.");
    6666    return Action::failure;
    6767  }

  • src/Actions/CommandAction/BondLengthTableAction.cpp

    r0b6b77 r26b4d62  
    7676    std::ifstream input(params.BondGraphFileName.get().string().c_str());
    7777    if ((input.good()) && (BG->LoadBondLengthTable(input))) {
    78       LOG(0, "Bond length table parsed successfully.");
     78      LOG(1, "Bond length table parsed successfully.");
    7979      input.close();
    8080      return ActionState::ptr(UndoState);
    8181    } else {
    82       ELOG(1, "Bond length table parsing failed.");
     82      STATUS("Bond length table "+params.BondGraphFileName.get().string()
     83          +" parsing failed.");
    8384      input.close();
    8485    }
    8586  } else {
    86     ELOG(1, "Bond length table loading failed.");
     87    STATUS("Bond length table "+params.BondGraphFileName.get().string()
     88        +" loading failed.");
    8789  }
    8890  // recover bond graph

  • src/Actions/CommandAction/ElementDbAction.cpp

    r0b6b77 r26b4d62  
    8080  periode->CleanupPeriodtable();
    8181  if (periode->LoadPeriodentafel(configuration->databasepath)) {
    82     LOG(0, "Element list loaded successfully.");
     82    STATUS("Element list loaded successfully.");
    8383    //periode->Output();
    8484    return ActionState::ptr(UndoState);
    8585  } else {
    86     LOG(0, "Element list loading failed.");
     86    STATUS("Element list loading failed.");
    8787    delete UndoState;
    8888    return Action::failure;
    … …  
    117117  periode->CleanupPeriodtable();
    118118  if (periode->LoadPeriodentafel(configuration->databasepath)) {
    119     LOG(0, "Element list loaded successfully.");
     119    STATUS("Redoing Element list loaded successfully.");
    120120    //periode->Output();
    121121    return ActionState::ptr(_state);
    122122  } else {
    123     LOG(0, "Element list loading failed.");
     123    STATUS("Redoing Element list loading failed.");
    124124    return Action::failure;
    125125  }

  • src/Actions/CommandAction/HelpAction.cpp

    r0b6b77 r26b4d62  
    9898      std::cout << std::endl;
    9999    } else {
    100       ELOG(1, "No action is known by the name " << params.actionname.get() << ".");
     100      STATUS("No action is known by the name "+params.actionname.get()+".");
    101101      return Action::failure;
    102102    }

  • src/Actions/CommandAction/LoadSessionAction.cpp

    r0b6b77 r26b4d62  
    6060  if (executePythonScript(params.filename.get().string()))
    6161    return Action::success;
    62   else
     62  else {
     63    STATUS("Failed executing python script.");
    6364    return Action::failure;
     65  }
    6466#else
    65   ELOG(1, "Python capabilities have not been compiled in.");
     67  STATUS("Python capabilities have not been compiled in.");
    6668  return Action::failure;
    6769#endif

  • src/Actions/CommandAction/VersionAction.cpp

    r0b6b77 r26b4d62  
    4949/** =========== define the function ====================== */
    5050ActionState::ptr CommandVersionAction::performCall() {
    51   LOG(1, "STATUS: Version of the program is " << MOLECUILDERVERSION << ".");
     51  STATUS("Version of the program is "+toString(MOLECUILDERVERSION)+".");
    5252  return Action::success;
    5353}

  • src/Actions/FillAction/FillRegularGridAction.cpp

    r0b6b77 r26b4d62  
    8484  const std::vector< molecule *> molecules = World::getInstance().getSelectedMolecules();
    8585  if (molecules.size() != 1) {
    86     ELOG(1, "No exactly one molecule selected, aborting,");
     86    STATUS("No exactly one molecule selected, aborting,");
    8787    return Action::failure;
    8888  }
    … …  
    9999  if (params.SphereRadius.get() != 0.) {
    100100    if ( atoms.size() == 0) {
    101       ELOG(1, "You have given a sphere radius " << params.SphereRadius.get()
    102           << " != 0, but have not select any atoms.");
     101      STATUS("You have given a sphere radius "+toString(params.SphereRadius.get())
     102          +" != 0, but have not select any atoms.");
    103103      return Action::failure;
    104104    }
    … …  
    168168
    169169      if (!successflag) {
    170         ELOG(1, "Insertion failed, removing inserted clusters, translating original one back");
     170        STATUS("Insertion failed, removing inserted clusters, translating original one back");
    171171        RemoveAtomsFromAtomicInfo(clonedatominfos);
    172172        clonedatoms.clear();
    … …  
    191191  if (successflag)
    192192    return ActionState::ptr(UndoState);
    193   else
     193  else {
    194194    return Action::failure;
     195  }
    195196}
    196197
    … …  
    220221  if (statusflag)
    221222    return ActionState::ptr(_state);
    222   else
     223  else {
     224    STATUS("Failed re-adding filled in atoms.");
    223225    return Action::failure;
     226  }
    224227}
    225228

  • src/Actions/FillAction/FillSurfaceAction.cpp

    r0b6b77 r26b4d62  
    7272  std::vector<AtomicInfo> movedatoms;
    7373  if (molecules.size() != 1) {
    74     ELOG(1, "No exactly one molecule selected, aborting,");
     74    STATUS("No exactly one molecule selected, aborting,");
    7575    return Action::failure;
    7676  }
    … …  
    112112    std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
    113113    if (selectedShapes.size() != 1){
    114       ELOG(1, "FillSurfaceAction::performCall(): there has to be exactly 1 selected shape.");
     114      STATUS("There has to be exactly 1 selected shape.");
    115115      return Action::failure;
    116116    }
    … …  
    150150
    151151      if (!successflag) {
    152         ELOG(1, "Insertion failed, removing inserted clusters, translating original one back");
     152        STATUS("Insertion failed, removing inserted clusters, translating original one back");
    153153        RemoveAtomsFromAtomicInfo(clonedatominfos);
    154154        clonedatoms.clear();
    … …  
    198198  if (statusflag)
    199199    return ActionState::ptr(_state);
    200   else
     200  else {
     201    STATUS("Failed to re-added filled in atoms.");
    201202    return Action::failure;
     203  }
    202204}
    203205

  • src/Actions/FragmentationAction/AnalyseFragmentationResultsAction.cpp

    r0b6b77 r26b4d62  
    525525
    526526  if (keysets.KeySets.empty()) {
    527     ELOG(2, "There are no results in the container.");
     527    STATUS("There are no results in the container.");
    528528    return Action::failure;
    529529  }
    … …  
    613613  if (DoLongrange) {
    614614    if ( World::getInstance().getAllAtoms().size() == 0) {
    615       ELOG(1, "Please load the full molecule intostd::map<JobId_t, VMGData> longrangeData the world before starting this action.");
     615      STATUS("Please load the full molecule intostd::map<JobId_t, VMGData> longrangeData the world before starting this action.");
    616616      return Action::failure;
    617617    }

  • src/Actions/FragmentationAction/ClearFragmentationResultsAction.cpp

    r0b6b77 r26b4d62  
    5656    LOG(1, "STATUS: Fragmentation results cleared.");
    5757    return Action::success;
    58   } else
     58  } else {
     59    STATUS("Failed to clear fragmentation results.");
    5960    return Action::failure;
     61  }
    6062}
    6163

  • src/Actions/FragmentationAction/FragmentationAction.cpp

    r0b6b77 r26b4d62  
    8989  // check for selected atoms
    9090  if (world.beginAtomSelection() == world.endAtomSelection()) {
    91     ELOG(1, "There are no atoms selected for fragmentation.");
     91    STATUS("There are no atoms selected for fragmentation.");
    9292    return Action::failure;
    9393  }
    … …  
    279279      exporter();
    280280#else
    281       ELOG(1, "No output file types specified and JobMarket support is not compiled in.");
     281      STATUS("No output file types specified and JobMarket support is not compiled in.");
    282282      return Action::failure;
    283283#endif

  • src/Actions/FragmentationAction/FragmentationAutomationAction.cpp

    r0b6b77 r26b4d62  
    152152  if (params.DoLongrange.get()) {
    153153  if ( World::getInstance().getAllAtoms().size() == 0) {
    154     ELOG(1, "Please load the full molecule into the world before starting this action.");
     154    STATUS("Please load the full molecule into the world before starting this action.");
    155155    return Action::failure;
    156156  }
    … …  
    196196        params.DoValenceOnly.get() ? MPQCData::DoSampleValenceOnly : MPQCData::DontSampleValenceOnly,
    197197        params.DoPrintDebug.get(),
    198         OpenBoundaryConditions))
     198        OpenBoundaryConditions)) {
     199      STATUS("Could not create long-range jobs for electronic charge distribution.");
    199200      return Action::failure;
     201    }
    200202
    201203    // Phase Six a: calculate result
    … …  
    222224          params.DoValenceOnly.get() ? MPQCData::DoSampleValenceOnly : MPQCData::DontSampleValenceOnly,
    223225          params.DoPrintDebug.get(),
    224           OpenBoundaryConditions))
     226          OpenBoundaryConditions)) {
     227        STATUS("Could not create long-range jobs for nuclei charge distribution.");
    225228        return Action::failure;
     229      }
    226230
    227231      // Phase Six b: calculate result
    … …  
    255259        debugcontroller.setPort(params.port.get());
    256260        debugcontroller.requestIds(full_sample.size());
    257         if (!debugcontroller.createDebugJobs(full_sample, OpenBoundaryConditions))
     261        if (!debugcontroller.createDebugJobs(full_sample, OpenBoundaryConditions)) {
     262          STATUS("Could not create debug jobs.");
    258263          return Action::failure;
     264        }
    259265        debugcontroller.waitforResults(full_sample.size());
    260266        debugcontroller.getResults(debugData);
    … …  
    286292  }
    287293
     294  if (Exitflag != 0)
     295    STATUS("Controller has returned failure.");
    288296  return (Exitflag == 0) ? Action::success : Action::failure;
    289297}

  • src/Actions/FragmentationAction/ParseFragmentJobsAction.cpp

    r0b6b77 r26b4d62  
    5353  // check for present jobs
    5454  if (params.jobfiles.get().empty()) {
    55     ELOG(2, "Given vector of jobfiles is empty!");
     55    STATUS("Given vector of jobfiles is empty!");
    5656    return Action::failure;
    5757  }
    … …  
    6060  if(!FragmentJobQueue::getInstance().addJobsFromFiles(
    6161      params.jobfiles.get(),
    62       params.level.get()))
     62      params.level.get())) {
     63    STATUS("Could not parse all given jobs files.");
    6364    return Action::failure;
     65  }
    6466  size_t FragmentCounter = FragmentJobQueue::getInstance().size();
    6567  LOG(1, "STATUS: I parsed " << FragmentCounter << " fragment files.");

  • src/Actions/FragmentationAction/StoreSaturatedFragmentAction.cpp

    r0b6b77 r26b4d62  
    6060  // check for selected atoms
    6161  if (world.beginAtomSelection() == world.endAtomSelection()) {
    62     ELOG(1, "There are not atoms selected for storing.");
     62    STATUS("There are not atoms selected for storing.");
    6363    return Action::failure;
    6464  }

  • src/Actions/GraphAction/DestroyAdjacencyAction.cpp

    r0b6b77 r26b4d62  
    7272  World::AtomComposite Set = World::getInstance().getAllAtoms(AtomsBySelection());
    7373  if (Set.empty()) {
    74     ELOG(2, "No atoms selected.");
     74    STATUS("No atoms selected.");
    7575    return Action::failure;
    7676  }

  • src/Actions/GraphAction/UpdateMoleculesAction.cpp

    r0b6b77 r26b4d62  
    9292  if (World::getInstance().numMolecules() == 0) {
    9393    //World::getInstance().destroyMolecule(mol);
    94     ELOG(1, "There are no molecules.");
     94    STATUS("There are no molecules.");
    9595    return Action::failure;
    9696  }

  • src/Actions/MoleculeAction/BondFileAction.cpp

    r0b6b77 r26b4d62  
    6767    mol->getBondCount();
    6868    return Action::success;
    69   } else
     69  } else {
     70    STATUS("There is not exactly one molecule selected.");
    7071    return Action::failure;
     72  }
    7173}
    7274
    … …  
    7779//  state->mol->setName(state->lastName);
    7880
     81  STATUS("Undo for MoleculeBondFileAction not implemented.");
    7982  return Action::failure;
    8083}
    8184
    8285ActionState::ptr MoleculeBondFileAction::performRedo(ActionState::ptr _state){
     86  STATUS("Redo for MoleculeBondFileAction not implemented.");
    8387  return Action::failure;
    8488}

  • src/Actions/MoleculeAction/ChangeBondAngleAction.cpp

    r0b6b77 r26b4d62  
    120120  const std::vector< atom *> atoms = World::getInstance().getSelectedAtoms();
    121121  if (atoms.size() != 3) {
    122     ELOG(1, "Exactly three atoms must be selected.");
     122    STATUS("Exactly three atoms must be selected.");
    123123    return Action::failure;
    124124  }
    125125  // check precondition: linearly bonded atoms
    126126  const std::vector<size_t> indices = sortIndicesFromCentralAtom(atoms);
    127   if (indices.size() != 3)
     127  if (indices.size() != 3) {
     128    STATUS("Selected atoms must be linearly bonded/form a chain");
    128129    return Action::failure;
     130  }
    129131  const molecule *mol = atoms[0]->getMolecule();
    130132  if ((mol != atoms[1]->getMolecule()) || (mol != atoms[2]->getMolecule())) {
    131     ELOG(1, "The two selected atoms must belong to the same molecule.");
     133    STATUS("The two selected atoms must belong to the same molecule.");
    132134    return Action::failure;
    133135  }

  • src/Actions/MoleculeAction/ChangeNameAction.cpp

    r0b6b77 r26b4d62  
    5757    mol->setName(params.name.get());
    5858    return ActionState::ptr(new MoleculeChangeNameState(mol,params));
    59   } else
     59  } else {
     60    STATUS("There must be exactly one molecule selected.");
    6061    return Action::failure;
     62  }
    6163}
    6264

  • src/Actions/MoleculeAction/FillVoidWithMoleculeAction.cpp

    r0b6b77 r26b4d62  
    6262ActionState::ptr MoleculeFillVoidWithMoleculeAction::performCall() {
    6363  if (!boost::filesystem::exists(params.fillername.get())) {
    64     ELOG(1, "File with filler molecule " << params.fillername.get() << " does not exist!");
     64    STATUS("File with filler molecule "+params.fillername.get().string()+" does not exist!");
    6565    return Action::failure;
    6666  }
    … …  
    152152  //MoleculeFillVoidWithMoleculeState *state = assert_cast<MoleculeFillVoidWithMoleculeState*>(_state.get());
    153153
     154  STATUS("Redo for MoleculeFillVoidWithMoleculeAction not implemented.");
    154155  return Action::failure;
    155156  //return ActionState::ptr(_state);

  • src/Actions/MoleculeAction/FillWithMoleculeAction.cpp

    r0b6b77 r26b4d62  
    156156  //MoleculeFillWithMoleculeState *state = assert_cast<MoleculeFillWithMoleculeState*>(_state.get());
    157157
     158  STATUS("Redo of MoleculeFillWithMoleculeAction not implemented.");
    158159  return Action::failure;
    159160  //return ActionState::ptr(_state);

  • src/Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.cpp

    r0b6b77 r26b4d62  
    7474//  state->mol->setName(state->lastName);
    7575
     76  STATUS("Undo of MoleculeLinearInterpolationofTrajectoriesAction not implemented.");
    7677  return Action::failure;
    7778}

  • src/Actions/MoleculeAction/LoadAction.cpp

    r0b6b77 r26b4d62  
    6060  // parsing file if present
    6161  if (!boost::filesystem::exists(params.filename.get())) {
    62     LOG(1, "Specified input file " << params.filename.get() << " not found.");
     62    STATUS("Specified input file "+params.filename.get().string()+" not found.");
    6363    return Action::failure;
    6464  } else {
    … …  
    7373      FilenamePrefix = params.filename.get().stem().string();
    7474    } else {
    75       ELOG(1, "Input file does not have a suffix, cannot recognize format.");
     75      STATUS("Input file does not have a suffix, cannot recognize format.");
    7676      return Action::failure;
    7777    }

  • src/Actions/MoleculeAction/RotateAroundSelfByAngleAction.cpp

    r0b6b77 r26b4d62  
    5757  // check whether a molecule is selected
    5858  std::vector<molecule *> selectedMolecules = World::getInstance().getSelectedMolecules();
    59   if (selectedMolecules.size() == 0)
     59  if (selectedMolecules.size() == 0) {
     60    STATUS("There are need to be some molecules selected.");
    6061    return Action::failure;
     62  }
    6163
    6264  // go through all selected molecules
    6365  BOOST_FOREACH(molecule *mol, selectedMolecules) {
    6466    // check whether Axis is valid
    65     if (params.Axis.get().IsZero())
     67    if (params.Axis.get().IsZero()) {
     68      STATUS("Rotation Axis must not be zero.");
    6669      return Action::failure;
     70    }
    6771
    6872    // convert from degrees to radian

  • src/Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp

    r0b6b77 r26b4d62  
    7878//  state->mol->setName(state->lastName);
    7979
     80  STATUS("Undo of MoleculeRotateToPrincipalAxisSystemAction not implemented.");
    8081  return Action::failure;
    8182}
    8283
    8384ActionState::ptr MoleculeRotateToPrincipalAxisSystemAction::performRedo(ActionState::ptr _state){
     85  STATUS("Redo of MoleculeRotateToPrincipalAxisSystemAction not implemented.");
    8486  return Action::failure;
    8587}

  • src/Actions/MoleculeAction/SaveAdjacencyAction.cpp

    r0b6b77 r26b4d62  
    8282//  state->mol->setName(state->lastName);
    8383
     84  STATUS("Undo of MoleculeSaveAdjacencyAction not implemented.");
    8485  return Action::failure;
    8586}

  • src/Actions/MoleculeAction/SaveBondsAction.cpp

    r0b6b77 r26b4d62  
    7070//  state->mol->setName(state->lastName);
    7171
     72  STATUS("Undo of MoleculeSaveBondsAction not implemented.");
    7273  return Action::failure;
    7374}

  • src/Actions/MoleculeAction/SaveSelectedMoleculesAction.cpp

    r0b6b77 r26b4d62  
    6363      FilenamePrefix = params.filename.get().stem().string();
    6464  } else {
    65     ELOG(1, "Output file does not have a suffix, cannot recognize format.");
     65    STATUS("Output file does not have a suffix, cannot recognize format.");
    6666    return Action::failure;
    6767  }
    … …  
    7474    FormatParserStorage::getInstance().saveSelectedMolecules(output, FilenameSuffix);
    7575  } else {
    76     ELOG(1, "Could not open file " << params.filename.get() << ".");
     76    STATUS("Could not open file "+params.filename.get().string()+".");
    7777  }
    7878  output.close();
    … …  
    8484//  ParserSaveXyzState *state = assert_cast<ParserSaveXyzState*>(_state.get());
    8585
    86   return Action::failure;
     86  return Action::success;
    8787//  string newName = state->mol->getName();
    8888//  state->mol->setName(state->lastName);
    … …  
    9292
    9393ActionState::ptr MoleculeSaveSelectedMoleculesAction::performRedo(ActionState::ptr _state){
    94   return Action::failure;
     94  return Action::success;
    9595//  // Undo and redo have to do the same for this action
    9696//  return performUndo(_state);

  • src/Actions/MoleculeAction/SaveTemperatureAction.cpp

    r0b6b77 r26b4d62  
    6363  const size_t MDSteps = set.getMaxTrajectorySize();
    6464  OutputTemperature<std::vector<atom *> > writer(set);
    65   if (output.fail() || !writer((ofstream * const) &output, 0, MDSteps))
    66     LOG(2, "File could not be written.");
    67   else
     65  if (output.fail() || !writer((ofstream * const) &output, 0, MDSteps)) {
     66    STATUS("File could not be written.");
     67    return Action::failure;
     68  } else
    6869    LOG(2, "File stored.");
    6970  output.close();
    … …  
    7778//  state->mol->setName(state->lastName);
    7879
    79   return Action::failure;
     80  return Action::success;
    8081}
    8182

  • src/Actions/MoleculeAction/StretchBondAction.cpp

    r0b6b77 r26b4d62  
    5858  const std::vector< atom *> atoms = World::getInstance().getSelectedAtoms();
    5959  if (atoms.size() != 2) {
    60     ELOG(1, "Exactly two atoms must be selected.");
     60    STATUS("Exactly two atoms must be selected.");
    6161    return Action::failure;
    6262  }
    6363  const molecule *mol = atoms[0]->getMolecule();
    6464  if (mol != atoms[1]->getMolecule()) {
    65     ELOG(1, "The two selected atoms must belong to the same molecule.");
     65    STATUS("The two selected atoms must belong to the same molecule.");
    6666    return Action::failure;
    6767  }

  • src/Actions/MoleculeAction/SuspendInWaterAction.cpp

    r0b6b77 r26b4d62  
    7474//  state->mol->setName(state->lastName);
    7575
     76  STATUS("Undo of MoleculeSuspendInWaterAction not implemented.");
    7677  return Action::failure;
    7778}

  • src/Actions/MoleculeAction/VerletIntegrationAction.cpp

    r0b6b77 r26b4d62  
    8989//  state->mol->setName(state->lastName);
    9090
     91  STATUS("Undo of MoleculeVerletIntegrationAction not implemented.");
    9192  return Action::failure;
    9293}
    9394
    9495ActionState::ptr MoleculeVerletIntegrationAction::performRedo(ActionState::ptr _state){
     96  STATUS("Rddo of MoleculeVerletIntegrationAction not implemented.");
    9597  return Action::failure;
    9698}

  • src/Actions/ParserAction/ParseTremoloPotentialsAction.cpp

    r0b6b77 r26b4d62  
    5858  // parsing file if present
    5959  if (!boost::filesystem::exists(params.filename.get())) {
    60     LOG(1, "Specified potentials file " << params.filename.get() << " not found.");
     60    STATUS("Specified potentials file "+params.filename.get().string()+" not found.");
    6161    // DONT FAIL: it's just empty we re-create default id-mapping
    6262    parser.createKnownTypesByIdentity();
    63 
     63    return Action::failure;
    6464  } else {
    6565    LOG(1, "Specified potentials file found, parsing ... ");
    … …  
    7777//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
    7878
     79  STATUS("Undo of ParserParseTremoloPotentialsAction not implemented.");
    7980  return Action::failure;
    8081//  string newName = state->mol->getName();
    … …  
    8586
    8687ActionState::ptr ParserParseTremoloPotentialsAction::performRedo(ActionState::ptr _state){
     88  STATUS("Redo of ParserParseTremoloPotentialsAction not implemented.");
    8789  return Action::failure;
    8890}

  • src/Actions/ParserAction/SaveSelectedAtomsAsExtTypesAction.cpp

    r0b6b77 r26b4d62  
    5656ActionState::ptr ParserSaveSelectedAtomsAsExtTypesAction::performCall() {
    5757  if (boost::filesystem::exists(params.filename.get())) {
    58     ELOG(1, "Specified exttypes file " << params.filename.get() << " already exists.");
     58    STATUS("Specified exttypes file "+params.filename.get().string()+" already exists.");
    5959
    6060    return Action::failure;
    … …  
    7070    if (status)
    7171      return Action::success;
    72     else
     72    else {
     73      STATUS("Failed to write ext file.");
    7374      return Action::failure;
     75    }
    7476  }
    7577}

  • src/Actions/ParserAction/SetOutputFormatsAction.cpp

    r0b6b77 r26b4d62  
    5656  for (vector<std::string>::const_iterator iter = params.FormatList.get().begin(); iter != params.FormatList.get().end(); ++iter) {
    5757    if (!FormatParserStorage::getInstance().add(*iter)) {
    58       ELOG(1, "Unknown parser format in ParserSetOutputFormatsAction: '" << *iter << "'");
     58      STATUS("Unknown parser format in ParserSetOutputFormatsAction: '"+*iter+"'");
    5959      return Action::failure;
    6060    } else {
    … …  
    6868//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
    6969
     70  STATUS("Undo of ParserSetOutputFormatsAction not implemented.");
    7071  return Action::failure;
    7172//  string newName = state->mol->getName();
    … …  
    7677
    7778ActionState::ptr ParserSetOutputFormatsAction::performRedo(ActionState::ptr _state){
     79  STATUS("Redo of ParserSetOutputFormatsAction not implemented.");
    7880  return Action::failure;
    7981}

  • src/Actions/PotentialAction/FitParticleChargesAction.cpp

    r0b6b77 r26b4d62  
    125125  // for the moment just use the very first fragment
    126126  if (range.first == range.second) {
    127     ELOG(1, "HomologyContainer does not contain specified fragment.");
     127    STATUS("HomologyContainer does not contain specified fragment.");
    128128    return Action::failure;
    129129  }
    130130  HomologyContainer::const_iterator iter = range.first;
    131131  if (!iter->second.containsGrids) {
    132     ELOG(2, "This HomologyGraph does not contain sampled grids.");
     132    STATUS("This HomologyGraph does not contain sampled grids.");
    133133    return Action::failure;
    134134  }

  • src/Actions/PotentialAction/FitPotentialAction.cpp

    r0b6b77 r26b4d62  
    131131      } catch (SerializablePotentialMissingValueException &e) {
    132132        if (const std::string *key = boost::get_error_info<SerializablePotentialKey>(e))
    133           ELOG(1, "Missing value when parsing information for potential "
    134               << *key << ".");
     133          STATUS("Missing value when parsing information for potential "+*key+".");
    135134        else
    136           ELOG(1, "Missing value parsing information for potential with unknown key.");
     135          STATUS("Missing value parsing information for potential with unknown key.");
    137136        return Action::failure;
    138137      } catch (SerializablePotentialIllegalKeyException &e) {
    139138        if (const std::string *key = boost::get_error_info<SerializablePotentialKey>(e))
    140           ELOG(1, "Illegal key parsing information for potential "
    141               << *key << ".");
     139          STATUS("Illegal key parsing information for potential "+*key+".");
    142140        else
    143           ELOG(1, "Illegal key parsing information for potential with unknown key.");
     141          STATUS("Illegal key parsing information for potential with unknown key.");
    144142        return Action::failure;
    145143      }
    146144    } else {
    147       ELOG(0, "Failed to parse from " << params.potential_file.get().string() << ".");
     145      STATUS("Failed to parse from "+params.potential_file.get().string()+".");
    148146      return Action::failure;
    149147    }
    … …  
    156154  } else {
    157155    if (params.charges.get().empty()) {
    158       ELOG(1, "Neither charges nor potential file given!");
     156      STATUS("Neither charges nor potential file given!");
    159157      return Action::failure;
    160158    } else {
    … …  
    220218        << fragmentnumbers << " is " << graph << ".");
    221219  } else {
    222     ELOG(1, "Specific fragment " << fragmentnumbers << " not found in homologies!");
     220    STATUS("Specific fragment "+toString(fragmentnumbers)+" not found in homologies!");
    223221    return Action::failure;
    224222  }
    … …  
    301299          << l2error << " are " << model->getParameters() << ".");
    302300    } else {
    303       ELOG(0, "We require parameter derivatives for a box constraint minimization.");
     301      STATUS("No required parameter derivatives for a box constraint minimization known.");
    304302      return Action::failure;
    305303    }

  • src/Actions/PotentialAction/ParseHomologiesAction.cpp

    r0b6b77 r26b4d62  
    8181  if (!params.homology_file.get().empty()) {
    8282    const boost::filesystem::path &homology_file = params.homology_file.get();
    83     if (homology_file.string() != "") {
    84       LOG(1, "INFO: Parsing HomologyGraphs from file " << homology_file.string() << ".");
    85       parseHomologiesFromFile(homology_file);
    86       return Action::success;
    87     }
     83    LOG(1, "INFO: Parsing HomologyGraphs from file " << homology_file.string() << ".");
     84    parseHomologiesFromFile(homology_file);
     85    return Action::success;
     86  } else {
     87    STATUS("Homology file name is empty.");
     88    return Action::failure;
    8889  }
     90}
    8991
     92ActionState::ptr PotentialParseHomologiesAction::performUndo(ActionState::ptr _state) {
     93  STATUS("Undo of PotentialParseHomologiesAction not implemented.");
    9094  return Action::failure;
    9195}
    9296
    93 ActionState::ptr PotentialParseHomologiesAction::performUndo(ActionState::ptr _state) {
    94   return Action::success;
    95 }
    96 
    9797ActionState::ptr PotentialParseHomologiesAction::performRedo(ActionState::ptr _state){
    98   return Action::success;
     98  STATUS("Redo of PotentialParseHomologiesAction not implemented.");
     99  return Action::failure;
    99100}
    100101

  • src/Actions/PotentialAction/SaveHomologiesAction.cpp

    r0b6b77 r26b4d62  
    8383  if (!params.homology_file.get().empty()) {
    8484    const boost::filesystem::path &homology_file = params.homology_file.get();
    85     if (homology_file.string() != "") {
    86       LOG(1, "INFO: Appending HomologyGraphs to file " << homology_file.string() << ".");
    87       if (!writeHomologiesToFile(homology_file))
    88         return Action::failure;
     85    LOG(1, "INFO: Appending HomologyGraphs to file " << homology_file.string() << ".");
     86    if (!writeHomologiesToFile(homology_file)) {
     87      STATUS("Failed to write homology file.");
     88      return Action::failure;
    8989    }
     90    return Action::success;
     91  } else {
     92    STATUS("Homology file name empty.");
     93    return Action::failure;
    9094  }
    91 
    92   return Action::success;
    9395}
    9496

  • src/Actions/SelectionAction/Atoms/AllAtomsInsideVolumeAction.cpp

    r0b6b77 r26b4d62  
    6161  std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
    6262  if (selectedShapes.size() != 1){
    63     ELOG(1, "SelectionAllAtomsInsideVolumeAction::performCall(): there has to be exactly 1 selected shape.");
     63    STATUS("There has to be exactly 1 selected shape.");
    6464    return Action::failure;
    6565  }
    … …  
    7474
    7575  std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
    76   if (selectedShapes.size() != 1)
    77     return Action::failure;
    7876  World::getInstance().unselectAllAtoms(AtomsByShape(*selectedShapes[0]));
    7977  BOOST_FOREACH(atom *_atom, state->selectedAtoms)
    … …  
    8785
    8886  std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
    89   if (selectedShapes.size() != 1)
    90     return Action::failure;
    9187  World::getInstance().selectAllAtoms(AtomsByShape(*selectedShapes[0]));
    9288

  • src/Actions/SelectionAction/Atoms/AtomByIdAction.cpp

    r0b6b77 r26b4d62  
    8585  switch (status) {
    8686    case AtomMissing:
     87      STATUS("Cannot find all atoms with given ids.");
    8788      return Action::failure;
    8889      break;

  • src/Actions/SelectionAction/Atoms/AtomByOrderAction.cpp

    r0b6b77 r26b4d62  
    6565    }
    6666  } else {
     67    STATUS("Cannot find atom by given order of "+toString(params.order.get())+".");
    6768    return Action::failure;
    6869  }

  • src/Actions/SelectionAction/Atoms/NotAllAtomsInsideVolumeAction.cpp

    r0b6b77 r26b4d62  
    6060  std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
    6161  if (selectedShapes.size() != 1){
    62     ELOG(1, "SelectionNotAllAtomsInsideVolumeAction::performCall(): there has to be exactly 1 selected shape.");
     62    STATUS("There has to be exactly 1 selected shape.");
    6363    return Action::failure;
    6464  }
    … …  
    7373
    7474  std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
    75   if (selectedShapes.size() != 1)
    76     return Action::failure;
    7775  World::getInstance().selectAllAtoms(AtomsByShape(*selectedShapes[0]));
    7876  BOOST_FOREACH(atom *_atom, state->unselectedAtoms)
    … …  
    8684
    8785  std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
    88   if (selectedShapes.size() != 1)
    89     return Action::failure;
    9086  World::getInstance().unselectAllAtoms(AtomsByShape(*selectedShapes[0]));
    9187

  • src/Actions/SelectionAction/Atoms/NotAtomByIdAction.cpp

    r0b6b77 r26b4d62  
    8585  switch (status) {
    8686    case AtomMissing:
     87      STATUS("Cannot find all atoms by given ids.");
    8788      return Action::failure;
    8889      break;

  • src/Actions/SelectionAction/Atoms/NotAtomByOrderAction.cpp

    r0b6b77 r26b4d62  
    6565    }
    6666  } else {
     67    STATUS("Cannot find atom by given order of "+toString(params.order.get())+".");
    6768    return Action::failure;
    6869  }

  • src/Actions/SelectionAction/Molecules/MoleculeByIdAction.cpp

    r0b6b77 r26b4d62  
    6464    }
    6565  } else {
     66    STATUS("Cannot find molecule by given index "+toString(params.molindex.get())+".");
    6667    return Action::failure;
    6768  }

  • src/Actions/SelectionAction/Molecules/MoleculeByOrderAction.cpp

    r0b6b77 r26b4d62  
    6666    }
    6767  } else {
     68    STATUS("Cannot find molecule by given index "+toString(params.molindex.get())+".");
    6869    return Action::failure;
    6970  }

  • src/Actions/SelectionAction/Molecules/NotMoleculeByIdAction.cpp

    r0b6b77 r26b4d62  
    6464    }
    6565  } else {
     66    STATUS("Cannot find molecule by given index "+toString(params.molindex.get())+".");
    6667    return Action::failure;
    6768  }

  • src/Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.cpp

    r0b6b77 r26b4d62  
    6666    }
    6767  } else {
     68    STATUS("Cannot find molecule by given index "+toString(params.molindex.get())+".");
    6869    return Action::failure;
    6970  }

  • src/Actions/SelectionAction/Shapes/NotShapeByNameAction.cpp

    r0b6b77 r26b4d62  
    6262    }
    6363  } else {
     64    STATUS("Cannot find shape by given name "+toString(params.shapeName.get())+".");
    6465    return Action::failure;
    6566  }

  • src/Actions/SelectionAction/Shapes/ShapeByNameAction.cpp

    r0b6b77 r26b4d62  
    6262    }
    6363  } else {
     64    STATUS("Cannot find shape by given name "+toString(params.shapeName.get())+".");
    6465    return Action::failure;
    6566  }

  • src/Actions/ShapeAction/CombineShapesAction.cpp

    r0b6b77 r26b4d62  
    6161  if (op == "AND"){
    6262    if (selectedShapes.size() != 2){
    63       ELOG(1, "Operation AND requires exactly 2 selected shapes.");
     63      STATUS("Operation AND requires exactly 2 selected shapes.");
    6464      return Action::failure;
    6565    }
    … …  
    6767  }else if (op == "OR"){
    6868    if (selectedShapes.size() != 2){
    69       ELOG(1, "Operation OR requires exactly 2 selected shapes.");
     69      STATUS("Operation OR requires exactly 2 selected shapes.");
    7070      return Action::failure;
    7171    }
    … …  
    7373  }else if (op == "NOT"){
    7474    if (selectedShapes.size() != 1){
    75       ELOG(1, "Operation NOT requires exactly 1 selected shape.");
     75      STATUS("Operation NOT requires exactly 1 selected shape.");
    7676      return Action::failure;
    7777    }
    … …  
    116116  std::string op = params.shape_op.get();
    117117  if (op == "AND"){
    118     if (selectedShapes.size() != 2){
    119       ELOG(1, "Operation AND requires exactly 2 selected shapes.");
    120       return Action::failure;
    121     }
    122118    s = (*selectedShapes[0]) && (*selectedShapes[1]);
    123119  }else if (op == "OR"){
    124     if (selectedShapes.size() != 2){
    125       ELOG(1, "Operation OR requires exactly 2 selected shapes.");
    126       return Action::failure;
    127     }
    128120    s = (*selectedShapes[0]) || (*selectedShapes[1]);
    129121  }else if (op == "NOT"){
    130     if (selectedShapes.size() != 1){
    131       ELOG(1, "Operation NOT requires exactly 1 selected shape.");
    132       return Action::failure;
    133     }
    134122    s = ! (*selectedShapes[0]);
    135123  }else{

  • src/Actions/TesselationAction/ConvexEnvelopeAction.cpp

    r0b6b77 r26b4d62  
    7272    //FindConvexBorder(mol, BoundaryPoints, TesselStruct, LCList, argv[argptr]);
    7373    // TODO: Beide Funktionen sollten streams anstelle des Filenamen benutzen, besser fuer unit tests
    74     FindNonConvexBorder(mol, TesselStruct, LCList, 50., params.filenameNonConvex.get().string().c_str());
     74    Success &= FindNonConvexBorder(mol, TesselStruct, LCList, 50., params.filenameNonConvex.get().string().c_str());
    7575    //RemoveAllBoundaryPoints(TesselStruct, mol, argv[argptr]);
    7676    const double volumedifference = ConvexizeNonconvexEnvelope(TesselStruct, mol, params.filenameConvex.get().string().c_str());
    … …  
    8383  if (Success)
    8484    return Action::success;
    85   else
     85  else {
     86    STATUS("Failed to find the non convex border.");
    8687    return Action::failure;
     88  }
    8789}
    8890
    … …  
    9395//  state->mol->setName(state->lastName);
    9496
     97  STATUS("Undo of TesselationConvexEnvelopeAction not implemented.");
    9598  return Action::failure;
    9699}

  • src/Actions/TesselationAction/NonConvexEnvelopeAction.cpp

    r0b6b77 r26b4d62  
    8888//  state->mol->setName(state->lastName);
    8989
     90  STATUS("Undo of TesselationNonConvexEnvelopeAction not implemented.");
    9091  return Action::failure;
    9192}

  • src/Actions/WorldAction/AddEmptyBoundaryAction.cpp

    r0b6b77 r26b4d62  
    117117    return ActionState::ptr(UndoState);
    118118  } else {
    119     ELOG(2, "There must be atoms present for AddingEmptyBoundary.");
     119    STATUS("There must be atoms present for AddingEmptyBoundary.");
    120120    return Action::failure;
    121121  }

  • src/Actions/WorldAction/CenterOnEdgeAction.cpp

    r0b6b77 r26b4d62  
    8080  // get maximum and minimum
    8181  if (AllAtoms.empty()) {
    82     ELOG(2, "For WorldCenterOnEdgeAction atoms must be present.");
     82    STATUS("There are no atoms present.");
    8383    return Action::failure;
    8484  }

  • src/Actions/WorldAction/InputAction.cpp

    r0b6b77 r26b4d62  
    7272    parsers.SetOutputPrefixForAll(FilenamePrefix);
    7373  } else {
    74     ELOG(1, "Input file does not have a suffix, cannot recognize format.");
     74    STATUS("Input file does not have a suffix, cannot recognize format.");
    7575    return Action::failure;
    7676  }
    … …  
    103103//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
    104104
     105  STATUS("Undo of WorldInputAction not implemented.");
    105106  return Action::failure;
    106107//  string newName = state->mol->getName();
    … …  
    111112
    112113ActionState::ptr WorldInputAction::performRedo(ActionState::ptr _state){
     114  STATUS("Redo of WorldInputAction not implemented.");
    113115  return Action::failure;
    114116}

  • src/Actions/WorldAction/OutputAction.cpp

    r0b6b77 r26b4d62  
    6060  // Parser configured to save anything?
    6161  if (!FormatParserStorage::getInstance().isAbleToSave()){
    62     ELOG(1, "No parser or file prefix selected.");
     62    STATUS("No parser or file prefix selected.");
    6363    return Action::failure;
    6464  }
    … …  
    7373//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
    7474
     75  STATUS("Undo of WorldOutputAction not implemented.");
    7576  return Action::failure;
    7677//  string newName = state->mol->getName();
    … …  
    8182
    8283ActionState::ptr WorldOutputAction::performRedo(ActionState::ptr _state){
     84  STATUS("Redo of WorldOutputAction not implemented.");
    8385  return Action::failure;
    8486}

  • src/Actions/WorldAction/OutputAsAction.cpp

    r0b6b77 r26b4d62  
    6464    FilenamePrefix = params.filename.get().stem().string();
    6565  } else {
    66     ELOG(1, "Output file does not have a suffix, cannot recognize format.");
     66    STATUS("Output file does not have a suffix, cannot recognize format.");
    6767    return Action::failure;
    6868  }
    … …  
    7575    FormatParserStorage::getInstance().saveWorld(output, FilenameSuffix);
    7676  } else {
    77     ELOG(1, "Could not open file " << params.filename.get() << ".");
     77    STATUS("Could not open file "+params.filename.get().string()+".");
     78    return Action::failure;
    7879  }
    7980  output.close();
    … …  
    8586//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
    8687
     88  STATUS("Undo of WorldOutputAsAction not implemented.");
    8789  return Action::failure;
    8890//  string newName = state->mol->getName();
    … …  
    9395
    9496ActionState::ptr WorldOutputAsAction::performRedo(ActionState::ptr _state){
     97  STATUS("Redo of WorldOutputAsAction not implemented.");
    9598  return Action::failure;
    9699}
Note: See TracChangeset for help on using the changeset viewer.