MAJOR update

Well I fucked the commits by merging the gh-pages branch like an utter
tit.
So here are all the commits I made into one big, unreadable mess.

Added:
Axes widget that rotates with basis angle (uses the axes resource and
svg file)
Ability to export colour bar as an RGB image. Size is hardcoded.
Labels on to distorition images.

Fixed:
Memory leak when updating images due to stupid pointers.
MAJOR bug where eigen matrices where not initialised to zero (this only
happened for smaller images?)
Small tweaks to usability, right click options are grayed out until they
are valid. Finding the g vector has a fail case. Errors when opening a
small image (widht or height < 3)
Tiff images now open the right way up.

probably a ton more...

Author: JJPPeters

Plotting/colorbarplot.h

@@ -14,6 +14,9 @@ class ColorBarPlot : public QCustomPlot
 public:
     ColorBarPlot(QWidget *parent = 0) : QCustomPlot(parent)
     {
+        setContextMenuPolicy(Qt::CustomContextMenu);
+        setFocusPolicy(Qt::StrongFocus);
+
         ColorBar = new QCPColorScale(this);
 
         // remove  the crap we don't want
@@ -24,6 +27,8 @@ class ColorBarPlot : public QCustomPlot
         //ColorBar->axis()->setLabel("Strain");
 
         CreateColorMaps();
+
+        connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuRequest(QPoint)));
     }
 
     void SetColorMap(const QString &Map)
@@ -97,6 +102,49 @@ class ColorBarPlot : public QCustomPlot
         JetLike_Map.setColorStopAt(1.0, QColor(255, 0, 0));
     }
 
+private slots:
+    void contextMenuRequest(QPoint pos)
+    {
+        QMenu* menu = new QMenu(this);
+
+        menu->addAction("Export RGB", this, SLOT(ExportImage()));
+
+        menu->popup(mapToGlobal(pos));
+    }
+
+public slots:
+    void ExportImage()
+    {
+        QSettings settings;
+
+        // get path
+        QString filepath = QFileDialog::getSaveFileName(this, "Save image", settings.value("dialog/currentSavePath").toString(), "TIFF (*.tif)");
+
+        if (filepath.isEmpty())
+            return;
+
+        QFileInfo temp_file(filepath);
+        settings.setValue("dialog/currentSavePath", temp_file.path());
+
+        ExportImage(filepath);
+    }
+
+    void ExportImage(QString directory, QString filename)
+    {
+        QString filepath = QDir(directory).filePath(filename);
+        filepath += ".tif";
+
+        ExportImage(filepath);
+    }
+
+    void ExportImage(QString filepath)
+    {
+        int w = width();
+
+        std::string format = "TIFF";
+        saveRastered(filepath, w, 512, 1.0, format.c_str());
+    }
+
 };
 
 #endif // COLORBARPLOT_H

Plotting/imageplot.h

@@ -5,6 +5,10 @@
 #define EIGEN_DEFAULT_TO_ROW_MAJOR
 #endif
 
+#ifndef EIGEN_INITIALIZE_MATRICES_BY_ZERO
+#define EIGEN_INITIALIZE_MATRICES_BY_ZERO
+#endif
+
 #include <complex>
 #include <memory>
 #include <cmath>
@@ -35,6 +39,7 @@ class ImagePlot : public QCustomPlot
     {
         setInteractions(QCP::iRangeZoom);
         setContextMenuPolicy(Qt::CustomContextMenu);
+        setFocusPolicy(Qt::StrongFocus);
 
         // this will remove all the crud but keep the grid lines
         xAxis->setSubTickPen(Qt::NoPen);
@@ -85,6 +90,8 @@ class ImagePlot : public QCustomPlot
         if (sx*sy != (int)image.size())
             throw sizeError;
 
+        clearImage();
+
         AspectRatio = (double)sx/(double)sy;
 
         rescaleAxes();
@@ -121,8 +128,13 @@ class ImagePlot : public QCustomPlot
         if (sx*sy != (int)image.size())
             throw sizeError;
 
+        clearImage();
+
         AspectRatio = (double)sx/(double)sy;
 
+        rescaleAxes();
+        setImageRatio();
+
         ImageObject = new QCPColorMap(xAxis, yAxis);
         addPlottable(ImageObject);
         ImageObject->setGradient(QCPColorGradient::gpGrayscale); // default
@@ -340,9 +352,12 @@ private slots:
 
         QMenu* saveMenu = new QMenu("Export...", this);
 
-        saveMenu->addAction("RGB image", this,  SLOT(ExportImage()));
-        saveMenu->addAction("Data image", this,  SLOT(ExportData()));
-        saveMenu->addAction("Binary", this,  SLOT(ExportBinary()));
+        QAction* expIm = saveMenu->addAction("RGB image", this,  SLOT(ExportImage()));
+        expIm->setEnabled(haveImage);
+        QAction* expDat = saveMenu->addAction("Data image", this,  SLOT(ExportData()));
+        expDat->setEnabled(haveImage);
+        QAction* expBin = saveMenu->addAction("Binary", this,  SLOT(ExportBinary()));
+        expBin->setEnabled(haveImage);
 
         menu->addMenu(saveMenu);
 

Strain/gpa.cpp

@@ -98,6 +98,9 @@ int GPA::getGVectors()
         averages.push_back(av);
     }
 
+    if(averages.size() < 1)
+        return std::min(xs, ys) / 2;
+
     // normalise
     auto minIterator = std::min_element(averages.begin(), averages.end());
     double min = *minIterator;

Strain/gpa.h

@@ -10,6 +10,10 @@ const double PI = 3.14159265358979323846;
 #define EIGEN_DEFAULT_TO_ROW_MAJOR
 #endif
 
+#ifndef EIGEN_INITIALIZE_MATRICES_BY_ZERO
+#define EIGEN_INITIALIZE_MATRICES_BY_ZERO
+#endif
+
 #include <memory>
 #include <complex>
 #include <algorithm>

Strain/phase.h

@@ -5,6 +5,10 @@
 #define EIGEN_DEFAULT_TO_ROW_MAJOR
 #endif
 
+#ifndef EIGEN_INITIALIZE_MATRICES_BY_ZERO
+#define EIGEN_INITIALIZE_MATRICES_BY_ZERO
+#endif
+
 #ifndef PI_H
 #define PI_H
 const double PI = 3.14159265358979323846;

Strainpp.pro

@@ -7,7 +7,7 @@
 RC_FILE = Strainpp.rc
 CONFIG += c++14
 
-QT       += core gui
+QT       += core gui svg
 QMAKE_CXXFLAGS_RELEASE += -O3
 QMAKE_CXXFLAGS += -fopenmp
 LIBS += -fopenmp
@@ -64,3 +64,6 @@ DEPENDPATH += $$PWD/../../../Programming/Cpp/msys64/usr/local/include
 
 win32:!win32-g++: PRE_TARGETDEPS += $$PWD/../../../Programming/Cpp/msys64/usr/local/lib/tiff.lib
 else:win32-g++: PRE_TARGETDEPS += $$PWD/../../../Programming/Cpp/msys64/usr/local/lib/libtiff.a
+
+RESOURCES += \
+    axesresource.qrc

Utils/utils.h

@@ -5,6 +5,10 @@
 #define EIGEN_DEFAULT_TO_ROW_MAJOR
 #endif
 
+#ifndef EIGEN_INITIALIZE_MATRICES_BY_ZERO
+#define EIGEN_INITIALIZE_MATRICES_BY_ZERO
+#endif
+
 #include <memory>
 #include <cmath>
 #include "fftw3.h"

axes.svg

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/Images">
+        <file>axes.svg</file>
+    </qresource>
+</RCC>

axesresource.qrc

@@ -3,6 +3,10 @@
 
 #include "dmreader.h"
 
+#include <QPainter>
+#include <QtSvg/QSvgRenderer>
+#include <QPoint>
+
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow)
@@ -37,6 +41,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
     statusBar()->addWidget(statusLabel);
 
+    on_angleSpin_editingFinished(); // this is just to update the axes image...
 
     // connect al the slots to update the strain images
     connect(ui->colorBar, SIGNAL(limitsChanged(double)), ui->exxPlot, SLOT(SetColorLimits(double)));
@@ -111,6 +116,12 @@ void MainWindow::openDM(std::string filename)
     int ny = dmFile.getY();
     int nz = dmFile.getZ();
 
+    if (nx < 3 || ny < 3)
+    {
+        QMessageBox::information(this, tr("File open"), tr("Image too small."), QMessageBox::Ok);
+        return;
+    }
+
     std::vector<double> image;
     if ( nz > 1)
         image = dmFile.getImage(0, nx*ny);
@@ -562,6 +573,7 @@ void MainWindow::doRefinement(double top, double left, double bottom, double rig
     }
 }
 
+// probably poorly named since it does so much more
 void MainWindow::getStrains()
 {
     updateStatusBar("GPA completed!");
@@ -750,6 +762,9 @@ void MainWindow::ExportAll(int choice)
         ui->exxPlot->ExportSelector(fileDir, "Dilitation", choice);
     }
 
