Changeset 73faf4 for src/UIElements/Qt4/Query/QtQuery.hpp

Timestamp:

May 8, 2017, 2:00:47 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

c8165c

Parents:

ce254c (diff), cb6357 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'GeometryObjects' into Candidate_v1.6.1

File:

• src/UIElements/Qt4/Query/QtQuery.hpp (modified) (2 diffs)

src/UIElements/Qt4/Query/QtQuery.hpp

@@ -414 +414 @@
 
 public slots:
+  void pageChanged(int);
+  void onUpdateName(int);
   void onUpdateX(double);
   void onUpdateY(double);
@@ -424 +426 @@
   QBoxLayout *subLayout;
   QBoxLayout *coordLayout;
-  QLabel *coordLabel;
   QDoubleSpinBox *coordInputX;
   QDoubleSpinBox *coordInputY;
   QDoubleSpinBox *coordInputZ;
   Dialog *dialog;
-};
-
-class QtDialog::VectorsQtQuery : public QWidget, public QtQuery<std::vector<Vector> >, public QtQueryList<Vector> {
+  QBoxLayout *nameLayout;
+  QComboBox *nameComboBox;
+};
+
+class QtDialog::VectorsQtQuery :
+    public QWidget,
+    public QtQuery<std::vector<Vector> >,
+    public QtQueryList<Vector> {
   Q_OBJECT
 public: