Merge pull request #263 from githubdoe/JST/squareContourview

merging this because it's a great feature and also because I think I want to look into fixing issue #302 and I want to do that with this code included as it might be related to issue #302.

Author: gr5

contourplot.cpp

@@ -27,30 +27,11 @@
 #include "wavefront.h"
 #include <qwt_picker.h>
 #include <qwt_plot_picker.h>
+#include <qwt_plot_rescaler.h>
 #include <qwt_interval.h>
 
 class MyZoomer;
-class SpectrogramData: public QwtRasterData
-{
-public:
-    SpectrogramData();
-    wavefront *m_wf;
-    void setSurface(wavefront *surface);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    // keep compatibility with newer version of QWT used in QT6
-    QwtInterval interval(Qt::Axis axis) const override;
-    void setInterval(Qt::Axis axis, const QwtInterval &interval);
-#endif
-    virtual double value( double x, double y ) const override;
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    // keep compatibility with newer version of QWT used in QT6
-private:
-    QwtInterval m_xInterval;
-    QwtInterval m_yInterval;
-    QwtInterval m_zInterval;
-#endif
-};
 class ContourPlot: public QwtPlot
 {
     Q_OBJECT
@@ -60,26 +41,29 @@ class ContourPlot: public QwtPlot
 
 public:
     QwtPlotSpectrogram *d_spectrogram;
-    wavefront* m_wf;
+    const wavefront* m_wf;
     ContourTools *m_tools;
     static bool m_useMiddleOffset;
     static int m_colorMapNdx;
     static double m_zOffset;
     static double m_waveRange;
     double contourRange;
     static QString m_zRangeMode;
-    ContourPlot(QWidget * = NULL, ContourTools *tools  = 0, bool minimal = false);
-    void setSurface(wavefront * mat);
+    ContourPlot(QWidget *parent = NULL, ContourTools *tools  = 0, bool minimal = false);
+    void setSurface(const wavefront * wft);
     void applyZeroOffset(bool useMiddle);
     void setZRange();
     void setColorMap(int ndx);
     void setTool(ContourTools* tool);
-    bool m_autoInterval;
-    bool m_minimal;
+    QRectF adjustRectToAspectRatio(double baseWidth, double baseHeight,
+                                    double canvasWidth, double canvasHeight) const;
+    void updateAspectRatio();
+    bool m_minimal; // when true, hide axes and colorbar
     bool m_linkProfile;
     QPen m_rulerPen;
     int m_radialDeg;
     bool m_do_fill;
+    bool m_inZoomOperation;
 
 
 signals:
@@ -102,14 +86,15 @@ public slots:
     void contourFillChanged(int);
     void newDisplayErrorRange(double min, double max);
     void drawProfileLine(const double ang);
+    void clearZoomFlag();
 #ifndef QT_NO_PRINTER
     void printPlot();
 #endif
 
 private:
     void drawCanvas(QPainter* p);
     void initPlot();
-
+    bool eventFilter(QObject *obj, QEvent *event);
 
     QColor m_contourPen;
 

contourplot.h

@@ -63,7 +63,7 @@ QImage contourView::getPixstatsImage(){
 }
 
 
-void contourView::setSurface(wavefront *wf){
+void contourView::setSurface(const wavefront *wf){
     getPlot()->setSurface(wf);
     ps->setData(wf);
 }
@@ -81,6 +81,7 @@ void contourView::showContextMenu(QPoint pos)
     // Show context menu at handling position
     myMenu.exec(globalPos);
 }
+
 ContourPlot *contourView::getPlot(){
     return ui->widget;
 }

contourview.cpp

@@ -34,19 +34,19 @@ class contourView : public QWidget
     explicit contourView(QWidget *parent = 0, ContourTools *tools = 0);
     ~contourView();
     ContourPlot *getPlot();
-    void setSurface(wavefront * wf);
-    bool zoomed;
+    void setSurface(const wavefront * wf);
+    bool zoomed; // this is not about zooming in the plot, but zooming the contour view to full screen
     QImage getPixstatsImage();
     pixelStats *getPixelstats(){ return ps;}
 signals:
     void lineSpacingChanged(double);
     void showAllContours();
-    void zoomMe(bool);
+    void zoomMe(bool); // full screen related
 private slots:
     void on_doubleSpinBox_valueChanged(double arg1);
     void showContextMenu(QPoint pos);
     void on_pushButton_pressed();
-    void zoom();
+    void zoom(); // full screen related
 
     void on_histogram_clicked();
 

contourview.h

@@ -26,7 +26,7 @@ QList<colorStop> dftColorMap::userStops;
 
 
 
-dftColorMap::dftColorMap(int type, wavefront *wf, bool zeroBased, double errorMargin, double scale,
+dftColorMap::dftColorMap(int type, const wavefront *wf, bool zeroBased, double errorMargin, double scale,
                          QColor less, QColor more):
         QwtLinearColorMap( less, more ),m_wf(wf)
 {

dftcolormap.cpp

@@ -24,11 +24,11 @@
 class dftColorMap: public QwtLinearColorMap
 {
 public:
-    dftColorMap(int type = 0, wavefront *wf= 0, bool zeroBased = true,
+    dftColorMap(int type = 0, const wavefront *wf= 0, bool zeroBased = true,
                 double errorMargin = .125, double scale = 1., QColor less = Qt::black,
                 QColor more = Qt::white);
     void setRange(double low, double high);
-    wavefront *m_wf;
+    const wavefront *m_wf;
     static QList<colorStop> userStops;
 };
 #endif // DFTCOLORMAP_H

dftcolormap.h

@@ -20,7 +20,6 @@
 #include <opencv2/core/core.hpp>
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
-#include "contourplot.h"
 #include "wavefront.h"
 #include "math.h"
 #include "utils.h"
@@ -296,7 +295,7 @@ pixelStats::~pixelStats()
 
 }
 
-void pixelStats::setData(wavefront *w){
+void pixelStats::setData(const wavefront *w){
    m_wf = w;
    g_ub = m_wf->min +  (m_wf->max-m_wf->min) * .9;
    g_lb = m_wf->min +  (m_wf->max-m_wf->min) * .1;
@@ -312,7 +311,7 @@ cv::Mat mat2gray(const cv::Mat& src)
     return dst;
 }
 
-cv::Mat slope(wavefront * wf){
+cv::Mat slope(const wavefront * wf){
     int half = wf->data.cols/2;
     cv::Mat gradx = cv::Mat::zeros(wf->data.rows,wf->data.cols, CV_64FC1);
     cv::Mat grady = cv::Mat::zeros(wf->data.rows,wf->data.cols, CV_64FC1);
@@ -406,7 +405,7 @@ cv::Mat slope(wavefront * wf){
 */
     return mag;
 }
-#include "dftarea.h"
+
 void pixelStats::updateSurface(){
     try {
         cv::Mat sur = cv::Mat::zeros(m_wf->data.rows, m_wf->data.cols, CV_8UC3);

pixelstats.cpp

@@ -19,7 +19,7 @@ class pixelStats : public QWidget
 public:
     explicit pixelStats(QWidget *parent = 0);
     ~pixelStats();
-    void setData(wavefront *w);
+    void setData(const wavefront *w);
 private slots:
     void bounds_valueChanged();
 
@@ -33,7 +33,7 @@ private slots:
 
 private:
     Ui::pixelStats *ui;
-    wavefront *m_wf;
+    const wavefront *m_wf;
     cv::Mat mask;
     void updateHisto();
     void updateSurface();

pixelstats.h

@@ -2738,24 +2738,24 @@ void SurfaceManager::saveAllContours(){
     m_allContours.save( fName );
 }
 
-#include "showallcontoursdlg.h"
-void SurfaceManager::showAllContours(){
-    showAllContoursDlg dlg;
+#include "showallcontoursdlg.h" //TODO move
+void SurfaceManager::showAllContours(){ //TODO move to contourview would make more sense as use only there
+    showAllContoursDlg dlg; //TODO not closing on app close
     if (!dlg.exec()) {
         return;
     }
     QRect rec = QGuiApplication::primaryScreen()->geometry();
     QApplication::setOverrideCursor(Qt::WaitCursor);
-    ContourPlot *plot =new ContourPlot(0,0);//m_contourPlot;
-    //plot->m_minimal = true;
-    int cols = dlg.getColumns();
+    ContourPlot *plot =new ContourPlot(0,0);//m_contourPlot; //TODO leaking ? 
+    //plot->m_minimal = true; 
+    int cols = dlg.getColumns(); //TODO parameter number of pixels unused here. update the dlg ui
     int width = rec.width()/cols;
     int height = width * .82;
     surfaceAnalysisTools *saTools = surfaceAnalysisTools::get_Instance();
     QList<int> list = saTools->SelectedWaveFronts();
 
-    int rows =  ceil((double)list.size()/cols);
-    int columns = std::min((int)list.size(),int(ceil((double)list.size()/rows)));
+    int rows =  ceil((float)list.size()/cols);
+    int columns = std::min((int)list.size(),int(ceil((float)list.size()/rows)));
     const QSizeF size(columns * (width + 10), rows * (height + 10));
     const QRect imageRect = QRect(0,0,size.width(),size.height());
     qDebug() << "save all" << imageRect;
@@ -2774,11 +2774,27 @@ void SurfaceManager::showAllContours(){
     {
         wavefront * wf = m_wavefronts[list[i]];
         plot->setSurface(wf);
+
+        //All these replots and updates are necessary to get the canvas updateAspectRatio to work properly.
+
+        // Resize the outer plot so its internal canvas area will match
+        // the requested image size.
+        plot->resize(width, height);
+        QCoreApplication::processEvents();
+        // Now ensure the canvas is the target size
+        if (plot->canvas())
+            plot->canvas()->resize(width, height);
+        plot->updateAspectRatio();
+        plot->replot();
+        plot->updateAspectRatio();
         plot->replot();
+
+
         int y_offset =  height * (i/columns) + 10;
         int x_offset = width * (i%columns) + 10;
         const QRectF topRect( x_offset, y_offset, width, height );
         renderer.render( plot, &painter, topRect );
+
     }
     painter.end();