Skip to content
This repository was archived by the owner on Mar 25, 2025. It is now read-only.

Commit 7be9a58

Browse files
peterbarancekpeterbarancek
authored
Fix cylinder layout (#578)
* *fixed wraping in cylinder service header * update package ivf to 2.0.0
1 parent 45ea2b0 commit 7be9a58

File tree

32 files changed

+140
-123
lines changed

32 files changed

+140
-123
lines changed

‎TcOpen.sln

Lines changed: 85 additions & 55 deletions
Large diffs are not rendered by default.

‎src/Tc.Prober/src/Tc.Prober/Tc.Prober.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<IsPackable>false</IsPackable>
2020
</PropertyGroup>
2121
<ItemGroup>
22-
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
22+
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<None Include="Assets\TcOpenLogo128.png">

‎src/Tc.Prober/tests/PlcTcProberTestsConnector/PlcTcProberTestsConnector.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<None Remove="_generated\PlcTcProberTests\**" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
15+
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
1616
</ItemGroup>
1717
<ItemGroup>
1818
<Compile Update="Properties\Localizations.Designer.cs">

‎src/Tc.Prober/tests/Tc.ProberTest/Tc.ProberTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
9+
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
1010
<PackageReference Include="nunit" Version="3.13.2" />
1111
<PackageReference Include="JunitXml.TestLogger" Version="2.1.10" />
1212
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />

‎src/TcOpen.Hammer/PlcHammer.Hmi.Blazor/PlcHammer.Hmi.Blazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0-alpha.753" />
11+
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0" />
1212
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.4" />
1313
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.4" />
1414
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.4" />

‎src/TcOpen.Hammer/TcOpenHammer/TcOpenHammer/TcOpenHammer.tsproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.22">
2+
<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.25">
33
<DataTypes>
44
<DataType>
55
<Name GUID="{18071995-0000-0000-0000-000000000035}" TcBaseType="true" HideType="true">UINTARR2</Name>
@@ -1454,7 +1454,6 @@ External Setpoint Generation:
14541454
<Var>
14551455
<Name>In</Name>
14561456
<Type GUID="{901C2423-655B-45CE-B7E3-21F174F0F99F}" Namespace="MC">NCENCODERSTRUCT_IN2B</Type>
1457-
<BitOffs>1024</BitOffs>
14581457
<SubVar TypeFormatIndex="2">
14591458
<Name>nDataIn1</Name>
14601459
</SubVar>
@@ -1485,7 +1484,6 @@ External Setpoint Generation:
14851484
<Var>
14861485
<Name>Out</Name>
14871486
<Type GUID="{9CC50AB2-5D79-4869-A3C2-1FA7761BAFEA}" Namespace="MC">NCENCODERSTRUCT_OUT2</Type>
1488-
<BitOffs>2048</BitOffs>
14891487
<SubVar TypeFormatIndex="2">
14901488
<Name>nDataOut1</Name>
14911489
</SubVar>
@@ -1517,7 +1515,6 @@ External Setpoint Generation:
15171515
<Var>
15181516
<Name>In</Name>
15191517
<Type GUID="{F95C7C69-0C87-46C4-9559-1285CCA5B23A}" Namespace="MC">NCDRIVESTRUCT_IN2</Type>
1520-
<BitOffs>1344</BitOffs>
15211518
<SubVar TypeFormatIndex="2">
15221519
<Name>nDataIn1</Name>
15231520
</SubVar>
@@ -1543,7 +1540,6 @@ External Setpoint Generation:
15431540
<Var>
15441541
<Name>Out</Name>
15451542
<Type GUID="{644DC4BD-3D15-4DCB-94C7-24F3A5D579AA}" Namespace="MC">NCDRIVESTRUCT_OUT2</Type>
1546-
<BitOffs>2368</BitOffs>
15471543
<SubVar TypeFormatIndex="2">
15481544
<Name>nDataOut1</Name>
15491545
</SubVar>

‎src/TcOpen.Inxton/src/Abstractions/TcOpen.Inxton.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
19+
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
2020
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
2121
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.7" />
2222
</ItemGroup>

‎src/TcOpen.Inxton/src/Application/TcOpen.Inxton.App.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
25+
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
2626
</ItemGroup>
2727

2828
<ItemGroup>

‎src/TcOpen.Inxton/src/TcOpen.Inxton.Wpf/TcOpen.Inxton.Wpf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0-alpha.753" />
20+
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0" />
2121
</ItemGroup>
2222
<ItemGroup>
2323
<ProjectReference Include="..\Abstractions\TcOpen.Inxton.Abstractions.csproj" />

‎src/TcOpen.Inxton/src/TcOpen.Inxton/TcOpen.Inxton.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Inxton.Package.Vortex.Core" Version="2.0.0-alpha.753" />
19+
<PackageReference Include="Inxton.Package.Vortex.Core" Version="2.0.0" />
2020
</ItemGroup>
2121

2222
</Project>

‎src/TcoCore/src/TcOpen.Inxton.TcoCore.Blazor/TcOpen.Inxton.TcoCore.Blazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0-alpha.753" />
22+
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0" />
2323
<PackageReference Include="Blazm.Components" Version="1.0.5" />
2424
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.4" />
2525
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.17" />

‎src/TcoCore/src/TcoCore.Wpf/TcOpen.Inxton.TcoCore.Wpf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<DebugSymbols>true</DebugSymbols>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0-alpha.753" />
23+
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0" />
2424
<PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
2525
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
2626
</ItemGroup>

‎src/TcoCore/src/TcoCore.Wpf/TcoComponent/TcoComponentServiceView.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
<RowDefinition Height="Auto"/>
6666
<RowDefinition />
6767
</Grid.RowDefinitions>
68-
<ItemsControl ItemsPanel="{StaticResource HorizontalWraped}" HorizontalAlignment="Right" ItemsSource="{Binding Tasks}">
68+
<ItemsControl ItemsPanel="{StaticResource HorizontalWraped}" HorizontalAlignment="Left" ItemsSource="{Binding Tasks}">
6969

7070
<ItemsControl.ItemTemplate>
71-
<DataTemplate>
72-
<vortex:RenderableContentControl DataContext="{Binding}" Margin="5"></vortex:RenderableContentControl>
71+
<DataTemplate>
72+
<vortex:RenderableContentControl MinWidth="150" DataContext="{Binding}" Margin="5"></vortex:RenderableContentControl>
7373
</DataTemplate>
7474
</ItemsControl.ItemTemplate>
7575
</ItemsControl>

‎src/TcoCore/src/TcoCoreConnector/TcoCoreConnector.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
<DefineConstants>PLC_DOCU</DefineConstants>
2929
</PropertyGroup>
3030
<ItemGroup>
31-
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
32-
<PackageReference Include="Inxton.vortex.compiler.console" Version="2.0.0-alpha.753" />
31+
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
32+
<PackageReference Include="Inxton.vortex.compiler.console" Version="2.0.0" />
3333
</ItemGroup>
3434
<ItemGroup>
3535
<Content Include="_meta\TcoCore.library" IncludeInPackage="true" Pack="true" PackagePath="lib" CopyToOutputDirectory="PreserveNewest" />

‎src/TcoCore/tests/TcoDummyTest/TcoDummyTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ItemGroup>
99
<PackageReference Include="NUnit" Version="3.12.0" />
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
11-
<PackageReference Include="Inxton.vortex.compiler.console" Version="2.0.0-alpha.753" />
11+
<PackageReference Include="Inxton.vortex.compiler.console" Version="2.0.0" />
1212
</ItemGroup>
1313

1414
</Project>

‎src/TcoData/src/Blazor/TcOpen.Inxton.Data.Blazor/TcOpen.Inxton.Data.Blazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<ItemGroup>
2929
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.17" />
30-
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0-alpha.753" />
30+
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/TcoData/src/Wpf/TcoData.Wpf/TcOpen.Inxton.Data.Wpf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0-alpha.753" />
20+
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0" />
2121
<PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
2222
<ProjectReference Include="..\..\..\..\TcOpen.Inxton\src\TcOpen.Inxton.Wpf\TcOpen.Inxton.Wpf.csproj" />
2323
<ProjectReference Include="..\..\TcoDataConnector\TcoDataConnector.csproj" />

‎src/TcoDrivesBeckhoff/src/TcOpen.Inxton.TcoDrivesBeckhoff.Blazor/TcOpen.Inxton.TcoDrivesBeckhoff.Blazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0-alpha.753" />
24+
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0" />
2525
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.4" />
2626
</ItemGroup>
2727

‎src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcOpen.Inxton.TcoDrivesBeckhoff.Wpf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0-alpha.753" />
21+
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎src/TcoElements/src/TcOpen.Inxton.TcoElements.Blazor/TcOpen.Inxton.TcoElements.Blazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0-alpha.753" />
24+
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0" />
2525
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.4" />
2626
</ItemGroup>
2727

‎src/TcoInspectors/src/Blazor/TcOpen.Inxton.TcoInspectors.Blazor/TcOpen.Inxton.TcoInspectors.Blazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<ItemGroup>
2525
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.17" />
26-
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0-alpha.753" />
26+
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

‎src/TcoIo/src/TcoIoConnector/TcoIoConnector.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PackageReference Include="Inxton.iXlinker" Version="0.1.4-alpha.100">
2727
<PrivateAssets>All</PrivateAssets>
2828
</PackageReference>
29-
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
29+
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
3030
</ItemGroup>
3131
<ItemGroup>
3232
<ProjectReference Include="..\..\..\TcoCore\src\TcoCoreConnector\TcoCoreConnector.csproj" />

‎src/TcoIo/src/Wpf/TcOpen.Inxton.TcoIo.Wpf/TcOpen.Inxton.TcoIo.Wpf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0-alpha.753" />
21+
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎src/TcoPneumatics/src/TcOpen.Inxton.TcoPneumatics.Blazor/TcOpen.Inxton.TcoPneumatics.Blazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0-alpha.753" />
24+
<PackageReference Include="Inxton.Vortex.Presentation.Controls.Blazor-experimental" Version="2.0.0" />
2525
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.4" />
2626
</ItemGroup>
2727

‎src/TcoPneumatics/src/TcoPneumatics.Wpf/Cylinders/TcoCylinderServiceView.xaml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,16 @@
1313
<d:UserControl.DataContext>
1414
<tcopneumatics:TcoCylinderServiceViewModel />
1515
</d:UserControl.DataContext>
16-
<UserControl.Resources>
17-
<ItemsPanelTemplate x:Key="HorizontalWraped">
18-
<WrapPanel Background="Transparent" Width="{Binding (FrameworkElement.ActualWidth) , RelativeSource={RelativeSource AncestorType=ScrollContentPresenter}}" MinWidth="{Binding ItemWidth , RelativeSource={RelativeSource Self}}" ItemHeight="{Binding (ListView.View).ItemHeight , RelativeSource={RelativeSource AncestorType=ListView}}" ItemWidth="{Binding (ListView.View).ItemWidth , RelativeSource={RelativeSource AncestorType=ListView}}" />
19-
</ItemsPanelTemplate>
2016

21-
</UserControl.Resources>
2217
<vortex:TcoComponentView >
2318
<vortex:TcoComponentView.ComponentHeader>
2419

25-
<ItemsControl ItemsPanel="{StaticResource HorizontalWraped}" HorizontalAlignment="Right" DataContext="{Binding Model}" >
26-
<ItemsControl.Resources>
20+
<WrapPanel HorizontalAlignment="Left" DataContext="{Binding Model}" >
21+
<WrapPanel.Resources>
2722
<Style TargetType="StackPanel">
28-
<Setter Property="MinWidth" Value="250"></Setter>
23+
<Setter Property="MinWidth" Value="200"></Setter>
2924
</Style>
30-
</ItemsControl.Resources>
25+
</WrapPanel.Resources>
3126
<StackPanel>
3227
<Border
3328
Height="5"
@@ -48,15 +43,14 @@
4843
CornerRadius="2" />
4944
<vortex:RenderableContentControl DataContext="{Binding _moveWorkDefault}"/>
5045
</StackPanel>
51-
</ItemsControl>
46+
</WrapPanel>
5247
</vortex:TcoComponentView.ComponentHeader>
5348
<vortex:TcoComponentView.ComponentDetails >
5449
<ScrollViewer MaxHeight="200" DataContext="{Binding Model}">
55-
<StackPanel Orientation="Vertical">
56-
<ItemsControl ItemsPanel="{StaticResource HorizontalWraped}" >
50+
<ItemsControl >
5751
<ItemsControl.Resources>
5852
<Style TargetType="StackPanel">
59-
<Setter Property="MinWidth" Value="250"></Setter>
53+
<Setter Property="MinWidth" Value="200"></Setter>
6054
<Setter Property="Margin" Value="10"></Setter>
6155

6256
</Style>
@@ -73,7 +67,6 @@
7367

7468

7569
</ItemsControl>
76-
</StackPanel>
7770
</ScrollViewer>
7871
</vortex:TcoComponentView.ComponentDetails>
7972
</vortex:TcoComponentView>

‎src/TcoPneumatics/src/TcoPneumatics.Wpf/Cylinders/TcoDoubleCylinderServiceView.xaml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,16 @@
1313
<d:UserControl.DataContext>
1414
<tcopneumatics:TcoDoubleCylinderServiceViewModel />
1515
</d:UserControl.DataContext>
16-
<UserControl.Resources>
17-
<ItemsPanelTemplate x:Key="HorizontalWraped">
18-
<WrapPanel Background="Transparent" Width="{Binding (FrameworkElement.ActualWidth) , RelativeSource={RelativeSource AncestorType=ScrollContentPresenter}}" MinWidth="{Binding ItemWidth , RelativeSource={RelativeSource Self}}" ItemHeight="{Binding (ListView.View).ItemHeight , RelativeSource={RelativeSource AncestorType=ListView}}" ItemWidth="{Binding (ListView.View).ItemWidth , RelativeSource={RelativeSource AncestorType=ListView}}" />
19-
</ItemsPanelTemplate>
2016

21-
</UserControl.Resources>
2217
<vortex:TcoComponentView>
2318
<vortex:TcoComponentView.ComponentHeader>
2419

25-
<ItemsControl ItemsPanel="{StaticResource HorizontalWraped}" HorizontalAlignment="Right" DataContext="{Binding Model}" >
26-
<ItemsControl.Resources>
20+
<WrapPanel HorizontalAlignment="Left" DataContext="{Binding Model}" >
21+
<WrapPanel.Resources>
2722
<Style TargetType="StackPanel">
28-
<Setter Property="MinWidth" Value="250"></Setter>
23+
<Setter Property="MinWidth" Value="200"></Setter>
2924
</Style>
30-
</ItemsControl.Resources>
25+
</WrapPanel.Resources>
3126
<StackPanel>
3227
<Border
3328
Height="5"
@@ -48,15 +43,15 @@
4843
CornerRadius="2" />
4944
<vortex:RenderableContentControl DataContext="{Binding _moveWorkDefault}"/>
5045
</StackPanel>
51-
</ItemsControl>
46+
</WrapPanel>
5247
</vortex:TcoComponentView.ComponentHeader>
5348
<vortex:TcoComponentView.ComponentDetails >
5449
<ScrollViewer MaxHeight="200" DataContext="{Binding Model}">
55-
<StackPanel Orientation="Vertical">
56-
<ItemsControl ItemsPanel="{StaticResource HorizontalWraped}" >
50+
51+
<ItemsControl >
5752
<ItemsControl.Resources>
5853
<Style TargetType="StackPanel">
59-
<Setter Property="MinWidth" Value="250"></Setter>
54+
<Setter Property="MinWidth" Value="200"></Setter>
6055
<Setter Property="Margin" Value="10"></Setter>
6156

6257
</Style>
@@ -72,10 +67,7 @@
7267
<tcoCore:TcoSignalInfoView DataContext="{Binding _toWorkPosSignalInfo}"></tcoCore:TcoSignalInfoView>
7368
</StackPanel>
7469

75-
76-
7770
</ItemsControl>
78-
</StackPanel>
7971
</ScrollViewer>
8072
</vortex:TcoComponentView.ComponentDetails>
8173
</vortex:TcoComponentView>

‎src/TcoPneumatics/src/TcoPneumatics.Wpf/TcOpen.Inxton.TcoPneumatics.Wpf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0-alpha.753" />
26+
<PackageReference Include="Inxton.Package.Vortex.Essentials.Wpf" Version="2.0.0" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

‎src/TcoPneumatics/src/TcoPneumaticsConnector/TcoPneumaticsConnector.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<Content Include="_meta\version.info" IncludeInPackage="true" Pack="true" PackagePath="lib" CopyToOutputDirectory="PreserveNewest" />
3232
</ItemGroup>
3333
<ItemGroup>
34-
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0-alpha.753" />
34+
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="2.0.0" />
3535
</ItemGroup>
3636
<ItemGroup>
3737
<ProjectReference Include="..\..\..\TcoCore\src\TcoCoreConnector\TcoCoreConnector.csproj" />

‎src/TcoPneumatics/tests/Sandbox/PlcOpen.Wpf.Sandbox/App.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
PrimaryColor="BlueGrey"
1515
SecondaryColor="LightGreen" />
1616
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
17-
<ResourceDictionary Source="pack://application:,,,/Vortex.Presentation.Styling.Wpf;component/VortexStyle.xaml" />
18-
<ResourceDictionary Source="pack://application:,,,/Vortex.Presentation.Styling.Wpf;component/MDOverrides.xaml" />
17+
<!--<ResourceDictionary Source="pack://application:,,,/Vortex.Presentation.Styling.Wpf;component/VortexStyle.xaml" />
18+
<ResourceDictionary Source="pack://application:,,,/Vortex.Presentation.Styling.Wpf;component/MDOverrides.xaml" />-->
1919
</ResourceDictionary.MergedDictionaries>
2020
<!--<Color x:Key="MtsGreenColor">#FF20A024</Color>
2121
<Color x:Key="MtsYellowColor">#FFFFD917</Color>

0 commit comments

Comments
 (0)