Skip to content

import wft config yes button was not working at all #371

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

Open
atsju wants to merge 1 commit into
base: master
Choose a base branch
from
Open

import wft config yes button was not working at all #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion mainwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ public slots:
signals:
void load(SurfaceManager *);
//void load(QStringList, SurfaceManager *);
void messageResult(int);
void gammaChanged(bool, double);
private slots:
void updateChannels(const cv::Mat&);
Expand Down
16 changes: 9 additions & 7 deletions surfacemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1349,16 +1349,16 @@ wavefront * SurfaceManager::readWaveFront(const QString &fileName){
}
wf->m_inside = CircleOutline(QPointF(xo,yo), rado);


if (lambda != md->lambda){
int resp = QMessageBox::No;
if (lambdResp == ASK){
QString message("The interferogram wavelength (");
message += QString("%1").arg( lambda, 6, 'f', 3) +
") Of the wavefront does not match the config value of " + QString("%1\n").arg(md->lambda, 6, 'f', 3) +
"Do you want to make the config match?";


int resp = QMessageBox(QMessageBox::Information,"config",message,QMessageBox::Yes|QMessageBox::No |
resp = QMessageBox(QMessageBox::Information,"config",message,QMessageBox::Yes|QMessageBox::No |
QMessageBox::YesToAll | QMessageBox::NoToAll).exec();

switch (resp){
Expand All @@ -1371,7 +1371,7 @@ wavefront * SurfaceManager::readWaveFront(const QString &fileName){
}
}

if ( lambdResp == YES || messageResult == QMessageBox::Yes){
if ( lambdResp == YES || resp == QMessageBox::Yes){
md->newLambda(QString::number(lambda));
}
}
Expand All @@ -1382,8 +1382,9 @@ wavefront * SurfaceManager::readWaveFront(const QString &fileName){
message += QString("%1").arg(diam, 6, 'f', 3) +
") Of the wavefront does not match the config value of " + QString("%1\n").arg(md->diameter, 6, 'f', 3) +
"Do you want to make the config match?";
int resp = QMessageBox::No;
if (diamResp == ASK){
int resp = QMessageBox(QMessageBox::Information,"config", message,QMessageBox::Yes|QMessageBox::No |
resp = QMessageBox(QMessageBox::Information,"config", message,QMessageBox::Yes|QMessageBox::No |
QMessageBox::YesToAll | QMessageBox::NoToAll).exec();

switch (resp){
Expand All @@ -1395,7 +1396,7 @@ wavefront * SurfaceManager::readWaveFront(const QString &fileName){
break;
}
}
if (diamResp == YES || messageResult == QMessageBox::Yes){
if (diamResp == YES || resp == QMessageBox::Yes){
emit diameterChanged(diam);
}
else {
Expand All @@ -1411,8 +1412,9 @@ wavefront * SurfaceManager::readWaveFront(const QString &fileName){
") Of the wavefront does not match the config value of " + QString("%1\n").arg(md->roc, 6, 'f', 3) +
"Do you want to make the config match?";
//qDebug() << message;
int resp = QMessageBox::No;
if (rocResp == ASK){
int resp = QMessageBox(QMessageBox::Information,"config",message,QMessageBox::Yes|QMessageBox::No |
resp = QMessageBox(QMessageBox::Information,"config",message,QMessageBox::Yes|QMessageBox::No |
QMessageBox::YesToAll | QMessageBox::NoToAll).exec();

switch (resp){
Expand All @@ -1424,7 +1426,7 @@ wavefront * SurfaceManager::readWaveFront(const QString &fileName){
break;
}
}
if (rocResp == YES || messageResult == QMessageBox::Yes){
if (rocResp == YES || resp == QMessageBox::Yes){
emit rocChanged(roc);
}
else {
Expand Down
1 change: 0 additions & 1 deletion surfacemanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ class SurfaceManager : public QObject
wavefront* m_standRemoved;
int insideOffset;
int outsideOffset;
int messageResult;
void inspectWavefront();

cv::Mat_<double> subtractPlane(cv::Mat_<double> phase, cv::Mat_<uint8_t> mask);
Expand Down
Loading