Changeset 26052

Timestamp:

12/07/08 20:42:24 (4 years ago)

Author:

hirobe

Message:

start,endオプションを有効にした
y軸の最小値を0に固定、単位を整数に変更。
タイムゾーンによるx軸のずれを補正。
週表示の場合にx軸の最小単位を7日に変更。

Location:

platform/trac/plugins/querychart/trunk/querychart

Files:

• htdocs/js/querychart.js (modified) (4 diffs)
• macro.py (modified) (6 diffs)

platform/trac/plugins/querychart/trunk/querychart/htdocs/js/querychart.js

@@ -5 +5 @@
 var opt_upper = $("#querychartopt_"+idstr+" .upper").text().toLowerCase();
 var opt_per = $("#querychartopt_"+idstr+" .per").text().toLowerCase();
+var tzoffset = (new Date()).getTimezoneOffset()*60*1000;
 
 var datas = [];
@@ -15 +16 @@
     a = $(this).text(); break;
   case 1:
-    b = new Date($(this).text()).getTime(); break;
+    b = new Date($(this).text()).getTime()-tzoffset; break;
   default:
     c = $(this).text();
@@ -38 +39 @@
 
 var posit = opt_upper == "true" ? "se" : "ne";
+var x_minTickSize = opt_per == "week" ? [7,"day"] : [1,"day"];
 
 function showTooltip(x, y, contents){
@@ -57 +59 @@
   lines: { show: true },
   points: { show: true },
-  xaxis: { mode: "time", timeformat: "%y/%m/%d" },
+  xaxis: { mode: "time", timeformat: "%y/%m/%d", minTickSize: x_minTickSize },
+  yaxis: { min: 0, tickDecimals: 0,autoscaleMargin: 0.05 },
   grid: { hoverable: true, clickable: false }
 });

platform/trac/plugins/querychart/trunk/querychart/macro.py

@@ -112 +112 @@
 
     def _make_data(self,req,opts):
-        arg_x_min = opts['min']
-        arg_x_max = opts['max']
+        arg_x_min = opts['start']
+        arg_x_max = opts['end']
         per = opts['per']
         query_str = opts['query']
@@ -163 +163 @@
             return None#'''No data to output.'''
 
-        x_min = min(edgedays)
-        x_max = max(edgedays)
-
+        x_min = arg_x_min or min(edgedays)
+        x_max = arg_x_max or max(edgedays)
+        x_min = datetime(x_min.year,x_min.month,x_min.day,tzinfo=x_min.tzinfo)
+        x_max = datetime(x_max.year,x_max.month,x_max.day,tzinfo=x_max.tzinfo)
 
         if per=='week':
@@ -179 +180 @@
         for daylist,dayids in daylists:
             for x in x_axis:
+                
                 count = len([1 for c in daylist if c <= x])
                 #ids = [dayids[c] for c in daylist if c <= x and c>last_x ]
@@ -187 +189 @@
             linenum += 1
 
-        x_min = arg_x_min or x_min
-        x_max = arg_x_max or x_max
 
         return {'x_axis':x_axis,
@@ -213 +213 @@
                'width':'536',
                'height':'300',
-               'max':None,
-               'min':None,
+               'end':None,
+               'start':None,
                'query':'',
                'col':[],
@@ -245 +245 @@
                             break
 
-            elif key in ['max','min']:
+            elif key in ['start','end']:
                 opts[key]= parse_date(value)
             else: