Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -re846c5a124b38dfbd2ebd2b51a1b26e2b2caf100 -rf413e7f760f94e4fa188286e4c8abe83321a75c2
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e846c5a124b38dfbd2ebd2b51a1b26e2b2caf100)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f413e7f760f94e4fa188286e4c8abe83321a75c2)
@@ -1119,6 +1119,15 @@
}
///
+ /// Looks up a localized string similar to Koppelen aan hydraulische belastingendatabase.
+ ///
+ public static string RiskeerPlugin_RunHydraulicBoundaryDatabaseImport_Connecting_to_database {
+ get {
+ return ResourceManager.GetString("RiskeerPlugin_RunHydraulicBoundaryDatabaseImport_Connecting_to_database", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Korte beschrijving van het project..
///
public static string RiskeerProjectProperties_Description_Description {
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -re846c5a124b38dfbd2ebd2b51a1b26e2b2caf100 -rf413e7f760f94e4fa188286e4c8abe83321a75c2
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision e846c5a124b38dfbd2ebd2b51a1b26e2b2caf100)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision f413e7f760f94e4fa188286e4c8abe83321a75c2)
@@ -482,4 +482,7 @@
Locatie bestand
+
+ Koppelen aan hydraulische belastingendatabase
+
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -re846c5a124b38dfbd2ebd2b51a1b26e2b2caf100 -rf413e7f760f94e4fa188286e4c8abe83321a75c2
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision e846c5a124b38dfbd2ebd2b51a1b26e2b2caf100)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision f413e7f760f94e4fa188286e4c8abe83321a75c2)
@@ -27,6 +27,7 @@
using System.Windows.Forms;
using Core.Common.Base;
using Core.Common.Base.Data;
+using Core.Common.Base.Service;
using Core.Common.Controls.TreeView;
using Core.Common.Gui;
using Core.Common.Gui.ContextMenu;
@@ -761,15 +762,6 @@
IsEnabled = context => HasGeometry(context.ParentAssessmentSection.ReferenceLine),
VerifyUpdates = context => VerifyForeshoreProfileUpdates(context, Resources.RiskeerPlugin_VerifyForeshoreProfileUpdates_When_importing_ForeshoreProfile_definitions_assigned_to_calculations_output_will_be_cleared_confirm)
};
-
- yield return new ImportInfo
- {
- CreateFileImporter = (context, filePath) => new HydraulicBoundaryDatabaseImporter(
- context.WrappedData, new HydraulicBoundaryDatabaseUpdateHandler(context.AssessmentSection,
- new DuneLocationsReplacementHandler(
- Gui.ViewCommands, context.AssessmentSection.DuneErosion)),
- filePath)
- };
}
public override IEnumerable GetExportInfos()
@@ -2282,17 +2274,11 @@
{
HydraulicBoundaryDatabase hydraulicBoundaryDatabase = nodeData.WrappedData;
- var dialog = hydraulicBoundaryDatabase.IsLinked()
- ? new HydraulicBoundaryDatabaseImporterSettingsDialog(Gui.MainWindow, GetInquiryHelper(),
- new HydraulicBoundaryDatabaseImporterSettings(
- hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.FilePath,
- hydraulicBoundaryDatabase.HrdDirectory,
- hydraulicBoundaryDatabase.LocationsFilePath))
- : new HydraulicBoundaryDatabaseImporterSettingsDialog(Gui.MainWindow, GetInquiryHelper());
+ HydraulicBoundaryDatabaseImporterSettingsDialog dialog = CreateHydraulicBoundaryDatabaseImporterSettingsDialog(hydraulicBoundaryDatabase);
if (dialog.ShowDialog() == DialogResult.OK)
{
-
+ RunHydraulicBoundaryDatabaseImport(nodeData, hydraulicBoundaryDatabase);
}
});
@@ -2320,6 +2306,27 @@
.Build();
}
+ private HydraulicBoundaryDatabaseImporterSettingsDialog CreateHydraulicBoundaryDatabaseImporterSettingsDialog(HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
+ {
+ return hydraulicBoundaryDatabase.IsLinked()
+ ? new HydraulicBoundaryDatabaseImporterSettingsDialog(Gui.MainWindow, GetInquiryHelper(),
+ new HydraulicBoundaryDatabaseImporterSettings(
+ hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.FilePath,
+ hydraulicBoundaryDatabase.HrdDirectory,
+ hydraulicBoundaryDatabase.LocationsFilePath))
+ : new HydraulicBoundaryDatabaseImporterSettingsDialog(Gui.MainWindow, GetInquiryHelper());
+ }
+
+ private void RunHydraulicBoundaryDatabaseImport(HydraulicBoundaryDatabaseContext nodeData, HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
+ {
+ var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryDatabase,
+ new HydraulicBoundaryDatabaseUpdateHandler(nodeData.AssessmentSection,
+ new DuneLocationsReplacementHandler(Gui.ViewCommands, nodeData.AssessmentSection.DuneErosion)),
+ "");
+
+ ActivityProgressDialogRunner.Run(Gui.MainWindow, new FileImportActivity(importer, RiskeerFormsResources.RiskeerPlugin_RunHydraulicBoundaryDatabaseImport_Connecting_to_database));
+ }
+
private ContextMenuStrip DesignWaterLevelCalculationsGroupContextMenuStrip(DesignWaterLevelCalculationsGroupContext nodeData, object parentData, TreeViewControl treeViewControl)
{
IAssessmentSection assessmentSection = nodeData.AssessmentSection;