Skip to content

Commit 7b2630e

Browse files
jmecostajmecosta
committed
TTSD-72756 add 2025 version of app
1 parent d62be1e commit 7b2630e

14 files changed

Lines changed: 1149 additions & 60 deletions

‎.github/workflows/contrast_security_app.yaml‎

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

‎.github/workflows/msbuild.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ env:
1313

1414
jobs:
1515
build:
16-
runs-on: windows-latest
16+
runs-on: windows-sandbox
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v5
2020

2121
- name: Add MSBuild to PATH
22-
uses: microsoft/setup-msbuild@v1.0.2
22+
uses: microsoft/setup-msbuild@v2
2323

2424
- name: Restore NuGet packages
2525
working-directory: ${{env.GITHUB_WORKSPACE}}

‎UserApp.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UserApp2022", "UserApp2022\
2020
EndProject
2121
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UserApp2023", "UserApp2023\UserApp2023.vcxproj", "{2BBFC722-8F82-497B-828F-6980540FFBD5}"
2222
EndProject
23+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UserApp2025", "UserApp2025\UserApp2025.vcxproj", "{3F7E898B-ED4E-4C7A-89D9-D199655EAC6C}"
24+
EndProject
2325
Global
2426
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2527
Debug|x64 = Debug|x64
@@ -50,6 +52,10 @@ Global
5052
{2BBFC722-8F82-497B-828F-6980540FFBD5}.Debug|x64.Build.0 = Debug|x64
5153
{2BBFC722-8F82-497B-828F-6980540FFBD5}.Release|x64.ActiveCfg = Release|x64
5254
{2BBFC722-8F82-497B-828F-6980540FFBD5}.Release|x64.Build.0 = Release|x64
55+
{3F7E898B-ED4E-4C7A-89D9-D199655EAC6C}.Debug|x64.ActiveCfg = Debug|x64
56+
{3F7E898B-ED4E-4C7A-89D9-D199655EAC6C}.Debug|x64.Build.0 = Debug|x64
57+
{3F7E898B-ED4E-4C7A-89D9-D199655EAC6C}.Release|x64.ActiveCfg = Release|x64
58+
{3F7E898B-ED4E-4C7A-89D9-D199655EAC6C}.Release|x64.Build.0 = Release|x64
5359
EndGlobalSection
5460
GlobalSection(SolutionProperties) = preSolution
5561
HideSolutionNode = FALSE

‎UserApp2025/INP/application.inp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
//application inp
2+
UserApp.exe 9
3+
user_macros.inp

‎UserApp2025/INP/user_macros.inp‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
page("Structures", "Tekla")
2+
{
3+
4+
usermacro(6,"j_Hall")
5+
{
6+
icon(1, 3, xs_macro_6, tip_m6)
7+
8+
command(one_point)
9+
10+
11+
tab_page("","jd_Parameters",3)
12+
{
13+
attribute("nframes", "j_no_of_frames", integer, "%d", none, check_maxmin, "100", "1")
14+
{
15+
value("5", 1)
16+
}
17+
18+
attribute("distance", "j_distance_between_frames", distance, "%.2f", none, none, "0.0", "0.0")
19+
{
20+
value("5000.0", 1)
21+
}
22+
23+
attribute("height1", "j_height_of_column", distance, "%.2f", none, none, "0.0", "0.0")
24+
{
25+
value("4000.00", 1)
26+
}
27+
28+
attribute("height2", "j_height_of_middle", distance, "%.2f", none, none, "0.0", "0.0")
29+
{
30+
value("4500.00", 1)
31+
}
32+
33+
attribute("width", "j_width_of_frame", distance, "%.2f", none, none, "0.0", "0.0")
34+
{
35+
value("8000.00", 1)
36+
}
37+
38+
attribute("profile1", "j_column_profile_name", string,"%s", none, none, "0.0", "0.0")
39+
{
40+
value("HEA400", 1)
41+
}
42+
43+
attribute("profile2", "j_beam_profile_name", string,"%s", none, none, "0.0", "0.0")
44+
{
45+
value("IPE330", 1)
46+
}
47+
}
48+
49+
/* ORIG depend(0) */
50+
depend(0)
51+
modify(1)
52+
draw(1, 100.0, 100.0, 0.0, 0.0)
53+
}
54+
55+
userdetail(45, "Round base plate")
56+
{
57+
icon(1, 12, xs_detail_45, tip_d45)
58+
autodir_type(autodir_detail)
59+
60+
tab_page("","jd_Picture",1)
61+
{
62+
part ("j_plate", tpl1, , , pos1, mat, , partname)
63+
picture("470_2_line", 400, 2, 15, 65)
64+
65+
picture("xsu_detail_45_plate", 100, 200, 90, 125)
66+
parameter(" Endplate from edge", e1, distance, number, 200, 100)
67+
68+
picture("xsu_detail_45_stiffeners", 100, 100, 350, 125)
69+
parameter(" Web plate height", hpl1, distance, number, 525, 175)
70+
parameter(" Web plate width", bpl1, distance, number, 450, 250)
71+
parameter(" Web plate chamfer", bj1, distance, number, 450, 100)
72+
73+
attribute("atab1", "j_Bolts", option,"%s", none, none, "0.0", "0.0",373,300,90)
74+
{
75+
value("j_no", 0)
76+
value("j_yes", 1)
77+
}
78+
attribute("atab2", "j_plate_stiffeners", option,"%s", none, none, "0.0", "0.0",373,330,90)
79+
{
80+
value("j_no", 0)
81+
value("j_yes", 1)
82+
}
83+
}
84+
tab_page("","Bolts",2)
85+
{
86+
attribute("bolt_size_lb", "j_bolt_size", label2,"%s", none, none, "0.0", "0.0",20,5)
87+
attribute("bolt_standard_lb", "j_bolt_standard", label3,"%s", none, none, "0.0", "0.0",20,30)
88+
attribute("tolerance_lb", "j_tolerance", label2,"%s", none, none, "0.0", "0.0",20,55)
89+
attribute("thread_in_material_lb", "j_thread_in_material", label3,"%s", none, none, "0.0", "0.0",20,80)
90+
parameter("",diameter, distance, number,160,5,90)
91+
parameter("",screwdin, string, text,160,30,90)
92+
parameter("",tolerance, distance, number,160,55,90)
93+
attribute("thread_in", "", option,"%s", none, none, "0.0", "0.0",160,80,90)
94+
{
95+
value("j_no", 0)
96+
value("j_yes", 1)
97+
}
98+
attribute("assembly_type", "", option,"%s", none, none, "0.0", "0.0",160,111,90)
99+
{
100+
value("j_site", 1)
101+
value("j_workshop", 0)
102+
}
103+
104+
long_hole(260,0)
105+
bolt_structure(469,0)
106+
extra_length(519,143)
107+
108+
picture("xsu_detail_45_bolts", 100, 100, 180, 155)
109+
parameter("", nb, integer, number, 350, 205, 40)
110+
parameter("", lbd, distance_list_no_toggle, number, 400, 205)
111+
}
112+
113+
welding( ,10, 0, , 10, 0, " ", 0, 1, 0.0, 0, 0.0, 0, 0.0)
114+
welding( ,10, 0, , 10, 0, " ", 0, 1, 0.0, 0, 0.0, 0, 0.0)
115+
116+
picture_used()
117+
}
118+
119+
userjoint(13,"j_Fitting")
120+
{
121+
icon(1, 17, xs_joint_13, tip_j13)
122+
origin_type( collision )
123+
autodir_type(autodir_basic)
124+
125+
part ("j_upper_stiffeners", tj1, bj1, hj1, pos5, mat , , partname) /* pna 230398 pos1 -> pos5 */
126+
part ("j_lower_stiffeners", tj2, bj2, hj2, pos6, mat2, , partname2)
127+
128+
tab_page("","jd_Picture",1)
129+
{
130+
picture("jnt_pict_uj13", 255, 180)
131+
parameter(" Clearance prim/sec", dvl1, distance, number,38)
132+
}
133+
tab_page("","jd_Parameters",3)
134+
{
135+
attribute("weld", "j_weldings", option,"%s", none, none, "0.0", "0.0")
136+
{
137+
value("j_no", 1)
138+
value("j_yes", 0)
139+
}
140+
parameter("j_stiff_dist_from_upper", adist1, distance, number, 2)
141+
parameter("j_stiff_dist_from_lower", adist2, distance, number, 3)
142+
parameter("j_upper_dist_from_beam", adist3, distance, number, 4)
143+
parameter("j_lower_dist_from_beam", adist4, distance, number, 5)
144+
parameter("j_end_plate_max_gap", col, distance, number,6)
145+
}
146+
welding( ,0, 0, , 0, 0, " ", 0, 1, 0.0, 0, 0.0, 0, 0.0)
147+
welding( ,0, 0, , 0, 0, " ", 0, 1, 0.0, 0, 0.0, 0, 0.0)
148+
welding( ,10, 0, , 10,0, " ", 0, 1, 0.0, 0, 0.0, 0, 0.0)
149+
welding( ,10, 0, , 10,0, " ", 0, 1, 0.0, 0, 0.0, 0, 0.0) /* for horiz stiff */
150+
}
151+
152+
}

