Changeset b14efe 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:

1de61e

Parents:

613f8c

git-author:

Michael Ankele <ankele@…> (03/13/12 12:58:50)

git-committer:

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

Message:

QtWorldView: selection in widget calls actions

File:

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

src/UIElements/Views/Qt4/QtWorldView.cpp

@@ -28 +28 @@
 #include "molecule.hpp"
 #include "MoleculeListClass.hpp"
+#include "Actions/SelectionAction/Molecules/MoleculeByIdAction.hpp"
+#include "Actions/SelectionAction/Molecules/NotMoleculeByIdAction.hpp"
 
 using namespace std;
@@ -103 +105 @@
     const int index = (*iter)->IndexNr;
     molItem->setData(0, Qt::UserRole, QVariant(index));
+    molItem->setSelected(World::getInstance().isSelected(*iter));
 
 
@@ -130 +133 @@
 
 void QtWorldView::rowSelected(){
-  //std::cout << "Selection in (" << row << "," << column << "): " << item(row,column) << std::endl;
-  /*bool state = item(row,column)->isSelected();
-  for(int i = 0; i<COLUMNCOUNT; i++){
-    //std::cout << "Setting " << i << "-th item " << item(row,i) << " in row " << row << " to state selected." << std::endl;
-    item(row,i)->setSelected(state);
+
+  // lookup all molecules in the treeWidget
+  for (int i=0;i<topLevelItemCount();i++){
+    QTreeWidgetItem *top = topLevelItem(i);
+    for (int j=0;j<top->childCount();j++){
+
+      // molecules are 1 level below the top
+      QTreeWidgetItem *molItem = top->child(j);
+
+      // molecule index stored as user data
+      int index = molItem->data(0, Qt::UserRole).toInt();
+      molecule *mol = molecules->ReturnIndex(index);
+      ASSERT(mol, "QtWorldView::rowSelected()");
+
+      // selection changed by user?
+      bool molSelectedWorld = World::getInstance().isSelected(mol);
+      bool molSelectedList = molItem->isSelected();
+      //std::cout << molSelectedWorld << " " << molSelectedList << std::endl;
+
+      if (molSelectedWorld != molSelectedList){
+
+        // apply new selection state
+        if (molSelectedList){
+          //std::cout << "select molecule" << std::endl;
+          MoleCuilder::SelectionMoleculeById(mol->getId());
+        }else{
+          //std::cout << "unselect molecule" << std::endl;
+          MoleCuilder::SelectionNotMoleculeById(mol->getId());
+        }
+      }
+    }
   }
-  // figure out which rows have changed
-  for(int i=0; i<rowCount();++i){
-    state = item(i,0)->isSelected();
-    if(molSelection[i]!=state){
-      int idx = verticalHeaderItem(i)->data(Qt::UserRole).toInt();
-      molecule *mol = molecules->ReturnIndex(idx);
-      if(state){
-        emit moleculeSelected(mol);
-      }
-      else{
-        emit moleculeUnSelected(mol);
-      }
-      molSelection[i]=state;
-    }
-  }*/
 }