Skip to content

Fix SCL-first workflow, Smart Dynamic reporting, and compact layout #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masarray merged 3 commits into from
Jul 14, 2026
Merged

Fix SCL-first workflow, Smart Dynamic reporting, and compact layout #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
434eb5d
fix: repair SCL-first workflow and compact application layout
masarray Jul 14, 2026
f5848ba
ci: publish repaired version 1.6.9
masarray Jul 14, 2026
0e4f1f2
fix: restore complete supplied ICO asset
masarray Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:

- name: Publish portable x64
shell: powershell
run: .\ArIED61850Tester\scripts\publish-windows-portable.ps1 -Version 1.6.8 -EngineProject "$env:GITHUB_WORKSPACE\ARIEC61850\src\AR.Iec61850\AR.Iec61850.csproj"
run: .\ArIED61850Tester\scripts\publish-windows-portable.ps1 -Version 1.6.9 -EngineProject "$env:GITHUB_WORKSPACE\ARIEC61850\src\AR.Iec61850\AR.Iec61850.csproj"

- name: Upload portable package
uses: actions/upload-artifact@v4
Expand Down
6 changes: 3 additions & 3 deletions ArIED61850Tester.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<Product>ArIED 61850</Product>
<AssemblyTitle>ArIED 61850 — IEC 61850 Engineering Workstation</AssemblyTitle>
<Description>Windows IEC 61850 engineering workstation for SCL-assisted project setup, live MMS model discovery, independent multi-IED monitoring, reporting diagnostics, sequence of events, and guarded Smart Control.</Description>
<Version>1.6.8</Version>
<AssemblyVersion>1.6.8.0</AssemblyVersion>
<FileVersion>1.6.8.0</FileVersion>
<Version>1.6.9</Version>
<AssemblyVersion>1.6.9.0</AssemblyVersion>
<FileVersion>1.6.9.0</FileVersion>
<PackageTags>iec61850;iec-61850;mms;scl;ied-explorer;multi-ied-monitoring;relay-testing;substation-automation;digital-substation;report-control-block;sequence-of-events;smart-control;wpf;dotnet</PackageTags>
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
<ArIec61850Project Condition="'$(ArIec61850Project)' == '' and '$(ARIEC61850_PROJECT)' != ''">$(ARIEC61850_PROJECT)</ArIec61850Project>
Expand Down
35 changes: 6 additions & 29 deletions MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>

<!-- Compact navigation row: the large top application bar was removed to free vertical space. -->
<!-- Compact navigation row: the large top application bar is removed to free vertical space. -->
<Grid Grid.Row="0" Margin="0,0,0,10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
Expand Down Expand Up @@ -98,12 +98,12 @@
<StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
<Button Style="{StaticResource IedIconButton}" Click="OpenProject_Click" ToolTip="Open ArIED project" Margin="0,0,6,0">
<Viewbox Width="16" Height="16"><Canvas Width="24" Height="24">
<Path Data="M6,3 H14 L19,8 V21 H6 Z M14,3 V8 H19 M9,12 H16 M9,16 H16" Stroke="#2563EB" StrokeThickness="1.8" StrokeLineJoin="Round" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Fill="Transparent"/>
<Path Data="M4,7 H10 L12,9 H20 V20 H4 Z M4,7 V5 H10 L12,7" Stroke="#2563EB" StrokeThickness="1.8" StrokeLineJoin="Round" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Fill="Transparent"/>
</Canvas></Viewbox>
</Button>
<Button Style="{StaticResource IedIconButton}" Click="SaveProject_Click" ToolTip="Save ArIED project">
<Viewbox Width="16" Height="16"><Canvas Width="24" Height="24">
<Path Data="M5,4 H17 L19,6 V20 H5 Z M8,4 V9 H16 V4 M9,20 V14 H15 V20" Stroke="#2563EB" StrokeThickness="1.8" StrokeLineJoin="Round" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Fill="Transparent"/>
<Path Data="M5,4 H17 L20,7 V20 H5 Z M8,4 V9 H16 V4 M9,20 V14 H16 V20" Stroke="#2563EB" StrokeThickness="1.8" StrokeLineJoin="Round" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Fill="Transparent"/>
</Canvas></Viewbox>
</Button>
</StackPanel>
Expand Down Expand Up @@ -528,32 +528,9 @@
</Style.Triggers>
</Style>
</StackPanel.Style>
<Button Content="Confirm Open" Tag="{Binding}" Click="ControlConfirmAction_Click"
IsEnabled="{Binding ControlCanConfirm}" Margin="0,0,7,0">
<Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource CommandOpenButton}">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<DataTrigger Binding="{Binding ControlPendingAction}" Value="Open">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Button.Style>
</Button>
<Button Content="Confirm Close" Tag="{Binding}" Click="ControlConfirmAction_Click"
IsEnabled="{Binding ControlCanConfirm}" Margin="0,0,7,0">
<Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource CommandCloseButton}">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<DataTrigger Binding="{Binding ControlPendingAction}" Value="Close">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Button.Style>
</Button>
<Button Content="{Binding ControlPendingConfirmationLabel}" Tag="{Binding}" Click="ControlConfirmAction_Click"
Style="{StaticResource CommandConfirmButton}"
IsEnabled="{Binding ControlCanConfirm}" Margin="0,0,7,0"/>
<Button Content="Cancel" Tag="{Binding}" Click="ControlCancelAction_Click"
Style="{StaticResource SoftButton}" Padding="12,6"/>
</StackPanel>
Expand Down
Loading
Loading