‎UserApp2025/Installer/manifest.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TEP Version="2.0">
3+
<Product Id="UserAppComponent" UpgradeCode="9C192914-1D85-443B-A8E2-E3BA49988786" Version="3.0" Language="1033"
4+
Name="UserAppComponent System Components" Manufacturer="Trimble Solutions Corporation" Description= "Extension manifest to deploy a system component"
5+
IconPath="%TEPDEFINITIONFILEFOLDER%\..\..\build\Icon.png" Type="Extension">
6+
<TeklaVersions>
7+
<TeklaVersion Name="2024.0"/>
8+
<MinTeklaVersion Name="2024.0"/>
9+
<MaxTeklaVersion Name="2099.1"/>
10+
</TeklaVersions>
11+
</Product>
12+
13+
<SourcePathVariables>
14+
<SourcePathVariable Id="InstallerFolder" Value="%TEPDEFINITIONFILEFOLDER%\..\..\BuildDrop\UserApp"/>
15+
</SourcePathVariables>
16+
17+
<TargetPathVariables>
18+
<PathVariable Id="ExtensionsDir" Value="%commonEnvFolder%\extensions\applications"/>
19+
<PathVariable Id="BinariesTargetDirectory" Value="%ExtensionsDir%\UserApp"/>
20+
</TargetPathVariables>
21+
22+
<Component Id="UserAppComponent" Guid="C4F12282-EB54-47C6-815A-20791F3A1645">
23+
<File Id="PluginFiles" Source="%InstallerFolder%\UserApp2024.*" Target="%BinariesTargetDirectory%" />
24+
<File Id="PluginFiles2" Source="%InstallerFolder%\UserApp_resources.*" Target="%BinariesTargetDirectory%" />
25+
</Component>
26+
27+
<Feature Id="TheExtensionFeature" Title="ExtensionFeature">
28+
<ComponentRef ReferenceId="UserAppComponent" />
29+
</Feature>
30+
31+
</TEP>

