Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jst/fix clazy3 #21

Draft
wants to merge 16 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/matcher/gcc_matcher_custom.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// problem matcher from https://github.com/ammaraskar/gcc-problem-matcher/blob/master/gcc_matcher.json
// modified to ignore /usr path to not match libraries warnings
{
"problemMatcher": [
{
"owner": "gcc-problem-matcher-custom",
"pattern": [
{
"regexp": "^(?!\\/usr\\/)(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
"file": 1,
"line": 2,
"column": 3,
"severity": 4,
"message": 5
}
]
}
]
}
5 changes: 3 additions & 2 deletions .github/workflows/build-linux-clazy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ jobs:
- run: sudo apt update
- run: sudo apt install -y clazy apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-core4.5d libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev libarmadillo10
- run: qmake -spec linux-clang QMAKE_CXX="clazy"
#- uses: ammaraskar/gcc-problem-matcher@master #TODO 2023/08/05 re-enable problem matcher when all warnings are fixed
# ignore noisy dirs from QT files itself
# all level 1 checks but ignore clazy-no-connect-by-name
# no parallel make with clazy to not mess log
- run: export CLAZY_IGNORE_DIRS=.*usr.* && export CLAZY_CHECKS="level1,no-connect-by-name" && make
- run: echo "::add-matcher::.github/matcher/gcc_matcher_custom.json"
- run: export CLAZY_IGNORE_DIRS=.*usr.* && export CLAZY_CHECKS="level1,no-connect-by-name" && make
- run: echo "::remove-matcher owner=gcc-problem-matcher-custom::"
3 changes: 2 additions & 1 deletion .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ jobs:
- run: sudo apt update
- run: sudo apt install -y apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-core4.5d libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev libarmadillo10
- run: qmake
- uses: ammaraskar/gcc-problem-matcher@master
- run: echo "::add-matcher::.github/matcher/uic_matcher.json"
- run: echo "::add-matcher::.github/matcher/gcc_matcher_custom.json"
- run: make -j4
- run: echo "::remove-matcher owner=uic-problem-matcher::"
- run: echo "::remove-matcher owner=gcc-problem-matcher-custom::"

2 changes: 0 additions & 2 deletions Circleoutline.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ class ellipseOutline: public boundary
ellipseOutline();
ellipseOutline(QPointF center, double minorAxis, double majorAxis);
ellipseOutline(QPointF left, QPointF right, double ecc);
void draw(QPainter& painter, double scale);
bool isInside(QPointF& p , int offset = 0);
void enlarge(int del);
void translate(QPointF del);
Expand All @@ -82,7 +81,6 @@ class rectangleOutline: public boundary
public:
rectangleOutline();
rectangleOutline(QPointF upperLeft, QPointF lowerRight);
void draw(QPainter& painter, double scale);
bool isInside(QPointF& p , int offset = 0);
void enlarge(int del);
void translate(QPointF del);
Expand Down
4 changes: 2 additions & 2 deletions DFTFringe.pro
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ RESOURCES += DFTResources.qrc

TRANSLATIONS += dftfringe_fr.ts

