perfsonar development work

Author: nemanja.zutic
Date: 2008-10-09 03:57:47 -0400 (Thu, 09 Oct 2008)
New Revision: 4596

Added:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMCalendarSyncAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMTimeIntervalPanel.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/nav_nexthalf.gif
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/nav_prevhalf.gif
Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
Log:
Modifications to the perfsonarUI circuits tab, allowing the user to scroll 
the graph back and forth for periods of one day or one week. Shifting is 
possible for the whole period or half a period.
Class MainPanelIPPM modified, classes IPPMTimeIntervalPanel and 
IPPMCalendarSyncAction added to display the control buttons and syncronise 
the controls with the DatePanel calendar.

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMCalendarSyncAction.java

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMTimeIntervalPanel.java

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
        2008-10-07 10:13:32 UTC (rev 4595)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
        2008-10-09 07:57:47 UTC (rev 4596)
@@ -22,16 +22,17 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
-import javax.swing.BoxLayout;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSplitPane;
 
 import org.perfsonar.perfsonarui.PSLogger;
+import org.perfsonar.perfsonarui.ippm.IPPMCalendarSyncAction;
 import org.perfsonar.perfsonarui.ippm.IPPMMetaDataList;
 import org.perfsonar.perfsonarui.ippm.IPPMPerfsonarModel;
 import org.perfsonar.perfsonarui.ippm.IPPMUserData;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
+import org.perfsonar.perfsonarui.ui.PerfsonarModel;
 import org.perfsonar.perfsonarui.ui.PluginMainPanel;
 import org.perfsonar.perfsonarui.ui.actions.ITimeSet;
 import org.perfsonar.perfsonarui.ui.actions.ITimeSetAction;
@@ -46,11 +47,15 @@
  * @author Nina Jeliazkova 

  * <b>Modified</b> 2005-12-4
  */
-public class MainPanelIPPM extends PluginMainPanel{
+public class MainPanelIPPM extends PluginMainPanel {
        protected JSplitPane panel = null;
 
        protected ResponseChartPanel responsePanel = null;
+       
        protected JPanel topPanel;
+       
+       protected JPanel bottomPanel;
+       
        protected JLabel status = null;
         
        /**
@@ -63,46 +68,57 @@
        }
 
        protected void addWidgets() {
-               responsePanel = new 
IPPMResponseChartPanel(model,(PerfsonarTimeSeriesDataset)model.getResponseListener());
+               bottomPanel = new JPanel(new BorderLayout());
+               
                IPPMPerfsonarModel psModel = (IPPMPerfsonarModel) model;
-               model.getDataList().addObserver(responsePanel);
+               
                DatePanel datePanel = new DatePanel();
                datePanel.addTimeAction(psModel.getTimeAction());
                
datePanel.addTimeAction((ITimeSet)psModel.getMetadataRequestAction());
+       
                topPanel = new JPanel(new BorderLayout());
 
-               QueryDetailsPanel scrollPaneQuery = new 
QueryDetailsPanel("Query parameters 
",psModel.getUserData(),psModel.getDataList()); 
+               QueryDetailsPanel scrollPaneQuery = new 
QueryDetailsPanel("Query parameters ",
+                               psModel.getUserData(),psModel.getDataList());
+               
                JPanel leftP = new JPanel();
-               leftP.setLayout(new BoxLayout(leftP,BoxLayout.PAGE_AXIS));
-               leftP.add(datePanel);           
-               leftP.add(scrollPaneQuery);
-               
-               
+               leftP.setLayout(new BorderLayout());
+               leftP.add(new JLabel(" Select a day to display the available 
measurements: "),
+                               BorderLayout.NORTH);
+               leftP.add(datePanel,BorderLayout.CENTER);
+               leftP.add(scrollPaneQuery,BorderLayout.SOUTH);
                topPanel.add(leftP,BorderLayout.WEST);
+
                topPanel.add(new 
IPPMPairsTablePanel((IPPMMetaDataList)psModel.getDataList(),
                                (IPPMUserData)psModel.getUserData(),
-                               
(ITimeSetAction)psModel.getDataRequestAction())
-                               //psModel.getTimeAction())
-                               ,BorderLayout.CENTER);
+                               
(ITimeSetAction)psModel.getDataRequestAction()),BorderLayout.CENTER);
+               topPanel.setPreferredSize(new Dimension(600,300));
                
-               
-               topPanel.setPreferredSize(new Dimension(600,300));
                psModel.getRequest().addPropertyChangeListener(responsePanel);
                
PSLogger.configureLog4j("/org/perfsonar/perfsonarui/log4.properties");
 
-               panel = new JSplitPane(JSplitPane.VERTICAL_SPLIT,topPanel, 
responsePanel);
+               //Panel for controling the time interval displayed on the 
graph
+               IPPMTimeIntervalPanel timeControls = new 
IPPMTimeIntervalPanel(datePanel.getDate().getTime()/1000);
+               
timeControls.addTimeAction((ITimeSetAction)((PerfsonarModel)model).getDataRequestAction());
+               //adding calendar sync action (whenever the a day in the 
calendar is selected the
+               //time inteval panel updates its time
+               datePanel.addTimeAction(new 
IPPMCalendarSyncAction(timeControls));
+               bottomPanel.add(timeControls, BorderLayout.NORTH);
 
-               //panel.setPreferredSize(new Dimension(width,height/2));
+               responsePanel = new IPPMResponseChartPanel(model,
+                               
(PerfsonarTimeSeriesDataset)model.getResponseListener());
+               model.getDataList().addObserver(responsePanel);
+               bottomPanel.add(responsePanel, BorderLayout.CENTER);
+
+               panel = new JSplitPane(JSplitPane.VERTICAL_SPLIT,topPanel, 
bottomPanel);
         panel.setDividerLocation(300);
-
                add(panel,BorderLayout.CENTER);
-
        }
+       
        @Override
        public void setModel(IPerfsonarTab model) {
                if (model instanceof IPPMPerfsonarModel)
                        super.setModel(model);
                else super.setModel(null);
        }
-       
 }

Added: branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/nav_nexthalf.gif


Property changes on: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/nav_nexthalf.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/nav_prevhalf.gif


Property changes on: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/nav_prevhalf.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream