From 2f02388da4e3bc2914e3074d44ab1b691e497a5e Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (home)" <j.wuttke@fz-juelich.de>
Date: Sat, 20 Dec 2008 18:16:17 +0100
Subject: [PATCH] further cleanup
---
src/dualplot.cpp | 3 +--
src/dualplot.h | 2 +-
src/edif.cpp | 6 +++---
src/manip.cpp | 1 +
src/olm.h | 1 -
src/scan.cpp | 1 -
6 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/dualplot.cpp b/src/dualplot.cpp
index 1488cb5d..69c461aa 100644
--- a/src/dualplot.cpp
+++ b/src/dualplot.cpp
@@ -12,7 +12,6 @@
#include "mystd.h"
#include "range.h"
-#include "grid.h"
#include "plotaux.h"
#include "coord.h"
#include "readln.h"
@@ -342,7 +341,7 @@ void NPlot::Box()
}
void NPlot::Line(const int lstyle,
- const CGrid x, const vector<double> y,
+ const vector<double> x, const vector<double> y,
const vector<double>* z,
const string xco, const string yco)
{
diff --git a/src/dualplot.h b/src/dualplot.h
index 0a9b43ed..a7a42dc1 100644
--- a/src/dualplot.h
+++ b/src/dualplot.h
@@ -25,7 +25,7 @@ namespace NPlot { // TAKE care : is DUPLICATED in dualplot.cpp
void Clear(void);
void Box();
void Line(const int lstyle,
- const CGrid x, const vector<double> y,
+ const vector<double> x, const vector<double> y,
const vector<double>* z,
const string xco, const string yco);
void Doc (vector<string> lDoc);
diff --git a/src/edif.cpp b/src/edif.cpp
index 7d9844b2..f07c564a 100644
--- a/src/edif.cpp
+++ b/src/edif.cpp
@@ -577,7 +577,6 @@ void NEdif::ReadIn(void)
// *** loop over scans ***
CScan S;
- static CGrid xgrid, ygrid;
uint n = 0;
uint imcm;
string quest, line;
@@ -692,8 +691,9 @@ void NEdif::ReadIn(void)
}
break;
case 2:
- ygrid.Ask("y", n);
- ygrid.AsVec(&(S.y));
+ throw string( "case 2 broken, ygrid undefined" );
+ //ygrid.Ask("y", n);
+ //ygrid.AsVec(&(S.y));
break;
case 3:
cout << "Enter " << n << " lines with y values:\n";
diff --git a/src/manip.cpp b/src/manip.cpp
index 66248457..078314a8 100644
--- a/src/manip.cpp
+++ b/src/manip.cpp
@@ -19,6 +19,7 @@
#include "manip.h"
#include "edif.h" // wg. ListZ()
#include "xax.h"
+#include "grid.h"
using namespace std;
diff --git a/src/olm.h b/src/olm.h
index 433ac0ca..e5e7d457 100644
--- a/src/olm.h
+++ b/src/olm.h
@@ -3,7 +3,6 @@
#include "index.h"
#include "list.h"
#include "coord.h"
-#include "grid.h"
#include "scan.h"
#include "curve.h"
#include "func.h"
diff --git a/src/scan.cpp b/src/scan.cpp
index 925c6bd5..5bcfc0b6 100644
--- a/src/scan.cpp
+++ b/src/scan.cpp
@@ -15,7 +15,6 @@
#include "mystd.h"
#include "range.h"
-#include "grid.h"
#include "scan.h"
--
GitLab