[Tail-cvs] Tail/src/java/net/sf/tail/graphics CriteriaChart.java, 1.4 CriteriaDataset.java, 1.3

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

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

Modified Files:
	CriteriaChart.java CriteriaDataset.java 
Log Message:
refatoracao do jumpleft e jumpright

Index: CriteriaDataset.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/CriteriaDataset.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CriteriaDataset.java	22 Oct 2007 20:11:53 -0000	1.2
--- CriteriaDataset.java	22 Oct 2007 22:36:31 -0000	1.3
***************
*** 88,114 ****
  	}
  
- 	public void moveRight() {
  
  		if (lastIndex + 1 < series.getSize()) {
! 			lastIndex++;
! 			for (Report report : reports) {
! 				data.addValue(report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(lastIndex)), report.getName(), series.getTick(lastIndex).getDate()
! 						.toString("hh:mm d/M/yyyy"));
  			}
  
  			if (data.getColumnCount() >= DATASET_SIZE) {
! 				firstIndex++;
! 				data.removeColumn(0);
  			}
  			fireDatasetChanged();
  		}
  	}
  
! 	public void moveLeft() {
  		if (firstIndex > 1) {
! 			firstIndex--;
! 			lastIndex--;
  
  			loadValues(firstIndex, lastIndex);
  
  			fireDatasetChanged();
--- 88,133 ----
  	}
  
  
+ 	public void moveRight(int size) {
  		if (lastIndex + 1 < series.getSize()) {
! 			int steps = series.getSize() - lastIndex - 1;
! 			if (steps > size)
! 			{
! 				steps = size;
! 			}
! 			
! 			for (int i = 0; i < steps; i++)
! 			{
! 				lastIndex ++;
! 				for (Report report : reports) {
! 					data.addValue(report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(lastIndex)), report.getName(), series.getTick(lastIndex).getDate()
! 							.toString("hh:mm d/M/yyyy"));
! 				}
  			}
  
  			if (data.getColumnCount() >= DATASET_SIZE) {
! 				firstIndex += steps;
! 				for (int i = 0; i < steps; i++)
! 				{
! 					data.removeColumn(0);
! 				}
  			}
+ 			
  			fireDatasetChanged();
  		}
  	}
  
! 	public void moveLeft(int size) {
  		if (firstIndex > 1) {
! 			int steps = firstIndex - 1;
! 			if (steps > size)
! 			{
! 				steps = size;
! 			}
! 			firstIndex -= steps;
! 			lastIndex -= steps;
  
  			loadValues(firstIndex, lastIndex);
+ 			
  
  			fireDatasetChanged();

Index: CriteriaChart.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/CriteriaChart.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CriteriaChart.java	22 Oct 2007 21:45:04 -0000	1.3
--- CriteriaChart.java	22 Oct 2007 22:36:31 -0000	1.4
***************
*** 52,56 ****
  
  		// Setando tamanho do label de cada tick
! 		categoryAxis.setTickLabelFont(new Font("SansSerif", 0, 10));
  
  		if(dateText) {
--- 52,56 ----
  
  		// Setando tamanho do label de cada tick
! 		categoryAxis.setTickLabelFont(new Font("SansSerif", 0, 8));
  
  		if(dateText) {