statsailr 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f43e60b39aac689fdb11d44e9210bca2dbc001c45bb2af91bfd7f4aaf030d8d2
-  data.tar.gz: 10df046a557a751c27a1555a04366c5a8da06641b2aa6b3516b04b95ce37e81c
+  metadata.gz: 0f27292effff5ace93fcbae7cecd0a62615450ff496ba1c2bdc03b3824894a56
+  data.tar.gz: 7a13e3905398a04bde7f3dd0719576bcfc92a6b95b62e2a34071eca9db0086c0
 SHA512:
-  metadata.gz: c58978325f14ed1d462f6647c56a1bae7d0b60103de26a65112b1050746312cb24179c8ea12568b58e7ac919682146aa753b58a8b3cb06e1a98750bf2763bb44
-  data.tar.gz: 7180c9aee4851fd67cfbf6f4857bc2b23d821d3003d4afea715b7a620399a90e4e1d756d6937effa5f93969771c53a0bb6fecae7e6281c5f19054bc76a1ccac8
+  metadata.gz: 356f45dd828c22c84071879e6d0a9a16ec215adf5f3894d37b6a292a6189dde7e211a12aea4697e5695a21cc8d6848c57ae5156d263b035c5b2eed667abb7300
+  data.tar.gz: 1f94bb8192f0af9d20ee9a79600a8db9278d17c4a323da274e8aad6e6ad3318368d070422fd30c631da75ac845773810708999d92a066ebcff0e2dce9bb8be59

data/lib/statsailr/sts_build_exec.rb

@@ -26,34 +26,54 @@ def self.initial_setting_for_r(device_info)
       RBridge.exec_function_no_return(attach_widget_func)
       @new_device_info = { "file_output" => false, "dev_off_required" => false }
 
-    when "cairoraster"  # (e.g.) ["CairoRaster", {"width" => 800, "height" => 600, "dev.copy_opt" => {"dir_path"=> dir_to_save , "prefix"=> "plot", "type" => "png"} }]
+    when "cairoraster"  # (e.g.) ["CairoRaster", {"width" => 800, "height" => 600 }, {"file_output_opt" => {"dir_path"=> dir_to_save , "prefix"=> "plot", "type" => "png"} }]
       puts "Use Cairo function in Cairo library"
       if ! device_info[1].is_a?(Hash)
         raise "The second element of device info needs to be Hash"
       end
-      cairo_info = device_info[1]
-      if ! ["png", "jpeg"].include? cairo_info["dev.copy_opt"]["type"]
+      cairo_info = device_info[1].dup
+      file_output_opt = device_info[2]["file_output_opt"]
+      if ! ["png", "jpeg"].include? file_output_opt["type"]
         raise "only png or jpeg is supported for type"
       else
-        case cairo_info["dev.copy_opt"]["type"]
+        case file_output_opt["type"]
         when "png"
           # load png library
           lib_func = RBridge.create_library_function("png")
           RBridge.exec_function_no_return(lib_func)
         when "jpeg"
           # use default jpeg device
+          lib_func = RBridge.create_library_function("jpeg")
+          RBridge.exec_function_no_return(lib_func)
         end
       end
       lib_func = RBridge.create_library_function("Cairo")
       RBridge.exec_function_no_return(lib_func)
