Skip to content

Fix ignore edge region. Center edge had wrong size and could have wrong coordinates #375

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

Fix ignore edge region. Center edge had wrong size and could have wrong coordinates #375

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e147650
code homogeneity
atsju Aug 16, 2026
4462f63
unused variables
atsju Aug 16, 2026
e1126be
correct ignore region center edge radius
atsju Aug 16, 2026
658ddf4
fix ignore edge region center edge coordinates when no hole
atsju Aug 16, 2026
77b10c4
put variables only in path where they are used
atsju Aug 16, 2026
479c7cf
add warning message in try/catch
atsju Aug 16, 2026
808299e
use central hole when present instead center coordinates
atsju Sep 6, 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
47 changes: 26 additions & 21 deletions surfacemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@
#include "utils.h"
#include "cnpy.h"

cv::Mat theMask;
cv::Mat deb;
double outputLambda;
double bilinear(cv::Mat mat, cv::Mat mask, double x, double y)
{
Expand Down Expand Up @@ -639,22 +637,22 @@ void SurfaceManager::makeMask(wavefront *wf, bool useInsideCircle){
ym = wf->m_outside.m_center.y();
double radm =wf->m_outside.m_radius + outsideOffset-2;
double rado = wf->m_inside.m_radius + insideOffset;
if (rado > 0)
rado += (insideOffset + 1);
if(rado > 0){
rado += 1;
}

double cx = wf->m_inside.m_center.x();
double cy = wf->m_inside.m_center.y();
cv::Mat mask = cv::Mat::zeros(height,width,CV_8U);
mirrorDlg &md = *mirrorDlg::get_Instance();
double rx = radm;
double rx2 = rx * rx;
double ry = rx * md.m_verticalAxis/md.diameter;
double ry2 = ry * ry;

if (!mirrorDlg::get_Instance()->isEllipse()){
uchar v = 0xff;
fillCircle(mask, xm,ym,radm, &v);
}
else {
double rx = radm;
double rx2 = rx * rx;
double ry = rx * md.m_verticalAxis/md.diameter;
double ry2 = ry * ry;
for (int y = 0; y < height; ++y){
for (int x = 0; x < width; ++x){

Expand All @@ -669,7 +667,15 @@ void SurfaceManager::makeMask(wavefront *wf, bool useInsideCircle){

if (rado > 0 && useInsideCircle) {
uchar color = 0;
fillCircle(mask, cx,cy,rado, &color);
if(wf->m_inside.isValid()){
double cx = wf->m_inside.m_center.x();
double cy = wf->m_inside.m_center.y();
fillCircle(mask, cx, cy, rado, &color);
}
else{
// inside circle is not always defined. So we use outside circle coordinates.
fillCircle(mask, xm, ym, rado, &color);
}
}

// expand the region by 10%
Expand Down Expand Up @@ -715,7 +721,6 @@ void SurfaceManager::makeMask(wavefront *wf, bool useInsideCircle){
//line(wf->workMask, Point(s/2, 0), Point(s/2,s),cv::Scalar(0,0,0), 10);
// line(wf->workMask, Point(0, s/2), Point(s,s/2),cv::Scalar(0,0,0), 10);
//line(wf->workMask, Point(0, 0), Point(s,s),cv::Scalar(0,0,0), 10);
theMask = mask.clone();


// add central obstruction (not to be confused with a hole in the mirror - this comes from mirror configuration)
Expand Down Expand Up @@ -758,10 +763,10 @@ void SurfaceManager::ObstructionChanged(){

void SurfaceManager::centerMaskValue(int val){
insideOffset = val;
double mmPerPixel = getCurrent()->diameter/(2 *( m_wavefronts[m_currentNdx]->m_outside.m_radius-1));
m_surfaceTools->m_centerMaskLabel->setText(QString("%1 mm").arg(mmPerPixel* val, 6, 'f', 2));
makeMask(m_currentNdx);
wavefront *wf = m_wavefronts[m_currentNdx];
double mmPerPixel = wf->diameter/(2 *(wf->m_outside.m_radius-1));
m_surfaceTools->m_centerMaskLabel->setText(QString("%1 mm").arg(mmPerPixel* val, 6, 'f', 2));
makeMask(wf);
wf->dirtyZerns = true;
wf->wasSmoothed = false;
//emit generateSurfacefromWavefront(m_currentNdx, this);
Expand All @@ -771,10 +776,10 @@ void SurfaceManager::centerMaskValue(int val){

void SurfaceManager::outsideMaskValue(int val){
outsideOffset = val;
double mmPerPixel = m_wavefronts[m_currentNdx]->diameter/(2 * (m_wavefronts[m_currentNdx]->m_outside.m_radius));
m_surfaceTools->m_edgeMaskLabel->setText(QString("%1 mm").arg(mmPerPixel* val, 6, 'f', 2));
makeMask(m_currentNdx);
wavefront *wf = m_wavefronts[m_currentNdx];
double mmPerPixel = wf->diameter/(2 * (wf->m_outside.m_radius));
m_surfaceTools->m_edgeMaskLabel->setText(QString("%1 mm").arg(mmPerPixel* val, 6, 'f', 2));
makeMask(wf);
wf->dirtyZerns = true;
wf->wasSmoothed = false;
//emit generateSurfacefromWavefront(m_currentNdx, this);
Expand Down Expand Up @@ -1648,6 +1653,7 @@ void SurfaceManager::backGroundUpdate(){
zp.m_bDontProcessEvents=false;
}
catch (int i) {
qWarning() << "Exception caught in generateSurfacefromWavefront:" << i;
break;
}
}
Expand Down Expand Up @@ -2905,8 +2911,8 @@ void SurfaceManager::showAllContours(){ //TODO move to contourview would make mo
}
QRect rec = QGuiApplication::primaryScreen()->geometry();
QApplication::setOverrideCursor(Qt::WaitCursor);
ContourPlot *plot =new ContourPlot(0,0);//m_contourPlot; //TODO leaking ?
//plot->m_minimal = true;
ContourPlot *plot =new ContourPlot(0,0);//m_contourPlot; //TODO leaking ?
//plot->m_minimal = true;
int cols = dlg.getColumns(); //TODO parameter number of pixels unused here. update the dlg ui
int width = rec.width()/cols;
int height = width * .82;
Expand Down Expand Up @@ -3499,4 +3505,3 @@ void SurfaceManager::tiltAnalysis(){
yTilt->attach(pl1);
pl1->show();
}

Loading