===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OXplot.java,v
retrieving revision 1.2
retrieving revision 1.7
diff -u -p -r1.2 -r1.7
--- OpenXM/src/OpenMath/OXplot.java	2000/07/07 03:02:36	1.2
+++ OpenXM/src/OpenMath/OXplot.java	2000/11/09 06:50:16	1.7
@@ -1,28 +1,31 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OXplot.java,v 1.1 2000/07/03 05:57:43 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OXplot.java,v 1.6 2000/10/11 08:32:13 ohara Exp $
  */
 
-import JP.ac.kobe_u.math.tam.OpenXM.*;
+import ORG.openxm.tam.*;
 import java.util.Stack;
 import java.util.Vector;
 import java.awt.*;
 
+
+
 public class OXplot extends OpenXMserver{
   private Stack stack = new Stack();
   private Vector plotframe = new Vector();
   protected boolean debug = true;
-  final int version = 200007010;
+  final int version = 200011090;
 
   public OXplot(String hostname,int ControlPort,int DataPort){
     super(hostname,ControlPort,DataPort);
   }
 
-  public void computeProcess(OpenXMconnection stream){
+  public void computeProcess(OpenXMstream stream){
     debug("OXplot started.");
     stack = new Stack();
     plotframe = new Vector();
     try{
       while(true){
+	Thread.yield();
 	try{
 	  OXmessage message = stream.receive();
 	  int ox_tag = message.getTag();
@@ -53,50 +56,12 @@ public class OXplot extends OpenXMserver{
       e.printStackTrace();
       System.err.println("error occured, and recovering processes seems to be impossible.");
     }finally{
-      System.out.println("breaking...");
+      System.err.println("breaking...");
     }
   }
 
-  class plotframe extends java.awt.Frame{
-    Canvas canvas;
-    int pixels[][];
 
-    plotframe(int width,int height){
-      super("plotframe");
-      add("Center", new Panel().add(canvas = new Canvas()));
-      canvas.setSize(width,height);
-      setResizable(false);
-
-      pixels = new int[width][];
-      for(int i=0;i<pixels.length;i++){
-	pixels[i] = new int[height];
-      }
-
-      pack();
-      show();
-    }
-
-    public void paint(Graphics gr){
-      Graphics g = canvas.getGraphics();
-
-      for(int x=0;x<pixels.length;x++){
-	for(int y=0;y<pixels[x].length;y++){
-	  if(pixels[x][y] == 1){
-	    g.setColor(Color.black);
-	  }else{
-	    g.setColor(Color.white);
-	  }
-	  g.fillRect(x,y,1,1);
-	}
-      }
-    }
-
-    public void pset(int x,int y){
-      pixels[x][y] = 1;
-    }
-  }
-
-  private void SM_popCMO(OpenXMconnection stream) throws java.io.IOException{
+  private void SM_popCMO(OpenXMstream stream) throws java.io.IOException{
     try{
       if(stack.empty()){
 	stream.send(new CMO_NULL());
@@ -129,10 +94,10 @@ public class OXplot extends OpenXMserver{
       argv[i] = (CMO)stack.pop();
     }
 
-    if(function_name.equals("CREATE") && argc==2){
+    if(function_name.equals("create") && argc==2){
       stack.push(CREATE(argv));
-    }else if(function_name.equals("CMO2OMXML") && argc==1){
-      //stack.push(CMO2OMXML(argv[0]));
+    }else if(function_name.equals("pset") && argc==4){
+      PSET(argv);
     }else{
       stack.push(new CMO_ERROR2(new CMO_NULL()));
     }
@@ -140,7 +105,7 @@ public class OXplot extends OpenXMserver{
     return;
   }
 
-  private void SM_mathcap(OpenXMconnection stream) throws java.io.IOException{
+  private void SM_mathcap(OpenXMstream stream) throws java.io.IOException{
     CMO[] mathcap = new CMO[3];
 
     {
@@ -185,7 +150,7 @@ public class OXplot extends OpenXMserver{
     debug("push: "+ stack.peek());
   }
 
-  private void SM_setMathCap(OpenXMconnection stream)
+  private void SM_setMathCap(OpenXMstream stream)
        throws java.io.IOException{
     Object mathcap = stack.pop();
 
@@ -195,7 +160,7 @@ public class OXplot extends OpenXMserver{
     stream.setMathCap((CMO_MATHCAP)mathcap);
   }
 
-  private void StackMachine(SM mesg,OpenXMconnection stream)
+  private void StackMachine(SM mesg,OpenXMstream stream)
        throws java.io.IOException{
     debug("receive: "+mesg);
 
@@ -217,16 +182,15 @@ public class OXplot extends OpenXMserver{
       break;
 
     default:
-      System.out.println("received "+ mesg);
+      System.err.println("received "+ mesg);
     }
   }
 
   private CMO CREATE(CMO[] argv){
     plotframe tmp = new plotframe(((CMO_INT32)argv[0]).intValue()
 				  ,((CMO_INT32)argv[1]).intValue());
-    int i;
 
-    for(i=0;i<plotframe.size();i++){
+    for(int i=0;i<plotframe.size();i++){
       if(plotframe.elementAt(i) == null){
 	plotframe.setElementAt(tmp,i);
 	return new CMO_INT32(i);
@@ -234,10 +198,20 @@ public class OXplot extends OpenXMserver{
     }
 
     plotframe.addElement(tmp);
+    plotframe.trimToSize();
 
-    return new CMO_INT32(plotframe.size());
+    return new CMO_INT32(plotframe.size()-1);
   }
 
+  private CMO PSET(CMO[] argv){
+    plotframe tmp = (plotframe)plotframe.elementAt(((CMO_INT32)argv[0]).intValue());
+
+    tmp.pset(((CMO_INT32)argv[1]).intValue(),
+	     ((CMO_INT32)argv[2]).intValue(),
+	     ((CMO_INT32)argv[3]).intValue());
+    return new CMO_NULL();
+  }
+
   private void debug(String str){
     if(debug){
       System.err.println(str);
@@ -266,7 +240,7 @@ public class OXplot extends OpenXMserver{
 
     for(int i=0;i<argv.length;i++){
       if(argv[i].equals("-h")){
-        System.out.println("");
+        System.err.println("");
         System.exit(0);
       }else if(argv[i].equals("-host")){
         hostname = argv[++i];
@@ -298,6 +272,71 @@ public class OXplot extends OpenXMserver{
 
     ox.start();
 
-    System.out.println("breaking...");
+    System.err.println("breaking...");
+  }
+}
+
+class plotframe extends java.awt.Frame implements java.awt.event.MouseListener{
+  Canvas canvas;
+  int pixels[][];
+  int offset_x,offset_y;
+
+  plotframe(int width,int height){
+    super("plotframe");
+    add("Center", new Panel().add(canvas = new Canvas()));
+    canvas.setSize(width,height);
+    setResizable(false);
+    canvas.addMouseListener(this);
+
+    pixels = new int[height][width];
+    for(int i=0;i<pixels.length;i++){
+      pixels[i] = new int[width];
+    }
+    offset_x = width/2;
+    offset_y = height/2;
+
+    pack();
+    show();
+  }
+
+  public void paint(Graphics gr){
+    paint();
+  }
+
+  public void paint(){
+    Graphics g = canvas.getGraphics();
+
+    for(int y=0;y<pixels.length;y++){
+      for(int x=0;x<pixels[y].length;x++){
+	g.setColor(new Color(pixels[y][x],pixels[y][x],pixels[y][x]));
+	g.fillRect(x,y,1,1);
+      }
+    }
+  }
+
+  public void mouseClicked(java.awt.event.MouseEvent e){
+    paint();
+  }
+
+  public void mousePressed(java.awt.event.MouseEvent e){
+  }
+
+  public void mouseReleased(java.awt.event.MouseEvent e){
+  }
+
+  public void mouseEntered(java.awt.event.MouseEvent e){
+  }
+
+  public void mouseExited(java.awt.event.MouseEvent e){
+  }
+
+  public void pset(int x,int y,int bright){
+    if(offset_x + x < 0 || offset_x + x >= pixels[0].length){
+      return;
+    }
+    if(offset_y + y < 0 || offset_y + y >= pixels.length){
+      return;
+    }
+    pixels[offset_y + y][offset_x + x] = bright;
   }
 }