Skip to content

Commit aea8375

Browse files
committed
Merge branch 'averageProfile' of https://github.com/githubdoe/DFTFringe into averageProfile
updateing from remote
2 parents f82eadb + f7de6f0 commit aea8375

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

foucaultview.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ void foucaultView::generateBatchRonchiImage(const QList<wavefront*>& wavefrontLi
490490
layout->addLayout(btns);
491491

492492
// Connect the comparison trigger
493-
connect(compareBtn, &QPushButton::clicked, [=, &previewDlg]() {
493+
connect(compareBtn, &QPushButton::clicked, &previewDlg, [=, &previewDlg]() {
494494
// [=] copies individualRonchis and names so they stay
495495
// valid even after generateBatchRonchiImage() returns.
496496
if (individualRonchis.size() >= 2) {

surfacemanager.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#include "surfacegraph.h"
4646
enum configRESPONSE { YES, NO, ASK};
4747
enum AutoInvertMode {invNOTSET, invMANUAL, invCONIC, invINSIDE, invOUTSIDE};
48-
enum askAboutInversion {ask, doNotAskDoNotInvert, doNotAskbutInvert};
4948
struct textres {
5049
QTextEdit *Edit;
5150
QList<QString> res;
@@ -113,7 +112,6 @@ class SurfaceManager : public QObject
113112
void subtractWavefronts();
114113

115114
AutoInvertMode m_inverseMode;
116-
askAboutInversion m_askAboutInvert;
117115
bool m_ignoreInverse;
118116
bool m_surface_finished;
119117
configRESPONSE diamResp;

0 commit comments

Comments
 (0)