From 53af35471e5634978af68980d10ff0d894ca1572 Mon Sep 17 00:00:00 2001 From: JJPPeters Date: Mon, 23 May 2016 20:08:19 +0100 Subject: [PATCH] Bugs Fixed bug where manual mask size was not being used (I had defined minGrad in class and locally) Fixed typo --- mainwindow.cpp | 8 ++++---- mainwindow.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index a3444cf..a4d2703 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -251,10 +251,10 @@ void MainWindow::on_actionGPA_triggered() minGrad = GPAstrain->getGVectors(); - AcceptGVector(minGrad); + AcceptGVector(); } -void MainWindow::AcceptGVector(double minGrad) +void MainWindow::AcceptGVector() { bool happy = false; // I hate myself for this loop, but it is to avoid recursion with the manual entry @@ -267,7 +267,7 @@ void MainWindow::AcceptGVector(double minGrad) QMessageBox msgBox; msgBox.setWindowTitle(tr("GPA")); msgBox.setText(tr("Accept mask size?")); - msgBox.setInformativeText(tr("(Solid Lline)")); + msgBox.setInformativeText(tr("(Solid Line)")); QAbstractButton *btnManual = msgBox.addButton(tr("Manual"), QMessageBox::ActionRole); QAbstractButton *btnRadius = msgBox.addButton(tr("Smallest g"), QMessageBox::ActionRole); @@ -325,7 +325,7 @@ void MainWindow::clickGVector(QMouseEvent *event) ui->fftPlot->DrawCircle(0, 0, Qt::red, QBrush(Qt::NoBrush), minGrad / 2); ui->fftPlot->DrawCircle(0, 0); - AcceptGVector(minGrad); + AcceptGVector(); } void MainWindow::clickBraggSpot(QMouseEvent *event) diff --git a/mainwindow.h b/mainwindow.h index ae36c27..3b4ccfe 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -136,7 +136,7 @@ private slots: void updateOtherPlot(int index, int side, bool rePlot = true); - void AcceptGVector(double minGrad); + void AcceptGVector(); };