Changeset 63b56a7

Timestamp:

Mar 4, 2010, 10:56:58 AM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

a77c96

Parents:

e6a9c1

Message:

Changed Name of the QTMoleculesView

Location:

src

Files:

• Makefile.am (modified) (2 diffs)
• UIElements/QT4/QTMainWindow.cpp (modified) (3 diffs)
• UIElements/QT4/QTMainWindow.hpp (modified) (2 diffs)
• Views/QT4/QTWorldView.cpp (moved) (moved from src/Views/QT4/QTMoleculesView.cpp ) (5 diffs)
• Views/QT4/QTWorldView.hpp (moved) (moved from src/Views/QT4/QTMoleculesView.hpp ) (2 diffs)

src/Makefile.am

@@ -38 +38 @@
 LEGACYHEADER = Legacy/oldmenu.hpp
 
-QTUIMOC_HEADER = UIElements/QT4/QTMainWindow.hpp UIElements/QT4/QTDialog.hpp Menu/QT4/QTMenu.hpp  Views/QT4/QTMoleculesView.hpp Views/QT4/GLMoleculeView.hpp Views/QT4/QTStatusBar.hpp 
-QTUIMOC_TARGETS = QTMainWindow.moc.cpp QTMenu.moc.cpp QTDialog.moc.cpp QTMoleculesView.moc.cpp GLMoleculeView.moc.cpp QTStatusBar.moc.cpp
+QTUIMOC_HEADER = UIElements/QT4/QTDialog.hpp \
+                                 UIElements/QT4/QTMainWindow.hpp \
+                                 Menu/QT4/QTMenu.hpp \
+                                 Views/QT4/QTWorldView.hpp \
+                                 Views/QT4/GLMoleculeView.hpp \
+                                 Views/QT4/QTStatusBar.hpp
+ 
+QTUIMOC_TARGETS = QTMainWindow.moc.cpp \
+                      QTMenu.moc.cpp\
+                      QTDialog.moc.cpp \
+                      QTWorldView.moc.cpp \
+                      GLMoleculeView.moc.cpp \
+                      QTStatusBar.moc.cpp
 
 DESCRIPTORSOURCE = Descriptors/AtomDescriptor.cpp \
@@ -53 +64 @@
                                    Descriptors/MoleculeIdDescriptor.hpp
 
-QTUISOURCE = ${QTUIMOC_TARGETS} UIElements/QT4/QTMainWindow.cpp UIElements/QT4/QTDialog.cpp UIElements/QT4/QTUIFactory.cpp Menu/QT4/QTMenu.cpp Views/QT4/QTMoleculesView.cpp Views/QT4/GLMoleculeView.cpp Views/QT4/QTStatusBar.cpp
+QTUISOURCE = ${QTUIMOC_TARGETS} \
+             UIElements/QT4/QTMainWindow.cpp \
+             UIElements/QT4/QTDialog.cpp \
+             UIElements/QT4/QTUIFactory.cpp \
+             Menu/QT4/QTMenu.cpp \
+             Views/QT4/QTWorldView.cpp \
+             Views/QT4/GLMoleculeView.cpp \
+             Views/QT4/QTStatusBar.cpp
 QTUIHEADER = ${QTUIMOC_HEADER} UIElements/QT4/QTUIFactory.hpp
 

src/UIElements/QT4/QTMainWindow.cpp

@@ -20 +20 @@
 #include "molecule.hpp"
 #include "Menu/QT4/QTMenu.hpp"
-#include "Views/QT4/QTMoleculesView.hpp"
+#include "Views/QT4/QTWorldView.hpp"
 #include "Views/QT4/GLMoleculeView.hpp"
 #include "Views/QT4/QTStatusBar.hpp"
@@ -33 +33 @@
   QSplitter *splitter2 = new QSplitter (Qt::Vertical, splitter1 );
 
