atome 0.5.7.0.4 → 0.5.7.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43a34334a41145533d60173178c7320ca20fea32690d6e26919f7dfa0553d2b0
-  data.tar.gz: 691dc70c3ed9c4849e5d6b597f879207528f1b88f58a948491d162e424e3091f
+  metadata.gz: 23166944704e42b25801cc052708c19f265c1f8247dd3ff9b099944ecb415401
+  data.tar.gz: 38a31b2cdcc6ceeef5453b926ee4d7eaf704e48c58039830126a94b5a430c188
 SHA512:
-  metadata.gz: 72e6d3ad87fc01564331b9c585c6021ab2075b56caf57946e974c3fdebbaa572e92db9edd23b97e014a691d3e000777715bbfc5223f8e8d9ad1230fdb788d6e5
-  data.tar.gz: 896f6f73134f274736317b1fd3a97e37aa1e0e89dc1dd26aa612363b7492136295747e379e154a319802d506f67ed17462da6b1bc5c9b8d5aefc4ef0f4207a5f
+  metadata.gz: 86db3598d96617483482c8e97006bf3fe2e981be529cd871e75b7370b55838002914192c64dcb4b46cf72313f470a91a9ff3f2408fa5914439b84126c924cd44
+  data.tar.gz: 655b083c5529f5ed4c642ee5c7457d2940062914433e072a582964ae1e7a4932423731b3a353d0f927d1d6db5b5d56386907d91d7011dfca53979b4e3c532608

data/lib/atome/genesis/particles/identity.rb

@@ -15,7 +15,6 @@ new({ sanitizer: :id }) do |params|
   #     Universe.add_to_atomes(params, self)
   #   end
 
-
   # Universe.atomes.each do |_aid,atome_f|
   #
   #   if atome_f.id == params
@@ -64,24 +63,27 @@ end
 
 new(particle: :selected, category: :identity, type: :boolean) do |params|
   if params == true
-    @selection_style=[]
-    select_style= border({ thickness: 3, red: 1, green: 1, blue: 1, alpha: 1, pattern: :dotted })
+    @selection_style = []
+    # select_style= border({ thickness: 3, red: 1, green: 1, blue: 1, alpha: 1, pattern: :dotted })
+    default_style = Universe.default_selection_style
+    select_style = ''
+    default_style.each do |atome_f, part_f|
+      select_style = send(atome_f, part_f)
+    end
     @selection_style << select_style.id
     grab(Universe.current_user).selection << @id
   elsif params == false
-    @selection_style.each do |style_f|
-      remove(style_f)
-    end
-    @selection_style=nil
+    @selection_style&.each do |style_f|
+          remove(style_f)
+        end
+    @selection_style = nil
     grab(Universe.current_user).selection.collect.delete(@id)
   else
-    @selection_style=[]
-     params.each do |part_f, val_f|
-       select_style=  send(part_f,val_f)
-       @selection_style << select_style.id
-     end
-    # border({ thickness: 3, red: 1, green: 0, blue: 1, alpha: 1, pattern: :dotted })
-    # border({ thickness: 10,  pattern: :solid, color: :red})
+    @selection_style = []
+    params.each do |part_f, val_f|
+      select_style = send(part_f, val_f)
+      @selection_style << select_style.id
+    end
     grab(Universe.current_user).selection << @id
   end
   params

data/lib/atome/genesis/particles/material.rb

@@ -13,37 +13,33 @@ new({ particle: :hide, category: :material, type: :boolean })
 
 new({ particle: :remove, category: :property, type: :hash }) do |params|
 
-
-  if  params.instance_of? Hash
+  if params.instance_of? Hash
     if params[:row]
       data.delete_at(params[:row])
-
     elsif params[:column]
       column = params[:column]
       data.map do |hash|
         hash.delete(hash.keys[column]) if hash.keys[column]
-        hash
       end
