Skip to content

Commit

Permalink
Fix event text annotation enabled/disabled
Browse files Browse the repository at this point in the history
  • Loading branch information
@tuandnvn
tuandnvn committed Jul 10, 2018
1 parent 2ed4c3a commit 05f0fd2
Show file tree
Hide file tree
Showing 11 changed files with 289 additions and 262 deletions.
1 change: 1 addition & 0 deletions Annotator/EventAnnotation.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ private void saveEventAnnotation()
textAnnotation.Text = ev.text;
ev.save();
main.unselectAnnotations();
main.disableAnnotationText();
main.selectedEvent = null;
main.clearRightBottomPanel();
selected = false;
Expand Down
150 changes: 81 additions & 69 deletions Annotator/Main.Designer.cs
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Annotator/Main.Event.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ private void annoRefView_CellClick(object sender, DataGridViewCellEventArgs e)
}
}

private void annoRefView_UserDeletedRow(object sender, DataGridViewRowEventArgs e)
private void annoRefView_UserDeletingRow(object sender, DataGridViewRowCancelEventArgs e)
{
Console.WriteLine("annoRefView_UserDeletedRow");

Expand Down
12 changes: 12 additions & 0 deletions Annotator/Main.File.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@ namespace Annotator
{
public partial class Main
{
private void rightClickOnFileTreeNode(MouseEventArgs e)
{
if (treeView.SelectedNode == null)
return;

TreeNode selectedNode = treeView.SelectedNode;
Point location = this.Location;
location.X += e.Location.X + leftMostPanel.Location.X + 15;
location.Y += e.Location.Y + leftMostPanel.Location.Y + 80;
fileRightClickPanel.Show(location);
}

private void removeFileToolStripMenuItem_Click(object sender, EventArgs e)
{
// Double guard
Expand Down
45 changes: 45 additions & 0 deletions Annotator/Main.Project.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,51 @@ private void showNewSessionPopup()
sessionInfo.ShowDialog();
}

private void rightClickOnProjectTreeNode(MouseEventArgs e)
{
if (treeView.SelectedNode == null)
return;

if (currentProject != null && treeView.SelectedNode.Text.Equals(currentProject.name))
{
selectToolStripMenuItem.Enabled = false;
closeToolStripMenuItem.Enabled = true;
statisticsToolStripMenuItem.Enabled = true;
newSessionToolStripMenuItem.Enabled = true;
refreshProjectMenuItem.Enabled = true;
recordSessionToolStripMenuItem.Enabled = true;
projectDetectToolStripMenuItem.Enabled = true;
projectGenerateToolStripMenuItem.Enabled = true;
}
else if (currentProject != null && !(treeView.SelectedNode.Text.Equals(currentProject.name)))
{
selectToolStripMenuItem.Enabled = true;
closeToolStripMenuItem.Enabled = false;
statisticsToolStripMenuItem.Enabled = false;
newSessionToolStripMenuItem.Enabled = false;
refreshProjectMenuItem.Enabled = false;
recordSessionToolStripMenuItem.Enabled = false;
projectDetectToolStripMenuItem.Enabled = false;
projectGenerateToolStripMenuItem.Enabled = false;
}

if (currentProject == null)
{
selectToolStripMenuItem.Enabled = true;
closeToolStripMenuItem.Enabled = false;
statisticsToolStripMenuItem.Enabled = false;
newSessionToolStripMenuItem.Enabled = false;
refreshProjectMenuItem.Enabled = false;
recordSessionToolStripMenuItem.Enabled = false;
projectDetectToolStripMenuItem.Enabled = false;
projectGenerateToolStripMenuItem.Enabled = false;
}
Point location = this.Location;
location.X += e.Location.X + leftMostPanel.Location.X + 15;
location.Y += e.Location.Y + leftMostPanel.Location.Y + 80;
projectRightClickPanel.Show(location);
}

/// <summary>
/// Select project from available projects in workspace
/// </summary>
Expand Down
73 changes: 73 additions & 0 deletions Annotator/Main.Session.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,79 @@ internal void populateMiddleBottomPanel()
}
}

private void rightClickOnSessionTreeNode(MouseEventArgs e)
{
if (treeView.SelectedNode == null)
return;

TreeNode selectedNode = treeView.SelectedNode;
Session choosenSession = null;

// Check if session node is inside currently open project
if (selectedNode != null && currentProject != null && selectedNode.Parent.Text.Equals(currentProject.name))
{
//Check if session is editing:
choosenSession = currentProject.getSession(selectedNode.Text);
if (choosenSession == null)
choosenSession = currentProject.getSession(selectedNode.Text.Substring(1));

if (choosenSession != null)
{
if (choosenSession.edited)
{
editSessionMenuItem.Enabled = false;
exitWithoutSavingToolStripMenuItem.Enabled = true;
reloadToolStripMenuItem.Enabled = true;
resetToolStripMenuItem.Enabled = true;
saveSessionMenuItem.Enabled = true;
deleteSessionMenuItem.Enabled = true;
addFileToSessionMenuItem.Enabled = true;
refreshSessionMenuItem.Enabled = true;
sessionDetectToolStripMenuItem.Enabled = true;
sessionGenerateToolStripMenuItem.Enabled = true;
}
else
{
editSessionMenuItem.Enabled = true;
exitWithoutSavingToolStripMenuItem.Enabled = false;
reloadToolStripMenuItem.Enabled = false;
resetToolStripMenuItem.Enabled = false;
saveSessionMenuItem.Enabled = false;
deleteSessionMenuItem.Enabled = true;
addFileToSessionMenuItem.Enabled = false;
refreshSessionMenuItem.Enabled = false;
sessionDetectToolStripMenuItem.Enabled = false;
sessionGenerateToolStripMenuItem.Enabled = false;
}
}
}
else
{
editSessionMenuItem.Enabled = false;
exitWithoutSavingToolStripMenuItem.Enabled = false;
reloadToolStripMenuItem.Enabled = false;
resetToolStripMenuItem.Enabled = false;
saveSessionMenuItem.Enabled = false;
deleteSessionMenuItem.Enabled = true;
addFileToSessionMenuItem.Enabled = false;
refreshSessionMenuItem.Enabled = false;
sessionDetectToolStripMenuItem.Enabled = false;
sessionGenerateToolStripMenuItem.Enabled = false;
}

Point location = this.Location;
location.X += e.Location.X + leftMostPanel.Location.X + 15;
location.Y += e.Location.Y + leftMostPanel.Location.Y + 80;
sessionRightClickPanel.Show(location);
}


private void exitWithoutSavingToolStripMenuItem_Click(object sender, EventArgs e)
{
closeSessionNode();
closeWithoutSaveCurrentSession();
}

/// <summary>
///
/// </summary>
Expand Down
121 changes: 1 addition & 120 deletions Annotator/Main.Workspace.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,126 +357,7 @@ private void rightClickOut(MouseEventArgs e)
workspaceRightClickPanel.Show(location);
}

private void rightClickOnFileTreeNode(MouseEventArgs e)
{
if (treeView.SelectedNode == null)
return;

TreeNode selectedNode = treeView.SelectedNode;
Point location = this.Location;
location.X += e.Location.X + leftMostPanel.Location.X + 15;
location.Y += e.Location.Y + leftMostPanel.Location.Y + 80;
fileRightClickPanel.Show(location);
}

private void rightClickOnSessionTreeNode(MouseEventArgs e)
{
if (treeView.SelectedNode == null)
return;

TreeNode selectedNode = treeView.SelectedNode;
Session choosenSession = null;

// Check if session node is inside currently open project
if (selectedNode != null && currentProject != null && selectedNode.Parent.Text.Equals(currentProject.name))
{
//Check if session is editing:
choosenSession = currentProject.getSession(selectedNode.Text);
if (choosenSession == null)
choosenSession = currentProject.getSession(selectedNode.Text.Substring(1));

if (choosenSession != null)
{
if (choosenSession.edited)
{
editSessionMenuItem.Enabled = false;
reloadToolStripMenuItem.Enabled = true;
resetToolStripMenuItem.Enabled = true;
saveSessionMenuItem.Enabled = true;
deleteSessionMenuItem.Enabled = true;
addFileToSessionMenuItem.Enabled = true;
refreshSessionMenuItem.Enabled = true;
sessionDetectToolStripMenuItem.Enabled = true;
sessionGenerateToolStripMenuItem.Enabled = true;
}
else
{
editSessionMenuItem.Enabled = true;
reloadToolStripMenuItem.Enabled = false;
resetToolStripMenuItem.Enabled = false;
saveSessionMenuItem.Enabled = false;
deleteSessionMenuItem.Enabled = true;
addFileToSessionMenuItem.Enabled = false;
refreshSessionMenuItem.Enabled = false;
sessionDetectToolStripMenuItem.Enabled = false;
sessionGenerateToolStripMenuItem.Enabled = false;
}
}
}
else
{
editSessionMenuItem.Enabled = false;
reloadToolStripMenuItem.Enabled = false;
resetToolStripMenuItem.Enabled = false;
saveSessionMenuItem.Enabled = false;
deleteSessionMenuItem.Enabled = true;
addFileToSessionMenuItem.Enabled = false;
refreshSessionMenuItem.Enabled = false;
sessionDetectToolStripMenuItem.Enabled = false;
sessionGenerateToolStripMenuItem.Enabled = false;
}

Point location = this.Location;
location.X += e.Location.X + leftMostPanel.Location.X + 15;
location.Y += e.Location.Y + leftMostPanel.Location.Y + 80;
sessionRightClickPanel.Show(location);
}

