Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r3860db11c483c9bd2de58f9795a57b3a85ab5be6 -r3d2194c3a340866e57c66e873601cbf4cc35f5c5 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3860db11c483c9bd2de58f9795a57b3a85ab5be6) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3d2194c3a340866e57c66e873601cbf4cc35f5c5) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2017. All rights reserved. +// Copyright (C) Stichting Deltares 2017. All rights reserved. // // This file is part of Ringtoets. // @@ -1004,7 +1004,9 @@ } /// - /// Looks up a localized string similar to Verzadigd gewicht (standaardafwijking) [kN/m³]. + /// Looks up a localized string similar to Verzadigd gewicht + ///(standaardafwijking) + ///[kN/m³]. /// public static string PipingSoilLayerTable_ColumnHeader_BelowPhreaticLevelDeviation { get { @@ -1013,7 +1015,9 @@ } /// - /// Looks up a localized string similar to Verzadigd gewicht (verwachtingswaarde) [kN/m³]. + /// Looks up a localized string similar to Verzadigd gewicht + ///(verwachtingswaarde) + ///[kN/m³]. /// public static string PipingSoilLayerTable_ColumnHeader_BelowPhreaticLevelMean { get { @@ -1022,7 +1026,9 @@ } /// - /// Looks up a localized string similar to Verzadigd gewicht (verschuiving) [kN/m³]. + /// Looks up a localized string similar to Verzadigd gewicht + ///(verschuiving) + ///[kN/m³]. /// public static string PipingSoilLayerTable_ColumnHeader_BelowPhreaticLevelShift { get { @@ -1040,7 +1046,9 @@ } /// - /// Looks up a localized string similar to d70 (variatiecoëfficiënt) [-]. + /// Looks up a localized string similar to d70 + ///(variatiecoëfficiënt) + ///[-]. /// public static string PipingSoilLayerTable_ColumnHeader_DiameterD70CoefficientOfVariation { get { @@ -1049,7 +1057,9 @@ } /// - /// Looks up a localized string similar to d70 (verwachtingswaarde) [m]. + /// Looks up a localized string similar to d70 + ///(verwachtingswaarde) + ///[m]. /// public static string PipingSoilLayerTable_ColumnHeader_DiameterD70Mean { get { @@ -1076,7 +1086,9 @@ } /// - /// Looks up a localized string similar to Doorlatendheid (variatiecoëfficiënt) [-]. + /// Looks up a localized string similar to Doorlatendheid + ///(variatiecoëfficiënt) + ///[-]. /// public static string PipingSoilLayerTable_ColumnHeader_PermeabilityCoefficientOfVariation { get { @@ -1085,7 +1097,9 @@ } /// - /// Looks up a localized string similar to Doorlatendheid (verwachtingswaarde) [m/s]. + /// Looks up a localized string similar to Doorlatendheid + ///(verwachtingswaarde) + ///[m/s]. /// public static string PipingSoilLayerTable_ColumnHeader_PermeabilityMean { get { @@ -1094,7 +1108,8 @@ } /// - /// Looks up a localized string similar to Topniveau [m+NAP]. + /// Looks up a localized string similar to Topniveau + ///[m+NAP]. /// public static string PipingSoilLayerTable_ColumnHeader_Top { get { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r3860db11c483c9bd2de58f9795a57b3a85ab5be6 -r3d2194c3a340866e57c66e873601cbf4cc35f5c5 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 3860db11c483c9bd2de58f9795a57b3a85ab5be6) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 3d2194c3a340866e57c66e873601cbf4cc35f5c5) @@ -452,31 +452,46 @@ Kleur - Topniveau [m+NAP] + Topniveau +[m+NAP] Is aquifer - Doorlatendheid (verwachtingswaarde) [m/s] + Doorlatendheid +(verwachtingswaarde) +[m/s] - Doorlatendheid (variatiecoëfficiënt) [-] + Doorlatendheid +(variatiecoëfficiënt) +[-] - d70 (verwachtingswaarde) [m] + d70 +(verwachtingswaarde) +[m] - d70 (variatiecoëfficiënt) [-] + d70 +(variatiecoëfficiënt) +[-] - Verzadigd gewicht (verwachtingswaarde) [kN/m³] + Verzadigd gewicht +(verwachtingswaarde) +[kN/m³] - Verzadigd gewicht (standaardafwijking) [kN/m³] + Verzadigd gewicht +(standaardafwijking) +[kN/m³] - Verzadigd gewicht (verschuiving) [kN/m³] + Verzadigd gewicht +(verschuiving) +[kN/m³] De locatie van het bestand waaruit de profielschematisaties zijn geïmporteerd. Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSoilLayerTableTest.cs =================================================================== diff -u -rc5c520903649e40b5a48611051705c07c95672e9 -r3d2194c3a340866e57c66e873601cbf4cc35f5c5 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSoilLayerTableTest.cs (.../PipingSoilLayerTableTest.cs) (revision c5c520903649e40b5a48611051705c07c95672e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSoilLayerTableTest.cs (.../PipingSoilLayerTableTest.cs) (revision 3d2194c3a340866e57c66e873601cbf4cc35f5c5) @@ -62,23 +62,23 @@ DataGridViewColumn colorColumn = table.GetColumnFromIndex(colorColumnIndex); Assert.AreEqual("Kleur", colorColumn.HeaderText); DataGridViewColumn topColumn = table.GetColumnFromIndex(topColumnIndex); - Assert.AreEqual("Topniveau [m+NAP]", topColumn.HeaderText); + Assert.AreEqual("Topniveau\r\n[m+NAP]", topColumn.HeaderText); DataGridViewColumn isAquiferColumn = table.GetColumnFromIndex(isAquiferColumnIndex); Assert.AreEqual("Is aquifer", isAquiferColumn.HeaderText); DataGridViewColumn permeabilityMeanColumn = table.GetColumnFromIndex(permeabilityMeanColumnIndex); - Assert.AreEqual("Doorlatendheid (verwachtingswaarde) [m/s]", permeabilityMeanColumn.HeaderText); + Assert.AreEqual("Doorlatendheid\r\n(verwachtingswaarde)\r\n[m/s]", permeabilityMeanColumn.HeaderText); DataGridViewColumn permeabilityCoefficientOfVariationColumn = table.GetColumnFromIndex(permeabilityCoefficientOfVariationColumnIndex); - Assert.AreEqual("Doorlatendheid (variatiecoëfficiënt) [-]", permeabilityCoefficientOfVariationColumn.HeaderText); + Assert.AreEqual("Doorlatendheid\r\n(variatiecoëfficiënt)\r\n[-]", permeabilityCoefficientOfVariationColumn.HeaderText); DataGridViewColumn d70MeanColumn = table.GetColumnFromIndex(d70MeanColumnIndex); - Assert.AreEqual("d70 (verwachtingswaarde) [m]", d70MeanColumn.HeaderText); + Assert.AreEqual("d70\r\n(verwachtingswaarde)\r\n[m]", d70MeanColumn.HeaderText); DataGridViewColumn d70DeviationColumn = table.GetColumnFromIndex(d70CoefficientOfVariationColumnIndex); - Assert.AreEqual("d70 (variatiecoëfficiënt) [-]", d70DeviationColumn.HeaderText); + Assert.AreEqual("d70\r\n(variatiecoëfficiënt)\r\n[-]", d70DeviationColumn.HeaderText); DataGridViewColumn belowPhreaticLevelWeightMeanColumn = table.GetColumnFromIndex(belowPhreaticLevelWeightMeanColumnIndex); - Assert.AreEqual("Verzadigd gewicht (verwachtingswaarde) [kN/m³]", belowPhreaticLevelWeightMeanColumn.HeaderText); + Assert.AreEqual("Verzadigd gewicht\r\n(verwachtingswaarde)\r\n[kN/m³]", belowPhreaticLevelWeightMeanColumn.HeaderText); DataGridViewColumn belowPhreaticLevelWeightDeviationColumn = table.GetColumnFromIndex(belowPhreaticLevelWeightDeviationColumnIndex); - Assert.AreEqual("Verzadigd gewicht (standaardafwijking) [kN/m³]", belowPhreaticLevelWeightDeviationColumn.HeaderText); + Assert.AreEqual("Verzadigd gewicht\r\n(standaardafwijking)\r\n[kN/m³]", belowPhreaticLevelWeightDeviationColumn.HeaderText); DataGridViewColumn belowPhreaticLevelWeightShiftColumn = table.GetColumnFromIndex(belowPhreaticLevelWeightShiftColumnIndex); - Assert.AreEqual("Verzadigd gewicht (verschuiving) [kN/m³]", belowPhreaticLevelWeightShiftColumn.HeaderText); + Assert.AreEqual("Verzadigd gewicht\r\n(verschuiving)\r\n[kN/m³]", belowPhreaticLevelWeightShiftColumn.HeaderText); Assert.Throws(() => table.GetColumnFromIndex(belowPhreaticLevelWeightShiftColumnIndex + 1));