summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ProjectionLSQ.H21
-rw-r--r--src/ProjectionLSQ.cxx1
2 files changed, 9 insertions, 13 deletions
diff --git a/src/ProjectionLSQ.H b/src/ProjectionLSQ.H
index 9f45276..6e4021a 100644
--- a/src/ProjectionLSQ.H
+++ b/src/ProjectionLSQ.H
@@ -20,11 +20,19 @@ class ProjectionLSQ {
double sec(double a);
public:
+ typedef enum {
+ RECTILINEAR = 0,
+ CYLINDRICAL = 1
+ } Projection_t;
ProjectionLSQ();
-#define ARGS double c_view, double c_nick, double c_tilt, double scale, double k0, double k1, double m_view, double m_nick
+ void get_coordinates(double a_view, double a_nick,
+ const ViewParams *parms, double *x, double *y);
+
+ int comp_params(const Hills *h, ViewParams *parms);
+#define ARGS double c_view, double c_nick, double c_tilt, double scale, double k0, double k1, double m_view, double m_nick
virtual double mac_x(ARGS);
virtual double mac_y(ARGS);
virtual double mac_x_dc_view(ARGS);
@@ -39,18 +47,7 @@ class ProjectionLSQ {
virtual double mac_y_dscale(ARGS);
virtual double mac_y_dk0(ARGS);
virtual double mac_y_dk1(ARGS);
-
#undef ARGS
-
- typedef enum {
- RECTILINEAR = 0,
- CYLINDRICAL = 1
- } Projection_t;
-
- void get_coordinates(double a_view, double a_nick,
- const ViewParams *parms, double *x, double *y);
-
- int comp_params(const Hills *h, ViewParams *parms);
};
#endif
diff --git a/src/ProjectionLSQ.cxx b/src/ProjectionLSQ.cxx
index 32a9bc6..69a196a 100644
--- a/src/ProjectionLSQ.cxx
+++ b/src/ProjectionLSQ.cxx
@@ -267,4 +267,3 @@ double ProjectionLSQ::mac_y_dc_tilt(ARGS) {return NAN;}
double ProjectionLSQ::mac_y_dscale(ARGS) {return NAN;}
double ProjectionLSQ::mac_y_dk0(ARGS) {return NAN;}
double ProjectionLSQ::mac_y_dk1(ARGS) {return NAN;}
-