From 24eb15f29cc02cd6ac42f9c6c3cebaa2b5e54e69 Mon Sep 17 00:00:00 2001 From: Linquize Date: Sun, 6 Apr 2014 18:57:22 +0800 Subject: [PATCH 1/2] AddIn Scout: Do not add extra SubItems if more than one Condition --- src/AddIns/Misc/AddinScout/Project/Src/Gui/CodonListPanel.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/AddIns/Misc/AddinScout/Project/Src/Gui/CodonListPanel.cs b/src/AddIns/Misc/AddinScout/Project/Src/Gui/CodonListPanel.cs index 9b6765ea12..00cfde5de9 100644 --- a/src/AddIns/Misc/AddinScout/Project/Src/Gui/CodonListPanel.cs +++ b/src/AddIns/Misc/AddinScout/Project/Src/Gui/CodonListPanel.cs @@ -18,6 +18,7 @@ using System; using System.Drawing; +using System.Linq; using System.Windows.Forms; using ICSharpCode.Core; @@ -105,9 +106,7 @@ namespace AddInScout lvi.SubItems.Add(c.Properties.Contains("class") ? c.Properties["class"] : ""); - foreach (ICondition condition in c.Conditions) { - lvi.SubItems.Add(condition.Name + ", " + condition.Action); - } + lvi.SubItems.Add(string.Join(";", c.Conditions.Select(a => a.Name + ": " + a.Action))); CodonLV.Items.Add(lvi); } } From dfbb94fdca8078d9ba1f7d7ecbae27d016c227a8 Mon Sep 17 00:00:00 2001 From: Linquize Date: Sun, 6 Apr 2014 18:57:45 +0800 Subject: [PATCH 2/2] AddIn Scout: Add Label column --- src/AddIns/Misc/AddinScout/Project/Src/Gui/CodonListPanel.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/AddIns/Misc/AddinScout/Project/Src/Gui/CodonListPanel.cs b/src/AddIns/Misc/AddinScout/Project/Src/Gui/CodonListPanel.cs index 00cfde5de9..331d5cbfa2 100644 --- a/src/AddIns/Misc/AddinScout/Project/Src/Gui/CodonListPanel.cs +++ b/src/AddIns/Misc/AddinScout/Project/Src/Gui/CodonListPanel.cs @@ -54,6 +54,7 @@ namespace AddInScout CodonLV.Columns.Add("Codon ID", 175,HorizontalAlignment.Left); CodonLV.Columns.Add("Codon Class", 400,HorizontalAlignment.Left); CodonLV.Columns.Add("Codon Condition -> Action on Fail", 600,HorizontalAlignment.Left); + CodonLV.Columns.Add("Label", 450, HorizontalAlignment.Left); ExtTextBox.Text = "Extension : "; ExtTextBox.ReadOnly = true; @@ -107,6 +108,7 @@ namespace AddInScout lvi.SubItems.Add(c.Properties.Contains("class") ? c.Properties["class"] : ""); lvi.SubItems.Add(string.Join(";", c.Conditions.Select(a => a.Name + ": " + a.Action))); + lvi.SubItems.Add(c.Properties.Contains("label") ? c.Properties["label"] : ""); CodonLV.Items.Add(lvi); } }