*** empty log message ***

10 files changed, 45 insertions, 59 deletions

diff --git a/src/bltGrAxisOp.C b/src/bltGrAxisOp.C
index 6f6cbf7..9345a50 100644
--- a/src/bltGrAxisOp.C
+++ b/src/bltGrAxisOp.C
@@ -79,7 +79,7 @@ int AxisObjConfigure(Axis* axisPtr, Tcl_Interp* interp,
     if (axisPtr->configure() != TCL_OK)
       return TCL_ERROR;
 
-    graphPtr->flags |= (RESET_AXES | LAYOUT);
+    graphPtr->flags |= RESET_AXES;
     graphPtr->eventuallyRedraw();
 
     break; 
@@ -186,7 +186,7 @@ static int DeleteOp(ClientData clientData, Tcl_Interp* interp,
   if (axisPtr->refCount_ == 0)
     delete axisPtr;
 
-  graphPtr->flags |= (RESET_AXES | LAYOUT);
+  graphPtr->flags |= RESET_AXES;
   graphPtr->eventuallyRedraw();
 
   return TCL_OK;
@@ -513,7 +513,7 @@ int AxisActivateOp(Axis* axisPtr, Tcl_Interp* interp,
   axisPtr->active_ = (string[0] == 'a') ? 1 : 0;
 
   if (!ops->hide && axisPtr->use_) {
-    graphPtr->flags |= (RESET_AXES | LAYOUT);
+    graphPtr->flags |= RESET_AXES;
     graphPtr->eventuallyRedraw();
   }
 
@@ -689,7 +689,7 @@ int AxisViewOp(Axis* axisPtr, Tcl_Interp* interp,
     ops->reqMax = EXP10(ops->reqMax);
   }
 
-  graphPtr->flags |= (RESET_AXES | LAYOUT);
+  graphPtr->flags |= RESET_AXES;
   graphPtr->eventuallyRedraw();
 
   return TCL_OK;
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index fa209b8..b0ddb47 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -420,17 +420,13 @@ void LineElement::extents(Region2d *extsPtr)
 
   // Correct the data limits for error bars
   if (ops->xError && ops->xError->nValues > 0) {
-    int i;
-	
     np = MIN(ops->xError->nValues, np);
-    for (i = 0; i < np; i++) {
-      double x;
-
-      x = ops->coords.x->values[i] + ops->xError->values[i];
-      if (x > extsPtr->right) {
+    for (int ii=0; ii<np; ii++) {
+      double x = ops->coords.x->values[ii] + ops->xError->values[ii];
+      if (x > extsPtr->right)
 	extsPtr->right = x;
-      }
-      x = ops->coords.x->values[i] - ops->xError->values[i];
+
+      x = ops->coords.x->values[ii] - ops->xError->values[ii];
       AxisOptions* axisxops = (AxisOptions*)ops->xAxis->ops();
       if (axisxops->logScale) {
 	// Mirror negative values, instead of ignoring them
@@ -451,9 +447,7 @@ void LineElement::extents(Region2d *extsPtr)
     }
     if (ops->xLow && ops->xLow->nValues > 0) {
       double left;
-	    
-      if ((ops->xLow->min <= 0.0) && 
-	  (axisxops->logScale))
+      if ((ops->xLow->min <= 0.0) && (axisxops->logScale))
 	left = FindElemValuesMinimum(ops->xLow, DBL_MIN);
       else
 	left = ops->xLow->min;
@@ -464,41 +458,33 @@ void LineElement::extents(Region2d *extsPtr)
   }
     
   if (ops->yError && ops->yError->nValues > 0) {
-    int i;
-	
     np = MIN(ops->yError->nValues, np);
-    for (i = 0; i < np; i++) {
-      double y;
-
-      y = ops->coords.y->values[i] + ops->yError->values[i];
-      if (y > extsPtr->bottom) {
+    for (int ii=0; ii<np; ii++) {
+      double y = ops->coords.y->values[ii] + ops->yError->values[ii];
+      if (y > extsPtr->bottom)
 	extsPtr->bottom = y;
-      }
-      y = ops->coords.y->values[i] - ops->yError->values[i];
+
+      y = ops->coords.y->values[ii] - ops->yError->values[ii];
       AxisOptions* axisyops = (AxisOptions*)ops->yAxis->ops();
       if (axisyops->logScale) {
-	if (y < 0.0) {
-	  y = -y;		/* Mirror negative values, instead of
-				 * ignoring them. */
-	}
-	if ((y > DBL_MIN) && (y < extsPtr->left)) {
+	// Mirror negative values, instead of ignoring them
+	if (y < 0.0)
+	  y = -y;
+	if ((y > DBL_MIN) && (y < extsPtr->left))
 	  extsPtr->top = y;
-	}
-      } else if (y < extsPtr->top) {
-	extsPtr->top = y;
       }
+      else if (y < extsPtr->top)
+	extsPtr->top = y;
     }
   }
   else {
-    if (ops->yHigh && 
-	(ops->yHigh->nValues > 0) && 
-	(ops->yHigh->max > extsPtr->bottom)) {
+    if (ops->yHigh && (ops->yHigh->nValues > 0) && 
+	(ops->yHigh->max > extsPtr->bottom))
       extsPtr->bottom = ops->yHigh->max;
-    }
+
     if (ops->yLow && ops->yLow->nValues > 0) {
       double top;
-      if ((ops->yLow->min <= 0.0) && 
-	  (axisyops->logScale))
+      if ((ops->yLow->min <= 0.0) && (axisyops->logScale))
 	top = FindElemValuesMinimum(ops->yLow, DBL_MIN);
       else
 	top = ops->yLow->min;
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index ba099ce..3384146 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -71,7 +71,7 @@ int ElementObjConfigure( Element* elemPtr, Tcl_Interp* interp,
     if (elemPtr->configure() != TCL_OK)
       return TCL_ERROR;
 
-    graphPtr->flags |= (RESET_AXES | LAYOUT);
+    graphPtr->flags |= RESET_AXES;
     graphPtr->eventuallyRedraw();
 
     break; 
@@ -184,7 +184,7 @@ static int ActivateOp(ClientData clientData, Tcl_Interp* interp,
 
   elemPtr->active_ = 1;
 
-  graphPtr->flags |= (RESET_AXES | LAYOUT);
+  graphPtr->flags |= RESET_AXES;
   graphPtr->eventuallyRedraw();
 
   return TCL_OK;
@@ -314,7 +314,7 @@ static int DeactivateOp(ClientData clientData, Tcl_Interp* interp,
     elemPtr->active_ = 0;
   }
 
-  graphPtr->flags |= (RESET_AXES | LAYOUT);
+  graphPtr->flags |= RESET_AXES;
   graphPtr->eventuallyRedraw();
 
   return TCL_OK;
@@ -331,7 +331,7 @@ static int DeleteOp(ClientData clientData, Tcl_Interp* interp,
     graphPtr->destroyElement(elemPtr);
   }
 
-  graphPtr->flags |= (RESET_AXES | LAYOUT);
+  graphPtr->flags |= RESET_AXES;
   graphPtr->eventuallyRedraw();
 
   return TCL_OK;
@@ -393,7 +393,7 @@ static int LowerOp(ClientData clientData, Tcl_Interp* interp,
   }	
   Blt_Chain_Destroy(chain);
 
-  graphPtr->flags |= (RESET_AXES | LAYOUT);
+  graphPtr->flags |= RESET_AXES;
   graphPtr->eventuallyRedraw();
 
   Tcl_SetObjResult(interp, DisplayListObj(graphPtr));
@@ -458,7 +458,7 @@ static int RaiseOp(ClientData clientData, Tcl_Interp* interp,
   }	
   Blt_Chain_Destroy(chain);
 
-  graphPtr->flags |= (RESET_AXES | LAYOUT);
+  graphPtr->flags |= RESET_AXES;
   graphPtr->eventuallyRedraw();
 
   Tcl_SetObjResult(interp, DisplayListObj(graphPtr));
@@ -505,7 +505,7 @@ static int ShowOp(ClientData clientData, Tcl_Interp* interp,
     elemPtr->link = link;
   }
 
-  graphPtr->flags |= (RESET_AXES | LAYOUT);
+  graphPtr->flags |= RESET_AXES;
   graphPtr->eventuallyRedraw();
 
   Tcl_SetObjResult(interp, DisplayListObj(graphPtr));
diff --git a/src/bltGrElemOption.C b/src/bltGrElemOption.C
index 6a2acbb..6cf4f26 100644
--- a/src/bltGrElemOption.C
+++ b/src/bltGrElemOption.C
@@ -441,7 +441,7 @@ static void VectorChangedProc(Tcl_Interp* interp, ClientData clientData,
 
   Element* elemPtr = valuesPtr->elemPtr;
   Graph* graphPtr = elemPtr->graphPtr_;
-  graphPtr->flags |= (RESET_AXES | LAYOUT);
+  graphPtr->flags |= RESET_AXES;
   graphPtr->eventuallyRedraw();
 }
 
diff --git a/src/bltGrPenOp.C b/src/bltGrPenOp.C
index a62c95a..e9c949e 100644
--- a/src/bltGrPenOp.C
+++ b/src/bltGrPenOp.C
@@ -59,7 +59,7 @@ int PenObjConfigure(Graph* graphPtr, Pen* penPtr,
 
     if (penPtr->configure() != TCL_OK)
       return TCL_ERROR;
-    graphPtr->flags |= (RESET_AXES | LAYOUT);
+    graphPtr->flags |= RESET_AXES;
     graphPtr->eventuallyRedraw();
 
     break; 
diff --git a/src/bltGrXAxisOp.C b/src/bltGrXAxisOp.C
index 482eae6..78a6cb8 100644
--- a/src/bltGrXAxisOp.C
+++ b/src/bltGrXAxisOp.C
@@ -193,7 +193,7 @@ static int UseOp(ClientData clientData, Tcl_Interp* interp,
     axisPtr->use_ =1;
   }
 
-  graphPtr->flags |= (RESET_AXES | LAYOUT);
+  graphPtr->flags |= RESET_AXES;
   graphPtr->eventuallyRedraw();
 
   return TCL_OK;
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 5abd962..da918aa 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -82,7 +82,7 @@ Graph::Graph(ClientData clientData, Tcl_Interp* interp,
 				   GraphInstCmdProc, this,
 				   GraphInstCmdDeleteProc);
 
-  flags = (RESET_AXES | LAYOUT);
+  flags = RESET_AXES;
   nextMarkerId_ = 1;
 
   legend_ = new Legend(this);
@@ -206,8 +206,7 @@ int Graph::configure()
 
   // If the -inverted option changed, we need to readjust the pointers
   // to the axes and recompute the their scales.
-  if (flags & RESET_AXES)
-    adjustAxes();
+  adjustAxes();
 
   // Free the pixmap if we're not buffering the display of elements anymore.
   if (cache_ != None) {
@@ -224,7 +223,7 @@ void Graph::map()
     cerr << "RESET_AXES" << endl;
     resetAxes();
     flags &= ~RESET_AXES;
-    flags |= CACHE_DIRTY;
+    flags |= (LAYOUT | CACHE_DIRTY);
   }
 
   if (flags & LAYOUT) {
@@ -385,7 +384,7 @@ int Graph::print(const char *ident, Blt_Ps ps)
     height_ = Tk_ReqHeight(tkwin_);
 
   Blt_Ps_ComputeBoundingBox(setupPtr, width_, height_);
-  flags |= (RESET_AXES | LAYOUT);
+  flags |= RESET_AXES;
 
   /* Turn on PostScript measurements when computing the graph's layout. */
   Blt_Ps_SetPrinting(ps, 1);
@@ -469,7 +468,7 @@ int Graph::print(const char *ident, Blt_Ps ps)
 
   // Redraw the graph in order to re-calculate the layout as soon as
   // possible. This is in the case the crosshairs are active.
-  flags |= (RESET_AXES | LAYOUT);
+  flags |= RESET_AXES;
   eventuallyRedraw();
 
   return result;
@@ -1007,6 +1006,7 @@ void Graph::mapAxes()
   for (int ii=0; ii<4; ii++) {
     int count =0;
     int offset =0;
+
     Blt_Chain chain = ops->margins[ii].axes;
     for (Blt_ChainLink link=Blt_Chain_FirstLink(chain); link; 
 	 link = Blt_Chain_NextLink(link)) {
diff --git a/src/bltGraphBar.C b/src/bltGraphBar.C
index ffaca02..5f66f43 100644
--- a/src/bltGraphBar.C
+++ b/src/bltGraphBar.C
@@ -239,7 +239,7 @@ int BarGraph::createPen(const char* penName, int objc, Tcl_Obj* const objv[])
     return TCL_ERROR;
   }
 
-  flags |= (RESET_AXES | LAYOUT);
+  flags |= RESET_AXES;
   eventuallyRedraw();
 
   return TCL_OK;
diff --git a/src/bltGraphLine.C b/src/bltGraphLine.C
index dd5a555..2c73e79 100644
--- a/src/bltGraphLine.C
+++ b/src/bltGraphLine.C
@@ -201,7 +201,7 @@ int LineGraph::createPen(const char* penName, int objc, Tcl_Obj* const objv[])
     return TCL_ERROR;
   }
 
-  flags |= (RESET_AXES | LAYOUT);
+  flags |= RESET_AXES;
   eventuallyRedraw();
 
   return TCL_OK;
diff --git a/src/bltGraphOp.C b/src/bltGraphOp.C
index 427c569..0089f48 100644
--- a/src/bltGraphOp.C
+++ b/src/bltGraphOp.C
@@ -89,7 +89,7 @@ int GraphObjConfigure(Graph* graphPtr, Tcl_Interp* interp,
     if (graphPtr->configure() != TCL_OK)
       return TCL_ERROR;
 
-    graphPtr->flags |= (RESET_AXES | LAYOUT);
+    graphPtr->flags |= RESET_AXES;
     graphPtr->eventuallyRedraw();
 
     break; 
@@ -446,7 +446,7 @@ void GraphEventProc(ClientData clientData, XEvent* eventPtr)
     }
   }
   else if (eventPtr->type == ConfigureNotify) {
-    graphPtr->flags |= (RESET_AXES | LAYOUT);
+    graphPtr->flags |= RESET_AXES;
     graphPtr->eventuallyRedraw();
   }
 }