Changeset be848d for src/UIElements/Qt4/QtMainWindow.cpp

Timestamp:

Jun 21, 2017, 10:02:14 PM (9 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, Candidate_v1.7.0, Candidate_v1.7.1, ChangeBugEmailaddress, ChemicalSpaceEvaluator, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_Verbose_Codepatterns, ForceAnnealing_oldresults, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, stable

Children:

78ea3c

Parents:

9a9f847 (diff), 6116df (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");