Compare commits
5 Commits
2.17.0-alpha3
...
2.17.1
| Author | SHA1 | Date | |
|---|---|---|---|
| b57fa010d1 | |||
| f816452b78 | |||
| 120083bb31 | |||
| a5bb5c4686 | |||
| e5e2729f0a |
@@ -27,10 +27,12 @@ module SpeckleConnector
|
||||
converter = Converters::ToNative.new(state, @stream_id, @stream_name, @branch_name, @source_app)
|
||||
# Have side effects on the sketchup model. It effects directly on the entities by adding new objects.
|
||||
start_time = Time.now.to_f
|
||||
state.sketchup_state.sketchup_model.start_operation('Receive Speckle Objects', true)
|
||||
state = converter.receive_commit_object(@base)
|
||||
if state.user_state.model_preferences[:merge_coplanar_faces]
|
||||
Converters::CleanUp.merge_coplanar_faces(converter.converted_faces)
|
||||
end
|
||||
state.sketchup_state.sketchup_model.commit_operation
|
||||
elapsed_time = (Time.now.to_f - start_time).round(3)
|
||||
puts "==== Converting to Native executed in #{elapsed_time} sec ===="
|
||||
puts "==== Source application is #{@source_app}. ===="
|
||||
|
||||
@@ -25,40 +25,18 @@ module SpeckleConnector
|
||||
|
||||
def self.merge_coplanar_faces(faces)
|
||||
edges = []
|
||||
start_time = Time.now.to_f
|
||||
puts "number of faces before reject deleted: #{faces.length}"
|
||||
faces = faces.reject(&:deleted?)
|
||||
puts "number of faces #{faces.length}"
|
||||
elapsed_time = (Time.now.to_f - start_time).round(3)
|
||||
puts "==== 1- Rejecting deleted faces executed in #{elapsed_time} sec ===="
|
||||
|
||||
start_time = Time.now.to_f
|
||||
faces.each { |face| face.edges.each { |edge| edges << edge } }
|
||||
elapsed_time = (Time.now.to_f - start_time).round(3)
|
||||
puts "==== 2- Collecting edges executed in #{elapsed_time} sec ===="
|
||||
|
||||
start_time = Time.now.to_f
|
||||
puts "number of edges before uniq!: #{edges.length}"
|
||||
edges.uniq!
|
||||
puts "number of edges #{edges.length}"
|
||||
elapsed_time = (Time.now.to_f - start_time).round(3)
|
||||
puts "==== 3- Making edges uniq! in #{elapsed_time} sec ===="
|
||||
|
||||
start_time = Time.now.to_f
|
||||
edges.each { |edge| remove_edge_have_coplanar_faces(edge) }
|
||||
elapsed_time = (Time.now.to_f - start_time).round(3)
|
||||
puts "==== 4- Clean up edges executed in #{elapsed_time} sec ===="
|
||||
|
||||
start_time = Time.now.to_f
|
||||
# Remove remaining orphan edges
|
||||
edges.reject(&:deleted?).select { |edge| edge.faces.empty? }.each(&:erase!)
|
||||
elapsed_time = (Time.now.to_f - start_time).round(3)
|
||||
puts "==== 5- Removing orphan edges edges executed in #{elapsed_time} sec ===="
|
||||
# edges.reject(&:deleted?).select { |edge| edge.faces.empty? }.each(&:erase!)
|
||||
|
||||
start_time = Time.now.to_f
|
||||
merged_faces(faces)
|
||||
elapsed_time = (Time.now.to_f - start_time).round(3)
|
||||
puts "==== 6- Rejecting deleted faces executed in #{elapsed_time} sec ===="
|
||||
end
|
||||
|
||||
def self.merged_faces(faces)
|
||||
|
||||
@@ -12,7 +12,7 @@ module SpeckleConnector
|
||||
include Immutable::ImmutableUtils
|
||||
DICT_HANDLER = SketchupModel::Dictionary::SpeckleModelDictionaryHandler
|
||||
# rubocop:disable Layout/LineLength
|
||||
DEFAULT_CONFIG = "('configSketchup', '{\"dark_theme\":false, \"diffing\":false, \"register_speckle_entity\":false}, \"fe2\":false');"
|
||||
DEFAULT_CONFIG = "('configSketchup', '{\"dark_theme\":false, \"diffing\":false, \"register_speckle_entity\":false, \"fe2\":false}');"
|
||||
# rubocop:enable Layout/LineLength
|
||||
DEFAULT_PREFERENCES = '{"dark_theme":false, "diffing":false, "register_speckle_entity": false, "fe2": false}'
|
||||
|
||||
@@ -34,12 +34,16 @@ module SpeckleConnector
|
||||
def self.data_complete?(row_data)
|
||||
return false if row_data.empty?
|
||||
|
||||
data = JSON.parse(row_data.first.first)
|
||||
if data['dark_theme'].nil? || data['fe2'].nil? || data['diffing'].nil? || data['register_speckle_entity'].nil?
|
||||
return false
|
||||
end
|
||||
begin
|
||||
data = JSON.parse(row_data.first.first)
|
||||
if data['dark_theme'].nil? || data['fe2'].nil? || data['diffing'].nil? || data['register_speckle_entity'].nil?
|
||||
return false
|
||||
end
|
||||
|
||||
true
|
||||
true
|
||||
rescue StandardError
|
||||
false
|
||||
end
|
||||
end
|
||||
|
||||
# Validates current preferences. If there are incomplete data then this method resets it with default preferences.
|
||||
|
||||
Reference in New Issue
Block a user