summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2013-09-06 19:55:23 (GMT)
committerjoye <joye>2013-09-06 19:55:23 (GMT)
commit0ec39155cbe23770621b9493e47efd90f6ed62d9 (patch)
treed3b3d619486705dfb48977d29960cc29a39fdf1f
parent9cd3184302d2169ca08d32688b17720762c0bab5 (diff)
downloadblt-0ec39155cbe23770621b9493e47efd90f6ed62d9.zip
blt-0ec39155cbe23770621b9493e47efd90f6ed62d9.tar.gz
blt-0ec39155cbe23770621b9493e47efd90f6ed62d9.tar.bz2
*** empty log message ***
-rw-r--r--src/bltGrAxis.C4
-rw-r--r--src/bltGrElemBar.C4
-rw-r--r--src/bltGrElemLine.C2
-rw-r--r--src/bltGrElemLineSpline.C2
-rw-r--r--src/bltGrElemOp.C2
-rw-r--r--src/bltGrMarker.C1
-rw-r--r--src/bltGrMisc.C11
-rw-r--r--src/bltGrPSOutput.C1
-rw-r--r--src/bltGrText.C1
-rw-r--r--src/bltGraph.C5
-rw-r--r--src/bltVecCmd.C4
-rw-r--r--src/bltVecMath.C5
-rw-r--r--src/bltVector.C2
13 files changed, 34 insertions, 10 deletions
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index 9d4dda8..b273dab 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -26,13 +26,13 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <math.h>
#include <assert.h>
+#include <X11/Xutil.h>
+#include "bltMath.h"
#include "bltGraph.h"
#include "bltOp.h"
#include "bltGrElem.h"
-#include <X11/Xutil.h>
#define MAXTICKS 10001
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C
index 7b11f64..c33d375 100644
--- a/src/bltGrElemBar.C
+++ b/src/bltGrElemBar.C
@@ -26,9 +26,11 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "bltGraph.h"
+#include <float.h>
+#include <math.h>
#include <X11/Xutil.h>
+#include "bltGraph.h"
#include "bltGrElem.h"
#define CLAMP(x,l,h) ((x) = (((x)<(l))? (l) : ((x)>(h)) ? (h) : (x)))
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index 6cd6a9d..bf74448 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -28,6 +28,8 @@
*/
#include <assert.h>
+#include <math.h>
+#include <float.h>
#include <X11/Xutil.h>
#include "bltGraph.h"
diff --git a/src/bltGrElemLineSpline.C b/src/bltGrElemLineSpline.C
index 385810b..e3a0a15 100644
--- a/src/bltGrElemLineSpline.C
+++ b/src/bltGrElemLineSpline.C
@@ -1,4 +1,6 @@
#include <assert.h>
+#include <float.h>
+#include <math.h>
#include "bltInt.h"
#include "bltOp.h"
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index 70d7c30..16cbce6 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -27,6 +27,8 @@
*/
#include <assert.h>
+#include <float.h>
+#include <math.h>
#include <X11/Xutil.h>
#include "bltGraph.h"
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index 0dfff22..9c62d2e 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -28,6 +28,7 @@
#include <assert.h>
+#include "bltMath.h"
#include "bltGraph.h"
#include "bltOp.h"
#include "bltImage.h"
diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C
index 0f4ca9c..880c53e 100644
--- a/src/bltGrMisc.C
+++ b/src/bltGrMisc.C
@@ -29,13 +29,22 @@
#include <assert.h>
#include <stdarg.h>
-
+#include <float.h>
+#include <math.h>
#include <X11/Xutil.h>
#include "bltGraph.h"
#include <bltAlloc.h>
#include <bltOp.h>
+#define ARROW_LEFT (0)
+#define ARROW_UP (1)
+#define ARROW_RIGHT (2)
+#define ARROW_DOWN (3)
+#define ARROW_OFFSET 4
+#define STD_ARROW_HEIGHT 3
+#define STD_ARROW_WIDTH ((2 * (ARROW_OFFSET - 1)) + 1)
+
#define BLT_SCROLL_MODE_CANVAS (1<<0)
#define BLT_SCROLL_MODE_LISTBOX (1<<1)
#define BLT_SCROLL_MODE_HIERBOX (1<<2)
diff --git a/src/bltGrPSOutput.C b/src/bltGrPSOutput.C
index cca02a1..b24bb0a 100644
--- a/src/bltGrPSOutput.C
+++ b/src/bltGrPSOutput.C
@@ -46,6 +46,7 @@
#include "bltInt.h"
#undef FOOBAR
+#include "bltMath.h"
#include "bltDBuffer.h"
#include "bltPicture.h"
#include "bltPsInt.h"
diff --git a/src/bltGrText.C b/src/bltGrText.C
index 82f1931..a19e71b 100644
--- a/src/bltGrText.C
+++ b/src/bltGrText.C
@@ -44,6 +44,7 @@
#include "bltInt.h"
#undef FOOBAR
+#include "bltMath.h"
#include "bltHash.h"
#include "bltImage.h"
#include "bltBitmap.h"
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 55ef7e9..eb28b28 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -44,6 +44,7 @@
#include <assert.h>
#include <X11/Xutil.h>
+#include "bltMath.h"
#include "bltGraph.h"
#include "bltOp.h"
#include "bltBind.h"
@@ -542,11 +543,11 @@ Blt_GraphTags(
tagProc = Blt_MakeMarkerTag;
break;
case CID_NONE:
- panic("unknown object type");
+ Blt_Panic("unknown object type");
tagProc = NULL;
break;
default:
- panic("bogus object type");
+ Blt_Panic("bogus object type");
tagProc = NULL;
break;
}
diff --git a/src/bltVecCmd.C b/src/bltVecCmd.C
index d0978b1..7df8e87 100644
--- a/src/bltVecCmd.C
+++ b/src/bltVecCmd.C
@@ -44,7 +44,9 @@
* x notify reorder #1 #2
*/
-#include "assert.h"
+#include <assert.h>
+#include <math.h>
+#include <float.h>
#include "bltVecInt.h"
#include "bltOp.h"
diff --git a/src/bltVecMath.C b/src/bltVecMath.C
index 231afd6..dc7cf5a 100644
--- a/src/bltVecMath.C
+++ b/src/bltVecMath.C
@@ -30,6 +30,9 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <float.h>
+#include <math.h>
+
#include "bltVecInt.h"
#include "bltNsUtil.h"
#include "bltParse.h"
@@ -174,8 +177,6 @@ static int precTable[] =
static int NextValue(Tcl_Interp *interp, ParseInfo *piPtr, int prec,
Value *valuePtr);
-#include <bltMath.h>
-
/*
*---------------------------------------------------------------------------
*
diff --git a/src/bltVector.C b/src/bltVector.C
index f3ff1ac..ec851f2 100644
--- a/src/bltVector.C
+++ b/src/bltVector.C
@@ -42,6 +42,7 @@
*/
#include <assert.h>
+#include <float.h>
#include <math.h>
#include <time.h>
@@ -49,7 +50,6 @@
#include "bltOp.h"
#include "bltNsUtil.h"
#include "bltSwitch.h"
-#include "bltMath.h"
#ifndef TCL_NAMESPACE_ONLY
#define TCL_NAMESPACE_ONLY TCL_GLOBAL_ONLY