Changeset d21933 for src/UIElements

Timestamp:

Sep 6, 2016, 2:36:34 PM (8 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, 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_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, 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, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, 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, Ubuntu_1604_changes, stable

Children:

0f5956

Parents:

3d61c7

git-author:

Frederik Heber <heber@…> (08/31/16 08:06:50)

git-committer:

Frederik Heber <heber@…> (09/06/16 14:36:34)

Message:

Added second log view for stderr.

Location:

src/UIElements

Files:

• Qt4/QtMainWindow.cpp (modified) (2 diffs)
• Qt4/QtMainWindow.hpp (modified) (1 diff)
• Views/Qt4/QtLogBox.cpp (modified) (1 diff)
• Views/Qt4/QtLogBox.hpp (modified) (2 diffs)

src/UIElements/Qt4/QtMainWindow.cpp

@@ -112 +112 @@
   homologyList = new QtHomologyList(worldTab);
   fragmentList = new QtFragmentList(worldTab);
-  logBox = new QtLogBox(worldTab);
+  logBox = new QtLogBox(std::cout, worldTab);
+  errorlogBox = new QtLogBox(std::cerr, worldTab);
   shapeController = new QtShapeController(worldTab);
 
@@ -147 +148 @@
   worldTab->addTab(homologyList, "All Homologies");
   worldTab->addTab(logBox, "Log");
+  worldTab->addTab(errorlogBox, "Errors");
 
   statusBar = new QtStatusBar(this);

src/UIElements/Qt4/QtMainWindow.hpp

@@ -70 +70 @@
   QSlider *timeline;
   QtLogBox *logBox;
+  QtLogBox *errorlogBox;
 
   QtObservedInstanceBoard *InstanceBoard;

src/UIElements/Views/Qt4/QtLogBox.cpp

@@ -47 +47 @@
 #include <sstream>
 
-std::stringstream dummystream;
+std::stringstream dummystream("Log capture is not compiled in.");
 #endif
 
-QtLogBox::QtLogBox(QWidget * _parent) :
+QtLogBox::QtLogBox(std::ostream &stream, QWidget * _parent) :
     QPlainTextEdit (_parent),
 #ifdef QT_CAPTURES_LOG
-    logbuf(std::cout, this)
+    logbuf(stream, this)
 #else
   logbuf(dummystream, this)

src/UIElements/Views/Qt4/QtLogBox.hpp

@@ -16 +16 @@
 #include <QPlainTextEdit>
 
+#include <iosfwd>
 #include <string>
 
@@ -32 +33 @@
 
 public:
-  QtLogBox(QWidget * _parent=0);
+  QtLogBox(std::ostream &stream, QWidget * _parent=0);
   virtual ~QtLogBox();