Changeset 52dfcc for src/UIElements/Views/Qt4

Timestamp:

Feb 10, 2015, 2:09:39 PM (10 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:

6a6276

Parents:

b569b8

git-author:

Frederik Heber <heber@…> (01/25/15 21:19:53)

git-committer:

Frederik Heber <heber@…> (02/10/15 14:09:39)

Message:

FIX: QDebugStream is now protected against multiple writes to log window.

• writes bracketed with bool.
• we had multiple, seemingly random segfaults in QDebugStream when inserting new text.

File:

• src/UIElements/Views/Qt4/QDebugStream.hpp (modified) (5 diffs)

src/UIElements/Views/Qt4/QDebugStream.hpp

@@ -33 +33 @@
 {
 public:
-  QDebugStream(std::ostream &stream, QTextEdit* text_edit) : m_stream(stream)
+  QDebugStream(std::ostream &stream, QTextEdit* text_edit) :
+    m_stream(stream),
+    printing(false)
   {
     log_window = text_edit;
@@ -54 +56 @@
   {
     if (v == '\n') {
+      while (printing);
+      printing = true;
       log_window->append(m_string.c_str());
       qDebug() << m_string.c_str();
       m_string.erase(m_string.begin(), m_string.end());
+      printing = false;
     } else
       m_string += v;
@@ -65 +70 @@
   virtual std::streamsize xsputn(const char *p, std::streamsize n)
   {
+    while (printing);
+    printing = true;
     m_string.append(p, p + n);
+    printing = false;
 
     size_t pos = 0;
@@ -72 +80 @@
       if (pos != std::string::npos) {
         std::string tmp(m_string.begin(), m_string.begin() + pos);
+        while (printing);
+        printing = true;
         log_window->append(tmp.c_str());
         qDebug() << tmp.c_str();
         m_string.erase(m_string.begin(), m_string.begin() + pos + 1);
+        printing = false;
       }
     }
@@ -86 +97 @@
   std::string m_string;
 
+  bool printing;
+
   QTextEdit* log_window;
 };