‎UserApp2025/UserApp.vcxproj.filters‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="bin">
5+
<UniqueIdentifier>{41e2049c-b2bf-4fea-b5f6-77359eecb7dd}</UniqueIdentifier>
6+
</Filter>
7+
<Filter Include="INP">
8+
<UniqueIdentifier>{ed5a366d-f9b7-4c82-a21e-1bd31b3caccf}</UniqueIdentifier>
9+
</Filter>
10+
<Filter Include="Source files">
11+
<UniqueIdentifier>{13b61104-9620-4e39-a083-abf21017868c}</UniqueIdentifier>
12+
<Extensions>c;cpp</Extensions>
13+
</Filter>
14+
</ItemGroup>
15+
<ItemGroup>
16+
<None Include="packages.config" />
17+
<None Include="INP\application.inp">
18+
<Filter>INP</Filter>
19+
</None>
20+
<None Include="INP\user_macros.inp">
21+
<Filter>INP</Filter>
22+
</None>
23+
</ItemGroup>
24+
<ItemGroup>
25+
<ClCompile Include="about_dialog.c">
26+
<Filter>Source files</Filter>
27+
</ClCompile>
28+
<ClCompile Include="fitting_joint.c">
29+
<Filter>Source files</Filter>
30+
</ClCompile>
31+
<ClCompile Include="hall_macro.c">
32+
<Filter>Source files</Filter>
33+
</ClCompile>
34+
<ClCompile Include="info_dialog.c">
35+
<Filter>Source files</Filter>
36+
</ClCompile>
37+
<ClCompile Include="round_plate_detail.c">
38+
<Filter>Source files</Filter>
39+
</ClCompile>
40+
</ItemGroup>
41+
</Project>

‎UserApp2025/UserApp2025.vcxproj‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|x64">
5+
<Configuration>Debug</Configuration>
6+
<Platform>x64</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|x64">
9+
<Configuration>Release</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<PropertyGroup Label="Globals">
14+
<ProjectGuid>{3F7E898B-ED4E-4C7A-89D9-D199655EAC6C}</ProjectGuid>
15+
<RootNamespace>UserApp2024</RootNamespace>
16+
<Keyword>Win32Proj</Keyword>
17+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
18+
</PropertyGroup>
19+
<PropertyGroup Label="Configuration">
20+
<ConfigurationType>Application</ConfigurationType>
21+
</PropertyGroup>
22+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
23+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
24+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
25+
<PropertyGroup>
26+
<OutDir>..\BuildDrop\UserApp\</OutDir>
27+
</PropertyGroup>
28+
<ItemDefinitionGroup>
29+
<ClCompile>
30+
<PreprocessorDefinitions>WIN32;_CONSOLE;_CRT_SECURE_NO_WARNINGS;LEGACY_SOLUTION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
31+
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdcpp17</LanguageStandard>
32+
</ClCompile>
33+
</ItemDefinitionGroup>
34+
<ItemGroup>
35+
<None Include="INP\application.inp" />
36+
<None Include="INP\user_macros.inp" />
37+
<None Include="packages.config" />
38+
</ItemGroup>
39+
<ItemGroup>
40+
<ClCompile Include="about_dialog.c" />
41+
<ClCompile Include="fitting_joint.c" />
42+
<ClCompile Include="hall_macro.c" />
43+
<ClCompile Include="info_dialog.c" />
44+
<ClCompile Include="round_plate_detail.c" />
45+
</ItemGroup>
46+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
47+
<ImportGroup Label="ExtensionTargets">
48+
<Import Project="..\packages\StructuresDevKit.2025.0.0\build\native\StructuresDevKit.targets" Condition="Exists('..\packages\StructuresDevKit.2025.0.0\build\native\StructuresDevKit.targets')" />
49+
</ImportGroup>
50+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
51+
<PropertyGroup>
52+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
53+
</PropertyGroup>
54+
<Error Condition="!Exists('..\packages\StructuresDevKit.2025.0.0\build\native\StructuresDevKit.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StructuresDevKit.2025.0.0\build\native\StructuresDevKit.targets'))" />
55+
</Target>
56+
</Project>

0 commit comments

Comments
 (0)