Changeset 7b6bcfe for src/UIElements/Views/Qt4

Timestamp:

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

4f7473

Parents:

407638e

git-author:

Michael Ankele <ankele@…> (06/18/12 13:35:31)

git-committer:

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

Message:

QtMoleculeView: pages for hovering atom and molecule (no information yet)

Location:

src/UIElements/Views/Qt4

Files:

• QtMoleculeView.cpp (modified) (3 diffs)
• QtMoleculeView.hpp (modified) (4 diffs)

src/UIElements/Views/Qt4/QtMoleculeView.cpp

@@ -31 +31 @@
 
 QtMoleculeView::QtMoleculeView() :
-    QTabWidget()
+    QTabWidget(),
+    page_mol(NULL), page_atom(NULL)
 {
-  allPage = new QTAllMoleculePage();
+  /*allPage = new QTAllMoleculePage();
   addTab(allPage,QString("All Molecules"));
 
   connect(this,SIGNAL(addMolecule(molecule*)),allPage,SLOT(addMolecule(molecule*)));
-  connect(this,SIGNAL(removeMolecule(molecule*)),allPage,SLOT(removeMolecule(molecule*)));
+  connect(this,SIGNAL(removeMolecule(molecule*)),allPage,SLOT(removeMolecule(molecule*)));*/
 }
 
@@ -43 +44 @@
 {}
 
-void QtMoleculeView::moleculeSelected(molecule *mol){
+/*void QtMoleculeView::moleculeSelected(molecule *mol){
   if(!pages.count(mol)){
     string molName = mol->name;
@@ -68 +69 @@
 void QtMoleculeView::nameChanged(QTMoleculePage *page, std::string name){
   setTabText(indexOf(page),QString(name.c_str()));
+}*/
+
+void QtMoleculeView::nameChanged(QTMoleculePage *page, std::string name){}
+
+void QtMoleculeView::atomHover(const atom *_atom)
+{
+  // Remove old tabs.
+  if (page_atom){
+    removeTab(indexOf(page_atom));
+    delete(page_atom);
+    page_atom = NULL;
+  }
+  if (page_mol){
+    removeTab(indexOf(page_mol));
+    delete(page_mol);
+    page_mol = NULL;
+  }
+
+
+  // Show new tabs.
+  if (_atom){
+    page_atom = new QTAtomPage(_atom, "test");
+    addTab(page_atom, "atom...");
+  }
 }
 
-/************************ Tab for all Molecules ********************/
+/************************ Tab for single Atoms ********************/
 
-QTAllMoleculePage::QTAllMoleculePage() :
-  Observer("QTAllMoleculePage")
-{}
+QTAtomPage::QTAtomPage(const atom *_atom,std::string _name) :
+  Observer("QTAtomPage"),
+  atomRef(_atom), name(_name)
+{
+  atomRef->signOn(this);
+}
 
-void QTAllMoleculePage::addMolecule(molecule *mol){}
+QTAtomPage::~QTAtomPage()
+{
+  atomRef->signOff(this);
+}
 
-void QTAllMoleculePage::removeMolecule(molecule *mol){}
+void QTAtomPage::update(Observable *subject){
+  /*if(name != atomRef->name){
+    name = atomRef->name;
+    emit nameChanged(this,name);
+  }*/
+}
 
-void QTAllMoleculePage::update(Observable *subject){}
-
-void QTAllMoleculePage::subjectKilled(Observable *subject){}
+void QTAtomPage::subjectKilled(Observable *subject){}
 
 /************************ Tab for single Molecules *****************/
 
-QTMoleculePage::QTMoleculePage(molecule *_mol, std::string _name) :
+QTMoleculePage::QTMoleculePage(const molecule *_mol, std::string _name) :
     Observer("QTMoleculePage"),
     mol(_mol), name(_name)

src/UIElements/Views/Qt4/QtMoleculeView.hpp

@@ -20 +20 @@
 
 class molecule;
+class atom;
 
 // Forwarding of the Tab-Pages
-class QTAllMoleculePage;
+class QTAtomPage;
 class QTMoleculePage;
 
@@ -33 +34 @@
 
 public slots:
-  void moleculeSelected(molecule *);
-  void moleculeUnSelected(molecule *);
+  void atomHover(const atom *_atom);
 
   void nameChanged(QTMoleculePage *page, std::string name);
 
-signals:
-  void addMolecule(molecule *);
-  void removeMolecule(molecule *);
-
-
 private:
-  QTAllMoleculePage *allPage; //!< contained widget to cary information of all selected molecules
-  std::map<molecule*,QTMoleculePage *> pages;//!< contained widget to cary information on a specific molecule
+  QTMoleculePage *page_mol;
+  QTAtomPage *page_atom;
 };
 
 /**
- * Widget to display the tab page for all selected molecules
+ * Widget to display the tab page for a single atom
  */
-class QTAllMoleculePage : public QWidget, public Observer {
+class QTAtomPage : public QWidget, public Observer {
   Q_OBJECT
 public:
-  QTAllMoleculePage();
+  QTAtomPage(const atom *_atom,std::string _name);
+  virtual ~QTAtomPage();
   void update(Observable *subject);
   void subjectKilled(Observable *subject);
-public slots:
-  void addMolecule(molecule *mol);
-  void removeMolecule(molecule *mol);
+
+//public slots:
+//  void nameChanged(QTAtomPage*,std::string);
+
+private:
+  const atom *atomRef;
+  std::string name;
 };
 
@@ -68 +68 @@
   Q_OBJECT
 public:
-  QTMoleculePage(molecule *_mol,std::string _name);
+  QTMoleculePage(const molecule *_mol,std::string _name);
   virtual ~QTMoleculePage();
 
@@ -78 +78 @@
 
 private:
-  molecule *mol;
+  const molecule *mol;
   std::string name;
 };