V0.4 with Java 1.5

Author: sbonaime

Console/.gitignore

@@ -0,0 +1,3 @@
+/Console$ReaderThread$1.class
+/Console$ReaderThread.class
+/Console.class

Console/.svn/README.txt

@@ -0,0 +1,2 @@
+This is a Subversion working copy administrative directory.
+Visit http://subversion.tigris.org/ for more information.

Console/.svn/dir-wcprops

@@ -0,0 +1,5 @@
+K 25
+svn:wc:ra_dav:version-url
+V 40
+/instru_geos/!svn/ver/2/jSeisCal/Console
+END

jSeisCal/.svn/wc.db-journal Console/.svn/empty-file

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wc-entries
+   xmlns="svn:">
+<entry
+   repos="https://svn.ipgp.fr/instru_geos"
+   name=""
+   revision="238"
+   last-author="leroy"
+   url="https://svn.ipgp.fr/instru_geos/jSeisCal/Console"
+   uuid="308c3184-852a-42d4-b679-f66096868c1e"
+   committed-rev="2"
+   kind="dir"
+   committed-date="2010-01-14T18:01:35.428086Z"/>
+<entry
+   name="Console.java"
+   checksum="842aa9429750b49deba4659c9e24b7c8"
+   last-author="leroy"
+   committed-rev="2"
+   text-time="2010-01-14T18:01:35.000000Z"
+   kind="file"
+   committed-date="2010-01-14T18:01:35.428086Z"/>
+</wc-entries>

Console/.svn/entries

@@ -0,0 +1 @@
+4

Console/.svn/format

@@ -0,0 +1,89 @@
+package Console;
+import java.awt.*;
+import java.io.*;
+import javax.swing.*;
+import javax.swing.border.LineBorder;
+import javax.swing.border.TitledBorder;
+    
+public class Console extends JPanel {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	PipedInputStream piOut;
+    PipedInputStream piErr;
+    PipedOutputStream poOut;
+    PipedOutputStream poErr;
+    JTextArea textArea = new JTextArea();
+
+    public Console() throws IOException {
+        // Set up System.out
+        piOut = new PipedInputStream();
+        poOut = new PipedOutputStream(piOut);
+        //System.setOut(new PrintStream(poOut, true));
+
+        // Set up System.err
+        piErr = new PipedInputStream();
+        poErr = new PipedOutputStream(piErr);
+        //System.setErr(new PrintStream(poErr, true));
+
+        // Add a scrolling text area
+        textArea.setEditable(false);
+        textArea.setRows(10);
+        textArea.setColumns(20);
+        //textArea.setFont(new Font("SansSerif",	Font.PLAIN, 8));
+        /*textArea.setRows(5);
+        textArea.setColumns(50);*/
+        textArea.setLineWrap(true);
+
+        this.add(new JScrollPane(textArea), BorderLayout.CENTER);
+        
+        // Create reader threads
+        new ReaderThread(piOut).start();
+        //new ReaderThread(piErr).start();
+        setBorder(new TitledBorder(LineBorder.createGrayLineBorder(),"Console"));
+    }
+    
+    public void write(String str) {
+    	this.textArea.append(str+"\n");
+    	this.textArea.setCaretPosition(textArea.getDocument().getLength());
+    }
+
+    class ReaderThread extends Thread {
+        PipedInputStream pi;
+
+        ReaderThread(PipedInputStream pi) {
+            this.pi = pi;
+        }
+
+        public synchronized void run() {
+            final byte[] buf = new byte[1024];
+            try {
+                while (true) {
+                    final int len = pi.read(buf);
+                    if (len == -1) {
+                        break;
+                    }
+                    SwingUtilities.invokeLater(new Runnable() {
+                        public void run() {
+                            textArea.append(new String(buf, 0, len));
+
+                            // Make sure the last line is always visible
+                            textArea.setCaretPosition(textArea.getDocument().getLength());
+
+                            // Keep the text area down to a certain character size
+                         /*   int idealSize = 1000;
+                            int maxExcess = 500;
+                            int excess = textArea.getDocument().getLength() - idealSize;
+                            if (excess >= maxExcess) {
+                                textArea.replaceRange("", 0, excess);
+                            }*/
+                        }
+                    });
+                }
+            } catch (IOException e) {
+            }
+        }
+    }
+}

Console/.svn/text-base/Console.java.svn-base

@@ -0,0 +1,5 @@
+K 25
+svn:wc:ra_dav:version-url
+V 53
+/instru_geos/!svn/ver/2/jSeisCal/Console/Console.java
+END

Console/.svn/wcprops/Console.java.svn-work

