From 1381ceda536e2e8e2173be9885f84b3ee5aa6d15 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan.grewe@g-node.org>
Date: Mon, 16 Mar 2020 11:40:02 +0100
Subject: [PATCH] reapply image scaling

---
 pylonrecorder.cpp | 18 +++++++++++++-----
 pylonrecorder.h   |  1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pylonrecorder.cpp b/pylonrecorder.cpp
index 827bec3..b8c4900 100644
--- a/pylonrecorder.cpp
+++ b/pylonrecorder.cpp
@@ -77,7 +77,8 @@ PylonRecorder::PylonRecorder(QWidget *parent)
   //grabbingLabel->setStyleSheet("QLabel { color : gray; }");
   grabbingLabel->setEnabled(false);
   labelSwitch = false;
-  cameraConnectedLabel = new QLabel("disconnected");
+  cameraConnectedLabel = new QLabel("not connected");
+  cameraConnectedLabel->setStyleSheet("QLabel { color : red; }");
 
   statusBar()->addWidget(new QLabel("Camera:"));
   statusBar()->addWidget(cameraConnectedLabel);
@@ -124,15 +125,17 @@ void PylonRecorder::setImage(const QImage &newImage) {
   // (image.colorSpace().isValid())
   //  image.convertToColorSpace(QColorSpace::SRgb);
   imageLabel->setPixmap(QPixmap::fromImage(image));
-  scaleFactor = 1.0;
+  // scaleFactor = 1.0;
 
   scrollArea->setVisible(true);
   printAct->setEnabled(true);
   fitToWindowAct->setEnabled(true);
   updateActions();
 
-  if (!fitToWindowAct->isChecked())
+  if (!fitToWindowAct->isChecked()) {
     imageLabel->adjustSize();
+    applyScaling();
+  }
 }
 
 bool PylonRecorder::saveFile(const QString &fileName) {
@@ -382,6 +385,10 @@ void PylonRecorder::scaleImage(double factor) {
   zoomOutAct->setEnabled(scaleFactor > 0.333);
 }
 
+void PylonRecorder::applyScaling(){
+  imageLabel->resize(scaleFactor * imageLabel->pixmap()->size());
+}
+
 void PylonRecorder::quitApplication() {
   if (pylon->isOpen()) {
       if (grabbing) {
@@ -411,8 +418,8 @@ void PylonRecorder::connectCamera() {
 void PylonRecorder::disconnectCamera() {
   pylon->closeCamera();
   statusBar()->showMessage(tr("Camera closed!"));
-  cameraConnectedLabel->setText("disconnected");
-  cameraConnectedLabel->setStyleSheet("QLabel { color : black; }");
+  cameraConnectedLabel->setText("not connected");
+  cameraConnectedLabel->setStyleSheet("QLabel { color : red; }");
   updateActions();
 }
 
@@ -469,6 +476,7 @@ void PylonRecorder::displayActivity() {
   writingLabel->setEnabled(labelSwitch && writing);
   labelSwitch = !labelSwitch;
 }
+
 void PylonRecorder::displaySingleFrame() {
      MyImage img;
      bool valid = buffer->readLast(img);
diff --git a/pylonrecorder.h b/pylonrecorder.h
index 8479990..be8f643 100644
--- a/pylonrecorder.h
+++ b/pylonrecorder.h
@@ -69,6 +69,7 @@ private:
     bool saveFile(const QString &fileName);
     void setImage(const QImage &newImage);
     void scaleImage(double factor);
+    void applyScaling();
     void adjustScrollBar(QScrollBar *scrollBar, double factor);
 
     QImage image;