修改IO自定义控件

B20UVLog/Controls/IOCell.xaml

@@ -22,68 +22,68 @@
                 </Style>
             </StackPanel.Resources>
             <StackPanel>
-                <TextBlock>0</TextBlock>
-                <Rectangle x:Name="B0"/>
-            </StackPanel>
-            <StackPanel>
-                <TextBlock>1</TextBlock>
-                <Rectangle x:Name="B1"/>
+                <TextBlock>F</TextBlock>
+                <Rectangle x:Name="BF"/>
             </StackPanel>
             <StackPanel>
-                <TextBlock>2</TextBlock>
-                <Rectangle x:Name="B2"/>
+                <TextBlock>E</TextBlock>
+                <Rectangle x:Name="BE"/>
             </StackPanel>
             <StackPanel>
-                <TextBlock>3</TextBlock>
-                <Rectangle x:Name="B3"/>
+                <TextBlock>D</TextBlock>
+                <Rectangle x:Name="BD"/>
             </StackPanel>
             <StackPanel>
-                <TextBlock>4</TextBlock>
-                <Rectangle x:Name="B4"/>
+                <TextBlock>C</TextBlock>
+                <Rectangle x:Name="BC"/>
             </StackPanel>
             <StackPanel>
-                <TextBlock>5</TextBlock>
-                <Rectangle x:Name="B5"/>
+                <TextBlock>B</TextBlock>
+                <Rectangle x:Name="BB"/>
             </StackPanel>
             <StackPanel>
-                <TextBlock>6</TextBlock>
-                <Rectangle x:Name="B6"/>
+                <TextBlock>A</TextBlock>
+                <Rectangle x:Name="BA"/>
             </StackPanel>
             <StackPanel>
-                <TextBlock>7</TextBlock>
-                <Rectangle x:Name="B7"/>
+                <TextBlock>9</TextBlock>
+                <Rectangle x:Name="B9"/>
             </StackPanel>
             <StackPanel>
                 <TextBlock>8</TextBlock>
                 <Rectangle x:Name="B8"/>
             </StackPanel>
             <StackPanel>
-                <TextBlock>9</TextBlock>
-                <Rectangle x:Name="B9"/>
+                <TextBlock>7</TextBlock>
+                <Rectangle x:Name="B7"/>
             </StackPanel>
             <StackPanel>
-                <TextBlock>A</TextBlock>
-                <Rectangle x:Name="BA"/>
+                <TextBlock>6</TextBlock>
+                <Rectangle x:Name="B6"/>
             </StackPanel>
             <StackPanel>
-                <TextBlock>B</TextBlock>
-                <Rectangle x:Name="BB"/>
+                <TextBlock>5</TextBlock>
+                <Rectangle x:Name="B5"/>
             </StackPanel>
             <StackPanel>
-                <TextBlock>C</TextBlock>
-                <Rectangle x:Name="BC"/>
+                <TextBlock>4</TextBlock>
+                <Rectangle x:Name="B4"/>
             </StackPanel>
             <StackPanel>
-                <TextBlock>D</TextBlock>
-                <Rectangle x:Name="BD"/>
+                <TextBlock>3</TextBlock>
+                <Rectangle x:Name="B3"/>
             </StackPanel>
             <StackPanel>
-                <TextBlock>E</TextBlock>
-                <Rectangle x:Name="BE"/>
+                <TextBlock>2</TextBlock>
+                <Rectangle x:Name="B2"/>
             </StackPanel>
             <StackPanel>
-                <TextBlock>F</TextBlock>
-                <Rectangle x:Name="BF"/>
+                <TextBlock>1</TextBlock>
+                <Rectangle x:Name="B1"/>
+            </StackPanel>
+            <StackPanel>
+                <TextBlock>0</TextBlock>
+                <Rectangle x:Name="B0"/>
             </StackPanel>
         </StackPanel>
     </Grid>

B20UVLog/Windows/DBSet.xaml

@@ -34,7 +34,7 @@
             <My:MTextBox  Grid.Column="1" Grid.Row="0" Text="{Binding DataSource,Mode=TwoWay}"/>
             <TextBlock Grid.Column="2" Grid.Row="0" Text="Port:"/>
             <!--<My:MTextBox  Grid.Column="3" Grid.Row="0" Text="{Binding Port}"/>-->
-            <My:MTextBox  Grid.Column="3" Grid.Row="0" Text="{Binding DataSource}"/>
+            <My:MTextBox  Grid.Column="3" Grid.Row="0" Text="{Binding Port}"/>
             <TextBlock Grid.Column="0" Grid.Row="1" Text="User:"/>
             <My:MTextBox  Grid.Column="1" Grid.Row="1" Text="{Binding User}"/>
             <TextBlock Grid.Column="2" Grid.Row="1" Text="Password:"/>

B20UVLog/Windows/PLCSet.xaml

@@ -45,7 +45,7 @@
             <My:MButton Type="Primary" x:Name="BtnReadPLC" Content="读取" Click="BtnReadPLC_Click" />
             <My:MButton Type="Primary"  x:Name="BtnWritePLC" Content="写入" Click="BtnWritePLC_Click" />
         </WrapPanel>
-        <RichTextBox x:Name="RtbRunLog" Grid.Row="2" Margin="5">
+        <RichTextBox x:Name="RtbRunLog" Grid.Row="2" Margin="5" Padding="5 10 5 10">
             <FlowDocument>
             </FlowDocument>
         </RichTextBox>