Subversion Repositories Projects

Rev

Rev 2401 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2401 Rev 2405
Line 592... Line 592...
592 
                            </Style.Triggers>
 592 
                            </Style.Triggers>
593 
                        </Style>
 593 
                        </Style>
594 
                    </Label.Style>
 594 
                    </Label.Style>
595 
                </Label>
 595 
                </Label>
596 
            </Grid>
 596 
            </Grid>
597 
            <Grid x:Name="GridData" Background="#7F000000" HorizontalAlignment="Left" Width="204" Margin="23,36,0,0" Visibility="Collapsed" >
 597 
            <Grid x:Name="GridData" Background="#7F000000" HorizontalAlignment="Left" Width="204" Margin="23,36,0,0" >
598 
                <TabControl x:Name="tabControl" HorizontalAlignment="Left" Height="619" VerticalAlignment="Top" Width="200" Background="{x:Null}" Margin="2,0,0,0">
 598 
                <TabControl x:Name="tabControl" HorizontalAlignment="Left" Height="619" VerticalAlignment="Top" Width="200" Background="{x:Null}" Margin="2,0,0,0">
599 
                    <TabItem Header="Analog">
 599 
                    <TabItem Header="Analog">
600 
                        <Grid>
 600 
                        <Grid>
601 
                            <TextBlock x:Name="tbVolt" HorizontalAlignment="Left" Height="23" Margin="110,42,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
 601 
                            <TextBlock x:Name="tbVolt" HorizontalAlignment="Left" Height="23" Margin="110,42,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
602 
                            <TextBlock x:Name="tbCur" HorizontalAlignment="Left" Height="23" Margin="110,60,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
 602 
                            <TextBlock x:Name="tbCur" HorizontalAlignment="Left" Height="23" Margin="110,60,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
Line 640... Line 640...
640 
                            <TextBox x:Name="tbSPI" Margin="78,0,35,26.04" TextWrapping="Wrap" Text="0" Padding="-9,0,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" Foreground="White" Background="{x:Null}" Height="21" VerticalAlignment="Bottom"/>
 640 
                            <TextBox x:Name="tbSPI" Margin="78,0,35,26.04" TextWrapping="Wrap" Text="0" Padding="-9,0,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" Foreground="White" Background="{x:Null}" Height="21" VerticalAlignment="Bottom"/>
641 
                            <Label x:Name="label6_Copy2" Content="I2C-Error" Margin="14,0,68,40.04" Background="{x:Null}" Foreground="White" Height="26" VerticalAlignment="Bottom"/>
 641 
                            <Label x:Name="label6_Copy2" Content="I2C-Error" Margin="14,0,68,40.04" Background="{x:Null}" Foreground="White" Height="26" VerticalAlignment="Bottom"/>
642 
                            <TextBox x:Name="tbI2C" Margin="78,0,35,41.04" TextWrapping="Wrap" Text="0" Padding="-9,0,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" Foreground="White" Background="{x:Null}" Height="21" VerticalAlignment="Bottom"/>
 642 
                            <TextBox x:Name="tbI2C" Margin="78,0,35,41.04" TextWrapping="Wrap" Text="0" Padding="-9,0,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" Foreground="White" Background="{x:Null}" Height="21" VerticalAlignment="Bottom"/>
643 
                            <Label x:Name="label6_Copy18" Content="NC-Error" Margin="14,0,68,56.04" Background="{x:Null}" Foreground="White" Height="26" VerticalAlignment="Bottom"/>
 643 
                            <Label x:Name="label6_Copy18" Content="NC-Error" Margin="14,0,68,56.04" Background="{x:Null}" Foreground="White" Height="26" VerticalAlignment="Bottom"/>
644 
                            <TextBox x:Name="tbNCErr" Margin="78,0,35,57.04" TextWrapping="Wrap" Text="0" Padding="-9,0,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" Foreground="White" Background="{x:Null}" Height="21" VerticalAlignment="Bottom"/>
 644 
                            <TextBox x:Name="tbNCErr" Margin="78,0,35,57.04" TextWrapping="Wrap" Text="0" Padding="-9,0,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" Foreground="White" Background="{x:Null}" Height="21" VerticalAlignment="Bottom"/>
645 
                            <TextBlock x:Name="tbNCGrSpeed" HorizontalAlignment="Left" Height="23" Margin="110,376,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
 645 
                            <TextBlock x:Name="tbNCGrSpeed" HorizontalAlignment="Left" Height="23" Margin="110,396,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
