Print

Print


Commit in lcsim/src/org/lcsim/plugin/browser on MAIN
CollectionTable.java+24-11.1 -> 1.2
GenericTableModel.java+5-11.3 -> 1.4
ReconstructedParticleTableModel.java+1-11.1 -> 1.2
TrackTableModel.java+13-11.1 -> 1.2
+43-4
4 modified files
Fix for browsing tracks and recon particles

lcsim/src/org/lcsim/plugin/browser
CollectionTable.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- CollectionTable.java	22 Jun 2005 05:32:48 -0000	1.1
+++ CollectionTable.java	1 Jul 2005 22:05:59 -0000	1.2
@@ -1,5 +1,6 @@
 package org.lcsim.plugin.browser;
 
+import hep.physics.vec.Hep3Vector;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.lang.reflect.Array;
@@ -23,7 +24,7 @@
 /**
  *
  * @author tonyj
- * @version $Id: CollectionTable.java,v 1.1 2005/06/22 05:32:48 tonyj Exp $
+ * @version $Id: CollectionTable.java,v 1.2 2005/07/01 22:05:59 tonyj Exp $
  */
 public class CollectionTable extends JPanel
 {
@@ -50,6 +51,7 @@
       m_table.setDefaultRenderer(new float[0].getClass(),new ArrayRenderer());
       m_table.setDefaultRenderer(new int[0].getClass(),new ArrayRenderer());
       m_table.setDefaultRenderer(new String[0].getClass(),new ArrayRenderer());
+      m_table.setDefaultRenderer(Hep3Vector.class,new VectorRenderer());
       m_table.setDefaultRenderer(Object.class, new LCObjectRenderer());
    }
    void setEvent(EventHeader event)
@@ -139,6 +141,27 @@
          return this;
       }
    }
+   private static class VectorRenderer extends DefaultTableCellRenderer
+   {
+      private ScientificFormat format = new ScientificFormat();
+      public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column)
+      {
+         super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+         if (value instanceof Hep3Vector)
+         {
+            Hep3Vector vector = (Hep3Vector) value;
+            StringBuffer buffer = new StringBuffer("[");
+            buffer.append(format.format(vector.x()));
+            buffer.append(',');
+            buffer.append(format.format(vector.y()));
+            buffer.append(',');
+            buffer.append(format.format(vector.z()));
+            buffer.append(']');
+            setText(buffer.toString());
+         }
+         return this;
+      }
+   }
    private class LCObjectRenderer extends DefaultTableCellRenderer
    {
       public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column)

lcsim/src/org/lcsim/plugin/browser
GenericTableModel.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- GenericTableModel.java	30 Jun 2005 23:40:22 -0000	1.3
+++ GenericTableModel.java	1 Jul 2005 22:05:59 -0000	1.4
@@ -67,11 +67,15 @@
          return Throwable.class;
       }
    }
+   protected Object getData(int row)
+   {
+      return data.get(row);
+   }
    public Object getValueAt(int row, int column)
    {
       try
       {
-         Object bean = data.get(row);
+         Object bean = getData(row);
          String name = columns[column];
          Method m = klass.getMethod("get"+name,(Class[]) null);
          return m.invoke(bean,(Object[]) null);

lcsim/src/org/lcsim/plugin/browser
ReconstructedParticleTableModel.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- ReconstructedParticleTableModel.java	30 Jun 2005 23:40:22 -0000	1.1
+++ ReconstructedParticleTableModel.java	1 Jul 2005 22:05:59 -0000	1.2
@@ -8,7 +8,7 @@
  */
 class ReconstructedParticleTableModel extends GenericTableModel
 {
-   private static final String[] columns = {"Type","Energy","Momentum","ReferencePoint","Particles"};
+   private static final String[] columns = {"Type","Momentum","Energy","Mass","Charge","ReferencePoint"};
    private static Class klass = ReconstructedParticle.class;
 
    ReconstructedParticleTableModel()

lcsim/src/org/lcsim/plugin/browser
TrackTableModel.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- TrackTableModel.java	30 Jun 2005 23:40:22 -0000	1.1
+++ TrackTableModel.java	1 Jul 2005 22:05:59 -0000	1.2
@@ -8,11 +8,23 @@
  */
 class TrackTableModel extends GenericTableModel
 {
-   private static final String[] columns = {"Momentum","Charge","dEdx","Chi2","NDF"};
+   private static final String[] columns = {"Type","D0","Phi","Omega","Z0","TanLambda","Chi2","NDF","dEdx"};
    private static Class klass = Track.class;
 
    TrackTableModel()
    {
       super(klass,columns);
    }
+
+   public Object getValueAt(int row, int column)
+   {
+      if (column > 0 && column <= 5) return ((Track) getData(row)).getTrackParameter(column-1);
+      else return super.getValueAt(row,column);
+   }
+   
+   public Class getColumnClass(int column)
+   {
+       if (column > 0 && column <= 5) return Double.class;
+       else return super.getColumnClass(column);
+   }
 }
CVSspam 0.2.8