Changeset 592d42

Timestamp:

Oct 5, 2013, 9:31:54 AM (11 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:

76e224

Parents:

5e4bfd

git-author:

Frederik Heber <heber@…> (09/27/13 19:45:07)

git-committer:

Frederik Heber <heber@…> (10/05/13 09:31:54)

Message:

Added enable/disable for DreiBein and domain box.

Files:

• data/icons/Makefile.am (modified) (1 diff)
• data/icons/icon_domain.png (added)
• data/icons/icon_dreiBein.png (added)
• data/icons/icons.qrc (modified) (1 diff)
• src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp (modified) (8 diffs)
• src/UIElements/Views/Qt4/Qt3D/GLWorldView.hpp (modified) (2 diffs)

data/icons/Makefile.am

@@ -4 +4 @@
 EXTRA_DIST = \
         icons.qrc \
+        icon_domain.png \
+        icon_dreiBein.png \
         icon_select_atom.png \
         icon_select_molecule.png \

data/icons/icons.qrc

@@ -1 +1 @@
 <!DOCTYPE RCC><RCC version="1.0">
  <qresource>
+     <file>icon_domain.png</file>
+     <file>icon_dreiBein.png</file>
      <file>icon_select_atom.png</file>
      <file>icon_select_molecule.png</file>

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

@@ -113 +113 @@
 GLWorldView::~GLWorldView()
 {
+  QSettings settings;
+  settings.beginGroup("WorldView");
+  settings.setValue("domainBoxEnabled", (meshDomainBox->options() & QGLSceneNode::HideNode) == 0);
+  settings.setValue("dreiBeinEnabled", (meshDreiBein->options() & QGLSceneNode::HideNode) == 0);
+  settings.endGroup();
+
+
   World::getInstance().signOff(this);
   World::getInstance().signOff(this, World::AtomInserted);
@@ -189 +196 @@
   connect(selMolAction, SIGNAL(triggered()), worldscene, SLOT(setSelectionModeMolecule()));
   toolbar->addAction(selMolAction);
+
+  // dreiBein/domain enabler
+  toolbar->addSeparator();
+  QAction *seldreiBein = new QAction(QIcon(QPixmap(":/icon_dreiBein.png")), tr("enable/disable dreiBein"), this);
+  connect(seldreiBein, SIGNAL(triggered()), this, SLOT(changeDreiBein()));
+  toolbar->addAction(seldreiBein);
+  QAction *seldomain = new QAction(QIcon(QPixmap(":/icon_domain.png")), tr("enable/disable domain box"), this);
+  connect(seldomain, SIGNAL(triggered()), this, SLOT(changeDomain()));
+  toolbar->addAction(seldomain);
 }
 
@@ -201 +217 @@
   settings.setValue("domainBoxColorAmbient", colorAmbient);
   settings.setValue("domainBoxColorDiffuse", colorDiffuse);
+  const bool status = settings.value("domainBoxEnabled").toBool();
   settings.endGroup();
 
@@ -221 +238 @@
   meshDomainBox->setLocalTransform(mat);
   meshDomainBox->setMaterial(material);
+
+  setDomainStatus( status );
 }
 
@@ -233 +252 @@
   settings.setValue("dreiBeinColorY", colorY);
   settings.setValue("dreiBeinColorZ", colorZ);
-  settings.setValue("dreiBeinEnabled", true);
+  const bool status = settings.value("dreiBeinEnabled").toBool();
   settings.endGroup();
 
@@ -291 +310 @@
   node->addNode(cone);
   node->setPosition(QVector3D(0.f, 0.f, .8f));
+
+  setdreiBeinStatus( status );
 }
 
@@ -424 +445 @@
 }
 
+void GLWorldView::changeDreiBein()
+{
+  // invert to new status
+  const bool status = ((meshDreiBein->options() & QGLSceneNode::HideNode) == 0);
+  setdreiBeinStatus(!status);
+  // realize
+  updateGL();
+  needsRedraw = true;
+}
+
+void GLWorldView::setdreiBeinStatus(const bool status)
+{
+  if (status)
+    meshDreiBein->setOptions( meshDreiBein->options() & (255-QGLSceneNode::HideNode) );
+  else
+    meshDreiBein->setOptions( meshDreiBein->options() | QGLSceneNode::HideNode );
+}
+
+void GLWorldView::changeDomain()
+{
+  // invert to new status
+  const bool status = ((meshDomainBox->options() & QGLSceneNode::HideNode) == 0);
+  setDomainStatus(!status);
+  // realize
+  updateGL();
+  needsRedraw = true;
+}
+
+void GLWorldView::setDomainStatus(const bool status)
+{
+  if (status)
+    meshDomainBox->setOptions( meshDomainBox->options() & (255-QGLSceneNode::HideNode) );
+  else
+    meshDomainBox->setOptions( meshDomainBox->options() | QGLSceneNode::HideNode );
+}
+
 void GLWorldView::sceneChangeSignalled()
 {
@@ -654 +711 @@
   glDisable(GL_CULL_FACE);
 
-  // Draw the outlines.
-  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);
+  // Draw the outlines (if we have drawn the box itself)
+  if ((meshDomainBox->options() & QGLSceneNode::HideNode) == 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();

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

@@ -52 +52 @@
   void sceneChangeSignalled();
   void sceneHoverSignalled(const atom *_atom);
+  void changeDreiBein();
+  void changeDomain();
 
 signals:
@@ -100 +102 @@
 
 private:
+  void setdreiBeinStatus(const bool status);
+  void setDomainStatus(const bool status);
+
+private:
 
   GLWorldScene *worldscene;