Skip to content

Commit 15632cb

Browse files
authored
Merge pull request #228 from atsju/JST/clazyArgs
pass by reference or by value when necessary
2 parents fc352c4 + 1f195c6 commit 15632cb

File tree

116 files changed

+239
-239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+239
-239
lines changed

IgramArea.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class outlinePair{
8585
public:
8686
QImage m_image;
8787
CircleOutline m_outline;
88-
outlinePair(QImage img, CircleOutline outline): m_image(img), m_outline(outline){}
88+
outlinePair(const QImage &img, const CircleOutline &outline): m_image(img), m_outline(outline){}
8989
};
9090

9191
class undoStack {
@@ -94,7 +94,7 @@ class undoStack {
9494

9595
public:
9696
undoStack(){};
97-
void push(QImage img, CircleOutline outline);
97+
void push(const QImage &img, const CircleOutline &outline);
9898
outlinePair current(){return m_stack.back();};
9999
outlinePair undo();
100100
outlinePair redo();
@@ -142,8 +142,8 @@ class IgramArea : public QWidget
142142
CircleOutline m_center;
143143
void hideOutline(bool checked);
144144
bool m_hideOutlines;
145-
void loadOutlineFileOldV6(QString filename);
146-
void loadOutlineFile(QString filename);
145+
void loadOutlineFileOldV6(const QString &filename);
146+
void loadOutlineFile(const QString &filename);
147147
void undo();
148148
void redo();
149149
void writeOutlinesOldV6(QString fileName);
@@ -152,23 +152,23 @@ class IgramArea : public QWidget
152152
void shiftoutline(QPointF p);
153153
void setZoomMode(zoomMode mode);
154154
void showAliasDialog();
155-
cv::Mat igramToGray(cv::Mat roi);
155+
cv::Mat igramToGray(const cv::Mat &roi);
156156
cv::Mat qImageToMat(QImage &roi);
157157
private slots:
158158
void aperatureChanged();
159159
public slots:
160160
void gammaChanged(bool, double);
161161
void generateSimIgram();
162162
void clearImage();
163-
void dftReady(QImage img);
163+
void dftReady(const QImage &img);
164164
void outlineTimerTimeout();
165165
void shiftUp();
166166
void shiftDown();
167167
void shiftRight();
168168
void shiftLeft();
169169
void zoomIn();
170170
void zoomOut();
171-
void igramOutlineParmsChanged(outlineParms parms);
171+
void igramOutlineParmsChanged(const outlineParms &parms);
172172
void increase( int i = 1);
173173
void decrease();
174174
void zoomFull();
@@ -218,8 +218,8 @@ public slots:
218218

219219
double leftMargin;
220220
double searchOutlineScale;
221-
cv::Point2d findBestOutsideOutline(cv::Mat gray, int start, int end, int step, int *radius, int pass);
222-
cv::Point2d findBestCenterOutline(cv::Mat gray, int start, int end, int step, int *radius, bool useExisting);
221+
cv::Point2d findBestOutsideOutline(const cv::Mat &gray, int start, int end, int step, int *radius, int pass);
222+
cv::Point2d findBestCenterOutline(const cv::Mat &gray, int start, int end, int step, int *radius, bool useExisting);
223223
QString m_outlineMsg;
224224
double m_edgeMaskWidth;
225225
void saveRegions();

arbitrarywavwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ ArbitraryWavWidget::~ArbitraryWavWidget(){
5454
pts.empty();
5555
}
5656

57-
bool comparePoints(const QPointF &a, const QPointF &b) {
57+
bool comparePoints(QPointF a, QPointF b) {
5858
return a.x() < b.x();
5959
}
6060

astigpolargraph.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class astigSample{
2525
QString m_name;
2626
double m_xastig;
2727
double m_yastig;
28-
astigSample(QString name, double xastig, double yastig): m_name(name), m_xastig(xastig), m_yastig(yastig){};
28+
astigSample(const QString &name, double xastig, double yastig): m_name(name), m_xastig(xastig), m_yastig(yastig){};
2929
};
3030

3131
class astigPolargraph : public QDialog

astigscatterplot.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ astigScatterPlot::astigScatterPlot(QWidget *parent):QwtPlot( parent ),m_max(.3)
4646
replot();
4747
}
4848

49-
void astigScatterPlot::selectedwave(QString m){
49+
void astigScatterPlot::selectedwave(const QString &m){
5050
emit waveSeleted(m);
5151
}
5252

5353

54-
void astigScatterPlot::addValue(QString name, QPointF p){
54+
void astigScatterPlot::addValue(const QString &name, QPointF p){
5555
QwtPlotMarker *m = new QwtPlotMarker(name);
5656
if (fabs(p.x()) > m_max)
5757
m_max = fabs(p.x());

astigscatterplot.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ class astigScatterPlot : public QwtPlot
1717
double m_max;
1818
public:
1919
astigScatterPlot(QWidget *parent = 0);
20-
void addValue(QString name, QPointF p);
20+
void addValue(const QString &name, QPointF p);
2121
signals:
2222
void waveSeleted(QString m);
2323
public slots:
24-
void selectedwave(QString);
24+
void selectedwave(const QString&);
2525
};
2626

2727
#endif // ASTIGSCATTERPLOT_H

astigstatsdlg.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class CustomPlotPicker : public QwtPlotPicker {
110110
: QwtPlotPicker(xAxis, yAxis, QwtPicker::NoRubberBand, QwtPicker::AlwaysOn, canvas) {
111111
}
112112

113-
void addTooltipToPoint(const QPointF &point, const QString &tooltip){
113+
void addTooltipToPoint(QPointF point, const QString &tooltip){
114114
tooltips_.emplace_back(point, tooltip);
115115
}
116116

@@ -138,7 +138,7 @@ class CustomPlotPicker : public QwtPlotPicker {
138138
};
139139

140140

141-
astigStatsDlg::astigStatsDlg(QVector<wavefront *> wavefronts, QWidget *parent) :
141+
astigStatsDlg::astigStatsDlg(const QVector<wavefront *> &wavefronts, QWidget *parent) :
142142
QDialog(parent),
143143
ui(new Ui::astigStatsDlg), m_wavefronts(wavefronts), editor(0), PDFMode(false),
144144
distributionWindow(0), runningAvgN(20), showSamples(false),
@@ -181,7 +181,7 @@ class measure{
181181
public:
182182
QString name;
183183
QPointF p;
184-
measure(QString n, QPointF _p):name(n),p(_p){};
184+
measure(const QString &n, QPointF _p):name(n),p(_p){};
185185
measure(){};
186186
};
187187

@@ -480,7 +480,7 @@ void astigStatsDlg::plot(){
480480
ui->mPlot->replot();
481481
}
482482

483-
void astigStatsDlg::showItem(QVariant item, bool on, int /*ndx*/){
483+
void astigStatsDlg::showItem(const QVariant &item, bool on, int /*ndx*/){
484484
qDebug() << "item " << item;
485485
QwtPlotItem *t = qvariant_cast<QwtPlotItem *>(item);
486486
t->setVisible(on);

astigstatsdlg.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class astigStatsDlg : public QDialog
2424
Q_OBJECT
2525

2626
public:
27-
explicit astigStatsDlg( QVector<wavefront *> wavefronts,QWidget *parent = 0);
27+
explicit astigStatsDlg( const QVector<wavefront *> &wavefronts,QWidget *parent = 0);
2828
~astigStatsDlg();
2929
void plot();
3030
private slots:
@@ -41,7 +41,7 @@ private slots:
4141
void on_clearPb_clicked();
4242

4343
void on_onlyAverages_clicked();
44-
void showItem(QVariant item, bool on, int ndx);
44+
void showItem(const QVariant &item, bool on, int ndx);
4545

4646
void on_savePB_clicked();
4747
void showSamplesChanged(bool);

averagewavefrontfilesdlg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <opencv2/imgproc.hpp>
1111

1212
void showData(const std::string &txt, cv::Mat mat, bool useLog);
13-
averageWaveFrontFilesDlg::averageWaveFrontFilesDlg(QStringList list, SurfaceManager *m, QWidget *parent) :
13+
averageWaveFrontFilesDlg::averageWaveFrontFilesDlg(const QStringList &list, SurfaceManager *m, QWidget *parent) :
1414
QDialog(parent),
1515
ui(new Ui::averageWaveFrontFilesDlg)
1616
{

averagewavefrontfilesdlg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class averageWaveFrontFilesDlg : public QDialog
1616
SurfaceManager *sm;
1717

1818
public:
19-
explicit averageWaveFrontFilesDlg(QStringList list, SurfaceManager *sm, QWidget *parent = 0);
19+
explicit averageWaveFrontFilesDlg(const QStringList &list, SurfaceManager *sm, QWidget *parent = 0);
2020
~averageWaveFrontFilesDlg();
2121
wavefront *average;
2222
signals:

batchigramwizard.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ QString batchIgramWizard::reviewFileName;
2727
QCheckBox *batchIgramWizard::autoOutlineCenter = 0;
2828
QCheckBox *batchIgramWizard::autoOutlineOutside = 0;
2929

30-
batchIgramWizard::batchIgramWizard(QStringList files, QWidget *parent, Qt::WindowFlags flags) :
30+
batchIgramWizard::batchIgramWizard(const QStringList &files, QWidget *parent, Qt::WindowFlags flags) :
3131
QWizard(parent, flags),
3232
ui(new Ui::batchIgramWizard)
3333
{
@@ -88,7 +88,7 @@ void batchIntro::eraseItem()
8888
}
8989
}
9090

91-
void batchIntro::showContextMenu(const QPoint &pos)
91+
void batchIntro::showContextMenu(QPoint pos)
9292
{
9393
// Handle global position
9494
QPoint globalPos = filesList->mapToGlobal(pos);
@@ -257,7 +257,7 @@ bool batchIntro::shouldFilterWavefront(double rms){
257257
return (filterWavefront && rms > filterRms);
258258
}
259259

260-
void batchIgramWizard::addAstig(QString name, QPointF value){
260+
void batchIgramWizard::addAstig(const QString &name, QPointF value){
261261

262262
introPage->astigPlot->addValue(name,value);
263263
}
@@ -267,7 +267,7 @@ void batchIgramWizard::progressValue(int min, int max, int value){
267267
introPage->pgrBar->setValue(value);
268268
}
269269

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

0 commit comments

Comments
 (0)