Changeset 59a28e for src/UIElements/Views

Timestamp:

Apr 6, 2012, 11:57:19 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:

575343

Parents:

f20fa5

git-author:

Michael Ankele <ankele@…> (03/08/12 12:41:08)

git-committer:

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

Message:

QtElementList improved

• occurrence added
• connected to molecule observer

Location:

src/UIElements/Views/Qt4

Files:

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

src/UIElements/Views/Qt4/QtElementList.cpp

@@ -31 +31 @@
 #include "Element/element.hpp"
 #include "Element/periodentafel.hpp"
+#include "Descriptors/AtomTypeDescriptor.hpp"
+#include <QAbstractItemView>
 
 using namespace std;
 
 const int QtElementList::COLUMNCOUNT = COLUMNTYPES_MAX;
-const char *QtElementList::COLUMNNAMES[QtElementList::COLUMNCOUNT]={"Number","Name","Symbol","Mass"};
+const char *QtElementList::COLUMNNAMES[QtElementList::COLUMNCOUNT]={"Number","Name","Symbol","Mass","Occurrence"};
 
 QtElementList::QtElementList(QWidget * _parent) :
@@ -42 +44 @@
 {
   setColumnCount(COLUMNCOUNT);
+  setSelectionMode(QAbstractItemView::MultiSelection);
 
   QStringList header;
@@ -47 +50 @@
           header << COLUMNNAMES[i];
         setHeaderLabels(header);
-        //setAllColumnsShowFocus( true );
 
         molecules = World::getInstance().getMolecules();
@@ -53 +55 @@
         update(molecules);
 
-  periodentafel *&periode = World::getInstance().getPeriode();
-
-
-  int i;
-  periodentafel::const_iterator iter;
-  for(iter = periode->begin(),i=0;
-      iter != periode->end();
-      ++i,++iter) {
-    const element *e = iter->second;
-
-    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()));
-
-    /*QTableWidgetItem *indexWidget = new QTableWidgetItem();
-    //std::cout << "Creating index item " << indexWidget << "." << std::endl;
-    indexWidget->setText(QString::number(e->getAtomicNumber()));
-    indexWidget->setData(Qt::UserRole,QVariant(e->getAtomicNumber()));
-    setItem(i,NUMBER,indexWidget);
-
-    const string name = e->getName();
-    QTableWidgetItem *nameWidget = new QTableWidgetItem();
-    //std::cout << "Creating name item " << nameWidget << " at " << i << "," << NAME << "." << std::endl;
-    nameWidget->setText(QString(name.c_str()));
-    setItem(i,NAME,nameWidget);
-
-    const string symbol = e->getSymbol();
-    QTableWidgetItem *symWidget = new QTableWidgetItem();
-    //std::cout << "Creating symbol item " << symWidget << " at " << i << "," << NAME << "." << std::endl;
-    symWidget->setText(QString(symbol.c_str()));
-    setItem(i,SYMBOL,symWidget);
-
-    const double mass = e->getMass();
-    QTableWidgetItem *massWidget= new QTableWidgetItem();
-    //std::cout << "Creating mass item " << massWidget << " at " << i << "," << ATOMCOUNT << "." << std::endl;
-    massWidget->setText(QString::number(mass));
-    massWidget->setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
-    setItem(i,MASS,massWidget);*/
-  }
-
-        connect(this,SIGNAL(cellChanged(int,int)),this,SLOT(moleculeChanged(int,int)));
         connect(this,SIGNAL(cellClicked(int,int)),this,SLOT(cellSelected(int,int)));
 }
@@ -105 +64 @@
 
 void QtElementList::update(Observable *publisher) {
+
+  periodentafel *&periode = World::getInstance().getPeriode();
+
+
+  int i;
+
+  clear();
+  periodentafel::const_iterator iter;
+  for(iter = periode->begin(),i=0;
+      iter != periode->end();
+      ++i,++iter) {
+    const element *e = iter->second;
+    int count = 0;
+    count = World::getInstance().getAllAtoms(AtomByType(e)).size();
+
+    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()));
+    if (count > 0){
+      treeItem->setText(4, QString::number(count));
+    }else{
+      treeItem->setText(4, "none");
+      treeItem->setDisabled(true);
+    }
+  }
 }
 
 void QtElementList::subjectKilled(Observable *publisher) {
-}
-
-void QtElementList::moleculeChanged(int row, int column) {
 }
 

src/UIElements/Views/Qt4/QtElementList.hpp

@@ -34 +34 @@
 
   static const int COLUMNCOUNT;
-  enum {NUMBER,NAME,SYMBOL,MASS,COLUMNTYPES_MAX} COLUMNTYPES;
+  enum {NUMBER,NAME,SYMBOL,MASS,OCCURRENCE,COLUMNTYPES_MAX} COLUMNTYPES;
   static const char *COLUMNNAMES[];
 
 private slots:
-  void moleculeChanged(int row, int column);
-
-  void cellSelected(int row, int column);
+  void cellSelected(int row, int column); // itemSelectionChanged()
 
 signals: