Changeset 7d9416 for src/UIElements/Qt4

Timestamp:

Jun 13, 2012, 5:39:06 PM (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:

d496fd

Parents:

a483e4

git-author:

Michael Ankele <ankele@…> (05/10/12 15:00:12)

git-committer:

Frederik Heber <heber@…> (06/13/12 17:39:06)

Message:

Turned query<Box> into query<RealSpaceMatrix>

• CenterInBox and ChangeBox require RealSpaceMatrix instead of Box now for parameter cell_size.
• changed all query instances for Box, now query for RealSpaceMatrix.
• renamed BoxValue to RealSpaceMatrixValue (no other changes required). This is needed by the CommandLineUI only.

Location:

src/UIElements/Qt4

Files:

• Pipe/RealSpaceMatrixQtQueryPipe.cpp (moved) (moved from src/UIElements/Qt4/Pipe/BoxQtQueryPipe.cpp ) (3 diffs)
• Pipe/RealSpaceMatrixQtQueryPipe.hpp (moved) (moved from src/UIElements/Qt4/Pipe/BoxQtQueryPipe.hpp ) (2 diffs)
• QtDialog.cpp (modified) (1 diff)
• QtDialog.hpp (modified) (2 diffs)
• Query/QtQuery.hpp (modified) (3 diffs)
• Query/RealSpaceMatrixQtQuery.cpp (moved) (moved from src/UIElements/Qt4/Query/BoxQtQuery.cpp ) (3 diffs)

src/UIElements/Qt4/Pipe/RealSpaceMatrixQtQueryPipe.cpp

@@ -18 +18 @@
 #endif
 
-#include "UIElements/Qt4/Pipe/BoxQtQueryPipe.hpp"
+#include "UIElements/Qt4/Pipe/RealSpaceMatrixQtQueryPipe.hpp"
 #include "UIElements/Qt4/QtDialog.hpp"
 
@@ -26 +26 @@
 #include "CodePatterns/MemDebug.hpp"
 #include "LinearAlgebra/RealSpaceMatrix.hpp"
-#include "Box.hpp"
 
-BoxQtQueryPipe::BoxQtQueryPipe(Parameter<Box> &_content, QtDialog *_dialog, QTableWidget *_inputTable) :
+RealSpaceMatrixQtQueryPipe::RealSpaceMatrixQtQueryPipe(Parameter<RealSpaceMatrix> &_content, QtDialog *_dialog, QTableWidget *_inputTable) :
   content(_content),
   dialog(_dialog),
@@ -37 +36 @@
 }
 
-BoxQtQueryPipe::~BoxQtQueryPipe()
+RealSpaceMatrixQtQueryPipe::~RealSpaceMatrixQtQueryPipe()
 {
   delete tmpM;
 }
 
-void BoxQtQueryPipe::update(int row, int column)
+void RealSpaceMatrixQtQueryPipe::update(int row, int column)
 {
   tmpM->at(row, column) = inputTable->item(row, column)->text().toDouble();
-  Box b;
-  b.setM(*tmpM);
-  content.set(b);
+  content.set(*tmpM);
   dialog->update();
 }

src/UIElements/Qt4/Pipe/RealSpaceMatrixQtQueryPipe.hpp

@@ -20 +20 @@
 class QTableWidget;
 
-class Box;
 class QtDialog;
 class RealSpaceMatrix;
 
 
