chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Thread murderalization enhancement

Browse Source
This commit is contained in:
Mark Watkins 2011-09-01 12:06:38 +10:00
parent 7169f20c50
commit f0cf7a84a9
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Graphs/gGraphView.cpp
View File

@ -298,8 +298,9 @@ gThread::gThread(gGraph *g)
} }
void gThread::run() void gThread::run()
{ {
while (this->isRunning()) { m_running=true;
mutex.lock(); while (m_running) {
if (mutex.tryLock(1000)) {
int originX=m_lastbounds.x(); int originX=m_lastbounds.x();
int originY=m_lastbounds.y(); int originY=m_lastbounds.y();
int width=m_lastbounds.width(); int width=m_lastbounds.width();
@ -307,6 +308,7 @@ void gThread::run()
graph->paint(originX,originY,width,height); graph->paint(originX,originY,width,height);
graph->threadDone(); graph->threadDone();
} }
}
} }
void gThread::paint(int originX, int originY, int width, int height) void gThread::paint(int originX, int originY, int width, int height)
{ {
@ -343,6 +345,8 @@ gGraph::gGraph(gGraphView *graphview,QString title,int height,short group) :
gGraph::~gGraph() gGraph::~gGraph()
{ {
if (m_graphview->useThreads()) { if (m_graphview->useThreads()) {
m_thread->die();
m_thread->wait();
m_thread->exit(); m_thread->exit();
} }
delete m_thread; delete m_thread;

3
Graphs/gGraphView.h
View File

@ -163,11 +163,12 @@ public:
gThread(gGraph *g); gThread(gGraph *g);
void run(); void run();
void paint(int originX, int originY, int width, int height); void paint(int originX, int originY, int width, int height);
void die() { m_running=false; }
QMutex mutex; QMutex mutex;
protected: protected:
gGraph * graph; gGraph * graph;
QRect m_lastbounds; QRect m_lastbounds;
volatile bool m_running;
}; };
class gGraph class gGraph