Defining point as global type, making it available from the outside

PapeCoding · PapeCoding · commit 0c4ca9362e57 · 2025-04-28T17:45:34.000+02:00
diff --git a/Src/DasherCore/CircleStartHandler.cpp b/Src/DasherCore/CircleStartHandler.cpp
@@ -39,7 +39,7 @@ CCircleStartHandler::~CCircleStartHandler() {
     m_pSettingsStore->OnParameterChanged.Unsubscribe(this);
 }
 
-CDasherScreen::point CCircleStartHandler::CircleCenter(CDasherView *pView) {
+point CCircleStartHandler::CircleCenter(CDasherView *pView) {
   if (m_iScreenRadius!=-1) return m_screenCircleCenter;
 
   m_pView->Dasher2Screen(CDasherModel::ORIGIN_X, CDasherModel::ORIGIN_Y, m_screenCircleCenter.x, m_screenCircleCenter.y);
@@ -62,7 +62,7 @@ CDasherScreen::point CCircleStartHandler::CircleCenter(CDasherView *pView) {
 
 bool CCircleStartHandler::DecorateView(CDasherView *pView) {
   RegisterView(pView);
-  CDasherScreen::point ctr = CircleCenter(pView);
+  point ctr = CircleCenter(pView);
 
   const bool bAboutToChange = m_bInCircle && m_iEnterTime != std::numeric_limits<long>::max();
   if (m_pFilter->isPaused()) {
@@ -77,7 +77,7 @@ bool CCircleStartHandler::DecorateView(CDasherView *pView) {
 void CCircleStartHandler::Timer(unsigned long iTime, dasherint mouseX, dasherint mouseY,CDasherView *pView) {
   RegisterView(pView);
 
-  CDasherScreen::point ctr = CircleCenter(pView);
+  point ctr = CircleCenter(pView);
   screenint x,y;
   pView->Dasher2Screen(mouseX, mouseY, x, y);
   int dx=x-ctr.x, dy=y-ctr.y;
diff --git a/Src/DasherCore/CircleStartHandler.h b/Src/DasherCore/CircleStartHandler.h
@@ -24,10 +24,10 @@ class CCircleStartHandler : public CStartHandler {
   ///Radius of circle in screen coordinates (-1 = needs recomputing)
   int m_iScreenRadius;
   CDasherView *m_pView;
-  virtual CDasherScreen::point CircleCenter(CDasherView *pView);
+  virtual point CircleCenter(CDasherView *pView);
 private:
   ///Cached center of screen circle (needs recomputing if radius does)
-  CDasherScreen::point m_screenCircleCenter;
+  point m_screenCircleCenter;
   CSettingsStore* m_pSettingsStore;
 };
 }
diff --git a/Src/DasherCore/CompassMode.cpp b/Src/DasherCore/CompassMode.cpp
@@ -69,7 +69,7 @@ bool CCompassMode::DecorateView(CDasherView *pView, CDasherInput *pInput) {
   bool bFirst(true);
 
   while(iPos >= 0) {
-    CDasherScreen::point p[2];
+    point p[2];
 
     pView->Dasher2Screen(-100, iPos, p[0].x, p[0].y);
 
diff --git a/Src/DasherCore/DasherButtons.cpp b/Src/DasherCore/DasherButtons.cpp
@@ -88,7 +88,7 @@ void CDasherButtons::Timer(unsigned long Time, CDasherView *pView, CDasherInput
 void CDasherButtons::NewDrawGoTo(CDasherView *pView, myint iDasherMin, myint iDasherMax, bool bActive) {
    myint iHeight(iDasherMax - iDasherMin);
 
-   CDasherScreen::point p[4];
+   point p[4];
 
    pView->Dasher2Screen( 0, iDasherMin, p[0].x, p[0].y);
    pView->Dasher2Screen( iHeight, iDasherMin, p[1].x, p[1].y);
diff --git a/Src/DasherCore/DasherScreen.h b/Src/DasherCore/DasherScreen.h
@@ -62,13 +62,6 @@ class Dasher::CDasherScreen
 		return m_iHeight;
 	}
 
-	//! Structure defining a point on the screen 
-	typedef struct tagpoint
-	{
-		screenint x;
-		screenint y;
-	} point;
-
 	///Abstract class for objects representing strings that can be drawn on the screen.
 	/// Platform-specific instances are created by the MakeLabel(String) method, which
 	/// may then be passed to GetSize() and DrawText().
diff --git a/Src/DasherCore/DasherTypes.h b/Src/DasherCore/DasherTypes.h
@@ -46,6 +46,15 @@ namespace Dasher
   // All screen co-ordinates are of type screenint
   typedef int32_t screenint;
 
+  //! Structure defining a point on the screen 
+	typedef struct point
+	{
+		screenint x = 0;
+		screenint y = 0;
+    point() = default;
+    point(screenint X, screenint Y) : x(X), y(Y) {}
+	} point;
+
   // Using a signed symbol type allows "Out of band" ie negative {{{
   // values to be used to flag non-symbol data. For example commands
   // in dasher nodes.
diff --git a/Src/DasherCore/DasherView.cpp b/Src/DasherCore/DasherView.cpp
@@ -39,12 +39,12 @@ void CDasherView::ChangeScreen(CDasherScreen *NewScreen) {
 
 void CDasherView::DasherSpaceLine(myint x1, myint y1, myint x2, myint y2, int iWidth, const ColorPalette::Color& color) {
   if (!ClipLineToVisible(x1, y1, x2, y2)) return;
-  std::vector<CDasherScreen::point> vPoints;
-  CDasherScreen::point p;
+  std::vector<point> vPoints;
+  point p;
   Dasher2Screen(x1, y1, p.x, p.y);
   vPoints.push_back(p);
   DasherLine2Screen(x1,y1,x2,y2,vPoints);
-  CDasherScreen::point *pts = new CDasherScreen::point[vPoints.size()];
+  point *pts = new point[vPoints.size()];
   for (int i = static_cast<int>(vPoints.size()); i-->0; ) pts[i] = vPoints[i];
   Screen()->Polyline(pts, static_cast<int>(vPoints.size()), iWidth, color);
 }
@@ -89,7 +89,7 @@ bool CDasherView::ClipLineToVisible(myint &x1, myint &y1, myint &x2, myint &y2)
 
 void CDasherView::DasherPolyline(myint *x, myint *y, int n, int iWidth, const ColorPalette::Color& color) {
 
-  CDasherScreen::point * ScreenPoints = new CDasherScreen::point[n];
+  point * ScreenPoints = new point[n];
 
   for(int i(0); i < n; ++i)
     Dasher2Screen(x[i], y[i], ScreenPoints[i].x, ScreenPoints[i].y);
@@ -102,7 +102,7 @@ void CDasherView::DasherPolyline(myint *x, myint *y, int n, int iWidth, const Co
 // Draw a polyline with an arrow on the end
 void CDasherView::DasherPolyarrow(myint *x, myint *y, int n, int iWidth, const ColorPalette::Color& color, double dArrowSizeFactor) {
 
-  CDasherScreen::point * ScreenPoints = new CDasherScreen::point[n+3];
+  point * ScreenPoints = new point[n+3];
 
   for(int i(0); i < n; ++i)
     Dasher2Screen(x[i], y[i], ScreenPoints[i].x, ScreenPoints[i].y);
diff --git a/Src/DasherCore/DasherView.h b/Src/DasherCore/DasherView.h
@@ -220,8 +220,8 @@ class Dasher::CDasherView
 	/// \param x2 , y2 Dasher co-ordinates of end of line segment; also guaranteed within VisibleRegion.
 	/// \param vPoints vector to which to add screen points. Note that at the point that DasherLine2Screen is called,
 	/// the screen coordinates of the first point should already have been added to this vector; DasherLine2Screen
-	/// will then add exactly one CDasherScreen::point for each line segment required.
-	virtual void DasherLine2Screen(myint x1, myint y1, myint x2, myint y2, std::vector<CDasherScreen::point>& vPoints) =0;
+	/// will then add exactly one point for each line segment required.
+	virtual void DasherLine2Screen(myint x1, myint y1, myint x2, myint y2, std::vector<point>& vPoints) =0;
 
 	const ColorPalette* m_pColorPalette = nullptr;
 private:
diff --git a/Src/DasherCore/DasherViewSquare.cpp b/Src/DasherCore/DasherViewSquare.cpp
@@ -364,7 +364,7 @@ void CDasherViewSquare::TruncateTri(myint x, myint y1, myint y2, myint midy1, my
 		}
 	}
 	// midy1,x1 is now start point
-	std::vector<CDasherScreen::point> pts(1);
+	std::vector<point> pts(1);
 	Dasher2Screen(x1, midy1, pts[0].x, pts[0].y);
 	DasherLine2Screen(x1, midy1, tempx1, y1, pts);
 	if (tempx1)
@@ -402,7 +402,7 @@ void CDasherViewSquare::TruncateTri(myint x, myint y1, myint y2, myint midy1, my
 	else
 		DASHER_ASSERT(pts.back().x == pts[0].x && pts.back().y == pts[0].y);
 
-	auto p_array = new CDasherScreen::point[pts.size()];
+	auto p_array = new point[pts.size()];
 	for (unsigned int i = 0; i < pts.size(); i++) p_array[i] = pts[i];
 	Screen()->Polygon(p_array, static_cast<int>(pts.size()), fillColor, outlineColor, lineWidth);
 	delete[] p_array;
@@ -412,11 +412,11 @@ void CDasherViewSquare::TruncateTri(myint x, myint y1, myint y2, myint midy1, my
 
 void CDasherViewSquare::Circle(myint Range, myint y1, myint y2, const ColorPalette::Color& fillColor, const ColorPalette::Color& outlineColor, int lineWidth)
 {
-	std::vector<CDasherScreen::point> pts;
+	std::vector<point> pts;
 	myint cy((y1 + y2) / 2), r(Range / 2), x1, x2;
 	const DasherCoordScreenRegion visibleRegion = VisibleRegion();
 
-	CDasherScreen::point p;
+	point p;
 	//run along bottom edge...
 	if (y1 < visibleRegion.minY)
 	{
@@ -459,17 +459,17 @@ void CDasherViewSquare::Circle(myint Range, myint y1, myint y2, const ColorPalet
 		Dasher2Screen(0, visibleRegion.maxX, p.x, p.y);
 		pts.push_back(p);
 	}
-	auto p_array = new CDasherScreen::point[pts.size()];
+	auto p_array = new point[pts.size()];
 	for (unsigned int i = 0; i < pts.size(); i++) p_array[i] = pts[i];
 	Screen()->Polygon(p_array, static_cast<int>(pts.size()), fillColor, outlineColor, lineWidth);
 	delete[] p_array;
 }
 
-void CDasherViewSquare::CircleTo(myint cy, myint r, myint y1, myint x1, myint y3, myint x3, CDasherScreen::point dest, std::vector<CDasherScreen::point>& pts, double dXMul)
+void CDasherViewSquare::CircleTo(myint cy, myint r, myint y1, myint x1, myint y3, myint x3, point dest, std::vector<point>& pts, double dXMul)
 {
 	myint y2((y1 + y3) / 2);
 	myint x2(static_cast<myint>(sqrt((sq(r) - sq(cy - y2)) * dXMul)));
-	CDasherScreen::point mid; //where midpoint of circle/arc should be
+	point mid; //where midpoint of circle/arc should be
 	Dasher2Screen(x2, y2, mid.x, mid.y); //(except "midpoint" measured along y axis)
 	int lmx = (pts.back().x + dest.x) / 2, lmy = (pts.back().y + dest.y) / 2; //midpoint of straight line
 	if (abs(dest.y - pts.back().y) < 2 || abs(mid.x - lmx) + abs(mid.y - lmy) < 2)
@@ -487,10 +487,10 @@ void CDasherViewSquare::CircleTo(myint cy, myint r, myint y1, myint x1, myint y3
 
 void CDasherViewSquare::DasherSpaceArc(myint cy, myint r, myint x1, myint y1, myint x2, myint y2, const ColorPalette::Color& color, int iLineWidth)
 {
-	CDasherScreen::point p;
+	point p;
 	//start point
 	Dasher2Screen(x1, y1, p.x, p.y);
-	std::vector<CDasherScreen::point> pts;
+	std::vector<point> pts;
 	pts.push_back(p);
 	//if circle goes behind crosshair and we want the point of max-x, force division into two sections with that point as boundary
 	if (r > CDasherModel::ORIGIN_X && ((y1 < cy) ^ (y2 < cy)))
@@ -502,7 +502,7 @@ void CDasherViewSquare::DasherSpaceArc(myint cy, myint r, myint x1, myint y1, my
 	}
 	Dasher2Screen(x2, y2, p.x, p.y);
 	CircleTo(cy, r, y1, x1, y2, x2, p, pts, 1.0);
-	auto p_array = new CDasherScreen::point[pts.size()];
+	auto p_array = new point[pts.size()];
 	for (unsigned int i = 0; i < pts.size(); i++) p_array[i] = pts[i];
 	Screen()->Polyline(p_array, static_cast<int>(pts.size()), iLineWidth, color);
 }
@@ -512,7 +512,7 @@ void CDasherViewSquare::Quadric(myint Range, myint lowY, myint highY, const Colo
 	static const double RR2 = 1.0 / sqrt(2.0);
 	const int midY = static_cast<int>((lowY + highY) / 2);
 #define NUM_STEPS 40
-	CDasherScreen::point p_array[2 * NUM_STEPS + 2];
+	point p_array[2 * NUM_STEPS + 2];
 	
 	const DasherCoordScreenRegion visibleRegion = VisibleRegion();
 	{
@@ -1194,7 +1194,7 @@ void CDasherViewSquare::Dasher2Polar(myint iDasherX, myint iDasherY, double& r,
 	r = sqrt(x * x + y * y);
 }
 
-void CDasherViewSquare::DasherLine2Screen(myint x1, myint y1, myint x2, myint y2, std::vector<CDasherScreen::point>& vPoints)
+void CDasherViewSquare::DasherLine2Screen(myint x1, myint y1, myint x2, myint y2, std::vector<point>& vPoints)
 {
 	if (x1 != x2 && y1 != y2)
 	{
@@ -1221,7 +1221,7 @@ void CDasherViewSquare::DasherLine2Screen(myint x1, myint y1, myint x2, myint y2
 		if (m_pSettingsStore->GetLongParameter(LP_NONLINEAR_X) && (x1 > m_iXlogThres || x2 > m_iXlogThres))
 		{
 			//into logarithmic section
-			CDasherScreen::point pStart, pScreenMid, pEnd;
+			point pStart, pScreenMid, pEnd;
 			Dasher2Screen(x2, y2, pEnd.x, pEnd.y);
 			for (;;)
 			{
@@ -1231,7 +1231,7 @@ void CDasherViewSquare::DasherLine2Screen(myint x1, myint y1, myint x2, myint y2
 				pScreenMid.y = (pStart.y + pEnd.y) / 2;
 				//whereas a straight line _in_Dasher_space_ passes through pDasherMid:
 				myint xMid = (x1 + x2) / 2, yMid = (y1 + y2) / 2;
-				CDasherScreen::point pDasherMid;
+				point pDasherMid;
 				Dasher2Screen(xMid, yMid, pDasherMid.x, pDasherMid.y);
 
 				//since we know both endpoints are in the same section of the screen wrt. Y nonlinearity,
@@ -1259,7 +1259,7 @@ void CDasherViewSquare::DasherLine2Screen(myint x1, myint y1, myint x2, myint y2
 		//ok, not in x nonlinear section; fall through.
 	}
 
-	CDasherScreen::point p;
+	point p;
 	Dasher2Screen(x2, y2, p.x, p.y);
 	vPoints.push_back(p);
 }
diff --git a/Src/DasherCore/DasherViewSquare.h b/Src/DasherCore/DasherViewSquare.h
@@ -106,7 +106,7 @@ class Dasher::CDasherViewSquare : public CDasherView
 	/// dest - point (x2,y2) in screen coords
 	/// pts - vector into which to store points; on entry, last element should already be screen-coords of (x1,y1)
 	/// dXMul - multiply x coords (in dasher space) by this (i.e. aspect ratio), for ovals
-	void CircleTo(myint cy, myint r, myint y1, myint x1, myint y3, myint x3, CDasherScreen::point dest, std::vector<CDasherScreen::point>& pts, double dXMul);
+	void CircleTo(myint cy, myint r, myint y1, myint x1, myint y3, myint x3, point dest, std::vector<point>& pts, double dXMul);
 	void Circle(myint Range, myint y1, myint y2, const ColorPalette::Color& fillColor, const ColorPalette::Color& outlineColor, int lineWidth);
 	void Quadric(myint Range, myint lowY, myint highY, const ColorPalette::Color& fillColor, const ColorPalette::Color& outlineColor, int
                  lineWidth);
@@ -193,7 +193,7 @@ class Dasher::CDasherViewSquare : public CDasherView
     //Divides by SCALE_FACTOR, rounding away from 0
 	inline myint CustomIDivScaleFactor(myint iNumerator);
 
-	void DasherLine2Screen(myint x1, myint y1, myint x2, myint y2, std::vector<CDasherScreen::point>& vPoints) override;
+	void DasherLine2Screen(myint x1, myint y1, myint x2, myint y2, std::vector<point>& vPoints) override;
 
 	// Called on screen size or orientation changes
 	void SetScaleFactor();
diff --git a/Src/DasherCore/OneButtonFilter.cpp b/Src/DasherCore/OneButtonFilter.cpp
@@ -34,14 +34,14 @@ bool COneButtonFilter::DecorateView(CDasherView *pView, CDasherInput *pInput) {
       return true;
     }
     //reverse!
-    CDasherScreen::point p[4];
+    point p[4];
     pView->Dasher2Screen(2048, 0, p[0].x, p[0].y);
     pView->Dasher2Screen(4096, 0, p[1].x, p[1].y);
     pView->Dasher2Screen(4096, 4096, p[2].x, p[2].y);
     pView->Dasher2Screen(2048, 4096, p[3].x, p[3].y);
     pScreen->Polyline(p, 4, 1, pView->GetNamedColor(NamedColor::selectionHighlight));
   } else {
-    CDasherScreen::point p[2];
+    point p[2];
 
     pView->Dasher2Screen(-100, iLocation, p[0].x, p[0].y);
     pView->Dasher2Screen(-1000, iLocation, p[1].x, p[1].y);
diff --git a/Src/DasherCore/OneDimensionalFilter.cpp b/Src/DasherCore/OneDimensionalFilter.cpp
@@ -9,7 +9,7 @@ using namespace Dasher;
   : COneDimensionalFilter(pSettingsStore, pInterface, m_pDasherModel, 4, _("One Dimensional Mode")) {
 }*/
 
-CDasherScreen::point C1DCircleStartHandler::CircleCenter(CDasherView* pView)
+point C1DCircleStartHandler::CircleCenter(CDasherView* pView)
 {
     if (m_iScreenRadius==-1) {//if we need to recompute
         CCircleStartHandler::CircleCenter(pView); //that does the radius
diff --git a/Src/DasherCore/OneDimensionalFilter.h b/Src/DasherCore/OneDimensionalFilter.h
@@ -28,12 +28,12 @@ class COneDimensionalFilter : public CDefaultFilter {
 class C1DCircleStartHandler : public CCircleStartHandler {
 public:
   C1DCircleStartHandler(COneDimensionalFilter *f, CSettingsStore* pSettingsStore);
-  CDasherScreen::point CircleCenter(CDasherView *pView) override;
+  point CircleCenter(CDasherView *pView) override;
 
   void onPause() override;
 
 private:
-  CDasherScreen::point m_fwdCenter;
+  point m_fwdCenter;
   CSettingsStore* m_pSettingsStore;
 };
 }
diff --git a/Src/DasherCore/ScreenGameModule.cpp b/Src/DasherCore/ScreenGameModule.cpp
@@ -113,7 +113,7 @@ void CScreenGameModule::DrawText(CDasherView *pView) {
   pScreen->DrawString(m_pLabEntered, x-entDims.first, 0, uFontSize, pView->GetNamedColor(NamedColor::infoText));
   if (m_pLabWrong) {
     pScreen->DrawString(m_pLabWrong, x, 0, uFontSize, pView->GetNamedColor(NamedColor::warningText));
-    CDasherScreen::point p[2];
+    point p[2];
     p[0].x=x; p[1].x=targetStart;
     p[0].y = p[1].y = rectDims.second/2;
     pScreen->Polyline(p, 2, 2, pView->GetNamedColor(NamedColor::gameGuide));
diff --git a/Src/DasherCore/TwoButtonDynamicFilter.cpp b/Src/DasherCore/TwoButtonDynamicFilter.cpp
@@ -84,7 +84,7 @@ void CTwoButtonDynamicFilter::ComputeLagBits()
 bool CTwoButtonDynamicFilter::DecorateView(CDasherView *pView, CDasherInput *pInput) {
   CDasherScreen *pScreen(pView->Screen());
 
-  CDasherScreen::point p[2];
+  point p[2];
   
   myint iDasherX;
   myint iDasherY;
diff --git a/Src/DasherCore/TwoPushDynamicFilter.cpp b/Src/DasherCore/TwoPushDynamicFilter.cpp
@@ -62,7 +62,7 @@ CTwoPushDynamicFilter::~CTwoPushDynamicFilter()
 void GuideLine(CDasherView *pView, const myint iDasherY, NamedColor::knownColorName Colour)
 {
   myint iDasherX = -100;
-  CDasherScreen::point p[2];
+  point p[2];
   CDasherScreen *pScreen(pView->Screen());
   
   pView->Dasher2Screen(iDasherX, iDasherY, p[0].x, p[0].y);
