Changeset ec8471 for src/UIElements/Views

Timestamp:

Aug 5, 2015, 5:32:13 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:

6fe4f7

Parents:

b9e47e

git-author:

Frederik Heber <heber@…> (07/25/15 13:06:15)

git-committer:

Frederik Heber <heber@…> (08/05/15 17:32:13)

Message:

FIX: QtLogBox is again included and working thread-safe.

• QDebugStream is now appending text to QtLogBox in a thread-safe manner by using signal/slots. This code is taken from qt-forum.de.

Location:

src/UIElements/Views/Qt4

Files:

• QDebugStream.hpp (modified) (1 diff)
• QtLogBox.cpp (modified) (2 diffs)
• QtLogBox.hpp (modified) (2 diffs)

src/UIElements/Views/Qt4/QDebugStream.hpp

@@ -14 +14 @@
 #endif
 
-#include <QDebug>
-#include <QTextEdit>
+#include <QObject>
+#include <QPlainTextEdit>
 #include <QMutex>
 
-#include <ostream>
-#include <streambuf>
-#include <string>
+/**
+ * Taken from http://www.qtforum.de/forum/viewtopic.php?t=7970
+ */
+class QDebugStream : public QObject, std::basic_streambuf<char>{
 
-/** This class connects an output stream, such as std::cout, and a QTextEdit.
- *
- * It works by overriding certain streambuf functions such as xsputn() and
- * overflow().
- *
- * This code is copied from the questions posted here
- * http://stackoverflow.com/questions/10308425/redirect-stdcout-to-a-qtextedit
- * which worked right away.
- */
-class QDebugStream : public std::basic_streambuf<char>
-{
+   Q_OBJECT
+
+signals:
+   void sendString(QString text);
+
 public:
-  QDebugStream(std::ostream &stream, QTextEdit* text_edit) :
-    m_stream(stream)
-  {
-    log_window = text_edit;
-    m_old_buf = stream.rdbuf();
-    stream.rdbuf(this);
-  }
-  ~QDebugStream()
-  {
-    // output anything that is left
-    if (!m_string.empty()) {
-      change_mutex.lock();
-      log_window->append(m_string.c_str());
-      qDebug() << m_string.c_str();
-      change_mutex.unlock();
-    }
+   QDebugStream(std::ostream &stream, QPlainTextEdit* text_edit) : m_stream(stream){
+      log_window = text_edit;
+      m_old_buf = stream.rdbuf();
+      stream.rdbuf(this);
 
-    m_stream.rdbuf(m_old_buf);
-  }
+      connect(this, SIGNAL(sendString(QString)), text_edit, SLOT(appendPlainText (QString)));
+   }
+   ~QDebugStream(){
+   // output anything that is left
+   if (!m_string.empty())
+      emit sendString(m_string.c_str());
+      //log_window->appendPlainText(m_string.c_str());
+      m_stream.rdbuf(m_old_buf);
+   }
 
 protected:
-  virtual int_type overflow(int_type v)
-  {
-    if (v == '\n') {
-      change_mutex.lock();
-      log_window->append(m_string.c_str());
-      qDebug() << m_string.c_str();
-      m_string.erase(m_string.begin(), m_string.end());
-      change_mutex.unlock();
-    } else
-      m_string += v;
+   virtual int_type overflow(int_type v){
+      mutex.lock();
+      if (v == '\n'){
+         emit sendString(m_string.c_str());
+         //log_window->appendPlainText(m_string.c_str());
+         m_string.erase(m_string.begin(), m_string.end());
+      }
+      else
+         m_string += v;
 
-    return v;
-  }
+      mutex.unlock();
+      return v;
+   }
 
-  virtual std::streamsize xsputn(const char *p, std::streamsize n)
-  {
-    change_mutex.lock();
-    m_string.append(p, p + n);
-    change_mutex.unlock();
+   virtual std::streamsize xsputn(const char *p, std::streamsize n){
+      mutex.lock();
 
-    size_t pos = 0;
-    while (pos != std::string::npos) {
-      pos = m_string.find('\n');
-      if (pos != std::string::npos) {
-        std::string tmp(m_string.begin(), m_string.begin() + pos);
-        change_mutex.lock();
-        log_window->append(tmp.c_str());
-        qDebug() << tmp.c_str();
-        m_string.erase(m_string.begin(), m_string.begin() + pos + 1);
-        change_mutex.unlock();
+      m_string.append(p, p + n);
+      size_t pos = 0;
+      while (pos != std::string::npos){
+         pos = m_string.find('\n');
+         if (pos != std::string::npos){
+         std::string tmp(m_string.begin(), m_string.begin() + pos);
+         emit sendString(tmp.c_str());
+         //log_window->appendPlainText(tmp.c_str());
+         m_string.erase(m_string.begin(), m_string.begin() + pos + 1);
+         }
       }
-    }
 
-  return n;
-  }
+      mutex.unlock();
+      return n;
+   }
 
 private:
-  std::ostream &m_stream;
-  std::streambuf *m_old_buf;
-  std::string m_string;
-
-  QTextEdit* log_window;
-
-  QMutex change_mutex;
+   std::ostream &m_stream;
+   std::streambuf *m_old_buf;
+   std::string m_string;
+   QPlainTextEdit* log_window;
+   QMutex mutex;
 };
 
-#endif /* QDEBUGSTREAM_HPP_ */
+
+#endif // QDEBUGSTREAM_HPP

src/UIElements/Views/Qt4/QtLogBox.cpp

@@ -45 +45 @@
 
 QtLogBox::QtLogBox(QWidget * _parent) :
-    QTextEdit (_parent),
+    QPlainTextEdit (_parent),
     logbuf(std::cout, this)
 {
@@ -80 +80 @@
 
   // recast event
-  QTextEdit::mousePressEvent(e);
+  QPlainTextEdit::mousePressEvent(e);
 }
 

src/UIElements/Views/Qt4/QtLogBox.hpp

@@ -14 +14 @@
 #endif
 
-#include <QTextEdit>
+#include <QPlainTextEdit>
 
 #include <string>
@@ -27 +27 @@
  *
  */
-class QtLogBox : public QTextEdit
+class QtLogBox : public QPlainTextEdit
 {
   Q_OBJECT