:sparkling: add filter option for clusters

Author: Joseph Hirsch

demonstrator/assets/style.css

@@ -26,7 +26,7 @@ body {
     bottom: 0;
 }
 .two_columns {
-    min-height: 720px;
+    min-height: 760px;
     flex: 1 1 auto;
     width: 100%;
     display: flex;
@@ -56,15 +56,15 @@ body {
 
 
     height: 80vh;
-    min-height: 720px;
+    min-height: 760px;
     overflow: auto;
 }
 
 .graphContainer {
 
 
     height: 80vh;
-    min-height: 720px;
+    min-height: 760px;
     overflow: auto;
     width: 70%;
     border: 1px solid lightgray;
@@ -76,7 +76,7 @@ body {
 
 .nodeInfo {
     height: 80vh;
-    min-height: 720px;
+    min-height: 760px;
     overflow: auto;
     width: 30%;
     border: 1px solid lightgray;
@@ -86,7 +86,7 @@ body {
 }
 .main_page_container {
     width: 100%;
-    min-height: 850px;
+    min-height: 870px;
     overflow: none;
     display: flex;
     flex-flow: column;

demonstrator/data_manager.py

@@ -12,6 +12,7 @@ class FilterOptions():
     telemetry_similarities: float
     image_quality_threshold: float
     mosaics: bool
+    clusters: bool
     key_frames: bool
     filter_id: str
 
@@ -127,16 +128,17 @@ def get_graph_stuff(filter_options):
                 nodes[mosaic_id] = dict(mosaic.nodes[0])
                 in_mosaic.add((image_id, mosaic_id))
 
-    query_cluster_nodes = f"""{graph_images} WITH i ORDER BY i.id LIMIT {LIMIT} MATCH (i) -[:IN_CLUSTER]-> (c:Cluster) RETURN i, c"""
-    with neo4j_transaction() as tx:
-        cursor = tx.run(query_cluster_nodes)
-        results = [(r['i'], r['c']) for r in cursor]
-        for image, cluster in results:
-            image_id = f"im_{image['id']}"
-            cluster_id = f"{cluster['id']}"
-            if cluster_id.endswith("-1"): continue
-            nodes[cluster_id] = dict(cluster.nodes[0])
-            in_cluster.add((image_id, cluster_id))
+    if filter_options.clusters:
+        query_cluster_nodes = f"""{graph_images} WITH i ORDER BY i.id LIMIT {LIMIT} MATCH (i) -[:IN_CLUSTER]-> (c:Cluster) RETURN i, c"""
+        with neo4j_transaction() as tx:
+            cursor = tx.run(query_cluster_nodes)
+            results = [(r['i'], r['c']) for r in cursor]
+            for image, cluster in results:
+                image_id = f"im_{image['id']}"
+                cluster_id = f"{cluster['id']}"
+                if cluster_id.endswith("-1"): continue
+                nodes[cluster_id] = dict(cluster.nodes[0])
+                in_cluster.add((image_id, cluster_id))
 
 
     """

demonstrator/views/controls.py

@@ -16,11 +16,11 @@ def layout():
         html.P('Telemetry Similarities'),
         dcc.Slider(id="telemetry_similarities", min=0, max=5,  value=1.5),
         html.P('Visual Similarities'),
-        dcc.Slider(id="visual_similarities", min=0, max=5, value=2),
+        dcc.Slider(id="visual_similarities", min=0, max=20, value=10),
         html.P('Image Quality'),
         dcc.Slider(id="quality_slider", min=0, max=15, value=4),
-        html.H4('Image Stitching'),
-        dcc.Checklist(['mosaics'], id='extras_cl'),
+        html.H4('Extras'),
+        dcc.Checklist(['mosaics', 'clusters'], value=['clusters'], id='extras_cl'),
         html.H4('Inspection criteria'),
         dcc.Checklist(['marine growth', 'paint peel', 'corrosion', 'defect'], id='defects_cl'),
         html.H4('Classifications'),
@@ -47,6 +47,7 @@ def updateFilter(inspections, image_quality_threshold, telemetry_similarities, v
             inspections = [title_to_id[t] for t in inspections]
         if extras is None: extras = []
         mosaics = 'mosaics' in extras
+        clusters = 'clusters' in extras
         key_frames = 'key_frames' in extras
 
         if defects is None: defects = []