Changeset 57a770 for src/UIElements

Timestamp:

Jan 4, 2012, 2:28:40 PM (13 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, 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:

b75386

Parents:

0aa122

git-author:

Frederik Heber <heber@…> (01/04/12 13:26:47)

git-committer:

Frederik Heber <heber@…> (01/04/12 14:28:40)

Message:

Corrected verbosity levels of GLMoleculeObject..., GLWorldScene, and ..View.

• placede messages from Observer's to observerLog.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject_atom.cpp (modified) (7 diffs)
• GLMoleculeObject_bond.cpp (modified) (2 diffs)
• GLWorldScene.cpp (modified) (7 diffs)
• GLWorldView.cpp (modified) (2 diffs)

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp

@@ -56 +56 @@
   resetProperties();
 
-  std::cout << "Created sphere for atom " << _atom->getId() << "." << endl;
+  LOG(2, "INFO: Created sphere for atom " << _atom->getId() << ".");
 
   connect( this, SIGNAL(clicked()), this, SLOT(wasClicked()));
@@ -71 +71 @@
 void GLMoleculeObject_atom::update(Observable *publisher)
 {
-  LOG(0, "GLMoleculeObject_atom::update() - called fro atom "+toString(_atom->getId())+".");
+#ifdef LOG_OBSERVER
+  observerLog().addMessage() << "++ Update of Observer " << observerLog().getName(this) << " from atom "+toString(_atom->getId())+".";
+#endif
   resetProperties();
 }
@@ -78 +80 @@
 {
   const Vector Position = _atom->getPosition();
-  LOG(1, "GLMoleculeObject_atom::resetIndex() - new position is "+toString(Position)+".");
+  LOG(4, "INFO: GLMoleculeObject_atom::resetIndex() - new position is "+toString(Position)+".");
   setPosition(QVector3D(Position[0], Position[1], Position[2]));
 }
@@ -90 +92 @@
     elementno = 1;
   }
-  LOG(1, "GLMoleculeObject_atom::resetIndex() - new element number is "+toString(elementno)+".");
+  LOG(4, "INFO: GLMoleculeObject_atom::resetIndex() - new element number is "+toString(elementno)+".");
 
   // set materials
@@ -115 +117 @@
 {
   const size_t atomno = _atom->getId();
-  LOG(1, "GLMoleculeObject_atom::resetIndex() - new index is "+toString(atomno)+".");
+  LOG(4, "INFO: GLMoleculeObject_atom::resetIndex() - new index is "+toString(atomno)+".");
   setObjectId(atomno);
 }