@@ -102,7 +102,8 @@ public DisplayChannel(DataChannel channel, int maxAge) {
 		TimeSeriesCollection dataset = new TimeSeriesCollection();
 		dataset.addSeries(this.chan);
 
-		domain.setAutoRange(true);
+		//domain.setAutoRange(true);
+		domain.setFixedAutoRange(30000);
 
 		range = new NumberAxis(channel.name);
 		range.setAutoRange(true);
@@ -204,7 +205,8 @@ public void update(Observable arg0, Object arg1) {
 		ms = ms - 300000;
 		now2.setTime(ms);
 		domain.setRange(now2, now);*/
-			if (min<max) {
+			range.setAutoRange(true);
+			/*if (min<max) {
 				if ((max>maxold) && (min<minold)) {
 					maxold=max;
 					minold=min;
@@ -222,10 +224,10 @@ public void update(Observable arg0, Object arg1) {
 					range.setRange((double)minold, (double)(maxold));
 					//System.out.println("range");
 				}
-			}	
+			}	*/
 		}
     	timer = (System.currentTimeMillis() - timer);
-    	System.out.println("ch : " + this.dc.name +" - timer : " + timer);
+    	//System.out.println("ch : " + this.dc.name +" - timer : " + timer);
 
 	}
 

DisplayChannel.java

@@ -154,7 +154,8 @@ public DisplayChannelPOS(DataChannel channel, int maxAge) {
 		dataset.addSeries(chan);
 		dataset.addSeries(mav);
 
-		domain.setAutoRange(true);
+		//domain.setAutoRange(true);
+		domain.setFixedAutoRange(30000);
 
 		range = new NumberAxis(channel.name);
 		range.setAutoRange(true);
@@ -304,7 +305,7 @@ public void update(Observable arg0, Object arg1) {
 
 			chan.setNotify(false);
 			mav.setNotify(false);
-			if (offset > 0) {
+			if (offset >= 0) {
 				for (int k = 0; k < sr; k++) {
 					ms = dc.times[offset + k];
 					now.setTime(ms);
@@ -356,32 +357,6 @@ public void update(Observable arg0, Object arg1) {
 
 			}
 
-			// A finir !!
-			/*domain.setAutoRange(false);
-		Date now2 = new Date();
-		ms = ms - 300000;
-		now2.setTime(ms);
-		domain.setRange(now2, now);*/
-			if (min<max) {
-				if ((max>maxold) && (min<minold)) {
-					maxold=max;
-					minold=min;
-					range.setAutoRange(false);
-					range.setRange((double)minold, (double)(maxold));
-					//System.out.println("range");
-				}else if (max>maxold) {
-					maxold=max;
-					range.setAutoRange(false);
-					range.setRange((double)minold, (double)(maxold));
-					//System.out.println("range");
-				}else if (min<minold) {
-					minold=min;
-					range.setAutoRange(false);
-					range.setRange((double)minold, (double)(maxold));
-					//System.out.println("range");
-				}
-			}
-
 			int lenght = sr*10;	
 
 			if (end > lenght) {
@@ -416,9 +391,6 @@ public void update(Observable arg0, Object arg1) {
 			}
 
 		}
-		//System.out.println("Max = " + maxi + " " + iMax + " - Min = " + mini + " " + iMin);
-	
-		
 
 	}
 

DisplayChannelPOS.java

@@ -0,0 +1,2 @@
+This is a Subversion working copy administrative directory.
+Visit http://subversion.tigris.org/ for more information.

META-INF/.svn/README.txt

@@ -0,0 +1,5 @@
+K 25
+svn:wc:ra_dav:version-url
+V 42
+/instru_geos/!svn/ver/19/jSeisCal/META-INF
+END

META-INF/.svn/dir-wcprops

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wc-entries
+   xmlns="svn:">
+<entry
+   name=""
+   repos="https://svn.ipgp.fr/instru_geos"
+   revision="238"
+   last-author="leroy"
+   uuid="308c3184-852a-42d4-b679-f66096868c1e"
+   url="https://svn.ipgp.fr/instru_geos/jSeisCal/META-INF"
+   committed-rev="19"
+   kind="dir"
+   committed-date="2010-11-04T16:54:09.350805Z"/>
+<entry
+   name="MANIFEST.MF"
+   checksum="6e11a5a1f95142d33777b92b77c16f8a"
+   last-author="leroy"
+   text-time="2010-11-04T16:38:32.000000Z"
+   committed-rev="19"
+   kind="file"
+   committed-date="2010-11-04T16:54:09.350000Z"/>
+</wc-entries>

META-INF/.svn/empty-file

@@ -0,0 +1 @@
+4

META-INF/.svn/entries

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Sealed: true
+

META-INF/.svn/format

@@ -0,0 +1,5 @@
+K 25
+svn:wc:ra_dav:version-url
+V 54
+/instru_geos/!svn/ver/19/jSeisCal/META-INF/MANIFEST.MF
+END

META-INF/.svn/text-base/MANIFEST.MF.svn-base

@@ -30,6 +30,7 @@ public class MetrozetClient
 			//clientSocket.setSoTimeout(500);
 			//clientSocket.setSoLinger(false, 0);
 			clientSocket.setKeepAlive(true);
+
 
 			outToServer = new DataOutputStream(clientSocket.getOutputStream());
 			sena = new SenaTCPListener(clientSocket, console);
@@ -53,6 +54,7 @@ public void stop() {
 	public void send(String cmd) {
 		command = cmd + "\r";
 		if (clientSocket.isConnected()) {
+		//if (clientSocket.isBound()) {
 			try {
 				outToServer.writeBytes(command);
 				console.write(cmd);

META-INF/.svn/wcprops/MANIFEST.MF.svn-work

@@ -23,14 +23,16 @@ public class SenaTCPListener implements Runnable  {
 	}
 
 	public void run() {
-		while(true) {
+		boolean cond=true;
+		while(cond) {
 			try {			
 				buffer = inFromServer.readLine();
 				if (!buffer.startsWith("Ticks") && !buffer.startsWith("Seconds") && !buffer.equals("")) {
 					System.out.println(buffer);
 					console.write(buffer);			
 				}							
 			} catch (IOException e) {
+				cond=false;
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}