Skip to content

pass by reference or by value when necessary #228

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.

Sign up for GitHub

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

Merged
atsju merged 5 commits into from
Aug 20, 2025
Merged

pass by reference or by value when necessary #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31a061e
clazy fixit function-args-by-value
atsju Aug 15, 2025
feaddd4
fix a signature
atsju Aug 15, 2025
1bc3b3c
clazy fixit function-args-by-ref
atsju Aug 15, 2025
c600098
fix some declarations
atsju Aug 15, 2025
1f195c6
Merge branch 'master' of github.com:githubdoe/DFTFringe into JST/claz…
atsju Aug 20, 2025
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
18 changes: 9 additions & 9 deletions IgramArea.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class outlinePair{
public:
QImage m_image;
CircleOutline m_outline;
outlinePair(QImage img, CircleOutline outline): m_image(img), m_outline(outline){}
outlinePair(const QImage &img, const CircleOutline &outline): m_image(img), m_outline(outline){}
};

class undoStack {
Expand All @@ -94,7 +94,7 @@ class undoStack {

public:
undoStack(){};
void push(QImage img, CircleOutline outline);
void push(const QImage &img, const CircleOutline &outline);
outlinePair current(){return m_stack.back();};
outlinePair undo();
outlinePair redo();
Expand Down Expand Up @@ -142,8 +142,8 @@ class IgramArea : public QWidget
CircleOutline m_center;
void hideOutline(bool checked);
bool m_hideOutlines;
void loadOutlineFileOldV6(QString filename);
void loadOutlineFile(QString filename);
void loadOutlineFileOldV6(const QString &filename);
void loadOutlineFile(const QString &filename);
void undo();
void redo();
void writeOutlinesOldV6(QString fileName);
Expand All @@ -152,23 +152,23 @@ class IgramArea : public QWidget
void shiftoutline(QPointF p);
void setZoomMode(zoomMode mode);
void showAliasDialog();
cv::Mat igramToGray(cv::Mat roi);
cv::Mat igramToGray(const cv::Mat &roi);
cv::Mat qImageToMat(QImage &roi);
private slots:
void aperatureChanged();
public slots:
void gammaChanged(bool, double);
void generateSimIgram();
void clearImage();
void dftReady(QImage img);
void dftReady(const QImage &img);
void outlineTimerTimeout();
void shiftUp();
void shiftDown();
void shiftRight();
void shiftLeft();
void zoomIn();
void zoomOut();
void igramOutlineParmsChanged(outlineParms parms);
void igramOutlineParmsChanged(const outlineParms &parms);
void increase( int i = 1);
void decrease();
void zoomFull();
Expand Down Expand Up @@ -218,8 +218,8 @@ public slots:

double leftMargin;
double searchOutlineScale;
cv::Point2d findBestOutsideOutline(cv::Mat gray, int start, int end, int step, int *radius, int pass);
cv::Point2d findBestCenterOutline(cv::Mat gray, int start, int end, int step, int *radius, bool useExisting);
cv::Point2d findBestOutsideOutline(const cv::Mat &gray, int start, int end, int step, int *radius, int pass);
cv::Point2d findBestCenterOutline(const cv::Mat &gray, int start, int end, int step, int *radius, bool useExisting);
QString m_outlineMsg;
double m_edgeMaskWidth;
void saveRegions();
Expand Down
2 changes: 1 addition & 1 deletion arbitrarywavwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ArbitraryWavWidget::~ArbitraryWavWidget(){
pts.empty();
}

bool comparePoints(const QPointF &a, const QPointF &b) {
bool comparePoints(QPointF a, QPointF b) {
return a.x() < b.x();
}

Expand Down
2 changes: 1 addition & 1 deletion astigpolargraph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class astigSample{
QString m_name;
double m_xastig;
double m_yastig;
astigSample(QString name, double xastig, double yastig): m_name(name), m_xastig(xastig), m_yastig(yastig){};
astigSample(const QString &name, double xastig, double yastig): m_name(name), m_xastig(xastig), m_yastig(yastig){};
};

class astigPolargraph : public QDialog
Expand Down
4 changes: 2 additions & 2 deletions astigscatterplot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ astigScatterPlot::astigScatterPlot(QWidget *parent):QwtPlot( parent ),m_max(.3)
replot();
}

void astigScatterPlot::selectedwave(QString m){
void astigScatterPlot::selectedwave(const QString &m){
emit waveSeleted(m);
}


void astigScatterPlot::addValue(QString name, QPointF p){
void astigScatterPlot::addValue(const QString &name, QPointF p){
QwtPlotMarker *m = new QwtPlotMarker(name);
if (fabs(p.x()) > m_max)
m_max = fabs(p.x());
Expand Down
4 changes: 2 additions & 2 deletions astigscatterplot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ class astigScatterPlot : public QwtPlot
double m_max;
public:
astigScatterPlot(QWidget *parent = 0);
void addValue(QString name, QPointF p);
void addValue(const QString &name, QPointF p);
signals:
void waveSeleted(QString m);
public slots:
void selectedwave(QString);
void selectedwave(const QString&);
};

#endif // ASTIGSCATTERPLOT_H
8 changes: 4 additions & 4 deletions astigstatsdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class CustomPlotPicker : public QwtPlotPicker {
: QwtPlotPicker(xAxis, yAxis, QwtPicker::NoRubberBand, QwtPicker::AlwaysOn, canvas) {
}

void addTooltipToPoint(const QPointF &point, const QString &tooltip){
void addTooltipToPoint(QPointF point, const QString &tooltip){
tooltips_.emplace_back(point, tooltip);
}

Expand Down Expand Up @@ -138,7 +138,7 @@ class CustomPlotPicker : public QwtPlotPicker {
};


astigStatsDlg::astigStatsDlg(QVector<wavefront *> wavefronts, QWidget *parent) :
astigStatsDlg::astigStatsDlg(const QVector<wavefront *> &wavefronts, QWidget *parent) :
QDialog(parent),
ui(new Ui::astigStatsDlg), m_wavefronts(wavefronts), editor(0), PDFMode(false),
distributionWindow(0), runningAvgN(20), showSamples(false),
Expand Down Expand Up @@ -181,7 +181,7 @@ class measure{
public:
QString name;
QPointF p;
measure(QString n, QPointF _p):name(n),p(_p){};
measure(const QString &n, QPointF _p):name(n),p(_p){};
measure(){};
};

Expand Down Expand Up @@ -480,7 +480,7 @@ void astigStatsDlg::plot(){
ui->mPlot->replot();
}

void astigStatsDlg::showItem(QVariant item, bool on, int /*ndx*/){
void astigStatsDlg::showItem(const QVariant &item, bool on, int /*ndx*/){
qDebug() << "item " << item;
QwtPlotItem *t = qvariant_cast<QwtPlotItem *>(item);
t->setVisible(on);
Expand Down
4 changes: 2 additions & 2 deletions astigstatsdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class astigStatsDlg : public QDialog
Q_OBJECT

public:
explicit astigStatsDlg( QVector<wavefront *> wavefronts,QWidget *parent = 0);
explicit astigStatsDlg( const QVector<wavefront *> &wavefronts,QWidget *parent = 0);
~astigStatsDlg();
void plot();
private slots:
Expand All @@ -41,7 +41,7 @@ private slots:
void on_clearPb_clicked();

void on_onlyAverages_clicked();
void showItem(QVariant item, bool on, int ndx);
void showItem(const QVariant &item, bool on, int ndx);

void on_savePB_clicked();
void showSamplesChanged(bool);
Expand Down
2 changes: 1 addition & 1 deletion averagewavefrontfilesdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <opencv2/imgproc.hpp>

void showData(const std::string &txt, cv::Mat mat, bool useLog);
averageWaveFrontFilesDlg::averageWaveFrontFilesDlg(QStringList list, SurfaceManager *m, QWidget *parent) :
averageWaveFrontFilesDlg::averageWaveFrontFilesDlg(const QStringList &list, SurfaceManager *m, QWidget *parent) :
QDialog(parent),
ui(new Ui::averageWaveFrontFilesDlg)
{
Expand Down
2 changes: 1 addition & 1 deletion averagewavefrontfilesdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class averageWaveFrontFilesDlg : public QDialog
SurfaceManager *sm;

public:
explicit averageWaveFrontFilesDlg(QStringList list, SurfaceManager *sm, QWidget *parent = 0);
explicit averageWaveFrontFilesDlg(const QStringList &list, SurfaceManager *sm, QWidget *parent = 0);
~averageWaveFrontFilesDlg();
wavefront *average;
signals:
Expand Down
8 changes: 4 additions & 4 deletions batchigramwizard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ QString batchIgramWizard::reviewFileName;
QCheckBox *batchIgramWizard::autoOutlineCenter = 0;
QCheckBox *batchIgramWizard::autoOutlineOutside = 0;

batchIgramWizard::batchIgramWizard(QStringList files, QWidget *parent, Qt::WindowFlags flags) :
batchIgramWizard::batchIgramWizard(const QStringList &files, QWidget *parent, Qt::WindowFlags flags) :
QWizard(parent, flags),
ui(new Ui::batchIgramWizard)
{
Expand Down Expand Up @@ -88,7 +88,7 @@ void batchIntro::eraseItem()
}
}

void batchIntro::showContextMenu(const QPoint &pos)
void batchIntro::showContextMenu(QPoint pos)
{
// Handle global position
QPoint globalPos = filesList->mapToGlobal(pos);
Expand Down Expand Up @@ -257,7 +257,7 @@ bool batchIntro::shouldFilterWavefront(double rms){
return (filterWavefront && rms > filterRms);
}

void batchIgramWizard::addAstig(QString name, QPointF value){
void batchIgramWizard::addAstig(const QString &name, QPointF value){

introPage->astigPlot->addValue(name,value);
}
Expand All @@ -267,7 +267,7 @@ void batchIgramWizard::progressValue(int min, int max, int value){
introPage->pgrBar->setValue(value);
}

void batchIgramWizard::addRms(QString name, QPointF p){
void batchIgramWizard::addRms(const QString &name, QPointF p){
introPage->m_rmsPlot->addValue(name,p);
}

Expand Down
8 changes: 4 additions & 4 deletions batchigramwizard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ class batchIgramWizard : public QWizard

static QCheckBox *autoOutlineOutside;
static QCheckBox *autoOutlineCenter;
explicit batchIgramWizard(QStringList files, QWidget *parent = 0 , Qt::WindowFlags flags = Qt::Widget);
explicit batchIgramWizard(const QStringList &files, QWidget *parent = 0 , Qt::WindowFlags flags = Qt::Widget);
~batchIgramWizard();
void listReady(QStringList list);

void addAstig(QString name, QPointF value);
void addRms(QString name, QPointF p);
void addAstig(const QString &name, QPointF value);
void addRms(const QString &name, QPointF p);
void progressValue(int min, int max, int value);
void select(int n);
void showPlots(bool flags);
Expand Down Expand Up @@ -82,7 +82,7 @@ class batchIntro : public QWizardPage
public slots:
void processBatch();
void addFiles();
void showContextMenu(const QPoint &pos);
void showContextMenu(QPoint pos);
void eraseItem();
void showPlots(bool flags);
void on_filter(bool);
Expand Down
4 changes: 2 additions & 2 deletions camcalibrationreviewdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "camcalibrationreviewdlg.h"
#include "ui_camcalibrationreviewdlg.h"
#include <QDebug>
CamCalibrationReviewDlg::CamCalibrationReviewDlg(std::vector<cv::Mat> images, std::vector<cv::Mat> keypoints,
std::vector<cv::Mat> corrected, QWidget *parent) :
CamCalibrationReviewDlg::CamCalibrationReviewDlg(const std::vector<cv::Mat> &images, const std::vector<cv::Mat> &keypoints,
const std::vector<cv::Mat> &corrected, QWidget *parent) :
QDialog(parent),
m_ndx(0), m_images(images), m_keypoints(keypoints), m_corrected(corrected),
ui(new Ui::CamCalibrationReviewDlg), m_overlay(false), m_viewType(0)
Expand Down
2 changes: 1 addition & 1 deletion camcalibrationreviewdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class CamCalibrationReviewDlg : public QDialog
Q_OBJECT

public:
explicit CamCalibrationReviewDlg( std::vector<cv::Mat> images, std::vector<cv::Mat> keypoints, std::vector<cv::Mat> corrected,QWidget *parent = 0);
explicit CamCalibrationReviewDlg( const std::vector<cv::Mat> &images, const std::vector<cv::Mat> &keypoints, const std::vector<cv::Mat> &corrected,QWidget *parent = 0);
~CamCalibrationReviewDlg();
virtual void resizeEvent( QResizeEvent * );
private slots:
Expand Down
6 changes: 3 additions & 3 deletions camwizardpage1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ double computeReprojectionErrors( const std::vector<std::vector<cv::Point3f> >&
return std::sqrt(totalErr/totalPoints);
}
bool CamWizardPage1::runCalibration( cv::Size& imageSize, cv::Mat& cameraMatrix, cv::Mat& distCoeffs,
std::vector<std::vector<cv::Point2f> > imagePoints, std::vector<cv::Mat>& rvecs, std::vector<cv::Mat>& tvecs,
const std::vector<std::vector<cv::Point2f> > &imagePoints, std::vector<cv::Mat>& rvecs, std::vector<cv::Mat>& tvecs,
std::vector<float>& reprojErrs, double& totalAvgErr)
{

Expand Down Expand Up @@ -150,7 +150,7 @@ void CamWizardPage1::eraseItem()
}
}

void CamWizardPage1::showContextMenu(const QPoint &pos)
void CamWizardPage1::showContextMenu(QPoint pos)
{
// Handle global position
QPoint globalPos = ui->listWidget->mapToGlobal(pos);
Expand All @@ -162,7 +162,7 @@ void CamWizardPage1::showContextMenu(const QPoint &pos)
myMenu.exec(globalPos);
}

bool CamWizardPage1::runCalibrationAndSave(cv::Size imageSize, cv::Mat& cameraMatrix, cv::Mat& distCoeffs,std::vector<std::vector<cv::Point2f> > imagePoints )
bool CamWizardPage1::runCalibrationAndSave(cv::Size imageSize, cv::Mat& cameraMatrix, cv::Mat& distCoeffs,const std::vector<std::vector<cv::Point2f> > &imagePoints )
{
std::vector<cv::Mat> rvecs, tvecs;
std::vector<float> reprojErrs;
Expand Down
6 changes: 3 additions & 3 deletions camwizardpage1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ class CamWizardPage1 : public QWizardPage
~CamWizardPage1();
QStringList fileList;
bool runCalibration(cv::Size& imageSize, cv::Mat& cameraMatrix, cv::Mat& distCoeffs,
std::vector<std::vector<cv::Point2f> > imagePoints, std::vector<cv::Mat>& rvecs, std::vector<cv::Mat>& tvecs,
const std::vector<std::vector<cv::Point2f> > &imagePoints, std::vector<cv::Mat>& rvecs, std::vector<cv::Mat>& tvecs,
std::vector<float>& reprojErrs, double& totalAvgErr);

bool runCalibrationAndSave(cv::Size imageSize, cv::Mat& cameraMatrix,
cv::Mat& distCoeffs,std::vector<std::vector<cv::Point2f> > imagePoints );
cv::Mat& distCoeffs,const std::vector<std::vector<cv::Point2f> > &imagePoints );
Ui::CamWizardPage1 *ui;
cv::Mat m_coeffs;
private slots:
void on_compute_clicked();
void on_pushButton_clicked();
void showContextMenu(const QPoint &pos);
void showContextMenu(QPoint pos);
void eraseItem();
void on_saveParams_clicked();
void on_rows_valueChanged(int arg1);
Expand Down
2 changes: 1 addition & 1 deletion colorchanneldisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ColorChannelDisplay::~ColorChannelDisplay()
{
delete ui;
}
void ColorChannelDisplay::setImage(cv::Mat imgMat){
void ColorChannelDisplay::setImage(const cv::Mat &imgMat){

for (int channel = 0; channel < 3; ++channel){
cv::Mat planes[4];
Expand Down
2 changes: 1 addition & 1 deletion colorchanneldisplay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ColorChannelDisplay : public QDialog
public:
explicit ColorChannelDisplay(QWidget *parent = 0);
~ColorChannelDisplay();
void setImage(cv::Mat imgMat);
void setImage(const cv::Mat &imgMat);

private:
Ui::ColorChannelDisplay *ui;
Expand Down
2 changes: 1 addition & 1 deletion colormapviewerdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ colorMapViewerDlg::colorMapViewerDlg(QWidget *parent) :

}

void colorMapViewerDlg::genList(QString path){
void colorMapViewerDlg::genList(const QString &path){
QStringList nameFilter("*.cmp");
QDir directory(path);
QStringList cmpFiles = directory.entryList(nameFilter);
Expand Down
2 changes: 1 addition & 1 deletion colormapviewerdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class colorMapViewerDlg : public QDialog
~colorMapViewerDlg();
QString m_selection;

void genList(QString path);
void genList(const QString &path);
private slots:
void on_browsePb_clicked();

Expand Down
2 changes: 1 addition & 1 deletion contourplot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ void ContourPlot::ruler(){
}
}

void ContourPlot::selected(const QPointF& pos){
void ContourPlot::selected(QPointF pos){
Copy link
Collaborator

@gr5 gr5 Aug 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I get that you are adding tons of "const &" and that makes it so it uses the incoming variable as is but promises not to modify it.

But why are you removing the const & in a few cases such as this one?

Copy link
Collaborator Author

@atsju atsju Aug 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically passing large classes by value makes the compiler do a copy of the variable on the stack. That's why you pass by reference with & (I'm a C expert so I see this more or less like pass by pointer). Adding const tells compiler and reviewer that the variable will not be modified inside the function.

You don't want to pass an int by pointer or reference because it adds unnecessary operation to make the pointer or reference. Small variables are already in registers and don't need copy on stack.

QPointF is a class but in fact it's really just 2 values. So it's small enough to prefer passing by value.
Now I understand this one (QPointF) is really misleading and I don't think it changes anything to the code. I would almost lean to let it like it was with pass by reference. It's just a little more work as those chances were automated.

if (m_wf==0)
return;

Expand Down
4 changes: 2 additions & 2 deletions contourplot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ class ContourPlot: public QwtPlot
void setMinMaxValues(double,double);
void setWaveRange(double);
void newContourRange(double);
void sigPointSelected(const QPointF&);
void sigPointSelected(QPointF );

public Q_SLOTS:
void selected(const QPointF& pos);
void selected(QPointF pos);


public Q_SLOTS:
Expand Down
2 changes: 1 addition & 1 deletion contourview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void contourView::setSurface(wavefront *wf){
ps->setData(wf);
}

void contourView::showContextMenu(const QPoint &pos)
void contourView::showContextMenu(QPoint pos)
{
// Handle global position
QPoint globalPos = mapToGlobal(pos);
Expand Down
2 changes: 1 addition & 1 deletion contourview.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class contourView : public QWidget
void zoomMe(bool);
private slots:
void on_doubleSpinBox_valueChanged(double arg1);
void showContextMenu(const QPoint &pos);
void showContextMenu(QPoint pos);
void on_pushButton_pressed();
void zoom();

Expand Down
2 changes: 1 addition & 1 deletion counterrotationdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "counterrotationdlg.h"
#include "ui_counterrotationdlg.h"

CounterRotationDlg::CounterRotationDlg(QString fn, double rot, bool dir, QWidget *parent) :
CounterRotationDlg::CounterRotationDlg(const QString &fn, double rot, bool dir, QWidget *parent) :
QDialog(parent),
ui(new Ui::CounterRotationDlg)
{
Expand Down
Loading
Loading