[Jrman-commit] drafts/src/org/jrman/parser Frame.java,1.8,1.9 Parser.java,1.49,1.50 Global.java,1.4,1.5

[<ma...@us...>]

Update of /cvsroot/jrman/drafts/src/org/jrman/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv18521/src/org/jrman/parser

Modified Files:
	Frame.java Parser.java Global.java 
Log Message:
Statistics flag.
Time format.
New scene.

Index: Frame.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parser/Frame.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Frame.java	26 May 2003 01:48:00 -0000	1.8
--- Frame.java	28 May 2003 06:22:44 -0000	1.9
***************
*** 108,111 ****
--- 108,113 ----
  
      private int bucketSizeY;
+     
+     private boolean endOfFrameStatistics;
  
      public Frame() {
***************
*** 490,493 ****
--- 492,503 ----
      public Transform getNDCTransform() {
          return AffineTransform.createNDC(horizontalResolution, verticalResolution);
+     }
+ 
+     public boolean endOfFrameStatisticsEnabled() {
+         return endOfFrameStatistics;
+     }
+ 
+     public void setEndOfFrameStatistics(boolean b) {
+         endOfFrameStatistics = b;
      }
  

Index: Parser.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parser/Parser.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Parser.java	27 May 2003 02:44:20 -0000	1.49
--- Parser.java	28 May 2003 06:22:44 -0000	1.50
***************
*** 599,602 ****
--- 599,608 ----
                  frame.setBucketSizeY(bucketsize[0][1]);
              }
+         } else if (name.equals("statistics")) {
+             Parameter parameter = (Parameter) parameters.get("endofframe");
+             if (parameter != null) {
+                 int[][] onOff = (int[][]) parameter.getData();
+                 frame.setEndOfFrameStatistics(onOff[0][0] != 0);
+             }
          }
      }

Index: Global.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parser/Global.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Global.java	17 May 2003 21:47:57 -0000	1.4
--- Global.java	28 May 2003 06:22:44 -0000	1.5
***************
*** 36,39 ****
--- 36,40 ----
          declarations.put("gridsize", new Declaration("gridsize", "integer"));
          declarations.put("bucketsize", new Declaration("bucketsize", "integer[2]"));
+         declarations.put("endofframe", new Declaration("endofframe", "integer"));
          declarations.put("intensity", new Declaration("intensity", "float"));
          declarations.put("lightcolor", new Declaration("lightcolor", "color"));