Changeset 1de61e for src/UIElements/Views

Timestamp:

Apr 6, 2012, 11:57:20 AM (13 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:

a14fe3

Parents:

b14efe

git-author:

Michael Ankele <ankele@…> (03/13/12 13:24:27)

git-committer:

Frederik Heber <heber@…> (04/06/12 11:57:20)

Message:

QtElementList: selection calls actions

Location:

src/UIElements/Views/Qt4

Files:

• QtElementList.cpp (modified) (5 diffs)
• QtElementList.hpp (modified) (2 diffs)

src/UIElements/Views/Qt4/QtElementList.cpp

@@ -33 +33 @@
 #include "Descriptors/AtomTypeDescriptor.hpp"
 #include <QAbstractItemView>
+#include "Actions/SelectionAction/Atoms/AtomByElementAction.hpp"
+#include "Actions/SelectionAction/Atoms/NotAtomByElementAction.hpp"
 
 using namespace std;
@@ -57 +59 @@
         update(molecules);
 
-        connect(this,SIGNAL(cellClicked(int,int)),this,SLOT(cellSelected(int,int)));
+        connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
 }
 
@@ -68 +70 @@
 
   periodentafel *&periode = World::getInstance().getPeriode();
+
+  elementSelection.clear();
 
   int i;
@@ -81 +85 @@
 
     QTreeWidgetItem *treeItem = new QTreeWidgetItem(this);
-    treeItem->setText(0, QString::number(e->getAtomicNumber()));
-    treeItem->setText(1, QString(e->getName().c_str()));
-    treeItem->setText(2, QString(e->getSymbol().c_str()));
-    treeItem->setText(3, QString::number(e->getMass()));
+    treeItem->setText(NUMBER, QString::number(e->getAtomicNumber()));
+    treeItem->setText(NAME, QString(e->getName().c_str()));
+    treeItem->setText(SYMBOL, QString(e->getSymbol().c_str()));
+    treeItem->setText(MASS, QString::number(e->getMass()));
     if (count > 0){
-      treeItem->setText(4, QString::number(count));
+      treeItem->setText(OCCURRENCE, QString::number(count));
     }else{
-      treeItem->setText(4, "none");
+      treeItem->setText(OCCURRENCE, "none");
       treeItem->setDisabled(true);
     }
+    elementSelection.push_back(treeItem->isSelected());
   }
 }
@@ -98 +103 @@
 
 
-void QtElementList::cellSelected(int row, int column)
+void QtElementList::rowSelected()
 {
+  //std::cout << "rowSelected\n";
+  periodentafel *&periode = World::getInstance().getPeriode();
+
+  for (int i=0;i<topLevelItemCount();i++){
+    QTreeWidgetItem *item = topLevelItem(i);
+    bool newSelection = item->isSelected();
+    if (newSelection != elementSelection[i]){
+      elementSelection[i] = newSelection;
+
+      int atomicNumber = item->text(NUMBER).toInt();
+      const element *e = periode->FindElement(atomicNumber);
+      if (newSelection)
+        MoleCuilder::SelectionAtomByElement(e);
+      else
+        MoleCuilder::SelectionNotAtomByElement(e);
+    }
+  }
 }
 

src/UIElements/Views/Qt4/QtElementList.hpp

@@ -38 +38 @@
 
 private slots:
-  void cellSelected(int row, int column); // itemSelectionChanged()
+  void rowSelected();
 
 signals:
@@ -45 +45 @@
 
 private:
-  std::vector<bool> molSelection; //!< needed to determine when a selection changes
+  std::vector<bool> elementSelection; //!< needed to determine when a selection changes
   MoleculeListClass *molecules;
   bool dirty;