[Jrobin-commits] src/org/jrobin/graph FetchSource.java,1.9,1.10 PlotDef.java,1.5,1.6 RrdExporter.java,1.5,1.6 Source.java,1.11,1.12 ValueExtractor.java,1.3,1.4 ValueGrid.java,1.12,1.13

[Arne V. <cob...@us...>]

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

Modified Files:
	FetchSource.java PlotDef.java RrdExporter.java Source.java 
	ValueExtractor.java ValueGrid.java 
Log Message:
JRobin 1.4.0
- Bug fixes graphing
- Demo tweaks

Index: ValueExtractor.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/ValueExtractor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ValueExtractor.java	9 Jul 2004 12:22:15 -0000	1.3
--- ValueExtractor.java	25 Jul 2004 12:28:49 -0000	1.4
***************
*** 77,81 ****
  				dsValues[i]		= values[i].getValues();
  
! 				if ( timestamps[i].length > 2 )
  					steps[i] = (timestamps[i][1] - timestamps[i][0]);
  			}
--- 77,81 ----
  				dsValues[i]		= values[i].getValues();
  
! 				if ( timestamps[i].length >= 2 )
  					steps[i] = (timestamps[i][1] - timestamps[i][0]);
  			}
***************
*** 96,100 ****
--- 96,102 ----
  			{
  				for (int x = 0; x < dsValues[i].length; x++)
+ 				{
  					sources[tblPos++].setFetchedStep( steps[i] );
+ 				}
  			}
  		}

Index: ValueGrid.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/ValueGrid.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ValueGrid.java	20 Jul 2004 17:01:41 -0000	1.12
--- ValueGrid.java	25 Jul 2004 12:28:49 -0000	1.13
***************
*** 82,86 ****
  		{
  			baseValue			= base;
! 			
  			double tmp 			= 1;
  			for (int i = 1; i < 7; i++) {
--- 82,86 ----
  		{
  			baseValue			= base;
! 
  			double tmp 			= 1;
  			for (int i = 1; i < 7; i++) {

Index: RrdExporter.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdExporter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RrdExporter.java	19 Jul 2004 21:12:27 -0000	1.5
--- RrdExporter.java	25 Jul 2004 12:28:49 -0000	1.6
***************
*** 285,289 ****
  
  			vEndTime				+= minStep;
! 			numRows					= (int) ((vEndTime - vStartTime) / minStep) + 1;
  		}
  
--- 285,289 ----
  
  			vEndTime				+= minStep;
! 			numRows					= reducedNumRows; //(int) ((vEndTime - vStartTime) / minStep) + 1;
  		}
  

Index: Source.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/Source.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Source.java	11 Jul 2004 22:04:14 -0000	1.11
--- Source.java	25 Jul 2004 12:28:49 -0000	1.12
***************
*** 95,100 ****
  	}
  
! 	void setFetchedStep( long step )
! 	{
  		this.step = step;
  	}
--- 95,99 ----
  	}
  
! 	void setFetchedStep( long step ) {
  		this.step = step;
  	}

Index: FetchSource.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/FetchSource.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FetchSource.java	9 Jul 2004 12:22:15 -0000	1.9
--- FetchSource.java	25 Jul 2004 12:28:49 -0000	1.10
***************
*** 196,202 ****
  				
  				// Fetch datasources
! 				FetchRequest request 		= rrd.createFetchRequest( cfNames[i], startTime, endTime + rrdStep, resolution );
! 				long arcStep				= rrd.findMatchingArchive( request ).getArcStep();
! 				request						= rrd.createFetchRequest( cfNames[i], startTime, endTime + arcStep, resolution );
  				request.setFilter( dsNames );
  
--- 196,200 ----
  				
  				// Fetch datasources
! 				FetchRequest request		= rrd.createFetchRequest( cfNames[i], startTime, endTime, resolution );
  				request.setFilter( dsNames );
  

Index: PlotDef.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/PlotDef.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PlotDef.java	9 Jul 2004 12:22:15 -0000	1.5
--- PlotDef.java	25 Jul 2004 12:28:49 -0000	1.6
***************
*** 133,137 ****
  	double getValue( int tblPos, long[] timestamps )
  	{
! 		return source.values[tblPos];	
  	}
  	
--- 133,137 ----
  	double getValue( int tblPos, long[] timestamps )
  	{
! 		return source.get( tblPos );	
  	}