Sketchup DUI2-DUI3 side by side (#350)

* New sqlite3 libraries for new namespace

* Rename top level module to SpeckleConnector3

* Register extension as v3

* Add new sqlite3 libraries for mac

* Update bundle files for hybrid build mac/intel

* Rename speckle_connector_loader for v3

* Rename file and folder

* Rename loader
This commit is contained in:
Oğuzhan Koral
2024-07-31 19:26:38 +03:00
committed by GitHub
parent ec598bf4a8
commit d145ce52f7
309 changed files with 367 additions and 367 deletions
+2 -2
View File
@@ -21,7 +21,7 @@ jobs:
- persist_to_workspace: - persist_to_workspace:
root: ./ root: ./
paths: paths:
- speckle_connector/vue_ui - speckle_connector_3/vue_ui
build-connector: # Reusable job for basic connectors build-connector: # Reusable job for basic connectors
executor: executor:
@@ -137,7 +137,7 @@ jobs:
- run: - run:
name: Zip Connector files name: Zip Connector files
command: | command: |
zip -r << parameters.slug >>-mac.zip "./speckle_connector" "./speckle_connector.rb" zip -r << parameters.slug >>-mac.zip "./speckle_connector_3" "./speckle_connector_3.rb"
# Copy installer files # Copy installer files
- run: - run:
name: Copy files to installer name: Copy files to installer
+2 -2
View File
@@ -10,8 +10,8 @@
settings.json settings.json
# vue app build dist folder # vue app build dist folder
speckle_connector/vue_ui speckle_connector_3/vue_ui
speckle_connector/html speckle_connector_3/html
# speckle-sharp-ci-tools # speckle-sharp-ci-tools
/speckle-sharp-ci-tools /speckle-sharp-ci-tools
+1 -1
View File
@@ -18,7 +18,7 @@ AllCops:
- '_tools/su_attributes/**/*.rb' - '_tools/su_attributes/**/*.rb'
- '_sqlite3/**/*.rb' - '_sqlite3/**/*.rb'
- 'ui/**/*' - 'ui/**/*'
- 'speckle_connector/src/ext/**/*.rb' - 'speckle_connector_3/src/ext/**/*.rb'
- 'vendor/bundle/**/*' - 'vendor/bundle/**/*'
- 'tests/**/*.rb' - 'tests/**/*.rb'
SketchUp: SketchUp:
+1 -1
View File
@@ -1,6 +1,6 @@
require_paths: require_paths:
- "C:/Program Files/SketchUp/SketchUp 2021/Tools" - "C:/Program Files/SketchUp/SketchUp 2021/Tools"
- speckle_connector - speckle_connector_3
require: require:
- sketchup-api-stubs - sketchup-api-stubs
+4 -4
View File
@@ -49,9 +49,9 @@ This repo is split into three parts:
### 1. **Speckle Connector extension** ### 1. **Speckle Connector extension**
Includes the `ruby` source files to run extension on SketchUp environment. SketchUp Extensions are composed of Includes the `ruby` source files to run extension on SketchUp environment. SketchUp Extensions are composed of
a **.rb** file as entry and **folder** that .rb file refers to. In our case entry file is `speckle_connector.rb` a **.rb** file as entry and **folder** that .rb file refers to. In our case entry file is `speckle_connector_3.rb`
that responsible to register Speckle Connector extension to SketchUp and also it shows address to where extension that responsible to register Speckle Connector extension to SketchUp and also it shows address to where extension
will start to read extension. Source folder is `speckle_connector`. will start to read extension. Source folder is `speckle_connector_3`.
### 2. **User Interface** ### 2. **User Interface**
@@ -64,7 +64,7 @@ This repo is split into three parts:
we use extensions as native part of the source `ruby` code. we use extensions as native part of the source `ruby` code.
After building `sqlite3.sln` file, compiled `sqlite3.so` (for Windows) and `sqlite3.bundle` (for OSX) dynamic library files are created After building `sqlite3.sln` file, compiled `sqlite3.so` (for Windows) and `sqlite3.bundle` (for OSX) dynamic library files are created
by solution to place them into source code into `speckle_connector/src/ext`. Building this project should be only by solution to place them into source code into `speckle_connector_3/src/ext`. Building this project should be only
happen when SketchUp starts to support newer Ruby versions (currently it is `2.7`). happen when SketchUp starts to support newer Ruby versions (currently it is `2.7`).
## Contribution Guide ## Contribution Guide
@@ -117,7 +117,7 @@ If you will use VS Code, make sure you've installed the Ruby extension for VS Co
### Loading the Speckle Connector Plugin ### Loading the Speckle Connector Plugin
1. Find already prepared `speckle_connector_loader.rb` file on the `_tools` 1. Find already prepared `speckle_connector_3_loader.rb` file on the `_tools`
folder. folder.
2. Copy this Ruby file into your SketchUp Plugins directory. You will likely find this at: 2. Copy this Ruby file into your SketchUp Plugins directory. You will likely find this at:
`C:\Users\{YOU}\AppData\Roaming\SketchUp\SketchUp 20XX\SketchUp\Plugins` `C:\Users\{YOU}\AppData\Roaming\SketchUp\SketchUp 20XX\SketchUp\Plugins`
+3 -3
View File
@@ -32,12 +32,12 @@ end
# Glob pattern to match source files. Defaults to FileList['.']. # Glob pattern to match source files. Defaults to FileList['.'].
ruby_critic_paths = FileList[ ruby_critic_paths = FileList[
'speckle_connector/**/*.rb', 'speckle_connector_3/**/*.rb',
'speckle_connector.rb', 'speckle_connector_3.rb',
'tests/**/*.rb'] - 'tests/**/*.rb'] -
FileList[ FileList[
'_tools/**/*.rb', '_tools/**/*.rb',
'speckle_connector/src/ext/**/*.rb', 'speckle_connector_3/src/ext/**/*.rb',
] ]
# for local # for local
+1 -1
View File
@@ -24,7 +24,7 @@ module JF_RubyToolbar
def self.load_toolbar def self.load_toolbar
@last_dir = "#{$LOAD_PATH[0]}/" @last_dir = "#{$LOAD_PATH[0]}/"
@last_dir = @last_dir.gsub('/', '\\\\\\\\') @last_dir = @last_dir.gsub('/', '\\\\\\\\')
@last_dir = File.join($JF_RUBYTOOLBAR, 'speckle_connector') @last_dir = File.join($JF_RUBYTOOLBAR, 'speckle_connector_3')
curdir = File.dirname __FILE__ curdir = File.dirname __FILE__
# create toolbar # create toolbar
@@ -10,7 +10,7 @@
# Create a link to Plugins folder with this command # Create a link to Plugins folder with this command
# rubocop:disable Layout/LineLength # rubocop:disable Layout/LineLength
# New-Item -ItemType SymbolicLink -Path '~\AppData\Roaming\SketchUp\SketchUp 2022\SketchUp\Plugins\speckle_connector_loader.rb' -Target ~\Git\Speckle\speckle-sketchup\_tools\speckle_connector_loader.rb # New-Item -ItemType SymbolicLink -Path '~\AppData\Roaming\SketchUp\SketchUp 2022\SketchUp\Plugins\speckle_connector_3_loader.rb' -Target ~\Git\Speckle\speckle-sketchup\_tools\speckle_connector_3_loader.rb
# rubocop:enable Layout/LineLength # rubocop:enable Layout/LineLength
SKETCHUP_CONSOLE.show # if you want to show Ruby console on startup SKETCHUP_CONSOLE.show # if you want to show Ruby console on startup
@@ -32,7 +32,7 @@ $LOAD_PATH << File.join(speckle_path, '_tools')
$JF_RUBYTOOLBAR = speckle_path $JF_RUBYTOOLBAR = speckle_path
# rubocop:enable Style/GlobalVars # rubocop:enable Style/GlobalVars
files = %w[speckle_connector jf_RubyPanel su_attributes] files = %w[speckle_connector_3 jf_RubyPanel su_attributes]
files.each do |ruby_file| files.each do |ruby_file|
puts "Loading #{ruby_file}" puts "Loading #{ruby_file}"
+1 -1
View File
@@ -4,7 +4,7 @@ import sys
def patch_connector(tag): def patch_connector(tag):
"""Patches the connector version within the connector file""" """Patches the connector version within the connector file"""
rb_file = "speckle_connector.rb" rb_file = "speckle_connector_3.rb"
with open(rb_file, "r") as file: with open(rb_file, "r") as file:
lines = file.readlines() lines = file.readlines()
@@ -1,9 +0,0 @@
# frozen_string_literal: true
module SpeckleConnector
APP_OBSERVER = 'SpeckleConnector::Observers::AppObserver'
ENTITIES_OBSERVER = 'SpeckleConnector::Observers::EntitiesObserver'
ENTITY_OBSERVER = 'SpeckleConnector::Observers::EntityObserver'
MODEL_OBSERVER = 'SpeckleConnector::Observers::ModelObserver'
SELECTION_OBSERVER = 'SpeckleConnector::Observers::SelectionObserver'
end
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -4,7 +4,7 @@ require 'sketchup'
require 'extensions' require 'extensions'
# Speckle connector module to enable multiplayer mode ON! # Speckle connector module to enable multiplayer mode ON!
module SpeckleConnector module SpeckleConnector3
# Version - patched by CI # Version - patched by CI
CONNECTOR_VERSION = '0.0.0' CONNECTOR_VERSION = '0.0.0'
@@ -27,7 +27,7 @@ module SpeckleConnector
puts("Loading Speckle Connector v#{CONNECTOR_VERSION} from #{DEV_MODE ? 'dev' : 'build'}") puts("Loading Speckle Connector v#{CONNECTOR_VERSION} from #{DEV_MODE ? 'dev' : 'build'}")
unless file_loaded?(__FILE__) unless file_loaded?(__FILE__)
ex = SketchupExtension.new('Speckle SketchUp', File.join(PATH, 'bootstrap')) ex = SketchupExtension.new('Speckle SketchUp v3', File.join(PATH, 'bootstrap'))
ex.description = 'Speckle Connector for SketchUp' ex.description = 'Speckle Connector for SketchUp'
ex.version = CONNECTOR_VERSION ex.version = CONNECTOR_VERSION
ex.copyright = 'AEC Systems Ltd.' ex.copyright = 'AEC Systems Ltd.'
@@ -2,7 +2,7 @@
require 'sketchup' require 'sketchup'
require 'pathname' require 'pathname'
require 'speckle_connector/debug' require 'speckle_connector_3/debug'
require_relative 'src/log/log' require_relative 'src/log/log'
require_relative 'src/ui/sketchup_ui' require_relative 'src/ui/sketchup_ui'
require_relative 'src/ui/ui_controller' require_relative 'src/ui/ui_controller'
@@ -13,7 +13,7 @@ require_relative 'src/states/initial_state'
require_relative 'src/commands/speckle_menu_commands' require_relative 'src/commands/speckle_menu_commands'
# Speckle Connector on SketchUp to enable Multiplayer mode ON! # Speckle Connector on SketchUp to enable Multiplayer mode ON!
module SpeckleConnector module SpeckleConnector3
SKETCHUP_VERSION = Sketchup.version.to_i SKETCHUP_VERSION = Sketchup.version.to_i
dir = __dir__.dup dir = __dir__.dup
@@ -24,9 +24,9 @@ module SpeckleConnector
sketchup_ui = Ui::SketchupUi.new sketchup_ui = Ui::SketchupUi.new
ui_controller = Ui::UiController.new(sketchup_ui) ui_controller = Ui::UiController.new(sketchup_ui)
menu_commands = Commands::MenuCommandHandler.new menu_commands = Commands::MenuCommandHandler.new
user_state = SpeckleConnector::States::UserState.new({}) user_state = SpeckleConnector3::States::UserState.new({})
initial_state = SpeckleConnector::States::InitialState.new(user_state) initial_state = SpeckleConnector3::States::InitialState.new(user_state)
app = SpeckleConnector::App::SpeckleConnectorApp.new(menu_commands, initial_state, ui_controller) app = SpeckleConnector3::App::SpeckleConnectorApp.new(menu_commands, initial_state, ui_controller)
# Add menu commands to SketchUp and Speckle application # Add menu commands to SketchUp and Speckle application
Commands::SpeckleMenuCommands.add_initial_commands!(app) Commands::SpeckleMenuCommands.add_initial_commands!(app)
app app
@@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
# Speckle connector module to enable multiplayer mode ON! # Speckle connector module to enable multiplayer mode ON!
module SpeckleConnector module SpeckleConnector3
# from thomthom # from thomthom
# https://github.com/thomthom/true-bend/blob/master/src/tt_truebend/debug.rb # https://github.com/thomthom/true-bend/blob/master/src/tt_truebend/debug.rb

Before

Width:  |  Height:  |  Size: 798 B

After

Width:  |  Height:  |  Size: 798 B

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 665 B

After

Width:  |  Height:  |  Size: 665 B

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 639 B

After

Width:  |  Height:  |  Size: 639 B

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

@@ -4,7 +4,7 @@ require 'JSON'
require_relative '../ext/sqlite3' require_relative '../ext/sqlite3'
require_relative '../constants/path_constants' require_relative '../constants/path_constants'
module SpeckleConnector module SpeckleConnector3
# Accounts to communicate with models on user's account. # Accounts to communicate with models on user's account.
module Accounts module Accounts
# Load accounts from user's app data. # Load accounts from user's app data.
@@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# State changer object. # State changer object.
class Action class Action
@@ -3,7 +3,7 @@
require_relative 'action' require_relative 'action'
require_relative 'deactivate_diffing' require_relative 'deactivate_diffing'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Deactivate diffing for stream. # Deactivate diffing for stream.
class ActivateDiffing < Action class ActivateDiffing < Action
@@ -2,7 +2,7 @@
require_relative 'action' require_relative 'action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Adds material to speckle state and Sketchup. # Adds material to speckle state and Sketchup.
class AddMaterial < Action class AddMaterial < Action
@@ -5,7 +5,7 @@ require_relative 'mapped_entities_updated'
require_relative 'events/selection_event_action' require_relative 'events/selection_event_action'
require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler' require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Apply mappings for selected entities. # Apply mappings for selected entities.
class ApplyMappings < Action class ApplyMappings < Action
@@ -10,7 +10,7 @@ require_relative '../../filters/send/selection_filter'
require_relative '../../filters/send_filters' require_relative '../../filters/send_filters'
require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler' require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to add send card. # Action to add send card.
class AddModel < Action class AddModel < Action
@@ -8,7 +8,7 @@ require_relative '../../filters/send/selection_filter'
require_relative '../../filters/send_filters' require_relative '../../filters/send_filters'
require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler' require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to add receive model card. # Action to add receive model card.
class AddReceiveModelCard < Action class AddReceiveModelCard < Action
@@ -8,7 +8,7 @@ require_relative '../../filters/send/selection_filter'
require_relative '../../filters/send_filters' require_relative '../../filters/send_filters'
require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler' require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to add send model card. # Action to add send model card.
class AddSendModelCard < Action class AddSendModelCard < Action
@@ -2,7 +2,7 @@
require_relative '../action' require_relative '../action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Get connector version. # Get connector version.
class GetConnectorVersion < Action class GetConnectorVersion < Action
@@ -4,7 +4,7 @@ require_relative '../action'
require_relative '../../filters/send_filters' require_relative '../../filters/send_filters'
require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler' require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Gets document state. # Gets document state.
class GetDocumentState < Action class GetDocumentState < Action
@@ -3,7 +3,7 @@
require_relative '../action' require_relative '../action'
require_relative '../../filters/send_filters' require_relative '../../filters/send_filters'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to get send filter. # Action to get send filter.
class GetSendFilters < Action class GetSendFilters < Action
@@ -2,7 +2,7 @@
require_relative '../action' require_relative '../action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Get source app name. # Get source app name.
class GetSourceAppName < Action class GetSourceAppName < Action
@@ -2,7 +2,7 @@
require_relative '../action' require_relative '../action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Get source app version. # Get source app version.
class GetSourceAppVersion < Action class GetSourceAppVersion < Action
@@ -3,7 +3,7 @@
require_relative '../action' require_relative '../action'
require_relative '../../sketchup_model/query/entity' require_relative '../../sketchup_model/query/entity'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to add send card. # Action to add send card.
class HighlightModel < Action class HighlightModel < Action
@@ -4,7 +4,7 @@ require_relative '../action'
require_relative '../../sketchup_model/query/entity' require_relative '../../sketchup_model/query/entity'
require_relative '../../sketchup_model/utils/view_utils' require_relative '../../sketchup_model/utils/view_utils'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to add send card. # Action to add send card.
class HighlightObjects < Action class HighlightObjects < Action
@@ -8,7 +8,7 @@ require_relative '../../filters/send/selection_filter'
require_relative '../../filters/send_filters' require_relative '../../filters/send_filters'
require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler' require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to remove send card. # Action to remove send card.
class RemoveModel < Action class RemoveModel < Action
@@ -3,7 +3,7 @@
require_relative '../action' require_relative '../action'
require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler' require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to update send filter. # Action to update send filter.
class UpdateSendFilter < Action class UpdateSendFilter < Action
@@ -3,7 +3,7 @@
require_relative 'action' require_relative 'action'
require_relative '../sketchup_model/dictionary/speckle_entity_dictionary_handler' require_relative '../sketchup_model/dictionary/speckle_entity_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Clear mapper source. # Clear mapper source.
class ClearMapperSource < Action class ClearMapperSource < Action
@@ -5,7 +5,7 @@ require_relative 'mapped_entities_updated'
require_relative 'events/selection_event_action' require_relative 'events/selection_event_action'
require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler' require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Clear mappings for selected entities. # Clear mappings for selected entities.
class ClearMappings < Action class ClearMappings < Action
@@ -5,7 +5,7 @@ require_relative 'mapped_entities_updated'
require_relative 'events/selection_event_action' require_relative 'events/selection_event_action'
require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler' require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Clear mappings for selected entities from mapped elements table. # Clear mappings for selected entities from mapped elements table.
class ClearMappingsFromTable < Action class ClearMappingsFromTable < Action
@@ -2,7 +2,7 @@
require_relative 'action' require_relative 'action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Clear queue from state. # Clear queue from state.
class ClearQueue < Action class ClearQueue < Action
@@ -4,7 +4,7 @@ require_relative 'action'
require_relative '../ext/sqlite3' require_relative '../ext/sqlite3'
require_relative '../constants/path_constants' require_relative '../constants/path_constants'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to collect preferences from database to UI. # Action to collect preferences from database to UI.
class CollectPreferences < Action class CollectPreferences < Action
@@ -2,7 +2,7 @@
require_relative 'action' require_relative 'action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to collect versions from sketchup and connector to track user's version by mixpanel. # Action to collect versions from sketchup and connector to track user's version by mixpanel.
class CollectVersions < Action class CollectVersions < Action
@@ -11,7 +11,7 @@ module SpeckleConnector
def self.update_state(state, _resolve_id, _data) def self.update_state(state, _resolve_id, _data)
versions = { versions = {
sketchup: Sketchup.version.to_i, sketchup: Sketchup.version.to_i,
speckle: SpeckleConnector::CONNECTOR_VERSION speckle: SpeckleConnector3::CONNECTOR_VERSION
} }
state.with_add_queue('collectVersions', versions.to_json, []) state.with_add_queue('collectVersions', versions.to_json, [])
end end
@@ -2,7 +2,7 @@
require_relative '../action' require_relative '../action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to get config. # Action to get config.
class GetConfig < Action class GetConfig < Action
@@ -3,7 +3,7 @@
require_relative '../action' require_relative '../action'
require_relative '../user_preferences_updated' require_relative '../user_preferences_updated'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to update config. # Action to update config.
class UpdateConfig < Action class UpdateConfig < Action
@@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to update connected state of application. # Action to update connected state of application.
class Connected < Action class Connected < Action
@@ -6,7 +6,7 @@ require_relative '../actions/save_stream'
require_relative '../actions/queue_send' require_relative '../actions/queue_send'
require_relative '../convertors/converter' require_relative '../convertors/converter'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Create stream. # Create stream.
class CreateStream < Action class CreateStream < Action
@@ -2,7 +2,7 @@
require_relative 'action' require_relative 'action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Deactivate diffing. # Deactivate diffing.
class DeactivateDiffing < Action class DeactivateDiffing < Action
@@ -5,7 +5,7 @@ require_relative 'on_document_changed'
require_relative '../load_sketchup_model' require_relative '../load_sketchup_model'
require_relative '../collect_preferences' require_relative '../collect_preferences'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
module Events module Events
# Handle events that are triggered by the {AppObserver}. # Handle events that are triggered by the {AppObserver}.
@@ -6,7 +6,7 @@ require_relative '../../sketchup_model/utils/face_utils'
require_relative '../../constants/dict_constants' require_relative '../../constants/dict_constants'
require_relative '../../sketchup_model/query/path' require_relative '../../sketchup_model/query/path'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
module Events module Events
# Event actions related to entities. # Event actions related to entities.
@@ -4,7 +4,7 @@ require_relative 'event_action'
require_relative '../../constants/dict_constants' require_relative '../../constants/dict_constants'
require_relative '../../sketchup_model/query/path' require_relative '../../sketchup_model/query/path'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
module Events module Events
PATH = SketchupModel::Query::Path PATH = SketchupModel::Query::Path
@@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# This module contains actions that are performed to handle events triggered by observers in Sketchup. # This module contains actions that are performed to handle events triggered by observers in Sketchup.
module Events module Events
@@ -3,7 +3,7 @@
require_relative 'event_action' require_relative 'event_action'
require_relative '../load_sketchup_model' require_relative '../load_sketchup_model'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
module Events module Events
# Handle events that are triggered by the {ModelObserver}. # Handle events that are triggered by the {ModelObserver}.
@@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Triggers whenever document has changed. # Triggers whenever document has changed.
class OnDocumentChanged < Action class OnDocumentChanged < Action
@@ -8,7 +8,7 @@ require_relative '../../sketchup_model/reader/speckle_entities_reader'
require_relative '../../sketchup_model/reader/mapper_reader' require_relative '../../sketchup_model/reader/mapper_reader'
require_relative '../../sketchup_model/query/entity' require_relative '../../sketchup_model/query/entity'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
module Events module Events
# Update selected speckle objects when the selection changes for mapper tool. # Update selected speckle objects when the selection changes for mapper tool.
@@ -4,7 +4,7 @@ require_relative 'action'
require_relative '../accounts/accounts' require_relative '../accounts/accounts'
require_relative 'load_saved_streams' require_relative 'load_saved_streams'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to initialize local accounts from database. # Action to initialize local accounts from database.
class GetAccounts < Action class GetAccounts < Action
@@ -2,7 +2,7 @@
require_relative 'action' require_relative 'action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Get document info. # Get document info.
class GetDocumentInfo < Action class GetDocumentInfo < Action
@@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to return error message to UI. # Action to return error message to UI.
# It is "TopLevelExceptionHandler" equivalent of C#. # It is "TopLevelExceptionHandler" equivalent of C#.
@@ -4,7 +4,7 @@ require_relative 'action'
require_relative 'events/selection_event_action' require_relative 'events/selection_event_action'
require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler' require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Hide entities that selected from mapped elements table. # Hide entities that selected from mapped elements table.
class HideMappingsFromTable < Action class HideMappingsFromTable < Action
@@ -4,7 +4,7 @@ require_relative 'action'
require_relative '../accounts/accounts' require_relative '../accounts/accounts'
require_relative 'load_saved_streams' require_relative 'load_saved_streams'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to initialize local accounts from database. # Action to initialize local accounts from database.
class InitLocalAccounts < Action class InitLocalAccounts < Action
@@ -4,7 +4,7 @@ require_relative 'action'
require_relative 'add_material' require_relative 'add_material'
require_relative '../constants/mat_constants' require_relative '../constants/mat_constants'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to initialize materials # Action to initialize materials
class InitializeMaterials < Action class InitializeMaterials < Action
@@ -9,16 +9,16 @@ require_relative '../preferences/preferences'
require_relative '../constants/observer_constants' require_relative '../constants/observer_constants'
require_relative '../ext/worker' require_relative '../ext/worker'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Initialization of the real state of the speckle. # Initialization of the real state of the speckle.
class InitializeSpeckle < Action class InitializeSpeckle < Action
# @param state [States::State] the current state of the {App::SpeckleConnectorApp} # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
# @return [States::State] the new updated state object # @return [States::State] the new updated state object
def self.update_state(state, observers, instant_message_sender) def self.update_state(state, observers, instant_message_sender)
worker = SpeckleConnector::Worker.new([]) worker = SpeckleConnector3::Worker.new([])
attach_app_observer!(observers[APP_OBSERVER]) attach_app_observer!(observers[APP_OBSERVER])
accounts = SpeckleConnector::Accounts.load_accounts accounts = SpeckleConnector3::Accounts.load_accounts
speckle_state = States::SpeckleState.new(accounts, observers, {}, {}) speckle_state = States::SpeckleState.new(accounts, observers, {}, {})
# This should be the only point that `Sketchup_active_model` passed to application state. # This should be the only point that `Sketchup_active_model` passed to application state.
sketchup_state = States::SketchupState.new(Sketchup.active_model) sketchup_state = States::SketchupState.new(Sketchup.active_model)
@@ -4,7 +4,7 @@ require_relative 'action'
require_relative 'events/selection_event_action' require_relative 'events/selection_event_action'
require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler' require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Isolate entities that selected from mapped elements table. # Isolate entities that selected from mapped elements table.
class IsolateMappingsFromTable < Action class IsolateMappingsFromTable < Action
@@ -2,7 +2,7 @@
require_relative 'action' require_relative 'action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to load saved streams. # Action to load saved streams.
class LoadSavedStreams < Action class LoadSavedStreams < Action
@@ -9,7 +9,7 @@ require_relative '../states/state'
require_relative '../states/sketchup_state' require_relative '../states/sketchup_state'
require_relative '../constants/observer_constants' require_relative '../constants/observer_constants'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Switch sketchup model wit a new one # Switch sketchup model wit a new one
class LoadSketchupModel < Action class LoadSketchupModel < Action
@@ -3,7 +3,7 @@
require_relative 'action' require_relative 'action'
require_relative '../sketchup_model/reader/mapper_reader' require_relative '../sketchup_model/reader/mapper_reader'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Triggers when mapped entities updated. # Triggers when mapped entities updated.
class MappedEntitiesUpdated < Action class MappedEntitiesUpdated < Action
@@ -4,7 +4,7 @@ require_relative 'action'
require_relative '../mapper/category/revit_category' require_relative '../mapper/category/revit_category'
require_relative '../mapper/category/revit_family_category' require_relative '../mapper/category/revit_family_category'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Collects mapper selection info. # Collects mapper selection info.
class MapperInitialized < Action class MapperInitialized < Action
@@ -7,7 +7,7 @@ require_relative '../sketchup_model/reader/mapper_reader'
require_relative '../sketchup_model/reader/speckle_entities_reader' require_relative '../sketchup_model/reader/speckle_entities_reader'
require_relative '../sketchup_model/dictionary/speckle_entity_dictionary_handler' require_relative '../sketchup_model/dictionary/speckle_entity_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Collects mapper selection info. # Collects mapper selection info.
class MapperSelectionChanged < Action class MapperSelectionChanged < Action
@@ -5,7 +5,7 @@ require_relative '../constants/type_constants'
require_relative '../mapper/mapper_source' require_relative '../mapper/mapper_source'
require_relative '../speckle_objects/built_elements/revit/revit_element_type' require_relative '../speckle_objects/built_elements/revit/revit_element_type'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to update mapper source. # Action to update mapper source.
class MapperSourceUpdated < Action class MapperSourceUpdated < Action
@@ -6,7 +6,7 @@ require_relative '../accounts/accounts'
require_relative '../constants/path_constants' require_relative '../constants/path_constants'
require_relative '../sketchup_model/dictionary/speckle_model_dictionary_handler' require_relative '../sketchup_model/dictionary/speckle_model_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# When preference updated by UI. # When preference updated by UI.
class ModelPreferencesUpdated < Action class ModelPreferencesUpdated < Action
@@ -8,7 +8,7 @@ require_relative 'events/model_event_action'
require_relative 'events/selection_event_action' require_relative 'events/selection_event_action'
require_relative '../constants/observer_constants' require_relative '../constants/observer_constants'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Handle events that were collected by observers # Handle events that were collected by observers
class OnEventsAction < Action class OnEventsAction < Action
@@ -5,7 +5,7 @@ require_relative '../states/state'
require_relative '../states/speckle_state' require_relative '../states/speckle_state'
require_relative '../actions/send_from_queue' require_relative '../actions/send_from_queue'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Send queue from state. # Send queue from state.
class QueueSend < Action class QueueSend < Action
@@ -2,7 +2,7 @@
require_relative '../action' require_relative '../action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to let sketchup know receive from server is finished.. # Action to let sketchup know receive from server is finished..
class AfterReceive < Action class AfterReceive < Action
@@ -2,7 +2,7 @@
require_relative '../action' require_relative '../action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to let sketchup know receive will be started. # Action to let sketchup know receive will be started.
class BeforeReceive < Action class BeforeReceive < Action
@@ -6,7 +6,7 @@ require_relative '../action'
require_relative '../../convertors/units' require_relative '../../convertors/units'
require_relative '../../convertors/to_native' require_relative '../../convertors/to_native'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Clear mappings for selected entities. # Clear mappings for selected entities.
class ReceiveSingleObject < Action class ReceiveSingleObject < Action
@@ -4,7 +4,7 @@ require_relative '../action'
require_relative '../../convertors/to_native' require_relative '../../convertors/to_native'
require_relative '../../convertors/to_native_v2' require_relative '../../convertors/to_native_v2'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Receive from server. # Receive from server.
class AfterGetObjects < Action class AfterGetObjects < Action
@@ -6,7 +6,7 @@ require_relative '../../convertors/units'
require_relative '../../convertors/to_speckle' require_relative '../../convertors/to_speckle'
require_relative '../../operations/send' require_relative '../../operations/send'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Receive from server. # Receive from server.
class Receive < Action class Receive < Action
@@ -6,7 +6,7 @@ require_relative '../convertors/to_native'
require_relative '../operations/receive' require_relative '../operations/receive'
require_relative '../convertors/clean_up' require_relative '../convertors/clean_up'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to receive objects from Speckle Server. # Action to receive objects from Speckle Server.
class ReceiveObjects < Action class ReceiveObjects < Action
@@ -4,7 +4,7 @@ require_relative 'action'
require_relative '../accounts/accounts' require_relative '../accounts/accounts'
require_relative 'load_saved_streams' require_relative 'load_saved_streams'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to reload accounts from database. # Action to reload accounts from database.
class ReloadAccounts < Action class ReloadAccounts < Action
@@ -5,7 +5,7 @@ require_relative '../accounts/accounts'
require_relative '../convertors/units' require_relative '../convertors/units'
require_relative '../convertors/converter' require_relative '../convertors/converter'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to remove stream. # Action to remove stream.
# Currently it is not a state changer. # Currently it is not a state changer.
@@ -3,7 +3,7 @@
require_relative 'action' require_relative 'action'
require_relative '../accounts/accounts' require_relative '../accounts/accounts'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Save stream. # Save stream.
# Currently it is not a state changer. # Currently it is not a state changer.
@@ -4,7 +4,7 @@ require_relative 'action'
require_relative 'events/selection_event_action' require_relative 'events/selection_event_action'
require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler' require_relative '../sketchup_model/dictionary/speckle_schema_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Select entities that selected from mapped elements table. # Select entities that selected from mapped elements table.
class SelectMappingsFromTable < Action class SelectMappingsFromTable < Action
@@ -3,7 +3,7 @@
require_relative '../action' require_relative '../action'
require_relative '../../ui_data/sketchup/selection_info' require_relative '../../ui_data/sketchup/selection_info'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to get selection. # Action to get selection.
class GetSelection < Action class GetSelection < Action
@@ -3,7 +3,7 @@
require_relative '../action' require_relative '../action'
require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler' require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to activate send filter. # Action to activate send filter.
class ActivateSendFilter < Action class ActivateSendFilter < Action
@@ -3,7 +3,7 @@
require_relative '../action' require_relative '../action'
require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler' require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to activate send filter tag. # Action to activate send filter tag.
class ActivateSendFilterTag < Action class ActivateSendFilterTag < Action
@@ -8,7 +8,7 @@ require_relative '../../operations/send'
require_relative '../../sketchup_model/definitions/definition_manager' require_relative '../../sketchup_model/definitions/definition_manager'
require_relative '../../sketchup_model/materials/material_manager' require_relative '../../sketchup_model/materials/material_manager'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Send to server. # Send to server.
class Send < Action class Send < Action
@@ -3,7 +3,7 @@
require_relative '../action' require_relative '../action'
require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler' require_relative '../../sketchup_model/dictionary/model_card_dictionary_handler'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to check send card expirations. # Action to check send card expirations.
class SendCardExpirationCheck < Action class SendCardExpirationCheck < Action
@@ -3,7 +3,7 @@
require_relative 'action' require_relative 'action'
require_relative '../accounts/accounts' require_relative '../accounts/accounts'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Send already converted objects from queue if exist on stream. # Send already converted objects from queue if exist on stream.
class SendFromQueue < Action class SendFromQueue < Action
@@ -6,7 +6,7 @@ require_relative '../convertors/units'
require_relative '../convertors/to_speckle' require_relative '../convertors/to_speckle'
require_relative '../operations/send' require_relative '../operations/send'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Send selection to server. # Send selection to server.
class SendSelection < Action class SendSelection < Action
@@ -2,7 +2,7 @@
require_relative 'action' require_relative 'action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Show all entities on the model. # Show all entities on the model.
class ShowAllEntities < Action class ShowAllEntities < Action
@@ -2,7 +2,7 @@
require_relative '../action' require_relative '../action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to get user config. # Action to get user config.
class GetUserConfig < Action class GetUserConfig < Action
@@ -2,7 +2,7 @@
require_relative '../action' require_relative '../action'
module SpeckleConnector module SpeckleConnector3
module Actions module Actions
# Action to get user config. # Action to get user config.
class UpdateUserConfig < Action class UpdateUserConfig < Action

Some files were not shown because too many files have changed in this diff Show More