Thread: [Mathlib-commitlog] SF.net SVN: mathlib:[698] JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ graphic
Status: Beta
Brought to you by:
st_mueller
Menu
▾
▴
mathlib-commitlog
|
[Mathlib-commitlog] SF.net SVN: mathlib:[698]
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ graphics
From: <st_...@us...> - 2009-01-20 20:17:25
|
Revision: 698
http://mathlib.svn.sourceforge.net/mathlib/?rev=698&view=rev
Author: st_mueller
Date: 2009-01-20 20:17:23 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/title.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/xlabel.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/ylabel.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/zlabel.java
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/title.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/title.java 2009-01-20 20:12:50 UTC (rev 697)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/title.java 2009-01-20 20:17:23 UTC (rev 698)
@@ -2,12 +2,13 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
/**Add text to the title of the current axes*/
public class title extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
//ErrorLogger.debugLine("title: evaluate");
@@ -20,8 +21,8 @@
String title = ((CharToken)operands[0]).toString();
- getGraphicsManager().getCurrentFigure().getCurrentAxes().setTitle(title);
- getGraphicsManager().getCurrentFigure().repaint();
+ globals.getGraphicsManager().getCurrentFigure().getCurrentAxes().setTitle(title);
+ globals.getGraphicsManager().getCurrentFigure().repaint();
return null;
}
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/xlabel.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/xlabel.java 2009-01-20 20:12:50 UTC (rev 697)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/xlabel.java 2009-01-20 20:17:23 UTC (rev 698)
@@ -2,12 +2,13 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
/**Add text to the x-axis of the current axes*/
public class xlabel extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
//ErrorLogger.debugLine("xlabel evaluate");
@@ -20,8 +21,8 @@
String xLabel = ((CharToken)operands[0]).toString();
- getGraphicsManager().getCurrentFigure().getCurrentAxes().setXLabel(xLabel);
- getGraphicsManager().getCurrentFigure().repaint();
+ globals.getGraphicsManager().getCurrentFigure().getCurrentAxes().setXLabel(xLabel);
+ globals.getGraphicsManager().getCurrentFigure().repaint();
return null;
}
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/ylabel.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/ylabel.java 2009-01-20 20:12:50 UTC (rev 697)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/ylabel.java 2009-01-20 20:17:23 UTC (rev 698)
@@ -2,12 +2,13 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
/**Add text to the y-axis of the current axes*/
public class ylabel extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
//ErrorLogger.debugLine("ylabel evaluate");
@@ -20,8 +21,8 @@
String yLabel = ((CharToken)operands[0]).toString();
- getGraphicsManager().getCurrentFigure().getCurrentAxes().setYLabel(yLabel);
- getGraphicsManager().getCurrentFigure().repaint();
+ globals.getGraphicsManager().getCurrentFigure().getCurrentAxes().setYLabel(yLabel);
+ globals.getGraphicsManager().getCurrentFigure().repaint();
return null;
}
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/zlabel.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/zlabel.java 2009-01-20 20:12:50 UTC (rev 697)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/zlabel.java 2009-01-20 20:17:23 UTC (rev 698)
@@ -2,12 +2,13 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
/**Add text to the z-axis of the current axes*/
public class zlabel extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
//ErrorLogger.debugLine("zlabel evaluate");
@@ -20,8 +21,8 @@
String zLabel = ((CharToken)operands[0]).toString();
- getGraphicsManager().getCurrentFigure().getCurrentAxes().setZLabel(zLabel);
- getGraphicsManager().getCurrentFigure().repaint();
+ globals.getGraphicsManager().getCurrentFigure().getCurrentAxes().setZLabel(zLabel);
+ globals.getGraphicsManager().getCurrentFigure().repaint();
return null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
[Mathlib-commitlog] SF.net SVN: mathlib:[699]
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ graphics
From: <st_...@us...> - 2009-01-20 20:18:51
|
Revision: 699
http://mathlib.svn.sourceforge.net/mathlib/?rev=699&view=rev
Author: st_mueller
Date: 2009-01-20 20:18:47 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/cla.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/clf.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/close.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/figure.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/gca.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/gcf.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/grid.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/hold.java
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/cla.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/cla.java 2009-01-20 20:17:23 UTC (rev 698)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/cla.java 2009-01-20 20:18:47 UTC (rev 699)
@@ -3,30 +3,31 @@
import jmathlib.core.tokens.*;
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class cla extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
if (getNArgIn(operands) >1)
throwMathLibException("cla: number of arguments <=1");
// get figure number
- double n = getGraphicsManager().getCurrentFigureNumber();
+ double n = globals.getGraphicsManager().getCurrentFigureNumber();
// in case n>1 there is no current figure, -> create one
if (n<1)
{
// create figure
- getGraphicsManager().createNewFigure();
+ globals.getGraphicsManager().createNewFigure();
// get figure number again (should be at least "1")
- n = getGraphicsManager().getCurrentFigureNumber();
+ n = globals.getGraphicsManager().getCurrentFigureNumber();
}
- getGraphicsManager().getCurrentFigure().getCurrentAxes().clearAxes();
+ globals.getGraphicsManager().getCurrentFigure().getCurrentAxes().clearAxes();
return null;
}
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/clf.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/clf.java 2009-01-20 20:17:23 UTC (rev 698)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/clf.java 2009-01-20 20:18:47 UTC (rev 699)
@@ -1,32 +1,32 @@
package jmathlib.toolbox.jmathlib.graphics;
import jmathlib.core.tokens.*;
-import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class clf extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
if (getNArgIn(operands) >1)
throwMathLibException("clf: number of arguments <=1");
// get figure number
- double n = getGraphicsManager().getCurrentFigureNumber();
+ double n = globals.getGraphicsManager().getCurrentFigureNumber();
// in case n>1 there is no current figure, -> create one
if (n<1)
{
// create figure
- getGraphicsManager().createNewFigure();
+ globals.getGraphicsManager().createNewFigure();
// get figure number again (should be at least "1")
- n = getGraphicsManager().getCurrentFigureNumber();
+ n = globals.getGraphicsManager().getCurrentFigureNumber();
}
- getGraphicsManager().getCurrentFigure().clearFigure();
+ globals.getGraphicsManager().getCurrentFigure().clearFigure();
return null;
}
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/close.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/close.java 2009-01-20 20:17:23 UTC (rev 698)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/close.java 2009-01-20 20:18:47 UTC (rev 699)
@@ -3,12 +3,13 @@
import jmathlib.core.tokens.*;
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
/**An external function for closing figures*/
public class close extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
//ErrorLogger.debugLine("figure evaluate");
@@ -16,8 +17,8 @@
if (operands==null)
{
- int i = getGraphicsManager().getCurrentFigureNumber();
- getGraphicsManager().removeFigure(i);
+ int i = globals.getGraphicsManager().getCurrentFigureNumber();
+ globals.getGraphicsManager().removeFigure(i);
}
else
@@ -30,10 +31,10 @@
int i = (int)(((DoubleNumberToken)operands[0]).getReValues()[0][0]);
- getGraphicsManager().removeFigure(i);
+ globals.getGraphicsManager().removeFigure(i);
}
- getGraphicsManager().getCurrentFigure().repaint();
+ globals.getGraphicsManager().getCurrentFigure().repaint();
return null;
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/figure.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/figure.java 2009-01-20 20:17:23 UTC (rev 698)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/figure.java 2009-01-20 20:18:47 UTC (rev 699)
@@ -3,12 +3,13 @@
import jmathlib.core.tokens.*;
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
/**An external function for 2 dimensional plots*/
public class figure extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
//ErrorLogger.debugLine("figure evaluate");
@@ -16,14 +17,14 @@
if (operands==null)
{
// figure called with no arguments
- getGraphicsManager().createNewFigure();
+ globals.getGraphicsManager().createNewFigure();
}
else
{
if (getNArgIn(operands) == 0)
- getGraphicsManager().createNewFigure();
+ globals.getGraphicsManager().createNewFigure();
if (getNArgIn(operands) != 1)
throwMathLibException("figure: number of arguments != 1");
@@ -33,10 +34,10 @@
int figureNumber = (int)(((DoubleNumberToken)operands[0]).getReValues()[0][0]);
- getGraphicsManager().createNewFigure(figureNumber);
+ globals.getGraphicsManager().createNewFigure(figureNumber);
}
- getGraphicsManager().getCurrentFigure().repaint();
+ globals.getGraphicsManager().getCurrentFigure().repaint();
return null;
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/gca.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/gca.java 2009-01-20 20:17:23 UTC (rev 698)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/gca.java 2009-01-20 20:18:47 UTC (rev 699)
@@ -3,18 +3,19 @@
import jmathlib.core.tokens.*;
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class gca extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
if (getNArgIn(operands) != 0)
throwMathLibException("gca: number of arguments != 0");
// get handle to axes
- double n = getGraphicsManager().getCurrentFigure().getCurrentAxes().getHandle();
+ double n = globals.getGraphicsManager().getCurrentFigure().getCurrentAxes().getHandle();
return new DoubleNumberToken(n);
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/gcf.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/gcf.java 2009-01-20 20:17:23 UTC (rev 698)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/gcf.java 2009-01-20 20:18:47 UTC (rev 699)
@@ -3,18 +3,19 @@
import jmathlib.core.tokens.*;
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class gcf extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
if (getNArgIn(operands) != 0)
throwMathLibException("gcf: number of arguments != 0");
// get figure number
- double n = getGraphicsManager().getCurrentFigure().getHandle();
+ double n = globals.getGraphicsManager().getCurrentFigure().getHandle();
return new DoubleNumberToken(n);
}
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/grid.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/grid.java 2009-01-20 20:17:23 UTC (rev 698)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/grid.java 2009-01-20 20:18:47 UTC (rev 699)
@@ -3,12 +3,13 @@
import jmathlib.core.tokens.*;
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
/**Add a grid to the current axes*/
public class grid extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
//ErrorLogger.debugLine("grid evaluate");
@@ -41,11 +42,11 @@
}
// switch grid on/off
- getGraphicsManager().getCurrentFigure().getCurrentAxes().set("XGrid",new Boolean(value));
- getGraphicsManager().getCurrentFigure().getCurrentAxes().set("YGrid",new Boolean(value));
- getGraphicsManager().getCurrentFigure().getCurrentAxes().set("ZGrid",new Boolean(value));
+ globals.getGraphicsManager().getCurrentFigure().getCurrentAxes().set("XGrid",new Boolean(value));
+ globals.getGraphicsManager().getCurrentFigure().getCurrentAxes().set("YGrid",new Boolean(value));
+ globals.getGraphicsManager().getCurrentFigure().getCurrentAxes().set("ZGrid",new Boolean(value));
- getGraphicsManager().getCurrentFigure().repaint();
+ globals.getGraphicsManager().getCurrentFigure().repaint();
return null;
}
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/hold.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/hold.java 2009-01-20 20:17:23 UTC (rev 698)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/hold.java 2009-01-20 20:18:47 UTC (rev 699)
@@ -3,13 +3,14 @@
import jmathlib.core.tokens.*;
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
/**Holds the current axes. All subsequent uses of plot will accumulate in
this axes */
public class hold extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
//ErrorLogger.debugLine("hold evaluate");
@@ -42,9 +43,9 @@
// switch hold on/off
if (value)
- getGraphicsManager().getCurrentFigure().getCurrentAxes().set("NextPlot","add");
+ globals.getGraphicsManager().getCurrentFigure().getCurrentAxes().set("NextPlot","add");
else
- getGraphicsManager().getCurrentFigure().getCurrentAxes().set("NextPlot","replace");
+ globals.getGraphicsManager().getCurrentFigure().getCurrentAxes().set("NextPlot","replace");
return null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
[Mathlib-commitlog] SF.net SVN: mathlib:[707]
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ graphics
From: <st_...@us...> - 2009-01-21 19:26:54
|
Revision: 707
http://mathlib.svn.sourceforge.net/mathlib/?rev=707&view=rev
Author: st_mueller
Date: 2009-01-21 19:26:49 +0000 (Wed, 21 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/get.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/ginput.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/print.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/propertyeditor.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/set.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/subplot.java
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/get.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/get.java 2009-01-20 22:30:47 UTC (rev 706)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/get.java 2009-01-21 19:26:49 UTC (rev 707)
@@ -4,12 +4,14 @@
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.functions.ExternalFunction;
import jmathlib.core.graphics.*;
+import jmathlib.core.interpreter.GlobalValues;
+
import java.awt.Color;
public class get extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
@@ -43,8 +45,8 @@
if (getNArgIn(operands) == 1)
{
// e.g. get(1234)
- getInterpreter().displayText("");
- ho.show(getInterpreter());
+ globals.getInterpreter().displayText("");
+ ho.show(globals.getInterpreter());
return null;
}
else if (getNArgIn(operands) == 2)
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/ginput.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/ginput.java 2009-01-20 22:30:47 UTC (rev 706)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/ginput.java 2009-01-21 19:26:49 UTC (rev 707)
@@ -4,12 +4,14 @@
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.functions.ExternalFunction;
import jmathlib.core.graphics.*;
+import jmathlib.core.interpreter.GlobalValues;
+
import java.awt.Color;
public class ginput extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/print.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/print.java 2009-01-20 22:30:47 UTC (rev 706)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/print.java 2009-01-21 19:26:49 UTC (rev 707)
@@ -2,6 +2,8 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
+
import java.awt.print.*;
/**An external function for printing plots*/
@@ -9,7 +11,7 @@
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
debugLine("print evaluate");
@@ -38,7 +40,7 @@
PrinterJob pjob = PrinterJob.getPrinterJob();
PageFormat defaultPF = pjob.defaultPage();
PageFormat pageformat = pjob.pageDialog(defaultPF);
- pjob.setPrintable(getGraphicsManager().getCurrentFigure(), pageformat);
+ pjob.setPrintable(globals.getGraphicsManager().getCurrentFigure(), pageformat);
// somebody hit cancel
if (pageformat != defaultPF)
@@ -61,7 +63,7 @@
catch (PrinterException e)
{
debugLine("print: Printer Exception");
- getInterpreter().displayText("print: Printer Exception");
+ globals.getInterpreter().displayText("print: Printer Exception");
}
//getGraphicsManager().getCurrentFigure().print();
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/propertyeditor.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/propertyeditor.java 2009-01-20 22:30:47 UTC (rev 706)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/propertyeditor.java 2009-01-21 19:26:49 UTC (rev 707)
@@ -5,6 +5,7 @@
import jmathlib.core.functions.ExternalFunction;
import jmathlib.core.graphics.HandleObject;
import jmathlib.core.graphics.properties.Property;
+import jmathlib.core.interpreter.GlobalValues;
import java.awt.*;
import java.awt.event.*;
@@ -15,7 +16,7 @@
public class propertyeditor extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
//if (getNArgIn(operands) != 0)
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/set.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/set.java 2009-01-20 22:30:47 UTC (rev 706)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/set.java 2009-01-21 19:26:49 UTC (rev 707)
@@ -4,11 +4,12 @@
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.functions.ExternalFunction;
import jmathlib.core.graphics.*;
+import jmathlib.core.interpreter.GlobalValues;
public class set extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
if (getNArgIn(operands) != 3)
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/subplot.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/subplot.java 2009-01-20 22:30:47 UTC (rev 706)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/subplot.java 2009-01-21 19:26:49 UTC (rev 707)
@@ -3,12 +3,13 @@
import jmathlib.core.tokens.*;
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
/**An external function for 2 dimensional plots*/
public class subplot extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
//ErrorLogger.debugLine("subplot evaluate");
@@ -25,8 +26,8 @@
int gridX = (int)(((DoubleNumberToken)operands[1]).getReValues()[0][0]);
int currentAxes = (int)(((DoubleNumberToken)operands[2]).getReValues()[0][0]);
- getGraphicsManager().getCurrentFigure().setSubPlot(gridY, gridX, currentAxes);
- getGraphicsManager().getCurrentFigure().repaint();
+ globals.getGraphicsManager().getCurrentFigure().setSubPlot(gridY, gridX, currentAxes);
+ globals.getGraphicsManager().getCurrentFigure().repaint();
return null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X