diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 1006fc6..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "Commons"]
- path = Commons
- url = git@github.com:mindleaving/commons.git
diff --git a/CentralMonitorGUI/CentralMonitorGUI.csproj b/CentralMonitorGUI/CentralMonitorGUI.csproj
index 0296da8..7ef2453 100644
--- a/CentralMonitorGUI/CentralMonitorGUI.csproj
+++ b/CentralMonitorGUI/CentralMonitorGUI.csproj
@@ -35,6 +35,12 @@
4
+
+ ..\packages\mindleaving.Commons.1.1.13\lib\net461\Commons.dll
+
+
+ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll
+
..\packages\OxyPlot.Core.1.0.0\lib\net45\OxyPlot.dll
@@ -68,6 +74,7 @@
+
@@ -188,10 +195,6 @@
-
- {D0E6B038-C939-487D-BB5E-A6270A0D18F5}
- Commons
-
{603afcc1-df38-4864-864b-0f604478963d}
NetworkCommunication
diff --git a/CentralMonitorGUI/ViewModels/AnnotationDatabaseViewModel.cs b/CentralMonitorGUI/ViewModels/AnnotationDatabaseViewModel.cs
index c435a89..9c97a54 100644
--- a/CentralMonitorGUI/ViewModels/AnnotationDatabaseViewModel.cs
+++ b/CentralMonitorGUI/ViewModels/AnnotationDatabaseViewModel.cs
@@ -2,7 +2,6 @@
using System.Collections.ObjectModel;
using System.Windows;
using System.Windows.Input;
-using Commons.Wpf;
using NetworkCommunication.DataStorage;
using NetworkCommunication.Objects;
diff --git a/CentralMonitorGUI/ViewModels/AnnotationNoteViewModel.cs b/CentralMonitorGUI/ViewModels/AnnotationNoteViewModel.cs
index d0f1e30..c14992f 100644
--- a/CentralMonitorGUI/ViewModels/AnnotationNoteViewModel.cs
+++ b/CentralMonitorGUI/ViewModels/AnnotationNoteViewModel.cs
@@ -1,6 +1,5 @@
using System;
using System.Windows.Input;
-using Commons.Wpf;
namespace CentralMonitorGUI.ViewModels
{
diff --git a/CentralMonitorGUI/ViewModels/DataExplorerWindowViewModel.cs b/CentralMonitorGUI/ViewModels/DataExplorerWindowViewModel.cs
index 493cd59..e24c1c1 100644
--- a/CentralMonitorGUI/ViewModels/DataExplorerWindowViewModel.cs
+++ b/CentralMonitorGUI/ViewModels/DataExplorerWindowViewModel.cs
@@ -6,7 +6,6 @@
using System.Windows.Input;
using CentralMonitorGUI.Views;
using Commons.Mathematics;
-using Commons.Wpf;
using NetworkCommunication;
using NetworkCommunication.DataStorage;
using NetworkCommunication.Objects;
diff --git a/CentralMonitorGUI/ViewModels/MainViewModel.cs b/CentralMonitorGUI/ViewModels/MainViewModel.cs
index 9fb8aac..49045d8 100644
--- a/CentralMonitorGUI/ViewModels/MainViewModel.cs
+++ b/CentralMonitorGUI/ViewModels/MainViewModel.cs
@@ -6,7 +6,6 @@
using System.Windows.Input;
using System.Windows.Threading;
using CentralMonitorGUI.Views;
-using Commons.Wpf;
using NetworkCommunication.DataStorage;
using NetworkCommunication.Objects;
diff --git a/CentralMonitorGUI/ViewModels/PatientDatabaseViewModel.cs b/CentralMonitorGUI/ViewModels/PatientDatabaseViewModel.cs
index c4a0a78..74350f1 100644
--- a/CentralMonitorGUI/ViewModels/PatientDatabaseViewModel.cs
+++ b/CentralMonitorGUI/ViewModels/PatientDatabaseViewModel.cs
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using System.Windows.Input;
using CentralMonitorGUI.Views;
-using Commons.Wpf;
using NetworkCommunication.DataStorage;
using NetworkCommunication.Objects;
diff --git a/CentralMonitorGUI/ViewModels/PatientMonitorViewModel.cs b/CentralMonitorGUI/ViewModels/PatientMonitorViewModel.cs
index 89c60b9..e537f3c 100644
--- a/CentralMonitorGUI/ViewModels/PatientMonitorViewModel.cs
+++ b/CentralMonitorGUI/ViewModels/PatientMonitorViewModel.cs
@@ -7,7 +7,6 @@
using System.Windows.Media;
using System.Windows.Threading;
using CentralMonitorGUI.Views;
-using Commons.Wpf;
using NetworkCommunication;
using NetworkCommunication.DataStorage;
using NetworkCommunication.Objects;
diff --git a/CentralMonitorGUI/ViewModels/RelayCommand.cs b/CentralMonitorGUI/ViewModels/RelayCommand.cs
new file mode 100644
index 0000000..b0aae44
--- /dev/null
+++ b/CentralMonitorGUI/ViewModels/RelayCommand.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Windows.Input;
+
+namespace CentralMonitorGUI.ViewModels
+{
+ public class RelayCommand : ICommand
+ {
+ private readonly Action action;
+ private readonly Func canExecute;
+
+ public RelayCommand(Action action)
+ {
+ this.action = action;
+ canExecute = () => true;
+ }
+ public RelayCommand(Action action, Func canExecute)
+ {
+ this.action = action;
+ this.canExecute = canExecute;
+ }
+
+ public bool CanExecute(object parameter)
+ {
+ return canExecute();
+ }
+
+ public void Execute(object parameter)
+ {
+ action();
+ }
+
+ public event EventHandler CanExecuteChanged;
+ }
+
+ public class RelayCommand : ICommand
+ {
+ private readonly Action action;
+ private readonly Func canExecute;
+
+ public RelayCommand(Action action)
+ {
+ this.action = action;
+ canExecute = () => true;
+ }
+ public RelayCommand(Action action, Func canExecute)
+ {
+ this.action = action;
+ this.canExecute = canExecute;
+ }
+
+ public bool CanExecute(object parameter)
+ {
+ return canExecute();
+ }
+
+ public void Execute(object parameter)
+ {
+ action((T)parameter);
+ }
+
+ public event EventHandler CanExecuteChanged;
+ }
+}
\ No newline at end of file
diff --git a/CentralMonitorGUI/packages.config b/CentralMonitorGUI/packages.config
index 6e98e5b..12697ae 100644
--- a/CentralMonitorGUI/packages.config
+++ b/CentralMonitorGUI/packages.config
@@ -1,5 +1,7 @@
+
+
\ No newline at end of file
diff --git a/Commons b/Commons
deleted file mode 160000
index ede4ea2..0000000
--- a/Commons
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ede4ea2be7704249816fe92aaa1c696df96d1172
diff --git a/GEDash4000.sln b/GEDash4000.sln
index d197516..291ca7a 100644
--- a/GEDash4000.sln
+++ b/GEDash4000.sln
@@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetworkCommunicationTest",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CentralMonitorGUI", "CentralMonitorGUI\CentralMonitorGUI.csproj", "{C165D3A0-735F-4E2F-BBB5-464A37213FBF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commons", "Commons\Commons.csproj", "{D0E6B038-C939-487D-BB5E-A6270A0D18F5}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HealforceEcgFileDecoder", "HealforceEcgFileDecoder\HealforceEcgFileDecoder.csproj", "{F300CA4E-A8D1-4401-91E2-4AFCDD30B1A3}"
EndProject
Global
@@ -31,10 +29,6 @@ Global
{C165D3A0-735F-4E2F-BBB5-464A37213FBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C165D3A0-735F-4E2F-BBB5-464A37213FBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C165D3A0-735F-4E2F-BBB5-464A37213FBF}.Release|Any CPU.Build.0 = Release|Any CPU
- {D0E6B038-C939-487D-BB5E-A6270A0D18F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D0E6B038-C939-487D-BB5E-A6270A0D18F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D0E6B038-C939-487D-BB5E-A6270A0D18F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D0E6B038-C939-487D-BB5E-A6270A0D18F5}.Release|Any CPU.Build.0 = Release|Any CPU
{F300CA4E-A8D1-4401-91E2-4AFCDD30B1A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F300CA4E-A8D1-4401-91E2-4AFCDD30B1A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F300CA4E-A8D1-4401-91E2-4AFCDD30B1A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/HealforceEcgFileDecoder/HealforceEcgFileDecoder.csproj b/HealforceEcgFileDecoder/HealforceEcgFileDecoder.csproj
index eeb0307..af637c4 100644
--- a/HealforceEcgFileDecoder/HealforceEcgFileDecoder.csproj
+++ b/HealforceEcgFileDecoder/HealforceEcgFileDecoder.csproj
@@ -32,6 +32,10 @@
4
+
+ False
+ ..\packages\mindleaving.Commons.1.1.13\lib\net461\Commons.dll
+
@@ -48,11 +52,5 @@
-
-
- {D0E6B038-C939-487D-BB5E-A6270A0D18F5}
- Commons
-
-
\ No newline at end of file
diff --git a/NetworkCommunication/NetworkCommunication.csproj b/NetworkCommunication/NetworkCommunication.csproj
index dc430d3..4dd697e 100644
--- a/NetworkCommunication/NetworkCommunication.csproj
+++ b/NetworkCommunication/NetworkCommunication.csproj
@@ -32,6 +32,12 @@
4
+
+ ..\packages\mindleaving.Commons.1.1.13\lib\net461\Commons.dll
+
+
+ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll
+
@@ -114,12 +120,7 @@
-
-
-
- {D0E6B038-C939-487D-BB5E-A6270A0D18F5}
- Commons
-
+
\ No newline at end of file
diff --git a/NetworkCommunication/packages.config b/NetworkCommunication/packages.config
new file mode 100644
index 0000000..283e50b
--- /dev/null
+++ b/NetworkCommunication/packages.config
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/NetworkCommunicationTest/NetworkCommunicationTest.csproj b/NetworkCommunicationTest/NetworkCommunicationTest.csproj
index ffa4c75..8c083c1 100644
--- a/NetworkCommunicationTest/NetworkCommunicationTest.csproj
+++ b/NetworkCommunicationTest/NetworkCommunicationTest.csproj
@@ -1,5 +1,6 @@
+
Debug
@@ -11,6 +12,8 @@
NetworkCommunicationTest
v4.6.1
512
+
+
true
@@ -30,8 +33,14 @@
4
-
- ..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll
+
+ ..\packages\mindleaving.Commons.1.1.13\lib\net461\Commons.dll
+
+
+ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll
+
+
+ ..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll
@@ -50,13 +59,6 @@
-
-
-
-
- {D0E6B038-C939-487D-BB5E-A6270A0D18F5}
- Commons
-
{603AFCC1-DF38-4864-864B-0F604478963D}
NetworkCommunication
@@ -65,5 +67,14 @@
+
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
\ No newline at end of file
diff --git a/NetworkCommunicationTest/packages.config b/NetworkCommunicationTest/packages.config
index 79c10c7..b62c16c 100644
--- a/NetworkCommunicationTest/packages.config
+++ b/NetworkCommunicationTest/packages.config
@@ -1,4 +1,6 @@
-
+
+
+
\ No newline at end of file