Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
===================================================================
diff -u -r2230 -r2273
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 2230)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 2273)
@@ -159,7 +159,6 @@
         /// <value>
         /// The number of iterations.
         /// </value>
-        [Label("Number of iterations")]
         [ReadOnly(true)]
         public int NumberOfIterations
         {
@@ -177,7 +176,6 @@
         /// The result file.
         /// </value>
         [Browsable(false)]
-        [Label("Image file")]
         public string ResultFile
         {
             get
@@ -213,7 +211,6 @@
         /// The input file.
         /// </value>
         [Browsable(false)]
-        [Label("Input file")]
         private string InputFile
         {
             get
@@ -245,7 +242,6 @@
         /// The piping result file.
         /// </value>
         [Browsable(false)]
-        [Label("Input file")]
         private string PipingResultFile
         {
             // Path of piping is not based on the working dir but on assembly (Assembly.GetExecutingAssembly().Location)
@@ -267,7 +263,6 @@
             }
         }
 
-        [Label("Analysis")]
         [PropertyOrder(1, 2)]
         [ReadOnly(true)]
         public AnalysisType AnalysisType // moet vanuit invoer komen
@@ -276,7 +271,6 @@
             set { analysisType = value; }
         }
 
-        [Label("Probabilistic")]
         [PropertyOrder(1, 3)]
         [ReadOnly(true)]
         public ProbabilisticType ProbabilisticType // moet vanuit invoer komen
@@ -298,7 +292,6 @@
 
         [CsvExportColumn("DikeName", 2)]
         [Browsable(false)]
-        [Label("Dike")]
         public string DikeName
         {
             get
@@ -333,7 +326,6 @@
         }
 
         [CsvExportColumn("LocationName", 5)]
-        [Label("Location")]
         [PropertyOrder(0, 1)]
         [ReadOnly(true)]
         public string LocationName
@@ -348,15 +340,13 @@
             }
         }
 
-        [Label("Scenario")]
         [PropertyOrder(0, 2)]
         [ReadOnly(true)]
         public string ScenarioDefinitionName
         {
             get { return scenarioName + " of " + locationScenarioCount.ToString(); }
         }
 
-        [Label("Calculation result")]
         [PropertyOrder(0, 3)]
         [ReadOnly(true)]
         public CalculationResult CalculationResult
@@ -371,7 +361,6 @@
             }
         }
 
-        [Label("Message")]
         [PropertyOrder(8,1)]
         [ReadOnly(true)]
         public string ResultMessage
@@ -398,7 +387,6 @@
 
 
         [CsvExportColumn("X", 6)]
-        [Label("Global X-coordinate")]
         [Format("F3")]
         [PropertyOrder(1, 0)]
         [Unit(UnitType.Length)]
@@ -417,7 +405,6 @@
         }
 
         [CsvExportColumn("Y", 7)]
-        [Label("Global Y-coordinate")]
         [Format("F3")]
         [PropertyOrder(1, 1)]
         [Unit(UnitType.Length)]
@@ -442,7 +429,6 @@
             get { return scenarioName; }
         }
 
-        [Label("River level")]
         [CsvExportColumn("RiverLevel", 9)]
         [PropertyOrder(2, 12)]
         [Format("F3")]
@@ -452,7 +438,6 @@
             get { return scenario.RiverLevel; }
         }
 
-        [Label("River level low")]
         [CsvExportColumn("RiverLevelLow", 10)]
         [PropertyOrder(2, 13)]
         [Format("F3")]
@@ -462,7 +447,6 @@
             get { return scenario.RiverLevelLow; }
         }
 
-        [Label("Dike table height")]
         [CsvExportColumn("DikeTableHeight", 11)]
         [PropertyOrder(2, 14)]
         [Format("F3")]
@@ -472,7 +456,6 @@
             get { return scenario.DikeTableHeight; }
         }
 
