From 85ee66ca4db9222912c2aadc5fd3d452cf098051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuzhan=20Koral?= <45078678+oguzhankoral@users.noreply.github.com> Date: Fri, 7 Mar 2025 12:04:16 +0300 Subject: [PATCH] Fix(instances): instance name prop is missing (#405) * add name to instances * set name only if it is not empty --- .../src/sketchup_model/definitions/definition_manager.rb | 1 + speckle_connector_3/src/speckle_objects/instance_proxy.rb | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/speckle_connector_3/src/sketchup_model/definitions/definition_manager.rb b/speckle_connector_3/src/sketchup_model/definitions/definition_manager.rb index 1428fb4..1185c7b 100644 --- a/speckle_connector_3/src/sketchup_model/definitions/definition_manager.rb +++ b/speckle_connector_3/src/sketchup_model/definitions/definition_manager.rb @@ -52,6 +52,7 @@ module SpeckleConnector3 instance_proxies[instance_id] = SpeckleObjects::InstanceProxy.new( definition_id, + entity.name, SpeckleObjects::Other::Transform.from_transformation(entity.transformation, @units).value, depth, @units, diff --git a/speckle_connector_3/src/speckle_objects/instance_proxy.rb b/speckle_connector_3/src/speckle_objects/instance_proxy.rb index 4310480..25a833c 100644 --- a/speckle_connector_3/src/speckle_objects/instance_proxy.rb +++ b/speckle_connector_3/src/speckle_objects/instance_proxy.rb @@ -8,12 +8,13 @@ module SpeckleConnector3 module SpeckleObjects class InstanceProxy < Base SPECKLE_TYPE = SPECKLE_CORE_MODELS_INSTANCES_INSTANCE_PROXY - def initialize(definition_id, transform, max_depth, units, sketchup_attributes: {}, application_id: nil) + def initialize(definition_id, name, transform, max_depth, units, sketchup_attributes: {}, application_id: nil) super( speckle_type: SPECKLE_TYPE, application_id: application_id, id: nil ) + self[:name] = name if name != "" self[:units] = units self[:definitionId] = definition_id self[:maxDepth] = max_depth @@ -24,9 +25,11 @@ module SpeckleConnector3 def self.to_native(state, instance_proxy, layer, entities, definition_proxies, &_convert_to_native) definition_id = instance_proxy['definitionId'] proxy_transform = instance_proxy['transform'] + name = instance_proxy['name'] transform = Other::Transform.to_native(proxy_transform, instance_proxy['units']) definition = definition_proxies[definition_id].definition instance = entities.add_instance(definition, transform) + instance.name = name if name unless instance_proxy['properties'].nil? SketchupModel::Dictionary::BaseDictionaryHandler