Index: src/Deltares.DSoilModel.Data/DSoilModelIO.cs
===================================================================
diff -u -r287 -r370
--- src/Deltares.DSoilModel.Data/DSoilModelIO.cs (.../DSoilModelIO.cs) (revision 287)
+++ src/Deltares.DSoilModel.Data/DSoilModelIO.cs (.../DSoilModelIO.cs) (revision 370)
@@ -30,26 +30,27 @@
/// The project.
public static void AddOldProjectDataBaseToProject(string fileName, DSoilModelProject project)
{
- DataEventPublisher.IsDataEventPublishStopped = true;
- using (var geoDatabase = new GeoDatabase(fileName))
+ DataEventPublisher.InvokeWithoutPublishingEvents(() =>
{
- ReadSoilsFromOldDataBaseAndAddToProject(ref project, geoDatabase);
- try
+ using (var geoDatabase = new GeoDatabase(fileName))
{
- ReadSoilProfilesFromOldDatabaseAndAddToProject(ref project, geoDatabase);
- ReadSoilProfiles2DFromOldDatabaseAndAddToProject(ref project, geoDatabase);
- ReadCptsFromOldDatabaseAndAddToProject(ref project, geoDatabase);
- ReadBoringsFromOldDatabaseAndAddToProject(ref project, geoDatabase);
- ReadSegmentsFromOldDatabaseAndAddToProject(ref project, geoDatabase);
+ try
+ {
+ ReadSoilsFromOldDataBaseAndAddToProject(ref project, geoDatabase);
+ ReadSoilProfilesFromOldDatabaseAndAddToProject(ref project, geoDatabase);
+ ReadSoilProfiles2DFromOldDatabaseAndAddToProject(ref project, geoDatabase);
+ ReadCptsFromOldDatabaseAndAddToProject(ref project, geoDatabase);
+ ReadBoringsFromOldDatabaseAndAddToProject(ref project, geoDatabase);
+ ReadSegmentsFromOldDatabaseAndAddToProject(ref project, geoDatabase);
+ }
+ catch (Exception e)
+ {
+ var message = LocalizationManager.GetTranslatedText(typeof(DSoilModelIO), "OldProjectImportError");
+ var logmessage = new LogMessage(LogMessageType.Error, typeof(DSoilModelIO), message + e.Message);
+ LogManager.Messages.Add(logmessage);
+ }
}
- catch (Exception e)
- {
- var message = LocalizationManager.GetTranslatedText(typeof(DSoilModelIO), "OldProjectImportError");
- var logmessage = new LogMessage(LogMessageType.Error, typeof(DSoilModelIO), message + e.Message);
- LogManager.Messages.Add(logmessage);
- }
- DataEventPublisher.IsDataEventPublishStopped = false;
- }
+ });
}
///