Graphfixes (#84)

* If we have a a line graph, we need to make sure the data values are sorted by x. but we still want to sort the categories, so we explicitly pull out the possible categories to make sure they are sorted. Signed-off-by: [email protected] <[email protected]> * We should use the FFMPEG_BIN environment variable if its defined. Signed-off-by: [email protected] <[email protected]> --------- Signed-off-by: [email protected] <[email protected]> Co-authored-by: [email protected] <[email protected]>
AcademySoftwareFoundation · Feb 25, 2024 · 5c67c97 · 5c67c97
1 parent 8d5ea2e
commit 5c67c97
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/enctests/testframework/encoders/ffmpeg_encoder.py b/enctests/testframework/encoders/ffmpeg_encoder.py
@@ -127,7 +127,7 @@ def run_wedges(self) -> dict:
 
     def get_application_version(self) -> str:
         if not self._application_version:
-            cmd = f'ffmpeg -version -v quiet -hide_banner'
+            cmd = f'{FFMPEG_BIN} -version -v quiet -hide_banner'
             _raw = subprocess.check_output(shlex.split(cmd))
             version = b'_'.join(_raw.split(b' ')[:3])
 

diff --git a/enctests/testframework/utils/outputTemplate.py b/enctests/testframework/utils/outputTemplate.py
@@ -28,10 +28,19 @@ def _exportGraph(config, reportconfig, graph, alltests):
   else:
     df = pd.DataFrame(alltests)
     # This sorts the filenames.
-    df = df.sort_values(by=graph.get("sortby", "name"))
   if graph.get("type", "line") == "bar":
+    df = df.sort_values(by=graph.get("sortby", "name"))
     fig = px.bar(df, **graphargs) 
   else:
+    # If we have a a line graph, we need to make sure the data values are sorted by x.
+    # but we still want to sort the categories, so we explicitly pull out the possible categories
+    # to make sure they are sorted.
+    df = df.sort_values(by=graphargs.get("x"))
+    labels = {}
+    for test in alltests:
+       labels[test[graphargs['color']]] = test[graphargs['color']]
+    category_orders = {graphargs['color']: labels.keys()}
+    graphargs['category_orders'] = category_orders
     fig = px.line(df, **graphargs) 
 
   filename = Path(reportconfig['name']+"-"+graph.get("name"))