Changeset 0eb7bf3

Timestamp:

Jul 18, 2012, 2:02: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:

3c53fa

Parents:

f31b34

git-author:

Michael Ankele <ankele@…> (07/12/12 15:37:12)

git-committer:

Michael Ankele <ankele@…> (07/18/12 14:02:27)

Message:

Refactoring: renamed QtWorldView -> QtMoleculeList

Location:

src/UIElements

Files:

• Makefile.am (modified) (2 diffs)
• Qt4/QtMainWindow.cpp (modified) (5 diffs)
• Qt4/QtMainWindow.hpp (modified) (2 diffs)
• Views/Qt4/QtMoleculeList.cpp (moved) (moved from src/UIElements/Views/Qt4/QtWorldView.cpp ) (9 diffs)
• Views/Qt4/QtMoleculeList.hpp (moved) (moved from src/UIElements/Views/Qt4/QtWorldView.hpp ) (4 diffs)

src/UIElements/Makefile.am

@@ -201 +201 @@
   UIElements/Qt4/QtUIFactory.cpp \
   UIElements/Menu/Qt4/QtMenuPipe.cpp \
-  UIElements/Views/Qt4/QtWorldView.cpp \
+  UIElements/Views/Qt4/QtMoleculeList.cpp \
   UIElements/Views/Qt4/QtMoleculeView.cpp \
   UIElements/Views/Qt4/QtElementList.cpp \
@@ -236 +236 @@
   UIElements/Qt4/Pipe/VectorsQtQueryPipe.hpp \
   UIElements/Menu/Qt4/QtMenuPipe.hpp \
-  UIElements/Views/Qt4/QtWorldView.hpp \
+  UIElements/Views/Qt4/QtMoleculeList.hpp \
   UIElements/Views/Qt4/QtMoleculeView.hpp \
   UIElements/Views/Qt4/QtElementList.hpp \

src/UIElements/Qt4/QtMainWindow.cpp

@@ -34 +34 @@
 
 #include "Menu/Qt4/QtMenu.hpp"
-#include "Views/Qt4/QtWorldView.hpp"
+#include "Views/Qt4/QtMoleculeList.hpp"
 #include "Views/Qt4/QtElementList.hpp"
 #include "Views/Qt4/QtMoleculeView.hpp"
@@ -60 +60 @@
   QTabWidget *worldTab = new QTabWidget(splitter2);
 
-  worldDisplay = new QtWorldView(worldTab);
+  moleculeList = new QtMoleculeList(worldTab);
   elementList = new QtElementList(worldTab);
 
   moleculeDisplay = new QtMoleculeView();
-  molecule3dDisplay = new GLWorldView(this);
-//  molecule3dDisplay->setSizePolicy( QSizePolicy::Minimum,QSizePolicy::Minimum);
-  molecule3dDisplay->setMinimumSize( QSize(640,480) );
-//  molecule3dDisplay->setFocus();
-  molecule3dDisplay->camera()->setEye( QVector3D(0,3,10));
+  glWorldView = new GLWorldView(this);
+//  glWorldView->setSizePolicy( QSizePolicy::Minimum,QSizePolicy::Minimum);
+  glWorldView->setMinimumSize( QSize(640,480) );
+//  glWorldView->setFocus();
+  glWorldView->camera()->setEye( QVector3D(0,3,10));
 
   MainMenu = new QtMenu<QMenuBar>(menuBar(), "");
@@ -74 +74 @@
 
   toolbar = new QtToolBar(this);
-  molecule3dDisplay->addToolBarActions(toolbar);
+  glWorldView->addToolBarActions(toolbar);
   addToolBar(toolbar);
 
@@ -80 +80 @@
   splitter1->addWidget(splitter2);
   splitter1->addWidget(moleculeDisplay);
-  splitter2->addWidget(molecule3dDisplay);
+  splitter2->addWidget(glWorldView);
   splitter2->addWidget(worldTab);
-  worldTab->addTab(worldDisplay, "Molecules");
+  worldTab->addTab(moleculeList, "Molecules");
   worldTab->addTab(elementList, "All Elements");
 
@@ -96 +96 @@
   settings.endGroup();
 
-  //connect(worldDisplay,SIGNAL(moleculeSelected(molecule*)),moleculeDisplay,SLOT(moleculeSelected(molecule*)));
-  //connect(worldDisplay,SIGNAL(moleculeUnSelected(molecule*)),moleculeDisplay,SLOT(moleculeUnSelected(molecule*)));
-  connect(molecule3dDisplay,SIGNAL(hoverChanged(const atom*)), moleculeDisplay,SLOT(atomHover(const atom*)));
+  connect(glWorldView,SIGNAL(hoverChanged(const atom*)), moleculeDisplay,SLOT(atomHover(const atom*)));
 }
 

src/UIElements/Qt4/QtMainWindow.hpp

@@ -23 +23 @@
 #include "Menu/Qt4/QtMenu.hpp"
 
-class QtWorldView;
+class QtMoleculeList;
 class QtElementList;
 class StringView;
@@ -45 +45 @@
   // All kinds of QTStuff used in this window
   QApplication *theApp;
-  QtWorldView *worldDisplay;
+  QtMoleculeList *moleculeList;
   QtElementList *elementList;
-  GLWorldView *molecule3dDisplay;
+  GLWorldView *glWorldView;
   QtMoleculeView *moleculeDisplay;
   QtStatusBar *statusBar;

src/UIElements/Views/Qt4/QtMoleculeList.cpp

@@ -7 +7 @@
 
 /*
- * QtWorldView.cpp
+ * QtMoleculeList.cpp
  *
  *  Created on: Jan 21, 2010
@@ -18 +18 @@
 #endif
 
-#include "Views/Qt4/QtWorldView.hpp"
+#include "Views/Qt4/QtMoleculeList.hpp"
 
 #include <QMetaMethod>
@@ -39 +39 @@
 // some attributes need to be easier to find for molecules
 // these attributes are skiped so far
-const int QtWorldView::COLUMNCOUNT = COLUMNTYPES_MAX;
-const char *QtWorldView::COLUMNNAMES[QtWorldView::COLUMNCOUNT]={"Name","Atoms","Formula","Occurrence"/*,"Size"*/};
+const int QtMoleculeList::COLUMNCOUNT = COLUMNTYPES_MAX;
+const char *QtMoleculeList::COLUMNNAMES[QtMoleculeList::COLUMNCOUNT]={"Name","Atoms","Formula","Occurrence"/*,"Size"*/};
 
-QtWorldView::QtWorldView(QWidget * _parent) :
+QtMoleculeList::QtMoleculeList(QWidget * _parent) :
   QTreeWidget (_parent),
-  Observer("QtWorldView")
+  Observer("QtMoleculeList")
 {
   setColumnCount(COLUMNCOUNT);
@@ -73 +73 @@
 }
 
-QtWorldView::~QtWorldView()
+QtMoleculeList::~QtMoleculeList()
 {
   World::getInstance().signOff(this);//, World::MoleculeInserted);
@@ -79 +79 @@
 }
 
-void QtWorldView::update(Observable *publisher) {
+void QtMoleculeList::update(Observable *publisher) {
 
   if (selecting)
@@ -92 +92 @@
 }
 
-void QtWorldView::refill() {
+void QtMoleculeList::refill() {
   const std::vector<molecule*> &molecules = World::getInstance().getAllMolecules();
 
@@ -140 +140 @@
 }
 
-void QtWorldView::paintEvent(QPaintEvent * event)
+void QtMoleculeList::paintEvent(QPaintEvent * event)
 {
   if (dirty)
@@ -147 +147 @@
 }
 
-void QtWorldView::subjectKilled(Observable *publisher) {
+void QtMoleculeList::subjectKilled(Observable *publisher) {
 }
 
-void QtWorldView::moleculeChanged() {
+void QtMoleculeList::moleculeChanged() {
   /*int idx = verticalHeaderItem(row)->data(Qt::UserRole).toInt();
   molecule *mol = molecules->ReturnIndex(idx);
@@ -162 +162 @@
 }
 
-void QtWorldView::rowsSelected(const QItemSelection & selected, const QItemSelection & deselected){
+void QtMoleculeList::rowsSelected(const QItemSelection & selected, const QItemSelection & deselected){
 
   if (clearing)

src/UIElements/Views/Qt4/QtMoleculeList.hpp

@@ -1 +1 @@
 /*
- * QtWorldView.hpp
+ * QtMoleculeList.hpp
  *
  *  Created on: Jan 21, 2010
@@ -6 +6 @@
  */
 
-#ifndef QTMOLECULESVIEW_HPP_
-#define QTMOLECULESVIEW_HPP_
+#ifndef QTMOLECULELIST_HPP_
+#define QTMOLECULELIST_HPP_
 
 // include config.h
@@ -21 +21 @@
 class MoleculeListClass;
 
-class QtWorldView : public QTreeWidget, public Observer
+class QtMoleculeList : public QTreeWidget, public Observer
 {
   Q_OBJECT
 
 public:
-  QtWorldView(QWidget * _parent=0);
-  virtual ~QtWorldView();
+  QtMoleculeList(QWidget * _parent=0);
+  virtual ~QtMoleculeList();
 
 protected:
@@ -54 +54 @@
 };
 
-#endif /* QTMOLECULESVIEW_HPP_ */
+#endif /* QTMOLECULELIST_HPP_ */