Skip to content

Commit 39d4a72

Browse files
teodor-krastevteodor-krastev
committed
b70
1 parent 18e66ba commit 39d4a72

701 files changed

Lines changed: 35924 additions & 272045 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
## files generated by popular Visual Studio add-ons.
33

44
# User-specific files
5-
.vs/*
6-
Axel-hub/config/
7-
.vs/slnx.sqlite
8-
*.sdt
9-
*.jlg
10-
*.jdt
11-
125
*.suo
136
*.user
147
*.sln.docstates
@@ -168,6 +161,16 @@ ClientBin/
168161
*.pfx
169162
*.publishsettings
170163
node_modules/
164+
*.tlg
165+
*.jdt
166+
*.ahs
167+
*.jlg
168+
*.csv
169+
*.ahf
170+
*.rws
171+
*.asd
172+
*.ahh
173+
*.zip
171174

172175
# RIA/Silverlight projects
173176
Generated_Code/
@@ -196,3 +199,5 @@ FakesAssemblies/
196199
GeneratedArtifacts/
197200
_Pvt_Extensions/
198201
ModelManifest.xml
202+
/Axel-hub/config/seq_template.RPR
203+
/Axel-hub/config/simplex_template.RPR

‎.vs/VSWorkspaceState.json‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.vs/slnx.sqlite‎

-1.91 MB
Binary file not shown.

‎Axel-data/App.config‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
55
</startup>
6-
</configuration>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
10+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
11+
</dependentAssembly>
12+
</assemblyBinding>
13+
</runtime>
14+
</configuration>

‎Axel-data/Axel-data.csproj‎

Lines changed: 80 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Axel_data</RootNamespace>
1111
<AssemblyName>Axel-data</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
1616
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
17+
<TargetFrameworkProfile />
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1920
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,9 +36,25 @@
3536
<WarningLevel>4</WarningLevel>
3637
</PropertyGroup>
3738
<PropertyGroup>
38-
<ApplicationIcon>dataProc2.ico</ApplicationIcon>
39+
<ApplicationIcon>
40+
</ApplicationIcon>
3941
</PropertyGroup>
4042
<ItemGroup>
43+
<Reference Include="Microsoft.WindowsAPICodePack.Core, Version=7.0.4.0, Culture=neutral, PublicKeyToken=8afb38e9204fc0a9, processorArchitecture=MSIL">
44+
<HintPath>..\packages\WindowsAPICodePack.7.0.4\lib\net48\Microsoft.WindowsAPICodePack.Core.dll</HintPath>
45+
</Reference>
46+
<Reference Include="Microsoft.WindowsAPICodePack.ExtendedLinguisticServices, Version=7.0.4.0, Culture=neutral, PublicKeyToken=8afb38e9204fc0a9, processorArchitecture=MSIL">
47+
<HintPath>..\packages\WindowsAPICodePack.7.0.4\lib\net48\Microsoft.WindowsAPICodePack.ExtendedLinguisticServices.dll</HintPath>
48+
</Reference>
49+
<Reference Include="Microsoft.WindowsAPICodePack.Sensors, Version=7.0.4.0, Culture=neutral, PublicKeyToken=8afb38e9204fc0a9, processorArchitecture=MSIL">
50+
<HintPath>..\packages\WindowsAPICodePack.7.0.4\lib\net48\Microsoft.WindowsAPICodePack.Sensors.dll</HintPath>
51+
</Reference>
52+
<Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=7.0.4.0, Culture=neutral, PublicKeyToken=8afb38e9204fc0a9, processorArchitecture=MSIL">
53+
<HintPath>..\packages\WindowsAPICodePack.7.0.4\lib\net48\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
54+
</Reference>
55+
<Reference Include="Microsoft.WindowsAPICodePack.ShellExtensions, Version=7.0.4.0, Culture=neutral, PublicKeyToken=8afb38e9204fc0a9, processorArchitecture=MSIL">
56+
<HintPath>..\packages\WindowsAPICodePack.7.0.4\lib\net48\Microsoft.WindowsAPICodePack.ShellExtensions.dll</HintPath>
57+
</Reference>
4158
<Reference Include="NationalInstruments.Analysis.Enterprise, Version=19.0.45.49152, Culture=neutral, PublicKeyToken=4febd62461bf11a4, processorArchitecture=MSIL">
4259
<Private>False</Private>
4360
</Reference>
@@ -57,12 +74,50 @@
5774
<Private>False</Private>
5875
</Reference>
5976
<Reference Include="NationalInstruments.UI, Version=19.0.45.49154, Culture=neutral, PublicKeyToken=4febd62461bf11a4, processorArchitecture=MSIL" />
60-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
61-
<SpecificVersion>False</SpecificVersion>
62-
<HintPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\Blend\Newtonsoft.Json.dll</HintPath>
77+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
78+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
6379
</Reference>
6480
<Reference Include="System" />
81+
<Reference Include="System.ComponentModel.Composition" />
6582
<Reference Include="System.Data" />
83+
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
84+
<HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
85+
<Private>True</Private>
86+
<Private>True</Private>
87+
</Reference>
88+
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
89+
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
90+
<Private>True</Private>
91+
<Private>True</Private>
92+
</Reference>
93+
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94+
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
95+
<Private>True</Private>
96+
<Private>True</Private>
97+
</Reference>
98+
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
99+
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
100+
<Private>True</Private>
101+
<Private>True</Private>
102+
</Reference>
103+
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
104+
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
105+
<Private>True</Private>
106+
<Private>True</Private>
107+
</Reference>
108+
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
109+
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
110+
<Private>True</Private>
111+
<Private>True</Private>
112+
</Reference>
113+
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
114+
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
115+
<Private>True</Private>
116+
<Private>True</Private>
117+
</Reference>
118+
<Reference Include="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
119+
<HintPath>..\packages\WindowsAPICodePack.7.0.4\lib\net48\System.Windows.Forms.dll</HintPath>
120+
</Reference>
66121
<Reference Include="System.Xml" />
67122
<Reference Include="Microsoft.CSharp" />
68123
<Reference Include="System.Core" />
@@ -78,6 +133,9 @@
78133
<Reference Include="WindowsBase" />
79134
<Reference Include="PresentationCore" />
80135
<Reference Include="PresentationFramework" />
136+
<Reference Include="WindowsFormsIntegration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
137+
<HintPath>..\packages\WindowsAPICodePack.7.0.4\lib\net48\WindowsFormsIntegration.dll</HintPath>
138+
</Reference>
81139
</ItemGroup>
82140
<ItemGroup>
83141
<ApplicationDefinition Include="App.xaml">
@@ -93,10 +151,16 @@
93151
<Compile Include="..\Axel-hub\Axel-hub\Options\OptionsType.cs">
94152
<Link>OptionsType.cs</Link>
95153
</Compile>
96-
<Compile Include="..\Axel-hub\Axel-hub\strobesUC.xaml.cs">
154+
<Compile Include="..\Axel-hub\Axel-hub\PanelsUC\strobesUC.xaml.cs">
97155
<Link>strobesUC.xaml.cs</Link>
98156
<DependentUpon>strobesUC.xaml</DependentUpon>
99157
</Compile>
158+
<Compile Include="checkOrderUC.xaml.cs">
159+
<DependentUpon>checkOrderUC.xaml</DependentUpon>
160+
</Compile>
161+
<Compile Include="graphTestUC.xaml.cs">
162+
<DependentUpon>graphTestUC.xaml</DependentUpon>
163+
</Compile>
100164
<Compile Include="JoinOptimUC.xaml.cs">
101165
<DependentUpon>JoinOptimUC.xaml</DependentUpon>
102166
</Compile>
@@ -109,11 +173,19 @@
109173
<Compile Include="TmprCompUC.xaml.cs">
110174
<DependentUpon>TmprCompUC.xaml</DependentUpon>
111175
</Compile>
112-
<Page Include="..\Axel-hub\Axel-hub\strobesUC.xaml">
176+
<Page Include="..\Axel-hub\Axel-hub\PanelsUC\strobesUC.xaml">
113177
<Link>strobesUC.xaml</Link>
114178
<Generator>MSBuild:Compile</Generator>
115179
<SubType>Designer</SubType>
116180
</Page>
181+
<Page Include="checkOrderUC.xaml">
182+
<SubType>Designer</SubType>
183+
<Generator>MSBuild:Compile</Generator>
184+
</Page>
185+
<Page Include="graphTestUC.xaml">
186+
<SubType>Designer</SubType>
187+
<Generator>MSBuild:Compile</Generator>
188+
</Page>
117189
<Page Include="JoinOptimUC.xaml">
118190
<Generator>MSBuild:Compile</Generator>
119191
<SubType>Designer</SubType>
@@ -162,6 +234,7 @@
162234
<Generator>ResXFileCodeGenerator</Generator>
163235
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
164236
</EmbeddedResource>
237+
<None Include="packages.config" />
165238
<None Include="Properties\Settings.settings">
166239
<Generator>SettingsSingleFileGenerator</Generator>
167240
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -174,9 +247,6 @@
174247
<ItemGroup>
175248
<Resource Include="Properties\TripleBar.bmp" />
176249
</ItemGroup>
177-
<ItemGroup>
178-
<Resource Include="dataProc2.ico" />
179-
</ItemGroup>
180250
<ItemGroup>
181251
<Resource Include="Properties\dataProc2.ico" />
182252
</ItemGroup>

0 commit comments

Comments
 (0)