Skip to content

Fix potential dip in profile plot when using Gaussian blur + minor display issues #359

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 4 commits into
base: master
Choose a base branch
from
Open

Fix potential dip in profile plot when using Gaussian blur + minor display issues #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88f001f
code used truncation instaed of rounding to nearest
atsju Aug 4, 2026
99c48c9
fix #333 manage circle boundaries same way everywhere
atsju Aug 5, 2026
4e983c2
fix #319 save ronchi displayed save ronchi
atsju Aug 4, 2026
a7ebba5
fix #317 scroll did not update min/max values in contour plot
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
17 changes: 11 additions & 6 deletions contourplot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,15 @@ double SpectrogramData::value( double x, double y ) const
if (y >= m_wf->workData.rows || x >= m_wf->workData.cols || y < 0 || x < 0){
return -10.0;
}
if ((m_wf->workMask.at<uint8_t>((int)y,(int)x)) != 255){
int ix = qRound(x);
int iy = qRound(y);
if (iy >= m_wf->workData.rows || ix >= m_wf->workData.cols || iy < 0 || ix < 0){
return -10.0;
}
if ((m_wf->workMask.at<uint8_t>(iy,ix)) != 255){
return -10;
}
return (m_wf->workData(y,x)* m_wf->lambda/outputLambda) -zOffset;
return (m_wf->workData(iy,ix)* m_wf->lambda/outputLambda) -zOffset;

}

