Skip to content

Commit 1a8294d

Browse files
author
deseilligny
committed
Bug export scale ellipse in checck board
1 parent 2c261ae commit 1a8294d

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

MMVII/include/MMVII_Geom2D.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,7 @@ class cEllipse
682682
cEllipse(const cPt2dr & aCenter,tREAL8 aTeta,tREAL8 aLGa,tREAL8 aLSa);
683683
/// Create a circle
684684
cEllipse (const cPt2dr & aCenter,tREAL8 aRay);
685+
cEllipse Scale(tREAL8 aScale) const;
685686

686687
void AddData(const cAuxAr2007 & anAux);
687688

MMVII/src/CodedTarget/cCheckBoardTargetExtract.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,8 @@ void cAppliCheckBoardTargetExtract::DoExport()
567567
aSetM.AddMeasure(aMesIm);
568568
Tpl_AddOneObjReportCSV(*this,mIdExportCSV,aMesIm);
569569

570-
571-
cSaveExtrEllipe aSEE(aCdtM.Ell(),aCdtM.mBlack,aCdtM.mWhite,aCode);
570+
cEllipse anEl = aCdtM.Ell().Scale(aCdtM.mScale);
571+
cSaveExtrEllipe aSEE(anEl,aCdtM.mBlack,aCdtM.mWhite,aCode);
572572
aVSavE.push_back(aSEE);
573573
// cSaveExtrEllipe anESave(*anEE,aCode);
574574
}

MMVII/src/Geom2D/cEllipse2D.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ cEllipse::cEllipse(const cPt2dr & aCenter,tREAL8 aRay) :
101101
{
102102
}
103103

104+
cEllipse cEllipse::Scale(tREAL8 aScale) const
105+
{
106+
return cEllipse(Center()*aScale,TetaGa(),LGa()*aScale,LSa()*aScale);
107+
}
108+
104109

105110
/*
106111
template <class Type> void AddDataAsStdVect(const cAuxAr2007 & anAux,cDenseVect<Type>& aDenseV)

0 commit comments

Comments
 (0)