mcc2 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a05b21ad3389b3f9633e6d3e74e019d5df9bb94d095e21fb21cba18670d2d390
-  data.tar.gz: 7445b74a0c53ca9ee59b137372e77d41e1d87a828cab929c87fe96240f54acaa
+  metadata.gz: 1c0644a22468b1f2859c31b47904bc3434bb74e241c58b0d98b6f7c50ee602b4
+  data.tar.gz: e424eb73bcf7a35e21ad822d7660b9cf1933cd66795058cbc78f5dd81d230d21
 SHA512:
-  metadata.gz: ee57765ce5967923e61f31644d358c035b95c7c17c9107303b9cac1168d2d6dad0beda434aeafd4c91da9f636b8fb7c2aab6b3fae979a8e7f85c81f4cc47379a
-  data.tar.gz: 2b362c2f47ded8c4b2c7e4d784c557e937a37c2d7494d1fb88c3ee893bc9a257a54f8ff5f2fdf4c5db39e67f1154f8cd877c3e95290c26ab3aa883fbb058e302
+  metadata.gz: 347b50b032706fe1484a94d2e3985b4747d4079868bdec9f0c68b4dc500276b84a55f36fbcee4142f1134580f7e936ca7af301e2b7eb66d05361402ed26798e7
+  data.tar.gz: 7a95636ed27195bf9b000c12955d8239276933b3d6c2fd335378c62403204bfa18accc40cc9e9e6a2c865263ea5e83739ce567af0fd367889a31332b2836b27d

data/lib/mcc2/layout_file.rb

@@ -308,19 +308,6 @@ PRINT 1
             get_pango_font(font_info, pt(fontsize))
           end
 
-          def get_text_sizes(go)
-            data = go[GOA_SAMPLE_DATA].to_s
-            if !data.empty?
-              pango_font = pango_font_of(go)
-              context  = pango_font_map.create_context
-              layout   = Pango::Layout.new(context)
-              layout.font_description = pango_font
-              layout.text = data # set the text to render
-
-              layout.pixel_size.map{|px| px_to_mm(px) }
-            end
-          end
-
           def get_new_coods(go)
             x = go[GOA_X].to_f
             y = go[GOA_Y].to_f
@@ -360,13 +347,12 @@ PRINT 1
               .sub("Mitte", "mid")
               .sub("Rechts", "right")
 
-            w, h = converter.get_text_sizes(go)
             # set bounding box and keep a little bit of space for safty
             if just == S_JUST_LEFT
               # Don't change middle or right aligned, they should already be valid
-              set_object_by_ids([id], GOA_WIDTH, format("%0.2f", w * 1.1 + 5.0))
+              set_object_by_ids([id], GOA_WIDTH, "")
             end
-            set_object_by_ids([id], GOA_HEIGHT, format("%0.2f", h * 1.1 + 1))
+            set_object_by_ids([id], GOA_HEIGHT, "")
 
             x, y = converter.get_new_coods(go)
             # move text up, because old old Y means text baseline

data/lib/mcc2/printer/svg_drawer.rb

@@ -231,8 +231,8 @@ module Mcc2
             # die allgemeinen Attribute ermitteln
             x = go[GOA_X].to_f
             y = go[GOA_Y].to_f
-            go_width = go[GOA_WIDTH].to_f
-            go_height = go[GOA_HEIGHT].to_f
+            go_width = go[GOA_WIDTH].to_f unless go[GOA_WIDTH].to_s.empty?
+            go_height = go[GOA_HEIGHT].to_f unless go[GOA_HEIGHT].to_s.empty?
             rotation = go[GOA_ROTATION].to_f
             typ = go[GOA_TYP]
 
@@ -245,21 +245,14 @@ module Mcc2
               data = go[GOA_SAMPLE_DATA].to_s
             end
 
-            if tra
-              rec = tra.translate(mm(x).round, mm(y).round).rotate(rotation)
-              rec2 = rec.translate(mm(go_width), 0)
-              rec3 = rec.translate(mm(go_width), mm(go_height))
-              rec4 = rec.translate(0, mm(go_height))
-              orec = ObjRectangle.new(rec.vector2d, rec2.vector2d, rec3.vector2d, rec4.vector2d, id)
-              rect_list.add(orec)
-            end
+            rec = tra.translate(mm(x).round, mm(y).round).rotate(rotation)
 
             drawing.g transform: "rotate(#{rec.a})" do
               opos = rec.inverse
 
               begin
                 # die Objekt-spezifischen Attribute ermitteln
