프로그램 정리

InkjetScale/InkjetScale.BusinessLogic.Scale/ScaleManager.cs

@@ -18,7 +18,7 @@ namespace InkjetScale.BusinessLogic.Scale
     {
         public SerialPort Scale = null;
 
-        eSerialRunMode RunMode;         
+        eSerialRunMode RunMode;      
         eCommand command;
         IEventAggregator ea = null;
         Thread readThread = null;
@@ -51,7 +51,7 @@ namespace InkjetScale.BusinessLogic.Scale
                 if (ports == null)
                     return false;
 
-                if (!Scale.IsOpen)
+                if(!Scale.IsOpen)
                 {
                     Scale.Open();
                     Scale.Encoding = Encoding.Default;
@@ -69,7 +69,7 @@ namespace InkjetScale.BusinessLogic.Scale
             {
                 return false;
             }
-            catch(Exception ex)
+            catch(Exception)
             {
                 return false;
             }

InkjetScale/InkjetScale.GUI.LogViews/Views/RegisteredWeightView.xaml

@@ -45,7 +45,7 @@
                             <DataGrid.Columns>
                                 <DataGridTextColumn Binding="{Binding Time ,StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Header="  Time" Width="2*" FontSize="18"
                                             EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" />
-                                <DataGridTextColumn Binding="{Binding Head}" Header="  Head" Width="1.5*" FontSize="18"
+                                <DataGridTextColumn Binding="{Binding Head}" Header="  Head" Width="1.7*" FontSize="18"
                                             EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" />
                                 <DataGridTextColumn Binding="{Binding Weight}" Header="  Weight(mg)" FontSize="18"
                                         EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" Width="*" />
@@ -88,7 +88,7 @@
                             <DataGrid.Columns>
                                 <DataGridTextColumn Binding="{Binding Time ,StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Header="  Time" Width="2*" FontSize="18"
                                             EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" />
-                                <DataGridTextColumn Binding="{Binding Head}" Header="  Head" Width="1.5*" FontSize="18"
+                                <DataGridTextColumn Binding="{Binding Head}" Header="  Head" Width="1.7*" FontSize="18"
                                             EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" />
                                 <DataGridTextColumn Binding="{Binding Weight}" Header="  Weight(mg)" FontSize="18"
                                         EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" Width="*" />
@@ -132,7 +132,7 @@
                             <DataGrid.Columns>
                                 <DataGridTextColumn Binding="{Binding Time ,StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Header="  Time" Width="2*" FontSize="18"
                                             EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" />
-                                <DataGridTextColumn Binding="{Binding Head}" Header="  Head" Width="1.5*" FontSize="18"
+                                <DataGridTextColumn Binding="{Binding Head}" Header="  Head" Width="1.7*" FontSize="18"
                                             EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" />
                                 <DataGridTextColumn Binding="{Binding Weight}" Header="  Weight(mg)" FontSize="18"
                                         EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}" Width="*" />

InkjetScale/InkjetScale.GUI.MainViews/Views/ScaleMainView.xaml

@@ -38,8 +38,7 @@
                 <RowDefinition Height="0.5*"/>
                 <RowDefinition Height="0.7*"/>
                 <RowDefinition Height="*"/>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="0.8*"/>
+                <RowDefinition Height="1.7*"/>
             </Grid.RowDefinitions>
 
             <Grid Grid.Row="0">
@@ -108,14 +107,12 @@
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition/>
                                 <ColumnDefinition/>
-                                <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
 
-
                             <Grid Grid.Column="0" Grid.Row ="0">
                                 <!--<Button Style="{StaticResource MaterialDesignRaisedButton}" Content="Zero" Command="{Binding RunCommand}" CommandParameter="Z"
                                             HorizontalAlignment="Center" VerticalAlignment="Center" MinWidth="100"/>-->
-                                <Button Style="{StaticResource MaterialDesignRaisedButton}" Content="Reset" Command="{Binding RunCommand}" CommandParameter="Z"   
+                                <Button Style="{StaticResource MaterialDesignRaisedButton}" Content="Zero" Command="{Binding RunCommand}" CommandParameter="Z"   
                                             HorizontalAlignment="Center" VerticalAlignment="Center" MinWidth="100"
                                             IsEnabled="{c:Binding !IsAuto , Converter={StaticResource BooleanToEnableConverter}}"/>
                             </Grid>
@@ -127,9 +124,9 @@
                             </Grid>
 
                             <Grid Grid.Column="2" Grid.Row ="0">
-                                <Button Style="{StaticResource MaterialDesignRaisedButton}" Content="Zero(T)" Command="{Binding RunCommand}" CommandParameter="T"   
+                                <!--<Button Style="{StaticResource MaterialDesignRaisedButton}" Content="Zero(T)" Command="{Binding RunCommand}" CommandParameter="T"   
                                             HorizontalAlignment="Center" VerticalAlignment="Center" MinWidth="100"
-                                            IsEnabled="{c:Binding !IsAuto , Converter={StaticResource BooleanToEnableConverter}}"/>
+                                            IsEnabled="{c:Binding !IsAuto , Converter={StaticResource BooleanToEnableConverter}}"/>-->
                             </Grid>
 
                             <Grid Grid.Column="2" Grid.Row ="1">
@@ -207,73 +204,31 @@
 
                     <Grid>
 
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="*"/>
+                            <RowDefinition/>
+                            <RowDefinition/>
                         </Grid.RowDefinitions>
 
-                        <Grid Grid.Row="0" Grid.Column="0">
-                            <TextBlock Text="Tare(mg)" Foreground="Black" FontSize="25" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        </Grid>
-
-                        <Grid Grid.Row="0" Grid.Column="1">
-                            <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top">
-                                <materialDesign:PackIcon Kind="Brightness1" Width="25" Height="35" Foreground="LimeGreen"  
-                                                 Visibility="{c:Binding IsTareStable , Converter={StaticResource BooleanToVisibilityConverter}}" />
-                                <materialDesign:PackIcon Kind="Brightness1" Width="25" Height="35" Foreground="Red"
-                                                 Visibility="{c:Binding !IsTareStable , Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                            </StackPanel>
-                            <TextBlock Text="{Binding TareWeight, FallbackValue=0.00}" Foreground="Black" FontSize="25" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        </Grid>
-
-                        <Grid Grid.Row="1" Grid.Column="0">
-
-                            <TextBlock Grid.Column="0" Text="Receive" Foreground="Black" FontSize="20" Width="auto"
-                                   HorizontalAlignment="Center" VerticalAlignment="Center" />
-
-                        </Grid>
-
-                        <Grid Grid.Row="1" Grid.Column="1">
-                            <TextBlock Grid.Column="1" Text="{Binding TareReceiveMsg}" Foreground="Black" FontSize="20" Width="auto"
-                                   HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        </Grid>
-
-                    </Grid>
-
-                </Border>
-
-            </Grid>
-
-            <Grid Grid.Row="5">
-                <Border CornerRadius="10" Background="{DynamicResource PrimaryHueLightBrush}" BorderBrush="#0075ce" Padding="5" BorderThickness="2" Margin="5">
-
-                    <Grid>
-
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-
-                        <Grid Grid.Column="0">
+                        <Grid Grid.Row="0">
                             <Button Style="{StaticResource MaterialDesignRaisedButton}" Content="LIVE" Command="{Binding RunModeChangeCommand}" CommandParameter="AUTO"   
-                                            HorizontalAlignment="Center" VerticalAlignment="Center" MinWidth="150" MinHeight="50" FontSize="30"
+                                            HorizontalAlignment="Center" VerticalAlignment="Center" MinWidth="170" MinHeight="80" FontSize="30"
                                         IsEnabled="{c:Binding !IsAuto , Converter={StaticResource BooleanToEnableConverter}}"/>
                         </Grid>
 
-                        <Grid Grid.Column="1">
+                        <Grid Grid.Row="1">
                             <Button Style="{StaticResource MaterialDesignRaisedButton}" Content="MANUAL" Command="{Binding RunModeChangeCommand}" CommandParameter="MANUAL"   
-                                            HorizontalAlignment="Center" VerticalAlignment="Center" MinWidth="150" MinHeight="50" FontSize="30"
+                                            HorizontalAlignment="Center" VerticalAlignment="Center" MinWidth="170" MinHeight="80" FontSize="30"
                                         IsEnabled="{c:Binding IsAuto , Converter={StaticResource BooleanToEnableConverter}}"/>
                         </Grid>
 
                     </Grid>
 
                 </Border>
+
+            </Grid>
+
+            <Grid Grid.Row="5">
+                
             </Grid>
 
 

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

@@ -106,6 +106,7 @@ namespace InkjetScale.GUI.MainViews.Views
             }
         }
 
