Changeset 41815a3 for src/UIElements/Views

Timestamp:

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

6966b7

Parents:

99e8ea

git-author:

Michael Ankele <ankele@…> (06/14/12 15:40:01)

git-committer:

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

Message:

QtWorldView: removed usage of MoleculeListClass

Location:

src/UIElements/Views/Qt4

Files:

• QtWorldView.cpp (modified) (8 diffs)
• QtWorldView.hpp (modified) (2 diffs)

src/UIElements/Views/Qt4/QtWorldView.cpp

@@ -19 +19 @@
 
 #include "Views/Qt4/QtWorldView.hpp"
+
+#include <QMetaMethod>
 
 #include <iostream>
@@ -52 +54 @@
   setHeaderLabels(header);
 
-  molecules = World::getInstance().getMolecules();
-  molecules->signOn(this);
+  World::getInstance().signOn(this);//, World::MoleculeInserted);
+  //World::getInstance().signOn(this, World::MoleculeRemoved);
+
+
+  //for (int i=0;i<metaObject()->methodCount();i++)
+  //  std::cout << metaObject()->method(i).signature() << "   -   " << metaObject()->method(i).methodType() << "\n";
+
+
 
   dirty = true;
   clearing = false;
+  selecting = false;
   refill();
 
   //connect(this,SIGNAL(cellChanged(int,int)),this,SLOT(moleculeChanged(int,int)));
-  connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
+  connect(selectionModel(),SIGNAL(selectionChanged(QItemSelection, QItemSelection)),this,SLOT(rowsSelected(QItemSelection, QItemSelection)));
 
 }
@@ -66 +75 @@
 QtWorldView::~QtWorldView()
 {
-  molecules->signOff(this);
+  World::getInstance().signOff(this);//, World::MoleculeInserted);
+  //World::getInstance().signOff(this, World::MoleculeRemoved);
 }
 
 void QtWorldView::update(Observable *publisher) {
+
+  if (selecting)
+    return;
 
   dirty = true;
@@ -80 +93 @@
 
 void QtWorldView::refill() {
-  int numMolecules = molecules->ListOfMolecules.size();
+  const std::vector<molecule*> &molecules = World::getInstance().getAllMolecules();
+
   clear();
-  molSelection.resize(numMolecules);
 
   // list of (unique) formulas in the world
   std::vector<Formula> formula;
 
-  int i;
-  MoleculeList::iterator iter;
-  for(iter = molecules->ListOfMolecules.begin(),i=0;
-      iter != molecules->ListOfMolecules.end();
-      ++i,++iter) {
+  for (std::vector<molecule*>::const_iterator iter = molecules.begin();
+      iter != molecules.end();
+      iter++) {
 
     // find group if already in list
@@ -109 +120 @@
       groupItem->setText(2, QString((*iter)->getFormula().toString().c_str()));
       groupItem->setText(3, "0");
+      groupItem->setData(0, Qt::UserRole, QVariant(-1));
     }
 
@@ -116 +128 @@
     molItem->setText(1, QString::number((*iter)->getAtomCount()));
     molItem->setText(2, QString((*iter)->getFormula().toString().c_str()));
-    const int index = (*iter)->IndexNr;
+    const int index = (*iter)->getId();
     molItem->setData(0, Qt::UserRole, QVariant(index));
     molItem->setSelected(World::getInstance().isSelected(*iter));
@@ -124 +136 @@
     int count = groupItem->text(3).toInt() + 1;
     groupItem->setText(3, QString::number(count));
-
-    //molSelection[i]=nameWidget->isSelected();
   }
   dirty = false;
@@ -152 +162 @@
 }
 
-
-void QtWorldView::rowSelected(){
+void QtWorldView::rowsSelected(const QItemSelection & selected, const QItemSelection & deselected){
 
   if (clearing)
     return;
+  if (selecting)
+    return;
+  selecting = true;
 
-  // 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++){
+  // Select all molecules which belong to newly selected rows.
+  QModelIndex index;
+  QModelIndexList items = selected.indexes();
+  foreach (index, items)
+    if (index.column() == 0){
+      int mol_id = model()->data(index, Qt::UserRole).toInt();
+      if (mol_id < 0)
+        continue;
+      //std::cout << "select molecule" << std::endl;
+      MoleCuilder::SelectionMoleculeById(mol_id);
+    }
 
-      // molecules are 1 level below the top
-      QTreeWidgetItem *molItem = top->child(j);
+  // Unselect all molecules which belong to newly unselected rows.
+  items = deselected.indexes();
+  foreach (index, items)
+    if (index.column() == 0){
+      int mol_id = model()->data(index, Qt::UserRole).toInt();
+      if (mol_id < 0)
+        continue;
+      //std::cout << "unselect molecule" << std::endl;
+      MoleCuilder::SelectionNotMoleculeById(mol_id);
+    }
 
-      // 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());
-        }
-      }
-    }
-  }
+  selecting = false;
 }

src/UIElements/Views/Qt4/QtWorldView.hpp

@@ -42 +42 @@
   void moleculeChanged();
 
-  void rowSelected();
+  void rowsSelected(const QItemSelection & selected, const QItemSelection & deselected);
 
 signals:
@@ -49 +49 @@
 
 private:
-  std::vector<bool> molSelection; //!< needed to determine when a selection changes
-  MoleculeListClass *molecules;
   bool dirty;
   bool clearing;
+  bool selecting;
 };