jfmcarreira/calyp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix threads for histogram and modules

Browse Source
This commit is contained in:
jfmcarreira
2021-06-06 12:12:16 +01:00
parent 420aeb89a6
commit 9e3fb9c0a0
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/CalypAppModuleIf.cpp
+2 -4
View File
@@ -167,14 +167,12 @@ void CalypAppModuleIf::show()
if( m_pcDisplaySubWindow ) if( m_pcDisplaySubWindow )
{ {
m_pcDisplaySubWindow->setCurrFrame( m_pcProcessedFrame ); m_pcDisplaySubWindow->setCurrFrame( m_pcProcessedFrame );
m_pcDisplaySubWindow->setFillWindow( false ); m_pcDisplaySubWindow->setFillWindow( isRunning() );
m_pcDisplaySubWindow->clearWindowBusy();
} }
else else
{ {
m_pcSubWindow[0]->setCurrFrame( m_pcProcessedFrame ); m_pcSubWindow[0]->setCurrFrame( m_pcProcessedFrame );
m_pcSubWindow[0]->setFillWindow( false ); m_pcSubWindow[0]->setFillWindow( isRunning() );
m_pcSubWindow[0]->clearWindowBusy();
} }
break; break;
case CLP_FRAME_MEASUREMENT_MODULE: case CLP_FRAME_MEASUREMENT_MODULE:
app/widgets/HistogramWidget.cpp
+2 -10
View File
@@ -53,25 +53,17 @@ public:
void setup( CalypFrame* frame ) void setup( CalypFrame* frame )
{ {
m_pcFrame = frame; m_pcFrame = frame;
run(); //run();
//start(); start();
} }
void run() void run()
{ {
if( m_pcFrame && m_parent ) if( m_pcFrame && m_parent )
{ {
EventData* eventData = new EventData(); EventData* eventData = new EventData();
// eventDm_imageHistogramata->starting = true;
// eventData->success = false;
// eventData->histogram = m_histogram;
// QCoreApplication::postEvent( m_parent, eventData );
eventData->starting = true; eventData->starting = true;
m_pcFrame->calcHistogram(); m_pcFrame->calcHistogram();
eventData->starting = false; eventData->starting = false;
// eventData->success = m_pcFrame->getHasHistogram();
eventData->success = true; eventData->success = true;
eventData->frame = m_pcFrame; eventData->frame = m_pcFrame;
QCoreApplication::postEvent( m_parent, eventData ); QCoreApplication::postEvent( m_parent, eventData );