Print

Print


Commit in SLICGUI on MAIN
nbproject/project.properties+3-11.1 -> 1.2
src/org/lcsim/slic/gui/Main.java-11.2 -> 1.3
                      /MainFrame.java+221.2 -> 1.3
                      /SLICDownloader.java+11.1 -> 1.2
+26-2
4 modified files
Comment out LCIO stuff not currently used

SLICGUI/nbproject
project.properties 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- project.properties	9 May 2005 05:48:42 -0000	1.1
+++ project.properties	30 Jun 2005 21:15:52 -0000	1.2
@@ -16,7 +16,9 @@
 dist.jar=${dist.dir}/SLICGUI.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 jar.compress=false
-javac.classpath=
+javac.classpath=\
+    ${file.reference.lcio.jar}:\
+    ${file.reference.sio.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

SLICGUI/src/org/lcsim/slic/gui
Main.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Main.java	9 May 2005 21:09:38 -0000	1.2
+++ Main.java	30 Jun 2005 21:15:53 -0000	1.3
@@ -23,7 +23,6 @@
       frame.setVisible(true);
       
       URL slicURL = new URL("http://lcsim.org/download/slic/current/win32/slic_win32.zip");
-//    URL slicURL = new URL("http://london.jaws.com/~tonyj/slic_win32.zip");
       SLICDownloader downloader = new SLICDownloader(frame, slicURL);
       downloader.perhapsDownload();
    }  

SLICGUI/src/org/lcsim/slic/gui
MainFrame.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- MainFrame.java	9 May 2005 21:09:38 -0000	1.2
+++ MainFrame.java	30 Jun 2005 21:15:53 -0000	1.3
@@ -28,6 +28,7 @@
    private final static String NEVENTS = "nEvents";
    private int eventsProcessed = 0;
    private SLICRunner runner;
+//   private LCReader reader;
    
    private SpinnerNumberModel events = new SpinnerNumberModel(10,1,10000,1);
    /** Creates new form MainPanel */
@@ -78,6 +79,24 @@
       prefs.putInt(NEVENTS,events.getNumber().intValue());
       System.exit(0);
    }
+   void nextEventReady()
+   {
+//      try
+//      {
+//         if (reader == null)
+//         {
+//            ILCFactory factory = LCFactory.getInstance();
+//            reader = factory.createLCReader();
+//            reader.open(runner.getLcio().getAbsolutePath());
+//         }
+//         LCEvent event = reader.readNextEvent();
+//         System.out.println(event);
+//      }
+//      catch (IOException x)
+//      {
+//         x.printStackTrace();
+//      }
+   }
    
    /** This method is called from within the constructor to
     * initialize the form.
@@ -399,6 +418,9 @@
                eventsProcessed++;
                progressBar.setValue(eventsProcessed);
                progressLabel.setText("Processing event "+eventsProcessed);
+               
+               // At this point we should be able to read the event
+               nextEventReady();
             }
          }
       };

SLICGUI/src/org/lcsim/slic/gui
SLICDownloader.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- SLICDownloader.java	9 May 2005 05:48:44 -0000	1.1
+++ SLICDownloader.java	30 Jun 2005 21:15:53 -0000	1.2
@@ -111,6 +111,7 @@
                }
                catch (IOException x)
                {
+                  // FixMe:
                   x.printStackTrace();
                }
                finally
CVSspam 0.2.8