Move temperature checking into main thread, fixes #12. Please test and confirm

Author: GuLinux

src/drivers/imager.cpp

@@ -101,6 +101,10 @@ void Imager::destroy()
   d->destroyed = true;
 }
 
+void Imager::readTemperature()
+{
+}
+
 void Imager::restart(const ImagerThread::Worker::factory& worker)
 {
   LOG_F_SCOPE

src/drivers/imager.h

@@ -63,6 +63,7 @@ public slots:
   void import_controls(const QVariantList &controls, bool by_id = true);
   virtual void startLive() = 0;
   virtual void destroy();
+  virtual void readTemperature();
 signals:
   void fps(double rate);
   void temperature(double celsius);

src/drivers/simulator/simulatorimager.cpp

@@ -33,7 +33,6 @@ using namespace GuLinux;
 typedef QMap<QString, Imager::Control> SimulatorSettings;
 class SimulatorImagerWorker;
 DPTR_IMPL(SimulatorImager) {
-  unique_ptr<QTimer> refresh_temperature;
   SimulatorSettings settings;
   shared_ptr<SimulatorImagerWorker> worker;
 
@@ -58,7 +57,7 @@ class SimulatorImagerWorker : public ImagerThread::Worker {
 
 Q_DECLARE_METATYPE(SimulatorImagerWorker::ImageType)
 
-SimulatorImager::SimulatorImager(const ImageHandler::ptr& handler) : Imager(handler), dptr(make_unique<QTimer>())
+SimulatorImager::SimulatorImager(const ImageHandler::ptr& handler) : Imager(handler), dptr()
 {
   d->roi_validator = make_shared<ROIValidator>(list<ROIValidator::Rule>{
     ROIValidator::x_multiple(2),
@@ -81,13 +80,6 @@ SimulatorImager::SimulatorImager(const ImageHandler::ptr& handler) : Imager(hand
     {"max_speed",	 Control{8l, "max_speed", Control::Bool}.set_value(false) }, 
   };
   qDebug() << "Max speed: " << d->settings["max_speed"];
-  connect(d->refresh_temperature.get(), &QTimer::timeout, this, [this]{
-   push_job_on_thread([&]{
-      double celsius = SimulatorImager::rand(200, 500) / 10.;
-      emit temperature(celsius);
-    });
-  });
-  d->refresh_temperature->start(2000);
 }
 
 SimulatorImager::~SimulatorImager()
@@ -124,6 +116,14 @@ void SimulatorImager::setControl(const Imager::Control& setting)
   }));
 }
 
+void SimulatorImager::readTemperature()
+{
+    push_job_on_thread([&]{
+       double celsius = SimulatorImager::rand(200, 500) / 10.;
+       emit temperature(celsius);
+     });
+}
+
 Imager::Controls SimulatorImager::controls() const
 {
   return d->settings.values();

src/drivers/simulator/simulatorimager.h

@@ -38,6 +38,7 @@ public slots:
     void setROI(const QRect &) override;
     void clearROI() override;
     void setControl(const Control& setting) override;
+    void readTemperature() override;
 private:
   DPTR
 };

src/drivers/zwo_asi/zwo_asi_imager.cpp

@@ -49,7 +49,6 @@ const int64_t BinControlID = 10001;
 
 DPTR_IMPL(ZWO_ASI_Imager) {
     ASI_CAMERA_INFO info;
-    shared_ptr<QTimer> reload_temperature_timer;
     ZWO_ASI_Imager *q;
 
     Properties properties;
@@ -61,25 +60,14 @@ DPTR_IMPL(ZWO_ASI_Imager) {
     ROIValidator::ptr roi_validator;
     QRect maxROI(int bin) const;
     void restart_worker(int bin, const QRect &roi, ASI_IMG_TYPE format);
-    void read_temperature();
     void update_worker_exposure_timeout();
     ASI_IMG_TYPE format() { return worker.expired() ? ASI_IMG_END : worker.lock()->format(); }
     int bin() { return worker.expired() ? -1 : worker.lock()->bin(); }
     QRect roi() { return worker.expired() ? QRect{} : worker.lock()->roi(); }
 };
 
-void ZWO_ASI_Imager::Private::read_temperature() {
-  qDebug() << "Refreshing ASI_TEMPERATURE if found..";
-  if(temperature_control)
-    q->push_job_on_thread([=]{
-      emit q->temperature(temperature_control->reload().control().value.toDouble());
-    });
-}
-
-
 
-
-ZWO_ASI_Imager::ZWO_ASI_Imager(const ASI_CAMERA_INFO &info, const ImageHandler::ptr &imageHandler) : Imager{imageHandler}, dptr(info, make_shared<QTimer>(), this)
+ZWO_ASI_Imager::ZWO_ASI_Imager(const ASI_CAMERA_INFO &info, const ImageHandler::ptr &imageHandler) : Imager{imageHandler}, dptr(info, this)
 {
     d->roi_validator = make_shared<ROIValidator>(initializer_list<ROIValidator::Rule>{
       ROIValidator::x_multiple(2),
@@ -109,8 +97,6 @@ ZWO_ASI_Imager::ZWO_ASI_Imager(const ASI_CAMERA_INFO &info, const ImageHandler::
     d->properties << LiveStream << ROI << Temperature;
     ASI_CHECK << ASIOpenCamera(info.CameraID) << "Open Camera";
     ASI_CHECK << ASIInitCamera(info.CameraID) << "Init Camera";
-    connect(d->reload_temperature_timer.get(), &QTimer::timeout, this, bind(&Private::read_temperature, d.get() ));
-    d->reload_temperature_timer->start(5000);
     connect(this, &Imager::exposure_changed, this, bind(&Private::update_worker_exposure_timeout, d.get()));
 }
 
@@ -121,10 +107,17 @@ ZWO_ASI_Imager::~ZWO_ASI_Imager()
 void ZWO_ASI_Imager::destroy() {
     Imager::destroy();
     d->worker.reset();
-    d->reload_temperature_timer->stop();
     ASI_CHECK << ASICloseCamera(d->info.CameraID) << "Close Camera";
 }
 
+void ZWO_ASI_Imager::readTemperature() {
+    qDebug() << "Refreshing ASI_TEMPERATURE if found..";
+    if(d->temperature_control)
+        push_job_on_thread([=]{
+           emit temperature(d->temperature_control->reload().control().value.toDouble());
+        });
+}
+
 Imager::Properties ZWO_ASI_Imager::properties() const
 {
     return d->properties;

src/drivers/zwo_asi/zwo_asi_imager.h

@@ -36,7 +36,8 @@ public slots:
     void startLive() override;
     void setROI(const QRect &) override;
     void clearROI() override;
-    virtual void destroy();
+    void destroy() override;
+    void readTemperature() override;
 private:
     DPTR
 };

src/planetaryimager_mainwindow.cpp

@@ -353,6 +353,12 @@ PlanetaryImagerMainWindow::PlanetaryImagerMainWindow(
     d->imageHandler = ImageHandler::ptr{new ThreadImageHandler{compositeImageHandler}};
     d->editROIDialog = new EditROIDialog(this);
     connect(d->editROIDialog, &EditROIDialog::roiSelected, this, [=](const QRect &roi){ d->imager->setROI(roi); });
+    auto readTemperature = new QTimer{this};
+    connect(readTemperature, &QTimer::timeout, this, [=] {
+        if(d->imager)
+            QMetaObject::invokeMethod(d->imager, "readTemperature", Qt::QueuedConnection);
+    });
+    readTemperature->start(2000);
 }
 
 void PlanetaryImagerMainWindow::closeEvent(QCloseEvent* event)