From 520e2f49d496dacf85bdbaaebfbbf0985f10ca58 Mon Sep 17 00:00:00 2001
From: PastaTime <arran94@gmail.com>
Date: Fri, 4 Sep 2020 14:57:58 +1200
Subject: [PATCH] Release/v1.2 (#90)

Merging Master changes into branch via Release v1.2
---
 client/annotation_client.py                   |  2 +-
 ...screen.py => instance_annotator_screen.py} |  2 --
 server/template.xml                           | 28 +++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)
 rename client/screens/{instance_annnotator_screen.py => instance_annotator_screen.py} (99%)
 create mode 100644 server/template.xml

diff --git a/client/annotation_client.py b/client/annotation_client.py
index 6dc6c55..1f6d350 100644
--- a/client/annotation_client.py
+++ b/client/annotation_client.py
@@ -14,7 +14,7 @@
 from client.client_config import ClientConfig
 from client.screens.common import Alert
 from client.screens.image_view_screen import ImageViewScreen
-from client.screens.instance_annnotator_screen import InstanceAnnotatorScreen
+from client.screens.instance_annotator_screen import InstanceAnnotatorScreen
 from client.screens.project_select_screen import ProjectSelectScreen
 from client.screens.project_tool_screen import ProjectToolScreen
 
diff --git a/client/screens/instance_annnotator_screen.py b/client/screens/instance_annotator_screen.py
similarity index 99%
rename from client/screens/instance_annnotator_screen.py
rename to client/screens/instance_annotator_screen.py
index 1632769..eba2c84 100644
--- a/client/screens/instance_annnotator_screen.py
+++ b/client/screens/instance_annotator_screen.py
@@ -1,5 +1,3 @@
-size_hint_y: None
-height: 50
 import time
 from threading import Lock
 
diff --git a/server/template.xml b/server/template.xml
new file mode 100644
index 0000000..ae5e7ad
--- /dev/null
+++ b/server/template.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+<annotation>
+   <folder>jpgs</folder>
+   <source>
+      <database>OXIIIT Custom</database>
+      <annotation>OXIIIT Bespoke</annotation>
+      <image>Self</image>
+   </source>
+   <size>
+      <width>0</width>
+      <height>0</height>
+      <depth>0</depth>
+   </size>
+   <segemented/>
+   <object>
+      <name>name</name>
+      <pose>Frontal</pose>
+      <truncated>0</truncated>
+      <occluded>0</occluded>
+      <bndbox>
+         <xmin>0</xmin>
+         <ymin>0</ymin>
+         <xmax>0</xmax>
+         <ymax>0</ymax>
+      </bndbox>
+      <difficult>0</difficult>
+   </object>
+</annotation>