Changeset a0d5ef

Timestamp:

Nov 15, 2012, 5:31:10 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:

cf373b

Parents:

2c004d

git-author:

Michael Ankele <ankele@…> (10/01/12 12:08:29)

git-committer:

Frederik Heber <heber@…> (11/15/12 17:31:10)

Message:

QtShapeList: selection in GUI calls selection actions

Location:

src/UIElements/Views/Qt4

Files:

• QtShapeList.cpp (modified) (5 diffs)
• QtShapeList.hpp (modified) (1 diff)

src/UIElements/Views/Qt4/QtShapeList.cpp

@@ -43 +43 @@
 
 #include <QAbstractItemView>
-//#include "Actions/SelectionAction/Atoms/AtomByElementAction.hpp"
-//#include "Actions/SelectionAction/Atoms/NotAtomByElementAction.hpp"
+#include "Actions/SelectionAction/Shapes/ShapeByNameAction.hpp"
+#include "Actions/SelectionAction/Shapes/NotShapeByNameAction.hpp"
 
 using namespace std;
@@ -63 +63 @@
         setHeaderLabels(header);
 
+        clearing = false;
+        selecting = false;
+
         refill();
 
         ShapeRegistry::getInstance().signOn(this);
 
-  //connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
-  //connect(this,SIGNAL(changed()),this,SLOT(update()));
+  connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
 }
 
@@ -83 +85 @@
 void QtShapeList::refill() {
 
+  clearing = true;
   clear();
+  shapeSelection.clear();
 
   ShapeRegistry &reg = ShapeRegistry::getInstance();
@@ -98 +102 @@
     treeItem->setText(RADIUS, QString::number(s->getRadius()));
     treeItem->setSelected(reg.isSelected(s));
+
+    shapeSelection.push_back(reg.isSelected(s));
   }
+  clearing = false;
 }
 
@@ -116 +123 @@
 void QtShapeList::rowSelected()
 {
+  if (clearing)
+    return;
+  if (selecting)
+    return;
   //std::cout << "rowSelected\n";
-  /*periodentafel *&periode = World::getInstance().getPeriode();
+  selecting = true;
 
   for (int i=0;i<topLevelItemCount();i++){
     QTreeWidgetItem *item = topLevelItem(i);
     bool newSelection = item->isSelected();
-    if (newSelection != elementSelection[i]){
-      elementSelection[i] = newSelection;
+    if (newSelection != shapeSelection[i]){
+      shapeSelection[i] = newSelection;
 
-      int atomicNumber = item->text(NUMBER).toInt();
-      const element *e = periode->FindElement(atomicNumber);
+      std::string shapeName = item->text(NAME).toStdString();
       if (newSelection)
-        MoleCuilder::SelectionAtomByElement(e);
+        MoleCuilder::SelectionShapeByName(shapeName);
       else
-        MoleCuilder::SelectionNotAtomByElement(e);
+        MoleCuilder::SelectionNotShapeByName(shapeName);
     }
-  }*/
+  }
+  selecting = false;
 }
 

src/UIElements/Views/Qt4/QtShapeList.hpp

@@ -47 +47 @@
 
 private:
+  bool clearing;
+  bool selecting;
   std::vector<bool> shapeSelection; //!< needed to determine when a selection changes
 };