Merge pull request #214 from atsju/JST/QT6retro

Minor Changes necessary for QT6 that are compatible with QT5

Author: atsju

IgramArea.h

@@ -73,9 +73,6 @@
 #include <opencv2/highgui/highgui.hpp>
 #include "dftthumb.h"
 #include <QTimer>
-#include <QVideoWidget>
-#include <QMediaPlayer>
-#include <QMediaPlaylist>
 #include <QScrollArea>
 #include "settingsigram.h"
 #include <QDockWidget>

astigpolargraph.cpp

@@ -1,6 +1,7 @@
 #include "astigpolargraph.h"
 #include "ui_astigpolargraph.h"
 #include "surfacemanager.h"
+#include <QtCharts/QLegendMarker>
 
 
 astigPolargraph::astigPolargraph(    QList<astigSample>list, QWidget *parent) :

astigstatsdlg.cpp

@@ -12,6 +12,7 @@
 #include <qwt_interval_symbol.h>
 #include <qwt_plot_intervalcurve.h>
 #include <qwt_scale_engine.h>
+#include <qwt_scale_map.h>
 #include <qwt_plot_marker.h>
 #include <QDebug>
 #include <math.h>
@@ -26,6 +27,7 @@
 #include <qwt_plot_panner.h>
 #include <QScrollArea>
 #include <QGroupBox>
+#include <QPen>
 #include <QPrinter>
 #include <QTextDocument>
 #include <QTextEdit>
@@ -53,7 +55,7 @@ class Zoomer: public QwtPlotZoomer
     Zoomer( QWidget *canvas, QwtPlot * plot ):
         QwtPlotZoomer( canvas ),mPlot(plot)
     {
-        setRubberBandPen( QColor( Qt::lightGray ) );
+        setRubberBandPen( QPen( Qt::lightGray ) );
         setTrackerMode( QwtPlotPicker::AlwaysOn );
     }
 

astigzoomer.cpp

@@ -3,11 +3,12 @@
 #include <qwt_plot.h>
 #include <qwt_plot_marker.h>
 #include <QtMath>
+#include <QPen>
 
 astigZoomer::astigZoomer( QWidget *canvas, QwtPlot * plot ):
     QwtPlotZoomer( canvas ),mPlot(plot)
 {
-    setRubberBandPen( QColor( Qt::lightGray ) );
+    setRubberBandPen( QPen( Qt::lightGray ) );
     setTrackerMode( QwtPlotPicker::AlwaysOn );
 }
 

averagewavefrontfilesdlg.cpp

@@ -9,7 +9,7 @@
 #include "utils.h"
 #include <opencv2/imgproc.hpp>
 
-void showData(const std::string &txt, Mat mat, bool useLog);
+void showData(const std::string &txt, cv::Mat mat, bool useLog);
 averageWaveFrontFilesDlg::averageWaveFrontFilesDlg(QStringList list, SurfaceManager *m, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::averageWaveFrontFilesDlg)

cameracalibwizard.cpp

@@ -1,9 +1,9 @@
 #include "cameracalibwizard.h"
 #include "ui_cameracalibwizard.h"
+#include "spdlog/spdlog.h"
 #include <QLabel>
 #include <QLayout>
 #include "camwizardpage1.h"
-#include "spdlog/spdlog.h"
 
 cameraCalibWizard::cameraCalibWizard(QWidget *parent) :
     QWizard(parent),

camwizardpage1.cpp

@@ -240,11 +240,11 @@ void CamWizardPage1::on_compute_clicked()
                 if (found)
                     break;
                 if ( i == 1){
-                    cv::SimpleBlobDetector detector;
+                    static Ptr<SimpleBlobDetector> detector = cv::SimpleBlobDetector::create();
 
                     // Detect blobs.
                     std::vector<cv::KeyPoint> keypoints;
-                    detector.detect( dial, keypoints);
+                    detector->detect( dial, keypoints);
 
                     /*int horz = 1;
                     int vert = 1;
@@ -329,13 +329,13 @@ void CamWizardPage1::on_compute_clicked()
             msg << "Grid of " << ui->columns->value() << " X " << ui->rows->value() << " not found. Press any key.";
             ui->Results->append("Pattern not found. Calibration failed.");
             // Set up the detector with default parameters.
-            cv::SimpleBlobDetector detector;
+            static Ptr<SimpleBlobDetector> detector = cv::SimpleBlobDetector::create();
 
             cv::threshold(raw,view, 200, 255, cv::THRESH_BINARY);
 
             // Detect blobs.
             std::vector<cv::KeyPoint> keypoints;
-            detector.detect( view, keypoints);
+            detector->detect( view, keypoints);
 
             // Draw detected blobs as red circles.
             // DrawMatchesFlags::DRAW_RICH_KEYPOINTS flag ensures the size of the circle corresponds to the size of blob

contourplot.cpp

@@ -42,6 +42,7 @@
 #include <qwt_plot_shapeitem.h>
 #include <QSettings>
 #include <qwt_picker_machine.h>
+#include "spdlog/spdlog.h"
 
 
 double zOffset = 0;

contourrulerparams.cpp

@@ -35,7 +35,7 @@ void ContourRulerParams::on_radialAngleSB_valueChanged(int arg1)
 void ContourRulerParams::on_setColorPB_clicked()
 {
 
-    QColor color = QColorDialog::getColor( ui->setColorPB->palette().color(QPalette::Background));
+    QColor color = QColorDialog::getColor( ui->setColorPB->palette().color(QPalette::Window));
 
     QSettings set;
     set.setValue("contourRulerColor", color.name());

contourtools.cpp

@@ -114,12 +114,12 @@ void ContourTools::on_ColorMapCB_activated(int index)
 
 
 
-void ContourTools::on_zeroOffsetCB_activated(const QString &arg1)
+void ContourTools::on_zeroOffsetCB_textActivated(const QString &arg1)
 {
     emit contourZeroOffsetChanged(arg1);
 }
 
-void ContourTools::on_colorRangeCB_activated(const QString &arg1)
+void ContourTools::on_colorRangeCB_textActivated(const QString &arg1)
 {
     ui->errorRangeSpin->setEnabled(arg1 == "Fractions of Wave");
     emit contourColorRangeChanged(arg1);