[Jrobin-commits] src/org/jrobin/inspector GraphFrame.java,1.1,1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/jrobin/src/org/jrobin/inspector
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8709/org/jrobin/inspector

Modified Files:
	GraphFrame.java 
Log Message:
major improvements on RrdInspector archive plot frame

Index: GraphFrame.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/inspector/GraphFrame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GraphFrame.java	31 Aug 2004 14:23:10 -0000	1.1
--- GraphFrame.java	18 Sep 2004 12:10:29 -0000	1.2
***************
*** 31,37 ****

  import javax.swing.*;
  import java.awt.*;
! import java.awt.event.WindowAdapter;
! import java.awt.event.WindowEvent;
  import java.io.IOException;
  import java.io.File;
--- 31,37 ----

  import javax.swing.*;
+ import javax.swing.filechooser.FileFilter;
  import java.awt.*;
! import java.awt.event.*;
  import java.io.IOException;
  import java.io.File;
***************
*** 40,50 ****
  class GraphFrame extends JFrame {
  	private static final Color COLOR = Color.RED;
! 	private static final int WIDTH = 350, HEIGHT = 200;

  	private GraphPanel graphPanel = new GraphPanel();
  	private RrdGraph rrdGraph;

! 	private String sourcePath, dsName, consolFun;
! 	private int dsIndex, arcIndex, arcSteps;
  	private long t1, t2;

--- 40,52 ----
  class GraphFrame extends JFrame {
  	private static final Color COLOR = Color.RED;
! 	private static final int WIDTH = 400, HEIGHT = 240;

+ 	private Color color = COLOR;
  	private GraphPanel graphPanel = new GraphPanel();
+ 	private JComboBox graphCombo = new JComboBox();
  	private RrdGraph rrdGraph;

! 	private String sourcePath, dsName;
! 	private int dsIndex, arcIndex;
  	private long t1, t2;

***************
*** 53,57 ****
  		this.dsIndex = dsIndex;
  		this.arcIndex = arcIndex;
! 		readRrdFile();
  		constructUI();
  		pack();
--- 55,60 ----
  		this.dsIndex = dsIndex;
  		this.arcIndex = arcIndex;
! 		createRrdGraph();
! 		fillGraphCombo();
  		constructUI();
  		pack();
***************
*** 60,64 ****
  	}

! 	private void readRrdFile() {
  		try {
  			RrdDb rrdDb = new RrdDb(sourcePath, true);
--- 63,67 ----
  	}

! 	private void createRrdGraph() {
  		try {
  			RrdDb rrdDb = new RrdDb(sourcePath, true);
***************
*** 67,72 ****
  			Robin robin = arc.getRobin(dsIndex);
  			dsName = ds.getDsName();
- 			consolFun = arc.getConsolFun();
- 			arcSteps = arc.getSteps();
  			t1 = arc.getStartTime();
  			t2 = arc.getEndTime();
--- 70,73 ----
***************
*** 78,89 ****
  			}
  			double[] values = robin.getValues();
  			rrdDb.close();
! 			RrdGraphDef def = new RrdGraphDef(t1, t2);
! 			// def.datasource(dsName, sourcePath, dsName, consolFun);
  			LinearInterpolator linearInterpolator = new LinearInterpolator(timestamps, values);
  			linearInterpolator.setInterpolationMethod(LinearInterpolator.INTERPOLATE_RIGHT);
! 			def.datasource(dsName, linearInterpolator);
! 			def.area(dsName, COLOR, dsName + "@r");
! 			rrdGraph = new RrdGraph(def);
  			rrdGraph.specifyImageSize(true);
  		} catch (IOException e) {
--- 79,94 ----
  			}
  			double[] values = robin.getValues();
+ 			RrdDef rrdDef = rrdDb.getRrdDef();
  			rrdDb.close();
! 			RrdGraphDef rrdGraphDef = new RrdGraphDef(t1, t2);
! 			rrdGraphDef.setTitle(rrdDef.getDsDefs()[dsIndex].dump() + " " +
! 				rrdDef.getArcDefs()[arcIndex].dump());
  			LinearInterpolator linearInterpolator = new LinearInterpolator(timestamps, values);
  			linearInterpolator.setInterpolationMethod(LinearInterpolator.INTERPOLATE_RIGHT);
! 			rrdGraphDef.datasource(dsName, linearInterpolator);
! 			rrdGraphDef.area(dsName, color, dsName + "@r");
! 			rrdGraphDef.comment("START: " + new Date(t1 * 1000L) + "@r");
! 			rrdGraphDef.comment("END: " + new Date(t2 * 1000L) + "@r");
! 			rrdGraph = new RrdGraph(rrdGraphDef);
  			rrdGraph.specifyImageSize(true);
  		} catch (IOException e) {
***************
*** 94,110 ****
  	}

  	private void constructUI() {
  		JPanel content = (JPanel) getContentPane();
! 		Box box = Box.createVerticalBox();
  		graphPanel.setPreferredSize(new Dimension(WIDTH, HEIGHT));
! 		box.add(graphPanel);
! 		box.add(Box.createVerticalStrut(3));
! 		String s1 = "START: " + t1 + " (" + new Date(t1 * 1000L) + ")";
! 		box.add(new JLabel(s1));
! 		String s2 = "END  : " + t2 + " (" + new Date(t2 * 1000L) + ")";
! 		box.add(new JLabel(s2));
! 		content.add(box);
! 		// finalize
! 		setTitle(new File(sourcePath).getName() + ":" + dsName + ":" + consolFun + ":" + arcSteps);
  		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
  		addWindowListener(new WindowAdapter() {
--- 99,156 ----
  	}

+ 	private void fillGraphCombo() {
+ 		try {
+ 			RrdDb rrdDb = new RrdDb(sourcePath, true);
+ 			RrdDef rrdDef = rrdDb.getRrdDef();
+ 			final DsDef[] dsDefs = rrdDef.getDsDefs();
+ 			final ArcDef[] arcDefs = rrdDef.getArcDefs();
+ 			GraphComboItem[] items = new GraphComboItem[rrdDef.getDsCount() * rrdDef.getArcCount()];
+ 			int selectedItem = -1;
+ 			for(int i = 0, k = 0; i <  rrdDef.getDsCount(); i++) {
+ 				for(int j = 0; j < rrdDef.getArcCount(); k++, j++) {
+ 					String description = dsDefs[i].dump() + " " + arcDefs[j].dump();
+ 					items[k] = new GraphComboItem(description, i, j);
+ 					if(i == dsIndex && j == arcIndex) {
+ 						selectedItem = k;
+ 					}
+ 				}
+ 			}
+ 			graphCombo.setModel(new DefaultComboBoxModel(items));
+ 			graphCombo.setSelectedIndex(selectedItem);
+ 		}
+ 		catch (IOException e) {
+ 			Util.error(this, e);
+ 		}
+ 		catch (RrdException e) {
+ 			Util.error(this, e);
+ 		}
+ 	}
+ 
  	private void constructUI() {
+ 		setTitle(new File(sourcePath).getName());
  		JPanel content = (JPanel) getContentPane();
! 		content.setLayout(new BorderLayout(3, 3));
! 		content.add(graphCombo, BorderLayout.NORTH);
  		graphPanel.setPreferredSize(new Dimension(WIDTH, HEIGHT));
! 		content.add(graphPanel, BorderLayout.CENTER);
! 		JPanel southPanel = new JPanel();
! 		southPanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
! 		JButton colorButton = new JButton("Change graph color");
! 		southPanel.add(colorButton);
! 		colorButton.addActionListener(new ActionListener() {
! 			public void actionPerformed(ActionEvent e) {
! 				changeColor();
! 			}
! 		});
! 		JButton saveButton = new JButton("Save graph");
! 		saveButton.addActionListener(new ActionListener() {
! 			public void actionPerformed(ActionEvent e) {
! 				saveGraph();
! 			}
! 		});
! 		southPanel.add(Box.createHorizontalStrut(3));
! 		southPanel.add(saveButton);
! 		content.add(southPanel, BorderLayout.SOUTH);
! 		// EVENT HANDLERS
  		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
  		addWindowListener(new WindowAdapter() {
***************
*** 113,116 ****
--- 159,173 ----
  			}
  		});
+ 		graphCombo.addItemListener(new ItemListener() {
+ 			public void itemStateChanged(ItemEvent e) {
+ 				if(e.getStateChange() == ItemEvent.SELECTED) {
+ 					GraphComboItem item = (GraphComboItem) e.getItem();
+ 					dsIndex = item.getDsIndex();
+ 					arcIndex = item.getArcIndex();
+ 					createRrdGraph();
+ 					graphPanel.repaint();
+ 				}
+ 			}
+ 		});
  	}

***************
*** 119,122 ****
--- 176,233 ----
  	}

+ 	private void changeColor() {
+ 		final JColorChooser picker = new JColorChooser(color);
+ 		ActionListener okListener = new ActionListener() {
+ 			public void actionPerformed(ActionEvent e) {
+ 				color = picker.getColor();
+ 				createRrdGraph();
+ 				graphPanel.repaint();
+ 			}
+ 		};
+ 		JColorChooser.createDialog(this, "Select color", true, picker, okListener, null).show();
+ 	}
+ 
+ 	private void saveGraph() {
+ 		JFileChooser chooser = new JFileChooser();
+ 		FileFilter filter = new FileFilter() {
+ 			public boolean accept(File f) {
+ 				return f.isDirectory()? true:
+ 					f.getAbsolutePath().toLowerCase().endsWith(".png");
+ 			}
+ 			public String getDescription() {
+ 				return "PNG images";
+ 			}
+ 		};
+ 		chooser.setFileFilter(filter);
+ 		int returnVal = chooser.showSaveDialog(this);
+ 		if(returnVal == JFileChooser.APPROVE_OPTION) {
+ 			try {
+ 				File selectedFile = chooser.getSelectedFile();
+ 				String path = selectedFile.getAbsolutePath();
+ 				if(!path.toLowerCase().endsWith(".png")) {
+ 					path += ".png";
+ 					selectedFile = new File(path);
+ 				}
+ 				if(selectedFile.exists()) {
+ 					// ask user to overwrite
+ 					String message = "File [" + selectedFile.getName() +
+ 						"] already exists. Do you want to overwrite it?";
+                     int answer = JOptionPane.showConfirmDialog(this,
+ 						message, "File exists", JOptionPane.YES_NO_OPTION);
+ 					if(answer == JOptionPane.NO_OPTION) {
+ 						return;
+ 					}
+ 				}
+ 				rrdGraph.saveAsPNG(selectedFile.getAbsolutePath(),
+ 						graphPanel.getWidth(), graphPanel.getHeight());
+ 			} catch (IOException e) {
+ 				Util.error(this, "Could not save graph to file:\n" + e);
+ 			}
+ 			catch (RrdException e) {
+ 				Util.error(this, "Could not save graph to file:\n" + e);
+ 			}
+ 		}
+ 	}
+ 
  	class GraphPanel extends JPanel {
  		public void paintComponent(Graphics g) {
***************
*** 130,132 ****
--- 241,266 ----
  		}
  	}
+ 
+ 	class GraphComboItem {
+ 		private String description;
+ 		private int dsIndex, arcIndex;
+ 
+ 		GraphComboItem(String description, int dsIndex, int arcIndex) {
+ 			this.description = description;
+ 			this.dsIndex = dsIndex;
+ 			this.arcIndex = arcIndex;
+ 		}
+ 
+ 		public String toString() {
+ 			return description;
+ 		}
+ 
+ 		int getDsIndex() {
+ 			return dsIndex;
+ 		}
+ 
+ 		int getArcIndex() {
+ 			return arcIndex;
+ 		}
+ 	}
  }