[Jrobin-commits] src/org/jrobin/graph ExportData.java,1.6,1.7 RrdExporter.java,1.7,1.8 Source.java,1.13,1.14 ValueExtractor.java,1.5,1.6

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

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

Modified Files:
	ExportData.java RrdExporter.java Source.java 
	ValueExtractor.java 
Log Message:
JRobin 1.4.1
- Fixing bug #0000067
- Note: Importing of ExportData is broken in this commit!

Index: ValueExtractor.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/ValueExtractor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ValueExtractor.java	27 Oct 2004 20:36:26 -0000	1.5
--- ValueExtractor.java	28 Oct 2004 20:04:43 -0000	1.6
***************
*** 97,102 ****
  				for (int x = 0; x < dsValues[i].length; x++)
  				{
! 					sources[tblPos].setTimespan( startTime, endTime );
! 					sources[tblPos++].setFetchedStep( steps[i] );
  				}
  			}
--- 97,101 ----
  				for (int x = 0; x < dsValues[i].length; x++)
  				{
! 					sources[tblPos++].setFetchSettings( steps[i], startTime, endTime );
  				}
  			}

Index: ExportData.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/ExportData.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ExportData.java	21 Sep 2004 08:42:10 -0000	1.6
--- ExportData.java	28 Oct 2004 20:04:43 -0000	1.7
***************
*** 605,609 ****
  		{
  			sources[i] 			= new Def( dsNames[i], arraySize, arraySize );
! 			sources[i].setFetchedStep( step );
  		}
  
--- 605,610 ----
  		{
  			sources[i] 			= new Def( dsNames[i], arraySize, arraySize );
! 			System.err.println("jdsklfjsdkljfdss");
! 			//sources[i].setFetchedStep( step );
  		}
  

Index: Source.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/Source.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Source.java	27 Oct 2004 20:36:26 -0000	1.13
--- Source.java	28 Oct 2004 20:04:43 -0000	1.14
***************
*** 52,56 ****
  	private double min						= Double.NaN;
  	private double max						= Double.NaN;
- 	private double lastValue 				= Double.NaN;
  	private double totalValue				= 0;
  	private double nextValue				= Double.POSITIVE_INFINITY;
--- 52,55 ----
***************
*** 96,109 ****
  	}
  
! 	void setTimespan( long startTime, long endTime )
  	{
  		this.startTime	= startTime;
  		this.endTime	= endTime;
  	}
  
- 	void setFetchedStep( long step ) {
- 		this.step = step;
- 	}
- 
  	long getStep() {
  		return step;
--- 95,105 ----
  	}
  
! 	void setFetchSettings( long step, long startTime, long endTime )
  	{
+ 		this.step		= step;
  		this.startTime	= startTime;
  		this.endTime	= endTime;
  	}
  
  	long getStep() {
  		return step;
***************
*** 262,266 ****
  
  		lastTime	= ( time < startTime ? startTime : time );
- 		lastValue	= value;
  	}
  }
--- 258,261 ----

Index: RrdExporter.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/RrdExporter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RrdExporter.java	27 Oct 2004 20:36:26 -0000	1.7
--- RrdExporter.java	28 Oct 2004 20:04:43 -0000	1.8
***************
*** 292,296 ****
  		{
  			sources[tblPos] = new Def( edefList[i].getName(), numRows, reducedNumRows );
! 			sources[tblPos].setFetchedStep( edefList[i].getStep() );
  			sourceIndex.put( edefList[i].getName(), new Integer(tblPos++) );
  		}
--- 292,296 ----
  		{
  			sources[tblPos] = new Def( edefList[i].getName(), numRows, reducedNumRows );
! 			sources[tblPos].setFetchSettings( edefList[i].getStep(), startTime, endTime );
  			sourceIndex.put( edefList[i].getName(), new Integer(tblPos++) );
  		}
***************
*** 300,304 ****
  		{
  			pdefList[i].prepare( numRows, reducedNumRows );
! 			pdefList[i].setFetchedStep( minStep );
  
  			sources[tblPos] = pdefList[i];
--- 300,304 ----
  		{
  			pdefList[i].prepare( numRows, reducedNumRows );
! 			pdefList[i].setFetchSettings( minStep, startTime, endTime );
  
  			sources[tblPos] = pdefList[i];
***************
*** 313,317 ****
  		{
  			cdefList[i].prepare( sourceIndex, numRows, reducedNumRows );
! 			cdefList[i].setFetchedStep( minStep );
  
  			sources[tblPos]	= cdefList[i];
--- 313,317 ----
  		{
  			cdefList[i].prepare( sourceIndex, numRows, reducedNumRows );
! 			cdefList[i].setFetchSettings( minStep, startTime, endTime );
  
  			sources[tblPos]	= cdefList[i];
***************
*** 500,504 ****
  	{
  		Def src = new Def( origSrc.getName(), reducedNumRows, reducedNumRows );
! 		src.setFetchedStep( reducedStep );
  
  		for ( int i = 0; i < reducedNumRows; i++ )
--- 500,504 ----
  	{
  		Def src = new Def( origSrc.getName(), reducedNumRows, reducedNumRows );
! 		src.setFetchSettings( reducedStep, startTime, endTime );
  
  		for ( int i = 0; i < reducedNumRows; i++ )