Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r2b9e80f0d003d30c57fae2f16f25acaf9b58d2d2 -r23773f2915c16d8f4d86b6bba06769ffc8e4032d --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2b9e80f0d003d30c57fae2f16f25acaf9b58d2d2) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 23773f2915c16d8f4d86b6bba06769ffc8e4032d) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -735,42 +735,6 @@ } /// - /// Looks up a localized string similar to De representatieve waarde die gebruikt wordt door de berekening.. - /// - public static string DesignVariableTypeConverter_DesignValue_Description { - get { - return ResourceManager.GetString("DesignVariableTypeConverter_DesignValue_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Rekenwaarde. - /// - public static string DesignVariableTypeConverter_DesignValue_DisplayName { - get { - return ResourceManager.GetString("DesignVariableTypeConverter_DesignValue_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Type verdeling. - /// - public static string DesignVariableTypeConverter_DestributionType_DisplayName { - get { - return ResourceManager.GetString("DesignVariableTypeConverter_DestributionType_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Het soort kansverdeling waarin deze parameter gedefinieerd wordt.. - /// - public static string DesignVariableTypeConverter_DistributionType_Description { - get { - return ResourceManager.GetString("DesignVariableTypeConverter_DistributionType_Description", resourceCulture); - } - } - - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap DocumentHS { @@ -1681,16 +1645,6 @@ } /// - /// Looks up a localized string similar to Profielmeting {0} bevat aaneengesloten dubbele geometrie punten, welke zijn genegeerd.. - /// - public static string PipingSurfaceLinesCsvImporter_SurfaceLine_0_has_multiple_duplicate_geometry_points_and_is_ignored { - get { - return ResourceManager.GetString("PipingSurfaceLinesCsvImporter_SurfaceLine_0_has_multiple_duplicate_geometry_point" + - "s_and_is_ignored", resourceCulture); - } - } - - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap PlayAll { Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx =================================================================== diff -u -r2b9e80f0d003d30c57fae2f16f25acaf9b58d2d2 -r23773f2915c16d8f4d86b6bba06769ffc8e4032d --- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 2b9e80f0d003d30c57fae2f16f25acaf9b58d2d2) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 23773f2915c16d8f4d86b6bba06769ffc8e4032d) @@ -749,18 +749,6 @@ Aantal ({0}) - - Type verdeling - - - Het soort kansverdeling waarin deze parameter gedefinieerd wordt. - - - Rekenwaarde - - - De representatieve waarde die gebruikt wordt door de berekening. - Nieuwe map toevoegen @@ -803,9 +791,6 @@ Sluiten van huidig project. - - Profielmeting {0} bevat aaneengesloten dubbele geometrie punten, welke zijn genegeerd. - Onbekend Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r83b9621346f7f3ca887096468de965815eb609ac -r23773f2915c16d8f4d86b6bba06769ffc8e4032d --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 83b9621346f7f3ca887096468de965815eb609ac) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 23773f2915c16d8f4d86b6bba06769ffc8e4032d) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -152,6 +152,42 @@ } /// + /// Looks up a localized string similar to De representatieve waarde die gebruikt wordt door de berekening.. + /// + public static string DesignVariableTypeConverter_DesignValue_Description { + get { + return ResourceManager.GetString("DesignVariableTypeConverter_DesignValue_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Rekenwaarde. + /// + public static string DesignVariableTypeConverter_DesignValue_DisplayName { + get { + return ResourceManager.GetString("DesignVariableTypeConverter_DesignValue_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Type verdeling. + /// + public static string DesignVariableTypeConverter_DestributionType_DisplayName { + get { + return ResourceManager.GetString("DesignVariableTypeConverter_DestributionType_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Het soort kansverdeling waarin deze parameter gedefinieerd wordt.. + /// + public static string DesignVariableTypeConverter_DistributionType_Description { + get { + return ResourceManager.GetString("DesignVariableTypeConverter_DistributionType_Description", resourceCulture); + } + } + + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap FolderIcon { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r83b9621346f7f3ca887096468de965815eb609ac -r23773f2915c16d8f4d86b6bba06769ffc8e4032d --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 83b9621346f7f3ca887096468de965815eb609ac) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 23773f2915c16d8f4d86b6bba06769ffc8e4032d) @@ -508,4 +508,16 @@ Invoer + + De representatieve waarde die gebruikt wordt door de berekening. + + + Rekenwaarde + + + Type verdeling + + + Het soort kansverdeling waarin deze parameter gedefinieerd wordt. + \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs =================================================================== diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -r23773f2915c16d8f4d86b6bba06769ffc8e4032d --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs (.../DesignVariableTypeConverter.cs) (revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs (.../DesignVariableTypeConverter.cs) (revision 23773f2915c16d8f4d86b6bba06769ffc8e4032d) @@ -4,14 +4,15 @@ using System.Linq; using System.Linq.Expressions; using Core.Common.Base; -using Core.Common.Gui.Properties; using Core.Common.Utils.PropertyBag.Dynamic; using Ringtoets.Piping.Data.Probabilistics; using Ringtoets.Piping.Forms.PresentationObjects; using Ringtoets.Piping.Forms.PropertyClasses; using Ringtoets.Piping.Forms.TypeConverters.PropertyDescriptors; +using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources; + namespace Ringtoets.Piping.Forms.TypeConverters { /// @@ -44,16 +45,16 @@ var designVariable = (DesignVariable)value; PropertyDescriptorCollection propertyDescriptorCollection = TypeDescriptor.GetProperties(designVariable.Distribution); var properties = new PropertyDescriptor[Parameters.Length+2]; - properties[0] = new SimpleReadonlyPropertyDescriptorItem(Resources.DesignVariableTypeConverter_DestributionType_DisplayName, - Resources.DesignVariableTypeConverter_DistributionType_Description, + properties[0] = new SimpleReadonlyPropertyDescriptorItem(PipingFormsResources.DesignVariableTypeConverter_DestributionType_DisplayName, + PipingFormsResources.DesignVariableTypeConverter_DistributionType_Description, "DistributionType", DistributionShortName); for (int i = 0; i < Parameters.Length; i++) { properties[i+1] = CreatePropertyDescriptor(propertyDescriptorCollection, Parameters[i], observableParent); } - properties[Parameters.Length + 1] = new SimpleReadonlyPropertyDescriptorItem(Resources.DesignVariableTypeConverter_DesignValue_DisplayName, - Resources.DesignVariableTypeConverter_DesignValue_Description, + properties[Parameters.Length + 1] = new SimpleReadonlyPropertyDescriptorItem(PipingFormsResources.DesignVariableTypeConverter_DesignValue_DisplayName, + PipingFormsResources.DesignVariableTypeConverter_DesignValue_Description, "DesignValue", designVariable.GetDesignValue()); Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs =================================================================== diff -u -ra5b6ad37f1dff6447a17f0f8ea3fc47a5517c2e1 -r23773f2915c16d8f4d86b6bba06769ffc8e4032d --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision a5b6ad37f1dff6447a17f0f8ea3fc47a5517c2e1) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision 23773f2915c16d8f4d86b6bba06769ffc8e4032d) @@ -5,7 +5,6 @@ using System.Linq; using Core.Common.Base; using Core.Common.Base.IO; -using Core.Common.Gui.Properties; using log4net; @@ -15,7 +14,7 @@ using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources; using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources; -using ApplicationResources = Ringtoets.Piping.Plugin.Properties.Resources; +using RingtoetsPluginResources = Ringtoets.Piping.Plugin.Properties.Resources; namespace Ringtoets.Piping.Plugin.FileImporter { @@ -71,7 +70,7 @@ get { return String.Format("{0} {1} (*.csv)|*.csv", - PipingFormsResources.PipingSurfaceLinesCollection_DisplayName, ApplicationResources.Csv_file_name); + PipingFormsResources.PipingSurfaceLinesCollection_DisplayName, RingtoetsPluginResources.Csv_file_name); } } @@ -126,7 +125,7 @@ return HandleCriticalError(path, e); } - var stepName = String.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_Read_PipingSurfaceLines_0_, + var stepName = String.Format(RingtoetsPluginResources.PipingSurfaceLinesCsvImporter_Read_PipingSurfaceLines_0_, Path.GetFileName(path)); int itemCount; @@ -157,7 +156,7 @@ } catch (LineParseException e) { - var message = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_ReadPipingSurfaceLines_ParseErrorMessage_0_SurfaceLine_skipped, + var message = string.Format(RingtoetsPluginResources.PipingSurfaceLinesCsvImporter_ReadPipingSurfaceLines_ParseErrorMessage_0_SurfaceLine_skipped, e.Message); log.Error(message); } @@ -192,23 +191,23 @@ if (consecutiveDuplicatePointIndices.Any()) { - log.WarnFormat(Resources.PipingSurfaceLinesCsvImporter_SurfaceLine_0_has_multiple_duplicate_geometry_points_and_is_ignored, + log.WarnFormat(RingtoetsPluginResources.PipingSurfaceLinesCsvImporter_SurfaceLine_0_has_multiple_duplicate_geometry_points_and_is_ignored, ringtoetsPipingSurfaceLine.Name); ringtoetsPipingSurfaceLine.SetGeometry(readPoints.Where((p, index) => !consecutiveDuplicatePointIndices.Contains(index))); } } private PipingReadResult HandleCriticalError(string path, Exception e) { - var message = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, + var message = string.Format(RingtoetsPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, e.Message); log.Error(message); return new PipingReadResult(true); } private void AddImportedDataToModel(object target, ICollection readSurfaceLines) { - NotifyProgress(ApplicationResources.PipingSurfaceLinesCsvImporter_Adding_imported_data_to_model, readSurfaceLines.Count, readSurfaceLines.Count); + NotifyProgress(RingtoetsPluginResources.PipingSurfaceLinesCsvImporter_Adding_imported_data_to_model, readSurfaceLines.Count, readSurfaceLines.Count); var targetCollection = (ICollection)target; foreach (var readSurfaceLine in readSurfaceLines) @@ -225,7 +224,7 @@ private void HandleUserCancellingImport() { - log.Info(ApplicationResources.PipingSurfaceLinesCsvImporter_Import_Import_cancelled); + log.Info(RingtoetsPluginResources.PipingSurfaceLinesCsvImporter_Import_Import_cancelled); shouldCancel = false; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -rbf306ed5e8bab6bbe0bd42bbcaf4e7ed64738aa5 -r23773f2915c16d8f4d86b6bba06769ffc8e4032d --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bf306ed5e8bab6bbe0bd42bbcaf4e7ed64738aa5) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 23773f2915c16d8f4d86b6bba06769ffc8e4032d) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18063 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -175,6 +175,16 @@ } /// + /// Looks up a localized string similar to Profielmeting {0} bevat aaneengesloten dubbele geometrie punten, welke zijn genegeerd.. + /// + public static string PipingSurfaceLinesCsvImporter_SurfaceLine_0_has_multiple_duplicate_geometry_points_and_is_ignored { + get { + return ResourceManager.GetString("PipingSurfaceLinesCsvImporter_SurfaceLine_0_has_multiple_duplicate_geometry_point" + + "s_and_is_ignored", resourceCulture); + } + } + + /// /// Looks up a localized string similar to DSoilModel bestand. /// public static string Soil_file_name { Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx =================================================================== diff -u -rbf306ed5e8bab6bbe0bd42bbcaf4e7ed64738aa5 -r23773f2915c16d8f4d86b6bba06769ffc8e4032d --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision bf306ed5e8bab6bbe0bd42bbcaf4e7ed64738aa5) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 23773f2915c16d8f4d86b6bba06769ffc8e4032d) @@ -160,4 +160,7 @@ Inlezen van de ondergrondschematisering uit de D-Soil Model database + + Profielmeting {0} bevat aaneengesloten dubbele geometrie punten, welke zijn genegeerd. + \ No newline at end of file