Changeset 82648 in vbox for trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphgooglechart.py

Timestamp:

Dec 23, 2019 8:53:40 PM (5 years ago)

Author:

vboxsync

Message:

TestManager/wuihlpgraphgooglechart.py++: Bar graph invertion and other tweaks.

File:

• trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphgooglechart.py (modified) (5 diffs)

trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphgooglechart.py

@@ -53 +53 @@
         self.fpMax = None;
         self.fpMin = 0.0;
+        self.fYInverted = False;
 
     def setRangeMax(self, fpMax):
@@ -59 +60 @@
         return None;
 
+    def invertYDirection(self):
+        """ Inverts the direction of the Y-axis direction. """
+        self.fYInverted = True;
+        return None;
+
     def renderGraph(self):
         aoTable = self._oData.aoTable; # type: WuiHlpGraphDataTable
+
+        # Seems material (google.charts.Bar) cannot change the direction on the Y-axis,
+        # so we cannot get bars growing downwards from the top like we want for the
+        # reports.  The classic charts OTOH cannot put X-axis labels on the top, but
+        # we just drop them all together instead, saving a little space.
+        fUseMaterial = False;
 
         # Unique on load function.
@@ -81 +93 @@
                  '             "title": "%s",\n' \
                  '         },\n' \
-                 '    };\n' \
+                 '         "vAxis": {\n' \
+                 '             "direction": %s,\n' \
+                 '         },\n' \
                 % ( iGraph,
                     iGraph,
                     webutils.escapeAttrJavaScriptStringDQ(self._sTitle) if self._sTitle is not None else '',
                     webutils.escapeAttrJavaScriptStringDQ(aoTable[0].sName) if aoTable and aoTable[0].sName else '',
+                    '-1' if self.fYInverted else '1',
                   );
+        if fUseMaterial and self.fYInverted:
+            sHtml +=  '        "axes": { "x": { 0: { "side": "top" } }, "y": { "0": { "direction": -1, }, }, },\n';
+        sHtml += '    };\n';
 
         # The data.
@@ -104 +122 @@
             sHtml += '    oData.addRows([\n';
             for oRow in aoTable[1:]:
-                sRow = '        [ "%s"' % (webutils.escapeAttrJavaScriptStringDQ(oRow.sName),);
+                if oRow.sName:
+                    sRow = '        [ "%s"' % (webutils.escapeAttrJavaScriptStringDQ(oRow.sName),);
+                else:
+                    sRow = '        [ null';
                 for iValue, oValue in enumerate(oRow.aoValues):
                     if not utils.isString(oValue):
@@ -129 +150 @@
 
         # Create and draw.
-        sHtml += '    oGraph = new google.visualization.ColumnChart(document.getElementById("%s"));\n' \
-                 '    oGraph.draw(oData, dGraphOptions);\n' \
-               % ( self._sId, );
+        if not fUseMaterial:
+            sHtml += '    oGraph = new google.visualization.ColumnChart(document.getElementById("%s"));\n' \
+                     '    oGraph.draw(oData, dGraphOptions);\n' \
+                   % ( self._sId, );
+        else:
+            sHtml += '    oGraph = new google.charts.Bar(document.getElementById("%s"));\n' \
+                     '    oGraph.draw(oData, google.charts.Bar.convertOptions(dGraphOptions));\n' \
+                   % ( self._sId, );
 
         # clean and return.