Index: Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs =================================================================== diff -u -r9a426b227a1f3902ae05dea3c2b0e94f4b4551cb -r925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f --- Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision 9a426b227a1f3902ae05dea3c2b0e94f4b4551cb) +++ Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision 925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f) @@ -64,5 +64,13 @@ { return Enumerable.Empty(); } + + protected void NotifyProgress(string currentStepName, int currentStep, int totalNumberOfSteps) + { + if (ProgressChanged != null) + { + ProgressChanged(currentStepName, currentStep, totalNumberOfSteps); + } + } } } \ No newline at end of file Index: Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs =================================================================== diff -u -r9a426b227a1f3902ae05dea3c2b0e94f4b4551cb -r925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f --- Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs (.../FileImporterBaseTest.cs) (revision 9a426b227a1f3902ae05dea3c2b0e94f4b4551cb) +++ Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs (.../FileImporterBaseTest.cs) (revision 925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f) @@ -52,10 +52,12 @@ observableInstance.Expect(o => o.NotifyObservers()); mocks.ReplayAll(); - var simpleImporter = new SimpleFileImporter(); - simpleImporter.GetAffectedNonTargetObservableInstancesOverride = new[] + var simpleImporter = new SimpleFileImporter { - observableInstance + GetAffectedNonTargetObservableInstancesOverride = new[] + { + observableInstance + } }; // Call @@ -75,10 +77,12 @@ var observableTarget = mocks.StrictMock(); mocks.ReplayAll(); - var simpleImporter = new SimpleFileImporter(); - simpleImporter.GetAffectedNonTargetObservableInstancesOverride = new[] + var simpleImporter = new SimpleFileImporter { - observableInstance + GetAffectedNonTargetObservableInstancesOverride = new[] + { + observableInstance + } }; simpleImporter.Cancel(); @@ -89,6 +93,47 @@ mocks.VerifyAll(); // Assert no NotifyObservers were called } + [Test] + public void NotifyProgress_NoDelegateSet_DoNothing() + { + // Setup + var simpleImporter = new SimpleFileImporter + { + ProgressChanged = null + }; + + // Call + TestDelegate call = () => simpleImporter.TestNotifyProgress("A", 1, 2); + + // Assert + Assert.DoesNotThrow(call); + } + + [Test] + public void NotifyProgress_DelegateSet_CallProgressChanged() + { + // Setup + var expectedDescription = "B"; + var expectedStep = 1; + var expectedNumberOfSteps = 3; + + var simpleImporter = new SimpleFileImporter(); + int progressChangedCallCount = 0; + simpleImporter.ProgressChanged = (description, step, steps) => + { + Assert.AreEqual(expectedDescription, description); + Assert.AreEqual(expectedStep, step); + Assert.AreEqual(expectedNumberOfSteps, steps); + progressChangedCallCount++; + }; + + // Call + simpleImporter.TestNotifyProgress(expectedDescription, expectedStep, expectedNumberOfSteps); + + // Assert + Assert.AreEqual(1, progressChangedCallCount); + } + private class SimpleFileImporter : FileImporterBase { public override string Name @@ -143,6 +188,11 @@ { throw new NotImplementedException(); } + + public void TestNotifyProgress(string currentStepName, int currentStep, int totalNumberOfSteps) + { + NotifyProgress(currentStepName, currentStep, totalNumberOfSteps); + } } } } \ No newline at end of file Index: Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs =================================================================== diff -u -r9a426b227a1f3902ae05dea3c2b0e94f4b4551cb -r925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f --- Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs (.../FileImportActivityTest.cs) (revision 9a426b227a1f3902ae05dea3c2b0e94f4b4551cb) +++ Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs (.../FileImportActivityTest.cs) (revision 925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f) @@ -206,10 +206,7 @@ public override bool Import(object targetItem, string filePath) { - if (ProgressChanged != null) - { - ProgressChanged("Step description", 1, 10); - } + NotifyProgress("Step description", 1, 10); return true; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/HydraulicBoundaryLocationsImporter.cs =================================================================== diff -u -r9a426b227a1f3902ae05dea3c2b0e94f4b4551cb -r925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/HydraulicBoundaryLocationsImporter.cs (.../HydraulicBoundaryLocationsImporter.cs) (revision 9a426b227a1f3902ae05dea3c2b0e94f4b4551cb) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/HydraulicBoundaryLocationsImporter.cs (.../HydraulicBoundaryLocationsImporter.cs) (revision 925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f) @@ -221,13 +221,5 @@ targetCollection.Add(item); } } - - private void NotifyProgress(string currentStepName, int currentStep, int totalNumberOfSteps) - { - if (ProgressChanged != null) - { - ProgressChanged(currentStepName, currentStep, totalNumberOfSteps); - } - } } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ReferenceLineImporter.cs =================================================================== diff -u -r97bfe9977d361008096dc670bdde5a3208251830 -r925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ReferenceLineImporter.cs (.../ReferenceLineImporter.cs) (revision 97bfe9977d361008096dc670bdde5a3208251830) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ReferenceLineImporter.cs (.../ReferenceLineImporter.cs) (revision 925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f) @@ -102,13 +102,12 @@ var importTarget = (ReferenceLineContext)targetItem; if (importTarget.Parent.ReferenceLine != null) { - var title = "Referentielijn vervangen?"; - var text = "Weet u zeker dat u de referentielijn wilt vervangen?" + Environment.NewLine + - "Als u door gaat zullen alle vakindelingen, berekende hydrolische randvoorwaarden en berekeningsresultaten worden verwijderd."; - DialogResult result = MessageBox.Show(text, title, MessageBoxButtons.OKCancel); + DialogResult result = MessageBox.Show(Resources.ReferenceLineImporter_ConfirmImport_Confirm_referenceline_import_which_clears_data_when_performed, + Resources.ReferenceLineImporter_ConfirmImport_DialogTitle, + MessageBoxButtons.OKCancel); if (result == DialogResult.Cancel) { - return false; + ImportIsCancelled = true; } else { @@ -118,12 +117,16 @@ if (ImportIsCancelled) { + NotifyProgress(Resources.ReferenceLineImporter_ProgressText_Import_cancelled_no_data_read, + 0, clearReferenceLineDependentData ? 4 : 2); return false; } ReferenceLine importedReferenceLine; try { + NotifyProgress(Resources.ReferenceLineImporter_ProgressText_Reading_referenceline, + 1, clearReferenceLineDependentData ? 4 : 2); importedReferenceLine = new ReferenceLineReader().ReadReferenceLine(filePath); } catch (ArgumentException e) @@ -139,6 +142,8 @@ if (ImportIsCancelled) { + NotifyProgress(Resources.ReferenceLineImporter_ProgressText_Import_cancelled_no_data_read, + 1, clearReferenceLineDependentData ? 4 : 2); return false; } @@ -153,6 +158,8 @@ private void AddReferenceLineToDataModel(AssessmentSectionBase assessmentSection, ReferenceLine importedReferenceLine, bool clearReferenceLineDependentData) { + NotifyProgress(Resources.ReferenceLineImporter_ProgressText_Adding_imported_referenceline_to_assessmentsection, + 2, clearReferenceLineDependentData ? 4 : 2); assessmentSection.ReferenceLine = importedReferenceLine; if (clearReferenceLineDependentData) @@ -163,11 +170,15 @@ private void ClearReferenceLineDependentData(AssessmentSectionBase assessmentSection) { + NotifyProgress(Resources.ReferenceLineImporter_ProgressText_Removing_calculation_output_and_failure_mechanism_sections, + 3, 4); foreach (var failureMechanism in assessmentSection.GetFailureMechanisms()) { ClearCalculationOutput(failureMechanism); ClearFailureMechanismSections(failureMechanism); } + NotifyProgress(Resources.ReferenceLineImporter_ProgressText_Removing_hydraulic_boundary_output, + 4, 4); ClearHydraulicBoundaryOutput(assessmentSection); } Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r249fd5e4604012895724a9d7df67201332c9e7dc -r925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 249fd5e4604012895724a9d7df67201332c9e7dc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f) @@ -61,6 +61,26 @@ } /// + /// Looks up a localized string similar to Weet u zeker dat u de referentielijn wilt vervangen? + ///Als u door gaat zullen alle vakindelingen, berekende hydrolische randvoorwaarden en berekeningsresultaten worden verwijderd.. + /// + internal static string ReferenceLineImporter_ConfirmImport_Confirm_referenceline_import_which_clears_data_when_performed { + get { + return ResourceManager.GetString("ReferenceLineImporter_ConfirmImport_Confirm_referenceline_import_which_clears_dat" + + "a_when_performed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Referentielijn vervangen?. + /// + internal static string ReferenceLineImporter_ConfirmImport_DialogTitle { + get { + return ResourceManager.GetString("ReferenceLineImporter_ConfirmImport_DialogTitle", resourceCulture); + } + } + + /// /// Looks up a localized string similar to {0} ///Er is geen referentielijn geïmporteerd.. /// @@ -70,5 +90,52 @@ "ed", resourceCulture); } } + + /// + /// Looks up a localized string similar to Geïmporteerde data toevoegen aan het traject.. + /// + internal static string ReferenceLineImporter_ProgressText_Adding_imported_referenceline_to_assessmentsection { + get { + return ResourceManager.GetString("ReferenceLineImporter_ProgressText_Adding_imported_referenceline_to_assessmentsec" + + "tion", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Referentielijn importeren afgebroken. Geen data ingelezen.. + /// + internal static string ReferenceLineImporter_ProgressText_Import_cancelled_no_data_read { + get { + return ResourceManager.GetString("ReferenceLineImporter_ProgressText_Import_cancelled_no_data_read", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Inlezen referentielijn.. + /// + internal static string ReferenceLineImporter_ProgressText_Reading_referenceline { + get { + return ResourceManager.GetString("ReferenceLineImporter_ProgressText_Reading_referenceline", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Verwijderen rekenresultaten en vakindelingen van faalmechanismen.. + /// + internal static string ReferenceLineImporter_ProgressText_Removing_calculation_output_and_failure_mechanism_sections { + get { + return ResourceManager.GetString("ReferenceLineImporter_ProgressText_Removing_calculation_output_and_failure_mechan" + + "ism_sections", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Verwijderen hydraulische randvoorwaarde uitvoer.. + /// + internal static string ReferenceLineImporter_ProgressText_Removing_hydraulic_boundary_output { + get { + return ResourceManager.GetString("ReferenceLineImporter_ProgressText_Removing_hydraulic_boundary_output", resourceCulture); + } + } } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -r249fd5e4604012895724a9d7df67201332c9e7dc -r925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 249fd5e4604012895724a9d7df67201332c9e7dc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f) @@ -102,4 +102,26 @@ {0} Er is geen referentielijn geïmporteerd. + + Referentielijn vervangen? + + + Weet u zeker dat u de referentielijn wilt vervangen? +Als u door gaat zullen alle vakindelingen, berekende hydrolische randvoorwaarden en berekeningsresultaten worden verwijderd. + + + Referentielijn importeren afgebroken. Geen data ingelezen. + + + Inlezen referentielijn. + + + Geïmporteerde data toevoegen aan het traject. + + + Verwijderen rekenresultaten en vakindelingen van faalmechanismen. + + + Verwijderen hydraulische randvoorwaarde uitvoer. + \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj =================================================================== diff -u -racbd08302b69fc06e5cade26def0dea4d35e3b92 -r925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision acbd08302b69fc06e5cade26def0dea4d35e3b92) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision 925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f) @@ -178,6 +178,7 @@ ResXFileCodeGenerator Resources.Designer.cs + Designer Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ReferenceLineImporterTest.cs =================================================================== diff -u -r97bfe9977d361008096dc670bdde5a3208251830 -r925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ReferenceLineImporterTest.cs (.../ReferenceLineImporterTest.cs) (revision 97bfe9977d361008096dc670bdde5a3208251830) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ReferenceLineImporterTest.cs (.../ReferenceLineImporterTest.cs) (revision 925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f) @@ -68,6 +68,43 @@ } [Test] + public void Import_ContextWithoutReferenceLine_GeneratedExpectedProgressMessages() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "traject_10-2.shp"); + + var referenceLineContext = new ReferenceLineContext(assessmentSection); + + var expectedProgressMessages = new[] + { + new ExpectedProgressNotification{ Text = "Inlezen referentielijn.", CurrentStep = 1, MaxNrOfSteps = 2 }, + new ExpectedProgressNotification{ Text = "Geïmporteerde data toevoegen aan het traject.", CurrentStep = 2, MaxNrOfSteps = 2 }, + }; + var progressChangedCallCount = 0; + var importer = new ReferenceLineImporter + { + ProgressChanged = (description, step, steps) => + { + Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].Text, description); + Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].CurrentStep, step); + Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].MaxNrOfSteps, steps); + progressChangedCallCount++; + } + }; + + // Call + importer.Import(referenceLineContext, path); + + // Assert + Assert.AreEqual(expectedProgressMessages.Length, progressChangedCallCount); + mocks.VerifyAll(); + } + + [Test] public void Import_FilePathIsDirectory_CancelImportWithErrorMessage() { // Setup @@ -264,6 +301,66 @@ } [Test] + public void Import_AssessmentSectionAlreadyHasReferenceLineAndAnswerDialogToContinue_GenerateExpectedProgressMessages() + { + // Setup + var originalReferenceLine = new ReferenceLine(); + + var mocks = new MockRepository(); + var calculation1 = mocks.Stub(); + var calculation2 = mocks.Stub(); + + var failureMechanism1 = mocks.Stub(); + failureMechanism1.Stub(fm => fm.CalculationItems).Return(new[] + { + calculation1, + calculation2 + }); + + var assessmentSection = mocks.Stub(); + assessmentSection.ReferenceLine = originalReferenceLine; + assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[] + { + failureMechanism1, + }); + mocks.ReplayAll(); + + var path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "traject_10-2.shp"); + + var referenceLineContext = new ReferenceLineContext(assessmentSection); + + var expectedProgressMessages = new[] + { + new ExpectedProgressNotification { Text = "Inlezen referentielijn.", CurrentStep = 1, MaxNrOfSteps = 4 }, + new ExpectedProgressNotification { Text = "Geïmporteerde data toevoegen aan het traject.", CurrentStep = 2, MaxNrOfSteps = 4 }, + new ExpectedProgressNotification { Text = "Verwijderen rekenresultaten en vakindelingen van faalmechanismen.", CurrentStep = 3, MaxNrOfSteps = 4 }, + new ExpectedProgressNotification { Text = "Verwijderen hydraulische randvoorwaarde uitvoer.", CurrentStep = 4, MaxNrOfSteps = 4 }, + }; + var progressChangedCallCount = 0; + var importer = new ReferenceLineImporter(); + importer.ProgressChanged = (description, step, steps) => + { + Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].Text, description); + Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].CurrentStep, step); + Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].MaxNrOfSteps, steps); + progressChangedCallCount++; + }; + + DialogBoxHandler = (name, wnd) => + { + var messageBoxTester = new MessageBoxTester(wnd); + messageBoxTester.ClickOk(); + }; + + // Call + importer.Import(referenceLineContext, path); + + // Assert + Assert.AreEqual(expectedProgressMessages.Length, progressChangedCallCount); + mocks.VerifyAll(); + } + + [Test] public void Import_CancellingImport_ReturnFalseAndNoChanges() { // Setup @@ -298,6 +395,63 @@ } [Test] + [TestCase(true)] + [TestCase(false)] + public void Import_CancelImportDuringDialogInteraction_GenerateExpectedProgressMessages(bool acceptRemovalOfReferenceLineDependentData) + { + // Setup + var originalReferenceLine = new ReferenceLine(); + + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + assessmentSection.ReferenceLine = originalReferenceLine; + mocks.ReplayAll(); + + var path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "traject_10-2.shp"); + + var referenceLineContext = new ReferenceLineContext(assessmentSection); + + var expectedProgressMessages = new[] + { + new ExpectedProgressNotification { Text = "Referentielijn importeren afgebroken. Geen data ingelezen.", CurrentStep = 0, MaxNrOfSteps = acceptRemovalOfReferenceLineDependentData ? 4 : 2 } + }; + + var progressChangedCount = 0; + var importer = new ReferenceLineImporter + { + ProgressChanged = (description, step, steps) => + { + Assert.AreEqual(expectedProgressMessages[progressChangedCount].Text, description); + Assert.AreEqual(expectedProgressMessages[progressChangedCount].CurrentStep, step); + Assert.AreEqual(expectedProgressMessages[progressChangedCount].MaxNrOfSteps, steps); + progressChangedCount++; + } + }; + + DialogBoxHandler = (name, wnd) => + { + importer.Cancel(); + + var messageBoxTester = new MessageBoxTester(wnd); + if (acceptRemovalOfReferenceLineDependentData) + { + messageBoxTester.ClickOk(); + } + else + { + messageBoxTester.ClickCancel(); + } + }; + + // Call + importer.Import(referenceLineContext, path); + + // Assert + Assert.AreEqual(expectedProgressMessages.Length, progressChangedCount); + mocks.VerifyAll(); + } + + [Test] public void Import_ReusingCancelledImporterForContextWithoutReferenceLine_ImportReferenceLineToAssessmentSection() { // Setup @@ -521,6 +675,11 @@ mocks.VerifyAll(); // Expect NotifyObservers on cleared calculations and context } - // TODO: Progress reporting + private class ExpectedProgressNotification + { + public string Text { get; set; } + public int CurrentStep { get; set; } + public int MaxNrOfSteps { get; set; } + } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs =================================================================== diff -u -r9a426b227a1f3902ae05dea3c2b0e94f4b4551cb -r925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs (.../PipingSoilProfilesImporter.cs) (revision 9a426b227a1f3902ae05dea3c2b0e94f4b4551cb) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs (.../PipingSoilProfilesImporter.cs) (revision 925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f) @@ -180,14 +180,6 @@ } } - private void NotifyProgress(string currentStepName, int currentStep, int totalNumberOfSteps) - { - if (ProgressChanged != null) - { - ProgressChanged(currentStepName, currentStep, totalNumberOfSteps); - } - } - private void HandleUserCancellingImport() { log.Info(ApplicationResources.PipingSoilProfilesImporter_Import_Import_cancelled); Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs =================================================================== diff -u -r1abce3b7d9611e826388ff49f3faf8cb1040f80c -r925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision 1abce3b7d9611e826388ff49f3faf8cb1040f80c) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision 925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f) @@ -138,14 +138,6 @@ return true; } - private void NotifyProgress(string currentStepName, int currentStep, int totalNumberOfSteps) - { - if (ProgressChanged != null) - { - ProgressChanged(currentStepName, currentStep, totalNumberOfSteps); - } - } - private ReadResult ReadPipingSurfaceLines(string path) { PipingSurfaceLinesCsvReader reader;