Lab Update

InkjetScale/InkjetScale.BusinessLogic.Scale/ScaleManager.cs

@@ -36,7 +36,7 @@ namespace InkjetScale.BusinessLogic.Scale
 
         public void InitSerial(SerialConfig config)
         {
-            Scale.PortName = "COM" + config.ToString();
+            Scale.PortName = "COM" + config.PortNo.ToString();
             Scale.BaudRate = config.BaudRate;
             Scale.DataBits = config.DataBits;
             Scale.StopBits = config.StopBits;

InkjetScale/InkjetScale.Common/Model/SerialConfig.cs

@@ -13,6 +13,6 @@ namespace InkjetScale.Common.Model
         public int BaudRate { get; set; }
         public Parity pParity { get; set; }
         public int DataBits { get; set; }
-        public StopBits StopBits { get; set; 
+        public StopBits StopBits { get; set; } 
     }
 }

InkjetScale/InkjetScale.DataAccess.Sqlite/InkjetScale.DataAccess.Sqlite.csproj

@@ -33,6 +33,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Remote_Lab|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Remote_Lab\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>

InkjetScale/InkjetScale.GUI.MainViews/Views/ScaleMainViewModel.cs

@@ -5,22 +5,14 @@ using InkjetScale.Common.Events;
 using InkjetScale.Common.Model;
 using InkjetScale.DataAccess.Sqlite;
 using InkjetScale.GUI.LogViews.Views;
-using InkjetScale.GUI.ScaleControlViews.Views;
 using Prism.Commands;
 using Prism.Events;
 using Prism.Ioc;
 using Prism.Mvvm;
-using Prism.Regions;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO.Ports;
 using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Windows.Input;
-using System.Windows.Threading;
 
 namespace InkjetScale.GUI.MainViews.Views
 {

InkjetScale/InkjetScale.sln

@@ -35,44 +35,63 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
+		Remote_LAB|Any CPU = Remote_LAB|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{9D711BC9-E822-4FF1-A81D-AD5759C337C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9D711BC9-E822-4FF1-A81D-AD5759C337C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9D711BC9-E822-4FF1-A81D-AD5759C337C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9D711BC9-E822-4FF1-A81D-AD5759C337C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D711BC9-E822-4FF1-A81D-AD5759C337C0}.Remote_LAB|Any CPU.ActiveCfg = Remote_LAB|Any CPU
+		{9D711BC9-E822-4FF1-A81D-AD5759C337C0}.Remote_LAB|Any CPU.Build.0 = Remote_LAB|Any CPU
 		{EC2237E4-678C-4C05-81AC-4E3532FDC0A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EC2237E4-678C-4C05-81AC-4E3532FDC0A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC2237E4-678C-4C05-81AC-4E3532FDC0A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC2237E4-678C-4C05-81AC-4E3532FDC0A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC2237E4-678C-4C05-81AC-4E3532FDC0A8}.Remote_LAB|Any CPU.ActiveCfg = Remote_LAB|Any CPU
+		{EC2237E4-678C-4C05-81AC-4E3532FDC0A8}.Remote_LAB|Any CPU.Build.0 = Remote_LAB|Any CPU
 		{A31E17BC-2226-4C99-8ADB-BF438F4EEFD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A31E17BC-2226-4C99-8ADB-BF438F4EEFD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A31E17BC-2226-4C99-8ADB-BF438F4EEFD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A31E17BC-2226-4C99-8ADB-BF438F4EEFD5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A31E17BC-2226-4C99-8ADB-BF438F4EEFD5}.Remote_LAB|Any CPU.ActiveCfg = Remote_LAB|Any CPU
+		{A31E17BC-2226-4C99-8ADB-BF438F4EEFD5}.Remote_LAB|Any CPU.Build.0 = Remote_LAB|Any CPU
 		{74C4EB8F-0A6F-47A0-AFDA-158FB056C0C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{74C4EB8F-0A6F-47A0-AFDA-158FB056C0C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{74C4EB8F-0A6F-47A0-AFDA-158FB056C0C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{74C4EB8F-0A6F-47A0-AFDA-158FB056C0C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74C4EB8F-0A6F-47A0-AFDA-158FB056C0C1}.Remote_LAB|Any CPU.ActiveCfg = Remote_LAB|Any CPU
+		{74C4EB8F-0A6F-47A0-AFDA-158FB056C0C1}.Remote_LAB|Any CPU.Build.0 = Remote_LAB|Any CPU
 		{BC7536F1-00FA-4970-8460-22B63D280108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BC7536F1-00FA-4970-8460-22B63D280108}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BC7536F1-00FA-4970-8460-22B63D280108}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BC7536F1-00FA-4970-8460-22B63D280108}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC7536F1-00FA-4970-8460-22B63D280108}.Remote_LAB|Any CPU.ActiveCfg = Remote_LAB|Any CPU
+		{BC7536F1-00FA-4970-8460-22B63D280108}.Remote_LAB|Any CPU.Build.0 = Remote_LAB|Any CPU
 		{3DDA8868-7FC0-4014-AA47-9375E608BD0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3DDA8868-7FC0-4014-AA47-9375E608BD0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3DDA8868-7FC0-4014-AA47-9375E608BD0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3DDA8868-7FC0-4014-AA47-9375E608BD0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DDA8868-7FC0-4014-AA47-9375E608BD0C}.Remote_LAB|Any CPU.ActiveCfg = Remote_LAB|Any CPU
+		{3DDA8868-7FC0-4014-AA47-9375E608BD0C}.Remote_LAB|Any CPU.Build.0 = Remote_LAB|Any CPU
 		{799D6601-8F88-4C27-8952-7760BAE9DA0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{799D6601-8F88-4C27-8952-7760BAE9DA0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{799D6601-8F88-4C27-8952-7760BAE9DA0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{799D6601-8F88-4C27-8952-7760BAE9DA0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{799D6601-8F88-4C27-8952-7760BAE9DA0C}.Remote_LAB|Any CPU.ActiveCfg = Remote_LAB|Any CPU
+		{799D6601-8F88-4C27-8952-7760BAE9DA0C}.Remote_LAB|Any CPU.Build.0 = Remote_LAB|Any CPU
 		{577C09AA-94AB-4F4F-9398-A93586049D1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{577C09AA-94AB-4F4F-9398-A93586049D1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{577C09AA-94AB-4F4F-9398-A93586049D1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{577C09AA-94AB-4F4F-9398-A93586049D1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{577C09AA-94AB-4F4F-9398-A93586049D1D}.Remote_LAB|Any CPU.ActiveCfg = Remote_Lab|Any CPU
+		{577C09AA-94AB-4F4F-9398-A93586049D1D}.Remote_LAB|Any CPU.Build.0 = Remote_Lab|Any CPU
 		{44603B31-78B6-4057-BB0D-E4A5D1992647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{44603B31-78B6-4057-BB0D-E4A5D1992647}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{44603B31-78B6-4057-BB0D-E4A5D1992647}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{44603B31-78B6-4057-BB0D-E4A5D1992647}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44603B31-78B6-4057-BB0D-E4A5D1992647}.Remote_LAB|Any CPU.ActiveCfg = Remote_Lab|Any CPU
+		{44603B31-78B6-4057-BB0D-E4A5D1992647}.Remote_LAB|Any CPU.Build.0 = Remote_Lab|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

InkjetScale/InkjetScale/InkjetScale.csproj

@@ -39,7 +39,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Remote_LAB|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>\\192.168.0.52\ScaleCalculator\InkjetScale\</OutputPath>
+    <OutputPath>\\192.168.0.52\InkjetScale\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>