Changeset 88c8ec for src/UIElements/Views/Qt4

Timestamp:

Jan 17, 2013, 10:59:15 PM (12 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:

c8302f3

Parents:

d6b6ce

git-author:

Frederik Heber <heber@…> (10/29/12 00:28:46)

git-committer:

Frederik Heber <heber@…> (01/17/13 22:59:15)

Message:

REFACTOR: Replaced all "bond *" appearances by bond::ptr.

• this is preparatory for making bond::ptr a boost::shared_ptr of bond.
• NOTE: We had to remove a const prefix at four or five places and forward declarations had to be replaced by the true inclusion of bond.hpp at tne or so files. Apart from that, the replacement has been very smooth.

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLMoleculeObject_atom.cpp (modified) (1 diff)
• GLMoleculeObject_atom.hpp (modified) (2 diffs)
• GLMoleculeObject_bond.cpp (modified) (1 diff)
• GLMoleculeObject_bond.hpp (modified) (3 diffs)
• GLWorldScene.cpp (modified) (5 diffs)
• GLWorldScene.hpp (modified) (2 diffs)

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

@@ -178 +178 @@
           ASSERT(!_atom->getListOfBonds().empty(),
               "GLMoleculeObject_atom::recieveNotification() - received BondsAdded but ListOfBonds is empty.");
-          const bond * _bond = *(_atom->getListOfBonds().rbegin());
+          const bond::ptr _bond = *(_atom->getListOfBonds().rbegin());
           const GLMoleculeObject_bond::SideOfBond side = (_bond->leftatom == _atom) ?
               GLMoleculeObject_bond::left : GLMoleculeObject_bond::right;

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

@@ -18 +18 @@
 #include "CodePatterns/Observer/Observer.hpp"
 
+#include "Bond/bond.hpp"
 #include "GLMoleculeObject_bond.hpp"
 
 class atom;
-class bond;
 
 class GLMoleculeObject_atom : public GLMoleculeObject, public Observer
@@ -40 +40 @@
 signals:
   void clicked(atomId_t);
-  void BondsInserted(const bond *_bond, const GLMoleculeObject_bond::SideOfBond side);
+  void BondsInserted(const bond::ptr _bond, const GLMoleculeObject_bond::SideOfBond side);
   void indexChanged(GLMoleculeObject_atom *ob, int oldId, int newId);
 

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

@@ -54 +54 @@
 #include "LinearAlgebra/Vector.hpp"
 
-GLMoleculeObject_bond::GLMoleculeObject_bond(QGLSceneNode *mesh[], QObject *parent, const bond *bondref, const enum SideOfBond side) :
+GLMoleculeObject_bond::GLMoleculeObject_bond(QGLSceneNode *mesh[], QObject *parent, const bond::ptr bondref, const enum SideOfBond side) :
   GLMoleculeObject(mesh, parent),
   Observer(std::string("GLMoleculeObject_bond")

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

@@ -18 +18 @@
 #include "CodePatterns/Observer/Observer.hpp"
 
+#include "Bond/bond.hpp"
 #include "types.hpp"
 
-class bond;
 
 class GLMoleculeObject_bond : public GLMoleculeObject, public Observer
@@ -28 +28 @@
   enum SideOfBond { left, right };
 
-  GLMoleculeObject_bond(QGLSceneNode *mesh[], QObject *parent, const bond *bondref, const enum SideOfBond side);
+  GLMoleculeObject_bond(QGLSceneNode *mesh[], QObject *parent, const bond::ptr bondref, const enum SideOfBond side);
   virtual ~GLMoleculeObject_bond();
 
@@ -41 +41 @@
 private:
   void resetPosition();
-  const bond *_bond;
+  bond::ptr _bond;
   const enum SideOfBond BondSide;
 };

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

@@ -127 +127 @@
             bonditer != bondlist.end();
             ++bonditer) {
-          const bond *_bond = *bonditer;
+          const bond::ptr _bond = *bonditer;
           const GLMoleculeObject_bond::SideOfBond side = (_bond->leftatom == *atomiter) ?
               GLMoleculeObject_bond::left : GLMoleculeObject_bond::right;
@@ -154 +154 @@
   connect (atomObject, SIGNAL(hoverChanged(GLMoleculeObject *)), this, SLOT(hoverChangedSignalled(GLMoleculeObject *)));
   connect (atomObject, SIGNAL(selectionChanged()), this, SIGNAL(changed()));
-  connect (atomObject, SIGNAL(BondsInserted(const bond *, const GLMoleculeObject_bond::SideOfBond)), this, SLOT(bondInserted(const bond *, const GLMoleculeObject_bond::SideOfBond)));
+  connect (atomObject, SIGNAL(BondsInserted(const bond::ptr , const GLMoleculeObject_bond::SideOfBond)), this, SLOT(bondInserted(const bond::ptr , const GLMoleculeObject_bond::SideOfBond)));
   connect (atomObject, SIGNAL(indexChanged(GLMoleculeObject_atom*, int, int)), this, SLOT(changeAtomId(GLMoleculeObject_atom*, int, int)));
   //bondsChanged(_atom);
@@ -244 +244 @@
  * @param side which side of the bond (left or right)
  */
-void GLWorldScene::bondInserted(const bond *_bond, const enum GLMoleculeObject_bond::SideOfBond side)
+void GLWorldScene::bondInserted(const bond::ptr _bond, const enum GLMoleculeObject_bond::SideOfBond side)
 {
   LOG(3, "INFO: GLWorldScene::bondInserted() - Adding bond "+toString(*_bond)+".");
@@ -263 +263 @@
       "GLWorldScene::bondAdded() - same left-sided bond "+toString(*_bond)+" added again.");
 #endif
-  GLMoleculeObject_bond *bondObject =
+  GLMoleculeObject_bond * bondObject =
       new GLMoleculeObject_bond(meshCylinder, this, _bond, side);
   connect (
@@ -288 +288 @@
         "GLWorldScene::bondRemoved() - bond "+toString(leftnr)+"-"
         +toString(rightnr)+" not on display.");
-    //GLMoleculeObject_bond *bondObject = leftiter->second;
+    //GLMoleculeObject_bond::ptr bondObject = leftiter->second;
     BondsinSceneMap.erase(leftiter);
     //delete bondObject; // is done by signal from bond itself

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

@@ -20 +20 @@
 #include <iosfwd>
 
+#include "Bond/bond.hpp"
 #include "GLMoleculeObject_bond.hpp"
 #include "GLMoleculeObject_molecule.hpp"
@@ -81 +82 @@
   void moleculeRemoved(const molecule *_molecule);
   void worldSelectionChanged();
-  void bondInserted(const bond *_bond, const GLMoleculeObject_bond::SideOfBond side);
+  void bondInserted(const bond::ptr _bond, const GLMoleculeObject_bond::SideOfBond side);
   void bondRemoved(const atomId_t leftnr, const atomId_t rightnr);
   void setSelectionModeAtom();