Skip to content

fix #345 where 16 diameters view change base angle on redraw #355

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
gr5 merged 2 commits into from
Aug 5, 2026
+11 −0
Merged

fix #345 where 16 diameters view change base angle on redraw #355

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96562cf
fix #345 where 16 diameters view change base angle on redraw
atsju Aug 4, 2026
8b41d8d
fix dashed line not displayed on different wft selection
atsju Aug 4, 2026
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
11 changes: 11 additions & 0 deletions profileplot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,9 @@ void ProfilePlot::setSurface(wavefront * wf){
m_waveFrontyOffsets.clear();
populate();
m_plot->replot();
// Re-emit the current angle so contour view redraws its dashed profile line
// after selecting a different wavefront.
emit profileAngleChanged(M_PI_2 - g_angle);
}

void ProfilePlot::setDefocusWaveFront( const cv::Mat_<double> &wf){
Expand All @@ -350,6 +353,7 @@ void ProfilePlot::setDefocusValue(double val){
QPolygonF ProfilePlot::createAverageProfile(double /*umnits*/, wavefront * /*wf*/, bool /*removeNull = false*/){
surfaceAnalysisTools *saTools = surfaceAnalysisTools::get_Instance();
QList<int> list = saTools->SelectedWaveFronts();
const double baselineAngle = g_angle;
QPolygonF avg;
for (int indx = 0; indx < list.size(); ++indx){

Expand Down Expand Up @@ -381,6 +385,7 @@ QPolygonF ProfilePlot::createAverageProfile(double /*umnits*/, wavefront * /*wf*
}

}
g_angle = startAngle;

// plot the average profile
int i = 0;
Expand All @@ -407,6 +412,8 @@ QPolygonF ProfilePlot::createAverageProfile(double /*umnits*/, wavefront * /*wf*
// avg = avg2;
// }

g_angle = baselineAngle;

return avg;
}

Expand Down Expand Up @@ -626,6 +633,8 @@ void ProfilePlot::populate()

m_plot->detachItems(QwtPlotItem::Rtti_PlotItem);
compass->setGeometry(QRect(80,80,70,70));
// Use compass as the source of truth when rebuilding profiles.
g_angle = compass->value() * DEGTORAD;
QString tmp("nanometers");
if (m_showNm == 1.)
tmp = QString("waves of %1 nm").arg(outputLambda, 6, 'f', 1);
Expand Down Expand Up @@ -781,6 +790,8 @@ void ProfilePlot::populate()
cprofile->attach( m_plot );
}
}
// Keep repeated redraws stable at the user-selected compass angle.
g_angle = startAngle;
}
if (m_showAvg){
qDebug() << "inside avg" << y_offset;
Expand Down
Loading