Changeset 4e5bf5

Timestamp:

Jun 28, 2014, 8:03:02 PM (11 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:

c73e35

Parents:

1b1fa5 (diff), 0ef912 (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 'QtGUI_LogBox' into stable

Location:

src/UIElements

Files:

• Makefile.am (modified) (2 diffs)
• Qt4/QtMainWindow.cpp (modified) (3 diffs)
• Qt4/QtMainWindow.hpp (modified) (2 diffs)
• Views/Qt4/QDebugStream.hpp (added)
• Views/Qt4/QtLogBox.cpp (added)
• Views/Qt4/QtLogBox.hpp (added)

src/UIElements/Makefile.am

@@ -172 +172 @@
   UIElements/Views/Qt4/QtHomologyList.cpp \
   UIElements/Views/Qt4/QtInfoBox.cpp \
+  UIElements/Views/Qt4/QtLogBox.cpp \
   UIElements/Views/Qt4/QtMoleculeList.cpp \
   UIElements/Views/Qt4/QtShapeController.cpp \
@@ -192 +193 @@
   UIElements/Qt4/Query/QtQuery.hpp \
   UIElements/Menu/Qt4/QtMenuPipe.hpp \
+  UIElements/Views/Qt4/QDebugStream.hpp \
   UIElements/Views/Qt4/QtElementList.hpp \
   UIElements/Views/Qt4/QtFragmentList.hpp \
   UIElements/Views/Qt4/QtHomologyList.hpp \
   UIElements/Views/Qt4/QtInfoBox.hpp \
+  UIElements/Views/Qt4/QtLogBox.hpp \
   UIElements/Views/Qt4/QtMoleculeList.hpp \
   UIElements/Views/Qt4/QtShapeController.hpp \

src/UIElements/Qt4/QtMainWindow.cpp

@@ -57 +57 @@
 #include "Views/Qt4/QtFragmentList.hpp"
 #include "Views/Qt4/QtHomologyList.hpp"
+#include "Views/Qt4/QtLogBox.hpp"
 #include "Views/Qt4/QtShapeController.hpp"
 #include "Views/Qt4/QtInfoBox.hpp"
@@ -98 +99 @@
   homologyList = new QtHomologyList(worldTab);
   fragmentList = new QtFragmentList(worldTab);
+  logBox = new QtLogBox(worldTab);
   shapeController = new QtShapeController(worldTab);
 
@@ -130 +132 @@
   worldTab->addTab(fragmentList, "All Fragments");
   worldTab->addTab(homologyList, "All Homologies");
+  worldTab->addTab(logBox, "Log");
 
   statusBar = new QtStatusBar(this);

src/UIElements/Qt4/QtMainWindow.hpp

@@ -23 +23 @@
 #include "Menu/Qt4/QtMenu.hpp"
 
+class QtElementList;
+class QtFragmentList;
+class QtHomologyList;
+class QtLogBox;
 class QtMoleculeList;
-class QtElementList;
-class QtHomologyList;
-class QtFragmentList;
 class QtShapeController;
 class StringView;
@@ -64 +65 @@
   QtToolBar *toolbar;
   QSlider *timeline;
+  QtLogBox *logBox;
 
 };