-        [Label("Slope damping factor")]
         [CsvExportColumn("DikeTableHeight", 12)]
         [PropertyOrder(2, 15)]
         [Format("F3")]
@@ -541,15 +524,13 @@
         }
 
         [CsvExportColumn("StabilityProfileName", 16)]
-        [Label("Stability profile")]
         [Browsable(false)]
         public string StabilityProfileName
         {
             get { return ProfileName; }
         }
 
         [CsvExportColumn("StabilityProfileProbability", 17)]
-        [Label("Stability probability")]
         [Format("F3")]
         [Unit(UnitType.Fractions)]
         [Browsable(false)]
@@ -559,15 +540,13 @@
         }
 
         [CsvExportColumn("PipingProfileName", 18)]
-        [Label("Piping profile")]
         [Browsable(false)]
         public string PipingProfileName
         {
             get { return ProfileName; }
         }
 
         [CsvExportColumn("PipingProfileProbability", 19)]
-        [Label("Piping probability")]
         [Format("F3")]
         [Unit(UnitType.Fractions)]
         [Browsable(false)]
@@ -590,7 +569,6 @@
         }
 
         [CsvExportColumn("StabilityToeAtPolderX", 21)]
-        [Label("Stability toe polder")]
         [Format("F3")]
         [Unit(UnitType.Length)]
         [Browsable(false)]
@@ -609,7 +587,6 @@
         }
 
         [CsvExportColumn("StabilityToeAtPolderZ", 22)]
-        [Label("Height stability toe polder")]
         [Format("F3")]
         [Unit(UnitType.Length)]
         [Browsable(false)]
@@ -628,7 +605,6 @@
         }
 
         [CsvExportColumn("StabilityShoulderHeight", 23)]
-        [Label("Stability shoulder height")]
         [Format("F3")]
         [Unit(UnitType.Length)]
         [Browsable(false)]
@@ -647,7 +623,6 @@
         }
 
         [CsvExportColumn("StabilitySafetyFactor", 24)]
-        [Label("Stability safety factor")]
         [Format("F3")]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
@@ -659,7 +634,6 @@
         }
 
         [CsvExportColumn("StabilityFailureProbability", 25)]
-        [Label("Stability failure probability")]
         [Format("F3")]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
@@ -671,7 +645,6 @@
         }
 
         [CsvExportColumn("RequiredSafetyFactorStabilityInnerSlope", 26)]
-        [Label("Required safety factor stability inside")]
         [Format("F3")]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
@@ -682,7 +655,6 @@
         }
 
         [CsvExportColumn("RequiredSafetyFactorStabilityOuterSlope", 27)]
-        [Label("Required safety factor stability outside")]
         [Format("F3")]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
@@ -693,7 +665,6 @@
         }
 
         [CsvExportColumn("RequiredSafetyFactorPiping", 28)]
-        [Label("Required safety factor piping")]
         [Format("F3")]
         [Unit(UnitType.Length)]
         [ReadOnly(true)]
@@ -704,7 +675,6 @@
         }
 
         [CsvExportColumn("PipingToeAtPolderX", 29)]
-        [Label("Piping toe")]
         [Format("F3")]
         [Unit(UnitType.Length)]
         [Browsable(false)]
@@ -723,7 +693,6 @@
         }
 
         [CsvExportColumn("PipingToeAtPolderZ", 30)]
-        [Label("Height Piping toe")]
         [Format("F3")]
         [Unit(UnitType.Length)]
         [Browsable(false)]
@@ -742,7 +711,6 @@
         }
 
         [CsvExportColumn("PipingShoulderHeight", 31)]
-        [Label("Piping shoulder height")]
         [Format("F3")]
         [Unit(UnitType.Length)]
         [Browsable(false)]
@@ -761,7 +729,6 @@
         }
 
         [CsvExportColumn("PipingFailureProbability", 32)]
-        [Label("Piping failure probability")]
         [Format("F3")]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