-    # elsif params[:all]
-    #   apply.each do |applied_atome|
-    #     if  grab(applied_atome).type.to_sym ==  params[:all].to_sym
-    #       puts "!go"
-    #     end
-    #   end
+      # elsif params[:all]
+      #   apply.each do |applied_atome|
+      #     if  grab(applied_atome).type.to_sym ==  params[:all].to_sym
+      #       puts "!go"
+      #     end
+      #   end
       # puts "so_good #{params}"
       # puts "***> #{apply}"
     end
+
     params
   else
 
     params
   end
 
-
 end
 # new({ particle: :remove, category: :property, type: :hash })
 
-
 new({ post: :remove }) do |params|
   # TODO : we have to rethink the removal of atome and particles (with exception like category) and maybe 'use particle type' to handle removal
   if params.instance_of?(Hash)
@@ -100,22 +96,22 @@ end
 new({ particle: :gradient, category: :material, type: :int })
 
 new({ particle: :thickness, category: :material, type: :int })
-new({ after: :thickness}) do |params|
-  a=affect.dup #  FIXME  we have to dup else some items in the array array other duplicated
+new({ after: :thickness }) do |params|
+  a = affect.dup #  FIXME  we have to dup else some items in the array array other duplicated
   a.each do |atome_to_refresh|
     grab(atome_to_refresh).apply(id)
   end
   params
 end
 new({ particle: :pattern, category: :material, type: :string })
-new({ after: :pattern })do |params|
-  a=affect.dup #  FIXME  we have to dup else some items in the array array other duplicated
+new({ after: :pattern }) do |params|
+  a = affect.dup #  FIXME  we have to dup else some items in the array array other duplicated
   a.each do |atome_to_refresh|
     grab(atome_to_refresh).apply(id)
   end
   params
 end
 # new({ particle: :border, category: :material, type: :int })
-new({particle: :fill, category: :material, type: :array })
+new({ particle: :fill, category: :material, type: :array })
 
-new({particle: :opacity, category: :material, type: :int })
+new({ particle: :opacity, category: :material, type: :int })

data/lib/atome/genesis/particles/utility.rb

@@ -25,7 +25,6 @@ def delete_recursive(atome_id)
 end
 
 new({ particle: :delete, category: :utility, type: :boolean, render: false }) do |params|
-
   if params == true
     # We use the tag persistent to exclude color of system object and other default colors
     unless @tag && (@tag[:persistent] || @tag[:system])
@@ -38,13 +37,11 @@ new({ particle: :delete, category: :utility, type: :boolean, render: false }) do
         parent_found = grab(@attach)
         parent_found.attached.delete(id_found)
       end
-      if @affect
-        @affect.each do |affected_atome|
+      @affect&.each do |affected_atome|
           affected_found = grab(affected_atome)
           affected_found.apply.delete(id_found)
           affected_found.refresh
         end
-      end
 
       # Universe.delete(@aid)
     end

data/lib/atome/kernel/universe.rb

@@ -27,13 +27,14 @@ class Universe
   @allow_tool_operations = false
   @active_tools = []
   @atome_preset = []
+  @default_selection_style={border: { thickness: 3, red: 1, green: 1, blue: 1, alpha: 1, pattern: :dotted }}
   @applicable_atomes= %i[color shadow border paint animation]
   # @historicize=false
   class << self
     attr_reader :atomes, :atomes_ids, :renderer_list, :molecule_list, :atome_list, :particle_list, :classes, :counter,
                 :atomes_specificities
     attr_accessor :connected, :allow_sync, :allow_localstorage, :database_ready, :edit_mode, :tools,
-                  :allow_tool_operations, :active_tools, :atome_preset, :applicable_atomes
+                  :allow_tool_operations, :active_tools, :atome_preset, :applicable_atomes, :default_selection_style
 
     def messages
       @messages

data/lib/atome/utilities/utilities.rb

@@ -388,7 +388,7 @@ class Atome
   def particles_to_hash
     hash = {}
     instance_variables.each do |var|