SOURCES += arbitrarywavefronthelp.cpp arbitrarywavwidget.cpp astigscatterplot.cpp astigstatsdlg.cpp astigzoomer.cpp averagewavefrontfilesdlg.cpp batchigramwizard.cpp bathastigdlg.cpp Boundary.cpp camcalibrationreviewdlg.cpp cameracalibwizard.cpp camwizardpage1.cpp ccswappeddlg.cpp circlefit.cpp circleoutline.cpp colorchannel.cpp colorchanneldisplay.cpp colormapviewerdlg.cpp contourplot.cpp contourrulerparams.cpp contourtools.cpp contourview.cpp counterrotationdlg.cpp cpoint.cpp defocusdlg.cpp dftarea.cpp dftcolormap.cpp dftthumb.cpp dfttools.cpp edgeplot.cpp filteroutlinesdlg.cpp foucaultview.cpp generatetargetdlg.cpp gplus.cpp graphicsutilities.cpp helpdlg.cpp igramarea.cpp igramintensity.cpp imagehisto.cpp intensityplot.cpp jitteroutlinedlg.cpp lensdialog.cpp lensetablemodel.cpp main.cpp mainwindow.cpp messagereceiver.cpp metricsdisplay.cpp mikespsirinterface.cpp mirrordlg.cpp myplotpicker.cpp myutils.cpp nullmarginhelpdlg.cpp nullvariationdlg.cpp oglrendered.cpp oglview.cpp outlinedialog.cpp outlinehelpdocwidget.cpp outlineplots.cpp outlinestatsdlg.cpp pdfcalibrationdlg.cpp pixelstats.cpp plotcolor.cpp prefsdlg.cpp profileplot.cpp psfplot.cpp psi_dlg.cpp psiphasedisplay.cpp psiresizeimagesdlg.cpp psitiltoptions.cpp punwrap.cpp regionedittools.cpp rejectedwavefrontsdlg.cpp renamewavefrontdlg.cpp reportdlg.cpp reviewwindow.cpp rmsplot.cpp rotationdlg.cpp savewavedlg.cpp settings2.cpp settingsdebug.cpp settingsdft.cpp settingsGeneral2.cpp settingsigram.cpp settingsprofile.cpp showaliasdlg.cpp showallcontoursdlg.cpp simigramdlg.cpp simulationsview.cpp singleapplication.cpp squareimage.cpp standastigwizard.cpp statsview.cpp subtractwavefronatsdlg.cpp surface3dcontrolsdlg.cpp surfaceanalysistools.cpp surfacegraph.cpp surfacelightingproxy.cpp surfacemanager.cpp surfacepropertiesdlg.cpp transformwavefrontdlg.cpp unwraperrorsview.cpp usercolormapdlg.cpp userdrawnprofiledlg.cpp utilil.cpp videosetupdlg.cpp vortexdebug.cpp wavefront.cpp wavefrontaveragefilterdlg.cpp wavefrontfilterdlg.cpp wavefrontloader.cpp wftexaminer.cpp wftstats.cpp zernikedlg.cpp zernikeeditdlg.cpp zernikeprocess.cpp zernikes.cpp zernikesmoothingdlg.cpp
SOURCES += arbitrarywavefronthelp.cpp arbitrarywavwidget.cpp astigscatterplot.cpp astigstatsdlg.cpp astigzoomer.cpp averagewavefrontfilesdlg.cpp batchigramwizard.cpp bathastigdlg.cpp Boundary.cpp camcalibrationreviewdlg.cpp cameracalibwizard.cpp camwizardpage1.cpp ccswappeddlg.cpp circlefit.cpp circleoutline.cpp colorchannel.cpp colorchanneldisplay.cpp colormapviewerdlg.cpp contourplot.cpp contourrulerparams.cpp contourtools.cpp contourview.cpp counterrotationdlg.cpp cpoint.cpp defocusdlg.cpp dftarea.cpp dftcolormap.cpp dftthumb.cpp dfttools.cpp edgeplot.cpp filteroutlinesdlg.cpp foucaultview.cpp generatetargetdlg.cpp gplus.cpp graphicsutilities.cpp helpdlg.cpp igramarea.cpp igramintensity.cpp imagehisto.cpp intensityplot.cpp jitteroutlinedlg.cpp lensdialog.cpp lensetablemodel.cpp main.cpp mainwindow.cpp messagereceiver.cpp metricsdisplay.cpp mirrordlg.cpp myplotpicker.cpp myutils.cpp nullmarginhelpdlg.cpp nullvariationdlg.cpp oglrendered.cpp oglview.cpp outlinedialog.cpp outlinehelpdocwidget.cpp outlineplots.cpp outlinestatsdlg.cpp pdfcalibrationdlg.cpp pixelstats.cpp plotcolor.cpp prefsdlg.cpp profileplot.cpp psfplot.cpp psi_dlg.cpp psiphasedisplay.cpp psiresizeimagesdlg.cpp psitiltoptions.cpp punwrap.cpp regionedittools.cpp rejectedwavefrontsdlg.cpp renamewavefrontdlg.cpp reportdlg.cpp reviewwindow.cpp rmsplot.cpp rotationdlg.cpp savewavedlg.cpp settings2.cpp settingsdebug.cpp settingsdft.cpp settingsGeneral2.cpp settingsigram.cpp settingsprofile.cpp showaliasdlg.cpp showallcontoursdlg.cpp simigramdlg.cpp simulationsview.cpp singleapplication.cpp squareimage.cpp standastigwizard.cpp statsview.cpp subtractwavefronatsdlg.cpp surface3dcontrolsdlg.cpp surfaceanalysistools.cpp surfacegraph.cpp surfacelightingproxy.cpp surfacemanager.cpp surfacepropertiesdlg.cpp transformwavefrontdlg.cpp unwraperrorsview.cpp usercolormapdlg.cpp userdrawnprofiledlg.cpp utilil.cpp videosetupdlg.cpp vortexdebug.cpp wavefront.cpp wavefrontaveragefilterdlg.cpp wavefrontfilterdlg.cpp wavefrontloader.cpp wftexaminer.cpp wftstats.cpp zernikedlg.cpp zernikeeditdlg.cpp zernikeprocess.cpp zernikes.cpp zernikesmoothingdlg.cpp

HEADERS += arbitrarywavefronthelp.h arbitrarywavwidget.h astigscatterplot.h astigstatsdlg.h astigzoomer.h averagewavefrontfilesdlg.h batchigramwizard.h bathastigdlg.h bezier.h boundary.h camcalibrationreviewdlg.h cameracalibwizard.h camwizardpage1.h ccswappeddlg.h circle.h circleoutline.h circleutils.h colorchannel.h colorchanneldisplay.h colormapviewerdlg.h contourplot.h contourrulerparams.h contourtools.h contourview.h counterrotationdlg.h cpoint.h defocusdlg.h dftarea.h dftcolormap.h dftthumb.h dfttools.h edgeplot.h filteroutlinesdlg.h foucaultview.h generatetargetdlg.h gplus.h graphicsutilities.h helpdlg.h IgramArea.h igramintensity.h imagehisto.h intensityplot.h jitteroutlinedlg.h lensdialog.h lensetablemodel.h mainwindow.h messagereceiver.h metricsdisplay.h mikespsiinterface.h mirrordlg.h myplotpicker.h myutils.h nullmarginhelpdlg.h nullvariationdlg.h oglrendered.h oglview.h outlinedialog.h outlinehelpdocwidget.h outlineplots.h outlinestatsdlg.h pdfcalibrationdlg.h pixelstats.h plotcolor.h prefsdlg.h profileplot.h psfplot.h psi_dlg.h psiphasedisplay.h psiresizeimagesdlg.h psitiltoptions.h punwrap.h regionedittools.h rejectedwavefrontsdlg.h renamewavefrontdlg.h reportdlg.h reviewwindow.h rmsplot.h rotationdlg.h savewavedlg.h settings2.h settingsdebug.h settingsdft.h settingsGeneral2.h settingsigram.h settingsprofile.h showaliasdlg.h showallcontoursdlg.h simigramdlg.h simulationsview.h singleapplication_p.h singleapplication.h spline.h squareimage.h standastigwizard.h statsview.h subtractwavefronatsdlg.h surface3dcontrolsdlg.h surfaceanalysistools.h surfacegraph.h surfacelightingproxy.h surfacemanager.h surfacepropertiesdlg.h transformwavefrontdlg.h unwraperrorsview.h usercolormapdlg.h userdrawnprofiledlg.h utils.h videosetupdlg.h vortex.h vortexdebug.h wavefront.h wavefrontaveragefilterdlg.h wavefrontfilterdlg.h wavefrontloader.h wavefrontstats.h wftexaminer.h wftstats.h zernikedlg.h zernikeeditdlg.h zernikeprocess.h zernikes.h zernikesmoothingdlg.h
HEADERS += arbitrarywavefronthelp.h arbitrarywavwidget.h astigscatterplot.h astigstatsdlg.h astigzoomer.h averagewavefrontfilesdlg.h batchigramwizard.h bathastigdlg.h bezier.h boundary.h camcalibrationreviewdlg.h cameracalibwizard.h camwizardpage1.h ccswappeddlg.h circle.h circleoutline.h circleutils.h colorchannel.h colorchanneldisplay.h colormapviewerdlg.h contourplot.h contourrulerparams.h contourtools.h contourview.h counterrotationdlg.h cpoint.h defocusdlg.h dftarea.h dftcolormap.h dftthumb.h dfttools.h edgeplot.h filteroutlinesdlg.h foucaultview.h generatetargetdlg.h gplus.h graphicsutilities.h helpdlg.h IgramArea.h igramintensity.h imagehisto.h intensityplot.h jitteroutlinedlg.h lensdialog.h lensetablemodel.h mainwindow.h messagereceiver.h metricsdisplay.h mirrordlg.h myplotpicker.h myutils.h nullmarginhelpdlg.h nullvariationdlg.h oglrendered.h oglview.h outlinedialog.h outlinehelpdocwidget.h outlineplots.h outlinestatsdlg.h pdfcalibrationdlg.h pixelstats.h plotcolor.h prefsdlg.h profileplot.h psfplot.h psi_dlg.h psiphasedisplay.h psiresizeimagesdlg.h psitiltoptions.h punwrap.h regionedittools.h rejectedwavefrontsdlg.h renamewavefrontdlg.h reportdlg.h reviewwindow.h rmsplot.h rotationdlg.h savewavedlg.h settings2.h settingsdebug.h settingsdft.h settingsGeneral2.h settingsigram.h settingsprofile.h showaliasdlg.h showallcontoursdlg.h simigramdlg.h simulationsview.h singleapplication_p.h singleapplication.h spline.h squareimage.h standastigwizard.h statsview.h subtractwavefronatsdlg.h surface3dcontrolsdlg.h surfaceanalysistools.h surfacegraph.h surfacelightingproxy.h surfacemanager.h surfacepropertiesdlg.h transformwavefrontdlg.h unwraperrorsview.h usercolormapdlg.h userdrawnprofiledlg.h utils.h videosetupdlg.h vortex.h vortexdebug.h wavefront.h wavefrontaveragefilterdlg.h wavefrontfilterdlg.h wavefrontloader.h wavefrontstats.h wftexaminer.h wftstats.h zernikedlg.h zernikeeditdlg.h zernikeprocess.h zernikes.h zernikesmoothingdlg.h

FORMS += arbitrarywavefronthelp.ui astigstatsdlg.ui averagewavefrontfilesdlg.ui batchigramwizard.ui bathastigdlg.ui camcalibrationreviewdlg.ui cameracalibwizard.ui camwizardpage1.ui ccswappeddlg.ui colorchanneldisplay.ui colormapviewerdlg.ui contourrulerparams.ui contourtools.ui contourview.ui counterrotationdlg.ui defocusdlg.ui dftarea.ui dftthumb.ui dfttools.ui edgeplot.ui filteroutlinesdlg.ui foucaultview.ui generatetargetdlg.ui helpdlg.ui igramintensity.ui jitteroutlinedlg.ui lensdialog.ui mainwindow.ui metricsdisplay.ui mirrordlg.ui nullmarginhelpdlg.ui nullvariationdlg.ui oglrendered.ui outlinedialog.ui outlinehelpdocwidget.ui outlineplots.ui outlinestatsdlg.ui pdfcalibrationdlg.ui pixelstats.ui prefsdlg.ui profilearea.ui profileplot.ui psfplot.ui psi_dlg.ui psiphasedisplay.ui psiresizeimagesdlg.ui psitiltoptions.ui regionedittools.ui rejectedwavefrontsdlg.ui renamewavefrontdlg.ui reportdlg.ui reviewwindow.ui rotationdlg.ui savewavedlg.ui settings2.ui settingsdebug.ui settingsdft.ui settingsGeneral2.ui settingsigram.ui settingsprofile.ui showaliasdlg.ui showallcontoursdlg.ui simigramdlg.ui simulationsview.ui standastigwizard.ui statsview.ui subtractwavefronatsdlg.ui surface3dcontrolsdlg.ui surfaceanalysistools.ui surfacepropertiesdlg.ui transformwavefrontdlg.ui unwraperrorsview.ui usercolormapdlg.ui userdrawnprofiledlg.ui videosetupdlg.ui vortexdebug.ui wavefrontaveragefilterdlg.ui wavefrontfilterdlg.ui wavefrontnulldlg.ui wftexaminer.ui zernikedlg.ui zernikeeditdlg.ui zernikesmoothingdlg.ui

Expand Down
2 changes: 0 additions & 2 deletions DFTFringe_Dale.pro
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ SOURCES += main.cpp\
graphicsutilities.cpp \
dfttools.cpp \
dftarea.cpp \
mikespsirinterface.cpp \
oglrendered.cpp \
pdfcalibrationdlg.cpp \
profileplot.cpp \
Expand Down Expand Up @@ -263,7 +262,6 @@ HEADERS += mainwindow.h \
psi_dlg.h \
psiphasedisplay.h \
outlinedialog.h \
mikespsiinterface.h \
psitiltoptions.h \
contourrulerparams.h \
zernikesmoothingdlg.h
Expand Down
21 changes: 11 additions & 10 deletions astigstatsdlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -258,15 +258,16 @@ void astigStatsDlg::plot(){
double ymax = -1000;
int colorndx = 0;
QMap<QString, QPointF> means;
foreach(QString name, groups.keys()){
int size = groups[name].size();
for(auto it = groups.cbegin() ; it != groups.cend() ; it++){
QString name = it.key();
const int size = it.value().size();
double *xAstig = new double[size];
double *yAstig = new double[size];
RunningStat xstats, ystats;

QColor color = QColor(Qt::GlobalColor( 7 + colorndx%12 ));
QVector<QPointF> points;
foreach (measure data, groups[name]){
foreach (const measure &data, it.value()){
xAstig[i] = data.p.x();
points << QPointF(data.p.x(), data.p.y());
xstats.Push(xAstig[i]);
Expand Down Expand Up @@ -390,9 +391,9 @@ void astigStatsDlg::plot(){
double *xvals = new double[means.size()];
double *yvals = new double[means.size()];
int i = 0;
foreach(QString name, means.keys()){
xvals[i] = means[name].x();
yvals[i] = means[name].y();
for(const QPointF &value: qAsConst(means)){
xvals[i] = value.x();
yvals[i] = value.y();
++i;
}

Expand Down Expand Up @@ -799,10 +800,10 @@ void astigStatsDlg::on_distribution_clicked()
html.append("<p><img src='" +imageName + "'/></p>");
}
// for each group
foreach(QString Name, groups.keys()){

QList<QPointF> items = groups[Name];
int size = items.size();
for(auto it=groups.cbegin() ; it!=groups.cend() ; it++){
const QList<QPointF> items = it.value();
const QString Name = it.key();
const int size = items.size();
float *xAstig = new float[size];
float *yAstig = new float[size];
for (int i = 0; i < size; ++i){
Expand Down
2 changes: 1 addition & 1 deletion boundary.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class boundary
public:
boundary();
virtual ~boundary();
virtual void draw(QPainter& painter, double scale, double scale2 = -1.) = 0;
virtual void draw(QPainter& painter, double scale, double scale2 = -1.) = 0;
virtual void enlarge(int del) = 0;
virtual void translate(QPointF del) = 0;
virtual void scale(double factor) = 0;
Expand Down
9 changes: 4 additions & 5 deletions contourplot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,8 @@ void ContourPlot::showContoursChanged(double val){
}

void ContourPlot::applyZeroOffset(bool useMiddle){
double min,max;
max = m_wf->max;
min = m_wf->min;
double min = m_wf->min;
//double max = m_wf->max;
if (useMiddle){
zOffset = 0.;
m_useMiddleOffset = true;
Expand All @@ -192,8 +191,8 @@ void ContourPlot::applyZeroOffset(bool useMiddle){
else {
zOffset = min;
m_useMiddleOffset = false;
max -= zOffset;
min -= zOffset;
//max -= zOffset;
//min -= zOffset;

}
setZRange();
Expand Down
3 changes: 0 additions & 3 deletions dftarea.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "utils.h"
#include "showaliasdlg.h"
#include <QLabel>
#include "mikespsiinterface.h"
#include <QShortcut>
#include <opencv2/core/core_c.h>
using namespace cv;
Expand Down Expand Up @@ -141,7 +140,7 @@
QSettings set;
m_center_filter = set.value("DFT Center Filter", 10).toDouble();
qDebug() << "init center" << m_center_filter;
emit updateFilterSize(m_center_filter);

Check warning on line 143 in dftarea.cpp

View workflow job for this annotation

GitHub Actions / build-linux-clazy

Emitting inside constructor probably has no effect [-Wclazy-incorrect-emit]

Check warning on line 143 in dftarea.cpp

View workflow job for this annotation

GitHub Actions / build-linux-clazy

Emitting inside constructor probably has no effect [-Wclazy-incorrect-emit]
installEventFilter(this);

/*
Expand Down Expand Up @@ -722,8 +721,6 @@
dft(imageMat,fdomMat);
imageMat.release();

double dc = fdomMat.at<double>(0,0,0);
dc/=size;
int count = 0;
bool *bp = m_mask.ptr<bool>(0);
for (int i = 0; i < size; ++i){
Expand Down
2 changes: 1 addition & 1 deletion dftarea.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public slots:
void doPSIstep1();
bool doPSIstep2();
void doPSIstep3();
void doPSIstep4(Mat images, QVector<double> phases);
void doPSIstep4(cv::Mat images, QVector<double> phases);
void doPSITilt();
void doDFT();
void dftSizeChanged(const QString&);
Expand Down
8 changes: 4 additions & 4 deletions edgeplot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ void EdgePlot::Update(){

m_chart->createDefaultAxes();

m_chart->axes(Qt::Horizontal).first()->setRange(-1,105);
m_chart->axes(Qt::Horizontal).constFirst()->setRange(-1,105);

m_chart->axes(Qt::Vertical).first()->setRange(-10,10);
m_chart->axes(Qt::Vertical).constFirst()->setRange(-10,10);


m_chart->axes(Qt::Horizontal).first()->setTitleText("start edge at percent of radius of mirror");
m_chart->axes(Qt::Vertical).first()->setTitleText("waves");
m_chart->axes(Qt::Horizontal).constFirst()->setTitleText("start edge at percent of radius of mirror");
m_chart->axes(Qt::Vertical).constFirst()->setTitleText("waves");
}
void EdgePlot::on_height_valueChanged(int value)
{
Expand Down
4 changes: 2 additions & 2 deletions intensityplot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class iSurfaceData: public QwtSyntheticPointData
int m_rad;
iSurfaceData(cv::Mat plane):
QwtSyntheticPointData( plane.cols ),
m_plane(plane), m_rad(plane.cols/2),m_angle(90)
m_plane(plane), m_rad(plane.cols/2)
{

}
Expand All @@ -75,7 +75,7 @@ class iSurfaceData: public QwtSyntheticPointData


private:
double m_angle;

};

bool intensityPlot::eventFilter( QObject *object, QEvent *event )
Expand Down
7 changes: 3 additions & 4 deletions mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ MainWindow::MainWindow(QWidget *parent) :
continue;
zernEnables[i] = false;
}
zernEnableUpdateTime = QDateTime::currentDateTime().toTime_t();

connect(m_surfaceManager, SIGNAL(rocChanged(double)),this, SLOT(rocChanged(double)));
connect(m_mirrorDlg, SIGNAL(newPath(QString)),this, SLOT(newMirrorDlgPath(QString)));
Expand Down Expand Up @@ -280,7 +279,7 @@ void MainWindow::openWaveFrontonInit(QStringList args){
if (pd.wasCanceled())
break;

if (arg.toUpper().endsWith(".WFT")){
if (arg.endsWith(".wft", Qt::CaseInsensitive)){
pd.setLabelText(arg);
try {
m_surfaceManager->loadWavefront(arg);
Expand Down Expand Up @@ -434,12 +433,12 @@ void MainWindow::on_actionLoad_Interferogram_triggered()
ui->SelectObsOutline->setChecked(false);
if (dialog.exec()){
if (dialog.selectedFiles().size() == 1){
QFileInfo a(dialog.selectedFiles().first());
QFileInfo a(dialog.selectedFiles().constFirst());
QString ext = a.completeSuffix();
set.setValue("igramExt", ext);
qDebug() << "suffix"<<ext;

loadFile(dialog.selectedFiles().first());
loadFile(dialog.selectedFiles().constFirst());
}
else{
m_igramsToProcess = dialog.selectedFiles();
Expand Down
1 change: 0 additions & 1 deletion mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ class MainWindow : public QMainWindow
QLabel *status2;
QLabel *status3;
ProfilePlot *m_profilePlot;
uint zernEnableUpdateTime;
ZernTableModel *zernTablemodel;
metricsDisplay *metrics;
reviewWindow *review;
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion myplotpicker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void myPlotPicker::select(const QPointF &p){
QString s = find(p);
if (s == "")
return;
emit selected(s);
emit plotSelected(s);
}
QString myPlotPicker::find(const QPointF &p)const{

Expand Down
Loading
Loading