Expand Down Expand Up @@ -402,8 +407,8 @@ void ContourPlot::ruler(){
double sina = sin(radians);
double cosa = cos(radians);
// move to start
int startx = -half * cosa;
int starty = -half * sina;
int startx = qRound(-half * cosa);
int starty = qRound(-half * sina);
radials.moveTo( half + startx,half + starty);
// line to end
int endx = half - startx;
Expand Down Expand Up @@ -486,8 +491,8 @@ void ContourPlot::drawProfileLine(const double angle){
QPainterPath radials;
int half = m_wf->data.rows/2.;
// move to start
int startx = -half * cosa;
int starty = -half * sina;
int startx = qRound(-half * cosa);
int starty = qRound(-half * sina);
radials.moveTo( half + startx,half + starty);
// line to end
int endx = half - startx;
Expand Down
3 changes: 3 additions & 0 deletions contourtools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ void ContourTools::setWaveRange(double val){
void ContourTools::setMinMaxValues(double min, double max){
m_min = min;
m_max = max;
ui->errorRangeSpin->blockSignals(true);
ui->errorRangeSpin->setValue(m_max - m_min);
ui->errorRangeSpin->blockSignals(false);
ui->minSB->blockSignals(true);
ui->maxSB->blockSignals(true);
ui->minSB->setValue(min);
Expand Down
2 changes: 1 addition & 1 deletion foucaultview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ QImage *foucaultView::render(){

void foucaultView::saveRonchiImage(){
const QPixmap pm = ui->ronchiViewLb->pixmap(Qt::ReturnByValue);
pm.save(getSaveFileName("foucault"));
pm.save(getSaveFileName("ronchi"));

}
void foucaultView::saveFoucaultImage(){
Expand Down
6 changes: 3 additions & 3 deletions profileplot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,9 +444,9 @@ QPolygonF ProfilePlot::createProfile(double units, const wavefront *wf, bool all
e = md.m_verticalAxis / md.diameter;
}

// Calculate matrix coordinates
int dx = radn * cos(g_angle + M_PI_2) + wf->m_outside.m_center.x();
int dy = -radn * e * sin(g_angle + M_PI_2) + wf->m_outside.m_center.y();
// Round to the nearest pixel to avoid 1-pixel endpoint errors at cardinal angles.
int dx = qRound(radn * cos(g_angle + M_PI_2) + wf->m_outside.m_center.x());
int dy = qRound(-radn * e * sin(g_angle + M_PI_2) + wf->m_outside.m_center.y());

// Boundary Check: Ignore points outside the matrix
if (dy >= wf->data.rows || dx >= wf->data.cols || dy < 0 || dx < 0) {
Expand Down
8 changes: 4 additions & 4 deletions psi_dlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,10 +293,10 @@ void PSI_dlg::plot(QVector<double> phases, int iteration, double sdp){
double angle = phases[i];
double angle2 = phases[i+1];

int x1 = half - rlast * cos(angle + M_PI/2.);
int x2 = half - r * cos(angle2 + M_PI/2.);
int y1 = half - rlast * sin(angle + M_PI/2.);
int y2 = half - r * sin(angle2+ M_PI/2.);
int x1 = qRound(half - rlast * cos(angle + M_PI/2.));
int x2 = qRound(half - r * cos(angle2 + M_PI/2.));
int y1 = qRound(half - rlast * sin(angle + M_PI/2.));
int y2 = qRound(half - r * sin(angle2+ M_PI/2.));
// qDebug() << "angle1" << angle * k << angle2 * k;
while (angle < 0)
angle = (2 * M_PI) + angle;
Expand Down
8 changes: 4 additions & 4 deletions psiphasedisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ void PSIphaseDisplay::plot(QVector<double> phases, int iteration, double sdp){
double angle = phases[i];
double angle2 = phases[i+1];

int x1 = half - rlast * cos(angle + M_PI/2.);
int x2 = half - r * cos(angle2 + M_PI/2.);
int y1 = half - rlast * sin(angle + M_PI/2.);
int y2 = half - r * sin(angle2+ M_PI/2.);
int x1 = qRound(half - rlast * cos(angle + M_PI/2.));
int x2 = qRound(half - r * cos(angle2 + M_PI/2.));
int y1 = qRound(half - rlast * sin(angle + M_PI/2.));
int y2 = qRound(half - r * sin(angle2+ M_PI/2.));
// qDebug() << "angle1" << angle * k << angle2 * k;
while (angle < 0)
angle = (2 * M_PI) + angle;
Expand Down
17 changes: 9 additions & 8 deletions utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,10 @@ void CropGaussianBlur(const cv::Mat &in_, cv::Mat &out, int kernelSize, const Ci
double radius2 = (outside.m_radius-2)*(outside.m_radius-2);
for (int x=0; x<width; x++) {
double dx = (cx-x)*(cx-x);
for (int y=0; y<width; y++) {
for (int y=0; y<height; y++) {
double dy = (cy-y)*(cy-y);
if ((dx+dy) >= radius2) {
// Keep boundary pixels inside, consistent with fillCircle() mask creation.
if ((dx+dy) > radius2) {
mask.at<double>(y,x) = 1e-5; // can't use zero or we get divide by zero issues later (in cells we don't care about)
in.at<double>(y,x) = 0;
}
Expand All @@ -246,9 +247,9 @@ void CropGaussianBlur(const cv::Mat &in_, cv::Mat &out, int kernelSize, const Ci
if (center.m_radius > 0) {
for (int x=0; x<width; x++) {
double dx = (cx-x)*(cx-x);
for (int y=0; y<width; y++) {
for (int y=0; y<height; y++) {
double dy = (cy-y)*(cy-y);
if ((dx+dy) < radius2) {
if ((dx+dy) <= radius2) {
mask.at<double>(y,x) = 1e-5; // can't use zero or we get divide by zero issues later (in cells we don't care about)
in.at<double>(y,x) = 0;
}
Expand Down Expand Up @@ -292,9 +293,9 @@ void CropGaussianBlur(const cv::Mat &in_, cv::Mat &out, int kernelSize, const Ci

for (int x=0; x<width; x++) {
double dx2 = (cx-x)*(cx-x);
for (int y=0; y<width; y++) {
for (int y=0; y<height; y++) {
double dy2 = (cy-y)*(cy-y);
if ((dx2+dy2) >= radius2) {
if ((dx2+dy2) > radius2) {
out.at<double>(y,x) = 0;
}
}
Expand All @@ -310,9 +311,9 @@ void CropGaussianBlur(const cv::Mat &in_, cv::Mat &out, int kernelSize, const Ci
if (center.m_radius > 0) {
for (int x=0; x<width; x++) {
double dx = (cx-x)*(cx-x);
for (int y=0; y<width; y++) {
for (int y=0; y<height; y++) {
double dy = (cy-y)*(cy-y);
if ((dx+dy) < radius2) {
if ((dx+dy) <= radius2) {
out.at<double>(y,x) = 0;
}
}
Expand Down
Loading