+        //DB에 있는 헤드별 노즐 데이터 가져오기
         private void LoadData()
         {
             var nozzleDataList = this.sql.NozzleDataEntity.GetAll().ToList();
@@ -147,7 +148,7 @@ namespace InkjetScale.GUI.MainViews.Views
 
                 switch (obj.Command)
                 {
-                    case eCommand.S: //-> S S      3.14 mg \r\n 
+                    case eCommand.S: //-> Receive Data : S S      3.14 mg \r\n 
                         {
                             ReceiveMsg = String.Empty;
                             WeightValue = String.Empty;
@@ -191,7 +192,7 @@ namespace InkjetScale.GUI.MainViews.Views
                             break;
                         }
 
-                    case eCommand.Z: //-> Z A \r\n
+                    case eCommand.Z: //-> Receive Data : Z A \r\n
                         {
                             ReceiveMsg = String.Empty;
                             for (int index = 0; index < obj.ReceiveLength; index++)

InkjetScale/InkjetScale/Shell.xaml

@@ -74,7 +74,7 @@
                     </Grid.ColumnDefinitions>
 
                     <Grid Grid.Column="0">
-                        <TextBlock Text="SON.220711" Margin="10,5,0,0" Background="{x:Null}" FontSize="15" Foreground="White" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                        <TextBlock Text="SON.220830" Margin="10,5,0,0" Background="{x:Null}" FontSize="15" Foreground="White" VerticalAlignment="Top" HorizontalAlignment="Left"/>
                     </Grid>
 
                     <Grid Grid.Column="1">