[Mathlib-commitlog] SF.net SVN: mathlib:[709] JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ graphic
Status: Beta
Brought to you by:
st_mueller
Menu
▾
▴
[Mathlib-commitlog] SF.net SVN: mathlib:[709] JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ graphics/graph3d
|
From: <st_...@us...> - 2009-01-21 19:29:33
|
Revision: 709
http://mathlib.svn.sourceforge.net/mathlib/?rev=709&view=rev
Author: st_mueller
Date: 2009-01-21 19:29:30 +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/graph3d/mesh.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/meshc.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/meshgrid.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/meshz.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/patch.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/pie3.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/plot3.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/quiver3.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/rotate.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/scatter3.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/sphere.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/stem3.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamline.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamribbon.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamslice.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamtube.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/surf.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/surfc.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/surfl.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/waterfall.java
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/mesh.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/mesh.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/mesh.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class mesh extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("mesh: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/meshc.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/meshc.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/meshc.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class meshc extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("meshc: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/meshgrid.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/meshgrid.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/meshgrid.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,6 +2,7 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
/*
@@ -16,7 +17,7 @@
* @param operands[0] = x values (e.g. [-2:0.2:2])
* @param operands[1] = y values (e.g. [-2:0.2:2])
* @return [X,Y] as matrices */
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
// one operand (e.g. [x,y]=meshgrid([-2:0.2:2],[-2:0.2:2]) )
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/meshz.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/meshz.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/meshz.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class meshz extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("meshz: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/patch.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/patch.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/patch.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class patch extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("patch: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/pie3.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/pie3.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/pie3.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class pie3 extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("pie3: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/plot3.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/plot3.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/plot3.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -5,13 +5,14 @@
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.graphics.*;
import jmathlib.core.interpreter.ErrorLogger;
+import jmathlib.core.interpreter.GlobalValues;
import jmathlib.core.graphics.axes.*;
/**An external function for 3 dimensional plots*/
public class plot3 extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
ErrorLogger.debugLine("plot3 evaluate. no of args: "+getNArgIn(operands));
@@ -125,9 +126,9 @@
}
// add Lines to current axes
- getGraphicsManager().getCurrentFigure().getCurrentAxes();
- getGraphicsManager().getCurrentFigure().convertCurrentAxesTo3DAxes();
- AxesObject axesOb = getGraphicsManager().getCurrentFigure().getCurrentAxes();
+ globals.getGraphicsManager().getCurrentFigure().getCurrentAxes();
+ globals.getGraphicsManager().getCurrentFigure().convertCurrentAxesTo3DAxes();
+ AxesObject axesOb = globals.getGraphicsManager().getCurrentFigure().getCurrentAxes();
if (axesOb instanceof Axes3DObject)
((Axes3DObject)axesOb).add3DLines(x,
y,
@@ -139,7 +140,7 @@
ErrorLogger.debugLine("plot3: eval: something wrong");
// call repaint to initiate drawing of plot lineStyleC);
- getGraphicsManager().getCurrentFigure().repaint();
+ globals.getGraphicsManager().getCurrentFigure().repaint();
return new DoubleNumberToken(1);
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/quiver3.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/quiver3.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/quiver3.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class quiver3 extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("quiver3: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/rotate.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/rotate.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/rotate.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -5,13 +5,14 @@
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.graphics.*;
import jmathlib.core.graphics.axes.*;
+import jmathlib.core.interpreter.GlobalValues;
/** rotate*/
public class rotate extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
double phiX = 0;
@@ -36,9 +37,9 @@
}
// rotate axes
- ((Axes3DObject)getGraphicsManager().getCurrentFigure().getCurrentAxes()).rotate(phiX,phiY,phiZ);
+ ((Axes3DObject)globals.getGraphicsManager().getCurrentFigure().getCurrentAxes()).rotate(phiX,phiY,phiZ);
- getGraphicsManager().getCurrentFigure().repaint();
+ globals.getGraphicsManager().getCurrentFigure().repaint();
return null;
}
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/scatter3.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/scatter3.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/scatter3.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class scatter3 extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("scatter3: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/sphere.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/sphere.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/sphere.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class sphere extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("sphere: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/stem3.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/stem3.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/stem3.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class stem3 extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("stem3: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamline.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamline.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamline.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class streamline extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("streamline: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamribbon.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamribbon.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamribbon.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class streamribbon extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("streamribbon: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamslice.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamslice.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamslice.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class streamslice extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("streamslice: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamtube.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamtube.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/streamtube.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class streamtube extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("streamtube: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/surf.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/surf.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/surf.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -6,12 +6,13 @@
import jmathlib.core.graphics.*;
import jmathlib.core.graphics.axes.*;
import jmathlib.core.interpreter.ErrorLogger;
+import jmathlib.core.interpreter.GlobalValues;
/**An external function for 3 dimensional surface plots*/
public class surf extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
double[][] x = {{0.0}};
double[][] y = {{0.0}};
@@ -90,16 +91,16 @@
// add surface to current axes
- getGraphicsManager().getCurrentFigure().getCurrentAxes();
- getGraphicsManager().getCurrentFigure().convertCurrentAxesTo3DAxes();
- AxesObject axesOb = getGraphicsManager().getCurrentFigure().getCurrentAxes();
+ globals.getGraphicsManager().getCurrentFigure().getCurrentAxes();
+ globals.getGraphicsManager().getCurrentFigure().convertCurrentAxesTo3DAxes();
+ AxesObject axesOb = globals.getGraphicsManager().getCurrentFigure().getCurrentAxes();
if (axesOb instanceof Axes3DObject)
((Axes3DObject)axesOb).addSurface(x, y, z);
else
ErrorLogger.debugLine("surf: eval: something wrong");
// call repaint to initiate drawing of plot lineStyleC);
- getGraphicsManager().getCurrentFigure().repaint();
+ globals.getGraphicsManager().getCurrentFigure().repaint();
return null;
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/surfc.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/surfc.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/surfc.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class surfc extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("surfc: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/surfl.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/surfl.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/surfl.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class surfl extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("surfl: not implemented yet");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/waterfall.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/waterfall.java 2009-01-21 19:28:12 UTC (rev 708)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/graphics/graph3d/waterfall.java 2009-01-21 19:29:30 UTC (rev 709)
@@ -2,11 +2,12 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class waterfall extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
throwMathLibException("waterfall: not implemented yet");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