-class BoxQtQueryPipe : public QWidget {
+class RealSpaceMatrixQtQueryPipe : public QWidget {
   Q_OBJECT
 public:
-  BoxQtQueryPipe(Parameter<Box> &_content, QtDialog *_dialog, QTableWidget *_inputTable);
-  virtual ~BoxQtQueryPipe();
+  RealSpaceMatrixQtQueryPipe(Parameter<RealSpaceMatrix> &_content, QtDialog *_dialog, QTableWidget *_inputTable);
+  virtual ~RealSpaceMatrixQtQueryPipe();
 
 public slots:
@@ -35 +34 @@
 
 private:
-  Parameter<Box> &content;
+  Parameter<RealSpaceMatrix> &content;
   QtDialog *dialog;
   QTableWidget *inputTable;

src/UIElements/Qt4/QtDialog.cpp

@@ -95 +95 @@
 }
 
-void QtDialog::queryBox(Parameter<Box> &param, const char* title, std::string)
+void QtDialog::queryRealSpaceMatrix(Parameter<RealSpaceMatrix> &param, const char* title, std::string)
 {
-  registerQuery(new BoxQtQuery(param,title,inputLayout,this));
+  registerQuery(new RealSpaceMatrixQtQuery(param,title,inputLayout,this));
 }
 

src/UIElements/Qt4/QtDialog.hpp

@@ -49 +49 @@
   virtual void queryVector(Parameter<Vector> &, const char*,bool,std::string = "");
   virtual void queryVectors(Parameter<std::vector<Vector> > &, const char*,bool,std::string = "");
-  virtual void queryBox(Parameter<Box> &, const char*, std::string = "");
+  virtual void queryRealSpaceMatrix(Parameter<RealSpaceMatrix> &, const char*, std::string = "");
   virtual void queryElement(Parameter<const element *> &, const char*,std::string = "");
   virtual void queryElements(Parameter<std::vector<const element *> > &, const char*,std::string = "");
@@ -63 +63 @@
   class AtomsQtQuery;
   class BooleanQtQuery;
-  class BoxQtQuery;
+  class RealSpaceMatrixQtQuery;
   class DoubleQtQuery;
   class DoublesQtQuery;

src/UIElements/Qt4/Query/QtQuery.hpp

@@ -37 +37 @@
 class AtomsQtQueryPipe;
 class BooleanQtQueryPipe;
-class BoxQtQueryPipe;
+class RealSpaceMatrixQtQueryPipe;
 class DoubleQtQueryPipe;
 class DoublesQtQueryPipe;
@@ -98 +98 @@
 };
 
-class QtDialog::BoxQtQuery : public Dialog::BoxQuery {
-public:
-  BoxQtQuery(Parameter<Box> &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
-  virtual ~BoxQtQuery();
+class QtDialog::RealSpaceMatrixQtQuery : public Dialog::RealSpaceMatrixQuery {
+public:
+  RealSpaceMatrixQtQuery(Parameter<RealSpaceMatrix> &, std::string _title, QBoxLayout *_parent,QtDialog *_dialog);
+  virtual ~RealSpaceMatrixQtQuery();
   virtual bool handle();
 private:
@@ -109 +109 @@
   QTableWidget *inputTable;
 
-  BoxQtQueryPipe *pipe;
+  RealSpaceMatrixQtQueryPipe *pipe;
 };
 

src/UIElements/Qt4/Query/RealSpaceMatrixQtQuery.cpp

@@ -25 +25 @@
 
 #include "UIElements/Qt4/Query/QtQuery.hpp"
-#include "UIElements/Qt4/Pipe/BoxQtQueryPipe.hpp"
+#include "UIElements/Qt4/Pipe/RealSpaceMatrixQtQueryPipe.hpp"
 
 #include "LinearAlgebra/RealSpaceMatrix.hpp"
 #include "World.hpp"
 
-QtDialog::BoxQtQuery::BoxQtQuery(Parameter<Box> &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
-    Dialog::BoxQuery(param, _title),
+QtDialog::RealSpaceMatrixQtQuery::RealSpaceMatrixQtQuery(Parameter<RealSpaceMatrix> &param, std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
+    Dialog::RealSpaceMatrixQuery(param, _title),
     parent(_parent)
 {
@@ -44 +44 @@
   inputTable->setVerticalHeaderLabels(CoordinateList);
 
-  pipe = new BoxQtQueryPipe(tmp,_dialog, inputTable);
+  pipe = new RealSpaceMatrixQtQueryPipe(tmp,_dialog, inputTable);
 
   // fill the box with current matrix
@@ -62 +62 @@
 }
 
-QtDialog::BoxQtQuery::~BoxQtQuery()
+QtDialog::RealSpaceMatrixQtQuery::~RealSpaceMatrixQtQuery()
 {
   delete pipe;
 }
 
-bool QtDialog::BoxQtQuery::handle() {
+bool QtDialog::RealSpaceMatrixQtQuery::handle() {
   return true;
 }