private void rightClickOnProjectTreeNode(MouseEventArgs e)
{
if (treeView.SelectedNode == null)
return;

if (currentProject != null && treeView.SelectedNode.Text.Equals(currentProject.name))
{
selectToolStripMenuItem.Enabled = false;
closeToolStripMenuItem.Enabled = true;
statisticsToolStripMenuItem.Enabled = true;
newSessionToolStripMenuItem.Enabled = true;
refreshProjectMenuItem.Enabled = true;
recordSessionToolStripMenuItem.Enabled = true;
projectDetectToolStripMenuItem.Enabled = true;
projectGenerateToolStripMenuItem.Enabled = true;
}
else if (currentProject != null && !(treeView.SelectedNode.Text.Equals(currentProject.name)))
{
selectToolStripMenuItem.Enabled = true;
closeToolStripMenuItem.Enabled = false;
statisticsToolStripMenuItem.Enabled = false;
newSessionToolStripMenuItem.Enabled = false;
refreshProjectMenuItem.Enabled = false;
recordSessionToolStripMenuItem.Enabled = false;
projectDetectToolStripMenuItem.Enabled = false;
projectGenerateToolStripMenuItem.Enabled = false;
}

if (currentProject == null)
{
selectToolStripMenuItem.Enabled = true;
closeToolStripMenuItem.Enabled = false;
statisticsToolStripMenuItem.Enabled = false;
newSessionToolStripMenuItem.Enabled = false;
refreshProjectMenuItem.Enabled = false;
recordSessionToolStripMenuItem.Enabled = false;
projectDetectToolStripMenuItem.Enabled = false;
projectGenerateToolStripMenuItem.Enabled = false;
}
Point location = this.Location;
location.X += e.Location.X + leftMostPanel.Location.X + 15;
location.Y += e.Location.Y + leftMostPanel.Location.Y + 80;
projectRightClickPanel.Show(location);
}


private void treeView_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
{
//Select node with right click also
Expand Down
1 change: 1 addition & 0 deletions Annotator/Main.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,5 +418,6 @@ private void label1_Click(object sender, EventArgs e)
{
otherWorkspaceToolStripMenuItem_Click(sender, e);
}

}
}
Loading

0 comments on commit 05f0fd2

Please sign in to comment.