@@ -772,7 +739,6 @@
             set { failureProbabilityPiping = value; }
         }
 
-        [Label("Required piping failure probability")]
         [Format("F3")]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
@@ -783,7 +749,6 @@
         }
         
         [CsvExportColumn("DikeLength", 33)]
-        [Label("Dike length")]
         [Format("F3")]
         [PropertyOrder(4, 1)]
         [Unit(UnitType.Length)]
@@ -801,7 +766,6 @@
         }
 
         [CsvExportColumn("Zone1SafetyFactorStability", 34)]
-        [Label("Zone 1 safety factor")]
         [Format("F3")]
         [PropertyOrder(3, 1)]
         [Unit(UnitType.None)]
@@ -812,7 +776,6 @@
             set { zone1SafetyFactorStability = value; }
         }
 
-        [Label("Zone 1 entry point (X-local)")]
         [Format("F3")]
         [PropertyOrder(3, 2)]
         [Unit(UnitType.Length)]
@@ -824,7 +787,6 @@
         }
 
         [CsvExportColumn("Zone1EntryPointX", 36)]
-        [Label("Zone 1 entry point (X-global)")]
         [Format("F3")]
         [PropertyOrder(3, 3)]
         [Unit(UnitType.Length)]
@@ -845,7 +807,6 @@
         }
 
         [CsvExportColumn("Zone1EntryPointY", 37)]
-        [Label("Zone 1 entry point (Y-global)")]
         [Format("F3")]
         [PropertyOrder(3, 4)]
         [Unit(UnitType.Length)]
@@ -866,7 +827,6 @@
         }
 
         [CsvExportColumn("Zone1EntryPointZ", 38)]
-        [Label("Zone 1 entry point (Z)")]
         [Format("F3")]
         [PropertyOrder(3, 5)]
         [Unit(UnitType.Length)]
@@ -885,7 +845,6 @@
         }
 
         [CsvExportColumn("LocalZone1ExitPointX", 39)]
-        [Label("Zone 1 exit point (X-local)")]
         [Format("F3")]
         [PropertyOrder(3, 6)]
         [Unit(UnitType.Length)]
@@ -897,7 +856,6 @@
         }
 
         [CsvExportColumn("Zone1ExitPointX", 40)]
-        [Label("Zone 1 exit point (X-global)")]
         [Format("F3")]
         [PropertyOrder(3, 7)]
         [Unit(UnitType.Length)]
@@ -917,7 +875,6 @@
         }
 
         [CsvExportColumn("Zone1ExitPointY", 41)]
-        [Label("Zone 1 exit point (Y-global)")]
         [Format("F3")]
         [PropertyOrder(3, 8)]
         [Unit(UnitType.Length)]
@@ -937,7 +894,6 @@
         }
 
         [CsvExportColumn("Zone1ExitPointZ", 42)]
-        [Label("Zone 1 exit point (Z)")]
         [Format("F3")]
         [PropertyOrder(3, 9)]
         [Unit(UnitType.Length)]
@@ -955,7 +911,6 @@
         }
 
         [CsvExportColumn("Zone2SafetyFactorStability", 43)]
-        [Label("Zone 2 safety factor")]
         [Format("F3")]
         [PropertyOrder(3, 10)]
         [Unit(UnitType.None)]
@@ -967,7 +922,6 @@
         }
 
         [CsvExportColumn("LocalZone2EntryPointX", 44)]
-        [Label("Zone 2 entry point (X-local)")]
         [Format("F3")]
         [PropertyOrder(3, 11)]
         [Unit(UnitType.Length)]
@@ -979,7 +933,6 @@
         }
 
         [CsvExportColumn("Zone2EntryPointX", 45)]
-        [Label("Zone 2 entry point (X-global)")]
         [Format("F3")]
         [PropertyOrder(3, 12)]
         [Unit(UnitType.Length)]