-      next if %i[@html_object @history @initialized @tick @controller_proc].include?(var)
+      next if %i[@selection_style @html_object @history @initialized @tick @controller_proc].include?(var)
       hash[var.to_s.delete('@').to_sym] = instance_variable_get(var)
     end
     hash

data/lib/atome/version.rb

@@ -2,5 +2,5 @@
 
 #  return atome version
 class Atome
-  VERSION = '0.5.7.0.4'
+  VERSION = '0.5.7.0.5'
 end

data/lib/renderers/html/material.rb

@@ -44,13 +44,13 @@ new({ method: :remove, renderer: :html, type: :string }) do |object_id_to_remove
       html.style("boxShadow", 'none')
       html.style("filter", 'none')
       @apply.delete(object_id_to_remove)
-      apply(@apply)
+      # apply(@apply)
     when :border
       # alert :poipoipoipoipo
       html.style("border", 'none')
-      # html.style("filter", 'none')
+      html.style("filter", 'none')
       @apply.delete(object_id_to_remove)
-      apply(@apply)
+      # apply(@apply)
     when :paint
       atome_to_remove = grab(object_id_to_remove)
       atome_to_remove.gradient.each do |color_id|

data/vendor/assets/application/examples/refresh.rb

@@ -9,7 +9,6 @@ b.instance_variable_set("@path", './medias/images/red_planet.png' )
 
 b.instance_variable_set("@smooth", 30)
 wait 1 do
-  # alert b.inspect
   b.refresh
   b.instance_variable_set("@left", 300)
   wait 1 do
@@ -24,13 +23,13 @@ wait 1 do
     end
   end
 end
-# i=image(:green_planet)
+i=image(:green_planet)
 # alert i.path
-# i.instance_variable_set("@path", './medias/images/red_planet.png')
-# wait 2 do
-#   i.refresh
-#   # i.path'./medias/images/red_planet.png'
-# end
+i.instance_variable_set("@path", './medias/images/red_planet.png')
+wait 2 do
+  i.refresh
+  # i.path'./medias/images/red_planet.png'
+end
 
 
 #

data/vendor/assets/application/examples/selected.rb

@@ -1,22 +1,28 @@
 # frozen_string_literal: true
 
-# grab(:a_styles).data
 t = text({ data: 'touch me to select all', id: :the_text })
 b = box({ left: 12, id: :the_box })
-c = circle({ left: 230, id: :the_circle })
-c.color(:green)
-# c.touch(true) do
-#   if c.selected
-#     c.selected(false)
-#   else
-#     # example of custom selection style
-#     c.selected({ shadow: {
-#       left: 9, top: 3, blur: 9,
-#       invert: false,
-#       red: 0, green: 0, blue: 0, alpha: 1
-#     }, border: { thickness: 5, red: 1, green: 1, blue: 1, alpha: 1, pattern: :dotted, id: :the_door,inside: true } })
-#   end
-# end
+c = circle({ left: 230, id: :the_circle, color: { blue: 1, id: :c1 } })
+c.color({ green: 1, id: :c2 })
+# to change default selection style
+Universe.default_selection_style = { border: { thickness: 3, red: 1, green: 0, blue: 1, alpha: 1, pattern: :dotted } }
+
+c.touch(true) do
+  if c.selected
+    c.selected(false)
+  else
+    # c.selected(true)
+    # example of custom selection style
+    c.selected({ shadow: { id: :titi,
+                           left: 9, top: 3, blur: 9,
+                           invert: false,
+                           red: 0, green: 0, blue: 0, alpha: 1
+    }, border: { id: :toto, thickness: 5, red: 1, green: 1, blue: 1, alpha: 1,
+                 pattern: :dotted, inside: true }
+               })
+  end
+end
+
 image({ path: 'medias/images/red_planet.png', id: :the__red_planet, top: 233 })
 
 t.touch(true) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atome
 version: !ruby/object:Gem::Version
-  version: 0.5.7.0.4
+  version: 0.5.7.0.5
 platform: ruby
 authors:
 - Jean-Eric Godard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 2024-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo