Changeset 11196 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/App_Code

Timestamp:

07/16/14 15:00:49 (10 years ago)

Author:

mroscoe

Message:

 

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/App_Code/ChartHelper.cshtml (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/App_Code/ChartHelper.cshtml

@@ -36 +36 @@
 }
 
-@helper LineChartTime(string destinationTag, string url, string title = "", double? minY = null, double? maxY = null, string axisYFormat = null)
-{
-    <script>
-        var @(destinationTag)Plot = $.jqplot("@destinationTag", "@url", {
-            title: "@title",
-            highlighter: {
-                show: true,
-                sizeAdjust: 7.5
-            },
-            seriesDefaults: {
-                markerOptions: { show: false }
-            },
-            dataRenderer: ajaxDataRenderer,
-            axes: {
-                xaxis: {
-                    renderer: $.jqplot.DateAxisRenderer,
-                    pad: 0
-                },
-                yaxis: {
-                    @if (axisYFormat != null)
-                    {<text>
-                    tickOptions: {
-                        formatString: "@axisYFormat",
-                    },
-                    </text>}
-                    autoscale: true,
-                    pad: 0,
-                    @if (minY != null)
-                    {
-                        @:min: @minY,
-                    }
-                    @if (maxY != null)
-                    {
-                        @:max: @maxY,
-                    }
-                },
-            },
-            gridPadding: { left: 50, right: 10 },
-            cursor: {
-                show: true,
-                showTooltip: false,
-                zoom: true,
-                clickReset: false,
-                dblClickReset: false,
-                constrainZoomTo: 'x'
-            }
-        });
+@helper LineChartTime(string destinationTag, string url, string title = "", double? minY = null, double? maxY = null, string axisYFormat = null) {
+  <script>
+    var @(destinationTag)Plot = $.jqplot("@destinationTag", "@url", {
+      title: "@title",
+      highlighter: {
+        show: true,
+        sizeAdjust: 7.5
+      },
+      seriesDefaults: {
+        markerOptions: { show: false }
+      },
+      dataRenderer: ajaxDataRenderer,
+      axes: {
+        xaxis: {
+          renderer: $.jqplot.DateAxisRenderer,
+          pad: 0
+        },
+        yaxis: {
+          @if (axisYFormat != null)
+          {<text>
+          tickOptions: {
+            formatString: "@axisYFormat",
+          },
+          </text>}
+          autoscale: true,
+          pad: 0,
+          @if (minY != null)
+          {
+            @:min: @minY,
+          }
+          @if (maxY != null)
+          {
+            @:max: @maxY,
+          }
+        },
+      },
+      gridPadding: { left: 50, right: 10 },
+      cursor: {
+        show: true,
+        showTooltip: false,
+        zoom: true,
+        clickReset: false,
+        dblClickReset: false,
+        constrainZoomTo: 'x'
+      }
+    });
         
-        $(window).resize(function() {
-            @(destinationTag)Plot.replot({ resetAxes: true });
-        });
-    </script>
-}
-
-@helper RefreshChart(string destinationTag, string url, string startDate, string endDate)
-{
+    $(window).resize(function() {
+      @(destinationTag)Plot.replot({ resetAxes: true });
+    });
+  </script>
+}
+
+@helper RefreshChart(string destinationTag, string url, string startDate, string endDate, double? minY=null, double? maxY=null) {
   <text>
   $.ajax({url: "@(new HtmlString(url))?start=" + @startDate + "&end=" + @endDate, datatype: "json", success: function(result) {
@@ -97 +95 @@
       @(destinationTag)Plot.series[i].data = result[i];
     }
-    @(destinationTag)Plot.replot({ resetAxes: true })
+    //Resets only the xaxis, still need to resize y with given min/max
+    @(destinationTag)Plot.replot({resetAxes:true});
+    @if(minY != null) {
+      //If min Y was provided set the plot's min Y value
+      @:@(destinationTag)Plot.axes.yaxis.min = @minY;
+    }
+    @if(maxY != null) {
+      //If max Y was provided set the plot's max Y value
+      @:@(destinationTag)Plot.axes.yaxis.max = @maxY;
+    }
+    @(destinationTag)Plot.axes.yaxis.reset();
+    //A final replot to redraw possible new Y axis values
+    @(destinationTag)Plot.replot({resetAxes:['xaxis']});
+@*    @(destinationTag)Plot.replot({ resetAxes:true });*@
   }});
   </text>