-                if typ == TEXTOBJECT
+                go_width, go_height = if typ == TEXTOBJECT
                   draw_textobject(drawing, opos, go, go_width, go_height, data.empty? ? data_nosub : data)
                 elsif typ == PICTUREOBJECT
                   draw_pictureobject(drawing, opos, go, go_width, go_height, data)
@@ -275,6 +268,12 @@ module Mcc2
                 raise err, "#{go[GOA_NAME]}: #{err}"
               end
 
+              rec2 = rec.translate(mm(go_width), 0)
+              rec3 = rec.translate(mm(go_width), mm(go_height))
+              rec4 = rec.translate(0, mm(go_height))
+              orec = ObjRectangle.new(rec.vector2d, rec2.vector2d, rec3.vector2d, rec4.vector2d, id)
+              rect_list.add(orec)
+
               # in Vorschau einen Rahmen um das selektierte Objekt zeichnen
               if preview && selected_object_ids.include?(id)
                 # drawing.fill("none")
@@ -349,6 +348,19 @@ module Mcc2
 
       if data && !data.empty?
         font_info = get_font_info(font, go)
+        context  = pango_font_map.create_context
+        layout   = Pango::Layout.new(context)
+
+        pango_font = get_pango_font(font_info, pt(fontsize))
+        layout.font_description = pango_font
+        layout.width = mm(go_width) * Pango::SCALE if go_width
+        layout.height = mm(go_height) * Pango::SCALE if go_height
+        layout.wrap = Pango::WrapMode::WORD_CHAR
+        layout.justify = just_block
+        layout.alignment = pjust
+        layout.ellipsize = Pango::EllipsizeMode::END
+        layout.text = data # set the text to render
+
         drawing.text_(fill: font_color,
                       'text-anchor': just,
                       'font-size': pt(fontsize),
@@ -358,20 +370,7 @@ module Mcc2
                       'font-stretch': font_info.font_stretch,
                       'xml:space': "preserve") do
 
-          context  = pango_font_map.create_context
-          layout   = Pango::Layout.new(context)
-
-          pango_font = get_pango_font(font_info, pt(fontsize))
-          layout.font_description = pango_font
-          layout.width = mm(go_width) * Pango::SCALE
-          layout.height = mm(go_height) * Pango::SCALE
-          layout.wrap = Pango::WrapMode::WORD_CHAR
-          layout.justify = just_block
-          layout.alignment = pjust
-          layout.ellipsize = Pango::EllipsizeMode::END
-          layout.text = data # set the text to render
-
-          # iterate all lines of the text box
+          # iterate all characters of the text box
           iter = layout.iter
           loop do
 
@@ -398,12 +397,16 @@ module Mcc2
               end
             end
 
-            drawing.tspan(cluster_text, x: tra.x + line_x, y: tra.y + line_y_baseline, **overflow)
+            drawing.tspan(cluster_text, x: tra.x + line_x, y: tra.y + line_y_baseline, **(overflow || {}))
 
             break unless next_byte_index
           end
         end
+        new_width, new_height = layout.pixel_size.map{|px| px_to_mm(px) }
+
+        return go_width || new_width, go_height || new_height
       end
+      return 1, 1
     end
 
     def draw_pictureobject(drawing, tra, go, go_width, go_height, data)
@@ -458,6 +461,8 @@ module Mcc2
       else
         raise Printer::Base::ResourceNotFoundError, I18n.t(:image_not_found, default: "Das Bild '%{path}' konnte nicht gefunden werden.", path: )
       end
+
+      return go_width, go_height
     end
 
     BARCODE_ALIAS = {
@@ -570,6 +575,7 @@ module Mcc2
                         'xml:space': "preserve")
         end
       end
+      return go_width, go_height
     end
 
     def barcode_mm_to_px(l, barcode_dpi)
@@ -592,6 +598,8 @@ module Mcc2
         "stroke-width": mm(border_width).round,
         x: tra.x, y: tra.y, width: mm(go_width).round, height: mm(go_height).round,
         rx: mm(corner_radius), ry: mm(corner_radius))
+
+      return go_width, go_height
     end
 
     def draw_embedobject(drawing, tra, go, go_width, go_height, data, row_number, barcode_dpi)
@@ -630,6 +638,7 @@ module Mcc2
       else
         raise Printer::Base::ResourceNotFoundError, I18n.t(:embedded_object_not_found, default: "Das Layout '%{path}' konnte nicht gefunden werden.", path: )
       end
+      return go_width, go_height
     end
 
     def get_font_info(font, obj)

data/lib/mcc2/version.rb

@@ -1,3 +1,3 @@
 module Mcc2
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcc2
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Lars Kanis