Skip to content

Commit 0171757

Browse files
eertugruleertugrul
committed
references has updated with Dynamo 1.1 dlls
#60 Matt (@tatlin) I just publicsed the new version of the DynamoSAP package.
1 parent 8e6022b commit 0171757

File tree

14 files changed

+217
-184
lines changed

14 files changed

+217
-184
lines changed

‎packages/DynamoSAP/extra/Sample_1a_SpaceStructure.dyn

+119-116
Large diffs are not rendered by default.

‎src/DynamoSAP/DynamoSAP.csproj

+12-8
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,29 @@
4141
<Prefer32Bit>false</Prefer32Bit>
4242
</PropertyGroup>
4343
<ItemGroup>
44+
<Reference Include="DSCoreNodes">
45+
<HintPath>..\..\..\..\..\..\..\Program Files\Dynamo\Dynamo Core\1.1\DSCoreNodes.dll</HintPath>
46+
<Private>False</Private>
47+
</Reference>
4448
<Reference Include="DynamoCore">
45-
<HintPath>$(DYNAMO_API)\DynamoCore.dll</HintPath>
49+
<HintPath>..\..\..\..\..\..\..\Program Files\Dynamo\Dynamo Core\1.1\DynamoCore.dll</HintPath>
50+
<Private>False</Private>
51+
</Reference>
52+
<Reference Include="DynamoServices">
53+
<HintPath>..\..\..\..\..\..\..\Program Files\Dynamo\Dynamo Core\1.1\DynamoServices.dll</HintPath>
4654
<Private>False</Private>
4755
</Reference>
4856
<Reference Include="DynamoUnits">
49-
<HintPath>$(DYNAMO_API)\DynamoUnits.dll</HintPath>
57+
<HintPath>..\..\..\..\..\..\..\Program Files\Dynamo\Dynamo Core\1.1\DynamoUnits.dll</HintPath>
5058
<Private>False</Private>
5159
</Reference>
5260
<Reference Include="PresentationCore" />
5361
<Reference Include="ProtoCore">
54-
<HintPath>$(DYNAMO_API)\ProtoCore.dll</HintPath>
62+
<HintPath>..\..\..\..\..\..\..\Program Files\Dynamo\Dynamo Core\1.1\ProtoCore.dll</HintPath>
5563
<Private>False</Private>
5664
</Reference>
5765
<Reference Include="ProtoGeometry">
58-
<HintPath>$(DYNAMO_API)\ProtoGeometry.dll</HintPath>
59-
<Private>False</Private>
60-
</Reference>
61-
<Reference Include="ProtoInterface">
62-
<HintPath>$(DYNAMO_API)\ProtoInterface.dll</HintPath>
66+
<HintPath>..\..\..\..\..\..\..\Program Files\Dynamo\Dynamo Core\1.1\ProtoGeometry.dll</HintPath>
6367
<Private>False</Private>
6468
</Reference>
6569
<Reference Include="SAP2000v16">

‎src/DynamoSAP/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
3535

36-
[assembly: AssemblyVersion("0.3.2.0")]
37-
[assembly: AssemblyFileVersion("0.3.2.0")]
36+
[assembly: AssemblyVersion("0.3.4.0")]
37+
[assembly: AssemblyFileVersion("0.3.4.0")]
3838

‎src/DynamoSAP/Structure/Frame.cs

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// Developed by Thornton Tomasetti's CORE Studio for Autodesk
22
/// http://core.thorntontomasetti.com
3-
/// CORE Developers: Elcin Ertugrul and Ana Garcia Puyol
3+
/// COREstudio Developers: Elcin Ertugrul and Ana Garcia Puyol
44

55
using System;
66
using System.Collections.Generic;
@@ -11,13 +11,15 @@
1111
//DYNAMO
1212
using Autodesk.DesignScript.Geometry;
1313
using Autodesk.DesignScript.Runtime;
14+
using DynamoSAP.Assembly;
15+
using DynamoSAP.Definitions;
1416
using ProtoCore.Lang;
17+
using DynamoServices;
1518

1619
//SAP
1720
using SAP2000v16;
1821
using SAPConnection;
19-
using DynamoSAP.Assembly;
20-
using DynamoSAP.Definitions;
22+
2123

