[Jrobin-commits] src/org/jrobin/graph TimeGrid.java,1.3,1.4

[Sasa M. <sa...@us...>]

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

Modified Files:
	TimeGrid.java 
Log Message:
Major RRDInspector changes:
- archived values are editable
- archived values can be plotted 
- multiple RRDs/plots can be open

Index: TimeGrid.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/graph/TimeGrid.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TimeGrid.java	21 Apr 2004 09:49:01 -0000	1.3
--- TimeGrid.java	27 Aug 2004 09:42:42 -0000	1.4
***************
*** 146,154 ****
  		}
  		else if ( days <= 157 ) {
! 			tAxis = new TimeAxisUnit( TimeAxisUnit.WEEK, 1, TimeAxisUnit.WEEK, 1, new SimpleDateFormat("ww"), true, firstDayOfWeek );
  		}
! 		else {
  			tAxis = new TimeAxisUnit( TimeAxisUnit.MONTH, 1, TimeAxisUnit.MONTH, 1, new SimpleDateFormat("MMM"), true, firstDayOfWeek );
  		}
  	}
  }
--- 146,160 ----
  		}
  		else if ( days <= 157 ) {
! 			tAxis = new TimeAxisUnit( TimeAxisUnit.WEEK, 1, TimeAxisUnit.WEEK, 1, new SimpleDateFormat("'wk'ww"), true, firstDayOfWeek );
  		}
! 		else if ( days <= 370 ) {
  			tAxis = new TimeAxisUnit( TimeAxisUnit.MONTH, 1, TimeAxisUnit.MONTH, 1, new SimpleDateFormat("MMM"), true, firstDayOfWeek );
  		}
+ 		else if ( days <= 735 ) {
+ 			tAxis = new TimeAxisUnit( TimeAxisUnit.MONTH, 1, TimeAxisUnit.MONTH, 1, new SimpleDateFormat("MM"), true, firstDayOfWeek );
+ 		}
+ 		else {
+ 			tAxis = new TimeAxisUnit( TimeAxisUnit.MONTH, 1, TimeAxisUnit.YEAR, 1, new SimpleDateFormat("yyyy"), true, firstDayOfWeek );
+ 		}
  	}
  }