Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSoilLayerDataTable.cs =================================================================== diff -u -r117a54dfd9b5972086a1f3386923edda2e7a334b -rd1c40c91c5e11b751a84980b3edd736bc7d6a571 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSoilLayerDataTable.cs (.../MacroStabilityInwardsSoilLayerDataTable.cs) (revision 117a54dfd9b5972086a1f3386923edda2e7a334b) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsSoilLayerDataTable.cs (.../MacroStabilityInwardsSoilLayerDataTable.cs) (revision d1c40c91c5e11b751a84980b3edd736bc7d6a571) @@ -62,31 +62,31 @@ Resources.MacroStabilityInwardsSoilLayerData_IsAquifer_DisplayName, true); AddTextBoxColumn(nameof(MacroStabilityInwardsFormattedSoilLayerDataRow.AbovePhreaticLevel), - $"{Resources.MacroStabilityInwardsSoilLayerData_AbovePhreaticLevel_DisplayName} {Resources.Unit_KiloNewtonPerCubicMeter}", + $"{Resources.MacroStabilityInwardsSoilLayerData_AbovePhreaticLevel_DisplayName}\r\n{Resources.Unit_KiloNewtonPerCubicMeter}", true); AddTextBoxColumn(nameof(MacroStabilityInwardsFormattedSoilLayerDataRow.BelowPhreaticLevel), - $"{Resources.MacroStabilityInwardsSoilLayerData_BelowPhreaticLevel_DisplayName} {Resources.Unit_KiloNewtonPerCubicMeter}", + $"{Resources.MacroStabilityInwardsSoilLayerData_BelowPhreaticLevel_DisplayName}\r\n{Resources.Unit_KiloNewtonPerCubicMeter}", true); AddTextBoxColumn(nameof(MacroStabilityInwardsFormattedSoilLayerDataRow.ShearStrengthModel), Resources.MacroStabilityInwardsSoilLayerData_ShearStrengthModel_DisplayName, true); AddTextBoxColumn(nameof(MacroStabilityInwardsFormattedSoilLayerDataRow.Cohesion), - $"{Resources.Cohesion_DisplayName} {Resources.Unit_KiloNewtonPerSquareMeter}", + $"{Resources.Cohesion_DisplayName}\r\n{Resources.Unit_KiloNewtonPerSquareMeter}", true); AddTextBoxColumn(nameof(MacroStabilityInwardsFormattedSoilLayerDataRow.FrictionAngle), - $"{Resources.FrictionAngle_DisplayName} {Resources.Unit_Degree}", + $"{Resources.FrictionAngle_DisplayName}\r\n{Resources.Unit_Degree}", true); AddTextBoxColumn(nameof(MacroStabilityInwardsFormattedSoilLayerDataRow.ShearStrengthRatio), - $"{Resources.MacroStabilityInwardsSoilLayerData_ShearStrengthRatio_DisplayName} {Resources.Unit_None}", + $"{Resources.MacroStabilityInwardsSoilLayerData_ShearStrengthRatio_DisplayName}\r\n{Resources.Unit_None}", true); AddTextBoxColumn(nameof(MacroStabilityInwardsFormattedSoilLayerDataRow.StrengthIncreaseExponent), - $"{Resources.MacroStabilityInwardsSoilLayerData_StrengthIncreaseExponent_DisplayName} {Resources.Unit_None}", + $"{Resources.MacroStabilityInwardsSoilLayerData_StrengthIncreaseExponent_DisplayName}\r\n{Resources.Unit_None}", true); AddCheckBoxColumn(nameof(MacroStabilityInwardsFormattedSoilLayerDataRow.UsePop), Resources.MacroStabilityInwardsSoilLayerData_UsePop_DisplayName, true); AddTextBoxColumn(nameof(MacroStabilityInwardsFormattedSoilLayerDataRow.Pop), - $"{Resources.Pop_DisplayName} {Resources.Unit_KiloNewtonPerSquareMeter}", + $"{Resources.Pop_DisplayName}\r\n{Resources.Unit_KiloNewtonPerSquareMeter}", true); } } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSoilLayerDataTableTest.cs =================================================================== diff -u -rc2b77b22666a09fdc2348440c76cd37325aeba7d -rd1c40c91c5e11b751a84980b3edd736bc7d6a571 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSoilLayerDataTableTest.cs (.../MacroStabilityInwardsSoilLayerDataTableTest.cs) (revision c2b77b22666a09fdc2348440c76cd37325aeba7d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsSoilLayerDataTableTest.cs (.../MacroStabilityInwardsSoilLayerDataTableTest.cs) (revision d1c40c91c5e11b751a84980b3edd736bc7d6a571) @@ -63,23 +63,23 @@ DataGridViewColumn isAquiferColumn = table.GetColumnFromIndex(isAquiferColumnIndex); Assert.AreEqual("Is aquifer", isAquiferColumn.HeaderText); DataGridViewColumn abovePhreaticLevelColumn = table.GetColumnFromIndex(abovePhreaticLevelColumnIndex); - Assert.AreEqual("Onverzadigd gewicht [kN/m³]", abovePhreaticLevelColumn.HeaderText); + Assert.AreEqual("Onverzadigd gewicht\r\n[kN/m³]", abovePhreaticLevelColumn.HeaderText); DataGridViewColumn belowPhreaticLevelColumn = table.GetColumnFromIndex(belowPhreaticLevelColumnIndex); - Assert.AreEqual("Verzadigd gewicht [kN/m³]", belowPhreaticLevelColumn.HeaderText); + Assert.AreEqual("Verzadigd gewicht\r\n[kN/m³]", belowPhreaticLevelColumn.HeaderText); DataGridViewColumn shearStrengthModelColumn = table.GetColumnFromIndex(shearStrengthModelColumnIndex); Assert.AreEqual("Schuifsterkte model", shearStrengthModelColumn.HeaderText); DataGridViewColumn cohesionColumn = table.GetColumnFromIndex(cohesionColumnIndex); - Assert.AreEqual("Cohesie [kN/m²]", cohesionColumn.HeaderText); + Assert.AreEqual("Cohesie\r\n[kN/m²]", cohesionColumn.HeaderText); DataGridViewColumn frictionAngleColumn = table.GetColumnFromIndex(frictionAngleColumnIndex); - Assert.AreEqual("Wrijvingshoek [°]", frictionAngleColumn.HeaderText); + Assert.AreEqual("Wrijvingshoek\r\n[°]", frictionAngleColumn.HeaderText); DataGridViewColumn shrearStrengthRatioColumn = table.GetColumnFromIndex(shrearStrengthRatioColumnIndex); - Assert.AreEqual("Schuifsterkte ratio (S) [-]", shrearStrengthRatioColumn.HeaderText); + Assert.AreEqual("Schuifsterkte ratio (S)\r\n[-]", shrearStrengthRatioColumn.HeaderText); DataGridViewColumn strengthIncreaseExponentColumn = table.GetColumnFromIndex(strengthIncreaseExponentColumnIndex); - Assert.AreEqual("Sterkte toename exp (m) [-]", strengthIncreaseExponentColumn.HeaderText); + Assert.AreEqual("Sterkte toename exp (m)\r\n[-]", strengthIncreaseExponentColumn.HeaderText); DataGridViewColumn usePopColumn = table.GetColumnFromIndex(usePopColumnIndex); Assert.AreEqual("Gebruik POP", usePopColumn.HeaderText); DataGridViewColumn popColumn = table.GetColumnFromIndex(popColumnIndex); - Assert.AreEqual("POP [kN/m²]", popColumn.HeaderText); + Assert.AreEqual("POP\r\n[kN/m²]", popColumn.HeaderText); Assert.Throws(() => table.GetColumnFromIndex(popColumnIndex + 1));