Changes in src/Actions/AtomAction/TranslateAction.cpp [34c338:bcf653]

File:

• src/Actions/AtomAction/TranslateAction.cpp (modified) (6 diffs)

src/Actions/AtomAction/TranslateAction.cpp ¶

@@ +1 @@
+/*
+ * Project: MoleCuilder
+ * Description: creates and alters molecular systems
+ * Copyright (C)  2010 University of Bonn. All rights reserved.
+ * Please see the LICENSE file or "Copyright notice" in builder.cpp for details.
+ */
+
 /*
  * TranslateAction.cpp
@@ -5 +12 @@
  *      Author: heber
  */
+
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "Helpers/MemDebug.hpp"
@@ -32 +44 @@
 class AtomTranslateState : public ActionState {
 public:
-  AtomTranslateState(std::vector<atom*> _selectedAtoms, Vector &_v) :
+  AtomTranslateState(const std::vector<atom*> &_selectedAtoms, const Vector &_v, const bool _periodic) :
     selectedAtoms(_selectedAtoms),
-    v(_v)
+    v(_v),
+    periodic(_periodic)
   {}
   std::vector<atom*> selectedAtoms;
   Vector v;
+  bool periodic;
 };
 
@@ -49 +63 @@
 {}
 
-void AtomTranslate(Vector &x) {
+void AtomTranslate(Vector &x, bool periodic = false) {
   ValueStorage::getInstance().setCurrentValue(AtomTranslateAction::NAME, x);
+  ValueStorage::getInstance().setCurrentValue("periodic", periodic);
   ActionRegistry::getInstance().getActionByName(AtomTranslateAction::NAME)->call(Action::NonInteractive);
 };
@@ -58 +73 @@
 
   dialog->queryVector(NAME, false, ValueStorage::getInstance().getDescription(NAME));
+  dialog->queryBoolean("periodic", ValueStorage::getInstance().getDescription("periodic"));
 
   return dialog;
@@ -64 +80 @@
 Action::state_ptr AtomTranslateAction::performCall() {
   Vector v;
+  bool periodic = false;
+  Box &domain = World::getInstance().getDomain();
   std::vector<atom *> selectedAtoms = World::getInstance().getSelectedAtoms();
 
   ValueStorage::getInstance().queryCurrentValue(NAME, v);
+  if (!ValueStorage::getInstance().queryCurrentValue("periodic", periodic, true))
+    periodic = false;
 
   // TODO: use AtomSet::translate
   for (std::vector<atom *>::iterator iter = selectedAtoms.begin(); iter != selectedAtoms.end(); ++iter) {
     *(*iter) += v;
+    if (periodic)
+      (*iter)->setPosition(domain.WrapPeriodically((*iter)->getPosition()));
   }
-  return Action::state_ptr(new AtomTranslateState(selectedAtoms, v));
+
+  return Action::state_ptr(new AtomTranslateState(selectedAtoms, v, periodic));
 }
 
 Action::state_ptr AtomTranslateAction::performUndo(Action::state_ptr _state) {
   AtomTranslateState *state = assert_cast<AtomTranslateState*>(_state.get());
+  Box &domain = World::getInstance().getDomain();
 
   for (std::vector<atom *>::iterator iter = state->selectedAtoms.begin(); iter != state->selectedAtoms.end(); ++iter) {
     *(*iter) -= state->v;
+    if (state->periodic)
+      (*iter)->setPosition(domain.WrapPeriodically((*iter)->getPosition()));
   }
 
-  return Action::state_ptr(new AtomTranslateState(state->selectedAtoms, state->v));
+  return Action::state_ptr(_state);
 }
 
 Action::state_ptr AtomTranslateAction::performRedo(Action::state_ptr _state){
   AtomTranslateState *state = assert_cast<AtomTranslateState*>(_state.get());
+  Box &domain = World::getInstance().getDomain();
 
   for (std::vector<atom *>::iterator iter = state->selectedAtoms.begin(); iter != state->selectedAtoms.end(); ++iter) {
     *(*iter) += state->v;
+    if (state->periodic)
+      (*iter)->setPosition(domain.WrapPeriodically((*iter)->getPosition()));
   }
 
-  return Action::state_ptr(new AtomTranslateState(state->selectedAtoms, state->v));
+  return Action::state_ptr(_state);
 }