Merge pull request #80 from ambianic/dev

feat: event timeline infinite scroll, close #63
ambianic · Nov 11, 2019 · bcc3d2a · bcc3d2a
2 parents 9660b49 + 708ecf3
commit bcc3d2a
Show file tree

Hide file tree

Showing 3 changed files with 194 additions and 186 deletions.
diff --git a/public/sample-data/timeline.json b/public/sample-data/timeline.json
@@ -12,10 +12,10 @@
         "inference_result": [
           {
             "box": {
-                "xmin": 0.6749029159545898,
-                "ymin": 0.024479886516928673,
-                "xmax": 0.9028397798538208,
-                "ymax": 0.4697817265987396
+              "xmin": 0.6749029159545898,
+              "ymin": 0.024479886516928673,
+              "xmax": 0.9028397798538208,
+              "ymax": 0.4697817265987396
             },
             "confidence": 0.98828125,
             "label": "person"
@@ -78,13 +78,23 @@
         "inference_result": [
           {
             "box": {
-                "xmin": 0.36677005887031555,
-                "ymin": 0.1813620924949646,
-                "xmax": 0.44172248244285583,
-                "ymax": 0.29970091581344604
+              "xmin": 0.36677005887031555,
+              "ymin": 0.2813620924949646,
+              "xmax": 0.44172248244285583,
+              "ymax": 0.49970091581344606
             },
             "confidence": 0.38828125,
             "label": "unknown"
+          },
+          {
+            "box": {
+              "xmin": 0.28677005887031554,
+              "ymin": 0.2213620924949646,
+              "xmax": 0.34172248244285586,
+              "ymax": 0.49970091581344606
+            },
+            "confidence": 0.38828125,
+            "label": "person"
           }
         ],
         "json_file_name": "20191028-000100.609045.json",
@@ -134,7 +144,7 @@
         "lineno": 110,
         "pathname": "/workspace/src/ambianic/pipeline/store.py"
       }
-    },    
+    },
     {
       "args": {
         "datetime": "2019-10-28T00:01:01.539012",

diff --git a/src/components/DetectionBoxes.vue b/src/components/DetectionBoxes.vue
@@ -18,7 +18,7 @@
               x: inf.box.xmin * stageSize.width,
               y: inf.box.ymin * stageSize.height,
               width: (inf.box.xmax - inf.box.xmin) * stageSize.width,
-              height: (inf.box.ymax -inf.box.ymin) * stageSize.height,
+              height: (inf.box.ymax - inf.box.ymin) * stageSize.height,
               stroke: 'white',
               strokeWidth: 4,
               shadowColor: 'black',
@@ -27,38 +27,6 @@
             }"
         >
         </v-rect>
-        <v-circle
-          :config="{
-            x: 5,
-            y: 5,
-            radius: 5,
-            fill: 'green'
-          }"
-        />
-        <v-circle
-          :config="{
-            x: stageSize.width - 5,
-            y: 5,
-            radius: 5,
-            fill: 'green'
-          }"
-        />
-        <v-circle
-          :config="{
-            x: stageSize.width - 5,
-            y: stageSize.height - 5,
-            radius: 5,
-            fill: 'green'
-          }"
-        />
-        <v-circle
-          :config="{
-            x: 5,
-            y: stageSize.height - 5,
-            radius: 5,
-            fill: 'green'
-          }"
-        />
       </v-layer>
       <v-layer ref="dragLayer"></v-layer>
     </v-stage>