Improved RMS sorting

Signed-off-by: Conor MacBride <[email protected]>

Author: ConorMacBride

pytest_mpl/summary/html.py

@@ -135,8 +135,13 @@ def card(name, item, warn_missing=None):
 
     if status['image'] == 'match':
         rms = '< tolerance'
-    else:
+        rms_sort = 999999
+    elif status['image'] == 'diff':
         rms = item['rms']
+        rms_sort = 99999 - item['rms']
+    else:
+        rms = 'None'
+        rms_sort = 999998
 
     offcanvas = RESULT_IMAGES.format(
 
@@ -172,6 +177,7 @@ def card(name, item, warn_missing=None):
         test_name=test_name,
         module=module,
         status_sort=status_sort,
+        rms_sort=rms_sort,
 
         image=image,
         badge=badge,

pytest_mpl/summary/templates/extra.js

@@ -13,7 +13,7 @@ var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
 
 // Search, sort and filter
 var options = {
-  valueNames: [ 'test-name', 'status-sort', 'rms', 'baseline-hash', 'result-hash' ]
+  valueNames: [ 'test-name', 'status-sort', 'rms-sort', 'rms', 'baseline-hash', 'result-hash' ]
 };
 var userList = new List('results', options);
 userList.sort('status-sort');

pytest_mpl/summary/templates/filter.html

@@ -10,7 +10,7 @@ <h5>Sort tests by...</h5>
             <label class="btn btn-outline-secondary" for="sortstatus">status</label>
             <input type="radio" class="btn-check sort" data-sort="test-name" name="sort" id="sortname" autocomplete="off">
             <label class="btn btn-outline-secondary" for="sortname">name</label>
-            <input type="radio" class="btn-check sort" data-sort="rms" name="sort" id="sortrms" autocomplete="off">
+            <input type="radio" class="btn-check sort" data-sort="rms-sort" name="sort" id="sortrms" autocomplete="off">
             <label class="btn btn-outline-secondary" for="sortrms">RMS</label>
         </div>
         <h5>Show tests which have...</h5>

pytest_mpl/summary/templates/result.html

@@ -1,6 +1,7 @@
 <div class="py-2 col-sm-6 col-lg-4 col-xxl-3 result {classes}">
     <span class="test-name" style="display:none">{module}.{test_name}</span>
     <span class="status-sort" style="display:none">{status_sort}</span>
+    <span class="rms-sort" style="display:none">{rms_sort}</span>
     <div class="card">
         <a class="btn" data-bs-toggle="offcanvas" href="#offcanvas{id}" role="button" aria-controls="offcanvas{id}">{image}</a>
         {offcanvas}