Changes in / [3fa16b:08d042]

Location:

src

Files:

• Actions/MoleculeAction/RotateAroundSelfByAngleAction.cpp (modified) (3 diffs)
• UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp (modified) (1 diff)
• UIElements/Views/Qt4/QtInfoBox.cpp (modified) (3 diffs)
• UIElements/Views/Qt4/QtStatusBar.cpp (modified) (1 diff)

src/Actions/MoleculeAction/RotateAroundSelfByAngleAction.cpp

@@ -62 +62 @@
   }
 
-  // check whether Axis is valid
-  if (params.Axis.get().IsZero()) {
-    STATUS("Rotation Axis must not be zero.");
-    return Action::failure;
-  }
-
-  // convert from degrees to radian
-  const double angle_radian = params.angle.get() * M_PI/180.;
-
   // go through all selected molecules
   BOOST_FOREACH(molecule *mol, selectedMolecules) {
+    // check whether Axis is valid
+    if (params.Axis.get().IsZero()) {
+      STATUS("Rotation Axis must not be zero.");
+      return Action::failure;
+    }
+
+    // convert from degrees to radian
+    params.angle.set(params.angle.get() * M_PI/180.);
+
     // Creation Line that is the rotation axis
     const Vector CenterOfGravity = mol->DetermineCenterOfGravity();
-    LOG(3, "DEBUG: Center of gravity is " << CenterOfGravity << ".");
+    LOG(0,  "Center of gravity is " << CenterOfGravity << ".");
     Line RotationAxis(CenterOfGravity, params.Axis.get());
-    LOG(2, "DEBUG: Rotate " << mol->getName() << " around self by " << angle_radian << " radian around axis " << RotationAxis << ".");
+    LOG(0, "Rotate " << mol->getName() << " around self by " << params.angle.get() << " radian around axis " << RotationAxis << ".");
 
     for (molecule::iterator iter = mol->begin(); iter != mol->end(); ++iter) {
-      (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), angle_radian));
+      (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), params.angle.get()));
     }
-    LOG(2, "DEBUG: Rotatating of " << mol->getName() << " done.");
+    LOG(0, "done.");
   }
 
@@ -91 +91 @@
   MoleculeRotateAroundSelfByAngleState *state = assert_cast<MoleculeRotateAroundSelfByAngleState*>(_state.get());
 
-  // convert from degrees to radian
-  const double angle_radian = -state->params.angle.get() * M_PI/180.;
-
   BOOST_FOREACH(molecule *mol, state->selectedMolecules) {
     const Vector CenterOfGravity = mol->DetermineCenterOfGravity();
     LOG(0,  "Center of gravity is " <<CenterOfGravity << ".");
     Line RotationAxis(CenterOfGravity, state->params.Axis.get());
-    LOG(0, "Rotate " << mol->getName() << " around self by " << angle_radian << " radian around axis " << RotationAxis << ".");
+    LOG(0, "Rotate " << mol->getName() << " around self by " << -state->params.angle.get() << " radian around axis " << RotationAxis << ".");
 
-    for (molecule::iterator iter = mol->begin(); iter != mol->end(); ++iter)
-      (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), angle_radian));
+    for (molecule::iterator iter = mol->begin(); iter != mol->end(); ++iter) {
+      (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), -state->params.angle.get()));
+    }
   }
 
@@ -110 +108 @@
   MoleculeRotateAroundSelfByAngleState *state = assert_cast<MoleculeRotateAroundSelfByAngleState*>(_state.get());
 
-  // convert from degrees to radian
-  const double angle_radian = state->params.angle.get() * M_PI/180.;
-
   BOOST_FOREACH(molecule *mol, state->selectedMolecules) {
     const Vector CenterOfGravity = mol->DetermineCenterOfGravity();
     LOG(0,  "Center of gravity is " << CenterOfGravity << ".");
     Line RotationAxis(CenterOfGravity, state->params.Axis.get());
-    LOG(0, "Rotate " << mol->getName() << " around self by " << angle_radian << " radian around axis " << RotationAxis << ".");
+    LOG(0, "Rotate " << mol->getName() << " around self by " << state->params.angle.get() << " radian around axis " << RotationAxis << ".");
 
-    for (molecule::iterator iter = mol->begin(); iter != mol->end(); ++iter)
-      (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), angle_radian));
+    for (molecule::iterator iter = mol->begin(); iter != mol->end(); ++iter) {
+      (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), state->params.angle.get()));
+    }
   }
 

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp

@@ -464 +464 @@
       +" does not have a groupitem?");
   QList<QStandardItem *> mol_row = _molitem->parent()->takeRow(_molitem->index().row());
-  // call setOccurrence on the old group later, if it's not a removal candidate
-  if (groupitem->rowCount() != 0)
-    addToBeSetOccurrence(groupitem);
+  // call setOccurrence on the old group later
+  addToBeSetOccurrence(groupitem);
   // ..  and re-add where new formula fits
   const std::string molecule_formula = _molitem->getMolecule()->getFormula().toString();

src/UIElements/Views/Qt4/QtInfoBox.cpp

@@ -57 +57 @@
 
   setMinimumWidth(200);
-  setMinimumHeight(220);
+  setMinimumHeight(200);
   currentPage = 0;
 
@@ -178 +178 @@
   addInfo(this, "Mass", QString("%1").arg(atomRef->getMass()));
   addInfo(this, "Charge", QString("%1").arg(atomRef->getCharge()));
+  addInfo(this, "Position", QString(toString(atomRef->getPosition()).c_str()));
   addInfo(this, "Bonds", QString("%1").arg(atomRef->getListOfBonds().size()));
-  addInfo(this, "Position x", QString(toString(atomRef->getPosition()[0]).c_str()));
-  addInfo(this, "Position y", QString(toString(atomRef->getPosition()[1]).c_str()));
-  addInfo(this, "Position z", QString(toString(atomRef->getPosition()[2]).c_str()));
 }
 
@@ -220 +218 @@
   addInfo(this, "Formula", QString(mol->getFormula().toString().c_str()));
   addInfo(this, "Atoms", QString("%1").arg(mol->getAtomCount()));
-  addInfo(this, "NonHydrogens", QString("%1").arg(mol->getNoNonHydrogen()));
   addInfo(this, "Bonds", QString("%1").arg(mol->getBondCount()));
-  const Vector molCenter = mol->DetermineCenterOfAll();
-  addInfo(this, "Center x", QString("%1").arg(molCenter[0]));
-  addInfo(this, "Center y", QString("%1").arg(molCenter[1]));
-  addInfo(this, "Center z", QString("%1").arg(molCenter[2]));
 }
 

src/UIElements/Views/Qt4/QtStatusBar.cpp

@@ -65 +65 @@
   StatusList_signedOn(false),
   timer(NULL),
-  timer_interval(4000)
+  timer_interval(1500)
 {
   World::getInstance().signOn(this);