From f23c962f714a53a945332e1bd0bcdd75e1944f9b Mon Sep 17 00:00:00 2001
From: joye <joye>
Date: Fri, 16 May 2014 20:51:03 +0000
Subject: *** empty log message ***

---
 src/bltGrAxisOp.C  | 2 +-
 src/bltGrMisc.h    | 9 +++------
 src/bltGrXAxisOp.C | 2 +-
 src/bltGraph.C     | 3 +--
 src/bltGraphSup.C  | 6 ++----
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/bltGrAxisOp.C b/src/bltGrAxisOp.C
index 7bb482e..390c9f0 100644
--- a/src/bltGrAxisOp.C
+++ b/src/bltGrAxisOp.C
@@ -687,7 +687,7 @@ int AxisViewOp(Axis* axisPtr, Tcl_Interp* interp,
     ops->reqMax = EXP10(ops->reqMax);
   }
 
-  graphPtr->flags |= (GET_AXIS_GEOMETRY | LAYOUT_NEEDED | RESET_AXES);
+  graphPtr->flags |= LAYOUT_NEEDED | RESET_AXES;
   graphPtr->eventuallyRedraw();
 
   return TCL_OK;
diff --git a/src/bltGrMisc.h b/src/bltGrMisc.h
index f78db62..d73bf81 100644
--- a/src/bltGrMisc.h
+++ b/src/bltGrMisc.h
@@ -50,9 +50,6 @@ using namespace std;
  *				of only those markers and elements that
  *				have changed will be reset. 
  *
- *	GET_AXIS_GEOMETRY	Indicates that the size of the axes needs 
- *				to be recalculated. 
- *
  *	RESET_AXES		Flag to call to Blt_ResetAxes routine.  
  *				This routine recalculates the scale offset
  *				(used for mapping coordinates) of each axis.
@@ -77,13 +74,13 @@ using namespace std;
 #define FOCUS			(1<<3)
 
 #define	MAP_ITEM		(1<<4)
+
 #define	MAP_ALL			(1<<5)
 #define LAYOUT_NEEDED		(1<<6)
 #define RESET_AXES		(1<<7)
-#define	GET_AXIS_GEOMETRY	(1<<8)
+#define	CACHE_DIRTY		(1<<8)
 
-#define	CACHE_DIRTY		(1<<9)
-#define	MAP_WORLD		(MAP_ALL|RESET_AXES|GET_AXIS_GEOMETRY)
+#define	MAP_WORLD		(MAP_ALL|RESET_AXES)
 
 #define MARGIN_NONE	-1
 #define MARGIN_BOTTOM	0		/* x */
diff --git a/src/bltGrXAxisOp.C b/src/bltGrXAxisOp.C
index 29f656d..3a634e7 100644
--- a/src/bltGrXAxisOp.C
+++ b/src/bltGrXAxisOp.C
@@ -194,7 +194,7 @@ static int UseOp(ClientData clientData, Tcl_Interp* interp,
   }
 
   // When any axis changes, we need to layout the entire graph.
-  graphPtr->flags |= (GET_AXIS_GEOMETRY | LAYOUT_NEEDED | RESET_AXES);
+  graphPtr->flags |= LAYOUT_NEEDED | RESET_AXES;
   graphPtr->flags |= (MAP_WORLD);
   graphPtr->eventuallyRedraw();
 
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 72741a9..77d0caa 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -1220,8 +1220,7 @@ void Graph::resetAxes()
 
   // When any axis changes, we need to layout the entire graph.
   flags &= ~RESET_AXES;
-  flags |= CACHE_DIRTY;
-  flags |= (GET_AXIS_GEOMETRY | LAYOUT_NEEDED | MAP_ALL);
+  flags |= LAYOUT_NEEDED | MAP_ALL | CACHE_DIRTY;
 }
 
 Axis* Graph::nearestAxis(int x, int y)
diff --git a/src/bltGraphSup.C b/src/bltGraphSup.C
index 1baa115..b08554c 100644
--- a/src/bltGraphSup.C
+++ b/src/bltGraphSup.C
@@ -401,8 +401,7 @@ int Graph::getMarginGeometry(Margin *marginPtr)
       AxisOptions* ops = (AxisOptions*)axisPtr->ops();
       if (!ops->hide && axisPtr->use_) {
 	nVisible++;
-	if (flags & GET_AXIS_GEOMETRY)
-	  axisPtr->getGeometry();
+	axisPtr->getGeometry();
 
 	if (isHoriz) {
 	  if (h < axisPtr->height_)
@@ -427,8 +426,7 @@ int Graph::getMarginGeometry(Margin *marginPtr)
       AxisOptions* ops = (AxisOptions*)axisPtr->ops();
       if (!ops->hide && axisPtr->use_) {
 	nVisible++;
-	if (flags & GET_AXIS_GEOMETRY)
-	  axisPtr->getGeometry();
+	axisPtr->getGeometry();
 
 	if ((ops->titleAlternate) && (l < axisPtr->titleWidth_))
 	  l = axisPtr->titleWidth_;
-- 
cgit v0.12