From 9e3fb9c0a02e8caabc4874edbb1a80381f1b9d03 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 6 Jun 2021 12:12:16 +0100 Subject: [PATCH] Fix threads for histogram and modules --- app/CalypAppModuleIf.cpp | 6 ++---- app/widgets/HistogramWidget.cpp | 12 ++---------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/app/CalypAppModuleIf.cpp b/app/CalypAppModuleIf.cpp index 050c045..3dfab31 100644 --- a/app/CalypAppModuleIf.cpp +++ b/app/CalypAppModuleIf.cpp @@ -167,14 +167,12 @@ void CalypAppModuleIf::show() if( m_pcDisplaySubWindow ) { m_pcDisplaySubWindow->setCurrFrame( m_pcProcessedFrame ); - m_pcDisplaySubWindow->setFillWindow( false ); - m_pcDisplaySubWindow->clearWindowBusy(); + m_pcDisplaySubWindow->setFillWindow( isRunning() ); } else { m_pcSubWindow[0]->setCurrFrame( m_pcProcessedFrame ); - m_pcSubWindow[0]->setFillWindow( false ); - m_pcSubWindow[0]->clearWindowBusy(); + m_pcSubWindow[0]->setFillWindow( isRunning() ); } break; case CLP_FRAME_MEASUREMENT_MODULE: diff --git a/app/widgets/HistogramWidget.cpp b/app/widgets/HistogramWidget.cpp index 64b7013..4813350 100644 --- a/app/widgets/HistogramWidget.cpp +++ b/app/widgets/HistogramWidget.cpp @@ -53,25 +53,17 @@ public: void setup( CalypFrame* frame ) { m_pcFrame = frame; - run(); - //start(); + //run(); + start(); } void run() { if( m_pcFrame && m_parent ) { EventData* eventData = new EventData(); - // eventDm_imageHistogramata->starting = true; - // eventData->success = false; - // eventData->histogram = m_histogram; - // QCoreApplication::postEvent( m_parent, eventData ); - eventData->starting = true; - m_pcFrame->calcHistogram(); - eventData->starting = false; - // eventData->success = m_pcFrame->getHasHistogram(); eventData->success = true; eventData->frame = m_pcFrame; QCoreApplication::postEvent( m_parent, eventData );