Skip to content

Commit 6fc722f

Browse files
MikhinjaMikhinja
authored
Cataliv/revit 244971/update dynamo core 4.0.0.3277 (#3267)
Nodes touched (their constructors): FaceAnalysisDisplay, PointAnalysisDisplay, VectorAnalysisDisplay
1 parent bce045d commit 6fc722f

File tree

7 files changed

+48
-43
lines changed

7 files changed

+48
-43
lines changed

‎.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.7.66
1+
0.7.67

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 0.7.67
2+
* Update Dynamo Core to 4.0.0.3277
3+
14
## 0.7.66
25
* Improve reg tests InstallDllTest and PackageDllTest to check for file version instead of assembly version
36

‎src/Config/packages_versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<!-- 3rd party package versions -->
5-
<DYNAMOCORE_VERSION>4.0.0-beta3076</DYNAMOCORE_VERSION>
5+
<DYNAMOCORE_VERSION>4.0.0.3277</DYNAMOCORE_VERSION>
66

77
<DYNAMOWPFUI_VERSION Condition="'$(DYNAMOWPFUI_VERSION)' == ''">$(DYNAMOCORE_VERSION)</DYNAMOWPFUI_VERSION>
88
<DYNAMOCORENODES_VERSION Condition="'$(DYNAMOCORENODES_VERSION)' == ''">$(DYNAMOCORE_VERSION)</DYNAMOCORENODES_VERSION>
@@ -12,8 +12,8 @@
1212
<DCoreLibSubFolder Condition="'$(Platform)' == 'NET80'">net8.0</DCoreLibSubFolder>
1313
<DCoreLibSubFolder Condition="'$(Platform)' == 'NET100'">net10.0</DCoreLibSubFolder>
1414

15-
<Greg_VERSION>3.0.1.4707</Greg_VERSION>
16-
<GregRevitAuth_VERSION>4.0.9405.33709</GregRevitAuth_VERSION>
15+
<Greg_VERSION>3.0.2.8780</Greg_VERSION>
16+
<GregRevitAuth_VERSION>4.0.9460.41744</GregRevitAuth_VERSION>
1717
<GregRevitAuthLibSubFolder>net10.0</GregRevitAuthLibSubFolder>
1818

1919
<!-- Keep in sync with DynamoCore & TODO: check if still needed -->

‎src/Config/user_local.props‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<!-- temporary path until aligned port to newer .NET 10 SDK build -->
5-
<REVITAPI Condition=" !Exists('$(REVITAPI)') ">$(SolutionDir)..\lib\Revit Preview Release\net10.0.0-preview.5.25277.114</REVITAPI>
6-
<REVITAPI Condition=" !Exists('$(REVITAPI)') ">D:\src\git.adsk\Revit\dev2\Debugx64</REVITAPI>
4+
<REVITAPI Condition=" !Exists('$(REVITAPI)') ">$(SolutionDir)..\lib\Revit Preview Release\net10.0</REVITAPI>
75
</PropertyGroup>
86
</Project>

‎src/Libraries/RevitNodes/AnalysisDisplay/FaceAnalysisDisplay.cs‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,14 @@ protected void InternalSetReferencePrimitiveIdPairs(Dictionary<Reference, int> k
4040
///
4141
/// </summary>
4242
/// <param name="view"></param>
43-
/// <param name="data"></param>
43+
/// <param name="surface"></param>
44+
/// <param name="sampleLocations"></param>
45+
/// <param name="samples"></param>
4446
/// <param name="resultsName"></param>
4547
/// <param name="description"></param>
4648
/// <param name="unitType"></param>
4749
protected FaceAnalysisDisplay(
48-
Autodesk.Revit.DB.View view, ISurfaceData<Autodesk.DesignScript.Geometry.UV, double> data, string resultsName, string description,Type unitType)
50+
Autodesk.Revit.DB.View view, Surface surface, Autodesk.DesignScript.Geometry.UV[] sampleLocations, IEnumerable<double> samples, string resultsName, string description,Type unitType)
4951
{
5052

5153
SpatialFieldManager sfm;
@@ -56,7 +58,7 @@ protected FaceAnalysisDisplay(
5658
var refPriIds = new Dictionary<Reference, int>();
5759
var primitiveIds = new List<int>();
5860

59-
var reference = data.Surface.Tags.LookupTag(DefaultTag) as Reference;
61+
var reference = surface.Tags.LookupTag(DefaultTag) as Reference;
6062
if (reference == null)
6163
{
6264
// Dont' throw an exception here. Handle the case of a bad tag
@@ -74,7 +76,7 @@ protected FaceAnalysisDisplay(
7476
int primitiveId;
7577
if (refPriIds.TryGetValue(reference, out primitiveId))
7678
{
77-
InternalSetSpatialFieldValues(primitiveId, data, resultsName, description, unitType);
79+
InternalSetSpatialFieldValues(primitiveId, surface, sampleLocations, samples, resultsName, description, unitType);
7880

7981
TransactionManager.Instance.TransactionTaskDone();
8082

@@ -94,7 +96,7 @@ protected FaceAnalysisDisplay(
9496
InternalSetSpatialPrimitiveIds(primitiveIds);
9597
InternalSetReferencePrimitiveIdPairs(refPriIds);
9698

97-
InternalSetSpatialFieldValues(primitiveId, data, resultsName, description, unitType);
99+
InternalSetSpatialFieldValues(primitiveId, surface, sampleLocations, samples, resultsName, description, unitType);
98100
}
99101
}
100102
else
@@ -111,7 +113,7 @@ protected FaceAnalysisDisplay(
111113
InternalSetSpatialPrimitiveIds(primitiveIds);
112114
InternalSetReferencePrimitiveIdPairs(refPriIds);
113115

114-
InternalSetSpatialFieldValues(primitiveId, data, resultsName, description, unitType);
116+
InternalSetSpatialFieldValues(primitiveId, surface, sampleLocations, samples, resultsName, description, unitType);
115117
}
116118

117119
TransactionManager.Instance.TransactionTaskDone();
@@ -126,16 +128,17 @@ protected FaceAnalysisDisplay(
126128
/// input sequences should be of the same length.
127129
/// </summary>
128130
/// <param name="primitiveId"></param>
129-
/// <param name="data"></param>
131+
/// <param name="surface"></param>
132+
/// <param name="sampleLocations"></param>
133+
/// <param name="samples"></param>
130134
/// <param name="schemaName"></param>
131135
/// <param name="description"></param>
132136
/// <param name="unitType"></param>
133137
private void
134-
InternalSetSpatialFieldValues(int primitiveId, ISurfaceData<Autodesk.DesignScript.Geometry.UV,
135-
double> data, string schemaName, string description, Type unitType)
138+
InternalSetSpatialFieldValues(int primitiveId, Surface surface, Autodesk.DesignScript.Geometry.UV[] sampleLocations, IEnumerable<double> samples, string schemaName, string description, Type unitType)
136139
{
137140
// Get the surface reference
138-
var reference = data.Surface.Tags.LookupTag(DefaultTag) as Reference;
141+
var reference = surface.Tags.LookupTag(DefaultTag) as Reference;
139142

140143
var el = DocumentManager.Instance.CurrentDBDocument.GetElement(reference.ElementId);
141144
var pointLocations = new List<UV>();
@@ -144,16 +147,16 @@ private void
144147
var face = el.GetGeometryObjectFromReference(reference) as Autodesk.Revit.DB.Face;
145148
if (face != null)
146149
{
147-
foreach (var loc in data.ValueLocations)
150+
foreach (var loc in sampleLocations)
148151
{
149-
var pt = data.Surface.PointAtParameter(loc.U, loc.V);
152+
var pt = surface.PointAtParameter(loc.U, loc.V);
150153
var faceLoc = face.Project(pt.ToXyz()).UVPoint;
151154
pointLocations.Add(faceLoc);
152155
}
153156
}
154157
}
155158

156-
var valList = data.Values.Select(v => new ValueAtPoint(new List<double>() { v }));
159+
var valList = samples.Select(v => new ValueAtPoint(new List<double>() { v }));
157160

158161
TransactionManager.Instance.EnsureInTransaction(Document);
159162

@@ -227,9 +230,7 @@ public static FaceAnalysisDisplay ByViewFacePointsAndValues(
227230
description = Properties.Resources.AnalysisResultsDefaultDescription;
228231
}
229232

230-
var data = SurfaceData.BySurfacePointsAndValues(surface, sampleLocations, samples);
231-
232-
return new FaceAnalysisDisplay(view.InternalView, data, name, description, unitType);
233+
return new FaceAnalysisDisplay(view.InternalView, surface, sampleLocations, samples, name, description, unitType);
233234
}
234235

235236
#endregion

‎src/Libraries/RevitNodes/AnalysisDisplay/PointAnalysisDisplay.cs‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ public class PointAnalysisDisplay : AbstractAnalysisDisplay
2626
/// Create a Point Analysis Display in the current view
2727
/// </summary>
2828
/// <param name="view"></param>
29-
/// <param name="data"></param>
29+
/// <param name="dataLocations"></param>
30+
/// <param name="values"></param>
3031
/// <param name="resultsName"></param>
3132
/// <param name="description"></param>
3233
/// <param name="unitType"></param>
33-
private PointAnalysisDisplay(Autodesk.Revit.DB.View view, PointData data, string resultsName, string description, Type unitType)
34+
private PointAnalysisDisplay(Autodesk.Revit.DB.View view, IEnumerable<Point> dataLocations, IEnumerable<double> values, string resultsName, string description, Type unitType)
3435
{
3536
SpatialFieldManager sfm;
3637
var primitiveIds = new List<int>();
@@ -57,7 +58,7 @@ private PointAnalysisDisplay(Autodesk.Revit.DB.View view, PointData data, string
5758

5859
InternalSetSpatialFieldManager(sfm);
5960

60-
InternalSetSpatialFieldValues(data, ref primitiveIds, resultsName, description, unitType);
61+
InternalSetSpatialFieldValues(dataLocations, values, ref primitiveIds, resultsName, description, unitType);
6162
InternalSetSpatialPrimitiveIds(primitiveIds);
6263
TransactionManager.Instance.TransactionTaskDone();
6364
SetElementAndPrimitiveIdsForTrace(sfm, primitiveIds);
@@ -70,12 +71,13 @@ private PointAnalysisDisplay(Autodesk.Revit.DB.View view, PointData data, string
7071
/// Set the spatial field values for the current spatial field primitive. The two
7172
/// input sequences should be of the same length.
7273
/// </summary>
73-
/// <param name="data"></param>
74+
/// <param name="dataLocations"></param>
75+
/// <param name="values"></param>
7476
/// <param name="primitiveIds"></param>
7577
/// <param name="schemaName"></param>
7678
/// <param name="description"></param>
7779
/// <param name="unitType"></param>
78-
private void InternalSetSpatialFieldValues(IStructuredData<Point, double> data, ref List<int> primitiveIds, string schemaName, string description, Type unitType)
80+
private void InternalSetSpatialFieldValues(IEnumerable<Point> dataLocations, IEnumerable<double> values, ref List<int> primitiveIds, string schemaName, string description, Type unitType)
7981
{
8082
TransactionManager.Instance.EnsureInTransaction(Document);
8183

@@ -84,13 +86,13 @@ private void InternalSetSpatialFieldValues(IStructuredData<Point, double> data,
8486

8587
var chunkSize = 1000;
8688

87-
var dataLocations = data.ValueLocations.Select(l=>l.ToXyz());
88-
var values = data.Values.ToList();
89+
var dataLocations2 = dataLocations.Select(l=>l.ToXyz());
90+
//var values = data.Values.ToList();
8991

90-
while (dataLocations.Any())
92+
while (dataLocations2.Any())
9193
{
9294
// Compute the chunks
93-
var pointLocationChunk = dataLocations.Take(chunkSize);
95+
var pointLocationChunk = dataLocations2.Take(chunkSize);
9496
var valuesChunk = values.Take(chunkSize).ToList();
9597

9698
// Create the ValueAtPoint objects
@@ -163,8 +165,7 @@ public static PointAnalysisDisplay ByViewPointsAndValues(View view,
163165
description = Properties.Resources.AnalysisResultsDefaultDescription;
164166
}
165167

166-
var data = PointData.ByPointsAndValues(sampleLocations, samples);
167-
return new PointAnalysisDisplay(view.InternalView, data, name, description, unitType);
168+
return new PointAnalysisDisplay(view.InternalView, sampleLocations, samples, name, description, unitType);
168169
}
169170

170171
#endregion

‎src/Libraries/RevitNodes/AnalysisDisplay/VectorAnalysisDisplay.cs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ public class VectorAnalysisDisplay : AbstractAnalysisDisplay
2727
/// Create a Vector Analysis Display in the current view
2828
/// </summary>
2929
/// <param name="view"></param>
30-
/// <param name="data"></param>
30+
/// <param name="locations"></param>
31+
/// <param name="values"></param>
3132
/// <param name="resultsName"></param>
3233
/// <param name="description"></param>
3334
/// <param name="unitType"></param>
34-
private VectorAnalysisDisplay(Autodesk.Revit.DB.View view, VectorData data,
35+
private VectorAnalysisDisplay(Autodesk.Revit.DB.View view,
36+
IEnumerable<Autodesk.DesignScript.Geometry.Point> locations, IEnumerable<Vector> values,
3537
string resultsName, string description, Type unitType)
3638
{
3739
SpatialFieldManager sfm;
@@ -60,7 +62,7 @@ private VectorAnalysisDisplay(Autodesk.Revit.DB.View view, VectorData data,
6062
InternalSetSpatialFieldManager(sfm);
6163

6264
var primitiveId = SpatialFieldManager.AddSpatialFieldPrimitive();
63-
InternalSetSpatialFieldValues(primitiveId, data, resultsName, description, unitType);
65+
InternalSetSpatialFieldValues(primitiveId, locations, values, resultsName, description, unitType);
6466
primitiveIds.Add(primitiveId);
6567
InternalSetSpatialPrimitiveIds(primitiveIds);
6668
TransactionManager.Instance.TransactionTaskDone();
@@ -75,19 +77,20 @@ private VectorAnalysisDisplay(Autodesk.Revit.DB.View view, VectorData data,
7577
/// input sequences should be of the same length.
7678
/// </summary>
7779
/// <param name="primitiveId"></param>
78-
/// <param name="data"></param>
80+
/// <param name="locations"></param>
81+
/// <param name="values"></param>
7982
/// <param name="schemaName"></param>
8083
/// <param name="description"></param>
8184
/// <param name="unitType"></param>
82-
private void InternalSetSpatialFieldValues(int primitiveId, VectorData data, string schemaName, string description, Type unitType)
85+
private void InternalSetSpatialFieldValues(int primitiveId, IEnumerable<Autodesk.DesignScript.Geometry.Point> locations, IEnumerable<Vector> values, string schemaName, string description, Type unitType)
8386
{
84-
var valList = data.Values.Select(v => new VectorAtPoint(new List<XYZ> { v.ToXyz() }));
87+
var valList = values.Select(v => new VectorAtPoint(new List<XYZ> { v.ToXyz() }));
8588
TransactionManager.Instance.EnsureInTransaction(Document);
8689

8790
var sampleValues = new FieldValues(valList.ToList());
8891

8992
// Convert the sample points to a special Revit Type
90-
var samplePts = new FieldDomainPointsByXYZ(data.ValueLocations.Select(p=>p.ToXyz()).ToList());
93+
var samplePts = new FieldDomainPointsByXYZ(locations.Select(p=>p.ToXyz()).ToList());
9194

9295
// Get the analysis results schema
9396
var schemaIndex = GetAnalysisResultSchemaIndex(schemaName, description, unitType);
@@ -147,8 +150,7 @@ public static VectorAnalysisDisplay ByViewPointsAndVectorValues(View view,
147150
description = Properties.Resources.AnalysisResultsDefaultDescription;
148151
}
149152

150-
var data = VectorData.ByPointsAndValues(sampleLocations, samples );
151-
return new VectorAnalysisDisplay(view.InternalView, data, name, description, unitType);
153+
return new VectorAnalysisDisplay(view.InternalView, sampleLocations, samples, name, description, unitType);
152154
}
153155

154156
#endregion

0 commit comments

Comments
 (0)