Index: Application/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj =================================================================== diff -u -r3112e21825ab694afebf3e220a867e7af913a5b2 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Application/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj (.../Application.Ringtoets.Setup.wixproj) (revision 3112e21825ab694afebf3e220a867e7af913a5b2) +++ Application/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj (.../Application.Ringtoets.Setup.wixproj) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -15,12 +15,12 @@ Environment Variable: BUILD_NUMBER Field could be set by BuildServer. If not present, it will be skipped. --> - WTI Setup ($(ReleaseVersion)) - WTI Setup ($(ReleaseVersion).$(BUILD_NUMBER)) + Ringtoets Setup %28%24%28ReleaseVersion%29%29 + Ringtoets Setup ($(ReleaseVersion).$(BUILD_NUMBER)) Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - WtiSetup + RingtoetsSetup bin\$(Configuration)\ @@ -57,9 +57,9 @@ - + - + @@ -81,7 +81,7 @@ - + @@ -102,7 +102,7 @@ $(DefineConstants);ReleaseVersion=$(ReleaseVersion);ApplicationBinFolder=..\Application.Ringtoets\bin; - "$(WIX)bin\heat.exe" dir $(ProjectDir)..\Application.Ringtoets\bin -cg WtiApplicationComponents -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)WtiPayload.wxs" + "$(WIX)bin\heat.exe" dir $(ProjectDir)..\Application.Ringtoets\bin -cg RingtoetsApplicationComponents -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)RingtoetsPayload.wxs" $(ProjectDir)..\..\build\svn_insert_version.cmd $(ProjectDir) GenerateVariables.wxi.svn GenerateVariables.wxi%3b + 40 + + 220 + + 40 + + + + + + + + + + + + + + + {\WixUI_Font_Banner_Description}Configureer de installatie locatie. + {\WixUI_Font_Banner_Description}Configureer de programmaonderdelen die u wilt installeren. + {\WixUI_Font_Banner_Description}De hoeveelheid geheugen nodig voor de geconfigureerde installatie. + {\WixUI_Font_Banner_Description}Lees de licentieovereenkomst zorgvuldig. + {\WixUI_Font_Banner_Description}Selecteer de operatie die u wenst uit te voeren. + {\WixUI_Font_Banner_Description}Het benodigde geheugen voor de installatie is groter dan be schikbare schijfruimte. + {\WixUI_Font_Banner_Description}Het benodigde geheugen voor de installatie is groter dan be schikbare schijfruimte. + {\WixUI_Font_Banner_Description}Kies de type installatie die het beste past. + + \ No newline at end of file Index: Application/Application.Ringtoets.Setup/Installer UI/RingtoetsUI_Deltares.wxs =================================================================== diff -u --- Application/Application.Ringtoets.Setup/Installer UI/RingtoetsUI_Deltares.wxs (revision 0) +++ Application/Application.Ringtoets.Setup/Installer UI/RingtoetsUI_Deltares.wxs (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + 1 + + 1 + LicenseAccepted = "1" + + 1 + 1 + 1 + 1 + + WixUI_InstallMode = "Change" + WixUI_InstallMode = "InstallCustom" + 1 + + 1 + + 1 + + 1 + 1 + 1 + 1 + + + + + + \ No newline at end of file Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `Application/Application.Ringtoets.Setup/Installer UI/WixUIVariables.wxl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `Application/Application.Ringtoets.Setup/Installer UI/wixUI_Deltares.wxs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Application.Ringtoets.Setup/Localization_nl-NL.wxl =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Application/Application.Ringtoets.Setup/Localization_nl-NL.wxl (.../Localization_nl-NL.wxl) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Application/Application.Ringtoets.Setup/Localization_nl-NL.wxl (.../Localization_nl-NL.wxl) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -1,7 +1,7 @@ - Wettelijk Toets Instrumentarium - WTI + Ringtoets + Ringtoets Deltares De installatie vereist dat Microsoft .NET Framework 4.5 geïnstalleerd is om verder te gaan. Een nieuwere versie van !(loc.ApplicationLongName) is al geïnstalleerd. Index: Application/Application.Ringtoets.Setup/Product.wxs =================================================================== diff -u -r3112e21825ab694afebf3e220a867e7af913a5b2 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Application/Application.Ringtoets.Setup/Product.wxs (.../Product.wxs) (revision 3112e21825ab694afebf3e220a867e7af913a5b2) +++ Application/Application.Ringtoets.Setup/Product.wxs (.../Product.wxs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -10,7 +10,7 @@ - + @@ -36,8 +36,8 @@ @@ -50,7 +50,7 @@ - + @@ -60,7 +60,7 @@ - + - + - + @@ -91,15 +91,15 @@ WorkingDirectory="APPLICATIONDIR" Icon="Ringtoets.ico"/> - + - + Index: Application/Application.Ringtoets.Setup/RingtoetsPayload.wxs =================================================================== diff -u --- Application/Application.Ringtoets.Setup/RingtoetsPayload.wxs (revision 0) +++ Application/Application.Ringtoets.Setup/RingtoetsPayload.wxs (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,1121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Application/Application.Ringtoets.Setup/Variables.wxi =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Application/Application.Ringtoets.Setup/Variables.wxi (.../Variables.wxi) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Application/Application.Ringtoets.Setup/Variables.wxi (.../Variables.wxi) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -2,7 +2,7 @@ Index: Application/Application.Ringtoets/App.xaml.cs =================================================================== diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406) +++ Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -167,15 +167,15 @@ new ProjectExplorerGuiPlugin(), new CommonToolsGuiPlugin(), new SharpMapGisGuiPlugin(), - new WtiGuiPlugin() + new RingtoetsGuiPlugin() }, Application = { Plugins = { new CommonToolsApplicationPlugin(), new SharpMapGisApplicationPlugin(), - new WtiApplicationPlugin() + new RingtoetsApplicationPlugin() } } }; Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs =================================================================== diff -u -rad6a41fea29f9f2160834d59d9511b8fb5d6c838 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision ad6a41fea29f9f2160834d59d9511b8fb5d6c838) +++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -593,7 +593,7 @@ { try { - Gui.CommandHandler.TryOpenExistingWTIProject(path); + Gui.CommandHandler.TryOpenExistingProject(path); RecentProjectsTabControl.Items.Remove(newItem); RecentProjectsTabControl.Items.Insert(1, newItem); } @@ -752,7 +752,7 @@ return; // Original code: - //var succesful = Gui.CommandHandler.TryOpenExistingWTIProject(); + //var succesful = Gui.CommandHandler.TryOpenExistingProject(); //OnAfterProjectSaveOrOpen(succesful); } @@ -762,14 +762,14 @@ return; // Original code: - //Gui.CommandHandler.TryCloseWTIProject(); + //Gui.CommandHandler.TryCloseProject(); //ValidateItems(); } private void OnFileNewClicked(object sender, RoutedEventArgs e) { // Original code: - Gui.CommandHandler.TryCreateNewWTIProject(); + Gui.CommandHandler.TryCreateNewProject(); ValidateItems(); } Index: Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs =================================================================== diff -u -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs (.../GuiCommandHandler.cs) (revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc) +++ Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs (.../GuiCommandHandler.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -42,63 +42,63 @@ guiExportHandler = CreateGuiExportHandler(); } - public void TryCreateNewWTIProject() + public void TryCreateNewProject() { - if (!TryCloseWTIProject()) + if (!TryCloseProject()) { - Log.Warn(Resources.Opening_new_wti_project_cancelled); + Log.Warn(Resources.Opening_new_Ringtoets_project_cancelled); return; } - Log.Info(Resources.Opening_new_wti_project); + Log.Info(Resources.Opening_new_Ringtoets_project); gui.Application.CreateNewProject(); - Log.Info(Resources.New_wti_project_successfully_opened); + Log.Info(Resources.New_Ringtoets_project_successfully_opened); RefreshGui(); } - public bool TryOpenExistingWTIProject() + public bool TryOpenExistingProject() { var openFileDialog = new OpenFileDialog { - Filter = Resources.Wti_project_file_filter, + Filter = Resources.Ringtoets_project_file_filter, FilterIndex = 1, RestoreDirectory = true }; if (openFileDialog.ShowDialog() == DialogResult.Cancel) { - Log.Warn(Resources.Opening_existing_wti_project_cancelled); + Log.Warn(Resources.Opening_existing_Ringtoets_project_cancelled); return false; } - Log.Info(Resources.Opening_existing_wti_project); + Log.Info(Resources.Opening_existing_Ringtoets_project); - return TryOpenExistingWTIProject(openFileDialog.FileName); + return TryOpenExistingProject(openFileDialog.FileName); } - public bool TryOpenExistingWTIProject(string filePath) + public bool TryOpenExistingProject(string filePath) { - if (!TryCloseWTIProject()) + if (!TryCloseProject()) { - Log.Warn(Resources.Opening_existing_wti_project_cancelled); + Log.Warn(Resources.Opening_existing_Ringtoets_project_cancelled); return false; } var result = false; - ProgressBarDialog.PerformTask(Resources.Loading_wti_project_from_selected_file, () => result = gui.Application.OpenProject(filePath)); + ProgressBarDialog.PerformTask(Resources.Loading_Ringtoets_project_from_selected_file, () => result = gui.Application.OpenProject(filePath)); RefreshGui(); return result; } - public bool TryCloseWTIProject() + public bool TryCloseProject() { if (gui.Application.Project != null) { - Log.Info("Closing current WTI project."); + Log.Info("Closing current project."); // Disconnect project ((INotifyPropertyChanged) gui.Application.Project).PropertyChanged -= CurrentProjectChanged; Index: Core/Common/src/Core.Common.Gui/IGuiCommandHandler.cs =================================================================== diff -u -rce485d2ea1e537a2d9be33d46a282e5bfa2abdcc -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Core/Common/src/Core.Common.Gui/IGuiCommandHandler.cs (.../IGuiCommandHandler.cs) (revision ce485d2ea1e537a2d9be33d46a282e5bfa2abdcc) +++ Core/Common/src/Core.Common.Gui/IGuiCommandHandler.cs (.../IGuiCommandHandler.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -10,40 +10,40 @@ public interface IGuiCommandHandler : IDisposable { /// - /// Tries to create a new WTI project. + /// Tries to create a new Ringtoets project. /// /// /// The creation action might be cancelled (due to user interaction). /// - void TryCreateNewWTIProject(); + void TryCreateNewProject(); /// - /// Tries to open an existing WTI project. + /// Tries to open an existing Ringtoets project. /// /// /// The opening action might be cancelled (due to user interaction). /// - /// Whether or not an existing WTI project was correctly opened. - bool TryOpenExistingWTIProject(); + /// Whether or not an existing project was correctly opened. + bool TryOpenExistingProject(); /// - /// Tries to open an existing WTI project from file. + /// Tries to open an existing Ringtoets project from file. /// - /// The path to the existing WTI project file. + /// The path to the existing Ringtoets project file. /// /// The opening action might be cancelled (due to user interaction). /// - /// Whether or not an existing WTI project was correctly opened. - bool TryOpenExistingWTIProject(string filePath); + /// Whether or not an existing project was correctly opened. + bool TryOpenExistingProject(string filePath); /// - /// Tries to close a WTI project. + /// Tries to close a Ringtoets project. /// /// /// The closing action might be cancelled (due to user interaction). /// - /// Whether or not the WTI project was correctly closed. - bool TryCloseWTIProject(); + /// Whether or not the project was correctly closed. + bool TryCloseProject(); /// /// Presents the user with a dialog to choose an editor for the selected dataitem Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r35ebe102d9a203951dad2d869f5f5f0265d6c5c0 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 35ebe102d9a203951dad2d869f5f5f0265d6c5c0) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -1510,11 +1510,11 @@ } /// - /// Looks up a localized string similar to Loading WTI project from selected file.. + /// Looks up a localized string similar to Loading Ringtoets project from selected file.. /// - public static string Loading_wti_project_from_selected_file { + public static string Loading_Ringtoets_project_from_selected_file { get { - return ResourceManager.GetString("Loading_wti_project_from_selected_file", resourceCulture); + return ResourceManager.GetString("Loading_Ringtoets_project_from_selected_file", resourceCulture); } } @@ -1914,11 +1914,11 @@ } /// - /// Looks up a localized string similar to New WTI project successfully opened.. + /// Looks up a localized string similar to New Ringtoets project successfully opened.. /// - public static string New_wti_project_successfully_opened { + public static string New_Ringtoets_project_successfully_opened { get { - return ResourceManager.GetString("New_wti_project_successfully_opened", resourceCulture); + return ResourceManager.GetString("New_Ringtoets_project_successfully_opened", resourceCulture); } } @@ -1953,38 +1953,38 @@ } /// - /// Looks up a localized string similar to Opening existing WTI project.. + /// Looks up a localized string similar to Opening existing Ringtoets project.. /// - public static string Opening_existing_wti_project { + public static string Opening_existing_Ringtoets_project { get { - return ResourceManager.GetString("Opening_existing_wti_project", resourceCulture); + return ResourceManager.GetString("Opening_existing_Ringtoets_project", resourceCulture); } } /// - /// Looks up a localized string similar to Opening existing WTI project cancelled.. + /// Looks up a localized string similar to Opening existing Ringtoets project cancelled.. /// - public static string Opening_existing_wti_project_cancelled { + public static string Opening_existing_Ringtoets_project_cancelled { get { - return ResourceManager.GetString("Opening_existing_wti_project_cancelled", resourceCulture); + return ResourceManager.GetString("Opening_existing_Ringtoets_project_cancelled", resourceCulture); } } /// - /// Looks up a localized string similar to Opening new WTI project.. + /// Looks up a localized string similar to Opening new Ringtoets project.. /// - public static string Opening_new_wti_project { + public static string Opening_new_Ringtoets_project { get { - return ResourceManager.GetString("Opening_new_wti_project", resourceCulture); + return ResourceManager.GetString("Opening_new_Ringtoets_project", resourceCulture); } } /// - /// Looks up a localized string similar to Opening new WTI project cancelled.. + /// Looks up a localized string similar to Opening new Ringtoets project cancelled.. /// - public static string Opening_new_wti_project_cancelled { + public static string Opening_new_Ringtoets_project_cancelled { get { - return ResourceManager.GetString("Opening_new_wti_project_cancelled", resourceCulture); + return ResourceManager.GetString("Opening_new_Ringtoets_project_cancelled", resourceCulture); } } @@ -2700,6 +2700,15 @@ } /// + /// Looks up a localized string similar to Ringtoets project files (.rt)|*.rtx. + /// + public static string Ringtoets_project_file_filter { + get { + return ResourceManager.GetString("Ringtoets_project_file_filter", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Error during plugin activation. /// public static string RingtoetsGui_ActivatePlugins_Error_during_plugin_activation { @@ -3339,14 +3348,5 @@ return ((System.Drawing.Bitmap)(obj)); } } - - /// - /// Looks up a localized string similar to WTI project files (.wti)|*.wti. - /// - public static string Wti_project_file_filter { - get { - return ResourceManager.GetString("Wti_project_file_filter", resourceCulture); - } - } } } Index: Core/Common/src/Core.Common.Gui/Properties/Resources.nl-NL.resx =================================================================== diff -u -r35ebe102d9a203951dad2d869f5f5f0265d6c5c0 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Core/Common/src/Core.Common.Gui/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 35ebe102d9a203951dad2d869f5f5f0265d6c5c0) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -820,26 +820,26 @@ NL Cannot start multiple instances of Ringtoets. Please close the other instance first. - - WTI projectbestanden (.wti)|*.wti + + Ringtoets projectbestanden (.rt)|*.trx - - Openen bestaand WTI project geannuleerd. + + Openen bestaand Ringtoets project geannuleerd. - - Openen bestaand WTI project. + + Openen bestaand Ringtoets project. - - Inladen WTI project uit geselecteerd bestand. + + Inladen Ringtoets project uit geselecteerd bestand. - - Openen nieuw WTI project geannuleerd. + + Openen nieuw Ringtoets project geannuleerd. - - Openen nieuw WTI project. + + Openen nieuw Ringtoets project. - - Nieuw WTI project succesvol geopend. + + Nieuw Ringtoets project succesvol geopend. Aantal ({0}) Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx =================================================================== diff -u -r35ebe102d9a203951dad2d869f5f5f0265d6c5c0 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 35ebe102d9a203951dad2d869f5f5f0265d6c5c0) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -151,8 +151,8 @@ ..\Resources\RelationshipsHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Opening new WTI project cancelled. + + Opening new Ringtoets project cancelled. ..\Resources\information_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -239,8 +239,8 @@ Cannot add an item to the selected container - - WTI project files (.wti)|*.wti + + Ringtoets project files (.rt)|*.rtx Error storing settings to {0} @@ -449,8 +449,8 @@ Activity '{0}' not found in project! Typo, or did you forget to load a project? - - Opening existing WTI project cancelled. + + Opening existing Ringtoets project cancelled. ..\Resources\graphhs.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -497,8 +497,8 @@ No view registered for : {0} - - Loading WTI project from selected file. + + Loading Ringtoets project from selected file. Run script from file @@ -638,8 +638,8 @@ Messages - - New WTI project successfully opened. + + New Ringtoets project successfully opened. Find In Project @@ -893,8 +893,8 @@ Show Chart Contents (Shift + Alt + C) - - Opening new WTI project. + + Opening new Ringtoets project. ..\Resources\chart_bar.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1031,8 +1031,8 @@ Properties - - Opening existing WTI project. + + Opening existing Ringtoets project. Clipboard Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs =================================================================== diff -u -r125002b7df54bc7ec7190146cd9b23458999c60e -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) +++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -267,7 +267,7 @@ isExiting = true; - if (!SkipDialogsOnExit && !CommandHandler.TryCloseWTIProject()) + if (!SkipDialogsOnExit && !CommandHandler.TryCloseProject()) { // user cancelled exit: isExiting = false; Index: Core/Common/test/Core.Common.Integration.Tests/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs =================================================================== diff -u -rf1c02b2d47dc561deec70a24128d8dd49d9bed6a -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Core/Common/test/Core.Common.Integration.Tests/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs (.../RingtoetsGuiIntegrationTest.cs) (revision f1c02b2d47dc561deec70a24128d8dd49d9bed6a) +++ Core/Common/test/Core.Common.Integration.Tests/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs (.../RingtoetsGuiIntegrationTest.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -37,8 +37,8 @@ gui.Plugins.Add(new ProjectExplorerGuiPlugin()); gui.Run(); - gui.CommandHandler.TryCreateNewWTIProject(); - gui.CommandHandler.TryCreateNewWTIProject(); + gui.CommandHandler.TryCreateNewProject(); + gui.CommandHandler.TryCreateNewProject(); } } @@ -105,7 +105,7 @@ using (var gui = new RingtoetsGui()) { gui.Run(); - gui.CommandHandler.TryCloseWTIProject(); //should not trigger exception + gui.CommandHandler.TryCloseProject(); //should not trigger exception } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj =================================================================== diff -u -r67e117952bef2b1524aebb434c654c2c9be77dbd -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj (.../Ringtoets.Piping.Data.csproj) (revision 67e117952bef2b1524aebb434c654c2c9be77dbd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj (.../Ringtoets.Piping.Data.csproj) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -77,7 +77,7 @@ Resources.resx - + Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/RingtoetsProject.cs =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.Data/RingtoetsProject.cs (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/RingtoetsProject.cs (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,78 @@ +using System.Collections.Generic; +using Core.Common.Base; + +namespace Ringtoets.Piping.Data +{ + /// + /// Container for all the data that has been imported and calculated by the user when performing an assessment. + /// + public class RingtoetsProject : IObservable + { + private readonly IList observers = new List(); + + /// + /// Creates a new instance of with a default name set. + /// + public RingtoetsProject() + { + Name = "Ringtoets project"; + } + + /// + /// Gets or sets the . + /// + public PipingFailureMechanism PipingFailureMechanism { get; private set; } + + /// + /// The name of the . + /// + public string Name { get; set; } + + /// + /// Removes the assigned to the . + /// + public void ClearPipingFailureMechanism() + { + PipingFailureMechanism = null; + } + + /// + /// Creates a new and assign it to the . + /// + public void InitializePipingFailureMechanism() + { + PipingFailureMechanism = new PipingFailureMechanism(); + } + + /// + /// Determines whether a new can be added to the . + /// + /// True if a new can be assigned. False otherwise. + public bool CanAddPipingFailureMechanism() + { + return PipingFailureMechanism == null; + } + + #region IObservable + + public void Attach(IObserver observer) + { + observers.Add(observer); + } + + public void Detach(IObserver observer) + { + observers.Remove(observer); + } + + public void NotifyObservers() + { + foreach (var observer in observers) + { + observer.UpdateObserver(); + } + } + + #endregion + } +} \ No newline at end of file Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Data/WtiProject.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs =================================================================== diff -u -r1efcd2277f5a38d44a78e4a9286eec35134fe8dd -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs (.../PipingFailureMechanismNodePresenter.cs) (revision 1efcd2277f5a38d44a78e4a9286eec35134fe8dd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs (.../PipingFailureMechanismNodePresenter.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -101,10 +101,10 @@ protected override bool RemoveNodeData(object parentNodeData, PipingFailureMechanism nodeData) { - var wtiProject = (WtiProject)parentNodeData; + var ringtoetsProject = (RingtoetsProject)parentNodeData; - wtiProject.ClearPipingFailureMechanism(); - wtiProject.NotifyObservers(); + ringtoetsProject.ClearPipingFailureMechanism(); + ringtoetsProject.NotifyObservers(); return true; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/RingtoetsProjectNodePresenter.cs =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/RingtoetsProjectNodePresenter.cs (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/RingtoetsProjectNodePresenter.cs (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,138 @@ +using System; +using System.Collections; +using System.ComponentModel; +using System.Windows.Forms; +using Core.Common.Base; +using Core.Common.Controls; +using Core.Common.Utils.Collections; +using Ringtoets.Piping.Data; +using Ringtoets.Piping.Forms.Extensions; +using Ringtoets.Piping.Forms.Properties; + +namespace Ringtoets.Piping.Forms.NodePresenters +{ + /// + /// Node presenter for items in the tree view. + /// + public class RingtoetsProjectNodePresenter : ITreeNodePresenter + { + public ITreeView TreeView { get; set; } + + public Type NodeTagType + { + get + { + return typeof(RingtoetsProject); + } + } + + public void UpdateNode(ITreeNode parentNode, ITreeNode node, object nodeData) + { + var ringtoetsProject = (RingtoetsProject) nodeData; + node.Text = ringtoetsProject.Name; + node.Image = Resources.RingtoetsProjectFolderIcon; + } + + public IEnumerable GetChildNodeObjects(object parentNodeData, ITreeNode node) + { + var ringtoetsProject = (RingtoetsProject) parentNodeData; + if (ringtoetsProject.PipingFailureMechanism != null) + { + yield return ringtoetsProject.PipingFailureMechanism; + } + } + + public bool CanRenameNode(ITreeNode node) + { + return true; + } + + public bool CanRenameNodeTo(ITreeNode node, string newName) + { + return true; + } + + public void OnNodeRenamed(object nodeData, string newName) + { + var project = (RingtoetsProject) nodeData; + + project.Name = newName; + project.NotifyObservers(); + } + + public void OnNodeChecked(ITreeNode node) {} + + public DragOperations CanDrag(object nodeData) + { + return DragOperations.None; + } + + public DragOperations CanDrop(object item, ITreeNode sourceNode, ITreeNode targetNode, DragOperations validOperations) + { + return DragOperations.None; + } + + public bool CanInsert(object item, ITreeNode sourceNode, ITreeNode targetNode) + { + return false; + } + + public void OnDragDrop(object item, object sourceParentNodeData, object targetParentNodeData, DragOperations operation, int position) {} + + public void OnNodeSelected(object nodeData) {} + + public ContextMenuStrip GetContextMenu(ITreeNode sender, object nodeData) + { + var ringtoetsProject = (RingtoetsProject) nodeData; + + var contextMenu = new ContextMenuStrip(); + if (ringtoetsProject.CanAddPipingFailureMechanism()) + { + contextMenu.AddMenuItem(Resources.RingtoetsProjectNodePresenter_ContextMenu_Add_PipingFailureMechanism, + Resources.RingtoetsProjectNodePresenter_ContextMenu_Add_PipingFailureMechanism_Tooltip, + Resources.PipingIcon, + InitializePipingFailureMechanismForRingtoetsProject).Tag = nodeData; + } + else + { + contextMenu.AddMenuItem(Resources.RingtoetsProjectNodePresenter_ContextMenu_Add_PipingFailureMechanism, + Resources.RingtoetsProjectNodePresenter_ContextMenu_PipingFailureMechanism_Already_Added_Tooltip, + Resources.PipingIcon, + InitializePipingFailureMechanismForRingtoetsProject).Enabled = false; + } + + return contextMenu; + } + + public void OnPropertyChanged(object sender, ITreeNode node, PropertyChangedEventArgs e) {} + + public void OnCollectionChanged(object sender, NotifyCollectionChangingEventArgs e) {} + + public bool CanRemove(object parentNodeData, object nodeData) + { + return true; + } + + public bool RemoveNodeData(object parentNodeData, object nodeData) + { + var parentProject = (Project) parentNodeData; + var ringtoetsProject = (RingtoetsProject) nodeData; + + parentProject.Items.Remove(ringtoetsProject); + parentProject.NotifyObservers(); + + return true; + } + + private void InitializePipingFailureMechanismForRingtoetsProject(object sender, EventArgs e) + { + var treeNode = (ToolStripItem) sender; + if (treeNode != null) + { + var ringtoetsProject = (RingtoetsProject) treeNode.Tag; + ringtoetsProject.InitializePipingFailureMechanism(); + ringtoetsProject.NotifyObservers(); + } + } + } +} \ No newline at end of file Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/WtiProjectNodePresenter.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r67e117952bef2b1524aebb434c654c2c9be77dbd -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 67e117952bef2b1524aebb434c654c2c9be77dbd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.18063 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -1096,94 +1096,104 @@ } /// - /// Looks up a localized string similar to Verschoven lognormale verdeling. + /// Looks up a localized string similar to Naam van het Ringtoets project.. /// - public static string ShiftedLognormalDistribution_DisplayName { + public static string RingtoetsProject_Name_Description { get { - return ResourceManager.GetString("ShiftedLognormalDistribution_DisplayName", resourceCulture); + return ResourceManager.GetString("RingtoetsProject_Name_Description", resourceCulture); } } /// - /// Looks up a localized string similar to Verschoven lognormaal. + /// Looks up a localized string similar to Naam. /// - public static string ShiftedLognormalDistribution_ShortName { + public static string RingtoetsProject_Name_DisplayName { get { - return ResourceManager.GetString("ShiftedLognormalDistribution_ShortName", resourceCulture); + return ResourceManager.GetString("RingtoetsProject_Name_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Valideren. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static string Validate { + public static System.Drawing.Bitmap RingtoetsProjectFolderIcon { get { - return ResourceManager.GetString("Validate", resourceCulture); + object obj = ResourceManager.GetObject("RingtoetsProjectFolderIcon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); } } /// - /// Looks up a localized string similar to Naam van het wettelijk toets instrumentarium project.. + /// Looks up a localized string similar to Voeg piping faalmechanisme toe. /// - public static string WtiProject_Name_Description { + public static string RingtoetsProjectNodePresenter_ContextMenu_Add_PipingFailureMechanism { get { - return ResourceManager.GetString("WtiProject_Name_Description", resourceCulture); + return ResourceManager.GetString("RingtoetsProjectNodePresenter_ContextMenu_Add_PipingFailureMechanism", resourceCulture); } } /// - /// Looks up a localized string similar to Naam. + /// Looks up a localized string similar to Start een nieuwe piping toetsing voor dit project.. /// - public static string WtiProject_Name_DisplayName { + public static string RingtoetsProjectNodePresenter_ContextMenu_Add_PipingFailureMechanism_Tooltip { get { - return ResourceManager.GetString("WtiProject_Name_DisplayName", resourceCulture); + return ResourceManager.GetString("RingtoetsProjectNodePresenter_ContextMenu_Add_PipingFailureMechanism_Tooltip", resourceCulture); } } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Looks up a localized string similar to Kan geen nieuwe piping toetsing starten, omdat er al een piping toetsing is gestart voor dit project.. /// - public static System.Drawing.Bitmap WtiProjectFolderIcon { + public static string RingtoetsProjectNodePresenter_ContextMenu_PipingFailureMechanism_Already_Added_Tooltip { get { - object obj = ResourceManager.GetObject("WtiProjectFolderIcon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ResourceManager.GetString("RingtoetsProjectNodePresenter_ContextMenu_PipingFailureMechanism_Already_Added_To" + + "oltip", resourceCulture); } } /// - /// Looks up a localized string similar to Voeg piping faalmechanisme toe. + /// Looks up a localized string similar to Algemeen. /// - public static string WtiProjectNodePresenter_ContextMenu_Add_PipingFailureMechanism { + public static string RingtoetsProjectProperties_Category { get { - return ResourceManager.GetString("WtiProjectNodePresenter_ContextMenu_Add_PipingFailureMechanism", resourceCulture); + return ResourceManager.GetString("RingtoetsProjectProperties_Category", resourceCulture); } } /// - /// Looks up a localized string similar to Start een nieuwe piping toetsing voor dit project.. + /// Looks up a localized string similar to Ringtoest project. /// - public static string WtiProjectNodePresenter_ContextMenu_Add_PipingFailureMechanism_Tooltip { + public static string RingtoetsProjectProperties_DisplayName { get { - return ResourceManager.GetString("WtiProjectNodePresenter_ContextMenu_Add_PipingFailureMechanism_Tooltip", resourceCulture); + return ResourceManager.GetString("RingtoetsProjectProperties_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Kan geen nieuwe piping toetsing starten, omdat er al een piping toetsing is gestart voor dit project.. + /// Looks up a localized string similar to Verschoven lognormale verdeling. /// - public static string WtiProjectNodePresenter_ContextMenu_PipingFailureMechanism_Already_Added_Tooltip { + public static string ShiftedLognormalDistribution_DisplayName { get { - return ResourceManager.GetString("WtiProjectNodePresenter_ContextMenu_PipingFailureMechanism_Already_Added_Tooltip", resourceCulture); + return ResourceManager.GetString("ShiftedLognormalDistribution_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to WTI project. + /// Looks up a localized string similar to Verschoven lognormaal. /// - public static string WtiProjectProperties_DisplayName { + public static string ShiftedLognormalDistribution_ShortName { get { - return ResourceManager.GetString("WtiProjectProperties_DisplayName", resourceCulture); + return ResourceManager.GetString("ShiftedLognormalDistribution_ShortName", resourceCulture); } } + + /// + /// Looks up a localized string similar to Valideren. + /// + public static string Validate { + get { + return ResourceManager.GetString("Validate", resourceCulture); + } + } } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r67e117952bef2b1524aebb434c654c2c9be77dbd -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 67e117952bef2b1524aebb434c654c2c9be77dbd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -307,25 +307,25 @@ Dwarsdoorsneden - + ..\Resources\folder-stand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Naam van het wettelijk toets instrumentarium project. + + Naam van het Ringtoets project. - + Naam - - WTI project + + Ringtoest project Faalmechanisme piping ..\Resources\u48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + Voeg piping faalmechanisme toe @@ -340,10 +340,10 @@ Importeer nieuwe dwarsdoorsnedes van een *.csv bestand. - + Start een nieuwe piping toetsing voor dit project. - + Kan geen nieuwe piping toetsing starten, omdat er al een piping toetsing is gestart voor dit project. @@ -490,4 +490,7 @@ Verschoven lognormaal + + Algemeen + \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsProjectProperties.cs =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsProjectProperties.cs (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsProjectProperties.cs (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,31 @@ +using Core.Common.Gui; +using Core.Common.Utils; +using Ringtoets.Piping.Data; + +using Ringtoets.Piping.Forms.Properties; + +namespace Ringtoets.Piping.Forms.PropertyClasses +{ + /// + /// ViewModel of for properties panel. + /// + [ResourcesDisplayName(typeof(Resources), "RingtoetsProjectProperties_DisplayName")] + public class RingtoetsProjectProperties : ObjectProperties + { + [ResourcesCategory(typeof(Resources), "Categories_General")] + [ResourcesDisplayName(typeof(Resources), "RingtoetsProject_Name_DisplayName")] + [ResourcesDescription(typeof(Resources), "RingtoetsProject_Name_Description")] + public string Name + { + get + { + return data.Name; + } + set + { + data.Name = value; + data.NotifyObservers(); + } + } + } +} \ No newline at end of file Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/WtiProjectProperties.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj =================================================================== diff -u -r67e117952bef2b1524aebb434c654c2c9be77dbd -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj (.../Ringtoets.Piping.Forms.csproj) (revision 67e117952bef2b1524aebb434c654c2c9be77dbd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj (.../Ringtoets.Piping.Forms.csproj) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -61,7 +61,7 @@ - + @@ -73,7 +73,7 @@ - + Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs =================================================================== diff -u -ra6ba313236d0ff8d2f219fc8249b700b1eade338 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs (.../PipingSoilProfilesImporter.cs) (revision a6ba313236d0ff8d2f219fc8249b700b1eade338) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs (.../PipingSoilProfilesImporter.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -7,7 +7,7 @@ using Ringtoets.Piping.Data; using Ringtoets.Piping.IO.Exceptions; using Ringtoets.Piping.IO.SoilProfile; -using WtiFormsResources = Ringtoets.Piping.Forms.Properties.Resources; +using RingtoetsFormsResources = Ringtoets.Piping.Forms.Properties.Resources; using ApplicationResources = Ringtoets.Piping.Plugin.Properties.Resources; namespace Ringtoets.Piping.Plugin.FileImporter @@ -23,23 +23,23 @@ { get { - return WtiFormsResources.PipingSoilProfilesCollection_DisplayName; + return RingtoetsFormsResources.PipingSoilProfilesCollection_DisplayName; } } public string Category { get { - return ApplicationResources.Wti_application_name; + return RingtoetsFormsResources.RingtoetsProjectProperties_Category; } } public Bitmap Image { get { - return WtiFormsResources.PipingSoilProfileIcon; + return RingtoetsFormsResources.PipingSoilProfileIcon; } } @@ -67,7 +67,7 @@ get { return String.Format("{0} {1} (*.soil)|*.soil", - WtiFormsResources.PipingSoilProfilesCollection_DisplayName, ApplicationResources.Soil_file_name); + RingtoetsFormsResources.PipingSoilProfilesCollection_DisplayName, ApplicationResources.Soil_file_name); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs =================================================================== diff -u -r21c58fc28e5675736f50be6e06b2605120991478 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision 21c58fc28e5675736f50be6e06b2605120991478) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -10,7 +10,7 @@ using Ringtoets.Piping.IO; using Ringtoets.Piping.IO.Exceptions; -using WtiFormsResources = Ringtoets.Piping.Forms.Properties.Resources; +using RingtoetsFormsResources = Ringtoets.Piping.Forms.Properties.Resources; using ApplicationResources = Ringtoets.Piping.Plugin.Properties.Resources; namespace Ringtoets.Piping.Plugin.FileImporter @@ -33,23 +33,23 @@ { get { - return WtiFormsResources.PipingSurfaceLinesCollection_DisplayName; + return RingtoetsFormsResources.PipingSurfaceLinesCollection_DisplayName; } } public string Category { get { - return ApplicationResources.Wti_application_name; + return RingtoetsFormsResources.RingtoetsProjectProperties_Category; } } public Bitmap Image { get { - return WtiFormsResources.PipingSurfaceLineIcon; + return RingtoetsFormsResources.PipingSurfaceLineIcon; } } @@ -77,7 +77,7 @@ get { return String.Format("{0} {1} (*.csv)|*.csv", - WtiFormsResources.PipingSurfaceLinesCollection_DisplayName, ApplicationResources.Csv_file_name); + RingtoetsFormsResources.PipingSurfaceLinesCollection_DisplayName, ApplicationResources.Csv_file_name); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -rfb6f952991193be2c30995f3f8e60312c12dc052 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision fb6f952991193be2c30995f3f8e60312c12dc052) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -177,14 +177,5 @@ return ResourceManager.GetString("Soil_file_name", resourceCulture); } } - - /// - /// Looks up a localized string similar to WTI. - /// - public static string Wti_application_name { - get { - return ResourceManager.GetString("Wti_application_name", resourceCulture); - } - } } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx =================================================================== diff -u -rfb6f952991193be2c30995f3f8e60312c12dc052 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision fb6f952991193be2c30995f3f8e60312c12dc052) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - WTI - Kommagescheiden bestand Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Ringtoets.Piping.Plugin.csproj =================================================================== diff -u -r67e117952bef2b1524aebb434c654c2c9be77dbd -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Ringtoets.Piping.Plugin.csproj (.../Ringtoets.Piping.Plugin.csproj) (revision 67e117952bef2b1524aebb434c654c2c9be77dbd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Ringtoets.Piping.Plugin.csproj (.../Ringtoets.Piping.Plugin.csproj) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -75,10 +75,10 @@ True Resources.resx - - - - WtiRibbon.xaml + + + + RingtoetsRibbon.xaml @@ -133,7 +133,7 @@ - + Designer MSBuild:Compile @@ -144,7 +144,7 @@ true - Wti.Plugin + Ringtoets.Piping.Plugin Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/RingtoetsApplicationPlugin.cs =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/RingtoetsApplicationPlugin.cs (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/RingtoetsApplicationPlugin.cs (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,30 @@ +using System.Collections.Generic; +using Core.Common.Base; + +using Ringtoets.Piping.Data; +using Ringtoets.Piping.Plugin.FileImporter; + +using RingtoetsFormsResources = Ringtoets.Piping.Forms.Properties.Resources; + +namespace Ringtoets.Piping.Plugin +{ + public class RingtoetsApplicationPlugin : ApplicationPlugin + { + public override IEnumerable GetDataItemInfos() + { + yield return new DataItemInfo + { + Name = RingtoetsFormsResources.RingtoetsProjectProperties_DisplayName, + Category = RingtoetsFormsResources.RingtoetsProjectProperties_Category, + Image = RingtoetsFormsResources.RingtoetsProjectFolderIcon, + CreateData = owner => new RingtoetsProject() + }; + } + + public override IEnumerable GetFileImporters() + { + yield return new PipingSurfaceLinesCsvImporter(); + yield return new PipingSoilProfilesImporter(); + } + } +} \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/RingtoetsGuiPlugin.cs =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/RingtoetsGuiPlugin.cs (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/RingtoetsGuiPlugin.cs (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,57 @@ +using System.Collections.Generic; +using Core.Common.Controls; +using Core.Common.Gui; +using Core.Common.Gui.Forms; + +using Ringtoets.Piping.Data; + +using Ringtoets.Piping.Forms.NodePresenters; +using Ringtoets.Piping.Forms.PresentationObjects; +using Ringtoets.Piping.Forms.PropertyClasses; + +namespace Ringtoets.Piping.Plugin +{ + public class RingtoetsGuiPlugin : GuiPlugin + { + public override IRibbonCommandHandler RibbonCommandHandler + { + get + { + return new RingtoetsRibbon(); + } + } + + public override IEnumerable GetPropertyInfos() + { + yield return new PropertyInfo(); + yield return new PropertyInfo(); + yield return new PropertyInfo(); + yield return new PropertyInfo(); + yield return new PropertyInfo(); + } + + public override IEnumerable GetProjectTreeViewNodePresenters() + { + yield return new RingtoetsProjectNodePresenter(); + yield return new PipingCalculationInputsNodePresenter + { + RunActivityAction = Gui.Application.ActivityRunner.Enqueue + }; + yield return new PipingFailureMechanismNodePresenter + { + RunActivityAction = Gui.Application.ActivityRunner.Enqueue + }; + yield return new PipingSurfaceLineCollectionNodePresenter + { + ImportSurfaceLinesAction = Gui.CommandHandler.ImportToGuiSelection + }; + yield return new PipingSurfaceLineNodePresenter(); + yield return new PipingSoilProfileCollectionNodePresenter + { + ImportSoilProfilesAction = Gui.CommandHandler.ImportToGuiSelection + }; + yield return new PipingSoilProfileNodePresenter(); + yield return new PipingOutputNodePresenter(); + } + } +} \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/RingtoetsRibbon.xaml =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/RingtoetsRibbon.xaml (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/RingtoetsRibbon.xaml (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,13 @@ + + + + + + Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/RingtoetsRibbon.xaml.cs =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/RingtoetsRibbon.xaml.cs (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/RingtoetsRibbon.xaml.cs (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,37 @@ +using System.Collections.Generic; +using Core.Common.Controls; +using Core.Common.Gui.Forms; + +namespace Ringtoets.Piping.Plugin +{ + /// + /// Interaction logic for RingtoetsRibbon.xaml + /// + public partial class RingtoetsRibbon : IRibbonCommandHandler + { + public RingtoetsRibbon() + { + InitializeComponent(); + } + + public IEnumerable Commands + { + get + { + yield break; + } + } + + public object GetRibbonControl() + { + return RingtoetsRibbonControl; + } + + public void ValidateItems() {} + + public bool IsContextualTabVisible(string tabGroupName, string tabName) + { + return false; + } + } +} \ No newline at end of file Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Plugin/WtiApplicationPlugin.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Plugin/WtiGuiPlugin.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Plugin/WtiRibbon.xaml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Plugin/WtiRibbon.xaml.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj =================================================================== diff -u -r712a020ea0330ece24849c2710641c1ce399ed61 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj (.../Ringtoets.Piping.Data.Test.csproj) (revision 712a020ea0330ece24849c2710641c1ce399ed61) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj (.../Ringtoets.Piping.Data.Test.csproj) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -66,7 +66,7 @@ - + Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsProjectTest.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsProjectTest.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsProjectTest.cs (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,151 @@ +using Core.Common.Base; +using NUnit.Framework; +using Rhino.Mocks; + +namespace Ringtoets.Piping.Data.Test +{ + [TestFixture] + public class RingtoetsProjectTest + { + [Test] + public void DefaultConstructor_ExpectedValues() + { + // Call + var project = new RingtoetsProject(); + + // Assert + Assert.IsInstanceOf(project); + Assert.AreEqual("Ringtoets project", project.Name); + } + + [Test] + public void InitializePipingFailureMechanism_WithoutFailureMechanismSet_SetNewFailureMechanism() + { + // Setup + var project = new RingtoetsProject(); + + // Call + project.InitializePipingFailureMechanism(); + + // Assert + Assert.IsNotNull(project.PipingFailureMechanism); + } + + [Test] + public void InitializePipingFailureMechanism_WithFailureMechanismSet_SetNewFailureMechanism() + { + // Setup + var project = new RingtoetsProject(); + project.InitializePipingFailureMechanism(); + PipingFailureMechanism notExpectedFailureMechanism = project.PipingFailureMechanism; + + // Precondition + Assert.IsNotNull(notExpectedFailureMechanism); + + // Call + project.InitializePipingFailureMechanism(); + + // Assert + Assert.AreNotSame(notExpectedFailureMechanism, project.PipingFailureMechanism); + } + + [Test] + public void ClearPipingFailureMechanism_WithFailureMechanismSet_FailureMechanismUnassigned() + { + // Setup + var project = new RingtoetsProject(); + project.InitializePipingFailureMechanism(); + PipingFailureMechanism notExpectedFailureMechanism = project.PipingFailureMechanism; + + // Precondition + Assert.IsNotNull(notExpectedFailureMechanism); + + // Call + project.ClearPipingFailureMechanism(); + + // Assert + Assert.IsNull(project.PipingFailureMechanism); + } + + [Test] + public void ClearPipingFailureMechanism_WithoutFailureMechanismSet_PipingFailureMechanismStillUnassigned() + { + // Setup + var project = new RingtoetsProject(); + + // Precondition + Assert.IsNull(project.PipingFailureMechanism); + + // Call + project.ClearPipingFailureMechanism(); + + // Assert + Assert.IsNull(project.PipingFailureMechanism); + } + + [Test] + public void NotifyObservers_ObserverAttachedToProject_ObserverIsNotified() + { + // Setup + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + observer.Expect(o => o.UpdateObserver()); + mocks.ReplayAll(); + + var project = new RingtoetsProject(); + project.Attach(observer); + + // Call + project.NotifyObservers(); + + // Assert + mocks.VerifyAll(); + } + + [Test] + public void NotifyObservers_ObserverHasBeenDetached_ObserverShouldNotBeNotified() + { + // Setup + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + mocks.ReplayAll(); + + var project = new RingtoetsProject(); + project.Attach(observer); + project.Detach(observer); + + // Call + project.NotifyObservers(); + + // Assert + mocks.VerifyAll(); // Expect no calls on observer + } + + [Test] + public void CanAddPipingFailureMechanism_NoPipingFailureMechanismAssigned_ReturnsTrue() + { + // Setup + var project = new RingtoetsProject(); + + // Call + var result = project.CanAddPipingFailureMechanism(); + + // Assert + Assert.IsTrue(result); + } + + [Test] + public void CanAddPipingFailureMechanism_PipingFailureMechanismInitialized_ReturnsTrue() + { + // Setup + var project = new RingtoetsProject(); + project.InitializePipingFailureMechanism(); + + // Call + var result = project.CanAddPipingFailureMechanism(); + + // Assert + Assert.IsFalse(result); + } + } +} \ No newline at end of file Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/WtiProjectTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationInputsNodePresenterTest.cs =================================================================== diff -u -r17e1e8a3db7862fea5fb74b46c375da5065da8dc -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationInputsNodePresenterTest.cs (.../PipingCalculationInputsNodePresenterTest.cs) (revision 17e1e8a3db7862fea5fb74b46c375da5065da8dc) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationInputsNodePresenterTest.cs (.../PipingCalculationInputsNodePresenterTest.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -14,7 +14,7 @@ using Ringtoets.Piping.Forms.NodePresenters; using Ringtoets.Piping.Forms.PresentationObjects; -using WtiFormsResources = Ringtoets.Piping.Forms.Properties.Resources; +using RingtoetsFormsResources = Ringtoets.Piping.Forms.Properties.Resources; namespace Ringtoets.Piping.Forms.Test.NodePresenters { @@ -308,15 +308,15 @@ // Assert Assert.IsNotNull(contextMenu); Assert.AreEqual(3, contextMenu.Items.Count); - Assert.AreEqual(WtiFormsResources.Validate, contextMenu.Items[contextMenuValidateIndex].Text); + Assert.AreEqual(RingtoetsFormsResources.Validate, contextMenu.Items[contextMenuValidateIndex].Text); ToolStripItem calculatePipingItem = contextMenu.Items[contextMenuCalculateIndex]; - Assert.AreEqual(WtiFormsResources.Calculate, calculatePipingItem.Text); + Assert.AreEqual(RingtoetsFormsResources.Calculate, calculatePipingItem.Text); Assert.AreEqual(16, calculatePipingItem.Image.Height); Assert.AreEqual(16, calculatePipingItem.Image.Width); ToolStripItem clearOutputItem = contextMenu.Items[contextMenuClearIndex]; - Assert.AreEqual(WtiFormsResources.Clear_output, clearOutputItem.Text); + Assert.AreEqual(RingtoetsFormsResources.Clear_output, clearOutputItem.Text); Assert.AreEqual(16, clearOutputItem.Image.Height); Assert.AreEqual(16, clearOutputItem.Image.Width); mockRepository.VerifyAll(); // Expect no calls on arguments @@ -343,7 +343,7 @@ ToolStripItem clearOutputItem = contextMenu.Items[contextMenuClearIndex]; Assert.IsFalse(clearOutputItem.Enabled); - Assert.AreEqual(WtiFormsResources.ClearOutput_No_output_to_clear, clearOutputItem.ToolTipText); + Assert.AreEqual(RingtoetsFormsResources.ClearOutput_No_output_to_clear, clearOutputItem.ToolTipText); mockRepository.VerifyAll(); // Expect no calls on arguments } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs =================================================================== diff -u -r17e1e8a3db7862fea5fb74b46c375da5065da8dc -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs (.../PipingFailureMechanismNodePresenterTest.cs) (revision 17e1e8a3db7862fea5fb74b46c375da5065da8dc) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs (.../PipingFailureMechanismNodePresenterTest.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -418,7 +418,7 @@ { // Setup var mocks = new MockRepository(); - var dataMock = mocks.StrictMock(); + var dataMock = mocks.StrictMock(); var nodeMock = mocks.StrictMock(); mocks.ReplayAll(); @@ -433,10 +433,10 @@ } [Test] - public void RemoveNodeData_PipingFailureMechanism_PipingFailureMechanismRemovedFromWtiProject() + public void RemoveNodeData_PipingFailureMechanism_PipingFailureMechanismRemovedFromRingtoetsProject() { // Setup - var project = new WtiProject(); + var project = new RingtoetsProject(); project.InitializePipingFailureMechanism(); var nodePresenter = new PipingFailureMechanismNodePresenter(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs =================================================================== diff -u -rf7d48349feba2a41391fac27dc3fef3028df091d -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs (.../PipingSoilProfileCollectionNodePresenterTest.cs) (revision f7d48349feba2a41391fac27dc3fef3028df091d) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSoilProfileCollectionNodePresenterTest.cs (.../PipingSoilProfileCollectionNodePresenterTest.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -1,16 +1,13 @@ using System; using System.Collections.Generic; -using System.ComponentModel; using System.Drawing; -using System.Linq; using Core.Common.Controls; -using Core.Common.Utils.Collections; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Piping.Calculation.TestUtil; using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.NodePresenters; -using WtiFormsResources = Ringtoets.Piping.Forms.Properties.Resources; +using RingtoetsFormsResources = Ringtoets.Piping.Forms.Properties.Resources; namespace Ringtoets.Piping.Forms.Test.NodePresenters { @@ -45,7 +42,7 @@ nodePresenter.UpdateNode(null, soilProfileCollectionNodeStub, soilProfilesCollection); // Assert - Assert.AreEqual(WtiFormsResources.PipingSoilProfilesCollection_DisplayName, soilProfileCollectionNodeStub.Text); + Assert.AreEqual(RingtoetsFormsResources.PipingSoilProfilesCollection_DisplayName, soilProfileCollectionNodeStub.Text); Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), soilProfileCollectionNodeStub.ForegroundColor); Assert.AreEqual(16, soilProfileCollectionNodeStub.Image.Height); Assert.AreEqual(16, soilProfileCollectionNodeStub.Image.Width); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs =================================================================== diff -u -r8df04aa7166563cc67a1b7e70f9f4b8867e454b7 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs (.../PipingSurfaceLineCollectionNodePresenterTest.cs) (revision 8df04aa7166563cc67a1b7e70f9f4b8867e454b7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs (.../PipingSurfaceLineCollectionNodePresenterTest.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -12,7 +12,7 @@ using Ringtoets.Piping.Forms.NodePresenters; -using WtiFormsResources = Ringtoets.Piping.Forms.Properties.Resources; +using RingtoetsFormsResources = Ringtoets.Piping.Forms.Properties.Resources; namespace Ringtoets.Piping.Forms.Test.NodePresenters { @@ -47,7 +47,7 @@ nodePresenter.UpdateNode(null, surfaceLinesCollectionNodeMock, surfaceLinesCollection); // Assert - Assert.AreEqual(WtiFormsResources.PipingSurfaceLinesCollection_DisplayName, surfaceLinesCollectionNodeMock.Text); + Assert.AreEqual(RingtoetsFormsResources.PipingSurfaceLinesCollection_DisplayName, surfaceLinesCollectionNodeMock.Text); Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), surfaceLinesCollectionNodeMock.ForegroundColor); Assert.AreEqual(16, surfaceLinesCollectionNodeMock.Image.Height); Assert.AreEqual(16, surfaceLinesCollectionNodeMock.Image.Width); @@ -69,7 +69,7 @@ nodePresenter.UpdateNode(null, surfaceLinesCollectionNodeMock, surfaceLinesCollection); // Assert - Assert.AreEqual(WtiFormsResources.PipingSurfaceLinesCollection_DisplayName, surfaceLinesCollectionNodeMock.Text); + Assert.AreEqual(RingtoetsFormsResources.PipingSurfaceLinesCollection_DisplayName, surfaceLinesCollectionNodeMock.Text); Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), surfaceLinesCollectionNodeMock.ForegroundColor); Assert.AreEqual(16, surfaceLinesCollectionNodeMock.Image.Height); Assert.AreEqual(16, surfaceLinesCollectionNodeMock.Image.Width); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/RingtoetsProjectNodePresenterTest.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/RingtoetsProjectNodePresenterTest.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/RingtoetsProjectNodePresenterTest.cs (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,433 @@ +using System.ComponentModel; +using System.Linq; +using Core.Common.Controls; +using Core.Common.Utils.Collections; +using System.Windows.Forms; +using Core.Common.Base; +using NUnit.Framework; +using Rhino.Mocks; + +using Ringtoets.Piping.Data; + +using Ringtoets.Piping.Forms.NodePresenters; +using RingtoetsFormsResources = Ringtoets.Piping.Forms.Properties.Resources; + +namespace Ringtoets.Piping.Forms.Test.NodePresenters +{ + [TestFixture] + public class RingtoetsProjectNodePresenterTest + { + [Test] + public void DefaultConstructor_ExpectedValues() + { + // Call + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Assert + Assert.IsInstanceOf(nodePresenter); + Assert.IsNull(nodePresenter.TreeView); + Assert.AreEqual(typeof(RingtoetsProject), nodePresenter.NodeTagType); + } + + [Test] + public void UpdateNode_WithData_InitializeNode() + { + // Setup + const string projectName = ""; + + var mocks = new MockRepository(); + var projectNode = mocks.Stub(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + var project = new RingtoetsProject + { + Name = projectName + }; + + // Call + nodePresenter.UpdateNode(null, projectNode, project); + + // Assert + Assert.AreEqual(projectName, projectNode.Text); + Assert.AreEqual(16, projectNode.Image.Height); + Assert.AreEqual(16, projectNode.Image.Width); + } + + [Test] + public void GetChildNodeObjects_WithoutPipingFailureMechanism_ReturnsEmptyList() + { + // Setup + var mocks = new MockRepository(); + var nodeMock = mocks.StrictMock(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + var project = new RingtoetsProject(); + + // Call + var children = nodePresenter.GetChildNodeObjects(project, nodeMock); + + // Assert + CollectionAssert.IsEmpty(children); + mocks.VerifyAll(); // Expect no calls on tree node + } + + [Test] + public void GetChildNodeObjects_WithPipingFailureMechanism_ReturnPipingFailureMechanism() + { + // Setup + var mocks = new MockRepository(); + var nodeMock = mocks.StrictMock(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + var project = new RingtoetsProject(); + project.InitializePipingFailureMechanism(); + + // Call + var children = nodePresenter.GetChildNodeObjects(project, nodeMock).Cast().AsList(); + + // Assert + Assert.AreEqual(1, children.Count); + Assert.AreSame(project.PipingFailureMechanism, children[0]); + mocks.VerifyAll(); // Expect no calls on tree node + } + + [Test] + public void CanRenameNode_Always_ReturnTrue() + { + // Setup + var mocks = new MockRepository(); + var nodeMock = mocks.StrictMock(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Call + var renameAllowed = nodePresenter.CanRenameNode(nodeMock); + + // Assert + Assert.IsTrue(renameAllowed); + mocks.VerifyAll(); // Expect no calls on tree node + } + + [Test] + public void CanRenameNodeTo_Always_ReturnTrue() + { + // Setup + var mocks = new MockRepository(); + var nodeMock = mocks.StrictMock(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Call + var renameAllowed = nodePresenter.CanRenameNodeTo(nodeMock, ""); + + // Assert + Assert.IsTrue(renameAllowed); + mocks.ReplayAll(); // Expect no calls on tree node + } + + [Test] + public void OnNodeRenamed_WithData_SetProjectNameWithNotification() + { + // Setup + var mocks = new MockRepository(); + var projectObserver = mocks.StrictMock(); + projectObserver.Expect(o => o.UpdateObserver()); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + var project = new RingtoetsProject(); + project.Attach(projectObserver); + + // Call + const string newName = "New Name"; + nodePresenter.OnNodeRenamed(project, newName); + + // Assert + Assert.AreEqual(newName, project.Name); + mocks.VerifyAll(); + } + + [Test] + public void OnNodeChecked_Always_DoNothing() + { + // Setup + var mocks = new MockRepository(); + var nodeMock = mocks.StrictMock(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Call + nodePresenter.OnNodeChecked(nodeMock); + + // Assert + mocks.VerifyAll(); // Expect no calls on tree node + } + + [Test] + public void CanDrag_Always_ReturnNone() + { + // Setup + var mocks = new MockRepository(); + var dataMock = mocks.StrictMock(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Call + DragOperations dragAllowed = nodePresenter.CanDrag(dataMock); + + // Assert + Assert.AreEqual(DragOperations.None, dragAllowed); + mocks.VerifyAll(); + } + + [Test] + public void CanDrop_Always_ReturnNone() + { + // Setup + var mocks = new MockRepository(); + var dataMock = mocks.StrictMock(); + var sourceMock = mocks.StrictMock(); + var targetMock = mocks.StrictMock(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Call + DragOperations dropAllowed = nodePresenter.CanDrop(dataMock, sourceMock, targetMock, DragOperations.Move); + + // Assert + Assert.AreEqual(DragOperations.None, dropAllowed); + mocks.VerifyAll(); // Expect no calls on mocks. + } + + [Test] + public void CanInsert_Always_ReturnFalse() + { + // Setup + var mocks = new MockRepository(); + var dataMock = mocks.StrictMock(); + var sourceMock = mocks.StrictMock(); + var targetMock = mocks.StrictMock(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Call + bool insertionAllowed = nodePresenter.CanInsert(dataMock, sourceMock, targetMock); + + // Assert + Assert.IsFalse(insertionAllowed); + mocks.VerifyAll(); // Expect no calls on arguments + } + + [Test] + public void OnDragDrop_Always_DoNothing() + { + // Setup + var mocks = new MockRepository(); + var dataMock = mocks.StrictMock(); + var sourceParentNodeMock = mocks.StrictMock(); + var targetParentNodeDataMock = mocks.StrictMock(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Call + nodePresenter.OnDragDrop(dataMock, sourceParentNodeMock, targetParentNodeDataMock, DragOperations.Move, 2); + + // Assert + mocks.VerifyAll(); // Expect no calls on arguments + } + + [Test] + public void OnNodeSelected_Always_DoNothing() + { + // Setup + var mocks = new MockRepository(); + var dataMock = mocks.StrictMock(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Call + nodePresenter.OnNodeSelected(dataMock); + + // Assert + mocks.VerifyAll(); // Expect no calls on arguments + } + + [Test] + public void GetContextMenu_WithNoPipingFailureMechanism_ReturnsContextMenuWithOneItemWithDataAsTag() + { + // Setup + var mocks = new MockRepository(); + var nodeMock = mocks.StrictMock(); + var ringtoetsProject = new RingtoetsProject(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Call + var contextMenu = nodePresenter.GetContextMenu(nodeMock, ringtoetsProject); + + // Assert + Assert.IsNotNull(contextMenu); + Assert.AreEqual(1, contextMenu.Items.Count); + ToolStripItem addPipingItem = contextMenu.Items[0]; + Assert.AreEqual(RingtoetsFormsResources.RingtoetsProjectNodePresenter_ContextMenu_Add_PipingFailureMechanism, addPipingItem.Text); + Assert.AreEqual(RingtoetsFormsResources.RingtoetsProjectNodePresenter_ContextMenu_Add_PipingFailureMechanism_Tooltip, addPipingItem.ToolTipText); + Assert.IsTrue(addPipingItem.Enabled); + Assert.AreSame(ringtoetsProject, addPipingItem.Tag); + Assert.AreEqual(16, addPipingItem.Image.Height); + Assert.AreEqual(16, addPipingItem.Image.Width); + mocks.VerifyAll(); // Expect no calls on arguments + } + + [Test] + public void GetContextMenu_WithPipingFailureMechanismAlreadySet_ReturnsContextMenuWithOneDisabledItem() + { + // Setup + var mocks = new MockRepository(); + var nodeMock = mocks.StrictMock(); + var ringtoetsProject = new RingtoetsProject(); + ringtoetsProject.InitializePipingFailureMechanism(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Call + var contextMenu = nodePresenter.GetContextMenu(nodeMock, ringtoetsProject); + + // Assert + Assert.IsNotNull(contextMenu); + Assert.AreEqual(1, contextMenu.Items.Count); + ToolStripItem addPipingItem = contextMenu.Items[0]; + Assert.AreEqual(RingtoetsFormsResources.RingtoetsProjectNodePresenter_ContextMenu_Add_PipingFailureMechanism, addPipingItem.Text); + Assert.AreEqual(RingtoetsFormsResources.RingtoetsProjectNodePresenter_ContextMenu_PipingFailureMechanism_Already_Added_Tooltip, addPipingItem.ToolTipText); + Assert.IsFalse(addPipingItem.Enabled); + Assert.IsNull(addPipingItem.Tag); + Assert.AreEqual(16, addPipingItem.Image.Height); + Assert.AreEqual(16, addPipingItem.Image.Width); + mocks.VerifyAll(); // Expect no calls on arguments + } + + [Test] + public void OnPropertyChange_Always_DoNothing() + { + // Setup + var mocks = new MockRepository(); + var dataMock = mocks.StrictMock(); + var nodeMock = mocks.StrictMock(); + var eventArgsMock = mocks.StrictMock(""); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Call + nodePresenter.OnPropertyChanged(dataMock, nodeMock, eventArgsMock); + + // Assert + mocks.VerifyAll(); // Expect no calls on arguments + } + + [Test] + public void OnCollectionChange_Always_DoNothing() + { + // Setup + var mocks = new MockRepository(); + var dataMock = mocks.StrictMock(); + var eventArgsMock = mocks.StrictMock(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Call + nodePresenter.OnCollectionChanged(dataMock, eventArgsMock); + + // Assert + mocks.VerifyAll(); // Expect no calls on arguments + } + + [Test] + public void CanRemove_Always_ReturnTrue() + { + // Setup + var mocks = new MockRepository(); + var dataMock = mocks.StrictMock(); + var nodeMock = mocks.StrictMock(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Call + bool removalAllowed = nodePresenter.CanRemove(dataMock, nodeMock); + + // Assert + Assert.IsTrue(removalAllowed); + mocks.VerifyAll(); // Expect no calls on arguments + } + + [Test] + public void RemoveNodeData_ProjectWithRingtoetsProject_ReturnTrueAndRemoveRingtoetsProject() + { + // Setup + var mocks = new MockRepository(); + + var observerMock = mocks.StrictMock(); + observerMock.Expect(o => o.UpdateObserver()); + + mocks.ReplayAll(); + + var ringtoetsProject = new RingtoetsProject(); + + var project = new Project(); + project.Items.Add(ringtoetsProject); + project.Attach(observerMock); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + + // Call + bool removalSuccesful = nodePresenter.RemoveNodeData(project, ringtoetsProject); + + // Assert + Assert.IsTrue(removalSuccesful); + CollectionAssert.DoesNotContain(project.Items, ringtoetsProject); + mocks.VerifyAll(); + } + + [Test] + public void RingtoetsProjectWithoutPipingFailureMechanism_AddPipingFailureMechanismThroughContextMenu_RingtoetsProjectHasPipingFailureMechanism() + { + // Setup + var mocks = new MockRepository(); + var nodeMock = mocks.StrictMock(); + var ringtoetsProject = new RingtoetsProject(); + mocks.ReplayAll(); + + var nodePresenter = new RingtoetsProjectNodePresenter(); + var contextMenu = nodePresenter.GetContextMenu(nodeMock, ringtoetsProject); + + // Preconditions + Assert.IsNotNull(contextMenu); + Assert.IsNull(ringtoetsProject.PipingFailureMechanism); + Assert.AreEqual(1, contextMenu.Items.Count); + + // Call + contextMenu.Items[0].PerformClick(); + + // Assert + Assert.IsNotNull(ringtoetsProject.PipingFailureMechanism); + } + } +} \ No newline at end of file Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/WtiProjectNodePresenterTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsProjectPropertiesTest.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsProjectPropertiesTest.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsProjectPropertiesTest.cs (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,71 @@ +using Core.Common.Base; +using Core.Common.Gui; +using NUnit.Framework; +using Rhino.Mocks; + +using Ringtoets.Piping.Data; + +using Ringtoets.Piping.Forms.PropertyClasses; + +namespace Ringtoets.Piping.Forms.Test.PropertyClasses +{ + [TestFixture] + public class RingtoetsProjectPropertiesTest + { + [Test] + public void DefaultConstructor_ExpectedValues() + { + // Call + var properties = new RingtoetsProjectProperties(); + + // Assert + Assert.IsInstanceOf>(properties); + Assert.IsNull(properties.Data); + } + + [Test] + public void GetProperties_WithData_ReturnExpectedValues() + { + // Setup + var project = new RingtoetsProject + { + Name = "Test" + }; + + var properties = new RingtoetsProjectProperties + { + Data = project + }; + + // Call & Assert + Assert.AreEqual(project.Name, properties.Name); + } + + [Test] + public void SetProperties_WithData_UpdateDataAndNotifyObservers() + { + // Setup + var mocks = new MockRepository(); + var projectObserver = mocks.StrictMock(); + projectObserver.Expect(o => o.UpdateObserver()); + mocks.ReplayAll(); + + var project = new RingtoetsProject(); + project.Attach(projectObserver); + + var properties = new RingtoetsProjectProperties + { + Data = project + }; + + const string newName = "Test"; + + // Call + properties.Name = newName; + + // Assert + Assert.AreEqual(newName, project.Name); + mocks.VerifyAll(); + } + } +} \ No newline at end of file Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/WtiProjectPropertiesTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj =================================================================== diff -u -r394db7c1bd905eb7444b9b2c47bcb5111bb63af6 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj (.../Ringtoets.Piping.Forms.Test.csproj) (revision 394db7c1bd905eb7444b9b2c47bcb5111bb63af6) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj (.../Ringtoets.Piping.Forms.Test.csproj) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -56,14 +56,14 @@ - + - + Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs =================================================================== diff -u -r069921ae1e06e13d8e5e19dd9caa5e8f7b9e1f35 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs (.../PipingSoilProfilesImporterTest.cs) (revision 069921ae1e06e13d8e5e19dd9caa5e8f7b9e1f35) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs (.../PipingSoilProfilesImporterTest.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -11,9 +11,9 @@ using Ringtoets.Piping.Data; using Ringtoets.Piping.Plugin.FileImporter; -using WtiFormsResources = Ringtoets.Piping.Forms.Properties.Resources; +using RingtoetsFormsResources = Ringtoets.Piping.Forms.Properties.Resources; using ApplicationResources = Ringtoets.Piping.Plugin.Properties.Resources; -using WtiIOResources = Ringtoets.Piping.IO.Properties.Resources; +using RingtoetsIOResources = Ringtoets.Piping.IO.Properties.Resources; namespace Ringtoets.Piping.Plugin.Test.FileImporter { @@ -34,15 +34,15 @@ { // Prepare var expectedFileFilter = String.Format("{0} {1} (*.soil)|*.soil", - WtiFormsResources.PipingSoilProfilesCollection_DisplayName, ApplicationResources.Soil_file_name); + RingtoetsFormsResources.PipingSoilProfilesCollection_DisplayName, ApplicationResources.Soil_file_name); // Call var importer = new PipingSoilProfilesImporter(); // Assert Assert.IsInstanceOf(importer); - Assert.AreEqual(WtiFormsResources.PipingSoilProfilesCollection_DisplayName, importer.Name); - Assert.AreEqual(ApplicationResources.Wti_application_name, importer.Category); + Assert.AreEqual(RingtoetsFormsResources.PipingSoilProfilesCollection_DisplayName, importer.Name); + Assert.AreEqual(RingtoetsFormsResources.RingtoetsProjectProperties_Category, importer.Category); Assert.AreEqual(16, importer.Image.Width); Assert.AreEqual(16, importer.Image.Height); CollectionAssert.AreEqual(new[] { typeof(ICollection) }, importer.SupportedItemTypes); @@ -262,7 +262,7 @@ Action call = () => importedItem = importer.ImportItem(corruptPath, observableSoilProfileList); // Assert - var internalErrorMessage = string.Format(WtiIOResources.Error_SoilProfile_read_from_database, + var internalErrorMessage = string.Format(RingtoetsIOResources.Error_SoilProfile_read_from_database, Path.GetFileName(corruptPath)); var expectedLogMessage = string.Format(ApplicationResources.PipingSoilProfilesImporter_Critical_error_reading_File_0_Cause_1_, corruptPath, internalErrorMessage); @@ -300,7 +300,7 @@ Action call = () => importedItem = importer.ImportItem(corruptPath, observableSoilProfileList); // Assert - var internalErrorMessage = string.Format(WtiIOResources.PipingSoilProfileReader_Profile_0_has_invalid_value_on_column_1_, + var internalErrorMessage = string.Format(RingtoetsIOResources.PipingSoilProfileReader_Profile_0_has_invalid_value_on_column_1_, "Profile","IntersectionX"); var expectedLogMessage = string.Format(ApplicationResources.PipingSoilProfilesImporter_ReadSoilProfiles_File_0_Message_1_, corruptPath, internalErrorMessage); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs =================================================================== diff -u -r7caaadff2fc6cb1b4b3936401a4c6281e120496d -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs (.../PipingSurfaceLineCsvImporterTest.cs) (revision 7caaadff2fc6cb1b4b3936401a4c6281e120496d) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs (.../PipingSurfaceLineCsvImporterTest.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -13,8 +13,8 @@ using Ringtoets.Piping.IO.Test.TestHelpers; using Ringtoets.Piping.Plugin.FileImporter; -using WtiFormsResources = Ringtoets.Piping.Forms.Properties.Resources; -using WtiIOResources = Ringtoets.Piping.IO.Properties.Resources; +using RingtoetsFormsResources = Ringtoets.Piping.Forms.Properties.Resources; +using RingtoetsIOResources = Ringtoets.Piping.IO.Properties.Resources; using ApplicationResources = Ringtoets.Piping.Plugin.Properties.Resources; namespace Ringtoets.Piping.Plugin.Test.FileImporter @@ -32,14 +32,14 @@ // Assert Assert.IsInstanceOf(importer); - Assert.AreEqual(WtiFormsResources.PipingSurfaceLinesCollection_DisplayName, importer.Name); - Assert.AreEqual(ApplicationResources.Wti_application_name, importer.Category); + Assert.AreEqual(RingtoetsFormsResources.PipingSurfaceLinesCollection_DisplayName, importer.Name); + Assert.AreEqual(RingtoetsFormsResources.RingtoetsProjectProperties_Category, importer.Category); Assert.AreEqual(16, importer.Image.Width); Assert.AreEqual(16, importer.Image.Height); CollectionAssert.AreEqual(new[] { typeof(ICollection) }, importer.SupportedItemTypes); Assert.IsFalse(importer.CanImportOnRootLevel); var expectedFileFilter = String.Format("{0} {1} (*.csv)|*.csv", - WtiFormsResources.PipingSurfaceLinesCollection_DisplayName, ApplicationResources.Csv_file_name); + RingtoetsFormsResources.PipingSurfaceLinesCollection_DisplayName, ApplicationResources.Csv_file_name); Assert.AreEqual(expectedFileFilter, importer.FileFilter); Assert.IsNull(importer.TargetDataDirectory); Assert.IsFalse(importer.ShouldCancel); @@ -257,7 +257,7 @@ Action call = () => importedItem = importer.ImportItem(corruptPath, observableSurfaceLinesList); // Assert - var internalErrorMessage = String.Format(WtiIOResources.Error_Path_cannot_contain_characters_0_, + var internalErrorMessage = String.Format(RingtoetsIOResources.Error_Path_cannot_contain_characters_0_, String.Join(", ", Path.GetInvalidFileNameChars())); var expectedLogMessage = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_Critical_error_reading_File_0_Cause_1_, corruptPath, internalErrorMessage); @@ -289,7 +289,7 @@ Action call = () => importedItem = importer.ImportItem(corruptPath, observableSurfaceLinesList); // Assert - var internalErrorMessage = String.Format(WtiIOResources.Error_File_0_does_not_exist, + var internalErrorMessage = String.Format(RingtoetsIOResources.Error_File_0_does_not_exist, corruptPath); var expectedLogMessage = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_Critical_error_reading_File_0_Cause_1_, corruptPath, internalErrorMessage); @@ -321,7 +321,7 @@ Action call = () => importedItem = importer.ImportItem(corruptPath, observableSurfaceLinesList); // Assert - var internalErrorMessage = String.Format(WtiIOResources.Error_File_0_empty, + var internalErrorMessage = String.Format(RingtoetsIOResources.Error_File_0_empty, corruptPath); var expectedLogMessage = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_Critical_error_reading_File_0_Cause_1_, corruptPath, internalErrorMessage); @@ -353,7 +353,7 @@ Action call = () => importedItem = importer.ImportItem(corruptPath, observableSurfaceLinesList); // Assert - var internalErrorMessage = String.Format(WtiIOResources.PipingSurfaceLinesCsvReader_File_0_invalid_header, + var internalErrorMessage = String.Format(RingtoetsIOResources.PipingSurfaceLinesCsvReader_File_0_invalid_header, corruptPath); var expectedLogMessage = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_Critical_error_reading_File_0_Cause_1_, corruptPath, internalErrorMessage); @@ -394,7 +394,7 @@ Action call = () => importedItem = importer.ImportItem(copyTargetPath, observableSurfaceLinesList); // Assert - var internalErrorMessage = String.Format(WtiIOResources.Error_File_0_does_not_exist, + var internalErrorMessage = String.Format(RingtoetsIOResources.Error_File_0_does_not_exist, copyTargetPath); var expectedLogMessage = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_Critical_error_reading_File_0_Cause_1_, copyTargetPath, internalErrorMessage); @@ -441,7 +441,7 @@ Action call = () => importedItem = importer.ImportItem(corruptPath, observableSurfaceLinesList); // Assert - var internalErrorMessage = String.Format(WtiIOResources.Error_File_0_has_not_double_SurfaceLineName_1_, + var internalErrorMessage = String.Format(RingtoetsIOResources.Error_File_0_has_not_double_SurfaceLineName_1_, corruptPath, "InvalidRow"); var expectedLogMessage = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_ReadPipingSurfaceLines_Parse_error_File_0_SurfaceLinesNumber_1_Message_2_, corruptPath, 2, internalErrorMessage); @@ -485,7 +485,7 @@ Action call = () => importedItem = importer.ImportItem(path, observableSurfaceLinesList); // Assert - var internalErrorMessage = String.Format(WtiIOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_SurfaceLineName_1_has_reclining_geometry, + var internalErrorMessage = String.Format(RingtoetsIOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_SurfaceLineName_1_has_reclining_geometry, path, "Rotterdam1"); var expectedLogMessage = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_ReadPipingSurfaceLines_Parse_error_File_0_SurfaceLinesNumber_1_Message_2_, path, 1, internalErrorMessage); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj (.../Ringtoets.Piping.Plugin.Test.csproj) (revision eee6c7815d1e418eac38c1c552fb279c0887ef55) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj (.../Ringtoets.Piping.Plugin.Test.csproj) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -52,8 +52,8 @@ - - + + Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/RingtoetsApplicationPluginTest.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/RingtoetsApplicationPluginTest.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/RingtoetsApplicationPluginTest.cs (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,61 @@ +using System.Linq; +using Core.Common.Base; +using NUnit.Framework; +using Ringtoets.Piping.Data; +using Ringtoets.Piping.Plugin.FileImporter; +using ApplicationResources = Ringtoets.Piping.Plugin.Properties.Resources; +using RingtoetsFormsResources = Ringtoets.Piping.Forms.Properties.Resources; + +namespace Ringtoets.Piping.Plugin.Test +{ + [TestFixture] + public class RingtoetsApplicationPluginTest + { + [Test] + public void DefaultConstructor_ExpectedValues() + { + // call + var ringtoetsApplicationPlugin = new RingtoetsApplicationPlugin(); + + // assert + Assert.IsInstanceOf(ringtoetsApplicationPlugin); + } + + [Test] + public void GetDataItemInfos_ReturnsExpectedDataItemDefinitions() + { + // setup + var plugin = new RingtoetsApplicationPlugin(); + + // call + var dataItemDefinitions = plugin.GetDataItemInfos().ToArray(); + + // assert + Assert.AreEqual(1, dataItemDefinitions.Length); + + DataItemInfo projectDataItemDefinition = dataItemDefinitions.Single(did => did.ValueType == typeof(RingtoetsProject)); + Assert.AreEqual(RingtoetsFormsResources.RingtoetsProjectProperties_DisplayName, projectDataItemDefinition.Name); + Assert.AreEqual(RingtoetsFormsResources.RingtoetsProjectProperties_Category, projectDataItemDefinition.Category); + Assert.AreEqual(16, projectDataItemDefinition.Image.Width); + Assert.AreEqual(16, projectDataItemDefinition.Image.Height); + Assert.IsNull(projectDataItemDefinition.AdditionalOwnerCheck); + Assert.IsInstanceOf(projectDataItemDefinition.CreateData(null)); + Assert.IsNull(projectDataItemDefinition.AddExampleData); + } + + [Test] + public void GetFileImporters_Always_ReturnExpectedFileImporters() + { + // Setup + var plugin = new RingtoetsApplicationPlugin(); + + // Call + var importers = plugin.GetFileImporters().ToArray(); + + // Assert + Assert.AreEqual(2, importers.Length); + Assert.IsInstanceOf(importers[0]); + Assert.IsInstanceOf(importers[1]); + } + } +} \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/RingtoetsGuiPluginTest.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/RingtoetsGuiPluginTest.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/RingtoetsGuiPluginTest.cs (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,115 @@ +using System; +using System.Linq; +using Core.Common.Base; +using Core.Common.Base.Workflow; +using Core.Common.Controls; +using Core.Common.Gui; + +using NUnit.Framework; + +using Rhino.Mocks; + +using Ringtoets.Piping.Data; + +using Ringtoets.Piping.Forms.NodePresenters; +using Ringtoets.Piping.Forms.PresentationObjects; +using Ringtoets.Piping.Forms.PropertyClasses; + +using GuiPluginResources = Ringtoets.Piping.Plugin.Properties.Resources; + +namespace Ringtoets.Piping.Plugin.Test +{ + [TestFixture] + public class RingtoetsGuiPluginTest + { + [Test] + [STAThread] // For creation of XAML UI component + public void DefaultConstructor_ExpectedValues() + { + // call + using (var ringtoetsGuiPlugin = new RingtoetsGuiPlugin()) + { + // assert + Assert.IsInstanceOf(ringtoetsGuiPlugin); + Assert.IsInstanceOf(ringtoetsGuiPlugin.RibbonCommandHandler); + } + } + + [Test] + public void GetPropertyInfos_ReturnsSupportedPropertyClasses() + { + // setup + using (var guiPlugin = new RingtoetsGuiPlugin()) + { + // call + PropertyInfo[] propertyInfos = guiPlugin.GetPropertyInfos().ToArray(); + + // assert + Assert.AreEqual(5, propertyInfos.Length); + + var RingtoetsProjectProperties = propertyInfos.Single(pi => pi.ObjectType == typeof(RingtoetsProject)); + Assert.AreEqual(typeof(RingtoetsProjectProperties), RingtoetsProjectProperties.PropertyType); + Assert.IsNull(RingtoetsProjectProperties.AdditionalDataCheck); + Assert.IsNull(RingtoetsProjectProperties.GetObjectPropertiesData); + Assert.IsNull(RingtoetsProjectProperties.AfterCreate); + + var pipingDataProperties = propertyInfos.Single(pi => pi.ObjectType == typeof(PipingCalculationInputs)); + Assert.AreEqual(typeof(PipingCalculationInputsProperties), pipingDataProperties.PropertyType); + Assert.IsNull(pipingDataProperties.AdditionalDataCheck); + Assert.IsNull(pipingDataProperties.GetObjectPropertiesData); + Assert.IsNull(pipingDataProperties.AfterCreate); + + var pipingOutputProperties = propertyInfos.Single(pi => pi.ObjectType == typeof(PipingOutput)); + Assert.AreEqual(typeof(PipingOutputProperties), pipingOutputProperties.PropertyType); + Assert.IsNull(pipingOutputProperties.AdditionalDataCheck); + Assert.IsNull(pipingOutputProperties.GetObjectPropertiesData); + Assert.IsNull(pipingOutputProperties.AfterCreate); + + var pipingSurfaceLineProperties = propertyInfos.Single(pi => pi.ObjectType == typeof(RingtoetsPipingSurfaceLine)); + Assert.AreEqual(typeof(RingtoetsPipingSurfaceLineProperties), pipingSurfaceLineProperties.PropertyType); + Assert.IsNull(pipingSurfaceLineProperties.AdditionalDataCheck); + Assert.IsNull(pipingSurfaceLineProperties.GetObjectPropertiesData); + Assert.IsNull(pipingSurfaceLineProperties.AfterCreate); + + var pipingSoilProfileProperties = propertyInfos.Single(pi => pi.ObjectType == typeof(PipingSoilProfile)); + Assert.AreEqual(typeof(PipingSoilProfileProperties), pipingSoilProfileProperties.PropertyType); + Assert.IsNull(pipingSoilProfileProperties.AdditionalDataCheck); + Assert.IsNull(pipingSoilProfileProperties.GetObjectPropertiesData); + Assert.IsNull(pipingSoilProfileProperties.AfterCreate); + } + } + + [Test] + public void GetProjectTreeViewNodePresenters_ReturnsSupportedNodePresenters() + { + // setup + var mocks = new MockRepository(); + var application = mocks.Stub(); + application.Stub(a => a.ActivityRunner).Return(mocks.Stub()); + + var guiStub = mocks.Stub(); + guiStub.CommandHandler = mocks.Stub(); + guiStub.Application = application; + + mocks.ReplayAll(); + + using (var guiPlugin = new RingtoetsGuiPlugin { Gui = guiStub }) + { + // call + ITreeNodePresenter[] nodePresenters = guiPlugin.GetProjectTreeViewNodePresenters().ToArray(); + + // assert + Assert.AreEqual(8, nodePresenters.Length); + Assert.IsTrue(nodePresenters.Any(np => np is RingtoetsProjectNodePresenter)); + Assert.IsTrue(nodePresenters.Any(np => np is PipingSurfaceLineCollectionNodePresenter)); + Assert.IsTrue(nodePresenters.Any(np => np is PipingSurfaceLineNodePresenter)); + Assert.IsTrue(nodePresenters.Any(np => np is PipingSoilProfileCollectionNodePresenter)); + Assert.IsTrue(nodePresenters.Any(np => np is PipingSoilProfileNodePresenter)); + Assert.IsTrue(nodePresenters.Any(np => np is PipingCalculationInputsNodePresenter)); + Assert.IsTrue(nodePresenters.Any(np => np is PipingFailureMechanismNodePresenter)); + Assert.IsTrue(nodePresenters.Any(np => np is PipingOutputNodePresenter)); + } + mocks.VerifyAll(); + } + } +} \ No newline at end of file Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/WtiApplicationPluginTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/WtiGuiPluginTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: build/Technical_documentation/Ringtoets.css =================================================================== diff -u --- build/Technical_documentation/Ringtoets.css (revision 0) +++ build/Technical_documentation/Ringtoets.css (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -0,0 +1,4 @@ +#projectlogo img { + height: 60px; + padding: 2px; +} \ No newline at end of file Index: build/Technical_documentation/Ringtoets.doxygen =================================================================== diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- build/Technical_documentation/Ringtoets.doxygen (.../Ringtoets.doxygen) (revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406) +++ build/Technical_documentation/Ringtoets.doxygen (.../Ringtoets.doxygen) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -44,14 +44,14 @@ # for a project that appears at the top of each page and should give viewer a # quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = "Wettelijk Toets Instrumentarium" +PROJECT_BRIEF = "" # With the PROJECT_LOGO tag one can specify an logo or icon that is included in # the documentation. The maximum height of the logo should not exceed 55 pixels # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo # to the output directory. -PROJECT_LOGO = ../Application/Application.Ringtoets.Setup/Ringtoets.ico +PROJECT_LOGO = ../Core/Common/src/Core.Common.Gui/Resources/Ringtoets.ico # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is @@ -1150,7 +1150,7 @@ # see the documentation. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_EXTRA_STYLESHEET = Technical_documentation/Wti.css +HTML_EXTRA_STYLESHEET = Technical_documentation/Ringtoets.css # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the HTML output directory. Note Fisheye: Tag 4d688bb446eb4508ff3b54b06baefbb71f60237a refers to a dead (removed) revision in file `build/Technical_documentation/Wti.css'. Fisheye: No comparison available. Pass `N' to diff? Index: doc/Functioneel ontwerp Ringtoets.docx =================================================================== diff -u Binary files differ Index: doc/Functioneel ontwerp WTI.docx =================================================================== diff -u -r5eb589ba8b9c7f7f62982e5a5a688fadc02bfc48 -r4d688bb446eb4508ff3b54b06baefbb71f60237a Binary files differ Index: doc/conventions/Complete Ringtoets parameterlijst Aquo.xlsx =================================================================== diff -u Binary files differ Index: doc/conventions/Complete WTI parameterlijst Aquo.xlsx =================================================================== diff -u -r56523d2848656da8c7ecd094f24a8e65c74b0de1 -r4d688bb446eb4508ff3b54b06baefbb71f60237a Binary files differ Index: doc/prototype/html/bereken_piping.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/bereken_piping.html (.../bereken_piping.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/bereken_piping.html (.../bereken_piping.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/browse_door_boom.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/browse_door_boom.html (.../browse_door_boom.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/browse_door_boom.html (.../browse_door_boom.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/combineer_1d_profiel_en_dwarsdoorsnede.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/combineer_1d_profiel_en_dwarsdoorsnede.html (.../combineer_1d_profiel_en_dwarsdoorsnede.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/combineer_1d_profiel_en_dwarsdoorsnede.html (.../combineer_1d_profiel_en_dwarsdoorsnede.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/combineer_2d_profiel_en_dwarsdoorsnede.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/combineer_2d_profiel_en_dwarsdoorsnede.html (.../combineer_2d_profiel_en_dwarsdoorsnede.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/combineer_2d_profiel_en_dwarsdoorsnede.html (.../combineer_2d_profiel_en_dwarsdoorsnede.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/dwarsdoorsnede_node_toevoegen.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/dwarsdoorsnede_node_toevoegen.html (.../dwarsdoorsnede_node_toevoegen.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/dwarsdoorsnede_node_toevoegen.html (.../dwarsdoorsnede_node_toevoegen.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/dwarsdoorsneden_klaar.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/dwarsdoorsneden_klaar.html (.../dwarsdoorsneden_klaar.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/dwarsdoorsneden_klaar.html (.../dwarsdoorsneden_klaar.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/grondprofielen_klaar.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/grondprofielen_klaar.html (.../grondprofielen_klaar.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/grondprofielen_klaar.html (.../grondprofielen_klaar.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/hernoem_piping_invoer_node.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/hernoem_piping_invoer_node.html (.../hernoem_piping_invoer_node.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/hernoem_piping_invoer_node.html (.../hernoem_piping_invoer_node.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/implementeer_classes.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/implementeer_classes.html (.../implementeer_classes.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/implementeer_classes.html (.../implementeer_classes.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/importeer_dwarsdoorsnedebestand_voor_piping.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/importeer_dwarsdoorsnedebestand_voor_piping.html (.../importeer_dwarsdoorsnedebestand_voor_piping.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/importeer_dwarsdoorsnedebestand_voor_piping.html (.../importeer_dwarsdoorsnedebestand_voor_piping.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/importeer_referentielijn_randvoowaardepunten.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/importeer_referentielijn_randvoowaardepunten.html (.../importeer_referentielijn_randvoowaardepunten.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/importeer_referentielijn_randvoowaardepunten.html (.../importeer_referentielijn_randvoowaardepunten.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/importeer_resultaten.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/importeer_resultaten.html (.../importeer_resultaten.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/importeer_resultaten.html (.../importeer_resultaten.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/importeer_soil_database.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/importeer_soil_database.html (.../importeer_soil_database.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/importeer_soil_database.html (.../importeer_soil_database.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/piping_toegevoegd.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/piping_toegevoegd.html (.../piping_toegevoegd.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/piping_toegevoegd.html (.../piping_toegevoegd.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/piping_voeg_berekeningen_toe.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/piping_voeg_berekeningen_toe.html (.../piping_voeg_berekeningen_toe.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/piping_voeg_berekeningen_toe.html (.../piping_voeg_berekeningen_toe.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/support_meerdere_berekeningen_vanuit_datamodel.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/support_meerdere_berekeningen_vanuit_datamodel.html (.../support_meerdere_berekeningen_vanuit_datamodel.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/support_meerdere_berekeningen_vanuit_datamodel.html (.../support_meerdere_berekeningen_vanuit_datamodel.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/toon_invoer_en_maak_het_wijzigbaar.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/toon_invoer_en_maak_het_wijzigbaar.html (.../toon_invoer_en_maak_het_wijzigbaar.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/toon_invoer_en_maak_het_wijzigbaar.html (.../toon_invoer_en_maak_het_wijzigbaar.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/valideer_referentielijn_randvoorwaardepunten.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/valideer_referentielijn_randvoorwaardepunten.html (.../valideer_referentielijn_randvoorwaardepunten.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/valideer_referentielijn_randvoorwaardepunten.html (.../valideer_referentielijn_randvoorwaardepunten.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/voeg_afgeleide_toe.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/voeg_afgeleide_toe.html (.../voeg_afgeleide_toe.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/voeg_afgeleide_toe.html (.../voeg_afgeleide_toe.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/voeg_ondergrondprofielen_node_toe.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/voeg_ondergrondprofielen_node_toe.html (.../voeg_ondergrondprofielen_node_toe.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/voeg_ondergrondprofielen_node_toe.html (.../voeg_ondergrondprofielen_node_toe.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/voer_alle_berekeningen_voor_piping_uit.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/voer_alle_berekeningen_voor_piping_uit.html (.../voer_alle_berekeningen_voor_piping_uit.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/voer_alle_berekeningen_voor_piping_uit.html (.../voer_alle_berekeningen_voor_piping_uit.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/voer_berekening_uit.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/voer_berekening_uit.html (.../voer_berekening_uit.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/voer_berekening_uit.html (.../voer_berekening_uit.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/wijs_dwarsdoorsnede_toe_als_invoer.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/wijs_dwarsdoorsnede_toe_als_invoer.html (.../wijs_dwarsdoorsnede_toe_als_invoer.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/wijs_dwarsdoorsnede_toe_als_invoer.html (.../wijs_dwarsdoorsnede_toe_als_invoer.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/html/wijs_profiel_toe_als_invoer.html =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a --- doc/prototype/html/wijs_profiel_toe_als_invoer.html (.../wijs_profiel_toe_als_invoer.html) (revision 766d6e195479ca28218c0e1e2c84982c8c300a76) +++ doc/prototype/html/wijs_profiel_toe_als_invoer.html (.../wijs_profiel_toe_als_invoer.html) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) @@ -73,7 +73,7 @@
-

WTI 2017

+

Ringtoets 2017

@@ -82,7 +82,7 @@
-

WTI 2017

+

Ringtoets 2017

Index: doc/prototype/projectfiles/Ringtoets.rp =================================================================== diff -u Binary files differ Index: doc/prototype/projectfiles/WTI.rp =================================================================== diff -u -r766d6e195479ca28218c0e1e2c84982c8c300a76 -r4d688bb446eb4508ff3b54b06baefbb71f60237a Binary files differ