@@ -1000,7 +953,6 @@
         }
 
         [CsvExportColumn("Zone2EntryPointY", 46)]
-        [Label("Zone 2 entry point (Y-global)")]
         [Format("F3")]
         [PropertyOrder(3, 13)]
         [Unit(UnitType.Length)]
@@ -1021,7 +973,6 @@
         }
 
         [CsvExportColumn("Zone2EntryPointZ", 47)]
-        [Label("Zone 2 entry point (Z)")]
         [Format("F3")]
         [PropertyOrder(3, 14)]
         [Unit(UnitType.Length)]
@@ -1039,7 +990,6 @@
         }
 
         [CsvExportColumn("LocalZone2ExitPointX", 48)]
-        [Label("Zone 2 exit point (X-local)")]
         [Format("F3")]
         [PropertyOrder(3, 15)]
         [Unit(UnitType.Length)]
@@ -1051,7 +1001,6 @@
         }
 
         [CsvExportColumn("Zone2ExitPointX", 49)]
-        [Label("Zone 2 exit point (X-global)")]
         [Format("F3")]
         [PropertyOrder(3, 16)]
         [Unit(UnitType.Length)]
@@ -1071,7 +1020,6 @@
         }
 
         [CsvExportColumn("Zone2ExitPointY", 50)]
-        [Label("Zone 2 exit point (Y-global)")]
         [Format("F3")]
         [PropertyOrder(3, 17)]
         [Unit(UnitType.Length)]
@@ -1091,7 +1039,7 @@
         }
 
         [CsvExportColumn("Zone2ExitPointZ", 51)]
-        [Label("Zone 2 exit point (Z)")]
+        
         [Format("F3")]
         [PropertyOrder(3, 18)]
         [Unit(UnitType.Length)]
@@ -1107,7 +1055,6 @@
         }
 
         [CsvExportColumn("IsUplift", 52)]
-        [Label("Uplift")]
         [PropertyOrder(1, 4)]
         [ReadOnly(true)]
         public bool? IsUplift
@@ -1117,7 +1064,6 @@
         }
 
         [CsvExportColumn("Pl3MinUplift", 53)]
-        [Label("PL3 Min uplift")]
         [Format("F3")]
         [PropertyOrder(5, 1)]
         [Unit(UnitType.None)]
@@ -1129,7 +1075,6 @@
         }
 
         [CsvExportColumn("Pl3HeadAdjusted", 54)]
-        [Label("PL3 Head adjusted")]
         [Format("F3")]
         [PropertyOrder(5, 2)]
         [Unit(UnitType.Length)]
@@ -1141,7 +1086,6 @@
         }
 
         [CsvExportColumn("pl3LocalLocationXMinUplift", 55)]
-        [Label("PL3 Min uplift (X-local)")]
         [Format("F3")]
         [PropertyOrder(5, 3)]
         [Unit(UnitType.Length)]
@@ -1153,7 +1097,6 @@
         }
 
         [CsvExportColumn("Pl3LocationXMinUplift", 56)]
-        [Label("PL3 Min uplift (X-global)")]
         [Format("F3")]
         [PropertyOrder(5, 4)]
         [Unit(UnitType.Length)]
@@ -1174,7 +1117,6 @@
         }
 
         [CsvExportColumn("Pl3LocationYMinUplift", 57)]
-        [Label("PL3 Min uplift (Y-global)")]
         [Format("F3")]
         [PropertyOrder(5, 5)]
         [Unit(UnitType.Length)]
@@ -1195,7 +1137,6 @@
         }
 
         [CsvExportColumn("Pl4MinUplift", 58)]
-        [Label("PL4 Min uplift")]
         [Format("F3")]
         [PropertyOrder(5, 6)]
         [Unit(UnitType.None)]
@@ -1207,7 +1148,6 @@
         }
 
         [CsvExportColumn("Pl4HeadAdjusted", 59)]