-      new_cairo_device_func = RBridge.create_function_call("Cairo", { "width" => RBridge.create_intvec([ cairo_info["width"] ]),
-                                                                      "height" => RBridge.create_intvec([ cairo_info["height"] ]),
-                                                                      "type" => RBridge.create_strvec([ "raster" ])  })
-      RBridge.exec_function_no_return(new_cairo_device_func)
-      @new_device_info = { "file_output" => true, "dev_off_required" => true ,
-                           "opt" => cairo_info["dev.copy_opt"].merge( {
-                                      "device_func" => RBridge::SymbolR.new( cairo_info["dev.copy_opt"]["type"] ).to_r_symbol,
-                                      "default_width" => cairo_info["width"], "default_height" => cairo_info["height"]})}
+
+      @new_device_info = { "file_output" => true, "dev_off_required" => true ,"file_output_opt" => file_output_opt,
+                           "dev_control" => {
+                             "new" => lambda {
+                               RBridge.exec_function_no_return(
+                               RBridge.create_function_call("Cairo",
+                                 { "width" => RBridge.create_intvec([ cairo_info["width"] ]),
+                                   "height" => RBridge.create_intvec([ cairo_info["height"] ]),
+                                   "type" => RBridge.create_strvec([ "raster" ])  }))
+                             },
+                             "off" => lambda {
+                               RBridge.exec_function_no_return(
+                               RBridge.create_function_call("dev.off", {}))
+                             },
+                             "get_size" => lambda {
+                               {:width => cairo_info["width"], :height => cairo_info["height"]}
+                             },
+                             "set_size" => lambda {|width, height|
+                               cairo_info["width"] = width
+                               cairo_info["height"] = height
+                             }
+                           }
+                         }
+      @new_device_info["dev_control"]["new"].call()
+
     else
       puts "Unknown device type: #{device_type}"
     end
@@ -253,17 +273,29 @@ blocks.each(){|blk|
           else
             if @new_device_info["file_output"] == true
               # The plot needs to be saved on disk.
-              dev_info_opt = @new_device_info["opt"]
+              file_output_opt = @new_device_info["file_output_opt"]
               temp_path = ""
-              temp_file = Tempfile.new( [dev_info_opt["prefix"] , "." + dev_info_opt["type"] ] , dev_info_opt["dir_path"] )
+              temp_file = Tempfile.new( [file_output_opt["prefix"] , "." + file_output_opt["type"] ] , file_output_opt["dir_path"] )
               temp_path = temp_file.path
               temp_file.close(true)
-              dev_copy_func = RBridge::create_function_call("dev.copy", { "device" => dev_info_opt["device_func"], "file" => RBridge::create_strvec([temp_path]),
-                                                                          "width" => RBridge::create_intvec( [dev_info_opt["default_width"]] ),
-                                                                          "height" => RBridge::create_intvec( [dev_info_opt["default_height"]] ) })
-              RBridge::exec_function_no_return(dev_copy_func)
-              dev_off_func = RBridge::create_function_call("dev.off", {})
-              RBridge::exec_function_no_return(dev_off_func)
+
+              if ["png", "jpeg" ].include? file_output_opt["type"]
+                # writePNG( image=Cairo.capture( device=dev.cur() ), target="./plot.png" )
+                r_func_curr_dev = RBridge::create_function_call("dev.cur", {})
+                r_func_cairo_capture = RBridge::create_function_call("Cairo.capture",{"device" => r_func_curr_dev})
+                r_str_file_path = RBridge::create_strvec([temp_path])
+                if file_output_opt["type"] == "png"
+                  r_func_write_png = RBridge::create_function_call("writePNG", {"image" => r_func_cairo_capture, "target" => r_str_file_path })
+                  RBridge::exec_function_no_return( r_func_write_png )
+                elsif file_output_opt["type"] == "jpeg"
+                  r_func_write_jpeg = RBridge::create_function_call("writeJPEG", {"image" => r_func_cairo_capture, "target" => r_str_file_path })
+                  RBridge::exec_function_no_return( r_func_write_jpeg )
+                end
+              end
+
+              @new_device_info["dev_control"]["off"].call()
+              @new_device_info["dev_control"]["new"].call()
+
               if(File.exist? temp_path)
                 output_mngr.add_new_message(:plot_file).set_content( temp_path )
               end

data/lib/statsailr/version.rb

@@ -1,3 +1,3 @@
 module StatSailr
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statsailr
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Toshihiro Umehara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r_bridge