+    if (choice == 0)
+        ui->colorBar->ExportImage(fileDir, "ColourBar");
+
     // need to loop through and show images before exporting them from same plot
     for(int i = 0; i < ui->leftCombo->count(); ++i)
     {
@@ -806,6 +821,9 @@ void MainWindow::ExportStrains(int choice)
     {
         ui->exxPlot->ExportSelector(fileDir, "Dilitation", choice);
     }
+
+    if (choice == 0)
+        ui->colorBar->ExportImage(fileDir, "ColourBar");
 }
 
 void MainWindow::DisconnectAll()
@@ -830,6 +848,71 @@ void MainWindow::ClearImages()
 
 void MainWindow::on_angleSpin_editingFinished()
 {
+    // OK....
+    // This first part is very messy. But bear with me.
+    // The axes is actually an SVG file kept int the resource file "axesresource.qrc"
+
+    // simple, get the angle!
+    double angle = ui->angleSpin->value();
+
+    if (lastAngle == angle)
+        return;
+
+    lastAngle = angle;
+
+    // These are to account for the size of the text
+    // there might be a better way using rects and setting the alignment to centre
+    // but I can't be botthered to work it out
+    QPoint ysz(-3, 4.5);
+    QPoint xsz(-3, 3);
+    // This is the size of our area to draw in
+    QSize size(100, 100);
+    // This is the pixmap that will eventually be shown, we start with it transparent
+    QPixmap newmap(size);
+    newmap.fill(Qt::transparent);
+    // this is the midpoint of our image (so we can rotate around it)
+    QPoint mid(size.height()/2, size.width()/2);
+    // this is the position of our labels
+    QPoint xp(65, 65);
+    QPoint yp(35, 35);
+
+    // here we rotate these positions about the mid point
+    xp = xp - mid;
+    yp = yp - mid;
+    QTransform temp;
+    QTransform tform = temp.rotate(-angle);
+
+    xp = tform.map(xp);
+    yp = tform.map(yp);
+    xp = xp + mid;
+    yp = yp + mid;
+
+    // set the font and colours
+    QFont tFont("Arial", 12, QFont::Normal);
+    QPen xPen(QColor("#E30513"));
+    QPen yPen(QColor("#008D36"));
+
+    // here we load the svg from the resource file
+    QSvgRenderer renderer(QString(":/Images/axes.svg"));
+    QPainter* p = new QPainter(&newmap);
+    //draw the texts (we have rotated the POSITION before)
+    p->setFont(tFont);
+    p->setPen(xPen);
+    p->drawText(xp + xsz, "x");
+    p->setPen(yPen);
+    p->drawText(yp + ysz, "y");
+    // now rotate the svg about hte mid point and draw it
+    p->translate(size.height()/2,size.height()/2);
+    p->rotate(-angle);
+    p->translate(-size.height()/2,-size.height()/2);
+    renderer.render(p);
+    // done, phew...
+    p->end();
+
+    // finally set it
+    ui->lblAxes->setPixmap(newmap);
+
+    // now do the calculation if we need to
     if(!haveStrains)
         return;
 
@@ -838,6 +921,43 @@ void MainWindow::on_angleSpin_editingFinished()
 
 void MainWindow::on_resultModeBox_currentIndexChanged(const QString &mode)
 {
+    // set the labels on the image
+    if (mode == "Distortion")
+    {
+        ui->exxLabel->setText("e<sub>xx</sub>");
+        ui->exyLabel->setText("e<sub>xy</sub>");
+        ui->eyxLabel->setText("e<sub>yx</sub>");
+        ui->eyyLabel->setText("e<sub>yy</sub>");
+        ui->exyLabel->setVisible(true);
+        ui->eyxLabel->setVisible(true);
+        ui->eyyLabel->setVisible(true);
+    }
+    else if(mode == "Strain")
+    {
+        ui->exxLabel->setText("ε<sub>xx</sub>");
+        ui->exyLabel->setText("ε<sub>xy</sub>");
+        ui->eyxLabel->setText("ε<sub>yx</sub>");
+        ui->eyyLabel->setText("ε<sub>yy</sub>");
+        ui->exyLabel->setVisible(true);
+        ui->eyxLabel->setVisible(true);
+        ui->eyyLabel->setVisible(true);
+    }
+    else if(mode == "Rotation")
+    {
+        ui->exxLabel->setText("ω<sub>xx</sub>");
+        ui->eyyLabel->setText("ω<sub>yy</sub>");
+        ui->exyLabel->setVisible(false);
+        ui->eyxLabel->setVisible(false);
+        ui->eyyLabel->setVisible(true);
+    }
+    else if(mode == "Dilitation")
+    {
+        ui->exxLabel->setText("Δ");
+        ui->exyLabel->setVisible(false);
+        ui->eyxLabel->setVisible(false);
+        ui->eyyLabel->setVisible(false);
+    }
+
     if(!haveStrains)
         return;