Merge pull request #374 from acesnik/master

ET/EE relation table filters; stepthrough info button
smith-chem-wisc · Apr 26, 2017 · fb9b218 · fb9b218
2 parents 93994a8 + 398abd1
commit fb9b218
Show file tree

Hide file tree

Showing 12 changed files with 420 additions and 172 deletions.
diff --git a/ProteoformSuiteGUI/DisplayObjects/DisplayProteoformRelation.cs b/ProteoformSuiteGUI/DisplayObjects/DisplayProteoformRelation.cs
@@ -22,15 +22,19 @@ public int PeakCenterCount
         {
             get
             {
-                return peak != null ? peak.peak_relation_group_count : -1000000;
+                return peak != null ? 
+                    peak.peak_relation_group_count :
+                    -1000000;
             }
         }
 
         public double PeakCenterDeltaMass
         {
             get
             {
-                return peak != null ? peak.DeltaMass : Double.NaN;
+                return peak != null ? 
+                    peak.DeltaMass : 
+                    Double.NaN;
             }
         }
 
@@ -92,44 +96,47 @@ public double agg_intensity_1
         {
             get
             {
-                try { return ((ExperimentalProteoform)connected_proteoforms[0]).agg_intensity; }
-                catch { return Double.NaN; }
+                return connected_proteoforms[0] as ExperimentalProteoform != null ?
+                    ((ExperimentalProteoform)connected_proteoforms[0]).agg_intensity :
+                    Double.NaN;
             }
         }
 
         public double agg_RT_1
         {
             get
             {
-                try { return ((ExperimentalProteoform)connected_proteoforms[0]).agg_rt; }
-                catch { return Double.NaN; }
+                return connected_proteoforms[0] as ExperimentalProteoform != null ?
+                    ((ExperimentalProteoform)connected_proteoforms[0]).agg_rt :
+                    Double.NaN;
             }
         }
 
         public int num_observations_1
         {
             get
             {
-                try { return ((ExperimentalProteoform)connected_proteoforms[0]).aggregated_components.Count; }
-                catch { return -1000000; }
+                return connected_proteoforms[0] as ExperimentalProteoform != null ?
+                    ((ExperimentalProteoform)connected_proteoforms[0]).aggregated_components.Count :
+                    -1000000;
             }
         }
 
         public double proteoform_mass_1
         {
             get
             {
-                try {return ((ExperimentalProteoform)connected_proteoforms[0]).agg_mass; }
-                catch { return Double.NaN; }
+                return connected_proteoforms[0] as ExperimentalProteoform != null ?
+                    ((ExperimentalProteoform)connected_proteoforms[0]).agg_mass :
+                    Double.NaN;
             }
         }
 
         public string accession_1
         {
             get
             {
-                try { return ((ExperimentalProteoform)connected_proteoforms[0]).accession; }
-                catch { return null; }
+                return connected_proteoforms[0].accession;
             }
         }
 
@@ -139,7 +146,7 @@ public double proteoform_mass_2
         {
             get
             {
-                return connected_proteoforms[1] is ExperimentalProteoform ?
+                return connected_proteoforms[1] as ExperimentalProteoform != null ?
                     ((ExperimentalProteoform)connected_proteoforms[1]).agg_mass :
                     ((TheoreticalProteoform)connected_proteoforms[1]).modified_mass;
             }
@@ -149,61 +156,67 @@ public double agg_intensity_2
         {
             get
             {
-                try { return ((ExperimentalProteoform)connected_proteoforms[1]).agg_intensity; }
-                catch { return 0; }
+                return connected_proteoforms[1] as ExperimentalProteoform != null ?
+                    ((ExperimentalProteoform)connected_proteoforms[1]).agg_intensity :
+                    0;
             }
         }
 
         public double agg_RT_2
         {
             get
             {
-                try { return ((ExperimentalProteoform)connected_proteoforms[1]).agg_rt; }
-                catch { return 0; }
+                return connected_proteoforms[1] as ExperimentalProteoform != null ?
+                    ((ExperimentalProteoform)connected_proteoforms[1]).agg_rt :
+                    0;
             }
         }
 
         public int num_observations_2
         {
             get
             {
-                try { return ((ExperimentalProteoform)connected_proteoforms[1]).aggregated_components.Count; }
-                catch { return 0; }
+                return connected_proteoforms[1] as ExperimentalProteoform != null ?
+                    ((ExperimentalProteoform)connected_proteoforms[1]).aggregated_components.Count :
+                    0;
             }
         }
 
         public string accession_2
         {
             get
             {
-                try { return (connected_proteoforms[1]).accession; }
-                catch { return null; }
+                return connected_proteoforms[1].accession;
             }
         }
 
         public string Name
         {
             get
             {
-                try { return ((TheoreticalProteoform)connected_proteoforms[1]).name; }
-                catch { return null; } }
+                return connected_proteoforms[1] as TheoreticalProteoform != null ?
+                    ((TheoreticalProteoform)connected_proteoforms[1]).name :
+                    "";
+            }
         }
 
         public string Fragment
         {
             get
             {
-                try { return ((TheoreticalProteoform)connected_proteoforms[1]).fragment; }
-                catch { return null; }
+                return connected_proteoforms[1] as TheoreticalProteoform != null ?
+                    ((TheoreticalProteoform)connected_proteoforms[1]).fragment :
+                    "";
             }
         }
 
         public string PtmDescription
         {
             get
             {
-                try { return connected_proteoforms[1].ptm_description; }
-                catch { return null; }
+                return connected_proteoforms[1] as TheoreticalProteoform != null ?
+                    ((TheoreticalProteoform)connected_proteoforms[1]).description :
+                    "";
             }
         }