Ignore:
Timestamp:
Jul 25, 2015, 1:01:21 PM (9 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:
73b13c
Parents:
4965922
git-author:
Frederik Heber <heber@…> (06/17/15 16:58:32)
git-committer:
Frederik Heber <heber@…> (07/25/15 13:01:21)
Message:

FIX: QDebugStream is now thread-safe.

  • also Fix to QTextCursor not registered.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/UIElements/Views/Qt4/QDebugStream.hpp

    r4965922 r9737db  
    1414#endif
    1515
     16#include <QDebug>
    1617#include <QTextEdit>
    17 #include <QDebug>
     18#include <QMutex>
    1819
    1920#include <ostream>
    … …  
    3435public:
    3536  QDebugStream(std::ostream &stream, QTextEdit* text_edit) :
    36     m_stream(stream),
    37     printing(false)
     37    m_stream(stream)
    3838  {
    3939    log_window = text_edit;
    … …  
    4545    // output anything that is left
    4646    if (!m_string.empty()) {
     47      change_mutex.lock();
    4748      log_window->append(m_string.c_str());
    4849      qDebug() << m_string.c_str();
     50      change_mutex.unlock();
    4951    }
    5052
    … …  
    5658  {
    5759    if (v == '\n') {
    58       while (printing);
    59       printing = true;
     60      change_mutex.lock();
    6061      log_window->append(m_string.c_str());
    6162      qDebug() << m_string.c_str();
    6263      m_string.erase(m_string.begin(), m_string.end());
    63       printing = false;
     64      change_mutex.unlock();
    6465    } else
    6566      m_string += v;
    … …  
    7071  virtual std::streamsize xsputn(const char *p, std::streamsize n)
    7172  {
    72     while (printing);
    73     printing = true;
     73    change_mutex.lock();
    7474    m_string.append(p, p + n);
    75     printing = false;
     75    change_mutex.unlock();
    7676
    7777    size_t pos = 0;
    … …  
    8080      if (pos != std::string::npos) {
    8181        std::string tmp(m_string.begin(), m_string.begin() + pos);
    82         while (printing);
    83         printing = true;
     82        change_mutex.lock();
    8483        log_window->append(tmp.c_str());
    8584        qDebug() << tmp.c_str();
    8685        m_string.erase(m_string.begin(), m_string.begin() + pos + 1);
    87         printing = false;
     86        change_mutex.unlock();
    8887      }
    8988    }
    … …  
    9796  std::string m_string;
    9897
    99   bool printing;
     98  QTextEdit* log_window;
    10099
    101   QTextEdit* log_window;
     100  QMutex change_mutex;
    102101};
    103102
Note: See TracChangeset for help on using the changeset viewer.