[mpich2-commits] r6641 - in mpich2/trunk/src/mpe2/src/slog2sdk/src/viewer: timelines zoomable

[chan at mcs.anl.gov]

Author: chan
Date: 2010-05-10 22:46:13 -0500 (Mon, 10 May 2010)
New Revision: 6641

Modified:
   mpich2/trunk/src/mpe2/src/slog2sdk/src/viewer/timelines/CanvasTimeline.java
   mpich2/trunk/src/mpe2/src/slog2sdk/src/viewer/timelines/InfoDialogForDrawable.java
   mpich2/trunk/src/mpe2/src/slog2sdk/src/viewer/zoomable/ModelTime.java
Log:
added preliminary support to locate start and final vertices of very long drawable which happens when one zooms very deep into seeing details.  This is added to address ticket #552.



Modified: mpich2/trunk/src/mpe2/src/slog2sdk/src/viewer/timelines/CanvasTimeline.java
===================================================================
--- mpich2/trunk/src/mpe2/src/slog2sdk/src/viewer/timelines/CanvasTimeline.java	2010-05-11 02:58:35 UTC (rev 6640)
+++ mpich2/trunk/src/mpe2/src/slog2sdk/src/viewer/timelines/CanvasTimeline.java	2010-05-11 03:46:13 UTC (rev 6641)
@@ -62,6 +62,7 @@
     private YaxisMaps          y_maps;
     private YaxisTree          tree_view;
     private BoundedRangeModel  y_model;
+    private ModelTime          t_model;
     private Method[]           methods;
     private String[]           y_colnames;
 
@@ -95,6 +96,7 @@
         TreeNode   treeroot;
         short      depth_max, depth_init;
 
+        t_model         = time_model;
         treetrunk       = treebody;
         y_maps          = yaxis_maps;
         tree_view       = y_maps.getTreeView();
@@ -435,6 +437,7 @@
                                                        clicked_time,
                                                        map_line2treeleaf,
                                                        y_colnames,
+                                                       t_model,
                                                        clicked_dobj );
                 }
             }
@@ -457,6 +460,7 @@
                                                        clicked_time,
                                                        map_line2treeleaf,
                                                        y_colnames,
+                                                       t_model,
                                                        clicked_dobj );
                 }
             }
@@ -479,6 +483,7 @@
                                                        clicked_time,
                                                        map_line2treeleaf,
                                                        y_colnames,
+                                                       t_model,
                                                        clicked_dobj );
                 }
             }
@@ -501,6 +506,7 @@
                                                        clicked_time,
                                                        map_line2treeleaf,
                                                        y_colnames,
+                                                       t_model,
                                                        clicked_dobj );
                 }
             }

Modified: mpich2/trunk/src/mpe2/src/slog2sdk/src/viewer/timelines/InfoDialogForDrawable.java
===================================================================
--- mpich2/trunk/src/mpe2/src/slog2sdk/src/viewer/timelines/InfoDialogForDrawable.java	2010-05-11 02:58:35 UTC (rev 6640)
+++ mpich2/trunk/src/mpe2/src/slog2sdk/src/viewer/timelines/InfoDialogForDrawable.java	2010-05-11 03:46:13 UTC (rev 6641)
@@ -11,22 +11,33 @@
 
 import java.awt.*;
 import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.Map;
 
 import base.drawable.Drawable;
 import viewer.zoomable.InfoDialog;
+import viewer.zoomable.ModelTime;
 
 public class InfoDialogForDrawable extends InfoDialog
 {
     private static final  long  serialVersionUID = 13200L;
+    private ModelTime time_model;
+    private double    clk_time_pos;
+    private JButton   left_btn;
+    private JButton   home_btn;
+    private JButton   right_btn;
 
     public InfoDialogForDrawable( final Frame     frame, 
                                   final double    clicked_time,
                                   final Map       map_line2treenodes,
                                   final String[]  y_colnames,
+                                        ModelTime tmodel,
                                   final Drawable  clicked_dobj )
     {
         super( frame, "Drawable Info Box", clicked_time );
+        time_model    = tmodel;
+        clk_time_pos  = clicked_time;
 
         Container root_panel = this.getContentPane();
         root_panel.setLayout( new BoxLayout( root_panel, BoxLayout.Y_AXIS ) );
@@ -34,6 +45,36 @@
         root_panel.add( new InfoPanelForDrawable( map_line2treenodes,
                                                   y_colnames, clicked_dobj ) );
 
-        root_panel.add( super.getCloseButtonPanel() );
+        JPanel btn_panel = super.getCloseButtonPanel();
+        left_btn   = new JButton( "left" );
+        home_btn   = new JButton( "home" );
+        right_btn  = new JButton( "right" );
+        left_btn.setAlignmentX( Component.LEFT_ALIGNMENT );
+        home_btn.setAlignmentX( Component.LEFT_ALIGNMENT );
+        right_btn.setAlignmentX( Component.RIGHT_ALIGNMENT );
+        left_btn.addActionListener( new ActionListener() {
+             public void actionPerformed( ActionEvent evt )
+             {
+                 double time = clicked_dobj.getStartVertex().time;
+                 time_model.centerTimeViewPosition( time );
+             }
+        } );
+        home_btn.addActionListener( new ActionListener() {
+             public void actionPerformed( ActionEvent evt )
+             {
+                 time_model.centerTimeViewPosition( clk_time_pos );
+             }
+        } );
+        right_btn.addActionListener( new ActionListener() {
+             public void actionPerformed( ActionEvent evt )
+             {
+                 double time = clicked_dobj.getFinalVertex().time;
+                 time_model.centerTimeViewPosition( time );
+             }
+        } );
+        btn_panel.add( left_btn );
+        btn_panel.add( home_btn );
+        btn_panel.add( right_btn );
+        root_panel.add( btn_panel );
     }
 }

Modified: mpich2/trunk/src/mpe2/src/slog2sdk/src/viewer/zoomable/ModelTime.java
===================================================================
--- mpich2/trunk/src/mpe2/src/slog2sdk/src/viewer/zoomable/ModelTime.java	2010-05-11 02:58:35 UTC (rev 6640)
+++ mpich2/trunk/src/mpe2/src/slog2sdk/src/viewer/zoomable/ModelTime.java	2010-05-11 03:46:13 UTC (rev 6641)
@@ -399,6 +399,14 @@
         }
     }
 
+    // tView_pos is  the time measured in second.
+    public void centerTimeViewPosition( double tView_pos )
+    {
+        this.setTimeViewPosition( tView_pos - (tView_extent/2.0) );
+        this.updatePixelCoords();
+        // this.setScrollBarIncrements();
+    }
+
     // tView_change is  the time measured in second.
     public void scroll( double tView_change )
     {