Remove extract data for learning

tuandnvn · Jul 11, 2018 · 1575acb · 1575acb
1 parent 05f0fd2
commit 1575acb
Show file tree

Hide file tree

Showing 7 changed files with 191 additions and 419 deletions.
diff --git a/Annotator/Main.Designer.cs b/Annotator/Main.Designer.cs
diff --git a/Annotator/Main.Memento.cs b/Annotator/Main.Memento.cs
@@ -91,17 +91,6 @@ internal void logSession(String log)
             currentSessionIndex++;
         }
 
-        /// <summary>
-        /// Log a message only
-        /// </summary>
-        /// <param name="log"></param>
-        internal void logMessage(String log)
-        {
-            logs.Add(log);
-
-            logGridView.Rows.Add(logs.Count.ToString(), log);
-        }
-
         /// <summary>
         /// Load an image of the current session given the index in the image list
         /// </summary>

diff --git a/Annotator/Main.Session.Kinect.cs b/Annotator/Main.Session.Kinect.cs
@@ -20,8 +20,6 @@ partial class Main
         internal CoordinateMapper coordinateMapper;
         DepthCoordinateMappingReader mappingReader;
 
-
-
         private void sessionOnlineModeGlyphDetectToolStripMenuItem_Click(object sender, EventArgs e)
         {
             try

diff --git a/Annotator/Main.Session.cs b/Annotator/Main.Session.cs
@@ -19,67 +19,6 @@ public partial class Main
         byte[] depthValuesToByte;
         Bitmap depthBitmap;
 
-        private void handleKeyDownOnAnnotatorTab(KeyEventArgs e)
-        {
-            // Click on rectangle
-            if (e.Modifiers == Keys.Alt && e.KeyCode == Keys.R)
-            {
-                if (rectangleDrawing.Enabled)
-                {
-                    rectangleDrawing_MouseDown(null, null);
-                }
-                return;
-            }
-
-            // Click on polygon
-            if (e.Modifiers == Keys.Alt && e.KeyCode == Keys.P)
-            {
-                if (polygonDrawing.Enabled)
-                {
-                    polygonDrawing_MouseDown(null, null);
-                }
-                return;
-            }
-
-            // Save down session
-            if (e.Modifiers == Keys.Control && e.KeyCode == Keys.S)
-            {
-                if (currentSession != null)
-                    saveCurrentSession();
-            }
-
-            // Edit session
-            if (e.Modifiers == Keys.Control && e.KeyCode == Keys.E)
-            {
-                if (currentProject != null)
-                    editSessionMenuItem_Click(null, null);
-            }
-
-            // Add a file into session
-            if (e.Modifiers == Keys.Control && e.KeyCode == Keys.A)
-            {
-                if (currentSession != null)
-                    addFileToSessionMenuItem_Click(null, null);
-            }
-
-            // Undo in session
-            if (e.Modifiers == Keys.Control && e.KeyCode == Keys.Z)
-            {
-                if (currentSession != null)
-                    undoBtn_Click(null, null);
-            }
-
-            // Redo in session
-            if (e.Modifiers == Keys.Control && e.KeyCode == Keys.Y)
-            {
-                if (currentSession != null)
-                    redoBtn_Click(null, null);
-            }
-
-            // While editing a polygon
-            handleKeyDownOnDrawingPolygon(e);
-        }
-
         /// <summary>
         /// 
         /// </summary>

diff --git a/Annotator/Main.cs b/Annotator/Main.cs
@@ -409,15 +409,81 @@ private void Main_FormClosing(object sender, FormClosingEventArgs e)
             saveParameters();
         }
 
-        private void middleCenterPanel_Paint(object sender, PaintEventArgs e)
+        private void label1_Click(object sender, EventArgs e)
         {
-
+            otherWorkspaceToolStripMenuItem_Click(sender, e);
         }
 
-        private void label1_Click(object sender, EventArgs e)
+        /// <summary>
+        /// Log a message only
+        /// </summary>
+        /// <param name="log"></param>
+        internal void logMessage(String log)
         {
-            otherWorkspaceToolStripMenuItem_Click(sender, e);
+            logs.Add(log);
+
+            logGridView.Rows.Add(logs.Count.ToString(), log);
         }
 
+        private void handleKeyDownOnAnnotatorTab(KeyEventArgs e)
+        {
+            // Click on rectangle
+            if (e.Modifiers == Keys.Alt && e.KeyCode == Keys.R)
+            {
+                if (rectangleDrawing.Enabled)
+                {
+                    rectangleDrawing_MouseDown(null, null);
+                }
+                return;
+            }
+
+            // Click on polygon
+            if (e.Modifiers == Keys.Alt && e.KeyCode == Keys.P)
+            {
+                if (polygonDrawing.Enabled)
+                {
+                    polygonDrawing_MouseDown(null, null);
+                }
+                return;
+            }
+
+            // Save down session
+            if (e.Modifiers == Keys.Control && e.KeyCode == Keys.S)
+            {
+                if (currentSession != null)
+                    saveCurrentSession();
+            }
+
+            // Edit session
+            if (e.Modifiers == Keys.Control && e.KeyCode == Keys.E)
+            {
+                if (currentProject != null)
+                    editSessionMenuItem_Click(null, null);
+            }
+
+            // Add a file into session
+            if (e.Modifiers == Keys.Control && e.KeyCode == Keys.A)
+            {
+                if (currentSession != null)
+                    addFileToSessionMenuItem_Click(null, null);
+            }
+
+            // Undo in session
+            if (e.Modifiers == Keys.Control && e.KeyCode == Keys.Z)
+            {
+                if (currentSession != null)
+                    undoBtn_Click(null, null);
+            }
+
+            // Redo in session
+            if (e.Modifiers == Keys.Control && e.KeyCode == Keys.Y)
+            {
+                if (currentSession != null)
+                    redoBtn_Click(null, null);
+            }
+
+            // While editing a polygon
+            handleKeyDownOnDrawingPolygon(e);
+        }
     }
 }