Compare commits
32 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Claire Kuang
|
2cb7211734 | ||
|
Claire Kuang
|
82c84bee97 | ||
|
Claire Kuang
|
3e6ceb3546 | ||
|
Jedd Morgan
|
2d13849b2c | ||
|
kekesidavid
|
952d95851a | ||
|
Claire Kuang
|
84fc2801ef | ||
|
Claire Kuang
|
07f272f453 | ||
|
Claire Kuang
|
8085065027 | ||
|
Adam Hathcock
|
31e26ca9d0 | ||
|
Adam Hathcock
|
088cbb3b97 | ||
|
Oğuzhan Koral
|
57fd7de027 | ||
|
Claire Kuang
|
85fc828036 | ||
|
Adam Hathcock
|
c288ea0088 | ||
|
Jedd Morgan
|
81924e2027 | ||
|
Jedd Morgan
|
c9b637b92e | ||
|
kekesidavid
|
4779d406b8 | ||
|
Jonathon Broughton
|
a945e35a2a | ||
|
Adam Hathcock
|
e7ee172f90 | ||
|
Adam Hathcock
|
d49b1eea33 | ||
|
Adam Hathcock
|
d8afd74171 | ||
|
Oğuzhan Koral
|
b88f50ced6 | ||
|
Adam Hathcock
|
e130045930 | ||
|
Adam Hathcock
|
ae72cc3adb | ||
|
Claire Kuang
|
816539ce18 | ||
|
Claire Kuang
|
c6cdb0d893 | ||
|
Claire Kuang
|
dd026e24a3 | ||
|
Adam Hathcock
|
76015ed30c | ||
|
Claire Kuang
|
b9fbf60df5 | ||
|
Claire Kuang
|
2f8477e072 | ||
|
Jonathon Broughton
|
973a91ac5a | ||
|
Claire Kuang
|
60a39b775c | ||
|
Jonathon Broughton
|
f84b5e7c90 |
@@ -259,9 +259,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -292,7 +292,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"Microsoft.Extensions.DependencyInjection": {
|
||||
@@ -336,18 +336,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -357,14 +357,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -259,9 +259,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -292,7 +292,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"Microsoft.Extensions.DependencyInjection": {
|
||||
@@ -336,18 +336,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -357,14 +357,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -259,9 +259,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -293,7 +293,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"Microsoft.Extensions.DependencyInjection": {
|
||||
@@ -337,18 +337,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -358,14 +358,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -210,9 +210,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -244,7 +244,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"Microsoft.Extensions.DependencyInjection": {
|
||||
@@ -288,18 +288,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Data.Sqlite": "7.0.5",
|
||||
@@ -307,14 +307,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
},
|
||||
"net8.0-windows7.0/win-x64": {
|
||||
|
||||
@@ -210,9 +210,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -244,7 +244,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"Microsoft.Extensions.DependencyInjection": {
|
||||
@@ -288,18 +288,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Data.Sqlite": "7.0.5",
|
||||
@@ -307,14 +307,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
},
|
||||
"net8.0-windows7.0/win-x64": {
|
||||
|
||||
+12
-21
@@ -60,7 +60,7 @@ public abstract class AutocadRootObjectBaseBuilder : IRootObjectBuilder<AutocadR
|
||||
)]
|
||||
public Task<RootObjectBuilderResult> Build(
|
||||
IReadOnlyList<AutocadRootObject> objects,
|
||||
SendInfo sendInfo,
|
||||
string projectId,
|
||||
IProgress<CardProgress> onOperationProgressed,
|
||||
CancellationToken cancellationToken
|
||||
)
|
||||
@@ -95,28 +95,19 @@ public abstract class AutocadRootObjectBaseBuilder : IRootObjectBuilder<AutocadR
|
||||
foreach (var (entity, applicationId) in atomicObjects)
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
using (var convertActivity = _activityFactory.Start("Converting object"))
|
||||
// Create and add a collection for this entity if not done so already.
|
||||
(Collection objectCollection, LayerTableRecord? autocadLayer) = CreateObjectCollection(entity, tr);
|
||||
|
||||
if (autocadLayer is not null)
|
||||
{
|
||||
// Create and add a collection for this entity if not done so already.
|
||||
(Collection objectCollection, LayerTableRecord? autocadLayer) = CreateObjectCollection(entity, tr);
|
||||
|
||||
if (autocadLayer is not null)
|
||||
{
|
||||
usedAcadLayers.Add(autocadLayer);
|
||||
root.elements.Add(objectCollection);
|
||||
}
|
||||
|
||||
var result = ConvertAutocadEntity(
|
||||
entity,
|
||||
applicationId,
|
||||
objectCollection,
|
||||
instanceProxies,
|
||||
sendInfo.ProjectId
|
||||
);
|
||||
results.Add(result);
|
||||
|
||||
onOperationProgressed.Report(new("Converting", (double)++count / atomicObjects.Count));
|
||||
usedAcadLayers.Add(autocadLayer);
|
||||
root.elements.Add(objectCollection);
|
||||
}
|
||||
|
||||
var result = ConvertAutocadEntity(entity, applicationId, objectCollection, instanceProxies, projectId);
|
||||
results.Add(result);
|
||||
|
||||
onOperationProgressed.Report(new("Converting", (double)++count / atomicObjects.Count));
|
||||
}
|
||||
|
||||
if (results.All(x => x.Status == Status.ERROR))
|
||||
|
||||
@@ -268,9 +268,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -302,7 +302,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"Microsoft.Extensions.DependencyInjection": {
|
||||
@@ -346,18 +346,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -367,14 +367,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -268,9 +268,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -302,7 +302,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"Microsoft.Extensions.DependencyInjection": {
|
||||
@@ -346,18 +346,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -367,14 +367,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -268,9 +268,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -302,7 +302,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"Microsoft.Extensions.DependencyInjection": {
|
||||
@@ -346,18 +346,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -367,14 +367,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -219,9 +219,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -254,7 +254,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"Microsoft.Extensions.DependencyInjection": {
|
||||
@@ -298,18 +298,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Data.Sqlite": "7.0.5",
|
||||
@@ -317,14 +317,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
},
|
||||
"net8.0-windows7.0/win-x64": {
|
||||
|
||||
@@ -219,9 +219,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -254,7 +254,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"Microsoft.Extensions.DependencyInjection": {
|
||||
@@ -298,18 +298,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Data.Sqlite": "7.0.5",
|
||||
@@ -317,14 +317,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
},
|
||||
"net8.0-windows7.0/win-x64": {
|
||||
|
||||
@@ -70,7 +70,7 @@ public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
|
||||
/// </remarks>
|
||||
public async Task<RootObjectBuilderResult> Build(
|
||||
IReadOnlyList<ICsiWrapper> csiObjects,
|
||||
SendInfo sendInfo,
|
||||
string projectId,
|
||||
IProgress<CardProgress> onOperationProgressed,
|
||||
CancellationToken cancellationToken
|
||||
)
|
||||
@@ -89,8 +89,6 @@ public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
|
||||
foreach (ICsiWrapper csiObject in csiObjects)
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
using var _2 = _activityFactory.Start("Convert");
|
||||
|
||||
var result = ConvertCsiObject(csiObject, rootObjectCollection);
|
||||
results.Add(result);
|
||||
|
||||
|
||||
@@ -259,9 +259,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -285,7 +285,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.etabs21": {
|
||||
@@ -335,18 +335,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -356,14 +356,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -210,9 +210,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -236,7 +236,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.etabs22": {
|
||||
@@ -286,18 +286,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Data.Sqlite": "7.0.5",
|
||||
@@ -305,14 +305,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -259,9 +259,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -285,7 +285,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.navisworks2020": {
|
||||
@@ -337,18 +337,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -358,14 +358,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
},
|
||||
".NETFramework,Version=v4.8/win-x64": {
|
||||
|
||||
@@ -259,9 +259,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -285,7 +285,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.navisworks2021": {
|
||||
@@ -337,18 +337,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -358,14 +358,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
},
|
||||
".NETFramework,Version=v4.8/win-x64": {
|
||||
|
||||
@@ -259,9 +259,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -285,7 +285,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.navisworks2022": {
|
||||
@@ -337,18 +337,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -358,14 +358,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
},
|
||||
".NETFramework,Version=v4.8/win-x64": {
|
||||
|
||||
@@ -259,9 +259,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -285,7 +285,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.navisworks2023": {
|
||||
@@ -337,18 +337,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -358,14 +358,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
},
|
||||
".NETFramework,Version=v4.8/win-x64": {
|
||||
|
||||
@@ -259,9 +259,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -285,7 +285,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.navisworks2024": {
|
||||
@@ -337,18 +337,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -358,14 +358,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
},
|
||||
".NETFramework,Version=v4.8/win-x64": {
|
||||
|
||||
@@ -265,9 +265,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -291,7 +291,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.navisworks2025": {
|
||||
@@ -337,18 +337,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -358,14 +358,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
},
|
||||
".NETFramework,Version=v4.8/win-x64": {
|
||||
|
||||
@@ -266,9 +266,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -292,7 +292,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.navisworks2026": {
|
||||
@@ -339,18 +339,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -360,14 +360,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
},
|
||||
".NETFramework,Version=v4.8/win-x64": {
|
||||
|
||||
+13
-13
@@ -151,22 +151,22 @@ public class NavisworksSavedViewsFilter : DiscriminatedObject, ISendFilterSelect
|
||||
|
||||
foreach (NAV.SavedItem item in ((NAV.GroupItem)parentItem).Children)
|
||||
{
|
||||
switch (item.IsGroup)
|
||||
switch (item)
|
||||
{
|
||||
// THIS IS COMMENTED OUT AS IT IS LEGACY DEFENSIVE BEHAVIOUR - DISCUSSION REQUIRED
|
||||
// case false when item is NAV.SavedViewpoint { ContainsVisibilityOverrides: false }:
|
||||
// // If the saved view does not contain visibility overrides, this is effectively everything in the model.
|
||||
// // This will need to be the documented behaviour.
|
||||
// break;
|
||||
case false:
|
||||
collectedSets.Add((NAV.SavedViewpoint)item);
|
||||
// case NAV.SavedViewpoint { ContainsVisibilityOverrides: false }:
|
||||
// Legacy defensive behaviour: skip viewpoints without visibility overrides.
|
||||
// Essentially, send everything, or whatever the current view state for hidden elements is.
|
||||
// break;
|
||||
case NAV.SavedViewpointAnimationCut:
|
||||
// Skip animation cuts.
|
||||
break;
|
||||
default: // handles item.IsGroup == true
|
||||
if (((NAV.GroupItem)item).Children.Count > 0) // Don't add empty groups
|
||||
{
|
||||
CollectSavedViews(item, collectedSets);
|
||||
}
|
||||
case NAV.SavedViewpoint savedViewpoint:
|
||||
collectedSets.Add(savedViewpoint);
|
||||
break;
|
||||
case NAV.GroupItem groupItem when groupItem.Children.Count > 0:
|
||||
CollectSavedViews(groupItem, collectedSets);
|
||||
break;
|
||||
// No action for empty groups or unknown types.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+12
-19
@@ -32,18 +32,9 @@ public class NavisworksRootObjectBuilder(
|
||||
|
||||
internal NavisworksConversionSettings GetCurrentSettings() => converterSettings.Current;
|
||||
|
||||
/// <summary>
|
||||
/// Asynchronously builds a Speckle object hierarchy from Navisworks model items.
|
||||
/// </summary>
|
||||
/// <param name="navisworksModelItems">The list of Navisworks items to convert.</param>
|
||||
/// <param name="sendInfo">Information about the send operation.</param>
|
||||
/// <param name="onOperationProgressed">Progress reporting callback.</param>
|
||||
/// <param name="cancellationToken">Token to cancel the operation.</param>
|
||||
/// <returns>A result containing the root collection and conversion results.</returns>
|
||||
/// <exception cref="SpeckleException">Thrown when no objects can be converted.</exception>
|
||||
public async Task<RootObjectBuilderResult> Build(
|
||||
IReadOnlyList<NAV.ModelItem> navisworksModelItems,
|
||||
SendInfo sendInfo,
|
||||
string projectId,
|
||||
IProgress<CardProgress> onOperationProgressed,
|
||||
CancellationToken cancellationToken
|
||||
)
|
||||
@@ -54,7 +45,7 @@ public class NavisworksRootObjectBuilder(
|
||||
#endif
|
||||
using var activity = activityFactory.Start("Build");
|
||||
|
||||
ValidateInputs(navisworksModelItems, sendInfo, onOperationProgressed);
|
||||
ValidateInputs(navisworksModelItems, projectId, onOperationProgressed);
|
||||
|
||||
// 2. Initialize root collection
|
||||
var rootCollection = InitializeRootCollection();
|
||||
@@ -62,7 +53,7 @@ public class NavisworksRootObjectBuilder(
|
||||
// 3. Convert all model items and store results
|
||||
var (convertedElements, conversionResults) = await ConvertModelItemsAsync(
|
||||
navisworksModelItems,
|
||||
sendInfo,
|
||||
projectId,
|
||||
onOperationProgressed,
|
||||
cancellationToken
|
||||
);
|
||||
@@ -80,7 +71,7 @@ public class NavisworksRootObjectBuilder(
|
||||
|
||||
private static void ValidateInputs(
|
||||
IReadOnlyList<NAV.ModelItem> navisworksModelItems,
|
||||
SendInfo sendInfo,
|
||||
string projectId,
|
||||
IProgress<CardProgress> onOperationProgressed
|
||||
)
|
||||
{
|
||||
@@ -94,9 +85,11 @@ public class NavisworksRootObjectBuilder(
|
||||
throw new ArgumentNullException(nameof(navisworksModelItems));
|
||||
}
|
||||
|
||||
if (onOperationProgressed == null || sendInfo == null)
|
||||
if (onOperationProgressed == null || projectId == null)
|
||||
{
|
||||
throw new ArgumentNullException(onOperationProgressed == null ? nameof(onOperationProgressed) : nameof(sendInfo));
|
||||
throw new ArgumentNullException(
|
||||
onOperationProgressed == null ? nameof(onOperationProgressed) : nameof(projectId)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -109,7 +102,7 @@ public class NavisworksRootObjectBuilder(
|
||||
|
||||
private Task<(Dictionary<string, Base?> converted, List<SendConversionResult> results)> ConvertModelItemsAsync(
|
||||
IReadOnlyList<NAV.ModelItem> navisworksModelItems,
|
||||
SendInfo sendInfo,
|
||||
string projectId,
|
||||
IProgress<CardProgress> onOperationProgressed,
|
||||
CancellationToken cancellationToken
|
||||
)
|
||||
@@ -122,7 +115,7 @@ public class NavisworksRootObjectBuilder(
|
||||
foreach (var item in navisworksModelItems)
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
var converted = ConvertNavisworksItem(item, convertedBases, sendInfo);
|
||||
var converted = ConvertNavisworksItem(item, convertedBases, projectId);
|
||||
results.Add(converted);
|
||||
processedCount++;
|
||||
onOperationProgressed.Report(new CardProgress("Converting", (double)processedCount / totalCount));
|
||||
@@ -310,7 +303,7 @@ public class NavisworksRootObjectBuilder(
|
||||
private SendConversionResult ConvertNavisworksItem(
|
||||
NAV.ModelItem navisworksItem,
|
||||
Dictionary<string, Base?> convertedBases,
|
||||
SendInfo sendInfo
|
||||
string projectId
|
||||
)
|
||||
{
|
||||
string applicationId = elementSelectionService.GetModelItemPath(navisworksItem);
|
||||
@@ -318,7 +311,7 @@ public class NavisworksRootObjectBuilder(
|
||||
|
||||
try
|
||||
{
|
||||
Base converted = sendConversionCache.TryGetValue(applicationId, sendInfo.ProjectId, out ObjectReference? cached)
|
||||
Base converted = sendConversionCache.TryGetValue(applicationId, projectId, out ObjectReference? cached)
|
||||
? cached
|
||||
: rootToSpeckleConverter.Convert(navisworksItem);
|
||||
|
||||
|
||||
+10
-14
@@ -63,23 +63,19 @@ public class ToSpeckleSettingsManagerNavisworks : IToSpeckleSettingsManagerNavis
|
||||
throw new ArgumentNullException(nameof(modelCard));
|
||||
}
|
||||
|
||||
var originString = modelCard.Settings?.First(s => s.Id == "originMode").Value as string;
|
||||
|
||||
if (originString is not null && OriginModeSetting.OriginModeMap.TryGetValue(originString, out OriginMode origin))
|
||||
var originString = modelCard.Settings?.FirstOrDefault(s => s.Id == "originMode")?.Value as string;
|
||||
if (!OriginModeSetting.OriginModeMap.TryGetValue(originString ?? string.Empty, out var origin))
|
||||
{
|
||||
if (_originModeCache.TryGetValue(modelCard.ModelCardId.NotNull(), out OriginMode previousType))
|
||||
{
|
||||
if (previousType != origin)
|
||||
{
|
||||
EvictCacheForModelCard(modelCard);
|
||||
}
|
||||
}
|
||||
|
||||
_originModeCache[modelCard.ModelCardId.NotNull()] = origin;
|
||||
return origin;
|
||||
return OriginMode.ModelOrigin; // Default to ModelOrigin if not specified or invalid
|
||||
}
|
||||
|
||||
throw new ArgumentException($"Invalid origin mode value: {originString}");
|
||||
if (_originModeCache.TryGetValue(modelCard.ModelCardId.NotNull(), out var previousType) && previousType != origin)
|
||||
{
|
||||
EvictCacheForModelCard(modelCard);
|
||||
}
|
||||
|
||||
_originModeCache[modelCard.ModelCardId.NotNull()] = origin;
|
||||
return origin;
|
||||
}
|
||||
|
||||
public bool GetConvertHiddenElements(SenderModelCard modelCard)
|
||||
|
||||
@@ -281,9 +281,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -306,7 +306,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.revit2022": {
|
||||
@@ -351,11 +351,11 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Revit.API": {
|
||||
@@ -366,9 +366,9 @@
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -378,14 +378,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -281,9 +281,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -306,7 +306,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.revit2023": {
|
||||
@@ -351,11 +351,11 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Revit.API": {
|
||||
@@ -366,9 +366,9 @@
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -378,14 +378,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -281,9 +281,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -306,7 +306,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.revit2024": {
|
||||
@@ -351,11 +351,11 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Revit.API": {
|
||||
@@ -366,9 +366,9 @@
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -378,14 +378,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -226,9 +226,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -251,7 +251,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.revit2025": {
|
||||
@@ -296,11 +296,11 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Revit.API": {
|
||||
@@ -311,9 +311,9 @@
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Data.Sqlite": "7.0.5",
|
||||
@@ -321,14 +321,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
},
|
||||
"net8.0-windows7.0/win-x64": {
|
||||
|
||||
@@ -219,9 +219,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.dui": {
|
||||
@@ -244,7 +244,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.revit2026": {
|
||||
@@ -280,11 +280,11 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Revit.API": {
|
||||
@@ -295,9 +295,9 @@
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Data.Sqlite": "7.0.5",
|
||||
@@ -305,14 +305,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
},
|
||||
"net8.0-windows7.0/win-x64": {
|
||||
|
||||
+4
-7
@@ -33,17 +33,17 @@ public class RevitRootObjectBuilder(
|
||||
{
|
||||
public Task<RootObjectBuilderResult> Build(
|
||||
IReadOnlyList<DocumentToConvert> documentElementContexts,
|
||||
SendInfo sendInfo,
|
||||
string projectId,
|
||||
IProgress<CardProgress> onOperationProgressed,
|
||||
CancellationToken ct = default
|
||||
) =>
|
||||
threadContext.RunOnMainAsync(
|
||||
() => Task.FromResult(BuildSync(documentElementContexts, sendInfo, onOperationProgressed, ct))
|
||||
() => Task.FromResult(BuildSync(documentElementContexts, projectId, onOperationProgressed, ct))
|
||||
);
|
||||
|
||||
private RootObjectBuilderResult BuildSync(
|
||||
IReadOnlyList<DocumentToConvert> documentElementContexts,
|
||||
SendInfo sendInfo,
|
||||
string projectId,
|
||||
IProgress<CardProgress> onOperationProgressed,
|
||||
CancellationToken cancellationToken
|
||||
)
|
||||
@@ -183,10 +183,7 @@ public class RevitRootObjectBuilder(
|
||||
// non-transformed elements can safely rely on cache
|
||||
// TODO: Potential here to transform cached objects and NOT reconvert,
|
||||
// TODO: we wont do !hasTransform here, and re-set application id before this
|
||||
if (
|
||||
!hasTransform
|
||||
&& sendConversionCache.TryGetValue(sendInfo.ProjectId, applicationId, out ObjectReference? value)
|
||||
)
|
||||
if (!hasTransform && sendConversionCache.TryGetValue(projectId, applicationId, out ObjectReference? value))
|
||||
{
|
||||
converted = value;
|
||||
cacheHitCount++;
|
||||
|
||||
+3
-3
@@ -37,9 +37,9 @@
|
||||
<Compile Include="$(MSBuildThisFileDirectory)HostApp\SendCollectionManager.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)HostApp\ElementUnpacker.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\ITransactionManager.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)operations\receive\ReferencePointSetting.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\ReferencePointSetting.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\RevitHostObjectBuilder.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)operations\receive\ToHostSettingsManager.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\ToHostSettingsManager.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\TransactionManager.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Filters\IRevitSendFilter.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Filters\RevitCategoriesFilter.cs" />
|
||||
@@ -61,4 +61,4 @@
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitCefPlugin.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Plugin\SpeckleRevitTaskException.cs" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
</ItemGroup>
|
||||
<Target AfterTargets="Build" Name="WarnIfPublicReleaseVersionInstalled" Condition="'$(RhinoVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true' And '$(OS)' == 'Windows_NT'">
|
||||
<Warning
|
||||
Text="Conflicting Rhino plugin detected - Do you have a public release installed?"
|
||||
Text="Conflicting Rhino plugin detected - Do you have a public release installed? at '@(PublicReleasePath)'"
|
||||
Condition="Exists(@(PublicReleasePath))" />
|
||||
</Target>
|
||||
|
||||
|
||||
@@ -325,9 +325,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.logging": {
|
||||
@@ -337,7 +337,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.rhino7": {
|
||||
@@ -382,18 +382,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -403,14 +403,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -325,9 +325,9 @@
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
|
||||
"Speckle.Connectors.Logging": "[1.0.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )",
|
||||
"Speckle.Sdk": "[3.4.4, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )",
|
||||
"Speckle.Sdk": "[3.4.6, )",
|
||||
"Speckle.Sdk.Dependencies": "[3.4.8, )"
|
||||
}
|
||||
},
|
||||
"speckle.connectors.logging": {
|
||||
@@ -337,7 +337,7 @@
|
||||
"type": "Project",
|
||||
"dependencies": {
|
||||
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
|
||||
"Speckle.Objects": "[3.4.4, )"
|
||||
"Speckle.Objects": "[3.4.6, )"
|
||||
}
|
||||
},
|
||||
"speckle.converters.rhino8": {
|
||||
@@ -382,18 +382,18 @@
|
||||
},
|
||||
"Speckle.Objects": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "zLYhOAPKdaFYN+YOjDDKyXK/9WMvv+EB2bmemdIf+xU8SzKeXOLMqf+Zo2pokkc1Wjc7ZmggphBbmSBkHmS9Dw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "JjCdW+gUWq7u1Tb5SlLaFCIYfmrMA9HbUzCdlSPDzyJkPuJFhwK3qKDwe4ggrAs7DuNuBhqL/VKCr/J29Wh2ng==",
|
||||
"dependencies": {
|
||||
"Speckle.Sdk": "3.4.4"
|
||||
"Speckle.Sdk": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "tzQR3tcTFGzzu2R1EQbG2JM+Us57JGFm+tH9wScSrDQE1X5XRjJfaxf1st09D26Ale2B+pVst/AVxr9OlLs1Kw==",
|
||||
"requested": "[3.4.6, )",
|
||||
"resolved": "3.4.6",
|
||||
"contentHash": "YBa/RuwvBbymjWGv7sD2TwMSLhSjz3GYPOGVJtZzBZvev/zDQNZozvIlre+Lk7xpT2KPdH1FRfLkPWyW+qonMA==",
|
||||
"dependencies": {
|
||||
"GraphQL.Client": "6.0.0",
|
||||
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
|
||||
@@ -403,14 +403,14 @@
|
||||
"Microsoft.Extensions.Logging": "2.2.0",
|
||||
"Speckle.DoubleNumerics": "4.1.0",
|
||||
"Speckle.Newtonsoft.Json": "13.0.2",
|
||||
"Speckle.Sdk.Dependencies": "3.4.4"
|
||||
"Speckle.Sdk.Dependencies": "3.4.6"
|
||||
}
|
||||
},
|
||||
"Speckle.Sdk.Dependencies": {
|
||||
"type": "CentralTransitive",
|
||||
"requested": "[3.4.4, )",
|
||||
"resolved": "3.4.4",
|
||||
"contentHash": "c5fRdts5l/xS842CjhxOCOvrCq7tZ6eO3x2SB1GRECBzpQ9Y9I2Yn4FXOrgznFSb5HFur+ReJsZZH7Ml8pW/iQ=="
|
||||
"requested": "[3.4.8, )",
|
||||
"resolved": "3.4.8",
|
||||
"contentHash": "bNpJc2NBvjtJmdYS3xb6Fv4eqI/xZ2URXfWeXUFaWPMfC1QXLTjlK6iFriQk9ptLwr/dt4UPDPYYHOBynY1f2A=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+12
-3
@@ -158,10 +158,19 @@ public class CreateCollection : VariableParameterComponentBase
|
||||
{
|
||||
foreach (var obj in objects)
|
||||
{
|
||||
// deep copy to avoid mutations
|
||||
if (obj?.ToSpeckleObjectWrapper() is SpeckleObjectWrapper objWrapper)
|
||||
// handle data objects directly (deep copy to avoid mutations)
|
||||
// NOTE: DataObject first, since a DataObject with one geo is castable to speckle geometry
|
||||
if (obj is SpeckleDataObjectWrapperGoo dataObjectWrapperGoo)
|
||||
{
|
||||
SpeckleObjectWrapper wrapper = objWrapper.DeepCopy();
|
||||
var dataObjectWrapper = dataObjectWrapperGoo.Value.DeepCopy();
|
||||
dataObjectWrapper.Path = childPath;
|
||||
dataObjectWrapper.Parent = parentCollection;
|
||||
parentCollection.Elements.Add(dataObjectWrapper);
|
||||
}
|
||||
// handle geometry objects (deep copy to avoid mutations)
|
||||
else if (obj?.ToSpeckleGeometryWrapper() is SpeckleGeometryWrapper objWrapper)
|
||||
{
|
||||
SpeckleGeometryWrapper wrapper = objWrapper.DeepCopy();
|
||||
wrapper.Path = childPath;
|
||||
wrapper.Parent = parentCollection;
|
||||
parentCollection.Elements.Add(wrapper);
|
||||
|
||||
+4
-7
@@ -55,8 +55,8 @@ public class ExpandCollection : GH_Component, IGH_VariableParameterComponent
|
||||
// Separate objects and collections
|
||||
// Note: SpeckleBlockInstanceWrapper inherits from SpeckleObjectWrapper,
|
||||
// so it will be included in objects
|
||||
var objects = wrapper.Elements.OfType<SpeckleObjectWrapper>().ToList();
|
||||
var collections = wrapper.Elements.OfType<SpeckleCollectionWrapper>().ToList();
|
||||
List<SpeckleWrapper> objects = wrapper.GetAtomicObjects().ToList();
|
||||
List<SpeckleCollectionWrapper> collections = wrapper.Elements.OfType<SpeckleCollectionWrapper>().ToList();
|
||||
|
||||
var outputParams = new List<OutputParamWrapper>();
|
||||
if (objects.Count != 0)
|
||||
@@ -66,7 +66,7 @@ public class ExpandCollection : GH_Component, IGH_VariableParameterComponent
|
||||
Name = "_objects",
|
||||
NickName = "_objs",
|
||||
Description =
|
||||
"Some collections may contain a mix of objects and other collections. Here we output the atomic objects from within this collection.",
|
||||
"Some collections may contain a mix of objects and other collections. These are the objects directly contained in this collection.",
|
||||
Access = GH_ParamAccess.list
|
||||
};
|
||||
|
||||
@@ -113,10 +113,7 @@ public class ExpandCollection : GH_Component, IGH_VariableParameterComponent
|
||||
else
|
||||
{
|
||||
// Create appropriate Goo types for child objects
|
||||
List<IGH_Goo> childObjectGoos = childWrapper
|
||||
.Elements.OfType<SpeckleObjectWrapper>()
|
||||
.Select(obj => obj.CreateGoo())
|
||||
.ToList();
|
||||
List<IGH_Goo> childObjectGoos = childWrapper.GetAtomicObjects().Select(obj => obj.CreateGoo()).ToList();
|
||||
outputValue = childObjectGoos;
|
||||
}
|
||||
|
||||
|
||||
@@ -8,8 +8,8 @@ public static class ComponentCategories
|
||||
|
||||
// categories
|
||||
public const string OPERATIONS = " Models";
|
||||
public const string OBJECTS = " Objects";
|
||||
public const string COLLECTIONS = " Collections";
|
||||
public const string OBJECTS = " Objects";
|
||||
public const string COLLECTIONS = " Collections";
|
||||
public const string PARAMETERS = " Params";
|
||||
public const string DEVELOPER = "Dev";
|
||||
}
|
||||
|
||||
+39
-14
@@ -49,7 +49,12 @@ public class DeconstructSpeckleParam : GH_Component, IGH_VariableParameterCompon
|
||||
List<IGH_Goo> children = collectionGoo.Value.Elements.Select(o => ((SpeckleWrapper)o).CreateGoo()).ToList();
|
||||
outputParams = ParseSpeckleWrapper(collectionGoo.Value, children);
|
||||
break;
|
||||
case SpeckleObjectWrapperGoo objectGoo when objectGoo.Value != null:
|
||||
case SpeckleDataObjectWrapperGoo dataObjectGoo when dataObjectGoo.Value != null:
|
||||
// get geometries from the wrapper to override the displayvalue prop while parsing
|
||||
List<IGH_Goo> display = dataObjectGoo.Value.Geometries.Select(o => o.CreateGoo()).ToList();
|
||||
outputParams = ParseSpeckleWrapper(dataObjectGoo.Value, null, display);
|
||||
break;
|
||||
case SpeckleGeometryWrapperGoo objectGoo when objectGoo.Value != null:
|
||||
outputParams = ParseSpeckleWrapper(objectGoo.Value);
|
||||
break;
|
||||
case SpeckleBlockInstanceWrapperGoo blockInstanceGoo when blockInstanceGoo.Value != null:
|
||||
@@ -73,7 +78,12 @@ public class DeconstructSpeckleParam : GH_Component, IGH_VariableParameterCompon
|
||||
: value is SpecklePropertyGroupGoo propGroup
|
||||
? propGroup
|
||||
: value;
|
||||
outputParams.Add(CreateOutputParamByKeyValue(key, outputValue, GH_ParamAccess.item));
|
||||
|
||||
OutputParamWrapper output =
|
||||
outputValue is IList
|
||||
? CreateOutputParamByKeyValue(key, outputValue, GH_ParamAccess.list)
|
||||
: CreateOutputParamByKeyValue(key, outputValue, GH_ParamAccess.item);
|
||||
outputParams.Add(output);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -114,13 +124,21 @@ public class DeconstructSpeckleParam : GH_Component, IGH_VariableParameterCompon
|
||||
}
|
||||
}
|
||||
|
||||
private List<OutputParamWrapper> ParseSpeckleWrapper(SpeckleWrapper wrapper, List<IGH_Goo>? collElements = null)
|
||||
private List<OutputParamWrapper> ParseSpeckleWrapper(
|
||||
SpeckleWrapper wrapper,
|
||||
List<IGH_Goo>? elements = null,
|
||||
List<IGH_Goo>? displayValue = null
|
||||
)
|
||||
{
|
||||
Name = string.IsNullOrEmpty(wrapper.Name) ? wrapper.Base.speckle_type : wrapper.Name;
|
||||
return CreateOutputParamsFromBase(wrapper.Base, collElements);
|
||||
return CreateOutputParamsFromBase(wrapper.Base, elements, displayValue);
|
||||
}
|
||||
|
||||
private List<OutputParamWrapper> CreateOutputParamsFromBase(Base @base, List<IGH_Goo>? collElements = null)
|
||||
private List<OutputParamWrapper> CreateOutputParamsFromBase(
|
||||
Base @base,
|
||||
List<IGH_Goo>? elements = null,
|
||||
List<IGH_Goo>? displayValue = null
|
||||
)
|
||||
{
|
||||
List<OutputParamWrapper> result = new();
|
||||
if (@base == null)
|
||||
@@ -143,9 +161,15 @@ public class DeconstructSpeckleParam : GH_Component, IGH_VariableParameterCompon
|
||||
List<object> nativeObjects = new();
|
||||
|
||||
// override list value if base is a collection and this is the elements prop, since this is empty if coming from a collectionwrapper
|
||||
if (@base is Collection && prop.Key == "elements" && collElements != null)
|
||||
if (@base is Collection && prop.Key == "elements" && elements != null)
|
||||
{
|
||||
list = collElements;
|
||||
list = elements;
|
||||
}
|
||||
|
||||
// override list value if base is a dataobject and this is the displayvalue prop, since this is empty if coming from a dataobject wrapper
|
||||
if (@base is Speckle.Objects.Data.DataObject && prop.Key == "displayValue" && displayValue != null)
|
||||
{
|
||||
list = displayValue;
|
||||
}
|
||||
|
||||
foreach (var x in list)
|
||||
@@ -198,16 +222,17 @@ public class DeconstructSpeckleParam : GH_Component, IGH_VariableParameterCompon
|
||||
return result;
|
||||
}
|
||||
|
||||
private List<SpeckleObjectWrapperGoo> ConvertOrCreateWrapper(Base @base)
|
||||
private List<SpeckleGeometryWrapperGoo> ConvertOrCreateWrapper(Base @base)
|
||||
{
|
||||
try
|
||||
{
|
||||
// convert the base and create a wrapper for each result
|
||||
List<(GeometryBase, Base)> convertedBase = SpeckleConversionContext.ConvertToHost(@base);
|
||||
List<SpeckleObjectWrapperGoo> convertedWrappers = new();
|
||||
foreach ((GeometryBase g, Base b) in convertedBase)
|
||||
List<(object, Base)> convertedBase = SpeckleConversionContext.Current.ConvertToHost(@base);
|
||||
List<SpeckleGeometryWrapperGoo> convertedWrappers = new();
|
||||
foreach ((object o, Base b) in convertedBase)
|
||||
{
|
||||
SpeckleObjectWrapper convertedWrapper =
|
||||
GeometryBase? g = o as GeometryBase;
|
||||
SpeckleGeometryWrapper convertedWrapper =
|
||||
new()
|
||||
{
|
||||
Base = b,
|
||||
@@ -226,7 +251,7 @@ public class DeconstructSpeckleParam : GH_Component, IGH_VariableParameterCompon
|
||||
{
|
||||
// some classes, like RawEncoding, have no direct conversion or fallback value.
|
||||
// when this is the case, wrap it to allow users to further expand the object.
|
||||
SpeckleObjectWrapper convertedWrapper =
|
||||
SpeckleGeometryWrapper convertedWrapper =
|
||||
new()
|
||||
{
|
||||
Base = @base,
|
||||
@@ -236,7 +261,7 @@ public class DeconstructSpeckleParam : GH_Component, IGH_VariableParameterCompon
|
||||
Material = null
|
||||
};
|
||||
|
||||
return new() { new SpeckleObjectWrapperGoo(convertedWrapper) };
|
||||
return new() { new SpeckleGeometryWrapperGoo(convertedWrapper) };
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+25
-2
@@ -17,7 +17,7 @@ public class CreateSpeckleProperties : VariableParameterComponentBase
|
||||
|
||||
public override Guid ComponentGuid => GetType().GUID;
|
||||
protected override Bitmap Icon => Resources.speckle_properties_create;
|
||||
public override GH_Exposure Exposure => GH_Exposure.tertiary;
|
||||
public override GH_Exposure Exposure => GH_Exposure.quarternary;
|
||||
|
||||
public CreateSpeckleProperties()
|
||||
: base(
|
||||
@@ -73,7 +73,10 @@ public class CreateSpeckleProperties : VariableParameterComponentBase
|
||||
continue;
|
||||
}
|
||||
|
||||
var propertyValue = ExtractPropertyValue(da, i, paramName);
|
||||
ISpecklePropertyGoo? propertyValue =
|
||||
Params.Input[i].Access == GH_ParamAccess.item
|
||||
? ExtractPropertyValue(da, i, paramName)
|
||||
: ExtractPropertyListValue(da, i, paramName);
|
||||
|
||||
if (propertyValue != null)
|
||||
{
|
||||
@@ -114,6 +117,26 @@ public class CreateSpeckleProperties : VariableParameterComponentBase
|
||||
return propertyGoo;
|
||||
}
|
||||
|
||||
private ISpecklePropertyGoo? ExtractPropertyListValue(IGH_DataAccess da, int index, string paramName)
|
||||
{
|
||||
List<object?> value = new();
|
||||
da.GetDataList(index, value);
|
||||
|
||||
var propertyGoo = new SpecklePropertyGoo();
|
||||
|
||||
if (!propertyGoo.CastFrom(value))
|
||||
{
|
||||
AddRuntimeMessage(
|
||||
GH_RuntimeMessageLevel.Error,
|
||||
$"Parameter '{paramName}' contains invalid data type. Only strings, numbers, and booleans are supported."
|
||||
);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
return propertyGoo;
|
||||
}
|
||||
|
||||
protected override void AppendComponentSpecificMenuItems(ToolStripDropDown menu)
|
||||
{
|
||||
Menu_AppendSeparator(menu);
|
||||
|
||||
+23
-11
@@ -85,7 +85,7 @@ public class FilterSpeckleObjects : GH_Component
|
||||
return;
|
||||
}
|
||||
|
||||
List<SpeckleObjectWrapper?> objects = inputObjects
|
||||
List<SpeckleWrapper?> objects = inputObjects
|
||||
.Select(o => o.ToSpeckleObjectWrapper())
|
||||
.Where(o => o is not null)
|
||||
.ToList();
|
||||
@@ -108,11 +108,11 @@ public class FilterSpeckleObjects : GH_Component
|
||||
string speckleId = "";
|
||||
dataAccess.GetData(5, ref speckleId);
|
||||
|
||||
List<SpeckleObjectWrapper> matchedObjects = new();
|
||||
List<SpeckleObjectWrapper> removedObjects = new();
|
||||
List<SpeckleWrapper> matchedObjects = new();
|
||||
List<SpeckleWrapper> removedObjects = new();
|
||||
for (int i = 0; i < objects.Count; i++)
|
||||
{
|
||||
SpeckleObjectWrapper wrapper = objects[i]!;
|
||||
SpeckleWrapper wrapper = objects[i]!;
|
||||
|
||||
// filter by name
|
||||
if (!MatchesSearchPattern(name, wrapper.Name))
|
||||
@@ -129,12 +129,21 @@ public class FilterSpeckleObjects : GH_Component
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (string key in wrapper.Properties.Value.Keys)
|
||||
SpecklePropertyGroupGoo? properties = wrapper is SpeckleDataObjectWrapper dataObjPropWrapper
|
||||
? dataObjPropWrapper.Properties
|
||||
: wrapper is SpeckleGeometryWrapper geoPropWrapper
|
||||
? geoPropWrapper.Properties
|
||||
: null;
|
||||
|
||||
if (properties is not null)
|
||||
{
|
||||
if (MatchesSearchPattern(property, key))
|
||||
foreach (string key in properties.Value.Keys)
|
||||
{
|
||||
foundProperty = true;
|
||||
break;
|
||||
if (MatchesSearchPattern(property, key))
|
||||
{
|
||||
foundProperty = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -146,10 +155,13 @@ public class FilterSpeckleObjects : GH_Component
|
||||
}
|
||||
|
||||
// filter by material name
|
||||
if (!MatchesSearchPattern(material, wrapper.Material?.Name ?? ""))
|
||||
if (wrapper is SpeckleGeometryWrapper geoWrapper)
|
||||
{
|
||||
removedObjects.Add(wrapper);
|
||||
continue;
|
||||
if (!MatchesSearchPattern(material, geoWrapper.Material?.Name ?? ""))
|
||||
{
|
||||
removedObjects.Add(wrapper);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
// filter by application id
|
||||
|
||||
-179
@@ -1,179 +0,0 @@
|
||||
using System.Runtime.InteropServices;
|
||||
using Grasshopper.Kernel;
|
||||
using Grasshopper.Kernel.Parameters;
|
||||
using Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
using Speckle.Connectors.GrasshopperShared.Properties;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Components.Objects;
|
||||
|
||||
[Guid("116F08A5-BAA7-45B3-B6C8-469E452C9AC7")]
|
||||
public class GetObjectProperties : GH_Component, IGH_VariableParameterComponent
|
||||
{
|
||||
public override Guid ComponentGuid => GetType().GUID;
|
||||
|
||||
protected override Bitmap Icon => Resources.speckle_properties_query;
|
||||
public override GH_Exposure Exposure => GH_Exposure.tertiary;
|
||||
|
||||
public GetObjectProperties()
|
||||
: base(
|
||||
"Query Properties",
|
||||
"qP",
|
||||
"Retrieves the values of the properties inside Speckle Objects at the specified keys",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.OBJECTS
|
||||
) { }
|
||||
|
||||
protected override void RegisterInputParams(GH_Component.GH_InputParamManager pManager)
|
||||
{
|
||||
pManager.AddParameter(
|
||||
new SpeckleObjectParam(),
|
||||
"Objects",
|
||||
"O",
|
||||
"Speckle Objects to retrieve properties",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
pManager.AddTextParameter("Keys", "K", "Property keys to filter by", GH_ParamAccess.list);
|
||||
}
|
||||
|
||||
protected override void RegisterOutputParams(GH_Component.GH_OutputParamManager pManager) { }
|
||||
|
||||
protected override void SolveInstance(IGH_DataAccess da)
|
||||
{
|
||||
List<string> paths = new();
|
||||
da.GetDataList(1, paths);
|
||||
|
||||
if (paths.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (OutputMismatch(paths))
|
||||
{
|
||||
OnPingDocument()
|
||||
.ScheduleSolution(
|
||||
5,
|
||||
_ =>
|
||||
{
|
||||
CreateOutputs(paths);
|
||||
}
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
SpeckleObjectWrapperGoo objectWrapperGoo = new();
|
||||
da.GetData(0, ref objectWrapperGoo);
|
||||
|
||||
// flatten object properties, if any
|
||||
SpecklePropertyGroupGoo properties = objectWrapperGoo.Value.Properties;
|
||||
if (properties.Value.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Dictionary<string, SpecklePropertyGoo> flattenedProps = properties.Flatten();
|
||||
|
||||
for (int i = 0; i < paths.Count; i++)
|
||||
{
|
||||
var name = paths[i];
|
||||
if (FindProperty(flattenedProps, name) is SpecklePropertyGoo prop)
|
||||
{
|
||||
da.SetData(i, prop.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
da.SetData(i, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// attempts to find a property by concatenated key, or returns null if not
|
||||
private SpecklePropertyGoo? FindProperty(Dictionary<string, SpecklePropertyGoo> props, string unifiedPath)
|
||||
{
|
||||
if (!props.TryGetValue(unifiedPath, out SpecklePropertyGoo currentGoo))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
return currentGoo;
|
||||
}
|
||||
|
||||
private bool OutputMismatch(List<string> outputParams)
|
||||
{
|
||||
if (Params.Output.Count != outputParams.Count)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
var count = 0;
|
||||
foreach (var newParam in outputParams)
|
||||
{
|
||||
var oldParam = Params.Output[count];
|
||||
if (oldParam.NickName != newParam || oldParam.Name != newParam)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
count++;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private void CreateOutputs(List<string> outputParams)
|
||||
{
|
||||
// Ensure we have the required count of output parameters
|
||||
while (Params.Output.Count != outputParams.Count)
|
||||
{
|
||||
if (Params.Output.Count > outputParams.Count) // if too many, unregister
|
||||
{
|
||||
Params.UnregisterOutputParameter(Params.Output[^1]);
|
||||
}
|
||||
|
||||
if (Params.Output.Count < outputParams.Count) // if too little, add some
|
||||
{
|
||||
var param = new Param_GenericObject
|
||||
{
|
||||
Name = "newParam",
|
||||
NickName = "newParam",
|
||||
MutableNickName = false,
|
||||
Access = GH_ParamAccess.item
|
||||
};
|
||||
Params.RegisterOutputParam(param);
|
||||
}
|
||||
}
|
||||
|
||||
// now unify names and nicknames
|
||||
int index = 0;
|
||||
foreach (var newParam in outputParams)
|
||||
{
|
||||
Params.Output[index].NickName = newParam;
|
||||
Params.Output[index].Name = newParam;
|
||||
index++;
|
||||
}
|
||||
|
||||
// now we can update the output params
|
||||
Params.OnParametersChanged();
|
||||
VariableParameterMaintenance();
|
||||
ExpireSolution(false);
|
||||
}
|
||||
|
||||
public bool CanInsertParameter(GH_ParameterSide side, int index) => false;
|
||||
|
||||
public bool CanRemoveParameter(GH_ParameterSide side, int index) => false;
|
||||
|
||||
public IGH_Param CreateParameter(GH_ParameterSide side, int index)
|
||||
{
|
||||
var myParam = new Param_GenericObject
|
||||
{
|
||||
Name = GH_ComponentParamServer.InventUniqueNickname("ABCD", Params.Input),
|
||||
MutableNickName = true,
|
||||
Optional = true
|
||||
};
|
||||
myParam.NickName = myParam.Name;
|
||||
return myParam;
|
||||
}
|
||||
|
||||
public bool DestroyParameter(GH_ParameterSide side, int index) => side == GH_ParameterSide.Output;
|
||||
|
||||
public void VariableParameterMaintenance() { }
|
||||
}
|
||||
+12
-22
@@ -4,9 +4,6 @@ using Speckle.Connectors.Common.Extensions;
|
||||
using Speckle.Connectors.GrasshopperShared.Components.BaseComponents;
|
||||
using Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
using Speckle.Connectors.GrasshopperShared.Properties;
|
||||
#if RHINO8_OR_GREATER
|
||||
using Grasshopper.Rhinoceros.Model;
|
||||
#endif
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Components.Objects;
|
||||
|
||||
@@ -23,35 +20,28 @@ public class PropertyGroupPathsSelector : ValueSet<IGH_Goo>
|
||||
|
||||
public override Guid ComponentGuid => new Guid("8882BE3A-81F1-4416-B420-58D69E4CC8F1");
|
||||
protected override Bitmap Icon => Resources.speckle_inputs_property;
|
||||
public override GH_Exposure Exposure => GH_Exposure.tertiary;
|
||||
public override GH_Exposure Exposure => GH_Exposure.quarternary;
|
||||
|
||||
protected override void LoadVolatileData()
|
||||
{
|
||||
var objectPropertyGroups = VolatileData
|
||||
var propertyGroups = VolatileData
|
||||
.AllData(true)
|
||||
.OfType<SpeckleObjectWrapperGoo>()
|
||||
.Select(goo => goo.Value.Properties)
|
||||
.Where(goo => goo is SpecklePropertyGroupGoo)
|
||||
.Select(goo =>
|
||||
goo switch
|
||||
{
|
||||
SpecklePropertyGroupGoo geometryGoo => geometryGoo,
|
||||
_ => throw new InvalidOperationException("Unexpected goo type")
|
||||
}
|
||||
)
|
||||
.ToList();
|
||||
|
||||
#if RHINO8_OR_GREATER
|
||||
// support model objects direct piping also
|
||||
if (objectPropertyGroups.Count != VolatileData.DataCount)
|
||||
{
|
||||
var modelObjects = VolatileData
|
||||
.AllData(true)
|
||||
.OfType<ModelObject>()
|
||||
.Select(mo => new SpeckleObjectWrapperGoo(mo).Value.Properties)
|
||||
.ToList();
|
||||
objectPropertyGroups.AddRange(modelObjects);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (objectPropertyGroups.Count == 0)
|
||||
if (propertyGroups.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var paths = GetPropertyPaths(objectPropertyGroups);
|
||||
var paths = GetPropertyPaths(propertyGroups);
|
||||
m_data.Clear();
|
||||
m_data.AppendRange(paths.Select(s => new GH_String(s)));
|
||||
}
|
||||
|
||||
+99
@@ -0,0 +1,99 @@
|
||||
using System.Runtime.InteropServices;
|
||||
using Grasshopper.Kernel;
|
||||
using Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
using Speckle.Connectors.GrasshopperShared.Properties;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Components.Objects;
|
||||
|
||||
[Guid("116F08A5-BAA7-45B3-B6C8-469E452C9AC7")]
|
||||
public class QueryProperties : GH_Component
|
||||
{
|
||||
public override Guid ComponentGuid => GetType().GUID;
|
||||
|
||||
protected override Bitmap Icon => Resources.speckle_properties_query;
|
||||
public override GH_Exposure Exposure => GH_Exposure.quarternary;
|
||||
|
||||
public QueryProperties()
|
||||
: base(
|
||||
"Query Properties",
|
||||
"qP",
|
||||
"Retrieves the values of the Properties at the specified keys",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.OBJECTS
|
||||
) { }
|
||||
|
||||
protected override void RegisterInputParams(GH_InputParamManager pManager)
|
||||
{
|
||||
pManager.AddParameter(
|
||||
new SpecklePropertyGroupParam(),
|
||||
"Properties",
|
||||
"P",
|
||||
"Speckle Properties",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
pManager.AddTextParameter("Keys", "K", "Property keys to filter by", GH_ParamAccess.list);
|
||||
}
|
||||
|
||||
protected override void RegisterOutputParams(GH_OutputParamManager pManager)
|
||||
{
|
||||
pManager.AddGenericParameter("Values", "V", "The values of the specified keys", GH_ParamAccess.list);
|
||||
}
|
||||
|
||||
protected override void SolveInstance(IGH_DataAccess da)
|
||||
{
|
||||
SpecklePropertyGroupGoo? properties = null;
|
||||
if (!da.GetData(0, ref properties))
|
||||
{
|
||||
AddRuntimeMessage(GH_RuntimeMessageLevel.Warning, $"Input a Speckle Properties item");
|
||||
return;
|
||||
}
|
||||
|
||||
List<string> keys = new();
|
||||
if (!da.GetDataList(1, keys))
|
||||
{
|
||||
AddRuntimeMessage(GH_RuntimeMessageLevel.Warning, $"Input a key");
|
||||
return;
|
||||
}
|
||||
|
||||
if (properties == null || properties.Value.Count == 0 || keys.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
List<object?> values = new();
|
||||
foreach (string key in keys)
|
||||
{
|
||||
ISpecklePropertyGoo? value = GetValueByPath(properties, key);
|
||||
values.Add(value);
|
||||
}
|
||||
|
||||
da.SetDataList(0, values);
|
||||
}
|
||||
|
||||
public static ISpecklePropertyGoo? GetValueByPath(SpecklePropertyGroupGoo data, string path)
|
||||
{
|
||||
string[] keys = path.Split('.');
|
||||
ISpecklePropertyGoo? current = data;
|
||||
|
||||
foreach (var key in keys)
|
||||
{
|
||||
if (current is SpecklePropertyGroupGoo dict)
|
||||
{
|
||||
if (dict.Value.TryGetValue(key, out ISpecklePropertyGoo? next))
|
||||
{
|
||||
current = next;
|
||||
}
|
||||
else
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return null; // Current is not a dictionary, path is invalid
|
||||
}
|
||||
}
|
||||
|
||||
return current;
|
||||
}
|
||||
}
|
||||
+11
-28
@@ -91,7 +91,7 @@ public class QuerySpeckleObjects : GH_Component, IGH_VariableParameterComponent
|
||||
private List<int>? _outputFilterIndices;
|
||||
|
||||
// Caches the list of all objects by geometrybase type
|
||||
private readonly Dictionary<ObjectType, List<SpeckleObjectWrapper>> _filterDict = new();
|
||||
private readonly Dictionary<ObjectType, List<SpeckleGeometryWrapper>> _filterDict = new();
|
||||
|
||||
protected override void SolveInstance(IGH_DataAccess dataAccess)
|
||||
{
|
||||
@@ -109,7 +109,7 @@ public class QuerySpeckleObjects : GH_Component, IGH_VariableParameterComponent
|
||||
// filter by collection path
|
||||
// Note: the collection paths selector will omit the target collection from the path of nested collections.
|
||||
// the discard ("_objects") will be used to indicate objects found directly in the target collection.
|
||||
List<SpeckleObjectWrapper> filteredObjects;
|
||||
List<SpeckleWrapper> filteredObjects;
|
||||
SpeckleCollectionWrapper? targetCollectionWrapper = null;
|
||||
if (!string.IsNullOrEmpty(path))
|
||||
{
|
||||
@@ -120,23 +120,25 @@ public class QuerySpeckleObjects : GH_Component, IGH_VariableParameterComponent
|
||||
return;
|
||||
}
|
||||
|
||||
filteredObjects = targetCollectionWrapper.Elements.OfType<SpeckleObjectWrapper>().ToList();
|
||||
filteredObjects = targetCollectionWrapper.GetAtomicObjects(true).ToList();
|
||||
}
|
||||
else
|
||||
{
|
||||
filteredObjects = GetAllObjectsFromCollection(collectionWrapperGoo.Value).ToList();
|
||||
filteredObjects = collectionWrapperGoo.Value.GetAtomicObjects(true).ToList();
|
||||
}
|
||||
|
||||
// sort objects by filters
|
||||
// sort geometry objects by filters
|
||||
var geometryObjects = filteredObjects.OfType<SpeckleGeometryWrapper>().ToList();
|
||||
if (_filterDict.Count == 0)
|
||||
{
|
||||
SortObjectsByGeometryBaseType(filteredObjects);
|
||||
SortObjectsByGeometryBaseType(geometryObjects);
|
||||
}
|
||||
|
||||
// Set output objects
|
||||
for (int i = 0; i < Params.Output.Count; i++)
|
||||
{
|
||||
List<SpeckleObjectWrapper> outputValues = i == 0 ? filteredObjects : _filterDict[Filters[i - 1]];
|
||||
List<SpeckleWrapper> outputValues =
|
||||
i == 0 ? filteredObjects : _filterDict[Filters[i - 1]].Select(o => (SpeckleWrapper)o).ToList();
|
||||
List<IGH_Goo> outputGoos = outputValues.Select(o => o.CreateGoo()).ToList();
|
||||
if (targetCollectionWrapper?.Topology is string topology && !string.IsNullOrEmpty(topology))
|
||||
{
|
||||
@@ -151,7 +153,7 @@ public class QuerySpeckleObjects : GH_Component, IGH_VariableParameterComponent
|
||||
}
|
||||
|
||||
// Sort the input objects by the FilterType enums, based on the type of their geometryBase
|
||||
private void SortObjectsByGeometryBaseType(List<SpeckleObjectWrapper> objs)
|
||||
private void SortObjectsByGeometryBaseType(List<SpeckleGeometryWrapper> objs)
|
||||
{
|
||||
if (_filterDict.Count > 0)
|
||||
{
|
||||
@@ -168,7 +170,7 @@ public class QuerySpeckleObjects : GH_Component, IGH_VariableParameterComponent
|
||||
{
|
||||
if (
|
||||
wrapper.GeometryBase?.ObjectType is ObjectType objType
|
||||
&& _filterDict.TryGetValue(objType, out List<SpeckleObjectWrapper>? value)
|
||||
&& _filterDict.TryGetValue(objType, out List<SpeckleGeometryWrapper>? value)
|
||||
)
|
||||
{
|
||||
value.Add(wrapper);
|
||||
@@ -176,25 +178,6 @@ public class QuerySpeckleObjects : GH_Component, IGH_VariableParameterComponent
|
||||
}
|
||||
}
|
||||
|
||||
private IEnumerable<SpeckleObjectWrapper> GetAllObjectsFromCollection(SpeckleCollectionWrapper collectionWrapper)
|
||||
{
|
||||
foreach (ISpeckleCollectionObject element in collectionWrapper.Elements)
|
||||
{
|
||||
switch (element)
|
||||
{
|
||||
case SpeckleCollectionWrapper childCollectionWrapper:
|
||||
foreach (var item in GetAllObjectsFromCollection(childCollectionWrapper))
|
||||
{
|
||||
yield return item;
|
||||
}
|
||||
break;
|
||||
case SpeckleObjectWrapper objectWrapper:
|
||||
yield return objectWrapper;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private SpeckleCollectionWrapper? FindCollectionAtPath(SpeckleCollectionWrapper root, string unifiedPath)
|
||||
{
|
||||
// POC: SpeckleCollections now have a full list<string> path prop on them always. Is this easier to use?
|
||||
|
||||
+16
-18
@@ -8,20 +8,18 @@ using Speckle.Connectors.GrasshopperShared.Properties;
|
||||
namespace Speckle.Connectors.GrasshopperShared.Components.Objects;
|
||||
|
||||
[Guid("8D2E3F4A-1B5C-4E7F-9A8B-3C6D9E2F1A4B")]
|
||||
public class SpeckleBlockDefinitionPassthrough : GH_Component
|
||||
public class SpeckleBlockDefinitionPassthrough()
|
||||
: SpeckleSolveInstance(
|
||||
"Speckle Block Definition",
|
||||
"SBD",
|
||||
"Create or modify a Speckle Block Definition",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.OBJECTS
|
||||
)
|
||||
{
|
||||
public SpeckleBlockDefinitionPassthrough()
|
||||
: base(
|
||||
"Speckle Block Definition",
|
||||
"SBD",
|
||||
"Create or modify a Speckle Block Definition",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.OBJECTS
|
||||
) { }
|
||||
|
||||
public override Guid ComponentGuid => GetType().GUID;
|
||||
protected override Bitmap Icon => Resources.speckle_objects_block_def;
|
||||
public override GH_Exposure Exposure => GH_Exposure.secondary;
|
||||
public override GH_Exposure Exposure => GH_Exposure.tertiary;
|
||||
|
||||
protected override void RegisterInputParams(GH_InputParamManager pManager)
|
||||
{
|
||||
@@ -35,9 +33,9 @@ public class SpeckleBlockDefinitionPassthrough : GH_Component
|
||||
Params.Input[0].Optional = true;
|
||||
|
||||
pManager.AddGenericParameter(
|
||||
"Objects",
|
||||
"O",
|
||||
"Objects to include in the Block Definition. Speckle objects and instances or Model objects and instances are accepted.",
|
||||
"Geometry",
|
||||
"G",
|
||||
"Geometry to include in the Block Definition. Speckle geometry and instances or Model objects and instances are accepted.",
|
||||
GH_ParamAccess.list
|
||||
);
|
||||
Params.Input[1].Optional = true;
|
||||
@@ -56,7 +54,7 @@ public class SpeckleBlockDefinitionPassthrough : GH_Component
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
|
||||
pManager.AddGenericParameter("Objects", "O", "Objects contained in the Block Definition", GH_ParamAccess.list);
|
||||
pManager.AddGenericParameter("Geometry", "G", "Geometry contained in the Block Definition", GH_ParamAccess.list);
|
||||
|
||||
pManager.AddTextParameter("Name", "N", "Name of the Block Definition", GH_ParamAccess.item);
|
||||
}
|
||||
@@ -71,7 +69,7 @@ public class SpeckleBlockDefinitionPassthrough : GH_Component
|
||||
|
||||
if (inputDefinition == null && inputObjects.Count == 0)
|
||||
{
|
||||
AddRuntimeMessage(GH_RuntimeMessageLevel.Warning, $"Pass in a Definition or Objects.");
|
||||
AddRuntimeMessage(GH_RuntimeMessageLevel.Warning, $"Pass in a Definition or Geometry.");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -91,10 +89,10 @@ public class SpeckleBlockDefinitionPassthrough : GH_Component
|
||||
// process geometry
|
||||
if (inputObjects.Count > 0)
|
||||
{
|
||||
List<SpeckleObjectWrapper> processedObjects = new();
|
||||
List<SpeckleGeometryWrapper> processedObjects = new();
|
||||
foreach (IGH_Goo goo in inputObjects)
|
||||
{
|
||||
if (goo.ToSpeckleObjectWrapper() is SpeckleObjectWrapper gooWrapper)
|
||||
if (goo.ToSpeckleGeometryWrapper() is SpeckleGeometryWrapper gooWrapper)
|
||||
{
|
||||
processedObjects.Add(gooWrapper);
|
||||
}
|
||||
|
||||
+9
-11
@@ -8,20 +8,18 @@ using Speckle.Connectors.GrasshopperShared.Properties;
|
||||
namespace Speckle.Connectors.GrasshopperShared.Components.Objects;
|
||||
|
||||
[Guid("2F8A9B1C-3D4E-5F6A-7B8C-9D0E1F2A3B4C")]
|
||||
public class SpeckleBlockInstancePassthrough : GH_Component
|
||||
public class SpeckleBlockInstancePassthrough()
|
||||
: SpeckleSolveInstance(
|
||||
"Speckle Block Instance",
|
||||
"SBI",
|
||||
"Create or modify a Speckle Block Instance",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.OBJECTS
|
||||
)
|
||||
{
|
||||
public SpeckleBlockInstancePassthrough()
|
||||
: base(
|
||||
"Speckle Block Instance",
|
||||
"SBI",
|
||||
"Create or modify a Speckle Block Instance",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.OBJECTS
|
||||
) { }
|
||||
|
||||
public override Guid ComponentGuid => GetType().GUID;
|
||||
protected override Bitmap Icon => Resources.speckle_objects_block_inst;
|
||||
public override GH_Exposure Exposure => GH_Exposure.secondary;
|
||||
public override GH_Exposure Exposure => GH_Exposure.tertiary;
|
||||
|
||||
protected override void RegisterInputParams(GH_InputParamManager pManager)
|
||||
{
|
||||
|
||||
+172
@@ -0,0 +1,172 @@
|
||||
using System.Runtime.InteropServices;
|
||||
using Grasshopper.Kernel;
|
||||
using Speckle.Connectors.GrasshopperShared.HostApp;
|
||||
using Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
using Speckle.Connectors.GrasshopperShared.Properties;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Components.Objects;
|
||||
|
||||
[Guid("5CE8AA40-7706-4893-853D-4C77604548FA")]
|
||||
public class SpeckleDataObjectPassthrough()
|
||||
: SpeckleSolveInstance(
|
||||
"Speckle Data Object",
|
||||
"SDO",
|
||||
"Create or modify a Speckle Data Object",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.OBJECTS
|
||||
)
|
||||
{
|
||||
public override Guid ComponentGuid => GetType().GUID;
|
||||
protected override Bitmap Icon => Resources.speckle_objects_dataobject;
|
||||
public override GH_Exposure Exposure => GH_Exposure.secondary;
|
||||
|
||||
protected override void RegisterInputParams(GH_InputParamManager pManager)
|
||||
{
|
||||
int objIndex = pManager.AddParameter(
|
||||
new SpeckleDataObjectParam(),
|
||||
"Speckle Data Object",
|
||||
"SDO",
|
||||
"Input Speckle DataObject. Model Objects are also accepted.",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
Params.Input[objIndex].Optional = true;
|
||||
|
||||
int geoIndex = pManager.AddParameter(
|
||||
new SpeckleGeometryWrapperParam(),
|
||||
"Geometries",
|
||||
"G",
|
||||
"Geometries of the Speckle Data Object. Speckle Geometry and Grasshopper geometry are accepted.",
|
||||
GH_ParamAccess.list
|
||||
);
|
||||
Params.Input[geoIndex].Optional = true;
|
||||
|
||||
int nameIndex = pManager.AddTextParameter("Name", "N", "Name of the Speckle Data Object", GH_ParamAccess.item);
|
||||
Params.Input[nameIndex].Optional = true;
|
||||
|
||||
int propIndex = pManager.AddParameter(
|
||||
new SpecklePropertyGroupParam(),
|
||||
"Properties",
|
||||
"P",
|
||||
"The properties of the Speckle Data Object. Speckle Properties and User Content are accepted.",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
Params.Input[propIndex].Optional = true;
|
||||
}
|
||||
|
||||
protected override void RegisterOutputParams(GH_OutputParamManager pManager)
|
||||
{
|
||||
pManager.AddParameter(
|
||||
new SpeckleDataObjectParam(),
|
||||
"Speckle Data Object",
|
||||
"SDO",
|
||||
"Speckle Data Object",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
|
||||
pManager.AddParameter(
|
||||
new SpeckleGeometryWrapperParam(),
|
||||
"Geometries",
|
||||
"G",
|
||||
"Geometries of the Speckle Data Object.",
|
||||
GH_ParamAccess.list
|
||||
);
|
||||
|
||||
pManager.AddTextParameter("Name", "N", "Name of the Speckle Data Object", GH_ParamAccess.item);
|
||||
|
||||
pManager.AddParameter(
|
||||
new SpecklePropertyGroupParam(),
|
||||
"Properties",
|
||||
"P",
|
||||
"The properties of the Speckle Data Object",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
|
||||
pManager.AddTextParameter(
|
||||
"Path",
|
||||
"p",
|
||||
$"The Collection Path of the Speckle Geometry, delimited with `{Constants.LAYER_PATH_DELIMITER}`",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
}
|
||||
|
||||
protected override void SolveInstance(IGH_DataAccess da)
|
||||
{
|
||||
// process the object
|
||||
// deep copy so we don't mutate the object
|
||||
SpeckleDataObjectWrapperGoo inputObject = new();
|
||||
SpeckleDataObjectWrapper? result = null;
|
||||
if (da.GetData(0, ref inputObject))
|
||||
{
|
||||
result = inputObject.Value.DeepCopy();
|
||||
}
|
||||
|
||||
List<SpeckleGeometryWrapperGoo> inputGeometry = new();
|
||||
if (!da.GetDataList(1, inputGeometry) && result == null)
|
||||
{
|
||||
AddRuntimeMessage(GH_RuntimeMessageLevel.Warning, $"Pass in a Speckle DataObject or Geometries.");
|
||||
return;
|
||||
}
|
||||
|
||||
foreach (var inputGeo in inputGeometry)
|
||||
{
|
||||
if (inputGeo.Value is SpeckleBlockInstanceWrapper)
|
||||
{
|
||||
AddRuntimeMessage(GH_RuntimeMessageLevel.Error, $"DataObjects cannot contain Block Instances.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
string? inputName = null;
|
||||
da.GetData(2, ref inputName);
|
||||
|
||||
SpecklePropertyGroupGoo? inputProperties = null;
|
||||
da.GetData(3, ref inputProperties);
|
||||
|
||||
// process geometry
|
||||
if (result == null)
|
||||
{
|
||||
result = new SpeckleDataObjectWrapperGoo().Value;
|
||||
}
|
||||
|
||||
if (inputGeometry.Count > 0)
|
||||
{
|
||||
result.Geometries.Clear();
|
||||
foreach (var inputGeo in inputGeometry)
|
||||
{
|
||||
// deep copy so we don't mutate the input geo which may be speckle geometry
|
||||
SpeckleGeometryWrapper mutatingGeo = inputGeo.Value.DeepCopy();
|
||||
|
||||
// assign fields before adding, otherwise they will be out of sync with wrapper
|
||||
mutatingGeo.Base[Constants.NAME_PROP] = result.Name;
|
||||
mutatingGeo.Properties = result.Properties;
|
||||
mutatingGeo.Parent = result.Parent;
|
||||
mutatingGeo.Path = result.Path;
|
||||
|
||||
result.Geometries.Add(mutatingGeo);
|
||||
}
|
||||
}
|
||||
|
||||
// process name
|
||||
if (inputName != null)
|
||||
{
|
||||
result.Name = inputName;
|
||||
}
|
||||
|
||||
// process properties
|
||||
if (inputProperties != null)
|
||||
{
|
||||
result.Properties = inputProperties;
|
||||
}
|
||||
|
||||
// get the path
|
||||
string? path =
|
||||
result.Path.Count > 1 ? string.Join(Constants.LAYER_PATH_DELIMITER, result.Path) : result.Path.FirstOrDefault();
|
||||
|
||||
// set all the data
|
||||
da.SetData(0, result.CreateGoo());
|
||||
da.SetDataList(1, result.Geometries);
|
||||
da.SetData(2, result.Name);
|
||||
da.SetData(3, result.Properties);
|
||||
da.SetData(4, path);
|
||||
}
|
||||
}
|
||||
+45
-47
@@ -4,31 +4,30 @@ using Grasshopper.Kernel.Types;
|
||||
using Speckle.Connectors.GrasshopperShared.HostApp;
|
||||
using Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
using Speckle.Connectors.GrasshopperShared.Properties;
|
||||
using Speckle.Sdk.Common;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Components.Objects;
|
||||
|
||||
[Guid("F9418610-ACAE-4417-B010-19EBEA6A121F")]
|
||||
public class SpeckleObjectPassthrough : GH_Component
|
||||
public class SpeckleGeometryPassthrough()
|
||||
: SpeckleSolveInstance(
|
||||
"Speckle Geometry",
|
||||
"SG",
|
||||
"Create or modify a Speckle Geometry",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.OBJECTS
|
||||
)
|
||||
{
|
||||
public SpeckleObjectPassthrough()
|
||||
: base(
|
||||
"Speckle Object",
|
||||
"SO",
|
||||
"Create or modify a Speckle Object",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.OBJECTS
|
||||
) { }
|
||||
|
||||
public override Guid ComponentGuid => GetType().GUID;
|
||||
protected override Bitmap Icon => Resources.speckle_objects_object;
|
||||
public override GH_Exposure Exposure => GH_Exposure.primary;
|
||||
protected override Bitmap Icon => Resources.speckle_objects_geometry;
|
||||
public override GH_Exposure Exposure => GH_Exposure.secondary;
|
||||
|
||||
protected override void RegisterInputParams(GH_InputParamManager pManager)
|
||||
{
|
||||
int objIndex = pManager.AddGenericParameter(
|
||||
"Object",
|
||||
"O",
|
||||
"Input Object. Speckle Objects and Model Objects are accepted.",
|
||||
"Speckle Geometry",
|
||||
"SG",
|
||||
"Input Speckle Geometry. Model Objects are also accepted.",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
Params.Input[objIndex].Optional = true;
|
||||
@@ -36,31 +35,36 @@ public class SpeckleObjectPassthrough : GH_Component
|
||||
int geoIndex = pManager.AddGeometryParameter(
|
||||
"Geometry",
|
||||
"G",
|
||||
"Geometry of the Speckle Object.",
|
||||
"Geometry of the Speckle Geometry.",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
Params.Input[geoIndex].Optional = true;
|
||||
|
||||
int nameIndex = pManager.AddTextParameter("Name", "N", "Name of the Speckle Object", GH_ParamAccess.item);
|
||||
int nameIndex = pManager.AddTextParameter("Name", "N", "Name of the Speckle Geometry", GH_ParamAccess.item);
|
||||
Params.Input[nameIndex].Optional = true;
|
||||
|
||||
int propIndex = pManager.AddParameter(
|
||||
new SpecklePropertyGroupParam(),
|
||||
"Properties",
|
||||
"P",
|
||||
"The properties of the Speckle Object. Speckle Properties and User Content are accepted.",
|
||||
"The properties of the Speckle Geometry. Speckle Properties and User Content are accepted.",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
Params.Input[propIndex].Optional = true;
|
||||
|
||||
int colorIndex = pManager.AddColourParameter("Color", "c", "The color of the Speckle Object", GH_ParamAccess.item);
|
||||
int colorIndex = pManager.AddColourParameter(
|
||||
"Color",
|
||||
"c",
|
||||
"The color of the Speckle Geometry",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
Params.Input[colorIndex].Optional = true;
|
||||
|
||||
int matIndex = pManager.AddParameter(
|
||||
new SpeckleMaterialParam(),
|
||||
"Material",
|
||||
"m",
|
||||
"The material of the Speckle Object. Display Materials, Model Materials, and Speckle Materials are accepted.",
|
||||
"The material of the Speckle Geometry. Display Materials, Model Materials, and Speckle Materials are accepted.",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
Params.Input[matIndex].Optional = true;
|
||||
@@ -78,39 +82,34 @@ public class SpeckleObjectPassthrough : GH_Component
|
||||
|
||||
protected override void RegisterOutputParams(GH_OutputParamManager pManager)
|
||||
{
|
||||
pManager.AddGenericParameter("Object", "O", "Speckle Object", GH_ParamAccess.item);
|
||||
pManager.AddGenericParameter("Speckle Geometry", "SG", "Speckle Geometry", GH_ParamAccess.item);
|
||||
|
||||
pManager.AddGeometryParameter(
|
||||
"Geometry",
|
||||
"G",
|
||||
"Geometry of the Speckle Object. GeometryBase in Grasshopper includes text entities.",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
pManager.AddGeometryParameter("Geometry", "G", "Geometry of the Speckle Geometry.", GH_ParamAccess.item);
|
||||
|
||||
pManager.AddTextParameter("Name", "N", "Name of the Speckle Object", GH_ParamAccess.item);
|
||||
pManager.AddTextParameter("Name", "N", "Name of the Speckle Geometry", GH_ParamAccess.item);
|
||||
|
||||
pManager.AddParameter(
|
||||
new SpecklePropertyGroupParam(),
|
||||
"Properties",
|
||||
"P",
|
||||
"The properties of the Speckle Object",
|
||||
"The properties of the Speckle Geometry",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
|
||||
pManager.AddColourParameter("Color", "c", "The color of the Speckle Object", GH_ParamAccess.item);
|
||||
pManager.AddColourParameter("Color", "c", "The color of the Speckle Geometry", GH_ParamAccess.item);
|
||||
|
||||
pManager.AddParameter(
|
||||
new SpeckleMaterialParam(),
|
||||
"Material",
|
||||
"M",
|
||||
"The material of the Speckle Object.",
|
||||
"The material of the Speckle Geometry.",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
|
||||
pManager.AddTextParameter(
|
||||
"Path",
|
||||
"p",
|
||||
$"The Collection Path of the Speckle Object, delimited with `{Constants.LAYER_PATH_DELIMITER}`",
|
||||
$"The Collection Path of the Speckle Geometry, delimited with `{Constants.LAYER_PATH_DELIMITER}`",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
}
|
||||
@@ -120,10 +119,10 @@ public class SpeckleObjectPassthrough : GH_Component
|
||||
// process the object
|
||||
// deep copy so we don't mutate the object
|
||||
IGH_Goo? inputObject = null;
|
||||
SpeckleObjectWrapper? result = null;
|
||||
SpeckleGeometryWrapper? result = null;
|
||||
if (da.GetData(0, ref inputObject))
|
||||
{
|
||||
if (inputObject?.ToSpeckleObjectWrapper() is SpeckleObjectWrapper gooWrapper)
|
||||
if (inputObject?.ToSpeckleGeometryWrapper() is SpeckleGeometryWrapper gooWrapper)
|
||||
{
|
||||
result = gooWrapper.DeepCopy();
|
||||
}
|
||||
@@ -139,7 +138,7 @@ public class SpeckleObjectPassthrough : GH_Component
|
||||
|
||||
if (result == null && inputGeometry == null)
|
||||
{
|
||||
AddRuntimeMessage(GH_RuntimeMessageLevel.Warning, $"Pass in an Object or Geometry.");
|
||||
AddRuntimeMessage(GH_RuntimeMessageLevel.Warning, $"Pass in a Speckle Geometry or Geometry.");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -159,9 +158,9 @@ public class SpeckleObjectPassthrough : GH_Component
|
||||
// deep copy so we don't mutate the input geo which may be speckle objects
|
||||
if (inputGeometry != null)
|
||||
{
|
||||
if (inputGeometry.ToSpeckleObjectWrapper() is SpeckleObjectWrapper geoWrapper)
|
||||
if (inputGeometry.ToSpeckleGeometryWrapper() is SpeckleGeometryWrapper geoWrapper)
|
||||
{
|
||||
SpeckleObjectWrapper mutatingGeo = geoWrapper.DeepCopy();
|
||||
SpeckleGeometryWrapper mutatingGeo = geoWrapper.DeepCopy();
|
||||
if (result is null)
|
||||
{
|
||||
result = mutatingGeo;
|
||||
@@ -190,44 +189,43 @@ public class SpeckleObjectPassthrough : GH_Component
|
||||
{
|
||||
AddRuntimeMessage(
|
||||
GH_RuntimeMessageLevel.Error,
|
||||
$"{inputGeometry.TypeName} is not a valid type for Speckle Objects."
|
||||
$"{inputGeometry.TypeName} is not a valid type for Speckle Geometry."
|
||||
);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
result.NotNull();
|
||||
// process name
|
||||
if (inputName != null)
|
||||
{
|
||||
result!.Name = inputName;
|
||||
result.Name = inputName;
|
||||
}
|
||||
|
||||
// process properties
|
||||
if (inputProperties != null)
|
||||
{
|
||||
result!.Properties = inputProperties;
|
||||
result.Properties = inputProperties;
|
||||
}
|
||||
|
||||
// process color (no mutation)
|
||||
if (inputColor != null)
|
||||
{
|
||||
result!.Color = inputColor;
|
||||
result.Color = inputColor;
|
||||
}
|
||||
|
||||
// process material (no mutation)
|
||||
if (inputMaterial != null)
|
||||
{
|
||||
result!.Material = inputMaterial.Value;
|
||||
result.Material = inputMaterial.Value;
|
||||
}
|
||||
|
||||
// no need to process application Id.
|
||||
// New definitions should have a new appID generated in the new() constructor, and we want to preserve old appID otherwise for changetracking.
|
||||
|
||||
// get the path
|
||||
string path =
|
||||
result!.Path.Count > 1
|
||||
? string.Join(Constants.LAYER_PATH_DELIMITER, result!.Path)
|
||||
: result!.Path.FirstOrDefault();
|
||||
string? path =
|
||||
result.Path.Count > 1 ? string.Join(Constants.LAYER_PATH_DELIMITER, result.Path) : result.Path.FirstOrDefault();
|
||||
|
||||
// set all the data
|
||||
da.SetData(0, result.CreateGoo());
|
||||
@@ -240,7 +238,7 @@ public class SpeckleObjectPassthrough : GH_Component
|
||||
}
|
||||
|
||||
// keeps the geometry and wrapped base the same while assigning all other props from the inut wrapper
|
||||
private void MatchNonGeometryProps(SpeckleObjectWrapper wrapper, SpeckleObjectWrapper wrapperToMatch)
|
||||
private void MatchNonGeometryProps(SpeckleGeometryWrapper wrapper, SpeckleGeometryWrapper wrapperToMatch)
|
||||
{
|
||||
wrapper.Name = wrapperToMatch.Name;
|
||||
wrapper.ApplicationId = wrapperToMatch.ApplicationId;
|
||||
+26
-27
@@ -10,11 +10,23 @@ namespace Speckle.Connectors.GrasshopperShared.Components.Objects;
|
||||
/// CreateSpeckleProperties passthrough component by key value pairs
|
||||
/// </summary>
|
||||
[Guid("FED2298C-0D2B-4868-94B5-B8D17F9385A5")]
|
||||
public class SpecklePropertiesPassthrough : GH_Component
|
||||
public class SpecklePropertiesPassthrough : SpeckleSolveInstance
|
||||
{
|
||||
public override Guid ComponentGuid => GetType().GUID;
|
||||
protected override Bitmap Icon => Resources.speckle_properties_properties;
|
||||
public override GH_Exposure Exposure => GH_Exposure.tertiary;
|
||||
public override GH_Exposure Exposure => GH_Exposure.quarternary;
|
||||
|
||||
public SpecklePropertiesPassthrough()
|
||||
: base(
|
||||
"Speckle Properties",
|
||||
"SP",
|
||||
"Creates or modifies a set of properties for Speckle objects by keyvalue",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.OBJECTS
|
||||
)
|
||||
{
|
||||
Message = Mode.ToString();
|
||||
}
|
||||
|
||||
private enum PropertyMode
|
||||
{
|
||||
@@ -38,18 +50,6 @@ public class SpecklePropertiesPassthrough : GH_Component
|
||||
}
|
||||
}
|
||||
|
||||
public SpecklePropertiesPassthrough()
|
||||
: base(
|
||||
"Speckle Properties",
|
||||
"SP",
|
||||
"Creates or modifies a set of properties for Speckle objects by keyvalue",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.OBJECTS
|
||||
)
|
||||
{
|
||||
Message = Mode.ToString();
|
||||
}
|
||||
|
||||
protected override void RegisterInputParams(GH_InputParamManager pManager)
|
||||
{
|
||||
pManager.AddParameter(new SpecklePropertyGroupParam(), "Properties", "P", "Input properties", GH_ParamAccess.item);
|
||||
@@ -95,13 +95,19 @@ public class SpecklePropertiesPassthrough : GH_Component
|
||||
return;
|
||||
}
|
||||
|
||||
// validate that keys and values are of same length
|
||||
if (inputKeys.Count != inputValues.Count)
|
||||
// validate that keys and values are of valid length
|
||||
if ((Mode == PropertyMode.Merge || Mode == PropertyMode.Replace) && inputKeys.Count != inputValues.Count)
|
||||
{
|
||||
AddRuntimeMessage(GH_RuntimeMessageLevel.Warning, $"Keys and values are mismatched in length");
|
||||
return;
|
||||
}
|
||||
|
||||
if (Mode == PropertyMode.Remove && (inputKeys.Count == 0 || inputValues.Count > 0))
|
||||
{
|
||||
AddRuntimeMessage(GH_RuntimeMessageLevel.Warning, $"Only input keys to remove");
|
||||
return;
|
||||
}
|
||||
|
||||
// process the properties
|
||||
Dictionary<string, ISpecklePropertyGoo> result =
|
||||
inputProperties is null || Mode == PropertyMode.Replace
|
||||
@@ -126,7 +132,7 @@ public class SpecklePropertiesPassthrough : GH_Component
|
||||
for (int i = 0; i < inputKeys.Count; i++)
|
||||
{
|
||||
string key = inputKeys[i];
|
||||
object? value = inputValues[i];
|
||||
object? value = Mode == PropertyMode.Remove ? null : inputValues[i];
|
||||
ISpecklePropertyGoo? convertedValue = null;
|
||||
switch (value)
|
||||
{
|
||||
@@ -142,7 +148,7 @@ public class SpecklePropertiesPassthrough : GH_Component
|
||||
{
|
||||
AddRuntimeMessage(
|
||||
GH_RuntimeMessageLevel.Error,
|
||||
$"Values contain an invalid data type. Only strings, numbers, booleans, and other Speckle properties are supported."
|
||||
$"Values contain an invalid data type. Only strings, numbers, booleans, planes, vectors, intervals, and other Speckle properties are supported."
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -167,13 +173,7 @@ public class SpecklePropertiesPassthrough : GH_Component
|
||||
result.Add(key, convertedValue);
|
||||
break;
|
||||
case PropertyMode.Remove:
|
||||
if (result.TryGetValue(key, out ISpecklePropertyGoo existingValue))
|
||||
{
|
||||
if (existingValue.Equals(convertedValue))
|
||||
{
|
||||
result.Remove(key);
|
||||
}
|
||||
}
|
||||
result.Remove(key);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -203,8 +203,7 @@ public class SpecklePropertiesPassthrough : GH_Component
|
||||
modeItem.ToolTipText = "Existing properties will be cleared and replaced by input keyvalue pairs.";
|
||||
break;
|
||||
case PropertyMode.Remove:
|
||||
modeItem.ToolTipText =
|
||||
"Existing keyvalue pairs that match the input keyvalue pairs will be removed from properties.";
|
||||
modeItem.ToolTipText = "Existing keyvalue pairs that match the input keys will be removed from properties.";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -29,8 +29,8 @@ public class AccountManagerComponent : GH_Component, IDisposable
|
||||
|
||||
public AccountManagerComponent()
|
||||
: base(
|
||||
"Accounts",
|
||||
"A",
|
||||
"Sign In",
|
||||
"SI",
|
||||
"Sign in to a Speckle Account",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.OPERATIONS
|
||||
|
||||
+1
-1
@@ -271,7 +271,7 @@ public class ReceiveAsyncComponent : GH_AsyncComponent<ReceiveAsyncComponent>
|
||||
ResetApiClient(UrlModelResource);
|
||||
}
|
||||
|
||||
private void ApiClient_OnVersionCreated(object sender, ProjectVersionsUpdatedMessage e)
|
||||
private void ApiClient_OnVersionCreated(object? sender, ProjectVersionsUpdatedMessage e)
|
||||
{
|
||||
HandleNewCommit();
|
||||
}
|
||||
|
||||
+15
-4
@@ -25,9 +25,6 @@ namespace Speckle.Connectors.GrasshopperShared.Components.Operations.Send;
|
||||
[Guid("52481972-7867-404F-8D9F-E1481183F355")]
|
||||
public class SendAsyncComponent : GH_AsyncComponent<SendAsyncComponent>
|
||||
{
|
||||
public GhContextMenuButton ProjectContextMenuButton { get; set; }
|
||||
public GhContextMenuButton ModelContextMenuButton { get; set; }
|
||||
|
||||
public SendAsyncComponent()
|
||||
: base(
|
||||
"Publish",
|
||||
@@ -57,6 +54,8 @@ public class SendAsyncComponent : GH_AsyncComponent<SendAsyncComponent>
|
||||
public SpeckleUrlModelResource? OutputParam { get; set; }
|
||||
public bool HasMultipleInputs { get; set; }
|
||||
|
||||
public string? VersionMessage { get; private set; }
|
||||
|
||||
protected override void RegisterInputParams(GH_InputParamManager pManager)
|
||||
{
|
||||
pManager.AddParameter(new SpeckleUrlModelResourceParam());
|
||||
@@ -67,6 +66,8 @@ public class SendAsyncComponent : GH_AsyncComponent<SendAsyncComponent>
|
||||
"The collection model object to send",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
pManager.AddTextParameter("Version Message", "versionMessage", "The version message", GH_ParamAccess.item);
|
||||
pManager[2].Optional = true;
|
||||
}
|
||||
|
||||
protected override void RegisterOutputParams(GH_OutputParamManager pManager)
|
||||
@@ -275,6 +276,10 @@ public class SendAsyncComponent : GH_AsyncComponent<SendAsyncComponent>
|
||||
return;
|
||||
}
|
||||
RootCollectionWrapper = rootCollectionWrapper;
|
||||
|
||||
string? versionMessage = null;
|
||||
da.GetData(2, ref versionMessage);
|
||||
VersionMessage = versionMessage;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -402,7 +407,13 @@ public class SendComponentWorker : WorkerInstance<SendAsyncComponent>
|
||||
using var scope = PriorityLoader.CreateScopeForActiveDocument();
|
||||
var sendOperation = scope.ServiceProvider.GetRequiredService<SendOperation<SpeckleCollectionWrapperGoo>>();
|
||||
SendOperationResult? result = await sendOperation
|
||||
.Execute(new List<SpeckleCollectionWrapperGoo>() { rootCollectionWrapper }, sendInfo, progress, CancellationToken)
|
||||
.Execute(
|
||||
new List<SpeckleCollectionWrapperGoo>() { rootCollectionWrapper },
|
||||
sendInfo,
|
||||
Parent.VersionMessage,
|
||||
progress,
|
||||
CancellationToken
|
||||
)
|
||||
.ConfigureAwait(false);
|
||||
|
||||
// TODO: If we have NodeRun events later, better to have `ComponentTracker` to use across components
|
||||
|
||||
+17
-4
@@ -49,6 +49,8 @@ public class SendComponent : SpeckleTaskCapableComponent<SendComponentInput, Sen
|
||||
|
||||
public string? Url { get; private set; }
|
||||
|
||||
public string? VersionMessage { get; private set; }
|
||||
|
||||
protected override Bitmap Icon => Resources.speckle_operations_syncpublish;
|
||||
|
||||
protected override void RegisterInputParams(GH_InputParamManager pManager)
|
||||
@@ -61,7 +63,8 @@ public class SendComponent : SpeckleTaskCapableComponent<SendComponentInput, Sen
|
||||
"The model collection to publish",
|
||||
GH_ParamAccess.item
|
||||
);
|
||||
|
||||
pManager.AddTextParameter("Version Message", "versionMessage", "The version message", GH_ParamAccess.item);
|
||||
pManager[2].Optional = true;
|
||||
pManager.AddBooleanParameter("Run", "r", "Run the publish operation", GH_ParamAccess.item);
|
||||
}
|
||||
|
||||
@@ -86,8 +89,12 @@ public class SendComponent : SpeckleTaskCapableComponent<SendComponentInput, Sen
|
||||
SpeckleCollectionWrapperGoo rootCollectionWrapper = new();
|
||||
da.GetData(1, ref rootCollectionWrapper);
|
||||
|
||||
string? versionMessage = null;
|
||||
da.GetData(2, ref versionMessage);
|
||||
VersionMessage = versionMessage;
|
||||
|
||||
bool run = false;
|
||||
da.GetData(2, ref run);
|
||||
da.GetData(3, ref run);
|
||||
|
||||
return new SendComponentInput(resource.NotNull(), rootCollectionWrapper, run);
|
||||
}
|
||||
@@ -177,8 +184,14 @@ public class SendComponent : SpeckleTaskCapableComponent<SendComponentInput, Sen
|
||||
|
||||
using var client = clientFactory.Create(account);
|
||||
var sendInfo = await input.Resource.GetSendInfo(client, cancellationToken).ConfigureAwait(false);
|
||||
var result = await sendOperation
|
||||
.Execute(new List<SpeckleCollectionWrapperGoo>() { input.Input }, sendInfo, progress, cancellationToken)
|
||||
await sendOperation
|
||||
.Execute(
|
||||
new List<SpeckleCollectionWrapperGoo>() { input.Input },
|
||||
sendInfo,
|
||||
VersionMessage,
|
||||
progress,
|
||||
cancellationToken
|
||||
)
|
||||
.ConfigureAwait(false);
|
||||
|
||||
// TODO: If we have NodeRun events later, better to have `ComponentTracker` to use across components
|
||||
|
||||
+2
-2
@@ -36,8 +36,8 @@ public class SpeckleSelectModelComponent : GH_Component
|
||||
|
||||
public SpeckleSelectModelComponent()
|
||||
: base(
|
||||
"Speckle Model URL",
|
||||
"URL",
|
||||
"Speckle Model",
|
||||
"SM",
|
||||
"User selectable model from Speckle",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.OPERATIONS
|
||||
|
||||
+3
-1
@@ -1,3 +1,5 @@
|
||||
using Speckle.Sdk.Common;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Components.Operations.Wizard;
|
||||
|
||||
public class SearchToolStripMenuItem
|
||||
@@ -124,7 +126,7 @@ public class SearchToolStripMenuItem
|
||||
ParentDropDown.ItemClicked += (sender, args) =>
|
||||
{
|
||||
// we are not closing the dropdown only if user clicked the first item of the dropdown which is TextBox that we use for search
|
||||
if (args.ClickedItem.Name == SearchItemId)
|
||||
if (args.ClickedItem.NotNull().Name == SearchItemId)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
+4
-4
@@ -426,28 +426,28 @@ public class SpeckleOperationWizard
|
||||
WorkspaceMenuHandler.RedrawMenuButton(SelectedWorkspace);
|
||||
}
|
||||
|
||||
private void OnWorkspaceSelected(object sender, WorkspaceSelectedEventArgs e)
|
||||
private void OnWorkspaceSelected(object? sender, WorkspaceSelectedEventArgs e)
|
||||
{
|
||||
SelectedWorkspace = e.SelectedWorkspace;
|
||||
ResetProjects();
|
||||
_refreshComponent.Invoke();
|
||||
}
|
||||
|
||||
private void OnProjectSelected(object sender, ProjectSelectedEventArgs e)
|
||||
private void OnProjectSelected(object? sender, ProjectSelectedEventArgs e)
|
||||
{
|
||||
SelectedProject = e.SelectedProject;
|
||||
ResetModels();
|
||||
_refreshComponent.Invoke();
|
||||
}
|
||||
|
||||
private void OnModelSelected(object sender, ModelSelectedEventArgs e)
|
||||
private void OnModelSelected(object? sender, ModelSelectedEventArgs e)
|
||||
{
|
||||
SelectedModel = e.SelectedModel;
|
||||
ResetVersions(true);
|
||||
_refreshComponent.Invoke();
|
||||
}
|
||||
|
||||
private void OnVersionSelected(object sender, VersionSelectedEventArgs e)
|
||||
private void OnVersionSelected(object? sender, VersionSelectedEventArgs e)
|
||||
{
|
||||
SelectedVersion = e.SelectedVersion;
|
||||
IsLatestVersion = e.IsLatest;
|
||||
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
using Grasshopper.Kernel;
|
||||
using Speckle.Connectors.GrasshopperShared.HostApp;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Components;
|
||||
|
||||
public abstract class SpeckleSolveInstance(
|
||||
string name,
|
||||
string nickname,
|
||||
string description,
|
||||
string category,
|
||||
string subCategory
|
||||
) : GH_Component(name, nickname, description, category, subCategory)
|
||||
{
|
||||
protected override void BeforeSolveInstance() => SpeckleConversionContext.SetupCurrent();
|
||||
|
||||
protected override void AfterSolveInstance() => SpeckleConversionContext.EndCurrent();
|
||||
|
||||
protected abstract override void SolveInstance(IGH_DataAccess da);
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
using Grasshopper.Kernel;
|
||||
using Speckle.Connectors.GrasshopperShared.Properties;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.HostApp.Extras;
|
||||
|
||||
public class ListAccessStateTag : GH_StateTag
|
||||
{
|
||||
public override string Description => "This parameter is set to List access";
|
||||
public override string Name => "List Access";
|
||||
public override Bitmap Icon => Resources.speckle_state_access;
|
||||
}
|
||||
@@ -128,12 +128,45 @@ public static class GrasshopperHelpers
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Attempts to cast an IGH_Goo to a Speckle Object Wrapper
|
||||
/// Gets all of the atomic objects inside a collection wrapper.
|
||||
/// </summary>
|
||||
/// <param name="coll"></param>
|
||||
/// <param name="recurse">Will recurse into sub collections to get atomic objects</param>
|
||||
/// <returns></returns>
|
||||
public static IEnumerable<SpeckleWrapper> GetAtomicObjects(this SpeckleCollectionWrapper coll, bool recurse = false)
|
||||
{
|
||||
foreach (var element in coll.Elements)
|
||||
{
|
||||
switch (element)
|
||||
{
|
||||
case SpeckleDataObjectWrapper dataObject:
|
||||
yield return dataObject;
|
||||
break;
|
||||
case SpeckleGeometryWrapper geo: // covers both instances and geo
|
||||
yield return geo;
|
||||
break;
|
||||
case SpeckleCollectionWrapper subColl:
|
||||
if (recurse)
|
||||
{
|
||||
foreach (var subElement in subColl.GetAtomicObjects(recurse))
|
||||
{
|
||||
yield return subElement;
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Attempts to cast an IGH_Goo to a Speckle Geometry Wrapper
|
||||
/// </summary>
|
||||
/// <param name="goo"></param>
|
||||
/// <returns>A reference to the Speckle Object Wrapper from the goo, if any</returns>
|
||||
/// <returns>A reference to the Speckle Geometry Wrapper from the goo, if any</returns>
|
||||
/// <remarks>This method **does not** deep copy the return value</remarks>
|
||||
public static SpeckleObjectWrapper? ToSpeckleObjectWrapper(this IGH_Goo goo)
|
||||
public static SpeckleGeometryWrapper? ToSpeckleGeometryWrapper(this IGH_Goo goo)
|
||||
{
|
||||
SpeckleBlockInstanceWrapperGoo instanceGoo = new();
|
||||
if (instanceGoo.CastFrom(goo))
|
||||
@@ -142,7 +175,35 @@ public static class GrasshopperHelpers
|
||||
}
|
||||
else
|
||||
{
|
||||
SpeckleObjectWrapperGoo objGoo = new();
|
||||
SpeckleGeometryWrapperGoo objGoo = new();
|
||||
return objGoo.CastFrom(goo) ? objGoo.Value : null;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Attempts to cast an IGH_Goo to a Speckle Geometry or DataObject Wrapper
|
||||
/// </summary>
|
||||
/// <param name="goo"></param>
|
||||
/// <returns>A reference to the Speckle Wrapper from the goo, if any</returns>
|
||||
/// <remarks>This method **does not** deep copy the return value</remarks>
|
||||
public static SpeckleWrapper? ToSpeckleObjectWrapper(this IGH_Goo goo)
|
||||
{
|
||||
// first preserve data objects as they are
|
||||
// this is processed first because data objects with 1 display value can be cast to geometry wrappers
|
||||
if (goo is SpeckleDataObjectWrapperGoo dataObject)
|
||||
{
|
||||
return dataObject.Value;
|
||||
}
|
||||
|
||||
// then try to process as geometry
|
||||
SpeckleBlockInstanceWrapperGoo instanceGoo = new();
|
||||
if (instanceGoo.CastFrom(goo))
|
||||
{
|
||||
return instanceGoo.Value;
|
||||
}
|
||||
else
|
||||
{
|
||||
SpeckleGeometryWrapperGoo objGoo = new();
|
||||
return objGoo.CastFrom(goo) ? objGoo.Value : null;
|
||||
}
|
||||
}
|
||||
|
||||
+45
-10
@@ -3,6 +3,7 @@ using Rhino.Geometry;
|
||||
using Speckle.Connectors.GrasshopperShared.Registration;
|
||||
using Speckle.Converters.Common;
|
||||
using Speckle.Sdk;
|
||||
using Speckle.Sdk.Common;
|
||||
using Speckle.Sdk.Models;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.HostApp;
|
||||
@@ -10,25 +11,59 @@ namespace Speckle.Connectors.GrasshopperShared.HostApp;
|
||||
/// <summary>
|
||||
/// Handles grasshopper wide converters. We don't need new converters, unless the document changes - this class should handle this (untested).
|
||||
/// </summary>
|
||||
public static class SpeckleConversionContext
|
||||
public class SpeckleConversionContext(IRootToSpeckleConverter speckleConverter, IRootToHostConverter hostConverter)
|
||||
{
|
||||
public static Base ConvertToSpeckle(GeometryBase geo)
|
||||
private static IServiceScope? s_scope;
|
||||
private static SpeckleConversionContext? s_currentContext;
|
||||
|
||||
public static SpeckleConversionContext Current
|
||||
{
|
||||
using var scope = PriorityLoader.CreateScopeForActiveDocument();
|
||||
return scope.ServiceProvider.GetRequiredService<IRootToSpeckleConverter>().Convert(geo);
|
||||
get
|
||||
{
|
||||
if (s_currentContext == null)
|
||||
{
|
||||
SetupCurrent();
|
||||
}
|
||||
|
||||
return s_currentContext.NotNull();
|
||||
}
|
||||
}
|
||||
|
||||
public static List<(GeometryBase, Base)> ConvertToHost(Base input)
|
||||
public static void SetupCurrent()
|
||||
{
|
||||
using var scope = PriorityLoader.CreateScopeForActiveDocument();
|
||||
var result = scope.ServiceProvider.GetRequiredService<IRootToHostConverter>().Convert(input);
|
||||
if (s_currentContext != null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
s_scope = PriorityLoader.CreateScopeForActiveDocument();
|
||||
s_currentContext = s_scope.Get<SpeckleConversionContext>();
|
||||
}
|
||||
|
||||
public static void EndCurrent()
|
||||
{
|
||||
if (s_currentContext == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
s_currentContext = null;
|
||||
s_scope?.Dispose();
|
||||
s_scope = null;
|
||||
}
|
||||
|
||||
public Base ConvertToSpeckle(object geo) => speckleConverter.Convert(geo);
|
||||
|
||||
public List<(object, Base)> ConvertToHost(Base input)
|
||||
{
|
||||
var result = hostConverter.Convert(input);
|
||||
|
||||
return result switch
|
||||
{
|
||||
GeometryBase geometry => [(geometry, input)],
|
||||
List<GeometryBase> geometryList => geometryList.Select(o => (o, input)).ToList(),
|
||||
IEnumerable<(GeometryBase, Base)> fallbackConversionResult => fallbackConversionResult.ToList(),
|
||||
_ => throw new SpeckleException("Failed to convert input to rhino")
|
||||
List<GeometryBase> geometryList => geometryList.Select(o => ((object)o, input)).ToList(),
|
||||
IEnumerable<(GeometryBase, Base)> fallbackConversionResult
|
||||
=> fallbackConversionResult.Select(o => ((object)o.Item1, o.Item2)).ToList(),
|
||||
object obj => [(obj, input)],
|
||||
_ => throw new SpeckleException("Failed to convert input to grasshopper")
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
+4
-4
@@ -40,7 +40,7 @@ internal sealed class GrasshopperBlockUnpacker
|
||||
public HashSet<string> UnpackBlocks(
|
||||
IReadOnlyCollection<TraversalContext> blockComponents,
|
||||
IReadOnlyCollection<InstanceDefinitionProxy>? definitionProxies,
|
||||
Dictionary<string, SpeckleObjectWrapper> convertedObjectsMap,
|
||||
Dictionary<string, SpeckleGeometryWrapper> convertedObjectsMap,
|
||||
GrasshopperCollectionRebuilder collectionRebuilder
|
||||
)
|
||||
{
|
||||
@@ -95,7 +95,7 @@ internal sealed class GrasshopperBlockUnpacker
|
||||
/// </summary>
|
||||
private void CreateBlocksInDependencyOrder(
|
||||
List<(Collection[] path, IInstanceComponent component)> sortedComponents,
|
||||
Dictionary<string, SpeckleObjectWrapper> convertedObjectsMap,
|
||||
Dictionary<string, SpeckleGeometryWrapper> convertedObjectsMap,
|
||||
GrasshopperCollectionRebuilder collectionRebuilder,
|
||||
HashSet<string> consumedObjectIds
|
||||
)
|
||||
@@ -159,11 +159,11 @@ internal sealed class GrasshopperBlockUnpacker
|
||||
private SpeckleBlockDefinitionWrapper? CreateBlockDefinitionWrapper(
|
||||
InstanceDefinitionProxy definitionProxy,
|
||||
string definitionId,
|
||||
Dictionary<string, SpeckleObjectWrapper> convertedObjectsMap,
|
||||
Dictionary<string, SpeckleGeometryWrapper> convertedObjectsMap,
|
||||
HashSet<string> consumedObjectIds
|
||||
)
|
||||
{
|
||||
var definitionObjects = new List<SpeckleObjectWrapper>();
|
||||
var definitionObjects = new List<SpeckleGeometryWrapper>();
|
||||
var currentDefinitionObjectIds = new HashSet<string>();
|
||||
|
||||
foreach (var objectId in definitionProxy.objects)
|
||||
|
||||
+6
-4
@@ -25,7 +25,7 @@ internal sealed class GrasshopperCollectionRebuilder
|
||||
}
|
||||
|
||||
public void AppendSpeckleGrasshopperObject(
|
||||
SpeckleObjectWrapper speckleGrasshopperObjectWrapper,
|
||||
ISpeckleCollectionObject speckleGrasshopperObjectWrapper,
|
||||
List<Collection> collectionPath,
|
||||
GrasshopperColorUnpacker colorUnpacker,
|
||||
GrasshopperMaterialUnpacker materialUnpacker
|
||||
@@ -43,7 +43,7 @@ internal sealed class GrasshopperCollectionRebuilder
|
||||
{
|
||||
// first check if cache already has this collection
|
||||
string fullPath = string.Concat(path);
|
||||
if (_cache.TryGetValue(fullPath, out SpeckleCollectionWrapper col))
|
||||
if (_cache.TryGetValue(fullPath, out SpeckleCollectionWrapper? col))
|
||||
{
|
||||
return col;
|
||||
}
|
||||
@@ -58,7 +58,7 @@ internal sealed class GrasshopperCollectionRebuilder
|
||||
string key = string.Concat(currentLayerPath);
|
||||
|
||||
// check cache
|
||||
if (_cache.TryGetValue(key, out SpeckleCollectionWrapper currentCol))
|
||||
if (_cache.TryGetValue(key, out SpeckleCollectionWrapper? currentCol))
|
||||
{
|
||||
previousCollectionWrapper = currentCol;
|
||||
continue;
|
||||
@@ -118,7 +118,9 @@ internal sealed class GrasshopperCollectionRebuilder
|
||||
{
|
||||
// Remove consumed objects from this level
|
||||
collection.Elements.RemoveAll(element =>
|
||||
element is SpeckleObjectWrapper obj && obj.ApplicationId != null && consumedObjectIds.Contains(obj.ApplicationId)
|
||||
element is SpeckleGeometryWrapper obj
|
||||
&& obj.ApplicationId != null
|
||||
&& consumedObjectIds.Contains(obj.ApplicationId)
|
||||
);
|
||||
|
||||
// Recurse into child collections
|
||||
|
||||
+3
-2
@@ -1,5 +1,5 @@
|
||||
using Speckle.Connectors.Common.Extensions;
|
||||
using Speckle.Connectors.Common.Operations;
|
||||
using Speckle.Connectors.Logging;
|
||||
using Speckle.Sdk.Api;
|
||||
using Speckle.Sdk.Logging;
|
||||
using Speckle.Sdk.Models;
|
||||
@@ -41,7 +41,8 @@ public class GrasshopperReceiveOperation
|
||||
// 2 - Check account exist
|
||||
var account = receiveInfo.Account;
|
||||
using IClient apiClient = _clientFactory.Create(account);
|
||||
using var userScope = ActivityScope.SetTag(Consts.USER_ID, account.GetHashedEmail());
|
||||
|
||||
using var userScope = UserActivityScope.AddUserScope(account);
|
||||
|
||||
Speckle.Sdk.Api.GraphQL.Models.Version? version = await apiClient
|
||||
.Version.Get(receiveInfo.SelectedVersionId, receiveInfo.ProjectId, cancellationToken)
|
||||
|
||||
+84
-33
@@ -18,7 +18,7 @@ using Speckle.Sdk.Models.Instances;
|
||||
/// </remarks>
|
||||
internal sealed class LocalToGlobalMapHandler
|
||||
{
|
||||
public Dictionary<string, SpeckleObjectWrapper> ConvertedObjectsMap { get; } = new();
|
||||
public Dictionary<string, SpeckleGeometryWrapper> ConvertedObjectsMap { get; } = new();
|
||||
public readonly GrasshopperCollectionRebuilder CollectionRebuilder;
|
||||
|
||||
private readonly TraversalContextUnpacker _traversalContextUnpacker;
|
||||
@@ -53,7 +53,7 @@ internal sealed class LocalToGlobalMapHandler
|
||||
|
||||
try
|
||||
{
|
||||
List<(GeometryBase, Base)> converted = SpeckleConversionContext.ConvertToHost(obj);
|
||||
List<(object, Base)> converted = SpeckleConversionContext.Current.ConvertToHost(obj);
|
||||
|
||||
if (converted.Count == 0)
|
||||
{
|
||||
@@ -69,51 +69,102 @@ internal sealed class LocalToGlobalMapHandler
|
||||
_materialUnpacker
|
||||
);
|
||||
|
||||
// Extract name and properties
|
||||
SpecklePropertyGroupGoo propertyGroup = new();
|
||||
string name = "";
|
||||
|
||||
if (obj is Speckle.Objects.Data.DataObject dataObject)
|
||||
{
|
||||
// get color and mat on dataobject first
|
||||
Color? dataObjColor = _colorUnpacker.Cache.TryGetValue(
|
||||
dataObject.applicationId ?? "",
|
||||
out var cachedDataObjColor
|
||||
)
|
||||
? cachedDataObjColor
|
||||
: null;
|
||||
|
||||
SpeckleMaterialWrapper? dataObjMat = _materialUnpacker.Cache.TryGetValue(
|
||||
dataObject.applicationId ?? "",
|
||||
out var cachedDataObjMaterial
|
||||
)
|
||||
? cachedDataObjMaterial
|
||||
: null;
|
||||
|
||||
// get geometries
|
||||
List<SpeckleGeometryWrapper> geometries = new();
|
||||
foreach ((object convertedObj, Base original) in converted)
|
||||
{
|
||||
if (convertedObj is GeometryBase geometryBase)
|
||||
{
|
||||
SpeckleGeometryWrapper wrapper =
|
||||
new()
|
||||
{
|
||||
Base = original,
|
||||
GeometryBase = geometryBase,
|
||||
Color = _colorUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjColor)
|
||||
? cachedObjColor
|
||||
: dataObjColor,
|
||||
Material = _materialUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjMaterial)
|
||||
? cachedObjMaterial
|
||||
: dataObjMat,
|
||||
};
|
||||
|
||||
geometries.Add(wrapper);
|
||||
}
|
||||
}
|
||||
|
||||
SpecklePropertyGroupGoo propertyGroup = new();
|
||||
propertyGroup.CastFrom(dataObject.properties);
|
||||
name = dataObject.name;
|
||||
|
||||
// remove the displayvalue of the original dataobject since these are now processed and stored on the wrapper
|
||||
// to prevent storing of duplicate Base
|
||||
dataObject.displayValue.Clear();
|
||||
|
||||
var dataObjectWrapper = new SpeckleDataObjectWrapper()
|
||||
{
|
||||
Base = dataObject,
|
||||
Geometries = geometries,
|
||||
Path = path.Select(p => p.name).ToList(),
|
||||
Parent = objectCollection,
|
||||
Name = dataObject.name,
|
||||
Properties = propertyGroup,
|
||||
ApplicationId = dataObject.applicationId,
|
||||
};
|
||||
|
||||
// Add to collections (not to map since these won't be definition objects)
|
||||
CollectionRebuilder.AppendSpeckleGrasshopperObject(dataObjectWrapper, path, _colorUnpacker, _materialUnpacker);
|
||||
}
|
||||
else
|
||||
{
|
||||
SpecklePropertyGroupGoo propertyGroup = new();
|
||||
if (obj[Constants.PROPERTIES_PROP] is Dictionary<string, object?> props)
|
||||
{
|
||||
propertyGroup.CastFrom(props);
|
||||
}
|
||||
|
||||
if (obj[Constants.NAME_PROP] is string objName)
|
||||
foreach ((object convertedObj, Base original) in converted)
|
||||
{
|
||||
name = objName;
|
||||
if (convertedObj is GeometryBase geometryBase)
|
||||
{
|
||||
var wrapper = new SpeckleGeometryWrapper()
|
||||
{
|
||||
Base = original,
|
||||
Path = path.Select(p => p.name).ToList(),
|
||||
Parent = objectCollection,
|
||||
GeometryBase = geometryBase,
|
||||
Properties = propertyGroup,
|
||||
Name = obj[Constants.NAME_PROP] as string ?? "",
|
||||
Color = _colorUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjColor)
|
||||
? cachedObjColor
|
||||
: null,
|
||||
Material = _materialUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjMaterial)
|
||||
? cachedObjMaterial
|
||||
: null,
|
||||
ApplicationId = objId
|
||||
};
|
||||
|
||||
// Always add to both map and collections
|
||||
ConvertedObjectsMap[objId] = wrapper;
|
||||
CollectionRebuilder.AppendSpeckleGrasshopperObject(wrapper, path, _colorUnpacker, _materialUnpacker);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foreach ((GeometryBase geometryBase, Base original) in converted)
|
||||
{
|
||||
var wrapper = new SpeckleObjectWrapper()
|
||||
{
|
||||
Base = original,
|
||||
Path = path.Select(p => p.name).ToList(),
|
||||
Parent = objectCollection,
|
||||
GeometryBase = geometryBase,
|
||||
Properties = propertyGroup,
|
||||
Name = name,
|
||||
Color = _colorUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjColor)
|
||||
? cachedObjColor
|
||||
: null,
|
||||
Material = _materialUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjMaterial)
|
||||
? cachedObjMaterial
|
||||
: null,
|
||||
ApplicationId = objId
|
||||
};
|
||||
|
||||
// Always add to both map and collections
|
||||
ConvertedObjectsMap[objId] = wrapper;
|
||||
CollectionRebuilder.AppendSpeckleGrasshopperObject(wrapper, path, _colorUnpacker, _materialUnpacker);
|
||||
}
|
||||
}
|
||||
catch (Exception ex) when (!ex.IsFatal())
|
||||
{
|
||||
|
||||
+5
-5
@@ -10,9 +10,9 @@ namespace Speckle.Connectors.GrasshopperShared.Operations.Send;
|
||||
/// </summary>
|
||||
internal sealed class GrasshopperBlockPacker
|
||||
{
|
||||
private readonly IInstanceObjectsManager<SpeckleObjectWrapper, List<string>> _instanceObjectsManager;
|
||||
private readonly IInstanceObjectsManager<SpeckleGeometryWrapper, List<string>> _instanceObjectsManager;
|
||||
|
||||
public GrasshopperBlockPacker(IInstanceObjectsManager<SpeckleObjectWrapper, List<string>> instanceObjectsManager)
|
||||
public GrasshopperBlockPacker(IInstanceObjectsManager<SpeckleGeometryWrapper, List<string>> instanceObjectsManager)
|
||||
{
|
||||
_instanceObjectsManager = instanceObjectsManager;
|
||||
}
|
||||
@@ -31,7 +31,7 @@ internal sealed class GrasshopperBlockPacker
|
||||
/// </summary>
|
||||
/// <param name="blockInstance">The block instance to process</param>
|
||||
/// <param name="depth">Current nesting depth (0 = top level, increases for nested instances)</param>
|
||||
public List<SpeckleObjectWrapper>? ProcessInstance(SpeckleBlockInstanceWrapper? blockInstance, int depth = 0)
|
||||
public List<SpeckleGeometryWrapper>? ProcessInstance(SpeckleBlockInstanceWrapper? blockInstance, int depth = 0)
|
||||
{
|
||||
if (blockInstance?.Definition == null)
|
||||
{
|
||||
@@ -51,7 +51,7 @@ internal sealed class GrasshopperBlockPacker
|
||||
/// Processes a block definition, adding it and its objects to InstanceObjectsManager.
|
||||
/// Updates maxDepth for existing definitions when encountered at greater depths.
|
||||
/// </summary>
|
||||
private List<SpeckleObjectWrapper>? ProcessDefinition(SpeckleBlockDefinitionWrapper definition, int depth = 0)
|
||||
private List<SpeckleGeometryWrapper>? ProcessDefinition(SpeckleBlockDefinitionWrapper definition, int depth = 0)
|
||||
{
|
||||
// Use wrapper's id as definitive identifier. Create if empty.
|
||||
definition.ApplicationId ??= Guid.NewGuid().ToString();
|
||||
@@ -73,7 +73,7 @@ internal sealed class GrasshopperBlockPacker
|
||||
}
|
||||
|
||||
// Process objects recursively
|
||||
var objectsToAdd = new List<SpeckleObjectWrapper>();
|
||||
var objectsToAdd = new List<SpeckleGeometryWrapper>();
|
||||
var currentObjectIds = new List<string>(); // Track current object IDs for proxy update
|
||||
|
||||
foreach (var obj in definition.Objects)
|
||||
|
||||
+51
-11
@@ -5,16 +5,17 @@ using Speckle.Connectors.GrasshopperShared.HostApp;
|
||||
using Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
using Speckle.Sdk.Models;
|
||||
using Speckle.Sdk.Models.Collections;
|
||||
using DataObject = Speckle.Objects.Data.DataObject;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Operations.Send;
|
||||
|
||||
public class GrasshopperRootObjectBuilder : IRootObjectBuilder<SpeckleCollectionWrapperGoo>
|
||||
{
|
||||
private readonly IInstanceObjectsManager<SpeckleObjectWrapper, List<string>> _instanceObjectsManager;
|
||||
private readonly IInstanceObjectsManager<SpeckleGeometryWrapper, List<string>> _instanceObjectsManager;
|
||||
|
||||
// each Build() call gets a fresh scoped IInstanceObjectsManager
|
||||
public GrasshopperRootObjectBuilder(
|
||||
IInstanceObjectsManager<SpeckleObjectWrapper, List<string>> instanceObjectsManager
|
||||
IInstanceObjectsManager<SpeckleGeometryWrapper, List<string>> instanceObjectsManager
|
||||
)
|
||||
{
|
||||
_instanceObjectsManager = instanceObjectsManager;
|
||||
@@ -29,14 +30,11 @@ public class GrasshopperRootObjectBuilder : IRootObjectBuilder<SpeckleCollection
|
||||
|
||||
public Task<RootObjectBuilderResult> Build(
|
||||
IReadOnlyList<SpeckleCollectionWrapperGoo> input,
|
||||
SendInfo sendInfo,
|
||||
string projectId,
|
||||
IProgress<CardProgress> onOperationProgressed,
|
||||
CancellationToken ct = default
|
||||
)
|
||||
{
|
||||
// TODO: Send info is used in other connectors to get the project ID to populate the SendConversionCache
|
||||
Console.WriteLine($"Send Info {sendInfo}");
|
||||
|
||||
// deep copy input (to not mutate input) and set the input collection name to "Grasshopper Model"
|
||||
var inputCollectionGoo = (SpeckleCollectionWrapperGoo)input[0].Duplicate();
|
||||
inputCollectionGoo.Value.Name = "Grasshopper Model";
|
||||
@@ -90,9 +88,9 @@ public class GrasshopperRootObjectBuilder : IRootObjectBuilder<SpeckleCollection
|
||||
Unwrap(collWrapper, colorPacker, materialPacker, blockPacker);
|
||||
break;
|
||||
|
||||
case SpeckleObjectWrapper so: // handles both SpeckleObjectWrapper and SpeckleBlockInstanceWrapper (inheritance)
|
||||
case SpeckleGeometryWrapper so: // handles both SpeckleObjectWrapper and SpeckleBlockInstanceWrapper (inheritance)
|
||||
// convert wrapper to base and add to collection - common for all object wrappers
|
||||
Base objectBase = Unwrap(so);
|
||||
Base objectBase = UnwrapGeometry(so);
|
||||
string applicationId = objectBase.applicationId!;
|
||||
currentColl.elements.Add(objectBase);
|
||||
|
||||
@@ -106,6 +104,14 @@ public class GrasshopperRootObjectBuilder : IRootObjectBuilder<SpeckleCollection
|
||||
colorPacker.ProcessColor(applicationId, so.Color);
|
||||
materialPacker.ProcessMaterial(applicationId, so.Material);
|
||||
break;
|
||||
|
||||
case SpeckleDataObjectWrapper dataObjectWrapper:
|
||||
// convert wrapper to DataObject and add to collection
|
||||
// UnwrapDataObject will unwrap underlying geometry and handle color and material
|
||||
// arguably doing too much, but I'm apprehensive looping twice without good reason
|
||||
DataObject dataObject = UnwrapDataObject(dataObjectWrapper, colorPacker, materialPacker);
|
||||
currentColl.elements.Add(dataObject);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -125,12 +131,12 @@ public class GrasshopperRootObjectBuilder : IRootObjectBuilder<SpeckleCollection
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Converts a <see cref="SpeckleObjectWrapper"/> to underlying Base object with dynamically attached properties.
|
||||
/// Converts a <see cref="SpeckleGeometryWrapper"/> to underlying Base object with dynamically attached properties.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// POC: if we move properties assignment to auto set the wrapped base, we can get rid of this entirely!
|
||||
/// </remarks>
|
||||
private Base Unwrap(SpeckleObjectWrapper wrapper)
|
||||
private Base UnwrapGeometry(SpeckleGeometryWrapper wrapper)
|
||||
{
|
||||
Dictionary<string, object?> props = [];
|
||||
Base baseObject = wrapper.Base;
|
||||
@@ -164,7 +170,7 @@ public class GrasshopperRootObjectBuilder : IRootObjectBuilder<SpeckleCollection
|
||||
{
|
||||
foreach (var definitionObject in definitionObjects)
|
||||
{
|
||||
Base defObjectBase = Unwrap(definitionObject);
|
||||
Base defObjectBase = UnwrapGeometry(definitionObject);
|
||||
string applicationId = defObjectBase.applicationId!;
|
||||
|
||||
// just add to current collection for now
|
||||
@@ -176,6 +182,40 @@ public class GrasshopperRootObjectBuilder : IRootObjectBuilder<SpeckleCollection
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Converts a <see cref="SpeckleDataObjectWrapper"/> to underlying DataObject with properly configured displayValue.
|
||||
/// Processes colors and materials for each individual geometry during conversion.
|
||||
/// </summary>
|
||||
private DataObject UnwrapDataObject(
|
||||
SpeckleDataObjectWrapper wrapper,
|
||||
GrasshopperColorPacker colorPacker,
|
||||
GrasshopperMaterialPacker materialPacker
|
||||
)
|
||||
{
|
||||
DataObject dataObject = wrapper.DataObject;
|
||||
|
||||
// Convert geometries back to Base objects for displayValue
|
||||
var displayValue = new List<Base>();
|
||||
foreach (var geometryWrapper in wrapper.Geometries)
|
||||
{
|
||||
Base geometryBase = UnwrapGeometry(geometryWrapper);
|
||||
displayValue.Add(geometryBase);
|
||||
|
||||
// process color and material for each geometry while we're iterating
|
||||
// this could be in the switch statements (like SpeckleGeometryWrapper) but then we're unnecessarily looping twice
|
||||
if (geometryWrapper.ApplicationId != null)
|
||||
{
|
||||
colorPacker.ProcessColor(geometryWrapper.ApplicationId, geometryWrapper.Color);
|
||||
materialPacker.ProcessMaterial(geometryWrapper.ApplicationId, geometryWrapper.Material);
|
||||
}
|
||||
}
|
||||
|
||||
// Update the DataObject's displayValue
|
||||
dataObject.displayValue = displayValue;
|
||||
|
||||
return dataObject;
|
||||
}
|
||||
|
||||
/*
|
||||
// will cache the object wrappers and group them by similarity.
|
||||
private void ProcessObjectWrapper(SpeckleObjectWrapper objectWrapper, ref HashSet<string> processedIds)
|
||||
|
||||
+65
@@ -1,5 +1,8 @@
|
||||
using Grasshopper.Documentation;
|
||||
using Grasshopper.Kernel.Types;
|
||||
using Speckle.Connectors.GrasshopperShared.HostApp;
|
||||
using Speckle.Sdk;
|
||||
using Speckle.Sdk.Models;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
|
||||
@@ -32,9 +35,44 @@ public class SpecklePropertyGoo : GH_Goo<object>, ISpecklePropertyGoo
|
||||
{
|
||||
switch (source)
|
||||
{
|
||||
case List<object?> list:
|
||||
List<object?> castedItems = new();
|
||||
foreach (var item in list)
|
||||
{
|
||||
SpecklePropertyGoo itemGoo = new();
|
||||
if (itemGoo.CastFrom(item))
|
||||
{
|
||||
castedItems.Add(itemGoo.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Value = castedItems;
|
||||
return true;
|
||||
case SpecklePropertyGoo speckleProperty:
|
||||
Value = speckleProperty.Value;
|
||||
return true;
|
||||
case Base @base: // this would capture cases of planes, vectors, and intervals from GH
|
||||
try
|
||||
{
|
||||
Value = SpeckleConversionContext.Current.ConvertToHost(@base!).First().Item1;
|
||||
return true;
|
||||
}
|
||||
catch (SpeckleException)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
case GH_Plane plane:
|
||||
Value = plane.Value;
|
||||
return true;
|
||||
case GH_Vector vector:
|
||||
Value = vector.Value;
|
||||
return true;
|
||||
case GH_Interval interval:
|
||||
Value = interval.Value;
|
||||
return true;
|
||||
case double d:
|
||||
Value = d;
|
||||
return true;
|
||||
@@ -89,6 +127,27 @@ public class SpecklePropertyGoo : GH_Goo<object>, ISpecklePropertyGoo
|
||||
return true;
|
||||
}
|
||||
|
||||
if (type.IsAssignableFrom(typeof(GH_Plane)))
|
||||
{
|
||||
object ptr = new GH_Plane((Rhino.Geometry.Plane)Value);
|
||||
target = (T)ptr;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (type.IsAssignableFrom(typeof(GH_Vector)))
|
||||
{
|
||||
object ptr = new GH_Vector((Rhino.Geometry.Vector3d)Value);
|
||||
target = (T)ptr;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (type.IsAssignableFrom(typeof(GH_Interval)))
|
||||
{
|
||||
object ptr = new GH_Interval((Rhino.Geometry.Interval)Value);
|
||||
target = (T)ptr;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (type.IsAssignableFrom(typeof(GH_Integer)))
|
||||
{
|
||||
object ptr = new GH_Integer((int)Value);
|
||||
@@ -129,6 +188,12 @@ public class SpecklePropertyGoo : GH_Goo<object>, ISpecklePropertyGoo
|
||||
|
||||
switch (Value)
|
||||
{
|
||||
case Rhino.Geometry.Plane plane:
|
||||
return prop.Value is Rhino.Geometry.Plane otherPlane && plane.Equals(otherPlane);
|
||||
case Rhino.Geometry.Vector3d vector:
|
||||
return prop.Value is Rhino.Geometry.Vector3d otherVector && vector.Equals(otherVector);
|
||||
case Rhino.Geometry.Interval interval:
|
||||
return prop.Value is Rhino.Geometry.Interval otherInterval && interval.Equals(otherInterval);
|
||||
case string s:
|
||||
return s == prop.Value.ToString();
|
||||
case bool b:
|
||||
|
||||
+22
-35
@@ -1,9 +1,6 @@
|
||||
using Grasshopper.Kernel;
|
||||
using Grasshopper.Kernel.Types;
|
||||
using Rhino.DocObjects;
|
||||
using Speckle.Connectors.GrasshopperShared.Components;
|
||||
using Speckle.Connectors.GrasshopperShared.HostApp;
|
||||
using Speckle.Connectors.GrasshopperShared.Properties;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
|
||||
@@ -91,7 +88,7 @@ public partial class SpecklePropertyGroupGoo : GH_Goo<Dictionary<string, ISpeckl
|
||||
var otherProps = propGroup.Flatten();
|
||||
foreach (var entry in thisProps)
|
||||
{
|
||||
if (!otherProps.TryGetValue(entry.Key, out SpecklePropertyGoo otherValue) || !entry.Value.Equals(otherValue))
|
||||
if (!otherProps.TryGetValue(entry.Key, out SpecklePropertyGoo? otherValue) || !entry.Value.Equals(otherValue))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -189,11 +186,27 @@ public partial class SpecklePropertyGroupGoo : GH_Goo<Dictionary<string, ISpeckl
|
||||
Dictionary<string, object?> dict = new();
|
||||
foreach (var kvp in properties)
|
||||
{
|
||||
object? val = kvp.Value is SpecklePropertyGroupGoo propertyGroup
|
||||
? UnwrapWorker(propertyGroup.Value)
|
||||
: kvp.Value is SpecklePropertyGoo property
|
||||
? property.Value
|
||||
: null;
|
||||
object? val = null;
|
||||
switch (kvp.Value)
|
||||
{
|
||||
case SpecklePropertyGroupGoo propertyGroup:
|
||||
val = UnwrapWorker(propertyGroup.Value);
|
||||
break;
|
||||
case SpecklePropertyGoo property:
|
||||
switch (property.Value)
|
||||
{
|
||||
case Rhino.Geometry.Plane:
|
||||
case Rhino.Geometry.Vector3d:
|
||||
case Rhino.Geometry.Interval:
|
||||
val = SpeckleConversionContext.Current.ConvertToSpeckle(property.Value);
|
||||
break;
|
||||
default:
|
||||
val = property.Value;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
dict.Add(kvp.Key, val);
|
||||
}
|
||||
|
||||
@@ -202,29 +215,3 @@ public partial class SpecklePropertyGroupGoo : GH_Goo<Dictionary<string, ISpeckl
|
||||
|
||||
public override int GetHashCode() => base.GetHashCode();
|
||||
}
|
||||
|
||||
public class SpecklePropertyGroupParam : GH_Param<SpecklePropertyGroupGoo>
|
||||
{
|
||||
public override Guid ComponentGuid => new("AF4757C3-BA33-4ACD-A92B-C80356043129");
|
||||
protected override Bitmap Icon => Resources.speckle_param_properties;
|
||||
public override GH_Exposure Exposure => GH_Exposure.tertiary;
|
||||
|
||||
public SpecklePropertyGroupParam()
|
||||
: this(GH_ParamAccess.item) { }
|
||||
|
||||
public SpecklePropertyGroupParam(IGH_InstanceDescription tag)
|
||||
: base(tag) { }
|
||||
|
||||
public SpecklePropertyGroupParam(IGH_InstanceDescription tag, GH_ParamAccess access)
|
||||
: base(tag, access) { }
|
||||
|
||||
public SpecklePropertyGroupParam(GH_ParamAccess access)
|
||||
: base(
|
||||
"Speckle Properties",
|
||||
"SP",
|
||||
"Represents a set of Speckle Properties",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.PARAMETERS,
|
||||
access
|
||||
) { }
|
||||
}
|
||||
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
using Grasshopper.Kernel;
|
||||
using Speckle.Connectors.GrasshopperShared.Components;
|
||||
using Speckle.Connectors.GrasshopperShared.Properties;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
|
||||
public class SpecklePropertyGroupParam : GH_Param<SpecklePropertyGroupGoo>
|
||||
{
|
||||
public override Guid ComponentGuid => new("AF4757C3-BA33-4ACD-A92B-C80356043129");
|
||||
protected override Bitmap Icon => Resources.speckle_param_properties;
|
||||
public override GH_Exposure Exposure => GH_Exposure.quarternary;
|
||||
|
||||
public SpecklePropertyGroupParam()
|
||||
: this(GH_ParamAccess.item) { }
|
||||
|
||||
public SpecklePropertyGroupParam(IGH_InstanceDescription tag)
|
||||
: base(tag) { }
|
||||
|
||||
public SpecklePropertyGroupParam(IGH_InstanceDescription tag, GH_ParamAccess access)
|
||||
: base(tag, access) { }
|
||||
|
||||
public SpecklePropertyGroupParam(GH_ParamAccess access)
|
||||
: base(
|
||||
"Speckle Properties",
|
||||
"SP",
|
||||
"Represents a set of Speckle Properties",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.PARAMETERS,
|
||||
access
|
||||
) { }
|
||||
}
|
||||
+2
-2
@@ -16,8 +16,8 @@ public class SpeckleUrlModelResourceParam : GH_Param<SpeckleUrlModelResourceGoo>
|
||||
|
||||
public SpeckleUrlModelResourceParam(GH_ParamAccess access)
|
||||
: base(
|
||||
"Model Link",
|
||||
"SML",
|
||||
"Speckle Model",
|
||||
"SM",
|
||||
"A resource link to a Speckle Model",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.PARAMETERS,
|
||||
|
||||
+56
@@ -1,7 +1,10 @@
|
||||
using GH_IO.Serialization;
|
||||
using Grasshopper.Kernel;
|
||||
using Grasshopper.Kernel.Parameters;
|
||||
using Speckle.Connectors.GrasshopperShared.Components.Objects;
|
||||
using Speckle.Connectors.GrasshopperShared.HostApp;
|
||||
using Speckle.Connectors.GrasshopperShared.HostApp.Extras;
|
||||
using Speckle.Connectors.GrasshopperShared.Properties;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
|
||||
@@ -51,6 +54,59 @@ public class SpeckleVariableParam : Param_GenericObject
|
||||
|
||||
public override Guid ComponentGuid => new("A1B2C3D4-E5F6-7890-ABCD-123456789ABC");
|
||||
|
||||
public override void AppendAdditionalMenuItems(ToolStripDropDown menu)
|
||||
{
|
||||
base.AppendAdditionalMenuItems(menu);
|
||||
|
||||
// Append list access menu item if this is a create properties node
|
||||
if (Attributes?.Parent.DocObject is CreateSpeckleProperties)
|
||||
{
|
||||
Menu_AppendSeparator(menu);
|
||||
|
||||
var listAccessToggle = Menu_AppendItem(
|
||||
menu,
|
||||
"List Access",
|
||||
(s, e) => SetAccess(Access == GH_ParamAccess.list ? GH_ParamAccess.item : GH_ParamAccess.list),
|
||||
true,
|
||||
Access == GH_ParamAccess.list
|
||||
);
|
||||
|
||||
listAccessToggle.ToolTipText = "Set this parameter as a List. If disabled, defaults to item access.";
|
||||
listAccessToggle.Image = Resources.speckle_state_access;
|
||||
}
|
||||
}
|
||||
|
||||
public override GH_StateTagList StateTags
|
||||
{
|
||||
get
|
||||
{
|
||||
var tags = base.StateTags;
|
||||
|
||||
if (Kind == GH_ParamKind.input)
|
||||
{
|
||||
if (Access == GH_ParamAccess.list)
|
||||
{
|
||||
tags.Add(new ListAccessStateTag());
|
||||
}
|
||||
}
|
||||
|
||||
return tags;
|
||||
}
|
||||
}
|
||||
|
||||
protected void SetAccess(GH_ParamAccess accessType)
|
||||
{
|
||||
Access = accessType;
|
||||
HandleParamStateChange();
|
||||
}
|
||||
|
||||
private void HandleParamStateChange()
|
||||
{
|
||||
OnObjectChanged(GH_ObjectEventType.DataMapping);
|
||||
OnDisplayExpired(true);
|
||||
ExpireSolution(true);
|
||||
}
|
||||
|
||||
public override void AddSource(IGH_Param source, int index)
|
||||
{
|
||||
base.AddSource(source, index);
|
||||
|
||||
+6
-6
@@ -30,9 +30,9 @@ public class SpeckleBlockDefinitionWrapper : SpeckleWrapper
|
||||
}
|
||||
}
|
||||
|
||||
private List<SpeckleObjectWrapper> _objects = new();
|
||||
private List<SpeckleGeometryWrapper> _objects = new();
|
||||
|
||||
public List<SpeckleObjectWrapper> Objects
|
||||
public List<SpeckleGeometryWrapper> Objects
|
||||
{
|
||||
get => _objects;
|
||||
set
|
||||
@@ -42,10 +42,10 @@ public class SpeckleBlockDefinitionWrapper : SpeckleWrapper
|
||||
}
|
||||
}
|
||||
|
||||
private static void ValidateObjects(List<SpeckleObjectWrapper> objects)
|
||||
private static void ValidateObjects(List<SpeckleGeometryWrapper> objects)
|
||||
{
|
||||
// SpeckleBlockInstanceWrapper inherits from SpeckleObjectWrapper, check if it's assignable, not exact type match
|
||||
var invalidObjects = objects.Where(o => !typeof(SpeckleObjectWrapper).IsAssignableFrom(o.GetType())).ToList();
|
||||
var invalidObjects = objects.Where(o => !typeof(SpeckleGeometryWrapper).IsAssignableFrom(o.GetType())).ToList();
|
||||
|
||||
if (invalidObjects.Count > 0)
|
||||
{
|
||||
@@ -64,7 +64,7 @@ public class SpeckleBlockDefinitionWrapper : SpeckleWrapper
|
||||
/// Creates a preview of the block definition by displaying all contained objects
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Leveraging already defined preview logic for the objects which make up this block. Refer to <see cref="SpeckleObjectWrapper.DrawPreview"/>.
|
||||
/// Leveraging already defined preview logic for the objects which make up this block. Refer to <see cref="SpeckleGeometryWrapper.DrawPreview"/>.
|
||||
/// </remarks>
|
||||
public void DrawPreview(IGH_PreviewArgs args, bool isSelected = false) =>
|
||||
DrawDepthLimitedPreview(args, isSelected, 0);
|
||||
@@ -228,7 +228,7 @@ public class SpeckleBlockDefinitionWrapper : SpeckleWrapper
|
||||
public SpeckleBlockDefinitionWrapper DeepCopy() =>
|
||||
new()
|
||||
{
|
||||
Base = InstanceDefinitionProxy.ShallowCopy(),
|
||||
Base = (Base)InstanceDefinitionProxy.ShallowCopy(),
|
||||
ApplicationId = ApplicationId,
|
||||
Name = Name,
|
||||
Objects = Objects.Select(o => o.DeepCopy()).ToList()
|
||||
|
||||
+34
-26
@@ -13,10 +13,10 @@ public partial class SpeckleBlockDefinitionWrapperGoo
|
||||
switch (source)
|
||||
{
|
||||
case InstanceDefinition instanceDefinition:
|
||||
List<SpeckleObjectWrapper> objects = new();
|
||||
List<SpeckleGeometryWrapper> objects = new();
|
||||
foreach (var defObj in instanceDefinition.GetObjects())
|
||||
{
|
||||
SpeckleObjectWrapperGoo defObjGoo = new();
|
||||
SpeckleGeometryWrapperGoo defObjGoo = new();
|
||||
if (defObjGoo.CastFrom(defObj))
|
||||
{
|
||||
objects.Add(defObjGoo.Value);
|
||||
@@ -28,43 +28,51 @@ public partial class SpeckleBlockDefinitionWrapperGoo
|
||||
return false;
|
||||
}
|
||||
|
||||
Value = new SpeckleBlockDefinitionWrapper()
|
||||
{
|
||||
Base = new InstanceDefinitionProxy
|
||||
{
|
||||
name = instanceDefinition.Name,
|
||||
objects = objects.Select(o => o.ApplicationId!).ToList(),
|
||||
maxDepth = 0 // represent newly created, top-level objects. actual depth calculation happens in GrasshopperBlockPacker
|
||||
},
|
||||
Name = instanceDefinition.Name,
|
||||
Objects = objects,
|
||||
ApplicationId = instanceDefinition.Id.ToString()
|
||||
};
|
||||
|
||||
SetValueFromDefinitionProps(objects, instanceDefinition.Name, instanceDefinition.Id.ToString());
|
||||
return true;
|
||||
|
||||
case ModelInstanceDefinition modelInstanceDef:
|
||||
InstanceDefinition? instanceDef = RhinoDoc.ActiveDoc?.InstanceDefinitions.Find(modelInstanceDef.Name);
|
||||
if (instanceDef == null)
|
||||
List<SpeckleGeometryWrapper> defObjs = new();
|
||||
foreach (var defObj in modelInstanceDef.Objects)
|
||||
{
|
||||
SpeckleGeometryWrapperGoo geoWrapperGoo = new();
|
||||
if (geoWrapperGoo.CastFrom(defObj))
|
||||
{
|
||||
defObjs.Add(geoWrapperGoo.Value);
|
||||
}
|
||||
}
|
||||
|
||||
if (defObjs.Count == 0)
|
||||
{
|
||||
// Rhino → Model → Model Block Definition passthrough component returns type ModelInstanceDefinition
|
||||
// .Objects of a ModelInstanceDefinition returns ModelObjects
|
||||
// ModelObject.Geometry is internal and cannot be accessed directly.
|
||||
// Only way to get geometry from a ModelObject is through RhinoDoc.Objects.FindId(), which only works for baked objects.
|
||||
// Unbaked Grasshopper geometry cannot be processed through the ModelObject workflow until we get a public geometry accessor 😓
|
||||
// ⚠️ So if user defines a Model Block Definition in Grasshopper with Grasshopper (unbaked) geometry, we're stuck.
|
||||
// That's why we're intercepting this case early → if the instanceDef == null don't go further
|
||||
throw new InvalidOperationException(
|
||||
$"Block definition '{modelInstanceDef.Name}' not found in Rhino document. Please bake the definition first or use Speckle Block Definition components instead."
|
||||
$"Block definition '{modelInstanceDef.Name}' did not have any valid geometry."
|
||||
);
|
||||
}
|
||||
|
||||
return CastFromModelObject(instanceDef);
|
||||
SetValueFromDefinitionProps(defObjs, modelInstanceDef.Name, modelInstanceDef.Id.ToString());
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private void SetValueFromDefinitionProps(List<SpeckleGeometryWrapper> objs, string name, string id)
|
||||
{
|
||||
string validAppId = string.IsNullOrWhiteSpace(id) ? Guid.NewGuid().ToString() : id;
|
||||
Value = new SpeckleBlockDefinitionWrapper()
|
||||
{
|
||||
Base = new InstanceDefinitionProxy
|
||||
{
|
||||
name = name,
|
||||
objects = objs.Select(o => o.ApplicationId!).ToList(),
|
||||
maxDepth = 0 // represent newly created, top-level objects. actual depth calculation happens in GrasshopperBlockPacker
|
||||
},
|
||||
Name = name,
|
||||
Objects = objs,
|
||||
ApplicationId = validAppId
|
||||
};
|
||||
}
|
||||
|
||||
private bool CastToModelObject<T>(ref T target)
|
||||
{
|
||||
var type = typeof(T);
|
||||
|
||||
+2
-1
@@ -1,4 +1,5 @@
|
||||
using Grasshopper.Kernel.Types;
|
||||
using Speckle.Sdk.Models;
|
||||
using Speckle.Sdk.Models.Instances;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
@@ -75,7 +76,7 @@ public partial class SpeckleBlockDefinitionWrapperGoo : GH_Goo<SpeckleBlockDefin
|
||||
public SpeckleBlockDefinitionWrapper DeepCopy() =>
|
||||
new()
|
||||
{
|
||||
Base = Value.InstanceDefinitionProxy.ShallowCopy(),
|
||||
Base = (Base)Value.InstanceDefinitionProxy.ShallowCopy(),
|
||||
Name = Value.Name,
|
||||
Objects = Value.Objects.Select(o => o.DeepCopy()).ToList(),
|
||||
ApplicationId = Value.ApplicationId
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ public class SpeckleBlockDefinitionWrapperParam
|
||||
|
||||
protected override Bitmap Icon => Resources.speckle_param_block_def;
|
||||
|
||||
public override GH_Exposure Exposure => GH_Exposure.secondary;
|
||||
public override GH_Exposure Exposure => GH_Exposure.tertiary;
|
||||
|
||||
public override void RegisterRemoteIDs(GH_GuidTable idList)
|
||||
{
|
||||
|
||||
+6
-6
@@ -11,11 +11,11 @@ using Speckle.Sdk.Models.Instances;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
|
||||
public class SpeckleBlockInstanceWrapper : SpeckleObjectWrapper
|
||||
public class SpeckleBlockInstanceWrapper : SpeckleGeometryWrapper
|
||||
{
|
||||
private InstanceProxy _instanceProxy;
|
||||
private Transform _transform = Transform.Identity;
|
||||
private List<SpeckleObjectWrapper>? _cachedTransformedObjects;
|
||||
private List<SpeckleGeometryWrapper>? _cachedTransformedObjects;
|
||||
private Transform _lastCachedTransform = Transform.Unset;
|
||||
private const int MAX_DISPLAY_DEPTH = 3;
|
||||
private SpeckleBlockDefinitionWrapper? _definition;
|
||||
@@ -194,10 +194,10 @@ public class SpeckleBlockInstanceWrapper : SpeckleObjectWrapper
|
||||
}
|
||||
}
|
||||
|
||||
public override SpeckleObjectWrapper DeepCopy() =>
|
||||
public override SpeckleGeometryWrapper DeepCopy() =>
|
||||
new SpeckleBlockInstanceWrapper()
|
||||
{
|
||||
Base = InstanceProxy.ShallowCopy(),
|
||||
Base = (Base)InstanceProxy.ShallowCopy(),
|
||||
GeometryBase = GeometryBase?.Duplicate(),
|
||||
Color = Color,
|
||||
Material = Material,
|
||||
@@ -224,7 +224,7 @@ public class SpeckleBlockInstanceWrapper : SpeckleObjectWrapper
|
||||
/// Gets or builds a cached list of transformed objects for displaying.
|
||||
/// Only rebuilds the cache when the transform changes, dramatically improving performance.
|
||||
/// </summary>
|
||||
private List<SpeckleObjectWrapper> GetTransformedObjectsForDisplay()
|
||||
private List<SpeckleGeometryWrapper> GetTransformedObjectsForDisplay()
|
||||
{
|
||||
// Check if cache is valid (transform hasn't changed)
|
||||
if (_cachedTransformedObjects != null && Transform.Equals(_lastCachedTransform))
|
||||
@@ -233,7 +233,7 @@ public class SpeckleBlockInstanceWrapper : SpeckleObjectWrapper
|
||||
}
|
||||
|
||||
// Rebuild cache
|
||||
_cachedTransformedObjects = new List<SpeckleObjectWrapper>();
|
||||
_cachedTransformedObjects = new List<SpeckleGeometryWrapper>();
|
||||
_lastCachedTransform = Transform;
|
||||
|
||||
if (Definition?.Objects == null)
|
||||
|
||||
+2
-2
@@ -14,7 +14,7 @@ public partial class SpeckleBlockInstanceWrapperGoo
|
||||
switch (source)
|
||||
{
|
||||
case InstanceReferenceGeometry instanceRef:
|
||||
SpeckleObjectWrapperGoo objGoo = new();
|
||||
SpeckleGeometryWrapperGoo objGoo = new();
|
||||
objGoo.CastFrom(instanceRef);
|
||||
if (objGoo.Value is SpeckleBlockInstanceWrapper instanceWrapper)
|
||||
{
|
||||
@@ -33,7 +33,7 @@ public partial class SpeckleBlockInstanceWrapperGoo
|
||||
case ModelObject modelObject:
|
||||
if (modelObject.ObjectType == ObjectType.InstanceReference)
|
||||
{
|
||||
SpeckleObjectWrapperGoo modelObjGoo = new();
|
||||
SpeckleGeometryWrapperGoo modelObjGoo = new();
|
||||
modelObjGoo.CastFrom(modelObject); // handles all model object casting like geo conversion, model object name and props and color and mat
|
||||
|
||||
if (modelObjGoo.Value is SpeckleBlockInstanceWrapper modelInstanceWrapper)
|
||||
|
||||
+4
-4
@@ -47,14 +47,14 @@ public partial class SpeckleBlockInstanceWrapperGoo : GH_Goo<SpeckleBlockInstanc
|
||||
case GH_Goo<SpeckleBlockInstanceWrapper> goo:
|
||||
Value = goo.Value;
|
||||
return true;
|
||||
case SpeckleObjectWrapperGoo objWrapperGoo:
|
||||
case SpeckleGeometryWrapperGoo objWrapperGoo:
|
||||
if (objWrapperGoo.Value is SpeckleBlockInstanceWrapper objWrapper)
|
||||
{
|
||||
Value = objWrapper;
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
case GH_Goo<SpeckleObjectWrapper> goo:
|
||||
case GH_Goo<SpeckleGeometryWrapper> goo:
|
||||
if (goo.Value is SpeckleBlockInstanceWrapper wrapper)
|
||||
{
|
||||
Value = wrapper;
|
||||
@@ -75,7 +75,7 @@ public partial class SpeckleBlockInstanceWrapperGoo : GH_Goo<SpeckleBlockInstanc
|
||||
return false;
|
||||
}
|
||||
|
||||
Base converted = SpeckleConversionContext.ConvertToSpeckle(instance);
|
||||
Base converted = SpeckleConversionContext.Current.ConvertToSpeckle(instance);
|
||||
Value = new SpeckleBlockInstanceWrapper()
|
||||
{
|
||||
GeometryBase = instance,
|
||||
@@ -93,7 +93,7 @@ public partial class SpeckleBlockInstanceWrapperGoo : GH_Goo<SpeckleBlockInstanc
|
||||
{
|
||||
switch (target)
|
||||
{
|
||||
case SpeckleObjectWrapperGoo:
|
||||
case SpeckleGeometryWrapperGoo:
|
||||
target = (T)(object)Value;
|
||||
return true;
|
||||
case Transform:
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ public class SpeckleBlockInstanceParam
|
||||
public override Guid ComponentGuid => new("938CCD6E-B202-4A0C-9D68-ABD7683B0EDE");
|
||||
protected override Bitmap Icon => Resources.speckle_param_block_instance;
|
||||
|
||||
public override GH_Exposure Exposure => GH_Exposure.secondary;
|
||||
public override GH_Exposure Exposure => GH_Exposure.tertiary;
|
||||
|
||||
public override void RegisterRemoteIDs(GH_GuidTable idList)
|
||||
{
|
||||
|
||||
+3
-3
@@ -92,7 +92,7 @@ public class SpeckleCollectionWrapper : SpeckleWrapper, ISpeckleCollectionObject
|
||||
{
|
||||
switch (element)
|
||||
{
|
||||
case SpeckleObjectWrapper o:
|
||||
case SpeckleGeometryWrapper o:
|
||||
o.Path = newPath;
|
||||
o.Parent = this;
|
||||
break;
|
||||
@@ -122,7 +122,7 @@ public class SpeckleCollectionWrapper : SpeckleWrapper, ISpeckleCollectionObject
|
||||
{
|
||||
SpeckleCollectionWrapper c => c.DeepCopy(),
|
||||
SpeckleBlockInstanceWrapper b => b.DeepCopy(),
|
||||
SpeckleObjectWrapper o => o.DeepCopy(),
|
||||
SpeckleGeometryWrapper o => o.DeepCopy(),
|
||||
_ => e
|
||||
}
|
||||
)
|
||||
@@ -156,7 +156,7 @@ public class SpeckleCollectionWrapper : SpeckleWrapper, ISpeckleCollectionObject
|
||||
// then bake elements in this collection
|
||||
foreach (var obj in Elements)
|
||||
{
|
||||
if (obj is SpeckleObjectWrapper so)
|
||||
if (obj is SpeckleGeometryWrapper so)
|
||||
{
|
||||
if (bakeObjects)
|
||||
{
|
||||
|
||||
+2
-2
@@ -66,7 +66,7 @@ public class SpeckleCollectionParam : GH_Param<SpeckleCollectionWrapperGoo>, IGH
|
||||
|
||||
public bool IsPreviewCapable => !VolatileData.IsEmpty;
|
||||
|
||||
private readonly List<SpeckleObjectWrapper> _previewObjects = new();
|
||||
private readonly List<SpeckleGeometryWrapper> _previewObjects = new();
|
||||
|
||||
public void DrawViewportMeshes(IGH_PreviewArgs args)
|
||||
{
|
||||
@@ -118,7 +118,7 @@ public class SpeckleCollectionParam : GH_Param<SpeckleCollectionWrapperGoo>, IGH
|
||||
FlattenForPreview(subCollWrapper);
|
||||
}
|
||||
|
||||
if (element is SpeckleObjectWrapper objWrapper)
|
||||
if (element is SpeckleGeometryWrapper objWrapper)
|
||||
{
|
||||
_previewObjects.Add(objWrapper);
|
||||
var box = objWrapper.GeometryBase is null ? new() : objWrapper.GeometryBase.GetBoundingBox(false);
|
||||
|
||||
+278
@@ -0,0 +1,278 @@
|
||||
using Grasshopper.Kernel;
|
||||
using Grasshopper.Kernel.Types;
|
||||
using Rhino;
|
||||
using Rhino.Display;
|
||||
using Speckle.Sdk;
|
||||
using Speckle.Sdk.Models;
|
||||
using DataObject = Speckle.Objects.Data.DataObject;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
|
||||
/// <summary>
|
||||
/// Wrapper around a data object and its converted speckle equivalent.
|
||||
/// </summary>
|
||||
public class SpeckleDataObjectWrapper : SpeckleWrapper, ISpeckleCollectionObject
|
||||
{
|
||||
/// <summary>
|
||||
/// Name on the wrapper and wrapped Base (DataObject) are kept in sync here.
|
||||
/// DataObject.name is the single source of truth - all geometry names inherit from it.
|
||||
/// </summary>
|
||||
public override string Name
|
||||
{
|
||||
get => DataObject.name;
|
||||
set
|
||||
{
|
||||
DataObject.name = value;
|
||||
SyncGeometryNames(); // Only sync names when name changes
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The wrapped DataObject.
|
||||
/// </summary>
|
||||
public DataObject DataObject { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Validated gateway to the typed property (validates and delegates to DataObject).
|
||||
/// </summary>
|
||||
public override required Base Base
|
||||
{
|
||||
get => DataObject;
|
||||
set
|
||||
{
|
||||
if (value is not DataObject dataObject)
|
||||
{
|
||||
throw new ArgumentException("Cannot create data object wrapper from a non-DataObject Base");
|
||||
}
|
||||
DataObject = dataObject;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Contains a list of <see cref="SpeckleGeometryWrapper"/>.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// A list of the wrappers as opposed to the geometry bases allows us to hold on to the color and material information.
|
||||
/// However, this does make syncing of name, props etc. more challenging.
|
||||
/// </remarks>
|
||||
public List<SpeckleGeometryWrapper> Geometries { get; set; } = [];
|
||||
|
||||
private List<string> _path = [];
|
||||
|
||||
/// <summary>
|
||||
/// The list of collection names that forms the full path to this object.
|
||||
/// </summary>
|
||||
public List<string> Path
|
||||
{
|
||||
get => _path;
|
||||
set
|
||||
{
|
||||
_path = value;
|
||||
SyncGeometryPath();
|
||||
}
|
||||
}
|
||||
|
||||
private SpeckleCollectionWrapper? _parent;
|
||||
|
||||
/// <summary>
|
||||
/// Reference to the parent collection wrapper.
|
||||
/// </summary>
|
||||
public SpeckleCollectionWrapper? Parent
|
||||
{
|
||||
get => _parent;
|
||||
set
|
||||
{
|
||||
_parent = value;
|
||||
SyncGeometryParent();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Try to keep DataObject.properties as source of truth.
|
||||
/// </summary>
|
||||
public SpecklePropertyGroupGoo Properties
|
||||
{
|
||||
get => new(DataObject.properties);
|
||||
set
|
||||
{
|
||||
DataObject.properties = value.Unwrap();
|
||||
SyncGeometryProperties(value); // Pass existing goo, only sync properties
|
||||
}
|
||||
}
|
||||
|
||||
public override IGH_Goo CreateGoo() => new SpeckleDataObjectWrapperGoo(this);
|
||||
|
||||
public override string ToString() =>
|
||||
$"Speckle Data Object : {(string.IsNullOrWhiteSpace(Name) ? Base.speckle_type : Name)}";
|
||||
|
||||
/// <summary>
|
||||
/// Draws preview for all geometries contained in this data object.
|
||||
/// </summary>
|
||||
public virtual void DrawPreview(IGH_PreviewArgs args, bool isSelected = false)
|
||||
{
|
||||
// iterate through all geometries and delegate to their existing preview logic
|
||||
foreach (var geometry in Geometries)
|
||||
{
|
||||
geometry.DrawPreview(args, isSelected);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Draws raw preview for all geometries using a specific material.
|
||||
/// </summary>
|
||||
public void DrawPreviewRaw(DisplayPipeline display, DisplayMaterial material)
|
||||
{
|
||||
foreach (var geometry in Geometries)
|
||||
{
|
||||
geometry.DrawPreviewRaw(display, material);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Bakes the DataObject as a Rhino group containing all the display geometries.
|
||||
/// </summary>
|
||||
/// <param name="doc">Rhino doc to bake into</param>
|
||||
/// <param name="objIds">Collection to store created objects GUIDs</param>
|
||||
/// <param name="bakeLayerIndex">Layer index to bake geometries to (-1 for automatic)</param>
|
||||
/// <param name="layersAlreadyCreated">Indicates whether layers have already been created or not</param>
|
||||
/// <param name="baseLayerName">Base layer name for group naming</param>
|
||||
public virtual void Bake(
|
||||
RhinoDoc doc,
|
||||
List<Guid> objIds,
|
||||
int bakeLayerIndex = -1,
|
||||
bool layersAlreadyCreated = false,
|
||||
string? baseLayerName = null
|
||||
)
|
||||
{
|
||||
// handles layer creation (if needed)
|
||||
if (!layersAlreadyCreated && bakeLayerIndex < 0 && Path.Count > 0 && Parent != null)
|
||||
{
|
||||
bakeLayerIndex = Parent.Bake(doc, objIds, false);
|
||||
if (bakeLayerIndex < 0)
|
||||
{
|
||||
return; // failed to create layers
|
||||
}
|
||||
}
|
||||
|
||||
if (Geometries.Count == 0)
|
||||
{
|
||||
return; // nothing to bake
|
||||
}
|
||||
|
||||
// bake all display geometries as individual objects
|
||||
List<Guid> geometryIds = [];
|
||||
|
||||
foreach (SpeckleGeometryWrapper geometryWrapper in Geometries)
|
||||
{
|
||||
if (geometryWrapper.GeometryBase != null)
|
||||
{
|
||||
// geometry wrappers should already be synced via prop setters, assume we're in a consistent state
|
||||
List<Guid> currentGeometryIds = [];
|
||||
geometryWrapper.Bake(doc, currentGeometryIds, bakeLayerIndex, true);
|
||||
geometryIds.AddRange(currentGeometryIds);
|
||||
}
|
||||
}
|
||||
|
||||
// create a group for all geometries
|
||||
if (geometryIds.Count > 1)
|
||||
{
|
||||
string groupName = CreateGroupName(baseLayerName);
|
||||
|
||||
try
|
||||
{
|
||||
int groupIndex = doc.Groups.Add(groupName, geometryIds);
|
||||
|
||||
if (groupIndex >= 0)
|
||||
{
|
||||
var group = doc.Groups.FindIndex(groupIndex);
|
||||
objIds.Add(group.Id); // add group ID first
|
||||
}
|
||||
}
|
||||
catch (Exception ex) when (!ex.IsFatal())
|
||||
{
|
||||
// group creation failed - continue like RhinoGroupBaker pattern
|
||||
// causes: invalid object IDs? duplicate names? doc state issues?
|
||||
}
|
||||
|
||||
// always add individual geometry IDs (whether group creation succeeded or failed)
|
||||
objIds.AddRange(geometryIds);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Creates a deep copy of this wrapper.
|
||||
/// </summary>
|
||||
public SpeckleDataObjectWrapper DeepCopy() =>
|
||||
new()
|
||||
{
|
||||
Base = (Base)DataObject.ShallowCopy(),
|
||||
Geometries = [.. Geometries.Select(g => g.DeepCopy())],
|
||||
Properties = Properties,
|
||||
ApplicationId = ApplicationId,
|
||||
Name = Name,
|
||||
Path = [.. Path],
|
||||
Parent = Parent
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
/// Syncs geometry names to match the DataObject name.
|
||||
/// </summary>
|
||||
private void SyncGeometryNames()
|
||||
{
|
||||
foreach (var geometry in Geometries)
|
||||
{
|
||||
geometry.Name = DataObject.name;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Syncs geometry properties to match the DataObject properties.
|
||||
/// </summary>
|
||||
private void SyncGeometryProperties(SpecklePropertyGroupGoo propertyGoo)
|
||||
{
|
||||
foreach (var geometry in Geometries)
|
||||
{
|
||||
geometry.Properties = propertyGoo; // Reuse the passed goo
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Syncs geometry paths.
|
||||
/// </summary>
|
||||
private void SyncGeometryPath()
|
||||
{
|
||||
foreach (var geometry in Geometries)
|
||||
{
|
||||
geometry.Path = [.. Path];
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Syncs geometry parents.
|
||||
/// </summary>
|
||||
private void SyncGeometryParent()
|
||||
{
|
||||
foreach (var geometry in Geometries)
|
||||
{
|
||||
geometry.Parent = Parent;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Creates a descriptive group name
|
||||
/// </summary>
|
||||
private string CreateGroupName(string? baseLayerName)
|
||||
{
|
||||
// Reference: RhinoGroupBaker.BakeGroups pattern:
|
||||
// var groupName = (groupProxy.name ?? "No Name Group") + $" ({baseLayerName})";
|
||||
|
||||
string groupName = !string.IsNullOrEmpty(Name) ? Name : "No Name DataObject";
|
||||
|
||||
if (!string.IsNullOrEmpty(baseLayerName))
|
||||
{
|
||||
return $"{groupName} ({baseLayerName})";
|
||||
}
|
||||
|
||||
return groupName;
|
||||
}
|
||||
}
|
||||
+58
@@ -0,0 +1,58 @@
|
||||
#if RHINO8_OR_GREATER
|
||||
using Grasshopper.Kernel;
|
||||
using Grasshopper.Kernel.Types;
|
||||
using Grasshopper.Rhinoceros.Model;
|
||||
using Rhino.DocObjects;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
|
||||
/// <summary>
|
||||
/// Rhino 8+ ModelObject casting support for SpeckleDataObjectWrapperGoo.
|
||||
/// </summary>
|
||||
public partial class SpeckleDataObjectWrapperGoo : GH_Goo<SpeckleDataObjectWrapper>, IGH_PreviewData
|
||||
{
|
||||
/// <summary>
|
||||
/// Handles casting from Rhino 8+ ModelObjects to DataObject.
|
||||
/// </summary>
|
||||
private bool CastFromModelObject(object source)
|
||||
{
|
||||
switch (source)
|
||||
{
|
||||
case ModelObject modelObject:
|
||||
var geometryWrapperGoo = new SpeckleGeometryWrapperGoo(modelObject);
|
||||
if (geometryWrapperGoo.IsValid)
|
||||
{
|
||||
return CastFromSpeckleGeometryWrapper(geometryWrapperGoo.Value);
|
||||
}
|
||||
return false;
|
||||
|
||||
case RhinoObject rhinoObject: // can this happen? I'm inclined to say no, but who knows with gh
|
||||
return CastFromModelObject((ModelObject)rhinoObject);
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Handles casting from DataObject to Rhino 8+ ModelObjects.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Only works if DataObject has exactly one geometry
|
||||
/// </remarks>
|
||||
private bool CastToModelObject<T>(ref T target)
|
||||
{
|
||||
if (Value.Geometries.Count != 1)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// extract first (and only) geometry and delegate to SpeckleGeometryWrapperGoo
|
||||
var firstGeometry = Value.Geometries[0];
|
||||
var geometryGoo = new SpeckleGeometryWrapperGoo(firstGeometry);
|
||||
|
||||
// using existing ModelObject casting logic from SpeckleGeometryWrapperGoo
|
||||
return geometryGoo.CastTo(ref target);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
+199
@@ -0,0 +1,199 @@
|
||||
using Grasshopper.Kernel;
|
||||
using Grasshopper.Kernel.Types;
|
||||
using Rhino.Geometry;
|
||||
using Speckle.Sdk.Models;
|
||||
using DataObject = Speckle.Objects.Data.DataObject;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
|
||||
/// <summary>
|
||||
/// Goo wrapper for SpeckleDataObjectWrapper.
|
||||
/// </summary>
|
||||
public partial class SpeckleDataObjectWrapperGoo : GH_Goo<SpeckleDataObjectWrapper>, IGH_PreviewData
|
||||
{
|
||||
/// <summary>
|
||||
/// Creates goo with a DataObject wrapper.
|
||||
/// </summary>
|
||||
public SpeckleDataObjectWrapperGoo(SpeckleDataObjectWrapper value)
|
||||
{
|
||||
Value = value;
|
||||
}
|
||||
|
||||
/// <summary>Parameterless constructor</summary>
|
||||
/// <remarks>Should only be used for casting!</remarks>
|
||||
public SpeckleDataObjectWrapperGoo()
|
||||
{
|
||||
Value = new()
|
||||
{
|
||||
Base = new DataObject
|
||||
{
|
||||
name = "",
|
||||
displayValue = [],
|
||||
properties = new Dictionary<string, object?>()
|
||||
},
|
||||
Geometries = []
|
||||
};
|
||||
}
|
||||
|
||||
public override bool IsValid => Value?.DataObject is not null && Value.ApplicationId is not null;
|
||||
public override string TypeName => "Speckle Data Object";
|
||||
public override string TypeDescription => "Represents a Speckle data object";
|
||||
|
||||
public override IGH_Goo Duplicate() => new SpeckleDataObjectWrapperGoo(Value.DeepCopy());
|
||||
|
||||
public override string ToString() =>
|
||||
$"Speckle Data Object : {(string.IsNullOrWhiteSpace(Value.Name) ? Value.Base.speckle_type : Value.Name)}";
|
||||
|
||||
/// <summary>
|
||||
/// Handles casting from other types to DataObject wrapper.
|
||||
/// </summary>
|
||||
public override bool CastFrom(object source)
|
||||
{
|
||||
switch (source)
|
||||
{
|
||||
// 1 - data object → data object
|
||||
case SpeckleDataObjectWrapper wrapper:
|
||||
Value = wrapper;
|
||||
return true;
|
||||
case SpeckleDataObjectWrapperGoo wrapperGoo:
|
||||
Value = wrapperGoo.Value;
|
||||
return true;
|
||||
|
||||
// 2 - speckle geometry → data object
|
||||
case SpeckleBlockInstanceWrapper:
|
||||
case SpeckleBlockInstanceWrapperGoo:
|
||||
// TODO: We need to have a larger discussion around allowing instances within data objects.
|
||||
// We don't allow instances within data objects for now
|
||||
return false;
|
||||
case SpeckleGeometryWrapper geometryWrapper:
|
||||
return CastFromSpeckleGeometryWrapper(geometryWrapper);
|
||||
case SpeckleGeometryWrapperGoo geometryWrapperGoo:
|
||||
return CastFromSpeckleGeometryWrapper(geometryWrapperGoo.Value);
|
||||
|
||||
// 3 - gh geometry → data object
|
||||
case IGH_GeometricGoo geometricGoo:
|
||||
return CastFromIghGeometricGoo(geometricGoo);
|
||||
|
||||
// 4 - model object → data object (Rhino 8+)
|
||||
default:
|
||||
return CastFromModelObject(source); // Try ModelObject casting (will return false on Rhino 7)
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Handles casting to other types from DataObject wrapper.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Only allows geometry casting when DataObject has exactly one geometry.
|
||||
/// </remarks>
|
||||
public override bool CastTo<T>(ref T target)
|
||||
{
|
||||
switch (target)
|
||||
{
|
||||
case DataObject:
|
||||
target = (T)(object)Value.DataObject;
|
||||
return true;
|
||||
|
||||
case SpeckleDataObjectWrapper:
|
||||
target = (T)(object)Value;
|
||||
return true;
|
||||
|
||||
case SpeckleDataObjectWrapperGoo:
|
||||
target = (T)(object)this;
|
||||
return true;
|
||||
|
||||
case Base:
|
||||
target = (T)(object)Value.DataObject;
|
||||
return true;
|
||||
|
||||
// for geometry types, only allow if exactly one geometry
|
||||
default:
|
||||
if (Value.Geometries.Count == 1)
|
||||
{
|
||||
var singleGeometry = Value.Geometries[0];
|
||||
var geometryGoo = new SpeckleGeometryWrapperGoo(singleGeometry);
|
||||
|
||||
// this should handle all IGH_GeometricGoo types and ModelObjects
|
||||
return geometryGoo.CastTo(ref target);
|
||||
}
|
||||
|
||||
return CastToModelObject(ref target);
|
||||
}
|
||||
}
|
||||
|
||||
#if !RHINO8_OR_GREATER
|
||||
private bool CastFromModelObject(object _) => false;
|
||||
|
||||
private bool CastToModelObject<T>(ref T _) => false;
|
||||
#endif
|
||||
|
||||
public void DrawViewportWires(GH_PreviewWireArgs args)
|
||||
{
|
||||
// TODO?
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Draws viewport meshes/surfaces for the data object.
|
||||
/// </summary>
|
||||
public void DrawViewportMeshes(GH_PreviewMeshArgs args) => Value.DrawPreviewRaw(args.Pipeline, args.Material);
|
||||
|
||||
/// <summary>
|
||||
/// Calculates the bounding box for all geometries in this data object.
|
||||
/// </summary>
|
||||
public BoundingBox ClippingBox
|
||||
{
|
||||
get
|
||||
{
|
||||
var clippingBox = new BoundingBox();
|
||||
|
||||
foreach (var geometry in Value.Geometries)
|
||||
{
|
||||
if (geometry.GeometryBase != null)
|
||||
{
|
||||
var box = geometry.GeometryBase.GetBoundingBox(false);
|
||||
clippingBox.Union(box);
|
||||
}
|
||||
}
|
||||
|
||||
return clippingBox;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Creates a single-element DataObject from <see cref="SpeckleGeometryWrapper"/> (one geometry → one display value).
|
||||
/// </summary>
|
||||
private bool CastFromSpeckleGeometryWrapper(SpeckleGeometryWrapper geometryWrapper)
|
||||
{
|
||||
// create DataObject with single displayValue
|
||||
DataObject dataObject =
|
||||
new()
|
||||
{
|
||||
name = geometryWrapper.Name,
|
||||
displayValue = [geometryWrapper.Base],
|
||||
properties = geometryWrapper.Properties.Unwrap(),
|
||||
applicationId = geometryWrapper.ApplicationId
|
||||
};
|
||||
|
||||
// create wrapper - Name, ApplicationId and Properties kept in sync with wrapped DataObject through getters/setters
|
||||
// geometry will inherit DataObject properties through the syncing (hopefully)
|
||||
Value = new SpeckleDataObjectWrapper
|
||||
{
|
||||
Base = dataObject,
|
||||
Geometries = [geometryWrapper],
|
||||
Path = [.. geometryWrapper.Path],
|
||||
Parent = geometryWrapper.Parent
|
||||
};
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private bool CastFromIghGeometricGoo(IGH_GeometricGoo geometricGoo)
|
||||
{
|
||||
SpeckleGeometryWrapperGoo geoGoo = new();
|
||||
if (geoGoo.CastFrom(geometricGoo))
|
||||
{
|
||||
return CastFromSpeckleGeometryWrapper(geoGoo.Value);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
+112
@@ -0,0 +1,112 @@
|
||||
using Grasshopper.Kernel;
|
||||
using Rhino;
|
||||
using Rhino.DocObjects;
|
||||
using Rhino.Geometry;
|
||||
using Speckle.Connectors.GrasshopperShared.Components;
|
||||
using Speckle.Connectors.GrasshopperShared.Properties;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
|
||||
public class SpeckleDataObjectParam : GH_Param<SpeckleDataObjectWrapperGoo>, IGH_BakeAwareObject, IGH_PreviewObject
|
||||
{
|
||||
public SpeckleDataObjectParam()
|
||||
: this(GH_ParamAccess.item) { }
|
||||
|
||||
public SpeckleDataObjectParam(IGH_InstanceDescription tag)
|
||||
: base(tag) { }
|
||||
|
||||
public SpeckleDataObjectParam(IGH_InstanceDescription tag, GH_ParamAccess access)
|
||||
: base(tag, access) { }
|
||||
|
||||
public SpeckleDataObjectParam(GH_ParamAccess access)
|
||||
: base(
|
||||
"Speckle Data Object",
|
||||
"SDO",
|
||||
"A Speckle data object with structured properties and display geometries",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.PARAMETERS,
|
||||
access
|
||||
) { }
|
||||
|
||||
public override Guid ComponentGuid => new("47B930F9-587B-4A88-8CEB-19986E60BA61");
|
||||
protected override Bitmap Icon => Resources.speckle_param_dataobject;
|
||||
public override GH_Exposure Exposure => GH_Exposure.secondary;
|
||||
|
||||
bool IGH_BakeAwareObject.IsBakeCapable => !VolatileData.IsEmpty;
|
||||
|
||||
void IGH_BakeAwareObject.BakeGeometry(RhinoDoc doc, List<Guid> objIds)
|
||||
{
|
||||
foreach (var item in VolatileData.AllData(true))
|
||||
{
|
||||
if (item is SpeckleDataObjectWrapperGoo goo)
|
||||
{
|
||||
goo.Value.Bake(doc, objIds);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void IGH_BakeAwareObject.BakeGeometry(RhinoDoc doc, ObjectAttributes att, List<Guid> objIds)
|
||||
{
|
||||
foreach (var item in VolatileData.AllData(true))
|
||||
{
|
||||
if (item is SpeckleDataObjectWrapperGoo goo)
|
||||
{
|
||||
int layerIndex = goo.Value.Path.Count == 0 ? att.LayerIndex : -1;
|
||||
bool layerCreated = goo.Value.Path.Count == 0;
|
||||
goo.Value.Bake(doc, objIds, layerIndex, layerCreated);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Draws viewport wires for all data objects in this parameter.
|
||||
/// </summary>
|
||||
public void DrawViewportWires(IGH_PreviewArgs args)
|
||||
{
|
||||
// Following the pattern - most wire drawing is handled in DrawViewportMeshes
|
||||
// Keep this minimal like other parameter types
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Draws viewport meshes for all data objects in this parameter.
|
||||
/// </summary>
|
||||
public void DrawViewportMeshes(IGH_PreviewArgs args)
|
||||
{
|
||||
var isSelected = args.Document.SelectedObjects().Contains(this) || OwnerSelected();
|
||||
|
||||
foreach (var item in VolatileData.AllData(true))
|
||||
{
|
||||
if (item is SpeckleDataObjectWrapperGoo goo)
|
||||
{
|
||||
goo.Value.DrawPreview(args, isSelected);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public bool Hidden { get; set; }
|
||||
|
||||
public bool IsPreviewCapable => !VolatileData.IsEmpty;
|
||||
|
||||
/// <summary>
|
||||
/// Calculates the clipping box for all data objects in this parameter.
|
||||
/// </summary>
|
||||
public BoundingBox ClippingBox
|
||||
{
|
||||
get
|
||||
{
|
||||
var clippingBox = new BoundingBox();
|
||||
|
||||
foreach (var item in VolatileData.AllData(true))
|
||||
{
|
||||
if (item is SpeckleDataObjectWrapperGoo goo)
|
||||
{
|
||||
clippingBox.Union(goo.ClippingBox);
|
||||
}
|
||||
}
|
||||
|
||||
return clippingBox;
|
||||
}
|
||||
}
|
||||
|
||||
private bool OwnerSelected() => Attributes?.Parent?.Selected ?? false;
|
||||
}
|
||||
+5
-5
@@ -11,7 +11,7 @@ namespace Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
/// <summary>
|
||||
/// Wrapper around a geometry base object and its converted speckle equivalent.
|
||||
/// </summary>
|
||||
public class SpeckleObjectWrapper : SpeckleWrapper, ISpeckleCollectionObject
|
||||
public class SpeckleGeometryWrapper : SpeckleWrapper, ISpeckleCollectionObject
|
||||
{
|
||||
public override required Base Base { get; set; }
|
||||
|
||||
@@ -40,7 +40,7 @@ public class SpeckleObjectWrapper : SpeckleWrapper, ISpeckleCollectionObject
|
||||
public SpeckleMaterialWrapper? Material { get; set; }
|
||||
|
||||
public override string ToString() =>
|
||||
$"Speckle Object : {(string.IsNullOrWhiteSpace(Name) ? Base.speckle_type : Name)}";
|
||||
$"Speckle Geometry : {(string.IsNullOrWhiteSpace(Name) ? Base.speckle_type : Name)}";
|
||||
|
||||
public virtual void DrawPreview(IGH_PreviewArgs args, bool isSelected = false)
|
||||
{
|
||||
@@ -145,10 +145,10 @@ public class SpeckleObjectWrapper : SpeckleWrapper, ISpeckleCollectionObject
|
||||
objIds.Add(guid);
|
||||
}
|
||||
|
||||
public virtual SpeckleObjectWrapper DeepCopy() =>
|
||||
public virtual SpeckleGeometryWrapper DeepCopy() =>
|
||||
new()
|
||||
{
|
||||
Base = Base.ShallowCopy(),
|
||||
Base = (Base)Base.ShallowCopy(),
|
||||
GeometryBase = GeometryBase?.Duplicate(),
|
||||
Color = Color,
|
||||
Material = Material,
|
||||
@@ -175,7 +175,7 @@ public class SpeckleObjectWrapper : SpeckleWrapper, ISpeckleCollectionObject
|
||||
return attributes;
|
||||
}
|
||||
|
||||
public override IGH_Goo CreateGoo() => new SpeckleObjectWrapperGoo(this);
|
||||
public override IGH_Goo CreateGoo() => new SpeckleGeometryWrapperGoo(this);
|
||||
|
||||
protected virtual void AddPropertiesToAttributes(ObjectAttributes attributes) =>
|
||||
Properties?.AssignToObjectAttributes(attributes);
|
||||
+14
-14
@@ -11,9 +11,9 @@ using Speckle.Sdk.Models;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
|
||||
public partial class SpeckleObjectWrapperGoo : GH_Goo<SpeckleObjectWrapper>, IGH_PreviewData
|
||||
public partial class SpeckleGeometryWrapperGoo : GH_Goo<SpeckleGeometryWrapper>, IGH_PreviewData
|
||||
{
|
||||
public SpeckleObjectWrapperGoo(ModelObject mo)
|
||||
public SpeckleGeometryWrapperGoo(ModelObject mo)
|
||||
{
|
||||
CastFrom(mo);
|
||||
}
|
||||
@@ -35,14 +35,13 @@ public partial class SpeckleObjectWrapperGoo : GH_Goo<SpeckleObjectWrapper>, IGH
|
||||
|
||||
private bool HandleModelObject(ModelObject modelObject)
|
||||
{
|
||||
if (RhinoDoc.ActiveDoc.Objects.FindId(modelObject.Id ?? Guid.Empty)?.Geometry is not GeometryBase geometryBase)
|
||||
modelObject.CastTo<GeometryBase>(out GeometryBase? geometryBase);
|
||||
if (geometryBase is null)
|
||||
{
|
||||
throw new InvalidOperationException(
|
||||
$"Could not retrieve geometry from Model Object {modelObject.ObjectType}. Did you forget to bake these objects in your document?"
|
||||
);
|
||||
throw new InvalidOperationException($"Could not retrieve geometry from model object.");
|
||||
}
|
||||
|
||||
Base converted = SpeckleConversionContext.ConvertToSpeckle(geometryBase);
|
||||
Base converted = SpeckleConversionContext.Current.ConvertToSpeckle(geometryBase);
|
||||
|
||||
// get layer, props, color, and mat
|
||||
SpeckleCollectionWrapper? collection = GetLayerCollectionFromModelObject(modelObject);
|
||||
@@ -61,7 +60,7 @@ public partial class SpeckleObjectWrapperGoo : GH_Goo<SpeckleObjectWrapper>, IGH
|
||||
collection,
|
||||
color,
|
||||
material,
|
||||
modelObject.Id.ToString(),
|
||||
modelObject.Id?.ToString(),
|
||||
definition
|
||||
);
|
||||
}
|
||||
@@ -154,7 +153,7 @@ public partial class SpeckleObjectWrapperGoo : GH_Goo<SpeckleObjectWrapper>, IGH
|
||||
{
|
||||
// we need to retrieve the actual material by the material source (otherwise will return default material for anything other than by object)
|
||||
Guid? matId = null;
|
||||
switch (modelObject.Render.Material?.Source)
|
||||
switch (modelObject.Render?.Material?.Source)
|
||||
{
|
||||
case ObjectMaterialSource.MaterialFromLayer:
|
||||
matId = modelObject.Layer.Material.Id;
|
||||
@@ -177,10 +176,11 @@ public partial class SpeckleObjectWrapperGoo : GH_Goo<SpeckleObjectWrapper>, IGH
|
||||
SpeckleCollectionWrapper? parent,
|
||||
Color? color,
|
||||
SpeckleMaterialWrapper? mat,
|
||||
string appId,
|
||||
string? appId,
|
||||
SpeckleBlockDefinitionWrapper? definition = null
|
||||
)
|
||||
{
|
||||
string validAppId = string.IsNullOrWhiteSpace(appId) ? Guid.NewGuid().ToString() : appId!;
|
||||
Value = geometryBase is InstanceReferenceGeometry instance
|
||||
? new SpeckleBlockInstanceWrapper()
|
||||
{
|
||||
@@ -193,9 +193,9 @@ public partial class SpeckleObjectWrapperGoo : GH_Goo<SpeckleObjectWrapper>, IGH
|
||||
Color = color,
|
||||
Material = mat,
|
||||
Properties = props,
|
||||
ApplicationId = appId
|
||||
ApplicationId = validAppId
|
||||
}
|
||||
: new SpeckleObjectWrapper()
|
||||
: new SpeckleGeometryWrapper()
|
||||
{
|
||||
GeometryBase = geometryBase,
|
||||
Base = @base,
|
||||
@@ -204,7 +204,7 @@ public partial class SpeckleObjectWrapperGoo : GH_Goo<SpeckleObjectWrapper>, IGH
|
||||
Color = color,
|
||||
Material = mat,
|
||||
Properties = props,
|
||||
ApplicationId = appId
|
||||
ApplicationId = validAppId
|
||||
};
|
||||
|
||||
return true;
|
||||
@@ -272,7 +272,7 @@ public partial class SpeckleObjectWrapperGoo : GH_Goo<SpeckleObjectWrapper>, IGH
|
||||
{
|
||||
// we need to retrieve the actual color by the color source (otherwise will return default color for anything other than by object)
|
||||
int? argb = null;
|
||||
switch (modelObject.Display.Color?.Source)
|
||||
switch (modelObject.Display?.Color?.Source)
|
||||
{
|
||||
case ObjectColorSource.ColorFromLayer:
|
||||
argb = modelObject.Layer.DisplayColor?.ToArgb();
|
||||
+31
-10
@@ -6,20 +6,20 @@ using Speckle.Sdk.Models;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
|
||||
public partial class SpeckleObjectWrapperGoo : GH_Goo<SpeckleObjectWrapper>, IGH_PreviewData
|
||||
public partial class SpeckleGeometryWrapperGoo : GH_Goo<SpeckleGeometryWrapper>, IGH_PreviewData
|
||||
{
|
||||
public override bool IsValid => Value.Base is not null && Value.ApplicationId is not null;
|
||||
public override string TypeName => "Speckle Object";
|
||||
public override string TypeName => "Speckle Geometry";
|
||||
public override string TypeDescription => "Represents a geometry object from Speckle";
|
||||
|
||||
public SpeckleObjectWrapperGoo(SpeckleObjectWrapper value)
|
||||
public SpeckleGeometryWrapperGoo(SpeckleGeometryWrapper value)
|
||||
{
|
||||
Value = value;
|
||||
}
|
||||
|
||||
/// <summary>Parameterless constructor</summary>
|
||||
/// <remarks>Should only be used for casting!</remarks>
|
||||
public SpeckleObjectWrapperGoo()
|
||||
public SpeckleGeometryWrapperGoo()
|
||||
{
|
||||
Value = new()
|
||||
{
|
||||
@@ -30,10 +30,10 @@ public partial class SpeckleObjectWrapperGoo : GH_Goo<SpeckleObjectWrapper>, IGH
|
||||
};
|
||||
}
|
||||
|
||||
public override IGH_Goo Duplicate() => new SpeckleObjectWrapperGoo(Value.DeepCopy());
|
||||
public override IGH_Goo Duplicate() => new SpeckleGeometryWrapperGoo(Value.DeepCopy());
|
||||
|
||||
public override string ToString() =>
|
||||
$"Speckle Object : {(string.IsNullOrWhiteSpace(Value.Name) ? Value.Base.speckle_type : Value.Name)}";
|
||||
$"Speckle Geometry : {(string.IsNullOrWhiteSpace(Value.Name) ? Value.Base.speckle_type : Value.Name)}";
|
||||
|
||||
/// <summary>
|
||||
/// Casts from Speckle objects, geometry base, and model objects.
|
||||
@@ -45,18 +45,22 @@ public partial class SpeckleObjectWrapperGoo : GH_Goo<SpeckleObjectWrapper>, IGH
|
||||
{
|
||||
switch (source)
|
||||
{
|
||||
case SpeckleObjectWrapper wrapper:
|
||||
case SpeckleGeometryWrapper wrapper:
|
||||
Value = wrapper;
|
||||
return true;
|
||||
case SpeckleObjectWrapperGoo wrapperGoo:
|
||||
case SpeckleGeometryWrapperGoo wrapperGoo:
|
||||
Value = wrapperGoo.Value;
|
||||
return true;
|
||||
case SpeckleBlockInstanceWrapperGoo instanceWrapperGoo:
|
||||
Value = instanceWrapperGoo.Value;
|
||||
return true;
|
||||
case SpeckleDataObjectWrapperGoo dataObjectGoo:
|
||||
return CastFromDataObject(dataObjectGoo.Value);
|
||||
case SpeckleDataObjectWrapper dataObjectWrapper:
|
||||
return CastFromDataObject(dataObjectWrapper);
|
||||
case IGH_GeometricGoo geometricGoo:
|
||||
GeometryBase gb = geometricGoo.ToGeometryBase();
|
||||
Base converted = SpeckleConversionContext.ConvertToSpeckle(gb);
|
||||
Base converted = SpeckleConversionContext.Current.ConvertToSpeckle(gb);
|
||||
string appId = Guid.NewGuid().ToString();
|
||||
Value = gb is InstanceReferenceGeometry instance
|
||||
? new SpeckleBlockInstanceWrapper()
|
||||
@@ -66,7 +70,7 @@ public partial class SpeckleObjectWrapperGoo : GH_Goo<SpeckleObjectWrapper>, IGH
|
||||
Transform = instance.Xform,
|
||||
ApplicationId = appId,
|
||||
}
|
||||
: new SpeckleObjectWrapper()
|
||||
: new SpeckleGeometryWrapper()
|
||||
{
|
||||
GeometryBase = gb,
|
||||
Base = converted,
|
||||
@@ -211,6 +215,23 @@ public partial class SpeckleObjectWrapperGoo : GH_Goo<SpeckleObjectWrapper>, IGH
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Handles casting from DataObject to SpeckleGeometryWrapper.
|
||||
/// Only works if DataObject has exactly one geometry.
|
||||
/// </summary>
|
||||
private bool CastFromDataObject(SpeckleDataObjectWrapper dataObjectWrapper)
|
||||
{
|
||||
// Apply single-geometry constraint
|
||||
if (dataObjectWrapper.Geometries.Count != 1)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Extract the single geometry
|
||||
Value = dataObjectWrapper.Geometries[0];
|
||||
return true;
|
||||
}
|
||||
|
||||
public void DrawViewportWires(GH_PreviewWireArgs args)
|
||||
{
|
||||
// TODO ?
|
||||
+14
-14
@@ -7,30 +7,30 @@ using Speckle.Connectors.GrasshopperShared.Properties;
|
||||
|
||||
namespace Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
|
||||
public class SpeckleObjectParam : GH_Param<SpeckleObjectWrapperGoo>, IGH_BakeAwareObject, IGH_PreviewObject
|
||||
public class SpeckleGeometryWrapperParam : GH_Param<SpeckleGeometryWrapperGoo>, IGH_BakeAwareObject, IGH_PreviewObject
|
||||
{
|
||||
public SpeckleObjectParam()
|
||||
public SpeckleGeometryWrapperParam()
|
||||
: this(GH_ParamAccess.item) { }
|
||||
|
||||
public SpeckleObjectParam(IGH_InstanceDescription tag)
|
||||
public SpeckleGeometryWrapperParam(IGH_InstanceDescription tag)
|
||||
: base(tag) { }
|
||||
|
||||
public SpeckleObjectParam(IGH_InstanceDescription tag, GH_ParamAccess access)
|
||||
public SpeckleGeometryWrapperParam(IGH_InstanceDescription tag, GH_ParamAccess access)
|
||||
: base(tag, access) { }
|
||||
|
||||
public SpeckleObjectParam(GH_ParamAccess access)
|
||||
public SpeckleGeometryWrapperParam(GH_ParamAccess access)
|
||||
: base(
|
||||
"Speckle Object",
|
||||
"SO",
|
||||
"Represents a Speckle object",
|
||||
"Speckle Geometry",
|
||||
"SG",
|
||||
"Represents a Speckle Geometry",
|
||||
ComponentCategories.PRIMARY_RIBBON,
|
||||
ComponentCategories.PARAMETERS,
|
||||
access
|
||||
) { }
|
||||
|
||||
public override Guid ComponentGuid => new("22FD5510-D5D3-4101-8727-153FFD329E4F");
|
||||
protected override Bitmap Icon => Resources.speckle_param_object;
|
||||
public override GH_Exposure Exposure => GH_Exposure.primary;
|
||||
protected override Bitmap Icon => Resources.speckle_param_geometry;
|
||||
public override GH_Exposure Exposure => GH_Exposure.secondary;
|
||||
|
||||
public bool IsBakeCapable =>
|
||||
// False if no data
|
||||
@@ -41,7 +41,7 @@ public class SpeckleObjectParam : GH_Param<SpeckleObjectWrapperGoo>, IGH_BakeAwa
|
||||
// Iterate over all data stored in the parameter
|
||||
foreach (var item in VolatileData.AllData(true))
|
||||
{
|
||||
if (item is SpeckleObjectWrapperGoo goo)
|
||||
if (item is SpeckleGeometryWrapperGoo goo)
|
||||
{
|
||||
goo.Value.Bake(doc, objIds);
|
||||
}
|
||||
@@ -63,7 +63,7 @@ public class SpeckleObjectParam : GH_Param<SpeckleObjectWrapperGoo>, IGH_BakeAwa
|
||||
// Iterate over all data stored in the parameter
|
||||
foreach (var item in VolatileData.AllData(true))
|
||||
{
|
||||
if (item is SpeckleObjectWrapperGoo goo)
|
||||
if (item is SpeckleGeometryWrapperGoo goo)
|
||||
{
|
||||
int layerIndex = goo.Value.Path.Count == 0 ? att.LayerIndex : -1;
|
||||
bool layerCreated = goo.Value.Path.Count == 0;
|
||||
@@ -83,7 +83,7 @@ public class SpeckleObjectParam : GH_Param<SpeckleObjectWrapperGoo>, IGH_BakeAwa
|
||||
// Iterate over all data stored in the parameter
|
||||
foreach (var item in VolatileData.AllData(true))
|
||||
{
|
||||
if (item is SpeckleObjectWrapperGoo goo && goo.Value.GeometryBase is GeometryBase gb)
|
||||
if (item is SpeckleGeometryWrapperGoo goo && goo.Value.GeometryBase is GeometryBase gb)
|
||||
{
|
||||
var box = gb.GetBoundingBox(false);
|
||||
clippingBox.Union(box);
|
||||
@@ -104,7 +104,7 @@ public class SpeckleObjectParam : GH_Param<SpeckleObjectWrapperGoo>, IGH_BakeAwa
|
||||
var isSelected = args.Document.SelectedObjects().Contains(this) || OwnerSelected();
|
||||
foreach (var item in VolatileData.AllData(true))
|
||||
{
|
||||
if (item is SpeckleObjectWrapperGoo goo)
|
||||
if (item is SpeckleGeometryWrapperGoo goo)
|
||||
{
|
||||
goo.Value.DrawPreview(args, isSelected);
|
||||
}
|
||||
+4
-2
@@ -55,8 +55,10 @@ public partial class SpeckleMaterialWrapperGoo : GH_Goo<SpeckleMaterialWrapper>
|
||||
|
||||
return CastFromModelRenderMaterial(matRenderMaterial);
|
||||
}
|
||||
|
||||
return false;
|
||||
else
|
||||
{
|
||||
return CastFrom(modelMaterial.ToAttributes().RenderMaterial);
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ public class SpeckleMaterialParam : GH_Param<SpeckleMaterialWrapperGoo>, IGH_Bak
|
||||
|
||||
public override Guid ComponentGuid => new("1A08CF79-2072-4B14-9430-E4465FF0C0FE");
|
||||
protected override Bitmap Icon => Resources.speckle_param_material;
|
||||
public override GH_Exposure Exposure => GH_Exposure.tertiary;
|
||||
public override GH_Exposure Exposure => GH_Exposure.quarternary;
|
||||
|
||||
bool IGH_BakeAwareObject.IsBakeCapable => // False if no data
|
||||
!VolatileData.IsEmpty;
|
||||
|
||||
+4
-1
@@ -12,7 +12,10 @@ public abstract class SpeckleWrapper
|
||||
/// <summary>
|
||||
/// The name of the object. When set, this will also update the "name" property of <see cref="Base"/>.
|
||||
/// </summary>
|
||||
public string Name
|
||||
/// <remarks>
|
||||
/// Made virtual to allow DataObject to override with custom sync logic.
|
||||
/// </remarks>
|
||||
public virtual string Name
|
||||
{
|
||||
get => Base[Constants.NAME_PROP] as string ?? "";
|
||||
set => Base[Constants.NAME_PROP] = value;
|
||||
|
||||
+34
-4
@@ -159,6 +159,16 @@ namespace Speckle.Connectors.GrasshopperShared.Properties {
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
public static System.Drawing.Bitmap speckle_objects_dataobject {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("speckle_objects_dataobject", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
@@ -173,9 +183,9 @@ namespace Speckle.Connectors.GrasshopperShared.Properties {
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
public static System.Drawing.Bitmap speckle_objects_object {
|
||||
public static System.Drawing.Bitmap speckle_objects_geometry {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("speckle_objects_object", resourceCulture);
|
||||
object obj = ResourceManager.GetObject("speckle_objects_geometry", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
@@ -259,6 +269,16 @@ namespace Speckle.Connectors.GrasshopperShared.Properties {
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
public static System.Drawing.Bitmap speckle_param_dataobject {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("speckle_param_dataobject", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
@@ -283,9 +303,9 @@ namespace Speckle.Connectors.GrasshopperShared.Properties {
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
public static System.Drawing.Bitmap speckle_param_object {
|
||||
public static System.Drawing.Bitmap speckle_param_geometry {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("speckle_param_object", resourceCulture);
|
||||
object obj = ResourceManager.GetObject("speckle_param_geometry", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
@@ -329,5 +349,15 @@ namespace Speckle.Connectors.GrasshopperShared.Properties {
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
public static System.Drawing.Bitmap speckle_state_access {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("speckle_state_access", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -151,9 +151,6 @@
|
||||
<data name="speckle_objects_filter" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\speckle_objects_filter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="speckle_objects_object" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\speckle_objects_object.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="speckle_objects_query" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\speckle_objects_query.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@@ -178,9 +175,6 @@
|
||||
<data name="speckle_param_material" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\speckle_param_material.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="speckle_param_object" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\speckle_param_object.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="speckle_param_properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\speckle_param_properties.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@@ -199,4 +193,19 @@
|
||||
<data name="speckle_param_block_instance" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\speckle_param_block_instance.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="speckle_objects_dataobject" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\speckle_objects_dataobject.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="speckle_objects_geometry" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\speckle_objects_geometry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="speckle_param_dataobject" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\speckle_param_dataobject.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="speckle_param_geometry" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\speckle_param_geometry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="speckle_state_access" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\speckle_state_access.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
+4
-2
@@ -9,6 +9,7 @@ using Speckle.Connectors.Common.Operations;
|
||||
using Speckle.Connectors.Common.Operations.Receive;
|
||||
using Speckle.Connectors.Common.Threading;
|
||||
using Speckle.Connectors.GrasshopperShared.Components;
|
||||
using Speckle.Connectors.GrasshopperShared.HostApp;
|
||||
using Speckle.Connectors.GrasshopperShared.Operations.Receive;
|
||||
using Speckle.Connectors.GrasshopperShared.Operations.Send;
|
||||
using Speckle.Connectors.GrasshopperShared.Parameters;
|
||||
@@ -62,10 +63,11 @@ public class PriorityLoader : GH_AssemblyPriority
|
||||
services.AddTransient<SendOperation<SpeckleCollectionWrapperGoo>>();
|
||||
services.AddSingleton<IThreadContext>(new DefaultThreadContext());
|
||||
services.AddScoped<
|
||||
IInstanceObjectsManager<SpeckleObjectWrapper, List<string>>,
|
||||
InstanceObjectsManager<SpeckleObjectWrapper, List<string>>
|
||||
IInstanceObjectsManager<SpeckleGeometryWrapper, List<string>>,
|
||||
InstanceObjectsManager<SpeckleGeometryWrapper, List<string>>
|
||||
>(); // each send operation gets its own InstanceObjectsManager instance (scoped = per-operation)
|
||||
|
||||
services.AddScoped<SpeckleConversionContext>();
|
||||
Container = services.BuildServiceProvider();
|
||||
return GH_LoadingInstruction.Proceed;
|
||||
}
|
||||
|
||||
BIN
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 938 B |
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user