-        [Label("PL4 Head adjusted")]
         [Format("F3")]
         [PropertyOrder(5, 7)]
         [Unit(UnitType.Length)]
@@ -1219,7 +1159,6 @@
         }
 
         [CsvExportColumn("pl4LocalLocationXMinUplift", 60)]
-        [Label("PL4 Min uplift (X-local)")]
         [Format("F3")]
         [PropertyOrder(5, 8)]
         [Unit(UnitType.Length)]
@@ -1231,7 +1170,6 @@
         }
 
         [CsvExportColumn("Pl4LocationXMinUplift", 61)]
-        [Label("PL4 Min uplift (X-global)")]
         [Format("F3")]
         [PropertyOrder(5, 9)]
         [Unit(UnitType.Length)]
@@ -1252,7 +1190,6 @@
         }
 
         [CsvExportColumn("Pl4LocationYMinUplift", 62)]
-        [Label("PL4 Min uplift (Y-global)")]
         [Format("F3")]
         [PropertyOrder(5, 10)]
         [Unit(UnitType.Length)]
@@ -1272,7 +1209,6 @@
             }
         }
 
-        [Label("Uplift Factor")]
         [Format("F3")]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
@@ -1306,7 +1242,6 @@
         }
 
         [CsvExportColumn("BlighHCritical", 64)]
-        [Label("Bligh H critical")]
         [Format("F3")]
         [Unit(UnitType.Length)]
         [ReadOnly(true)]
@@ -1318,7 +1253,6 @@
         }
 
         [CsvExportColumn("Sellmeijer2ForcesPipingFactor", 65)]
-        [Label("Sellmeijer 2 piping factor")]
         [Format("F3")]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
@@ -1330,7 +1264,6 @@
         }
 
         [CsvExportColumn("Sellmeijer2ForcesHCritical", 66)]
-        [Label("Sellmeijer 2 H Critical")]
         [Format("F3")]
         [Unit(UnitType.Length)]
         [ReadOnly(true)]
@@ -1342,7 +1275,6 @@
         }
 
         [CsvExportColumn("Sellmeijer4ForcesPipingFactor", 67)]
-        [Label("Sellmeijer 4 piping factor")]
         [Format("F3")]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
@@ -1354,7 +1286,6 @@
         }
 
         [CsvExportColumn("Sellmeijer4ForcesHCritical", 68)]
-        [Label("Sellmeijer 4 H Critical")]
         [Format("F3")]
         [Unit(UnitType.Length)]
         [ReadOnly(true)]
@@ -1366,7 +1297,6 @@
         }
 
         [CsvExportColumn("SellmeijerPipingFactor", 69)]
-        [Label("Sellmeijer piping factor")]
         [Format("F3")]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
@@ -1378,7 +1308,7 @@
         }
 
         [CsvExportColumn("SellmeijerHCritical", 70)]
-        [Label("Sellmeijer H Critical")]
+        
         [Format("F3")]
         [Unit(UnitType.Length)]
         [ReadOnly(true)]
@@ -1938,7 +1868,6 @@
             }
         }
 
-        [Label("Profile")]
         [PropertyOrder(2, 1)]
         [XmlIgnore]
         [ReadOnly(true)]
@@ -1975,7 +1904,6 @@
             return soilprofilename;
         }
 
-        [Label("Profile probability")]
         [Format("F3")]
         [PropertyOrder(2, 2)]
         [Unit(UnitType.Fractions)]
@@ -2001,7 +1929,6 @@
             }
         }
 
-        [Label("StabilityModel")]
         [Unit(UnitType.None)]
         [PropertyOrder(2, 3)]
         [ReadOnly(true)]
@@ -2014,7 +1941,6 @@
             set { stabilityModel = value; }
         }
 
-        [Label("SafetyFactor")]
         [Unit(UnitType.None)]
         [Format("F3")]
         [PropertyOrder(2, 4)]
