diff --git a/Annotator/Main.Designer.cs b/Annotator/Main.Designer.cs index dc2fb81..217bb57 100644 --- a/Annotator/Main.Designer.cs +++ b/Annotator/Main.Designer.cs @@ -33,8 +33,8 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.annotateTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); this.leftMostPanel = new System.Windows.Forms.Panel(); this.tabControl1 = new System.Windows.Forms.TabControl(); @@ -110,9 +110,6 @@ private void InitializeComponent() this.menu = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.newProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.simpleEventDataCreateMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.simpleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.eventToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.switchWorkspaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.othersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -213,7 +210,7 @@ private void InitializeComponent() this.annotateTableLayoutPanel.ColumnCount = 3; this.annotateTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 170F)); this.annotateTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.annotateTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 428F)); + this.annotateTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 433F)); this.annotateTableLayoutPanel.Controls.Add(this.leftMostPanel, 0, 0); this.annotateTableLayoutPanel.Controls.Add(this.middleTopPanel, 1, 0); this.annotateTableLayoutPanel.Controls.Add(this.middleCenterPanel, 1, 2); @@ -336,8 +333,8 @@ private void InitializeComponent() // // Log // - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.Log.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.Log.DefaultCellStyle = dataGridViewCellStyle3; this.Log.FillWeight = 169.5432F; this.Log.HeaderText = "Log"; this.Log.Name = "Log"; @@ -353,7 +350,7 @@ private void InitializeComponent() this.middleTopPanel.Location = new System.Drawing.Point(175, 4); this.middleTopPanel.Name = "middleTopPanel"; this.annotateTableLayoutPanel.SetRowSpan(this.middleTopPanel, 2); - this.middleTopPanel.Size = new System.Drawing.Size(827, 657); + this.middleTopPanel.Size = new System.Drawing.Size(822, 657); this.middleTopPanel.TabIndex = 1; // // middleTopTableLayoutPanel @@ -371,7 +368,7 @@ private void InitializeComponent() this.middleTopTableLayoutPanel.RowCount = 2; this.middleTopTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.middleTopTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F)); - this.middleTopTableLayoutPanel.Size = new System.Drawing.Size(825, 655); + this.middleTopTableLayoutPanel.Size = new System.Drawing.Size(820, 655); this.middleTopTableLayoutPanel.TabIndex = 8; // // videoPanel @@ -383,7 +380,7 @@ private void InitializeComponent() this.videoPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.videoPanel.Location = new System.Drawing.Point(123, 3); this.videoPanel.Name = "videoPanel"; - this.videoPanel.Size = new System.Drawing.Size(699, 599); + this.videoPanel.Size = new System.Drawing.Size(694, 599); this.videoPanel.TabIndex = 1; // // pictureBoard @@ -393,7 +390,7 @@ private void InitializeComponent() this.pictureBoard.Location = new System.Drawing.Point(0, 0); this.pictureBoard.mat = null; this.pictureBoard.Name = "pictureBoard"; - this.pictureBoard.Size = new System.Drawing.Size(699, 599); + this.pictureBoard.Size = new System.Drawing.Size(694, 599); this.pictureBoard.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBoard.TabIndex = 0; this.pictureBoard.TabStop = false; @@ -498,7 +495,7 @@ private void InitializeComponent() this.frameTrackBar.MinDragVal = 1; this.frameTrackBar.Minimum = 1; this.frameTrackBar.Name = "frameTrackBar"; - this.frameTrackBar.Size = new System.Drawing.Size(689, 48); + this.frameTrackBar.Size = new System.Drawing.Size(684, 48); this.frameTrackBar.TabIndex = 3; this.frameTrackBar.TickStyle = System.Windows.Forms.TickStyle.Both; this.frameTrackBar.Value = 1; @@ -533,9 +530,8 @@ private void InitializeComponent() this.middleCenterPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.middleCenterPanel.Location = new System.Drawing.Point(175, 668); this.middleCenterPanel.Name = "middleCenterPanel"; - this.middleCenterPanel.Size = new System.Drawing.Size(827, 94); + this.middleCenterPanel.Size = new System.Drawing.Size(822, 94); this.middleCenterPanel.TabIndex = 3; - this.middleCenterPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.middleCenterPanel_Paint); // // middleCenterTableLayoutPanel // @@ -545,7 +541,7 @@ private void InitializeComponent() this.middleCenterTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Top; this.middleCenterTableLayoutPanel.Location = new System.Drawing.Point(0, 0); this.middleCenterTableLayoutPanel.Name = "middleCenterTableLayoutPanel"; - this.middleCenterTableLayoutPanel.Size = new System.Drawing.Size(825, 0); + this.middleCenterTableLayoutPanel.Size = new System.Drawing.Size(820, 0); this.middleCenterTableLayoutPanel.TabIndex = 0; // // middleBottomPanel @@ -556,7 +552,7 @@ private void InitializeComponent() this.middleBottomPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.middleBottomPanel.Location = new System.Drawing.Point(175, 769); this.middleBottomPanel.Name = "middleBottomPanel"; - this.middleBottomPanel.Size = new System.Drawing.Size(827, 94); + this.middleBottomPanel.Size = new System.Drawing.Size(822, 94); this.middleBottomPanel.TabIndex = 2; // // middleBottomTableLayoutPanel @@ -570,7 +566,7 @@ private void InitializeComponent() this.middleBottomTableLayoutPanel.Name = "middleBottomTableLayoutPanel"; this.middleBottomTableLayoutPanel.RowCount = 1; this.middleBottomTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F)); - this.middleBottomTableLayoutPanel.Size = new System.Drawing.Size(825, 60); + this.middleBottomTableLayoutPanel.Size = new System.Drawing.Size(820, 60); this.middleBottomTableLayoutPanel.TabIndex = 1; // // addEventAnnotationBtn @@ -595,7 +591,7 @@ private void InitializeComponent() this.rightColumnLayoutPanel.Controls.Add(this.rightCenterPanel, 0, 1); this.rightColumnLayoutPanel.Controls.Add(this.panel1, 0, 2); this.rightColumnLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.rightColumnLayoutPanel.Location = new System.Drawing.Point(1009, 4); + this.rightColumnLayoutPanel.Location = new System.Drawing.Point(1004, 4); this.rightColumnLayoutPanel.Name = "rightColumnLayoutPanel"; this.rightColumnLayoutPanel.RowCount = 5; this.annotateTableLayoutPanel.SetRowSpan(this.rightColumnLayoutPanel, 4); @@ -604,7 +600,7 @@ private void InitializeComponent() this.rightColumnLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40F)); this.rightColumnLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 100F)); this.rightColumnLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 100F)); - this.rightColumnLayoutPanel.Size = new System.Drawing.Size(422, 859); + this.rightColumnLayoutPanel.Size = new System.Drawing.Size(427, 859); this.rightColumnLayoutPanel.TabIndex = 5; // // annoRefView @@ -618,20 +614,20 @@ private void InitializeComponent() this.EndAnno, this.TextAnno, this.NoteAnno}); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.annoRefView.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.annoRefView.DefaultCellStyle = dataGridViewCellStyle4; this.annoRefView.Dock = System.Windows.Forms.DockStyle.Fill; this.annoRefView.Location = new System.Drawing.Point(1, 759); this.annoRefView.Margin = new System.Windows.Forms.Padding(1); this.annoRefView.Name = "annoRefView"; this.annoRefView.RowHeadersVisible = false; - this.annoRefView.Size = new System.Drawing.Size(420, 99); + this.annoRefView.Size = new System.Drawing.Size(425, 99); this.annoRefView.TabIndex = 24; this.annoRefView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.annoRefView_CellClick); this.annoRefView.UserDeletingRow += new System.Windows.Forms.DataGridViewRowCancelEventHandler(this.annoRefView_UserDeletingRow); @@ -671,7 +667,7 @@ private void InitializeComponent() this.annotationText.Enabled = false; this.annotationText.Location = new System.Drawing.Point(3, 661); this.annotationText.Name = "annotationText"; - this.annotationText.Size = new System.Drawing.Size(416, 94); + this.annotationText.Size = new System.Drawing.Size(421, 94); this.annotationText.TabIndex = 23; this.annotationText.Text = ""; this.annotationText.MouseDown += new System.Windows.Forms.MouseEventHandler(this.annotationText_MouseDown); @@ -710,7 +706,7 @@ private void InitializeComponent() this.rightTopPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.rightTopPanel.Location = new System.Drawing.Point(3, 3); this.rightTopPanel.Name = "rightTopPanel"; - this.rightTopPanel.Size = new System.Drawing.Size(416, 164); + this.rightTopPanel.Size = new System.Drawing.Size(421, 164); this.rightTopPanel.TabIndex = 3; // // selectObjContextPanel @@ -1008,7 +1004,7 @@ private void InitializeComponent() this.rightCenterPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.rightCenterPanel.Location = new System.Drawing.Point(3, 173); this.rightCenterPanel.Name = "rightCenterPanel"; - this.rightCenterPanel.Size = new System.Drawing.Size(416, 287); + this.rightCenterPanel.Size = new System.Drawing.Size(421, 287); this.rightCenterPanel.TabIndex = 4; // // objectProperties @@ -1025,7 +1021,7 @@ private void InitializeComponent() this.objectProperties.Location = new System.Drawing.Point(0, 0); this.objectProperties.Name = "objectProperties"; this.objectProperties.RowHeadersVisible = false; - this.objectProperties.Size = new System.Drawing.Size(414, 285); + this.objectProperties.Size = new System.Drawing.Size(419, 285); this.objectProperties.TabIndex = 0; this.objectProperties.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.objectProperties_CellContentClick); this.objectProperties.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.objectProperties_CellValueChanged); @@ -1046,7 +1042,7 @@ private void InitializeComponent() this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(3, 466); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(416, 189); + this.panel1.Size = new System.Drawing.Size(421, 189); this.panel1.TabIndex = 25; // // tableLayoutPanel1 @@ -1062,7 +1058,7 @@ private void InitializeComponent() this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(416, 189); + this.tableLayoutPanel1.Size = new System.Drawing.Size(421, 189); this.tableLayoutPanel1.TabIndex = 0; // // predicateView @@ -1080,7 +1076,7 @@ private void InitializeComponent() this.predicateView.Location = new System.Drawing.Point(3, 28); this.predicateView.Name = "predicateView"; this.predicateView.RowHeadersVisible = false; - this.predicateView.Size = new System.Drawing.Size(410, 158); + this.predicateView.Size = new System.Drawing.Size(415, 158); this.predicateView.TabIndex = 1; // // dataGridViewTextBoxColumn1 @@ -1112,7 +1108,6 @@ private void InitializeComponent() // this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newProjectToolStripMenuItem, - this.simpleEventDataCreateMenuItem, this.switchWorkspaceToolStripMenuItem, this.optionsToolStripMenuItem, this.aboutToolStripMenuItem, @@ -1124,67 +1119,43 @@ private void InitializeComponent() // newProjectToolStripMenuItem // this.newProjectToolStripMenuItem.Name = "newProjectToolStripMenuItem"; - this.newProjectToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.newProjectToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.newProjectToolStripMenuItem.Text = "&New project"; this.newProjectToolStripMenuItem.Click += new System.EventHandler(this.newProjectToolStripMenuItem_Click); // - // simpleEventDataCreateMenuItem - // - this.simpleEventDataCreateMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.simpleToolStripMenuItem, - this.eventToolStripMenuItem}); - this.simpleEventDataCreateMenuItem.Enabled = false; - this.simpleEventDataCreateMenuItem.Name = "simpleEventDataCreateMenuItem"; - this.simpleEventDataCreateMenuItem.Size = new System.Drawing.Size(199, 22); - this.simpleEventDataCreateMenuItem.Text = "Extract data for learning"; - // - // simpleToolStripMenuItem - // - this.simpleToolStripMenuItem.Name = "simpleToolStripMenuItem"; - this.simpleToolStripMenuItem.Size = new System.Drawing.Size(110, 22); - this.simpleToolStripMenuItem.Text = "Simple"; - this.simpleToolStripMenuItem.Click += new System.EventHandler(this.simpleToolStripMenuItem_Click); - // - // eventToolStripMenuItem - // - this.eventToolStripMenuItem.Name = "eventToolStripMenuItem"; - this.eventToolStripMenuItem.Size = new System.Drawing.Size(110, 22); - this.eventToolStripMenuItem.Text = "Event"; - this.eventToolStripMenuItem.Click += new System.EventHandler(this.eventToolStripMenuItem_Click); - // // switchWorkspaceToolStripMenuItem // this.switchWorkspaceToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.othersToolStripMenuItem}); this.switchWorkspaceToolStripMenuItem.Name = "switchWorkspaceToolStripMenuItem"; - this.switchWorkspaceToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.switchWorkspaceToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.switchWorkspaceToolStripMenuItem.Text = "Switch workspace"; // // othersToolStripMenuItem // this.othersToolStripMenuItem.Name = "othersToolStripMenuItem"; - this.othersToolStripMenuItem.Size = new System.Drawing.Size(109, 22); + this.othersToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.othersToolStripMenuItem.Text = "Others"; this.othersToolStripMenuItem.Click += new System.EventHandler(this.otherWorkspaceToolStripMenuItem_Click); // // optionsToolStripMenuItem // this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.optionsToolStripMenuItem.Text = "Options"; this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click); // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.aboutToolStripMenuItem.Text = "About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(199, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.exitToolStripMenuItem.Text = "&Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -1682,7 +1653,6 @@ private void InitializeComponent() private System.Windows.Forms.MenuStrip menu; private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem newProjectToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem simpleEventDataCreateMenuItem; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; private System.Windows.Forms.ComboBox playbackFileComboBox; private System.Windows.Forms.Panel videoPanel; @@ -1786,8 +1756,6 @@ private void InitializeComponent() private DataGridViewTextBoxColumn Number; private DataGridViewTextBoxColumn Log; private ToolStripMenuItem statisticsToolStripMenuItem; - private ToolStripMenuItem simpleToolStripMenuItem; - private ToolStripMenuItem eventToolStripMenuItem; private Label annotationWorkspaceTitle; private ToolStripMenuItem deleteToolStripMenuItem; private ToolStripMenuItem refreshProjectMenuItem; diff --git a/Annotator/Main.Memento.cs b/Annotator/Main.Memento.cs index 1056cc4..c65d001 100644 --- a/Annotator/Main.Memento.cs +++ b/Annotator/Main.Memento.cs @@ -91,17 +91,6 @@ internal void logSession(String log) currentSessionIndex++; } - /// - /// Log a message only - /// - /// - internal void logMessage(String log) - { - logs.Add(log); - - logGridView.Rows.Add(logs.Count.ToString(), log); - } - /// /// Load an image of the current session given the index in the image list /// diff --git a/Annotator/Main.Session.Kinect.cs b/Annotator/Main.Session.Kinect.cs index eb3f909..19fa25f 100644 --- 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 index 6d55d9e..fd51258 100644 --- 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); - } - /// /// /// diff --git a/Annotator/Main.cs b/Annotator/Main.cs index 7065637..1026c45 100644 --- 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) + /// + /// Log a message only + /// + /// + 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); + } } } diff --git a/Annotator/Main.resx b/Annotator/Main.resx index 67e4973..a7725e3 100644 --- a/Annotator/Main.resx +++ b/Annotator/Main.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACi - CAAAAk1TRnQBSQFMAgEBAwEAAagBCAGoAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAwEAAdABCAHQAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -170,6 +170,12 @@ True + + True + + + True + 1130, 17 @@ -177,72 +183,72 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD8 - DgAAAk1TRnQBSQFMAgEBBAIAAQMBAAEDARgBAAEYAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA - AWADAAEwAwABAQEAAQgGAAESGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA - AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA - AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm - AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ - AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm - AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz - AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm - AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm - AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA - ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm - AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm - ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm - AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA - AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ - AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz - AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/ - AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA - AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM - AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm - ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ - AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/ - ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM - ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm - AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM - AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA - AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA - ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7 - Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA///AP8A/wD/AP8A/wD/AP8A - /wARAAH0CekB/w0AAfQJ6QH/DQAB9AlJAf8NAAH0CYsB/wwAA+kBRgH0AwAB8wTpCwAD6QFGAfQDAAHz - BOkLAANJAXEB9AMAAfMESQsABIsB9AMAAfMEiwkAARoC6QHyCQABbwLpAf8HAAEaAukB8gkAAW8C6QH/ - BwAB8AJJAfEJAAFyAkkB/wcAAfECiwHyCQABtAKLAf8GAAEaAukFAAH/AfQB/wUAAukB/wUAARoC6Q0A - AukB/wUAAbwCSQEAAfQB/woAAkkB/wUAAfACiwIAAf8B9AUAAfQB/wIAAosB/wQAAf8C6QMAAfMHRwH/ - AwAC6QQAAf8C6Q8AAukEAAH/AkkBAASXAfQJAAJJBAAB/wKLAgAEtAIAAf8DtAHwAgACiwQAAukDAApH - ARcDAALpAwAC6QMAAf8JRwQAAukDAAJJAgAGlwH/CAACSQMAAosDAAS0AbsBAAW0AwACiwIAARoB6QH/ - AgAMRwEXAgABbwHpAf8BAAEaAekB/wIAAf8LRwMAAW8B6QH/AQABCAFJAf8CAAiXAf8GAAFyAUkB/wEA - AfABiwH/AwAEtAG7AQAFtAMAAbQBiwH/AQAC6QIAARoNRwH/AgAC6QEAAukDAA1HAwAC6QEAAkkDAAqX - BgACSQEAAosEAAS0AbsBAAW0BAACiwEAAekBGgIAD0cCAALpAQAB6QEaAwANRwMAAukBAAFJAbwDAAyX - BAACSQEAAYsB8AQABLQBuwEABbQEAAKLAfQB6QIAAf8PRwIAAfMB6QH0AekEAA1HAwAB8wHpAfQBSQQA - DpcB/wEAAfMBSQH0AYsFAAS0AbsBAAW0BAAB8wGLAWkB6QIAAZQPRwH/AgAB6QFpAekEAA1HBAAB6QFx - AUkEAA+XAZgBAAFJAbQBiwUABLQBuwEABbQFAAGLAukCAAHjD0cB9AIAA+kEAA1HBAAB6QJJBAAQlwEA - AUkCiwUABLQBuwEABbQFAAGLAUYB6QIAAZQPRwH/AgAB6QFGAekEAA1HBAAB6QJJBAAQlwEAAUkCiwUA - BLQBuwEABbQFAAGLAfIB6QIAAfQPRwIAAfQB6QHyAekEAA1HAwAB9AHpAfIBSQQADpcB9AEAAfQBSQHy - AYsFAAS0AbsBAAW0BAAB9AGLAQAB6QHzAgAPRwIAAUYB6QEAAekB8wMADUcDAAFGAekBAAFJAfMDAAyX - Af8DAAFxAUkBAAGLAfMEAAS0AbsBAAW0BAACiwEAAukCAAHjDUcB8wIAAukBAALpAwANRwMAAukBAAJJ - AwAKlwHwBQACSQEAAosEAAS0AbsBAAW0BAACiwEAAZMB6QH/AgANRwIAAfIB6QH0AQABkwHpAf8CAAGU - C0cB/wIAAfIB6QH0AQABnQFJAf8CAAiXAQgGAAHxAUkB9AEAAbUBiwH/AwAEtAG7AQAFtAMAAfIBiwH0 - AgAC6QMAC0cDAALpAwAC6QMAAZQJRwH/AwAC6QMAAkkCAAaXAZgIAAJJAwACiwMABLQBuwEABbQDAAKL - AwABGgHpAUYDAAHjB0cBGgMAAukEAAEaAekBRg8AAukEAAHxAUkBcQEABJcBmAkAAkkEAAHxAYsBzwIA - BLQB/wEAAfMEtAIAAosFAAFGAekBRgQAAf8BlAHjAZQB/wQAAukBGgUAAUYB6QFGDQAC6QEaBQABTwFJ - AXEBAAGYAQgKAAJJAfAFAAKLAc8CAAHwAbsB/wMAAf8BuwHzAgACiwHxBgABRgLpCgAB/wLpARoHAAFG - AukKAAH/AukBGgcAAU8CSQoAAf8CSQG8BwADiwoAAf8CiwHwCAABGgPpAfMFAAEaA+kB/wkAARoD6QHz - BQABGgPpAf8JAAHxA0kB8wUAAbwDSQH/CQAB8QOLAfMFAAHwA4sB/wsAAW8J6QEaDQABbwnpARoNAAGR - CUkBCA0AAbUJiwHwEAAB8gFGAekBaQH0EwAB8gFGAekBaQH0EwAB8gJJAXEB9BMAAfICiwG0AfQJAAFC - AU0BPgcAAT4DAAEoAwABYAMAATADAAEBAQABAQUAAUABAhYAA///ACIAAf4BAAE/Af4BAAE/Af4BAAE/ - Af4BAAE/AfwBHAEfAfwBHAEfAfwBHAEfAfwBHAEfAfAB/wGHAfAB/wGHAfAB/wGHAfAB/wGHBOMB/wHj - AeIBfwLjAT4BYwHHAQABcwHHAf8B8wHEAR8B8wHGARgBMwHOAQABOQHOAQABeQHMAQcB+QHOAQgBOQGM - AQABGAGMAQABOAGMAQEB+AGOAQgBOAGYAQABDAGcAQABHAGcAQAB/AGeAQgBPAGYAQABDAGcAQABHAGc - AQABPAGeAQgBPAEwAQABDAE8AQABHAE8AQABBAE+AQgBPAEwAQABBgE8AQABHgE8AQABAgE+AQgBPgEw - AQABBgE8AQABHgE8AQABAgE+AQgBPgEwAQABBgE8AQABHgE8AQABAgE+AQgBPgEwAQABDAE8AQABHAE8 - AQABBAE+AQgBPAGYAQABDAGcAQABHAGcAQABHAGeAQgBPAGYAQABDAGcAQABHAGcAQABfAGeAQgBPAGM - AQABGAGMAQABGAGMAQEB+AGOAQgBOAHOAQABOQHOAQABOQHMAQcB+QHOAQgBOQHHAQABcwHHAf8B8wHE - AR8B8wHGAQgBMwHjAcEC4wH/AeMB4gF/AuMBHAFjAfEB/wGHAfEB/wGHAfEB/wGHAfEB/wGHAfgBPgEP - AfgBPgEPAfgBPgEPAfgBPgEPAf4BAAE/Af4BAAE/Af4BAAE/Af4BAAE/Af8BwQL/AcEC/wHBAv8BwQH/ - Cw== + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD+ + DgAAAk1TRnQBSQFMAgEBBAEAASgBAwEoAQMBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABYAMAATADAAEBAQABCAYAARIYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8A/wD/AP8A + /wD/ABEAAfQJ6QH/DQAB9AnpAf8NAAH0CUkB/w0AAfQJiwH/DAAD6QFGAfQDAAHzBOkLAAPpAUYB9AMA + AfME6QsAA0kBcQH0AwAB8wRJCwAEiwH0AwAB8wSLCQABGgLpAfIJAAFvAukB/wcAARoC6QHyCQABbwLp + Af8HAAHwAkkB8QkAAXICSQH/BwAB8QKLAfIJAAG0AosB/wYAARoC6QUAAf8B9AH/BQAC6QH/BQABGgLp + DQAC6QH/BQABvAJJAQAB9AH/CgACSQH/BQAB8AKLAgAB/wH0BQAB9AH/AgACiwH/BAAB/wLpAwAB8wdH + Af8DAALpBAAB/wLpDwAC6QQAAf8CSQEABJcB9AkAAkkEAAH/AosCAAS0AgAB/wO0AfACAAKLBAAC6QMA + CkcBFwMAAukDAALpAwAB/wlHBAAC6QMAAkkCAAaXAf8IAAJJAwACiwMABLQBuwEABbQDAAKLAgABGgHp + Af8CAAxHARcCAAFvAekB/wEAARoB6QH/AgAB/wtHAwABbwHpAf8BAAEIAUkB/wIACJcB/wYAAXIBSQH/ + AQAB8AGLAf8DAAS0AbsBAAW0AwABtAGLAf8BAALpAgABGg1HAf8CAALpAQAC6QMADUcDAALpAQACSQMA + CpcGAAJJAQACiwQABLQBuwEABbQEAAKLAQAB6QEaAgAPRwIAAukBAAHpARoDAA1HAwAC6QEAAUkBvAMA + DJcEAAJJAQABiwHwBAAEtAG7AQAFtAQAAosB9AHpAgAB/w9HAgAB8wHpAfQB6QQADUcDAAHzAekB9AFJ + BAAOlwH/AQAB8wFJAfQBiwUABLQBuwEABbQEAAHzAYsBaQHpAgABlA9HAf8CAAHpAWkB6QQADUcEAAHp + AXEBSQQAD5cBmAEAAUkBtAGLBQAEtAG7AQAFtAUAAYsC6QIAAeMPRwH0AgAD6QQADUcEAAHpAkkEABCX + AQABSQKLBQAEtAG7AQAFtAUAAYsBRgHpAgABlA9HAf8CAAHpAUYB6QQADUcEAAHpAkkEABCXAQABSQKL + BQAEtAG7AQAFtAUAAYsB8gHpAgAB9A9HAgAB9AHpAfIB6QQADUcDAAH0AekB8gFJBAAOlwH0AQAB9AFJ + AfIBiwUABLQBuwEABbQEAAH0AYsBAAHpAfMCAA9HAgABRgHpAQAB6QHzAwANRwMAAUYB6QEAAUkB8wMA + DJcB/wMAAXEBSQEAAYsB8wQABLQBuwEABbQEAAKLAQAC6QIAAeMNRwHzAgAC6QEAAukDAA1HAwAC6QEA + AkkDAAqXAfAFAAJJAQACiwQABLQBuwEABbQEAAKLAQABkwHpAf8CAA1HAgAB8gHpAfQBAAGTAekB/wIA + AZQLRwH/AgAB8gHpAfQBAAGdAUkB/wIACJcBCAYAAfEBSQH0AQABtQGLAf8DAAS0AbsBAAW0AwAB8gGL + AfQCAALpAwALRwMAAukDAALpAwABlAlHAf8DAALpAwACSQIABpcBmAgAAkkDAAKLAwAEtAG7AQAFtAMA + AosDAAEaAekBRgMAAeMHRwEaAwAC6QQAARoB6QFGDwAC6QQAAfEBSQFxAQAElwGYCQACSQQAAfEBiwHP + AgAEtAH/AQAB8wS0AgACiwUAAUYB6QFGBAAB/wGUAeMBlAH/BAAC6QEaBQABRgHpAUYNAALpARoFAAFP + AUkBcQEAAZgBCAoAAkkB8AUAAosBzwIAAfABuwH/AwAB/wG7AfMCAAKLAfEGAAFGAukKAAH/AukBGgcA + AUYC6QoAAf8C6QEaBwABTwJJCgAB/wJJAbwHAAOLCgAB/wKLAfAIAAEaA+kB8wUAARoD6QH/CQABGgPp + AfMFAAEaA+kB/wkAAfEDSQHzBQABvANJAf8JAAHxA4sB8wUAAfADiwH/CwABbwnpARoNAAFvCekBGg0A + AZEJSQEIDQABtQmLAfAQAAHyAUYB6QFpAfQTAAHyAUYB6QFpAfQTAAHyAkkBcQH0EwAB8gKLAbQB9AkA + AUIBTQE+BwABPgMAASgDAAFgAwABMAMAAQEBAAEBBQABQAECFgAD//8AIgAB/gEAAT8B/gEAAT8B/gEA + AT8B/gEAAT8B/AEcAR8B/AEcAR8B/AEcAR8B/AEcAR8B8AH/AYcB8AH/AYcB8AH/AYcB8AH/AYcE4wH/ + AeMB4gF/AuMBPgFjAccBAAFzAccB/wHzAcQBHwHzAcYBGAEzAc4BAAE5Ac4BAAF5AcwBBwH5Ac4BCAE5 + AYwBAAEYAYwBAAE4AYwBAQH4AY4BCAE4AZgBAAEMAZwBAAEcAZwBAAH8AZ4BCAE8AZgBAAEMAZwBAAEc + AZwBAAE8AZ4BCAE8ATABAAEMATwBAAEcATwBAAEEAT4BCAE8ATABAAEGATwBAAEeATwBAAECAT4BCAE+ + ATABAAEGATwBAAEeATwBAAECAT4BCAE+ATABAAEGATwBAAEeATwBAAECAT4BCAE+ATABAAEMATwBAAEc + ATwBAAEEAT4BCAE8AZgBAAEMAZwBAAEcAZwBAAEcAZ4BCAE8AZgBAAEMAZwBAAEcAZwBAAF8AZ4BCAE8 + AYwBAAEYAYwBAAEYAYwBAQH4AY4BCAE4Ac4BAAE5Ac4BAAE5AcwBBwH5Ac4BCAE5AccBAAFzAccB/wHz + AcQBHwHzAcYBCAEzAeMBwQLjAf8B4wHiAX8C4wEcAWMB8QH/AYcB8QH/AYcB8QH/AYcB8QH/AYcB+AE+ + AQ8B+AE+AQ8B+AE+AQ8B+AE+AQ8B/gEAAT8B/gEAAT8B/gEAAT8B/gEAAT8B/wHBAv8BwQL/AcEC/wHB + Af8L @@ -281,6 +287,12 @@ True + + True + + + True + 350, 17 @@ -296,6 +308,9 @@ 433, 17 + + 17, 17 + 978, 17 @@ -303,7 +318,7 @@ 17, 56 - 108 + 131 diff --git a/Annotator/annotatePanel/SessionRightClickMenu.cs b/Annotator/annotatePanel/SessionRightClickMenu.cs deleted file mode 100644 index 1064641..0000000 --- a/Annotator/annotatePanel/SessionRightClickMenu.cs +++ /dev/null @@ -1,203 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace Annotator -{ - public partial class SessionRightClickMenu - { - LeftMostPanel leftMostPanel; - - public SessionRightClickMenu(IContainer container, LeftMostPanel leftMostPanel) : base(container) - { - InitializeComponent(); - this.leftMostPanel = leftMostPanel; - } - - /// - /// - /// - /// - /// - private void editSessionMenuItem_Click(object sender, EventArgs e) - { - //Check selected node: - Session chosenSession = null; - if (treeView.SelectedNode.Text[0] == '*') - { - chosenSession = selectedProject.getSession(treeView.SelectedNode.Text.Substring(1)); - } - else - { - chosenSession = selectedProject.getSession(treeView.SelectedNode.Text); - } - - // Save current session if it is edited - if (currentSession != null && chosenSession != null && currentSession.sessionName != chosenSession.sessionName) - { - if (currentSession.getEdited()) - { - currentSession.setEdited(false); - treeView.BeginUpdate(); - currentSessionNode.Text = currentSessionNode.Text.Substring(1); - treeView.EndUpdate(); - - var result = MessageBox.Show(("Session " + currentSession.sessionName + " currently editing, Do you want to save this session?"), "Save session", MessageBoxButtons.YesNo); - if (result == DialogResult.Yes) - { - cleanCurrentSession(); - } - else if (result == DialogResult.No) - { - cleanSessionUI(); - } - } - } - - // Set current session = chosen session - if (chosenSession != null && !chosenSession.getEdited()) - { - chosenSession.setEdited(true); - currentSessionNode = treeView.SelectedNode; - currentSession = chosenSession; - currentSession.loadIfNotLoaded(); - currentSessionNode.Text = "*" + currentSessionNode.Text; - - frameTrackBar.Value = frameTrackBar.Minimum; - this.Text = "Project " + selectedProject.getProjectName() + " selected, edited session = " + chosenSession.sessionName; - } - - //Set comboBox: - String[] viewsList = chosenSession.getViews(); - //MessageBox.Show(viewsList.Length + ""); - for (int i = 0; i < viewsList.Length; i++) - { - playbackFileComboBox.Items.Add(viewsList[i]); - } - - if (playbackFileComboBox.Items.Count > 0) - { - playbackFileComboBox.SelectedIndex = 0; - playbackFileComboBox.Enabled = true; - frameTrackBar.Enabled = true; - addEventAnnotationBtn.Enabled = true; - //pictureBox1.BackgroundImage = null; - - // All toolstrips of file inside session are enables - toggleFileToolStripsOfSession(true); - } - } - - /// - /// - /// - /// - /// - private void saveSessionMenuItem_Click(object sender, EventArgs e) - { - TreeNode nodeS = treeView.SelectedNode; - //MessageBox.Show(selectedProject.getSessionN() + ""); - if (currentSession.getEdited()) - { - cleanCurrentSession(); - } - - toggleFileToolStripsOfSession(false); - } - - - /// - /// - /// - /// - /// - private void deleteSessionMenuItem_Click(object sender, EventArgs e) - { - //MessageBox.Show(item.ToString()); - TreeNode sessionToDeleteName = treeView.SelectedNode; - String sName = sessionToDeleteName.Text; - TreeNode projectNode = sessionToDeleteName.Parent; - Project project = workspace.getProject(projectNode.Text); - if (MessageBox.Show("Confirm session removal (exclude from project): " + sName + " from " + project.getProjectName(), "Delete session", MessageBoxButtons.YesNo) == DialogResult.Yes) - { - //1)Remove session from project: - project.removeSession(sName); - //2)Remove session from treeView: - treeView.BeginUpdate(); - foreach (TreeNode currentSessionNode in selectedProjectNode.Nodes) - { - if (currentSessionNode.Text.Equals(sName)) - { - //MessageBox.Show("Removing " + sName + " from" + project.getProjectName()); - selectedProjectNode.Nodes.Remove(currentSessionNode); - break; - } - } - treeView.EndUpdate(); - } - - //Disable button2: - addEventAnnotationBtn.Enabled = false; - newObjectContextPanel.Visible = false; - clearPlaybackFileComboBox(); - clearRightBottomPanel(); - pictureBoard.Image = null; - startPoint = endPoint; - currentVideo = null; - } - - /// - /// - /// - /// - /// - private void addFileToSessionMenuItem_Click(object sender, EventArgs e) - { - // Show the dialog and get result. - DialogResult result = openFileDialog.ShowDialog(); - if (result == DialogResult.OK) // Test result. - { - if (leftMostPanel.main.currentSession != null) - { - String fullFileName = openFileDialog.FileName; - copyFileIntoLocalSession(fullFileName); - } - } - } - - /// - /// - /// - /// - /// - private void refreshSessionMenuItem_Click(object sender, EventArgs e) - { - if (leftMostPanel.main.currentSession == null) - { return; } - - //Check files in current Session folder - String[] files = Directory.GetFiles(workspace.getLocationFolder() + Path.DirectorySeparatorChar + - leftMostPanel.main.currentSession.getProject() + Path.DirectorySeparatorChar + leftMostPanel.main.currentSession.sessionName); - - TreeNode[] arrayFiles = new TreeNode[files.Length]; - for (int j = 0; j < arrayFiles.Length; j++) - { - arrayFiles[j] = new TreeNode(files[j].Split(Path.DirectorySeparatorChar)[files[j].Split(Path.DirectorySeparatorChar).Length - 1]); - arrayFiles[j].ImageIndex = 2; - arrayFiles[j].SelectedImageIndex = arrayFiles[j].ImageIndex; - } - - treeView.BeginUpdate(); - currentSessionNode.Nodes.Clear(); - currentSessionNode.Nodes.AddRange(arrayFiles); - treeView.EndUpdate(); - } - - } -}