646 
                            <Label x:Name="label6_Copy21" Content="Gr. speed (NC)" HorizontalAlignment="Left" Margin="6,372,0,0" VerticalAlignment="Top" Background="{x:Null}" Foreground="White" FontSize="14"/>
 646 
                            <Label x:Name="label6_Copy21" Content="Gr. speed (NC)" HorizontalAlignment="Left" Margin="6,392,0,0" VerticalAlignment="Top" Background="{x:Null}" Foreground="White" FontSize="14"/>
647 
                            <TextBlock x:Name="tbHeadingCompass" HorizontalAlignment="Left" Height="23" Margin="110,395,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
 647 
                            <TextBlock x:Name="tbHeadingCompass" HorizontalAlignment="Left" Height="23" Margin="110,415,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
648 
                            <Label x:Name="label6_Copy22" Content="Heading (NC)" HorizontalAlignment="Left" Margin="6,391,0,0" VerticalAlignment="Top" Background="{x:Null}" Foreground="White" FontSize="14"/>
 648 
                            <Label x:Name="label6_Copy22" Content="Heading (NC)" HorizontalAlignment="Left" Margin="6,411,0,0" VerticalAlignment="Top" Background="{x:Null}" Foreground="White" FontSize="14"/>
649 
                            <TextBlock x:Name="tbHeadingNorth" HorizontalAlignment="Left" Height="23" Margin="110,413,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
 649 
                            <TextBlock x:Name="tbHeadingNorth" HorizontalAlignment="Left" Height="23" Margin="110,433,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
650 
                            <Label x:Name="label6_Copy23" Content="Heading north" HorizontalAlignment="Left" Margin="6,409,0,0" VerticalAlignment="Top" Background="{x:Null}" Foreground="White" FontSize="14"/>
 650 
                            <Label x:Name="label6_Copy23" Content="Heading north" HorizontalAlignment="Left" Margin="6,429,0,0" VerticalAlignment="Top" Background="{x:Null}" Foreground="White" FontSize="14"/>
- 
 
 651 
                            <TextBlock x:Name="tbWPMaxRange" HorizontalAlignment="Left" Height="23" Margin="110,370,0,0" TextWrapping="Wrap" Text="NA" VerticalAlignment="Top" Width="65" Foreground="White" FontSize="16"/>
- 
 
 652 
                            <Label x:Name="label6_Copy24" Content="WP max range" HorizontalAlignment="Left" Margin="6,366,0,0" VerticalAlignment="Top" Background="{x:Null}" Foreground="White" FontSize="14"/>
Line 651... Line 653...
651 
 
 653 
 
652 
                        </Grid>
 654 
                        </Grid>
653 
                    </TabItem>
 655 
                    </TabItem>
654 
                    <TabItem Header="Status">
 656 
                    <TabItem Header="Status">
Line 836... Line 838...
836 
 
 838 
 
837 
                        </Grid>
 839 
                        </Grid>
838 
                    </TabItem>
 840 
                    </TabItem>
839 
                </TabControl>
 841 
                </TabControl>
840 
            </Grid>
 842 
            </Grid>
841 
            <Grid x:Name="GridSettings" Background="#7B000000" HorizontalAlignment="Left" Width="233" Margin="23,36,0,0">
 843 
            <Grid x:Name="GridSettings" Background="#7B000000" HorizontalAlignment="Left" Width="233" Margin="23,36,0,0" Visibility="Collapsed">
842 
                <TabControl x:Name="tabControlSettings" HorizontalAlignment="Left" Width="229" Background="{x:Null}" Margin="4,0,0,0">
 844 
                <TabControl x:Name="tabControlSettings" HorizontalAlignment="Left" Width="229" Background="{x:Null}" Margin="4,0,0,0">
843 
                    <TabItem Header="General" Margin="0,0,5.849,0">
 845 
                    <TabItem Header="General" Margin="0,0,5.849,0">
844 
                        <Grid x:Name="TabGridGeneral">
 846 
                        <Grid x:Name="TabGridGeneral">
845 
                            <wpConverter:SerialPortCtrl x:Name="serialPortCtrl" HorizontalAlignment="Left" Height="256" Margin="11,5,0,0" VerticalAlignment="Top" Width="210"/>
 847 
                            <wpConverter:SerialPortCtrl x:Name="serialPortCtrl" HorizontalAlignment="Left" Height="256" Margin="11,5,0,0" VerticalAlignment="Top" Width="210"/>
