Changeset 9644
- Timestamp:
- 06/19/13 12:50:42 (12 years ago)
- Location:
- branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/App_Code/ChartHelper.cshtml
r9643 r9644 53 53 xaxis: { 54 54 renderer: $.jqplot.DateAxisRenderer, 55 pad: 0 55 56 }, 56 57 yaxis: { … … 70 71 }, 71 72 }, 73 gridPadding: { left: 50, right: 10 }, 72 74 cursor: { 73 75 show: true, 74 76 showTooltip: false, 75 77 zoom: true, 76 looseZoom: true,77 78 clickReset: false, 78 79 dblClickReset: false, … … 81 82 }); 82 83 83 @(destinationTag)Plot.replot( {resetAxes:true});84 @(destinationTag)Plot.replot({ resetAxes: true }); 84 85 85 86 $('#@destinationTag').contextmenu(function() { 86 87 @(destinationTag)Plot.resetZoom(); 87 @(destinationTag)Plot.replot( {resetAxes: true});88 @(destinationTag)Plot.replot({ resetAxes: true }); 88 89 return false; 89 90 }); 90 91 91 92 $(window).resize(function() { 92 @(destinationTag)Plot.replot( {resetAxes: true});93 @(destinationTag)Plot.replot({ resetAxes: true }); 93 94 }); 94 95 </script> … … 100 101 @: @(destinationTag)Plot.series[i].data = result[i]; 101 102 @: } 102 @: @(destinationTag)Plot.replot( {resetAxes: true})103 @: @(destinationTag)Plot.replot({ resetAxes: true }) 103 104 @:}}); 104 105 } -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ChartDataController.cs
r9643 r9644 93 93 return selectors.Select(selector => 94 94 data.Select(x => new[] { 95 //timeSelector(x).ToString("yyyy-MM-dd HH:mm"), 96 timeSelector(x).ToUnixTimestamp(), 95 timeSelector(x).ToUniversalTime().ToUnixTimestamp(), 97 96 selector(x) 98 97 }) -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Scripts/jqPlot/plugins/jqplot.dateAxisRenderer.js
r9617 r9644 340 340 // ticks must be in order of increasing value. 341 341 342 min = ((this.min != null) ? new $.jsDate(this.min).getTime() : db.min);343 max = ((this.max != null) ? new $.jsDate(this.max).getTime() : db.max);342 min = new $.jsDate((this.min != null) ? this.min : db.min).getTime(); 343 max = new $.jsDate((this.max != null) ? this.max : db.max).getTime(); 344 344 345 345 // see if we're zooming. if we are, don't use the min and max we're given, … … 448 448 min = Math.floor(min/tempti) * tempti; 449 449 min = new $.jsDate(min); 450 min = min.getTime() + min.getUtcOffset();450 min = min.getTime(); 451 451 452 452 nttarget = Math.ceil((max - min) / tempti) + 1;
Note: See TracChangeset
for help on using the changeset viewer.