Update(S,T,C)

InkjetScale/InkjetScale.Common/Enums.cs

@@ -9,8 +9,8 @@ namespace InkjetScale.Common
     public enum eCommand
     {
         S, //안정적인 값 받기
-        Z, //영점 잡기(한 번에 잘 안 잡힘)
-        T, //Tare
+        Z, //영점 잡기(한 번에 잘 안 잡힘) 용기무게도 초기화 되므로 미사용중
+        T, //Tare => 용기 무게 측정, 현재 무게 영점으로 맞춤
         C, //모든 Command 취소
 
     }

InkjetScale/InkjetScale.GUI.LogViews/InkjetScale.GUI.LogViews.csproj

@@ -92,11 +92,15 @@
     <Compile Include="Views\RegisteredWeightView.xaml.cs">
       <DependentUpon>RegisteredWeightView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\RegisteredWeightViewModel.cs" />
+    <Compile Include="Views\RegisteredWeightViewModel.cs">
+      <DependentUpon>RegisteredWeightView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\ScaleLogView.xaml.cs">
       <DependentUpon>ScaleLogView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\ScaleLogViewModel.cs" />
+    <Compile Include="Views\ScaleLogViewModel.cs">
+      <DependentUpon>ScaleLogView.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Page Include="Views\RegisteredWeightView.xaml">

InkjetScale/InkjetScale/App.xaml.cs

@@ -1,5 +1,4 @@
-using InkjetScale.BusinessLogic.ScaleCore;
-using InkjetScale.GUI.LogViews;
+using InkjetScale.GUI.LogViews;
 using InkjetScale.GUI.MainViews;
 using InkjetScale.GUI.ScaleControlViews;
 using Prism.Ioc;
@@ -40,8 +39,6 @@ namespace InkjetScale
         {
             containerRegistry.RegisterInstance(this.Container);
             containerRegistry.RegisterInstance(containerRegistry);
-
-            containerRegistry.RegisterSingleton<Icore, InkjetScaleCore>();
         }
 
         protected override void ConfigureModuleCatalog(IModuleCatalog moduleCatalog)

InkjetScale/InkjetScale/ShellViewModel.cs

@@ -41,20 +41,6 @@ namespace InkjetScale
             set { SetProperty(ref this.hddDriveList, value); }
         }
 
-        private string serialNum1 = "12345678";
-        public string SerialNum1
-        {
-            get { return this.serialNum1; }
-            set { SetProperty(ref this.serialNum1, value); }
-        }
-
-        private string serialNum2 = "12345678";
-        public string SerialNum2
-        {
-            get { return this.serialNum2; }
-            set { SetProperty(ref this.serialNum2, value); }
-        }
-
         private string currentModelName;
         public string CurrentModelName
         {
@@ -62,30 +48,6 @@ namespace InkjetScale
             set { SetProperty(ref this.currentModelName, value); }
         }
 
-        private List<string> modelList;
-        public List<string> ModelList
-        {
-            get { return this.modelList; }
-            set { SetProperty(ref this.modelList, value); }
-        }
-
-        private string targetModel;
-        public string TargetModel { get => this.targetModel; set => SetProperty(ref this.targetModel, value); }
-
-        private string systemID;
-        public string SystemID
-        {
-            get { return systemID; }
-            set { SetProperty(ref this.systemID, value); }
-        }
-
-        private long plcScanTime;
-        public long PLCScanTime
-        {
-            get { return plcScanTime; }
-            set { SetProperty(ref plcScanTime, value); }
-        }
-
         DateTime currentTime;
         public DateTime CurrentTime
         {
@@ -106,13 +68,12 @@ namespace InkjetScale
         #region PrismInterface
         IRegionManager regionmanager = null;
         IEventAggregator eventAggregator = null;
-        IContainerProvider provider = null;
         #endregion
 
         public Shell View { get; set; }
         DispatcherTimer Systemtimer = null;
 
-        public ShellViewModel(IEventAggregator ea, IRegionManager regionManager, IContainerProvider proVider)
+        public ShellViewModel(IEventAggregator ea, IRegionManager regionManager)
         {
             #region InitCommand
             this.MinCommand = new DelegateCommand(ExecuteMin);
@@ -122,9 +83,6 @@ namespace InkjetScale
 
             this.eventAggregator = ea;
             this.regionmanager = regionManager;
-            this.provider = proVider;
-
-
 
             this.HDDDriveList = new List<listBoxTemplate>();
             this.CPUUsage = new listBoxTemplate() { Tag = "CPU" };