2224
namespace DynamoSAP.Structure
2325
{
@@ -80,7 +82,7 @@ public static Frame FromLine(Line Line, SectionProp SectionProp, string Justific
8082
Frame tFrm;
8183
FrmID tFrmid = null;
8284

83-
Dictionary<string, ISerializable> getObjs = TraceUtils.GetObjectFromTLS();
85+
Dictionary<string, ISerializable> getObjs = ProtoCore.Lang.TraceUtils.GetObjectFromTLS();
8486
foreach (var k in getObjs.Keys)
8587
{
8688
tFrmid = getObjs[k] as FrmID;
@@ -106,7 +108,7 @@ public static Frame FromLine(Line Line, SectionProp SectionProp, string Justific
106108
//Set the trace data on the return to be this Frame
107109
Dictionary<string, ISerializable> objs = new Dictionary<string, ISerializable>();
108110
objs.Add(TRACE_ID, new FrmID { IntID = tFrm.ID });
109-
TraceUtils.SetObjectToTLS(objs);
111+
ProtoCore.Lang.TraceUtils.SetObjectToTLS(objs);
110112

111113
return tFrm;
112114
}
@@ -126,7 +128,7 @@ public static Frame FromEndPoints(Point i, Point j, SectionProp SectionProp, str
126128
Frame tFrm;
127129
FrmID tFrmid = null;
128130

129-
Dictionary<string, ISerializable> getObjs = TraceUtils.GetObjectFromTLS();
131+
Dictionary<string, ISerializable> getObjs = ProtoCore.Lang.TraceUtils.GetObjectFromTLS();
130132
foreach (var k in getObjs.Keys)
131133
{
132134
tFrmid = getObjs[k] as FrmID;
@@ -152,7 +154,7 @@ public static Frame FromEndPoints(Point i, Point j, SectionProp SectionProp, str
152154
//Set the trace data on the return to be this Frame
153155
Dictionary<string, ISerializable> objs = new Dictionary<string, ISerializable>();
154156
objs.Add(TRACE_ID, new FrmID { IntID = tFrm.ID });
155-
TraceUtils.SetObjectToTLS(objs);
157+
ProtoCore.Lang.TraceUtils.SetObjectToTLS(objs);
156158

157159
return tFrm;
158160
}

‎src/DynamoSAP/Structure/Joint.cs

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// Developed by Thornton Tomasetti's CORE Studio for Autodesk
22
/// http://core.thorntontomasetti.com
3-
/// CORE Developers: Elcin Ertugrul and Ana Garcia Puyol
3+
/// COREstudio Developers: Elcin Ertugrul and Ana Garcia Puyol
44

55
using System;
66
using System.Collections.Generic;
@@ -9,16 +9,17 @@
99
using System.Runtime.Serialization;
1010

1111
//DYNAMO
12+
using DynamoSAP.Assembly;
13+
using DynamoSAP.Definitions;
14+
using ProtoCore.Lang;
1215
using Autodesk.DesignScript.Geometry;
1316
using Autodesk.DesignScript.Runtime;
14-
17+
using DynamoServices;
1518

1619
//SAP
1720
using SAP2000v16;
1821
using SAPConnection;
19-
using DynamoSAP.Assembly;
20-
using DynamoSAP.Definitions;
21-
using ProtoCore.Lang;
22+
2223

2324
namespace DynamoSAP.Structure
2425
{
@@ -59,7 +60,7 @@ public static Joint FromPoint(Point Point)
5960
Joint tJoint;
6061
//JointID tJointId = TraceUtils.GetTraceData(TRACE_ID) as JointID;
6162

62-
Dictionary<string, ISerializable> getObjs= TraceUtils.GetObjectFromTLS();
63+
Dictionary<string, ISerializable> getObjs= ProtoCore.Lang.TraceUtils.GetObjectFromTLS();
6364

6465
JointID tJointId = null;
6566

@@ -86,7 +87,7 @@ public static Joint FromPoint(Point Point)
8687

8788
Dictionary<string, ISerializable> objs = new Dictionary<string, ISerializable>();
8889
objs.Add(TRACE_ID, new JointID { IntID = tJoint.ID });
89-
TraceUtils.SetObjectToTLS(objs);
90+
ProtoCore.Lang.TraceUtils.SetObjectToTLS(objs);
9091

9192
return tJoint;
9293
}

‎src/DynamoSAP/Structure/Shell.cs

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// Developed by Thornton Tomasetti's CORE Studio for Autodesk
22
/// http://core.thorntontomasetti.com
3-
/// CORE Developers: Elcin Ertugrul and Ana Garcia Puyol
3+
/// COREsudio Developers: Elcin Ertugrul and Ana Garcia Puyol
44

55
using System;
66
using System.Collections.Generic;
@@ -11,13 +11,15 @@
1111
//DYNAMO
1212
using Autodesk.DesignScript.Geometry;
1313
using Autodesk.DesignScript.Runtime;
14+
using DynamoSAP.Assembly;
15+
using DynamoSAP.Definitions;
1416
using ProtoCore.Lang;
17+
using DynamoServices;
1518

1619
//SAP
1720
using SAP2000v16;
1821
using SAPConnection;
19-
using DynamoSAP.Assembly;
20-
using DynamoSAP.Definitions;
22+
2123

2224
namespace DynamoSAP.Structure
2325
{
@@ -79,7 +81,7 @@ public static Shell FromMesh(Mesh Mesh, ShellProp ShellProp)
7981
Shell tShell;
8082
ShellID tShellid = null;
8183
//TraceUtils.GetTraceData(TRACE_ID) as ShellID;
82-
Dictionary<string, ISerializable> getObjs = TraceUtils.GetObjectFromTLS();
84+
Dictionary<string, ISerializable> getObjs = ProtoCore.Lang.TraceUtils.GetObjectFromTLS();
8385
foreach (var k in getObjs.Keys)
8486
{
8587
tShellid = getObjs[k] as ShellID;
@@ -104,7 +106,7 @@ public static Shell FromMesh(Mesh Mesh, ShellProp ShellProp)
104106
//TraceUtils.SetTraceData(TRACE_ID, new ShellID { IntID = tShell.ID });
105107
Dictionary<string, ISerializable> objs = new Dictionary<string, ISerializable>();
106108
objs.Add(TRACE_ID, new ShellID { IntID = tShell.ID });
107-
TraceUtils.SetObjectToTLS(objs);
109+
ProtoCore.Lang.TraceUtils.SetObjectToTLS(objs);
108110

109111
return tShell;
110112
}
@@ -123,7 +125,7 @@ public static Shell FromSurface(Surface Surface, ShellProp ShellProp)
123125
ShellID tShellid = null;
124126
//TraceUtils.GetTraceData(TRACE_ID) as ShellID;
125127

126-
Dictionary<string, ISerializable> getObjs = TraceUtils.GetObjectFromTLS();
128+
Dictionary<string, ISerializable> getObjs = ProtoCore.Lang.TraceUtils.GetObjectFromTLS();
127129
foreach (var k in getObjs.Keys)
128130
{
129131
tShellid = getObjs[k] as ShellID;
@@ -148,7 +150,7 @@ public static Shell FromSurface(Surface Surface, ShellProp ShellProp)
148150
//TraceUtils.SetTraceData(TRACE_ID, new ShellID { IntID = tShell.ID });
149151
Dictionary<string, ISerializable> objs = new Dictionary<string, ISerializable>();
150152
objs.Add(TRACE_ID, new ShellID { IntID = tShell.ID });
151-
TraceUtils.SetObjectToTLS(objs);
153+
ProtoCore.Lang.TraceUtils.SetObjectToTLS(objs);
152154

153155
return tShell;
154156
}

‎src/DynamoSAPTests/DynamoSAPTests.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<Prefer32Bit>false</Prefer32Bit>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="DynamoCore">
40-
<HintPath>$(DYNAMO_API)\DynamoCore.dll</HintPath>
41-
<Private>False</Private>
39+
<Reference Include="DynamoCore, Version=1.1.0.2094, Culture=neutral, processorArchitecture=MSIL">
40+
<SpecificVersion>False</SpecificVersion>
41+
<HintPath>..\..\..\..\..\..\..\Program Files\Dynamo\Dynamo Core\1.1\DynamoCore.dll</HintPath>
4242
</Reference>
4343
<Reference Include="DynamoSAP, Version=0.2.1.0, Culture=neutral, processorArchitecture=MSIL">
4444
<SpecificVersion>False</SpecificVersion>

‎src/DynamoSAPTests/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.3.2.0")]
36-
[assembly: AssemblyFileVersion("0.3.2.0")]
35+
[assembly: AssemblyVersion("0.3.3.0")]
36+
[assembly: AssemblyFileVersion("0.3.3.0")]

0 commit comments

Comments
 (0)