@@ -2040,7 +1966,6 @@
             }
         }
 
-        [Label("Failure probability")]
         [Format("F3")]
         [PropertyOrder(2, 5)]
         [Unit(UnitType.None)]
@@ -2066,7 +1991,6 @@
             }            
         }
 
-        [Label("Required failure probability")]
         [Format("F3")]
         [PropertyOrder(2, 9)]
         [Unit(UnitType.None)]
@@ -2087,7 +2011,6 @@
             }
         }
 
-        [Label("Required safety factor")]
         [Format("F3")]
         [PropertyOrder(2, 10)]
         [Unit(UnitType.None)]
@@ -2114,7 +2037,6 @@
             }            
         }
 
-        [Label("Shoulder height")]
         [Format("F3")]
         [PropertyOrder(2, 5)]
         [Unit(UnitType.Length)]
@@ -2138,7 +2060,6 @@
             }
         }
 
-        [Label("Toe polder")]
         [Format("F3")]
         [PropertyOrder(2, 7)]
         [Unit(UnitType.Length)]
@@ -2162,7 +2083,6 @@
             }
         }
 
-        [Label("Height toe polder")]
         [Format("F3")]
         [PropertyOrder(2, 8)]
         [Unit(UnitType.Length)]
@@ -2186,7 +2106,6 @@
             }
         }
 
-        [Label("Piping model")]
         [PropertyOrder(6, 1)]
         [Unit(UnitType.None)]
         [ReadOnly(true)]
@@ -2203,7 +2122,6 @@
             }
         }
 
-        [Label("Piping factor")]
         [Format("F3")]
         [PropertyOrder(6, 2)]
         [Unit(UnitType.None)]
@@ -2239,7 +2157,6 @@
             }
         }
 
-        [Label("Piping entry point (X-local)")]
         [Format("F3")]
         [PropertyOrder(6, 3)]
         [Unit(UnitType.Length)]
@@ -2260,7 +2177,6 @@
             }
         }
 
-        [Label("Piping entry point (X-global)")]
         [Format("F3")]
         [PropertyOrder(6, 4)]
         [Unit(UnitType.Length)]
@@ -2280,7 +2196,6 @@
             }
         }
 
-        [Label("Piping entry point (Y-global)")]
         [Format("F3")]
         [PropertyOrder(6, 5)]
         [Unit(UnitType.Length)]
@@ -2300,7 +2215,6 @@
             }
         }
 
-        [Label("Piping exit point (X-local)")]
         [Format("F3")]
         [PropertyOrder(6, 6)]
         [Unit(UnitType.Length)]
@@ -2311,7 +2225,6 @@
             set { localPipingExitPointX = value; }
         }
 
-        [Label("Piping exit point (X-global)")]
         [Format("F3")]
         [PropertyOrder(6, 7)]
         [Unit(UnitType.Length)]
@@ -2331,7 +2244,6 @@
             }
         }
 
-        [Label("Piping exit point (Y-global)")]
         [Format("F3")]
         [PropertyOrder(6, 8)]
         [Unit(UnitType.Length)]
@@ -2360,7 +2272,6 @@
             get { return localPipingExitPointX - LocalPipingEntryPointX; }
         }
 
-        [Label("H critical")]
         [Format("F3")]
         [PropertyOrder(6, 10)]
         [Unit(UnitType.Length)]
@@ -2410,8 +2321,7 @@
             set { calculationSubDir = value; }
         }
 
-        [Label("Evaluation")]
-        //[Category(ResultCategory)]
+        
         public ResultEvaluation ResultEvaluation
         {
             get { return resultEvaluation; }
@@ -2423,9 +2333,7 @@
             }
         }
 
-        [Label("Notes")]
         [Description("Use this area to explain the valuation and for any further remarks")]
-        //[Category(ResultCategory)]
         public string Notes
         {
             get { return notes; }