[Mc4j-cvs] mc4j/src/org/mc4j/console/swing/graph AbstractGraphPanel.java,1.6,1.7

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing/graph
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6737/src/org/mc4j/console/swing/graph

Modified Files:
	AbstractGraphPanel.java 
Log Message:
A new Logarithmic version of JSlider, plus one that deals in time to make the sleep delay in the graph popup easier to use.

Index: AbstractGraphPanel.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing/graph/AbstractGraphPanel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AbstractGraphPanel.java	8 Apr 2004 20:32:17 -0000	1.6
--- AbstractGraphPanel.java	16 Apr 2004 18:49:38 -0000	1.7
***************
*** 20,58 ****
  package org.mc4j.console.swing.graph;
  
- import java.awt.BorderLayout;
- import java.awt.Color;
- import java.awt.Dimension;
- import java.awt.FlowLayout;
- import java.awt.Font;
- import java.awt.event.ActionEvent;
- import java.awt.event.ActionListener;
- import java.awt.event.WindowAdapter;
- import java.awt.event.WindowEvent;
- import java.util.Calendar;
- import java.util.Date;
- import java.util.GregorianCalendar;
- import java.util.HashMap;
- import java.util.Map;
- import java.util.Timer;
- import java.util.TimerTask;
- 
- import javax.swing.BorderFactory;
- import javax.swing.BoxLayout;
- import javax.swing.ButtonGroup;
- import javax.swing.Icon;
- import javax.swing.ImageIcon;
- import javax.swing.JCheckBox;
- import javax.swing.JFrame;
- import javax.swing.JPanel;
- import javax.swing.JPopupMenu;
- import javax.swing.JRadioButton;
- import javax.swing.JSlider;
- import javax.swing.SwingUtilities;
- import javax.swing.border.LineBorder;
- 
- import org.openide.windows.TopComponent;
- 
- import org.mc4j.console.dashboard.components.RefreshControlComponent;
- 
  import org.jfree.chart.ChartPanel;
  import org.jfree.chart.JFreeChart;
--- 20,23 ----
***************
*** 67,70 ****
--- 32,51 ----
  import org.jfree.data.time.TimeSeriesCollection;
  
+ import org.openide.windows.TopComponent;
+ 
+ import org.mc4j.console.dashboard.components.RefreshControlComponent;
+ import org.mc4j.console.swing.LogarithmicTimeJSlider;
+ 
+ import java.awt.*;
+ import java.awt.event.ActionEvent;
+ import java.awt.event.ActionListener;
+ import java.awt.event.WindowAdapter;
+ import java.awt.event.WindowEvent;
+ import java.util.*;
+ import java.util.Timer;
+ 
+ import javax.swing.*;
+ import javax.swing.border.LineBorder;
+ 
  /**
   * This is an abstract base class for dynamic, running Graphs in MC4J. This
***************
*** 101,105 ****
      private JRadioButton jRadioTimeMinutes;
      private JRadioButton jRadioTimeSeconds;
!     protected JSlider sleepSlider;
  
  
--- 82,87 ----
      private JRadioButton jRadioTimeMinutes;
      private JRadioButton jRadioTimeSeconds;
!     protected LogarithmicTimeJSlider sleepSlider;
!     protected JLabel sleepDelay;
  
  
***************
*** 248,252 ****
  
          if (this.dataGeneratorTimerTask != null) {
!             this.dataGeneratorTimerTask.cancel();
          }
  
--- 230,236 ----
  
          if (this.dataGeneratorTimerTask != null) {
!             try {
!                 this.dataGeneratorTimerTask.cancel();
!             } catch(Exception e)  { e.printStackTrace();}
          }
  
***************
*** 336,342 ****
          //     ***************** * * * * * * * * *   *   *   *   *
          if (this.jRadioTimeMinutes.isSelected()) {
-             sleepSlider.setValue(5000);
-         } else if (this.jRadioTimeHours.isSelected()) {
              sleepSlider.setValue(10000);
          }
  
--- 320,326 ----
          //     ***************** * * * * * * * * *   *   *   *   *
          if (this.jRadioTimeMinutes.isSelected()) {
              sleepSlider.setValue(10000);
+         } else if (this.jRadioTimeHours.isSelected()) {
+             sleepSlider.setValue(100000);
          }
  
***************
*** 403,417 ****
          updateSpeedPanel.setBorder(BorderFactory.createTitledBorder("Update Speed"));
  
!         sleepSlider = new javax.swing.JSlider(100,10000,1000);
!         sleepSlider.setPaintLabels(true);
          sleepSlider.setPaintTicks(true);
!         sleepSlider.setMinorTickSpacing(500);
!         sleepSlider.setMajorTickSpacing(2000);
!         sleepSlider.setToolTipText("Milleseconds between updates");
          sleepSlider.setOpaque(false);
  
          sleepSlider.addChangeListener(new javax.swing.event.ChangeListener() {
              public void stateChanged(javax.swing.event.ChangeEvent evt) {
                  sleepSliderPropertyChange(null);
              }
          });
--- 387,412 ----
          updateSpeedPanel.setBorder(BorderFactory.createTitledBorder("Update Speed"));
  
!         //sleepSlider = new javax.swing.JSlider(100,10000,1000);
!         //sleepSlider.setPaintLabels(true);
!         //sleepSlider.setPaintTicks(true);
!         //sleepSlider.setMinorTickSpacing(500);
!         //sleepSlider.setMajorTickSpacing(2000);
! 
!         sleepSlider = new LogarithmicTimeJSlider(100, 100000, 1000);
! 
          sleepSlider.setPaintTicks(true);
!         sleepSlider.setPaintLabels(true);
!         sleepSlider.setMajorTickSpacing(10);
!         sleepSlider.setMinorTickSpacing(10);
! 
!         sleepSlider.setToolTipText("Time between updates");
          sleepSlider.setOpaque(false);
  
+         sleepDelay = new JLabel("Delay: " + sleepSlider.getTime());
+ 
          sleepSlider.addChangeListener(new javax.swing.event.ChangeListener() {
              public void stateChanged(javax.swing.event.ChangeEvent evt) {
                  sleepSliderPropertyChange(null);
+                 sleepDelay.setText("Delay: " + sleepSlider.getTime());
              }
          });
***************
*** 419,422 ****
--- 414,418 ----
  
          updateSpeedPanel.add(sleepSlider);
+         updateSpeedPanel.add(sleepDelay);
  
          jRadioButtonScaleLinear.addChangeListener(new javax.swing.event.ChangeListener() {
***************
*** 481,485 ****
                      name,
                      Millisecond.class);
!         ts.setHistoryCount(17280000); // 48 hours
          this.timeSeriesMap.put(key, ts);
          dataset.addSeries(ts);
--- 477,481 ----
                      name,
                      Millisecond.class);
!         ts.setHistoryCount(1728000); // 48 hours at 100 seconds
          this.timeSeriesMap.put(key, ts);
          dataset.addSeries(ts);