Changes in src/Actions/CommandAction/BondLengthTableAction.cpp [b1ac7a:ce7fdc]

File:

• src/Actions/CommandAction/BondLengthTableAction.cpp (modified) (5 diffs)

src/Actions/CommandAction/BondLengthTableAction.cpp

@@ -17 +17 @@
 #include <config.h>
 #endif
-
-// include headers that implement a archive in simple text format
-#include <boost/archive/text_oarchive.hpp>
-#include <boost/archive/text_iarchive.hpp>
 
 #include "CodePatterns/MemDebug.hpp"
@@ -48 +44 @@
 
   DoLog(0) && (Log() << Verbose(0) << "Using " << params.BondGraphFileName << " as bond length table." << endl);
-  BondGraph *&BG = World::getInstance().getBondGraph();
+  config *configuration = World::getInstance().getConfig();
+  BondGraph *OldBG = World::getInstance().getBondGraph();
 
-  // create undo state
-  std::stringstream undostream;
-  boost::archive::text_oarchive oa(undostream);
-  oa << BG;
-  CommandBondLengthTableState *UndoState =
-      new CommandBondLengthTableState(
-          undostream.str(),
-          params
-      );
-
-  BG->CleanupBondLengthTable();
+  BondGraph *BG = new BondGraph(configuration->GetIsAngstroem());
   if ((!params.BondGraphFileName.empty())
       && boost::filesystem::exists(params.BondGraphFileName)) {
@@ -67 +54 @@
       DoLog(0) && (Log() << Verbose(0) << "Bond length table parsed successfully." << endl);
       input.close();
-      return Action::state_ptr(UndoState);
+      CommandBondLengthTableState *state = new CommandBondLengthTableState(*OldBG, params);
+      World::getInstance().setBondGraph(BG);  // Changes OldBG, hence have to copy beforehand
+      return Action::state_ptr(state);
     } else {
       DoeLog(1) && (eLog()<< Verbose(1) << "Bond length table parsing failed." << endl);
       input.close();
+      return Action::failure;
     }
   } else {
     DoeLog(1) && (eLog()<< Verbose(1) << "Bond length table loading failed." << endl);
+    return Action::failure;
   }
-  // recover bond graph
-  boost::archive::text_iarchive ia(undostream);
-  delete BG;
-  ia >> BG;
-  delete UndoState;
-  return Action::failure;
 }
 
@@ -86 +71 @@
   CommandBondLengthTableState *state = assert_cast<CommandBondLengthTableState*>(_state.get());
 
-  BondGraph *BG;
-  std::stringstream undostream(state->undostring);
-  boost::archive::text_iarchive ia(undostream);
-  ia >> BG;
-  World::getInstance().setBondGraph(BG);
+  BondGraph *OldBG = World::getInstance().getBondGraph();
+  CommandBondLengthTableState *restate = new CommandBondLengthTableState(*OldBG, params);
+  World::getInstance().setBondGraph(new BondGraph(state->OldBG));  // Changes OldBG, hence have to copy beforehand
 
-  return Action::state_ptr(_state);
+  return Action::state_ptr(restate);
 }
 
@@ -98 +81 @@
   CommandBondLengthTableState *state = assert_cast<CommandBondLengthTableState*>(_state.get());
 
-  BondGraph *&BG = World::getInstance().getBondGraph();
-  BG->CleanupBondLengthTable();
-  std::ifstream input(state->params.BondGraphFileName.string().c_str());
-  if ((input.good()) && (BG->LoadBondLengthTable(input))) {
-    DoLog(0) && (Log() << Verbose(0) << "Bond length table parsed successfully." << endl);
-    input.close();
-  }
+  BondGraph *OldBG = World::getInstance().getBondGraph();
+  CommandBondLengthTableState *restate = new CommandBondLengthTableState(*OldBG, params);
+  World::getInstance().setBondGraph(new BondGraph(state->OldBG));  // Changes OldBG, hence have to copy beforehand
 
-  return Action::state_ptr(_state);
+  return Action::state_ptr(restate);
 }
 
 bool CommandBondLengthTableAction::canUndo() {
-  return true;
+  return false;
 }
 
 bool CommandBondLengthTableAction::shouldUndo() {
-  return true;
+  return false;
 }
 /** =========== end of function ====================== */