Skip to content

Commit

Permalink
+ TcoAbbrobotic Added information into header
Browse files Browse the repository at this point in the history 
* change notification colors in diagnostic green-> indigo(blue) because green evokes  ok ....
*fixed potential issue in boolean to visibility converter
+Mitsubichi Cr series robotics library
  • Loading branch information
@peterbarancek
peterbarancek committed Oct 3, 2023
1 parent 7d332fc commit a46b116
Show file tree
Hide file tree
Showing 47 changed files with 1,833 additions and 9,734 deletions.
134 changes: 1 addition & 133 deletions src/TcoAbbRobotics/src/TcoAbbRobotics.Wpf/Irc5/Service/TcoIrc5_v_1_x_xServiceView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,137 +16,5 @@

<local:TcoAbbRoboticsBaseServiceView DataContext="{Binding }"></local:TcoAbbRoboticsBaseServiceView>

<!--<vortex:TcoComponentView >
<vortex:TcoComponentView.ComponentHeader>
<WrapPanel VerticalAlignment="Center" HorizontalAlignment="Left" DataContext="{Binding Component}" >
<WrapPanel.Resources>
<Style TargetType="TextBlock" BasedOn="{StaticResource MaterialDesignBody1TextBlock}">
<Setter Property="VerticalAlignment" Value="Center"></Setter>
</Style>
</WrapPanel.Resources>
<WrapPanel DataContext="{Binding _status.State.MotorOffState}" Visibility="{Binding Cyclic, Converter={vortex:BooleanToVisibilityConverter}}" Margin=" 5,0">
<materialdesign:PackIcon Kind="WarningBox" Foreground="{StaticResource Warning}" VerticalAlignment="Center"/>
<TextBlock Text="Motors Off" Foreground="{StaticResource Warning}"/>
</WrapPanel>
<WrapPanel DataContext="{Binding _status.State.AutoOn}" Visibility="{Binding Cyclic, Converter={vortex:BooleanToVisibilityConverter},ConverterParameter=false}" Margin=" 5,0">
<materialdesign:PackIcon Kind="WarningBox" Foreground="{StaticResource Warning}" VerticalAlignment="Center"/>
<TextBlock Text="Key not in Auto" Foreground="{StaticResource Warning}"/>
</WrapPanel>
<WrapPanel DataContext="{Binding _status.State.MotorOnState}" Visibility="{Binding Cyclic, Converter={vortex:BooleanToVisibilityConverter}}" Margin=" 5,0">
<materialdesign:PackIcon Kind="CheckBox" Foreground="{StaticResource Notification}" VerticalAlignment="Center"/>
<TextBlock Text="Motors On" Foreground="{StaticResource Notification}"/>
</WrapPanel>
<WrapPanel DataContext="{Binding _status.State.CycleOn}" Visibility="{Binding Cyclic, Converter={vortex:BooleanToVisibilityConverter}}" Margin=" 5,0">
<materialdesign:PackIcon Kind="CheckBox" Foreground="{StaticResource Notification}" VerticalAlignment="Center"/>
<TextBlock Text="Program is running" Foreground="{StaticResource Notification}"/>
</WrapPanel>
<WrapPanel DataContext="{Binding _status.State.SafetyOk}" Visibility="{Binding Cyclic, Converter={vortex:BooleanToVisibilityConverter}}" Margin=" 5,0">
<materialdesign:PackIcon Kind="CheckBox" Foreground="{StaticResource Notification}" VerticalAlignment="Center"/>
<TextBlock Text="Sadfety Ok" Foreground="{StaticResource Notification}"/>
</WrapPanel>
<WrapPanel DataContext="{Binding _status.State.SafetyOk}" Visibility="{Binding Cyclic, Converter={vortex:BooleanToVisibilityConverter},ConverterParameter=false}" Margin=" 5,0">
<materialdesign:PackIcon Kind="CheckBox" Foreground="{StaticResource Warning}" VerticalAlignment="Center"/>
<TextBlock Text="Safety Error!" Foreground="{StaticResource Warning}"/>
</WrapPanel>
<WrapPanel DataContext="{Binding _pnError}" Visibility="{Binding Cyclic, Converter={vortex:BooleanToVisibilityConverter}}" Margin=" 5,0">
<materialdesign:PackIcon Kind="AlertBox" Foreground="{StaticResource Errors}" VerticalAlignment="Center"/>
<TextBlock VerticalAlignment="Center" Text="{Binding AttributeName}" Foreground="{StaticResource Errors}" />
</WrapPanel>
<WrapPanel Visibility="{Binding _status.State.Error.Cyclic, Converter={vortex:BooleanToVisibilityConverter}}" Margin=" 5,0">
<materialdesign:PackIcon Kind="AlertBox" Foreground="{StaticResource Errors}" VerticalAlignment="Center"/>
<TextBlock VerticalAlignment="Center" Text="{Binding _status.State.ErrorId.Cyclic}" Foreground="{StaticResource Errors}" Visibility="{Binding _status.State.Error.Cyclic, Converter={vortex:BooleanToVisibilityConverter}}"/>
</WrapPanel>
<vortex:RenderableContentControl Margin="5" DataContext="{Binding _restoreTask }" PresentationType="Base" />
</WrapPanel>
</vortex:TcoComponentView.ComponentHeader>
<vortex:TcoComponentView.ComponentDetails>
<ScrollViewer MaxHeight="600" HorizontalScrollBarVisibility="Disabled" DataContext="{Binding Component}" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto"></RowDefinition>
<RowDefinition></RowDefinition>
</Grid.RowDefinitions>
<StackPanel Grid.ColumnSpan="2" Orientation="Vertical">
<TextBlock Margin="5" Style="{StaticResource MaterialDesignBody1TextBlock}" Visibility="{Binding _status.State.Error.Cyclic ,Converter={vortex:BooleanToVisibilityConverter }}"
Foreground="{StaticResource OnErrors}" Background="{StaticResource Errors}" TextWrapping="WrapWithOverflow" Text="{Binding _status.State.ErrorId.Cyclic, Converter={local:ErrorIdToDescriptionConverter}}"></TextBlock>
</StackPanel>
<GroupBox Grid.Column="0" Grid.RowSpan="2" Padding="10" Grid.Row="1" DataContext="{Binding _status}" Header="{Binding AttributeName}">
<vortex:RenderableContentControl DataContext="{Binding }" PresentationType="DisplaySlim" />
</GroupBox>
<WrapPanel Grid.Column="1" Grid.Row="1">
<WrapPanel.Resources>
<Style TargetType="GroupBox" BasedOn="{StaticResource MaterialDesignCardGroupBox}">
<Setter Property="MinWidth" Value="300"></Setter>
<Setter Property="Margin" Value="5,0,0,5"></Setter>
</Style>
</WrapPanel.Resources>
<GroupBox Header="{Binding _control.AttributeName}">
<vortex:RenderableContentControl DataContext="{Binding _control}" PresentationType="ControlSlim" />
</GroupBox>
<GroupBox Header="{Binding _config.AttributeName}">
<vortex:RenderableContentControl DataContext="{Binding _config}" PresentationType="ControlSlim" />
</GroupBox>
<GroupBox Padding="10" Header="{Binding _startMotorsAndProgramTask.AttributeName}">
<WrapPanel Orientation="Vertical">
<vortex:RenderableContentControl Margin="5" DataContext="{Binding _startAtMainTask}" />
<vortex:RenderableContentControl Margin="5" DataContext="{Binding _startMotorsTask}" />
<vortex:RenderableContentControl Margin="5" DataContext="{Binding _startProgramTask}" />
<vortex:RenderableContentControl Margin="5" DataContext="{Binding _startMotorsAndProgramTask}" />
</WrapPanel>
</GroupBox>
<GroupBox Padding="10" Header="{Binding _stopMovementsAndProgramTask.AttributeName}">
<WrapPanel Orientation="Vertical">
<vortex:RenderableContentControl Margin="5" DataContext="{Binding _stopMovementsTask }" />
<vortex:RenderableContentControl Margin="5" DataContext="{Binding _stopMovementsTask._stopType}" PresentationType="ControlSlim"/>
<vortex:RenderableContentControl Margin="5" DataContext="{Binding _stopProgramTask }" />
<vortex:RenderableContentControl Margin="5" DataContext="{Binding _stopMotorsTask}" />
<vortex:RenderableContentControl Margin="5" DataContext="{Binding _stopMovementsAndProgramTask}" />
<vortex:RenderableContentControl Margin="5" DataContext="{Binding _stopMovementsAndProgramTask._stopType}" PresentationType="ControlSlim"/>
</WrapPanel>
</GroupBox>
<GroupBox Padding="10" DataContext="{Binding _startMovementsTask}" Header="{Binding AttributeName}">
<WrapPanel Orientation="Vertical">
<vortex:RenderableContentControl Margin="5" DataContext="{Binding }" />
<vortex:RenderableContentControl Margin="5" DataContext="{Binding _moveParams}" PresentationType="ControlSlim" />
</WrapPanel>
</GroupBox>
<GroupBox Padding="10" DataContext="{Binding _startMotorsProgramAndMovementsTask}" Header="{Binding AttributeName}">
<WrapPanel Orientation="Vertical">
<vortex:RenderableContentControl Margin="5" DataContext="{Binding }" />
<vortex:RenderableContentControl Margin="5" DataContext="{Binding _moveParams}" PresentationType="ControlSlim" />
</WrapPanel>
</GroupBox>
</WrapPanel>
</Grid>
</ScrollViewer>
</vortex:TcoComponentView.ComponentDetails>
</vortex:TcoComponentView>-->

</UserControl>
Loading

0 comments on commit a46b116

Please sign in to comment.