Fixed drawing order in graph object

Author: devinaconley

listener/Graph.java

@@ -171,24 +171,15 @@ public void Plot()
 	double yScale = AXIS_COV * this.height / ( this.extremes[3] - this.extremes[2] );
 	double yOffset = yScale * this.extremes[3] + 0.5 * ( 1.0 - AXIS_COV ) * this.height;
 
-	// X vs Y and vs Time specific stuff
+	// Modify scaling and offset
 	if ( this.xvy )
 	{
-	    this.DrawXYStuff();
-	    
-	    // Modify scaling and offset
 	    xScale *= AXIS_COV;
 	    xOffset = xScale * this.extremes[0] - 0.5 * ( 1.0 - AXIS_COV ) * this.width;
 	}
-	else
-	{
-	    this.DrawTimeStuff();
-	}
 
-	// Draw Ticks
-	this.DrawTicks( xScale, xOffset, yScale, yOffset );
 
-	// Do actual data plotting
+        // Do actual data plotting
 	for ( int i = 0; i < this.numVars; i++ )
 	{
 	    this.parent.stroke( this.colors[i] );
@@ -197,7 +188,21 @@ public void Plot()
 		this.parent.point( (float)(this.posX + (this.data[j][i][0]*xScale - xOffset)),
 				   (float)(this.posY + yOffset - data[j][i][1]*yScale) );
 	    }
+	}	
+	
+	// X vs Y and vs Time specific stuff
+	if ( this.xvy )
+	{
+	    this.DrawXYStuff();	    
+	}
+	else
+	{
+	    this.DrawTimeStuff();
 	}
+
+	// Draw Ticks
+	this.DrawTicks( xScale, xOffset, yScale, yOffset );
+	
     }
 
     // Private Helpers