Added time statistics

Author: jsbroks

backend/database/annotations.py

@@ -4,7 +4,7 @@
 
 from .datasets import DatasetModel
 from .categories import CategoryModel
-
+from .events import Event
 from flask_login import current_user
 
 
@@ -34,6 +34,10 @@ class AnnotationModel(DynamicDocument):
     deleted = BooleanField(default=False)
     deleted_date = DateTimeField()
 
+    milliseconds = IntField(default=0)
+    events = EmbeddedDocumentListField(Event)
+
+
     def __init__(self, image_id=None, **data):
 
         from .images import ImageModel

backend/database/images.py

@@ -5,9 +5,9 @@
 from PIL import Image
 from mongoengine import *
 
-from .events import Event
-from .annotations import AnnotationModel, DatasetModel
-
+from .events import Event, SessionEvent
+from .datasets import DatasetModel
+from .annotations import AnnotationModel
 
 class ImageModel(DynamicDocument):
 
@@ -44,8 +44,8 @@ class ImageModel(DynamicDocument):
     deleted = BooleanField(default=False)
     deleted_date = DateTimeField()
 
+    milliseconds = IntField(default=0)
     events = EmbeddedDocumentListField(Event)
-
     regenerate_thumbnail = BooleanField(default=False)
 
     @classmethod
@@ -179,7 +179,13 @@ def permissions(self, user):
         }
 
     def add_event(self, e):
-        self.update(push__events=e)
+        u = {
+            'push__events': e,
+        }
+        if isinstance(e, SessionEvent):
+            u['inc__milliseconds'] = e.milliseconds
+
+        self.update(**u)
 
 
 __all__ = ["ImageModel"]

backend/webserver/api/annotator.py

@@ -80,6 +80,7 @@ def post(self):
 
                 # Update annotation in database
                 sessions = []
+                total_time = 0
                 for session in annotation.get('sessions', []):
                     date = datetime.datetime.fromtimestamp(int(session.get('start')) / 1e3)
                     model = SessionEvent(
@@ -88,10 +89,12 @@ def post(self):
                         milliseconds=session.get('milliseconds'),
                         tools_used=session.get('tools')
                     )
+                    total_time += session.get('milliseconds')
                     sessions.append(model)
 
                 db_annotation.update(
                     add_to_set__events=sessions,
+                    inc__milliseconds=total_time,
                     set__keypoints=annotation.get('keypoints', []),
                     set__metadata=annotation.get('metadata'),
                     set__color=annotation.get('color')

backend/webserver/api/datasets.py

@@ -147,17 +147,19 @@ def get(self, dataset_id):
             return {"message": "Invalid dataset id"}, 400
 
         images = ImageModel.objects(dataset_id=dataset.id, deleted=False)
+        annotated_images = images.filter(annotated=True)
         annotations = AnnotationModel.objects(dataset_id=dataset_id, deleted=False)
         stats = {
             'total': {
                 'Users': dataset.get_users().count(),
                 'Images': images.count(),
-                'Annotated Images': images.filter(annotated=True).count(),
+                'Annotated Images': annotated_images.count(),
                 'Annotations': annotations.count(),
-                'Categories': len(dataset.categories)
+                'Categories': len(dataset.categories),
+                'Time Annotating (s)': (images.sum('milliseconds') or 0) / 1000
             },
             'average': {
-                'Image Width (px)': images.average('width'),
+                'Image Size (px)': images.average('width'),
                 'Image Height (px)': images.average('height'),
                 'Annotation Area (px)': annotations.average('area'),
                 'Time (ms) per Image': images.average('milliseconds') or 0,

client/src/views/Dataset.vue

@@ -99,15 +99,15 @@
                 <h6 class="border-bottom border-gray pb-2"><b>Total</b></h6>
                 <div class="row" v-for="stat in Object.keys(stats.total)">
                   <strong class="col-8">{{stat}}:</strong>
-                  <span class="col-4">{{stats.total[stat]}}</span>
+                  <span class="col-4">{{stats.total[stat].toFixed(0)}}</span>
                 </div>
               </div>
 
               <div v-if="stats.average" class="card my-3 p-3 shadow-sm col-4 mr-2">
                 <h6 class="border-bottom border-gray pb-2"><b>Average</b></h6>
                 <div class="row" v-for="stat in Object.keys(stats.average)">
                   <strong class="col-8">{{stat}}:</strong>
-                  <span class="col-4">{{stats.average[stat].toFixed(2)}}</span>
+                  <span class="col-4">{{stats.average[stat].toFixed(0)}}</span>
                 </div>
               </div>