@@ -136 +138 @@
 void GLMoleculeObject_atom::recieveNotification(Observable *publisher, Notification_ptr notification)
 {
-  LOG(0, "GLMoleculeObject_atom::recieveNotification() - atom "
-      +toString(_atom->getId())+" got notification type "
-      +toString(notification->getChannelNo())+".");
+#ifdef LOG_OBSERVER
+  observerLog().addMessage() << "++ Update of Observer "<< observerLog().getName(this)
+      << " received notification from atom " << _atom->getId() << " for channel "
+      << notification->getChannelNo() << ".";
+#endif
   switch (notification->getChannelNo()) {
     case AtomObservable::ElementChanged:
@@ -160 +164 @@
 void GLMoleculeObject_atom::wasClicked()
 {
-  qDebug("GLMoleculeObject_atom: atom %d has been clicked", _atom->getId());
+  LOG(4, "INFO: GLMoleculeObject_atom: atom " << _atom->getId() << " has been clicked");
   emit clicked(_atom->getId());
 }

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.cpp

@@ -30 +30 @@
 
 #include "CodePatterns/Assert.hpp"
+#include "CodePatterns/Log.hpp"
 #include "Atom/atom.hpp"
 #include "Bond/bond.hpp"
@@ -104 +105 @@
   // check
   Vector a_rotated = axis.rotateVector(a, alpha);
-  std::cout << "Created cylinder from "// << Position << " to " << OtherPosition
-      << a << " to " << a_rotated << " around " << b << " by " << alpha/M_PI*180. << ", respectively." << endl;
+  LOG(3, "INFO: Created cylinder from "// << Position << " to " << OtherPosition
+      << a << " to " << a_rotated << " around " << b << " by " << alpha/M_PI*180. << ", respectively.");
 
   // set position

src/UIElements/Views/Qt4/Qt3D/GLWorldScene.cpp

@@ -86 +86 @@
 void GLWorldScene::atomInserted(const atom *_atom)
 {
-  LOG(0, "GLWorldScene: Received signal atomInserted for atom "+toString(_atom->getId())+".");
+  LOG(3, "INFO: GLWorldScene: Received signal atomInserted for atom "+toString(_atom->getId())+".");
   GLMoleculeObject_atom *atomObject = new GLMoleculeObject_atom(this, _atom);
   AtomNodeMap::iterator iter = AtomsinSceneMap.find(_atom->getId());
@@ -105 +105 @@
 void GLWorldScene::atomRemoved(const atom *_atom)
 {
-  LOG(0, "GLWorldScene: Received signal atomRemoved for atom "+toString(_atom->getId())+".");
+  LOG(3, "INFO: GLWorldScene: Received signal atomRemoved for atom "+toString(_atom->getId())+".");
   // remove all its bonds
   const BondList& bondlist = _atom->getListOfBonds();
@@ -145 +145 @@
     presentBonds.insert( otherid );
   }
-  LOG(0, "We have the following bonds: "+toString(presentBonds)+".");
+  LOG(3, "INFO: We have the following bonds: "+toString(presentBonds)+".");
 
   // search for added bonds
@@ -169 +169 @@
     }
   }
-  LOG(0, "The following bonds should not be present: "+toString(presentBonds)+".");
+  if (!presentBonds.empty())
+    ELOG(2, "The following bonds should not be present: "+toString(presentBonds)+".");
 
   // remove all still presentBonds
@@ -184 +185 @@
 void GLWorldScene::bondInserted(const bond *_bond)
 {
-  LOG(0, "GLWorldScene::bondInserted() - Adding bond "+toString(*_bond)+".");
+  LOG(3, "INFO: GLWorldScene::bondInserted() - Adding bond "+toString(*_bond)+".");
   const double distance =
       _bond->leftatom->getPosition().distance(_bond->rightatom->getPosition())/2.;
@@ -218 +219 @@
 void GLWorldScene::bondRemoved(const atomId_t leftnr, const atomId_t rightnr)
 {
-  LOG(0, "GLWorldScene::bondRemoved() - Removing bond between "+toString(leftnr)+" and "+toString(leftnr)+".");
+  LOG(3, "INFO: GLWorldScene::bondRemoved() - Removing bond between "+toString(leftnr)+" and "+toString(leftnr)+".");
   {
     // left bond
@@ -268 +269 @@
 void GLWorldScene::atomClicked(atomId_t no)
 {
-   qDebug("GLWorldScene: atom %d has been clicked.", no);
+   LOG(3, "INFO: GLWorldScene - atom " << no << " has been clicked.");
    const atom *Walker = World::getInstance().getAtom(AtomById(no));
    if (!World::getInstance().isSelected(Walker))

src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp

@@ -83 +83 @@
     {
       const atom *_atom = World::getInstance().lastChanged<atom>();
-      LOG(0, "GLWorldView: Received notification that atom "+toString(_atom->getId())+" has been inserted.");
+#ifdef LOG_OBSERVER
+      observerLog().addMessage() << "++ Observer " << observerLog().getName(this) << " received notification that atom "+toString(_atom->getId())+" has been inserted.";
+#endif
       emit atomInserted(_atom);
       break;
@@ -90 +92 @@
     {
       const atom *_atom = World::getInstance().lastChanged<atom>();
-      LOG(0, "GLWorldView: Received notification that atom "+toString(_atom->getId())+" has been removed.");
+#ifdef LOG_OBSERVER
+      observerLog().addMessage() << "++ Observer " << observerLog().getName(this) << " received notification that atom "+toString(_atom->getId())+" has been removed.";
+#endif
       emit atomRemoved(_atom);
       break;