Line 1474... Line 1476...
1474 
                        <DataGridTextColumn Header="AutoTrigger" Binding="{Binding AutoTrigger, ConverterParameter=AutoTrigger, Converter={StaticResource wpConvert}}"/>
 1476 
                        <DataGridTextColumn Header="AutoTrigger" Binding="{Binding AutoTrigger, ConverterParameter=AutoTrigger, Converter={StaticResource wpConvert}}"/>
1475 
                        <DataGridTextColumn Header="CamAngle" Binding="{Binding CamAngle, ConverterParameter=CamAngle, Converter={StaticResource wpConvert}}"/>
 1477 
                        <DataGridTextColumn Header="CamAngle" Binding="{Binding CamAngle, ConverterParameter=CamAngle, Converter={StaticResource wpConvert}}"/>
1476 
                        <DataGridTextColumn Header="Out1Timer" Binding="{Binding Out1Timer}"/>
 1478 
                        <DataGridTextColumn Header="Out1Timer" Binding="{Binding Out1Timer}"/>
1477 
                    </DataGrid.Columns>
 1479 
                    </DataGrid.Columns>
1478 
                </DataGrid>
 1480 
                </DataGrid>
1479 
                <CheckBox x:Name="checkBoxShowWPRoute" Content="show route" HorizontalAlignment="Right" Height="22" Margin="0,405,4,0" VerticalAlignment="Top" Width="99" Foreground="#FFFFFEFE" Click="checkBoxShowWPRoute_Click"/>
 1481 
                <CheckBox x:Name="checkBoxShowWPRoute" Content="show route" HorizontalAlignment="Right" Height="22" Margin="0,396,0,0" VerticalAlignment="Top" Width="110" Foreground="#FFFFFEFE" Click="checkBoxShowWPRoute_Click"/>
1480 
                <Label x:Name="label4_Copy9" Content="total distance" HorizontalAlignment="Right" Margin="0,455,51,0" VerticalAlignment="Top" Width="99" Foreground="White" Padding="0" Height="18" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" FontSize="13"/>
 1482 
                <Label x:Name="label4_Copy9" Content="total distance" HorizontalAlignment="Right" Margin="0,455,51,0" VerticalAlignment="Top" Width="99" Foreground="White" Padding="0" Height="18" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" FontSize="13"/>
1481 
                <Label x:Name="lblWPRouteDistance" Content="0 m" HorizontalAlignment="Right" Margin="0,455,4,0" VerticalAlignment="Top" Width="42" Foreground="White" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Padding="0" FontSize="13"/>
 1483 
                <Label x:Name="lblWPRouteDistance" Content="0 m" HorizontalAlignment="Right" Margin="0,455,4,0" VerticalAlignment="Top" Width="42" Foreground="White" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Padding="0" FontSize="13"/>
1482 
                <Label x:Name="label4_Copy14" Content="/" HorizontalAlignment="Right" Margin="0,504,29,0" VerticalAlignment="Top" Width="7" Foreground="White" Height="20" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
 1484 
                <Label x:Name="label4_Copy14" Content="/" HorizontalAlignment="Right" Margin="0,504,29,0" VerticalAlignment="Top" Width="7" Foreground="White" Height="20" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
1483 
                <Label x:Name="lblWPCountNC" Content="##" HorizontalAlignment="Right" Margin="0,507,2,0" VerticalAlignment="Top" Width="25" Foreground="White" Padding="0" Height="16" FontSize="13"/>
 1485 
                <Label x:Name="lblWPCountNC" Content="##" HorizontalAlignment="Right" Margin="0,507,2,0" VerticalAlignment="Top" Width="25" Foreground="White" Padding="0" Height="16" FontSize="13"/>
1484 
                <Label x:Name="label4_Copy15" Content="active WP" HorizontalAlignment="Right" Margin="0,504,61,0" VerticalAlignment="Top" Width="65" Foreground="White" Height="21" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
 1486 
                <Label x:Name="label4_Copy15" Content="active WP" HorizontalAlignment="Right" Margin="0,504,61,0" VerticalAlignment="Top" Width="65" Foreground="White" Height="21" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
