Changeset 3d61c7

Timestamp:

Sep 6, 2016, 2:36:34 PM (9 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:

d21933

Parents:

0249ce

git-author:

Frederik Heber <heber@…> (08/30/16 14:15:53)

git-committer:

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

Message:

Added configure enable-switch for qtgui's capturing of stdout.

Files:

• configure.ac (modified) (1 diff)
• src/UIElements/Views/Qt4/QtLogBox.cpp (modified) (1 diff)

configure.ac

@@ -109 +109 @@
 AM_CONDITIONAL([CONDQTGUI], [test x"$enable_qtgui" != x"no"])
 AC_SUBST(HAVE_QTGUI)
+
+dnl Check whether qtgui captures log or not
+AC_MSG_CHECKING(whether to capture stdout in qtgui)
+AC_ARG_ENABLE(
+        [qtgui_capture_log],
+        AS_HELP_STRING([--enable-qtgui-capture-log],[turn on capturing of log inside qtgui [default=yes]]),
+        enable_qtgui_capture_log=$enableval,
+        enable_qtgui_capture_log="yes"
+)
+AC_MSG_RESULT($enable_qtgui_capture_log)
+AS_IF([test x"$enable_qtgui_capture_log" != x"no"],[
+  AC_DEFINE(QT_CAPTURES_LOG,1, ["Have QtGui capture the stdout."])
+])
+AC_SUBST(QT_CAPTURES_LOG)
+
 
 # check additionally for QWT to enable plotting of potentials

src/UIElements/Views/Qt4/QtLogBox.cpp

@@ -44 +44 @@
 #include "World.hpp"
 
+#ifndef QT_CAPTURES_LOG
+#include <sstream>
+
+std::stringstream dummystream;
+#endif
+
 QtLogBox::QtLogBox(QWidget * _parent) :
     QPlainTextEdit (_parent),
+#ifdef QT_CAPTURES_LOG
     logbuf(std::cout, this)
+#else
+  logbuf(dummystream, this)
+#endif
 {
   // don't edit the log