moving circle class to different file

DFTFringe.pro

@@ -281,9 +281,8 @@ HEADERS += bezier/bezier.h \
     cameracalibwizard.h \
     camwizardpage1.h \
     ccswappeddlg.h \
-    circle.h \
+    circlefit.h \
     circleoutline.h \
-    circleutils.h \
     cnpy/cnpy.h \
     colorchannel.h \
     colorchanneldisplay.h \

DFTFringe_Dale.pro

@@ -240,8 +240,7 @@ HEADERS  += mainwindow.h \
     myutils.h \
     pixelstats.h \
     utils.h \
-    circleutils.h \
-    circle.h \
+    circlefit.h \
     astigstatsdlg.h \
     averagewavefrontfilesdlg.h \
     astigscatterplot.h \

DFTFringe_QT5.pro

@@ -285,9 +285,8 @@ HEADERS += bezier/bezier.h \
     cameracalibwizard.h \
     camwizardpage1.h \
     ccswappeddlg.h \
-    circle.h \
+    circlefit.h \
     circleoutline.h \
-    circleutils.h \
     cnpy/cnpy.h \
     colorchannel.h \
     colorchanneldisplay.h \

astigstatsdlg.cpp

@@ -1,7 +1,6 @@
 #include "astigstatsdlg.h"
 #include "ui_astigstatsdlg.h"
-#include "circleutils.h"
-#include "circle.h"
+#include "circlefit.h"
 #include <qwt_plot.h>
 #include <qwt_plot_curve.h>
 #include <qwt_plot_grid.h>

circlefit.cpp

@@ -1,5 +1,4 @@
-#include "circleutils.h"
-#include "circle.h"
+#include "circlefit.h"
 
 
 /************************************************************************

circleutils.h → circlefit.h

@@ -1,11 +1,39 @@
-#ifndef CIRCLEUTILS_H
-#define CIRCLEUTILS_H
+#ifndef CIRCLEFIT_H
+#define CIRCLEFIT_H
 #include <iostream>
 #include <cmath>
 #include <limits>
 #include <iomanip>
 #include <cstdlib>
-#include "circle.h"
+
+/************************************************************************
+            DECLARATION OF THE CLASS CIRCLE
+************************************************************************/
+// Class for Circle
+// A circle has 7 fields:
+//     a, b, r (of type reals), the circle parameters
+//     s (of type reals), the estimate of sigma (standard deviation)
+//     g (of type reals), the norm of the gradient of the objective function
+//     i and j (of type int), the iteration counters (outer and inner, respectively)
+
+class Circle
+{
+public:
+
+    // The fields of a Circle
+    double a, b, r, s, g, Gx, Gy;
+    int i, j;
+
+    // constructors
+    Circle();
+    Circle(double aa, double bb, double rr);
+
+    // routines
+    void print(void);
+
+    // no destructor we didn't allocate memory by hand.
+};
+
 
 class CircleData
 {
@@ -47,4 +75,5 @@ Circle CircleFitByKasa (CircleData& data);
 Circle CircleFitByPratt (CircleData& data);
 Circle CircleFitByTaubin (CircleData& data);
 int CircleFitByLevenbergMarquardtFull (const CircleData& data, const Circle& circleIni, double LambdaIni, Circle& circle);
-#endif // CIRCLEUTILS_H
+
+#endif // CIRCLEFIT_H

surfacemanager.cpp

@@ -63,8 +63,7 @@
 #include "foucaultview.h"
 #include "myutils.h"
 #include "contourview.h"
-#include "circleutils.h"
-#include "circle.h"
+#include "circlefit.h"
 #include "utils.h"
 #include "wavefrontfilterdlg.h"
 #include "reportdlg.h"