Line 1529... Line 1531...
1529 
                <Label x:Name="label4_Copy32" Content="Simulation" HorizontalAlignment="Left" Margin="619,0,0,43" VerticalAlignment="Bottom" Width="74" Foreground="White" Height="26"/>
 1531 
                <Label x:Name="label4_Copy32" Content="Simulation" HorizontalAlignment="Left" Margin="619,0,0,43" VerticalAlignment="Bottom" Width="74" Foreground="White" Height="26"/>
1530 
                <Label x:Name="label4_Copy35" Content="distance next WP" HorizontalAlignment="Right" Margin="0,470,51,0" VerticalAlignment="Top" Width="118" Foreground="White" Height="21" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
 1532 
                <Label x:Name="label4_Copy35" Content="distance next WP" HorizontalAlignment="Right" Margin="0,470,51,0" VerticalAlignment="Top" Width="118" Foreground="White" Height="21" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
1531 
                <Label x:Name="lblWPRouteDistanceWP" Content="0 m" HorizontalAlignment="Right" Margin="0,472,4,0" VerticalAlignment="Top" Width="42" Foreground="White" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Padding="0" FontSize="13"/>
 1533 
                <Label x:Name="lblWPRouteDistanceWP" Content="0 m" HorizontalAlignment="Right" Margin="0,472,4,0" VerticalAlignment="Top" Width="42" Foreground="White" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Padding="0" FontSize="13"/>
1532 
                <Label x:Name="label4_Copy36" Content="hold time" HorizontalAlignment="Right" Margin="0,487,51,0" VerticalAlignment="Top" Width="118" Foreground="White" Height="21" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
 1534 
                <Label x:Name="label4_Copy36" Content="hold time" HorizontalAlignment="Right" Margin="0,487,51,0" VerticalAlignment="Top" Width="118" Foreground="White" Height="21" HorizontalContentAlignment="Right" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
1533 
                <Label x:Name="lblWPHoldTime" Content="0 s" HorizontalAlignment="Right" Margin="0,489,10,0" VerticalAlignment="Top" Width="36" Foreground="White" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Padding="0" FontSize="13"/>
 1535 
                <Label x:Name="lblWPHoldTime" Content="0 s" HorizontalAlignment="Right" Margin="0,489,10,0" VerticalAlignment="Top" Width="36" Foreground="White" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Padding="0" FontSize="13"/>
1534 
                <CheckBox x:Name="checkBoxShowWPStatus" Content="show statusbar" HorizontalAlignment="Right" Height="22" Margin="0,428,4,0" VerticalAlignment="Top" Width="100" Foreground="#FFFFFEFE" Click="checkBoxShowWPStatus_Click"/>
 1536 
                <CheckBox x:Name="checkBoxShowWPStatus" Content="show statusbar" HorizontalAlignment="Right" Height="22" Margin="0,414,-1,0" VerticalAlignment="Top" Width="111" Foreground="#FFFFFEFE" Click="checkBoxShowWPStatus_Click"/>
- 
 
 1537 
                <CheckBox x:Name="checkBoxShowWPMaxRange" Content="show max range" HorizontalAlignment="Right" Height="22" Margin="0,433,-1,0" VerticalAlignment="Top" Width="111" Foreground="#FFFFFEFE" Click="checkBoxShowWPMaxRange_click"/>
1535 
            </Grid>
 1538 
            </Grid>
1536 
            <Grid x:Name="GridSideBarR" Background="#66000000" Margin="0,36,0,0" HorizontalAlignment="Right" Width="23">
 1539 
            <Grid x:Name="GridSideBarR" Background="#66000000" Margin="0,36,0,0" HorizontalAlignment="Right" Width="23">
1537 
                <Label x:Name="labelMotordata" Content="Motors" Padding="0" RenderTransformOrigin="0.5,0.5" Margin="-25,233,-26,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Stretch" MouseDown="labelMotorData_MouseDown" FontSize="14" HorizontalAlignment="Left" Width="74" Height="22" VerticalAlignment="Top">
 1540 
                <Label x:Name="labelMotordata" Content="Motors" Padding="0" RenderTransformOrigin="0.5,0.5" Margin="-25,233,-26,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Stretch" MouseDown="labelMotorData_MouseDown" FontSize="14" HorizontalAlignment="Left" Width="74" Height="22" VerticalAlignment="Top">
1538 
                    <Label.RenderTransform>
 1541 
                    <Label.RenderTransform>
1539 
                        <TransformGroup>
 1542 
                        <TransformGroup>