-  moleculeDisplay = new QTMoleculesView(molecules,splitter2);
+  worldDisplay = new QTWorldView(molecules,splitter2);
 
   QLabel *pseudo1 = new QLabel(QString("Here be dragons"));
@@ -42 +42 @@
   splitter1->addWidget(pseudo1);
   splitter2->addWidget(molecule3dDisplay);
-  splitter2->addWidget(moleculeDisplay);
+  splitter2->addWidget(worldDisplay);
 
   statusBar = new QTStatusBar(this);

src/UIElements/QT4/QTMainWindow.hpp

@@ -12 +12 @@
 #include <QtGui/QMainWindow>
 
-class QTMoleculesView;
+class QTWorldView;
 class StringView;
 class QTMenu;
@@ -32 +32 @@
   // All kinds of QTStuff used in this window
   QApplication *theApp;
-  QTMoleculesView *moleculeDisplay;
+  QTWorldView *worldDisplay;
   QTMenu *editMoleculesMenu;
   GLMoleculeView *molecule3dDisplay;

src/Views/QT4/QTWorldView.cpp

@@ -1 +1 @@
 /*
- * QTMoleculesView.cpp
+ * QTWorldView.cpp
  *
  *  Created on: Jan 21, 2010
@@ -6 +6 @@
  */
 
-#include "Views/QT4/QTMoleculesView.hpp"
+#include "Views/QT4/QTWorldView.hpp"
 
 #include <iostream>
@@ -19 +19 @@
 // some attributes need to be easier to find for molecules
 // these attributes are skiped so far
-const int QTMoleculesView::COLUMNCOUNT = COLUMNTYPES_MAX;
-const char *QTMoleculesView::COLUMNNAMES[QTMoleculesView::COLUMNCOUNT]={"Name","Atoms"/*,"Formula"*/,"Center"/*,"Size"*/};
+const int QTWorldView::COLUMNCOUNT = COLUMNTYPES_MAX;
+const char *QTWorldView::COLUMNNAMES[QTWorldView::COLUMNCOUNT]={"Name","Atoms"/*,"Formula"*/,"Center"/*,"Size"*/};
 
-QTMoleculesView::QTMoleculesView(MoleculeListClass *_molecules,QWidget * _parent) :
+QTWorldView::QTWorldView(MoleculeListClass *_molecules,QWidget * _parent) :
   QTableWidget (_parent),
   molecules(_molecules)
@@ -42 +42 @@
 }
 
-QTMoleculesView::~QTMoleculesView()
+QTWorldView::~QTWorldView()
 {
   molecules->signOff(this);
 }
 
-void QTMoleculesView::update(Observable *publisher) {
+void QTWorldView::update(Observable *publisher) {
   int numMolecules = molecules->ListOfMolecules.size();
   setRowCount(numMolecules);
@@ -84 +84 @@
 }
 
-void QTMoleculesView::subjectKilled(Observable *publisher) {
+void QTWorldView::subjectKilled(Observable *publisher) {
 }
 
-void QTMoleculesView::moleculeChanged(int row, int column) {
+void QTWorldView::moleculeChanged(int row, int column) {
   int idx = verticalHeaderItem(row)->data(Qt::UserRole).toInt();
   molecule *mol =molecules->ReturnIndex(idx);

src/Views/QT4/QTWorldView.hpp

@@ -1 +1 @@
 /*
- * QTMoleculesView.hpp
+ * QTWorldView.hpp
  *
  *  Created on: Jan 21, 2010
@@ -14 +14 @@
 class MoleculeListClass;
 
-class QTMoleculesView : public QTableWidget, public Observer
+class QTWorldView : public QTableWidget, public Observer
 {
   Q_OBJECT
 
 public:
-  QTMoleculesView(MoleculeListClass *_molecules,QWidget * _parent=0);
-  virtual ~QTMoleculesView();
+  QTWorldView(MoleculeListClass *_molecules,QWidget * _parent=0);
+  virtual ~QTWorldView();
 
 protected: