Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -rdbf6ecaa927e26f430d7c73290df7e825ec04744 -rd0615029ee52b3dbe0eda73c8cf9ba40e4353ee4
--- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision dbf6ecaa927e26f430d7c73290df7e825ec04744)
+++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision d0615029ee52b3dbe0eda73c8cf9ba40e4353ee4)
@@ -27,7 +27,7 @@
using Ringtoets.Piping.Plugin;
using MessageBox = System.Windows.MessageBox;
#if INCLUDE_DEMOPROJECT
-using Demo.Ringtoets;
+using Demo.Ringtoets.GUIs;
#endif
namespace Application.Ringtoets
@@ -133,11 +133,12 @@
new CommonToolsGuiPlugin(),
new SharpMapGisGuiPlugin(),
new RingtoetsGuiPlugin(),
- new PipingGuiPlugin()
+ new PipingGuiPlugin(),
+ new DotSpatialGuiPlugin()
#if INCLUDE_DEMOPROJECT
, new DemoProjectGuiPlugin()
, new OxyPlotGuiPlugin()
- , new DotSpatialGuiPlugin()
+ , new DemoDotSpatialGuiPlugin()
#endif
},
Storage = new StorageSqLite()
Index: Core/Components/src/Core.Components.DotSpatial/BaseMap.cs
===================================================================
diff -u -r04c70d10f22ba007f8210813d3d02697e42f8a5d -rd0615029ee52b3dbe0eda73c8cf9ba40e4353ee4
--- Core/Components/src/Core.Components.DotSpatial/BaseMap.cs (.../BaseMap.cs) (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d)
+++ Core/Components/src/Core.Components.DotSpatial/BaseMap.cs (.../BaseMap.cs) (revision d0615029ee52b3dbe0eda73c8cf9ba40e4353ee4)
@@ -13,7 +13,7 @@
///
public sealed class BaseMap : Control
{
- private static readonly ILog log = LogManager.GetLogger(typeof(BaseMap));
+ private static readonly ILog Log = LogManager.GetLogger(typeof(BaseMap));
private MapData data;
private Map map;
@@ -72,7 +72,7 @@
{
map.AddLayer(filePath);
- log.InfoFormat(Resources.BaseMap_LoadData_Shape_file_on_path__0__is_added_to_the_map_, filePath);
+ Log.InfoFormat(Resources.BaseMap_LoadData_Shape_file_on_path__0__is_added_to_the_map_, filePath);
}
}
}
Index: Core/Plugins/src/Core.Plugins.DotSpatial/DotSpatialGuiPlugin.cs
===================================================================
diff -u -rdbf6ecaa927e26f430d7c73290df7e825ec04744 -rd0615029ee52b3dbe0eda73c8cf9ba40e4353ee4
--- Core/Plugins/src/Core.Plugins.DotSpatial/DotSpatialGuiPlugin.cs (.../DotSpatialGuiPlugin.cs) (revision dbf6ecaa927e26f430d7c73290df7e825ec04744)
+++ Core/Plugins/src/Core.Plugins.DotSpatial/DotSpatialGuiPlugin.cs (.../DotSpatialGuiPlugin.cs) (revision d0615029ee52b3dbe0eda73c8cf9ba40e4353ee4)
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using Core.Common.Gui;
-using Core.Common.Gui.Forms;
using Core.Common.Gui.Plugin;
using Core.Common.Gui.Properties;
using Core.Components.DotSpatial.Data;
Index: Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj
===================================================================
diff -u -rdbf6ecaa927e26f430d7c73290df7e825ec04744 -rd0615029ee52b3dbe0eda73c8cf9ba40e4353ee4
--- Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision dbf6ecaa927e26f430d7c73290df7e825ec04744)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision d0615029ee52b3dbe0eda73c8cf9ba40e4353ee4)
@@ -53,17 +53,18 @@
-
-
- MapRibbon.xaml
-
+
+
True
True
Resources.resx
-
+
+ MapRibbon.xaml
+
+
RingtoetsDemoProjectRibbon.xaml
@@ -97,6 +98,10 @@
{AA47E858-A2A7-470E-8B2D-C76AE8ED9CCD}
Core.Components.DotSpatial
+
+ {610E0A9C-1997-4C43-A10E-39D4C66ADA93}
+ Core.Plugins.DotSpatial
+
{d4200f43-3f72-4f42-af0a-8ced416a38ec}
Ringtoets.Common.Data
@@ -178,13 +183,13 @@
-
+
MSBuild:Compile
Designer
-
- Designer
+
MSBuild:Compile
+ Designer
@@ -218,6 +223,7 @@
+