Changeset e8c636 for src

Timestamp:

Jul 17, 2012, 12:17:23 PM (13 years ago)

Author:

Michael Ankele <ankele@…>

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:

585f78

Parents:

d1196d

git-author:

Michael Ankele <ankele@…> (05/04/12 14:24:06)

git-committer:

Michael Ankele <ankele@…> (07/17/12 12:17:23)

Message:

REFACTORING: moved drawDomainBox()/drawDreiBein() from GLWorldScene to GLWorldView

Location:

src/UIElements/Views/Qt4/Qt3D

Files:

• GLWorldScene.cpp (modified) (4 diffs)
• GLWorldScene.hpp (modified) (2 diffs)
• GLWorldView.cpp (modified) (5 diffs)
• GLWorldView.hpp (modified) (2 diffs)

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

@@ -55 +55 @@
 {
   init();
-
-  //changeMaterials(false);
-  domainBoxMaterial = new QGLMaterial;
-  domainBoxMaterial->setAmbientColor(QColor(0,0,0,255));
-  domainBoxMaterial->setDiffuseColor(QColor(0,0,0,255));
-  domainBoxMaterial->setEmittedLight(QColor(150,160,200,255));
-
-  dreiBeinMaterial = new QGLMaterial;
-  dreiBeinMaterial->setAmbientColor(QColor(0,0,0,255));
-  dreiBeinMaterial->setDiffuseColor(QColor(0,0,0,255));
-  dreiBeinMaterial->setEmittedLight(QColor(150,200,150,255));
 }
 
@@ -72 +61 @@
   // remove all elements
   GLMoleculeObject::cleanMaterialMap();
-
-  delete(domainBoxMaterial);
-  delete(dreiBeinMaterial);
 }
 
@@ -278 +264 @@
 }
 
-void GLWorldScene::drawDomainBox(QGLPainter *painter) const
-{
-  RealSpaceMatrix m = World::getInstance().getDomain().getM();
-  painter->modelViewMatrix().push();
-  painter->modelViewMatrix() *= QMatrix4x4(m.at(0,0), m.at(0,1), m.at(0,2), 0.0,
-                                           m.at(1,0), m.at(1,1), m.at(1,2), 0.0,
-                                           m.at(2,0), m.at(2,1), m.at(2,2), 0.0,
-                                           0.0,       0.0,       0.0,       1.0);
-
-  painter->setFaceMaterial(QGL::AllFaces, domainBoxMaterial);
-  //glEnable(GL_LINE_SMOOTH);
-  QVector3DArray array;
-  array.append(0, 0, 0); array.append(1, 0, 0);
-  array.append(1, 0, 0); array.append(1, 1, 0);
-  array.append(1, 1, 0); array.append(0, 1, 0);
-  array.append(0, 1, 0); array.append(0, 0, 0);
-
-  array.append(0, 0, 1); array.append(1, 0, 1);
-  array.append(1, 0, 1); array.append(1, 1, 1);
-  array.append(1, 1, 1); array.append(0, 1, 1);
-  array.append(0, 1, 1); array.append(0, 0, 1);
-
-  array.append(0, 0, 0); array.append(0, 0, 1);
-  array.append(1, 0, 0); array.append(1, 0, 1);
-  array.append(0, 1, 0); array.append(0, 1, 1);
-  array.append(1, 1, 0); array.append(1, 1, 1);
-  painter->clearAttributes();
-  painter->setVertexAttribute(QGL::Position, array);
-  painter->draw(QGL::Lines, 24);
-  painter->modelViewMatrix().pop();
-}
-
-void GLWorldScene::drawDreiBein(QGLPainter *painter) const
-{
-  QGLView *view = dynamic_cast<QGLView*>(this->parent());
-  painter->modelViewMatrix().push();
-  painter->modelViewMatrix().translate(view->camera()->center());
-  painter->setFaceMaterial(QGL::AllFaces, dreiBeinMaterial);
-  QVector3DArray array;
-  array.append(0, 0, 0); array.append(1, 0, 0);
-  array.append(0, 0, 0); array.append(0, 1, 0);
-  array.append(0, 0, 0); array.append(0, 0, 1);
-  painter->clearAttributes();
-  painter->setVertexAttribute(QGL::Position, array);
-  painter->draw(QGL::Lines, 6);
-  painter->modelViewMatrix().pop();
-}
-
 void GLWorldScene::draw(QGLPainter *painter) const
 {
@@ -334 +272 @@
          meshobj->draw(painter);
    }
-
-   drawDomainBox(painter);
-   drawDreiBein(painter);
 }
 

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

@@ -56 +56 @@
   void initialize(QGLView *view, QGLPainter *painter) const;
   void draw(QGLPainter *painter) const;
-  void drawDomainBox(QGLPainter *painter) const;
-  void drawDreiBein(QGLPainter *painter) const;
 
 signals:
@@ -91 +89 @@
   BondNodeMap BondsinSceneMap;
   MoleculeNodeMap MoleculesinSceneMap;
-
-  QGLMaterial *domainBoxMaterial;
-  QGLMaterial *dreiBeinMaterial;
 };
 

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

@@ -43 +43 @@
   setOption(QGLView::CameraNavigation, false);
   setCameraControlMode(Rotate);
+
+  //changeMaterials(false);
+  domainBoxMaterial = new QGLMaterial;
+  domainBoxMaterial->setAmbientColor(QColor(0,0,0,255));
+  domainBoxMaterial->setDiffuseColor(QColor(0,0,0,255));
+  domainBoxMaterial->setEmittedLight(QColor(150,160,200,255));
+
+  for (int i=0;i<3;i++){
+    dreiBeinMaterial[i] = new QGLMaterial;
+    dreiBeinMaterial[i]->setAmbientColor(QColor(0,0,0,255));
+    dreiBeinMaterial[i]->setDiffuseColor(QColor(0,0,0,255));
+    dreiBeinMaterial[i]->setEmittedLight(QColor(150,200,150,255));
+  }
 
   connect(worldscene, SIGNAL(changeOccured()), this, SLOT(changeSignalled()));
@@ -72 +85 @@
   AtomObserver::getInstance().signOff(this, AtomObservable::PositionChanged);
   delete worldscene;
+
+  delete(domainBoxMaterial);
+  for (int i=0;i<3;i++)
+    delete(dreiBeinMaterial[i]);
 }
 
@@ -192 +209 @@
 void GLWorldView::paintGL(QGLPainter *painter)
 {
+  drawDomainBox(painter);
+
   if (changesPresent) {
     initializeGL(painter);
@@ -197 +216 @@
   }
   worldscene->draw(painter);
+
+  drawDreiBein(painter);
 }
 
@@ -319 +340 @@
   // Set new eye position.
   camera()->setEye(camera()->center() + d);
+}
+
+void GLWorldView::drawDomainBox(QGLPainter *painter) const
+{
+  RealSpaceMatrix m = World::getInstance().getDomain().getM();
+  painter->modelViewMatrix().push();
+  painter->modelViewMatrix() *= QMatrix4x4(m.at(0,0), m.at(0,1), m.at(0,2), 0.0,
+                                           m.at(1,0), m.at(1,1), m.at(1,2), 0.0,
+                                           m.at(2,0), m.at(2,1), m.at(2,2), 0.0,
+                                           0.0,       0.0,       0.0,       1.0);
+
+  painter->setFaceMaterial(QGL::AllFaces, domainBoxMaterial);
+  //glEnable(GL_LINE_SMOOTH);
+  QVector3DArray array;
+  array.append(0, 0, 0); array.append(1, 0, 0);
+  array.append(1, 0, 0); array.append(1, 1, 0);
+  array.append(1, 1, 0); array.append(0, 1, 0);
+  array.append(0, 1, 0); array.append(0, 0, 0);
+
+  array.append(0, 0, 1); array.append(1, 0, 1);
+  array.append(1, 0, 1); array.append(1, 1, 1);
+  array.append(1, 1, 1); array.append(0, 1, 1);
+  array.append(0, 1, 1); array.append(0, 0, 1);
+
+  array.append(0, 0, 0); array.append(0, 0, 1);
+  array.append(1, 0, 0); array.append(1, 0, 1);
+  array.append(0, 1, 0); array.append(0, 1, 1);
+  array.append(1, 1, 0); array.append(1, 1, 1);
+  painter->clearAttributes();
+  painter->setVertexAttribute(QGL::Position, array);
+  painter->draw(QGL::Lines, 24);
+  painter->modelViewMatrix().pop();
+}
+
+void GLWorldView::drawDreiBein(QGLPainter *painter)
+{
+  painter->modelViewMatrix().push();
+  painter->modelViewMatrix().translate(camera()->center());
+  painter->setFaceMaterial(QGL::AllFaces, dreiBeinMaterial[0]);
+  QVector3DArray array;
+  array.append(0, 0, 0); array.append(1, 0, 0);
+  array.append(0, 0, 0); array.append(0, 1, 0);
+  array.append(0, 0, 0); array.append(0, 0, 1);
+  painter->clearAttributes();
+  painter->setVertexAttribute(QGL::Position, array);
+  painter->draw(QGL::Lines, 6);
+  painter->modelViewMatrix().pop();
 }
 

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

@@ -58 +58 @@
   void initializeGL(QGLPainter *painter);
   void paintGL(QGLPainter *painter);
+  void drawDomainBox(QGLPainter *painter) const;
+  void drawDreiBein(QGLPainter *painter);
 
   // input functions
@@ -88 +90 @@
 
   QPointF lastMousePos;
+
+  QGLMaterial *domainBoxMaterial;
+  QGLMaterial *dreiBeinMaterial[3];
 };