Changeset c7e000 for src/UIElements/Views/Qt4

Timestamp:

Jul 17, 2012, 12:17:25 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:

2aafe8

Parents:

b82101

git-author:

Michael Ankele <ankele@…> (06/05/12 10:14:59)

git-committer:

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

Message:

GL: saving color settings (domainBox, dreinBein)

File:

• src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp (modified) (3 diffs)

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

@@ -24 +24 @@
 #include <QtGui/QToolBar>
 #include <Qt/qtimer.h>
+#include <Qt/qsettings.h>
 #include <Qt3D/qglbuilder.h>
 #include <Qt3D/qglscenenode.h>
@@ -113 +114 @@
 void GLWorldView::createDomainBox()
 {
+  QSettings settings;
+  settings.beginGroup("WorldView");
+  QColor colorFrame = settings.value("domainBoxColorFrame", QColor(150,160,200,255)).value<QColor>();
+  QColor colorAmbient = settings.value("domainBoxColorAmbient", QColor(50,60,100,255)).value<QColor>();
+  QColor colorDiffuse = settings.value("domainBoxColorDiffuse", QColor(150,160,200,180)).value<QColor>();
+  settings.setValue("domainBoxColorFrame", colorFrame);
+  settings.setValue("domainBoxColorAmbient", colorAmbient);
+  settings.setValue("domainBoxColorDiffuse", colorDiffuse);
+  settings.endGroup();
+
   domainBoxMaterial = new QGLMaterial;
   domainBoxMaterial->setAmbientColor(QColor(0,0,0,255));
   domainBoxMaterial->setDiffuseColor(QColor(0,0,0,255));
-  domainBoxMaterial->setEmittedLight(QColor(150,160,200,255));
+  domainBoxMaterial->setEmittedLight(colorFrame);
 
 
   QGLMaterial *material = new QGLMaterial;
-  material->setAmbientColor(QColor(50,60,100,255));
-  material->setDiffuseColor(QColor(150,160,200,180));
+  material->setAmbientColor(colorAmbient);
+  material->setDiffuseColor(colorDiffuse);
 
   QGLBuilder builder;
@@ -135 +146 @@
 void GLWorldView::createDreiBein()
 {
+  QSettings settings;
+  settings.beginGroup("WorldView");
+  QColor colorX = settings.value("dreiBeinColorX", QColor(255,50,50,255)).value<QColor>();
+  QColor colorY = settings.value("dreiBeinColorY", QColor(50,255,50,255)).value<QColor>();
+  QColor colorZ = settings.value("dreiBeinColorZ", QColor(50,50,255,255)).value<QColor>();
+  settings.setValue("dreiBeinColorX", colorX);
+  settings.setValue("dreiBeinColorY", colorY);
+  settings.setValue("dreiBeinColorZ", colorZ);
+  settings.setValue("dreiBeinEnabled", true);
+  settings.endGroup();
+
   // Create 3 color for the 3 axes.
   dreiBeinMaterial[0] = new QGLMaterial;
-  dreiBeinMaterial[0]->setColor(QColor(255,50,50,255));
+  dreiBeinMaterial[0]->setColor(colorX);
   dreiBeinMaterial[1] = new QGLMaterial;
-  dreiBeinMaterial[1]->setColor(QColor(50,255,50,255));
+  dreiBeinMaterial[1]->setColor(colorY);
   dreiBeinMaterial[2] = new QGLMaterial;
-  dreiBeinMaterial[2]->setColor(QColor(50,50,255,255));
+  dreiBeinMaterial[2]->setColor(colorZ);
 
   // Create the basic meshes (cylinder and cone).