tail-cvs

[Carlos <ma...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/graphics
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20349/src/java/net/sf/tail/graphics

Modified Files:
	CriteriaChart.java SeriesDataset.java CriteriaDataset.java 
	SeriesChart.java 
Log Message:
Update denovo... TailS quase 100%... gogogo...

Index: CriteriaDataset.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/CriteriaDataset.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CriteriaDataset.java	17 Oct 2007 19:06:39 -0000	1.1
--- CriteriaDataset.java	22 Oct 2007 20:11:53 -0000	1.2
***************
*** 106,110 ****
  
  	public void moveLeft() {
! 		if (firstIndex > 0) {
  			firstIndex--;
  			lastIndex--;
--- 106,110 ----
  
  	public void moveLeft() {
! 		if (firstIndex > 1) {
  			firstIndex--;
  			lastIndex--;

Index: CriteriaChart.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/CriteriaChart.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CriteriaChart.java	17 Oct 2007 19:06:39 -0000	1.1
--- CriteriaChart.java	22 Oct 2007 20:11:53 -0000	1.2
***************
*** 9,12 ****
--- 9,13 ----
  import org.jfree.chart.JFreeChart;
  import org.jfree.chart.axis.CategoryAxis;
+ import org.jfree.chart.axis.CategoryLabelPositions;
  import org.jfree.chart.axis.NumberAxis;
  import org.jfree.chart.plot.CategoryPlot;
***************
*** 31,35 ****
  	}
  
! 	public JFreeChart createChart(String chartName) {
  		JFreeChart jfreechart = ChartFactory.createLineChart(chartName, "Date", "Value", dataSet,
  				PlotOrientation.VERTICAL, true, true, false);
--- 32,36 ----
  	}
  
! 	public JFreeChart createChart(String chartName, boolean dateText) {
  		JFreeChart jfreechart = ChartFactory.createLineChart(chartName, "Date", "Value", dataSet,
  				PlotOrientation.VERTICAL, true, true, false);
***************
*** 40,45 ****
  		// Setando labels em 90 graus
  		CategoryAxis categoryAxis = plot.getDomainAxis();
! 		categoryAxis.setVisible(false);
! //		categoryAxis.setCategoryLabelPositions(CategoryLabelPositions.DOWN_90);
  
  		// Setando tamanho do grafico
--- 41,46 ----
  		// Setando labels em 90 graus
  		CategoryAxis categoryAxis = plot.getDomainAxis();
! 		categoryAxis.setVisible(dateText);
! 		categoryAxis.setCategoryLabelPositions(CategoryLabelPositions.DOWN_90);
  
  		// Setando tamanho do grafico

Index: SeriesChart.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/SeriesChart.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SeriesChart.java	10 Oct 2007 23:10:36 -0000	1.4
--- SeriesChart.java	22 Oct 2007 20:11:53 -0000	1.5
***************
*** 9,12 ****
--- 9,13 ----
  import org.jfree.chart.JFreeChart;
  import org.jfree.chart.axis.CategoryAxis;
+ import org.jfree.chart.axis.CategoryLabelPositions;
  import org.jfree.chart.axis.NumberAxis;
  import org.jfree.chart.plot.CategoryPlot;
***************
*** 31,35 ****
  	}
  
! 	public JFreeChart createChart(String chartName) {
  		JFreeChart jfreechart = ChartFactory.createLineChart(chartName, "Date", "Value", dataSet,
  				PlotOrientation.VERTICAL, true, true, false);
--- 32,36 ----
  	}
  
! 	public JFreeChart createChart(String chartName, boolean dateText) {
  		JFreeChart jfreechart = ChartFactory.createLineChart(chartName, "Date", "Value", dataSet,
  				PlotOrientation.VERTICAL, true, true, false);
***************
*** 40,45 ****
  		// Setando labels em 90 graus
  		CategoryAxis categoryAxis = plot.getDomainAxis();
! 		categoryAxis.setVisible(false);
! //		categoryAxis.setCategoryLabelPositions(CategoryLabelPositions.DOWN_90);
  
  		// Setando tamanho do grafico
--- 41,46 ----
  		// Setando labels em 90 graus
  		CategoryAxis categoryAxis = plot.getDomainAxis();
! 		categoryAxis.setVisible(dateText);
! 		categoryAxis.setCategoryLabelPositions(CategoryLabelPositions.DOWN_90);
  
  		// Setando tamanho do grafico

Index: SeriesDataset.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/SeriesDataset.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SeriesDataset.java	22 Oct 2007 18:10:50 -0000	1.10
--- SeriesDataset.java	22 Oct 2007 20:11:53 -0000	1.11
***************
*** 2,5 ****
--- 2,6 ----
  package net.sf.tail.graphics;
  
+ import java.util.ArrayList;
  import java.util.List;
  
***************
*** 42,45 ****
--- 43,47 ----
  		this.series = series;
  		this.DATASET_SIZE = lastIndex - firstIndex + 1;
+ 		this.trades = new ArrayList<Trade>();
  
  		loadValues(firstIndex, lastIndex);
***************
*** 135,139 ****
  			lastIndex++;
  			for (Indicator<? extends Number> indicator : indicators) {
! 				data.addValue(indicator.getValue(lastIndex), indicator.getName(), series.getTick(lastIndex).getDate()
  						.toString("hh:mm d/M/yyyy"));
  			}
--- 137,141 ----
  			lastIndex++;
  			for (Indicator<? extends Number> indicator : indicators) {
! 				data.addValue(indicator.getValue(lastIndex), indicator.getName() + ": "+ series.getTick(series.getBegin()).getDateName() + " - " + series.getTick(series.getEnd()).getDateName(), series.getTick(lastIndex).getDate()
  						.toString("hh:mm d/M/yyyy"));
  			}
***************
*** 143,147 ****
  				data.removeColumn(0);
  			}
! 			loadTrade(firstIndex, lastIndex);
  			fireDatasetChanged();
  
--- 145,152 ----
  				data.removeColumn(0);
  			}
! 			if(trades.size() > 0)
! 			{
! 				loadTrade(firstIndex, lastIndex);
! 			}
  			fireDatasetChanged();
  
***************
*** 150,159 ****
  
  	public void moveLeft() {
! 		if (firstIndex > 0) {
  			firstIndex--;
  			lastIndex--;
  
  			loadValues(firstIndex, lastIndex);
! 			loadTrade(firstIndex, lastIndex);
  
  			fireDatasetChanged();
--- 155,167 ----
  
  	public void moveLeft() {
! 		if (firstIndex > 1) {
  			firstIndex--;
  			lastIndex--;
  
  			loadValues(firstIndex, lastIndex);
! 			if(trades.size() > 0)
! 			{
! 				loadTrade(firstIndex, lastIndex);
! 			}
  
  			fireDatasetChanged();