Changeset 73faf4 for src/UIElements/Qt4/QtMainWindow.cpp

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/QtMainWindow.cpp (modified) (3 diffs)

src/UIElements/Qt4/QtMainWindow.cpp

@@ -59 +59 @@
 #include "Views/Qt4/QtHomologyList.hpp"
 #include "UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp"
+#include "Views/Qt4/QtGeometryList.hpp"
 #include "Views/Qt4/QtLogBox.hpp"
 #include "Views/Qt4/QtShapeController.hpp"
@@ -112 +113 @@
   homologyList = new QtHomologyList(worldTab);
   fragmentList = new QtFragmentList(worldTab);
+  geometryList = new QtGeometryList(worldTab);
   logBox = new QtLogBox(std::cout, worldTab);
   errorlogBox = new QtLogBox(std::cerr, worldTab);
@@ -147 +149 @@
   worldTab->addTab(fragmentList, "All Fragments");
   worldTab->addTab(homologyList, "All Homologies");
+  worldTab->addTab(geometryList, "All Geometries");
   worldTab->addTab(logBox, "Log");
   worldTab->addTab(errorlogBox, "Errors");