report_html 0.4.3 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1adce0447e51e4ea0e9f5e59dbbb3fb3df8676fd
-  data.tar.gz: d573b07d21953e58f23f13656641f8070a7e8ab5
+SHA256:
+  metadata.gz: 42b11e6f7cbc1b41650dec3d46300a4f81400582d19e443a31ada784d5a75876
+  data.tar.gz: 43a686a11355a8a15bd1b477f979f13039bd456237c53100583ca3b932188b6f
 SHA512:
-  metadata.gz: 74092e520c4454244ba6dbaf290091938f8e723c83082452ee962cd0335230d8510f81319f172fa6ddc3c09bec1046a9b46d3340a652815f7714cbe1e80d4af6
-  data.tar.gz: c9bdfe76cc85abc3eddaa16e388aff3d5a2add3af1f551f509a1ec388c66d1c312e52676b53934e89d2b6523c08b9d94c5c0b91ce55840cd9ffc96c9b1121205
+  metadata.gz: af4adc3696c16ae9912747388bc25e3792357a3565b304d809c1b4bf153e1bec81ada93edb6be73273121794ea55195ab5f74f42d5809be996b389dd5bf24f9d
+  data.tar.gz: 7e107643ea36da3a8a7c8257aa6cf481d20c0c08ae1721d347c108e63d3938ef1b71363ea51f03ba16ff53468731206a8a4402768aab82d73bc7a5b0c42abc9a

data/lib/report_html/report_html.rb

@@ -400,7 +400,9 @@ class Report_html
 		end
 		values = data_array
 
-		yield(options, config, samples, vars, values, object_id)
+		x = {}
+		z = {}
+		yield(options, config, samples, vars, values, object_id, x, z)
 		# Build JSON objects and Javascript code
 		#-----------------------------------------------
 		@count_objects += 1
@@ -409,7 +411,9 @@ class Report_html
 				'vars' => vars,
 				'smps' => samples,
 				'data' => values
-			}
+			},
+			'x' => x,
+			'z' => z
 		}
 		events = false
 		info = false
@@ -442,7 +446,7 @@ class Report_html
 		default_options = {
 			row_names: true			
 		}.merge!(user_options)
-		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id|
+		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id, x, z|
 			config['graphType'] = 'Line'	
 		end
 		return html_string
@@ -452,7 +456,7 @@ class Report_html
 		default_options = {
 			row_names: true,
 		}.merge!(user_options)
-		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id|
+		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id, x, z|
 			config['graphType'] = 'Stacked'	
 		end
 		return html_string
@@ -462,17 +466,33 @@ class Report_html
 		default_options = {
 			row_names: true
 		}.merge!(user_options)
-		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id|
+		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id, x, z|
 			config['graphType'] = 'Bar'
 		end
 		return html_string
 	end
 
+	def dotplot(user_options = {}, &block)
+		default_options = {
+			row_names: true,
+			connect: false
+		}.merge!(user_options)
+		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id, x, z|
+			config['graphType'] = 'Dotplot'
+			if default_options[:connect]
+				config['dotplotType'] = "stacked"
+				config['connectBy'] = "Connect"
+				z[:Connect] = Array.new(vars.length, 1)
+			end
+		end
+		return html_string
+	end
+
 	def heatmap(user_options = {}, &block)
 		default_options = {
 			row_names: true
 		}.merge!(user_options)
-		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id|
+		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id, x, z|
 			config['graphType'] = 'Heatmap'	
 		end
 		return html_string
@@ -483,7 +503,7 @@ class Report_html
 			row_names: true,
 			header: true
 		}.merge!(user_options)
-		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id|
+		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id, x, z|
 			config['graphType'] = 'Boxplot'
 			options[:mod_data_structure] = 'boxplot'
 			if options[:extracode].nil?
@@ -497,7 +517,7 @@ class Report_html
 		default_options = {
 			transpose: false
 		}.merge!(user_options)
-		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id|
+		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id, x, z|
 			config['graphType'] = 'Pie'
 			if samples.length > 1
 				config['showPieGrid'] = true
@@ -514,7 +534,7 @@ class Report_html
 			transpose: false,
 			correlationAxis: 'samples'
 		}.merge!(user_options)
-		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id|
+		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id, x, z|
 			config['graphType'] = 'Correlation'
 			config['correlationAxis'] = default_options[:correlationAxis]
 		end
@@ -526,7 +546,7 @@ class Report_html
 			row_names: false,
 			transpose: false
 		}.merge!(user_options)
-		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id|
+		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id, x, z|
 			config['graphType'] = 'Scatter2D'
 			config['xAxis'] = [samples.first] if config['xAxis'].nil?	
 			config['yAxis']	= samples[1..samples.length-1] if config['yAxis'].nil?
@@ -549,7 +569,7 @@ class Report_html
 			row_names: true,
 			transpose: false
 		}.merge!(user_options)
-		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id|
+		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id, x, z|
 			config['graphType'] = 'ScatterBubble2D'
 			if options[:xAxis].nil?	
 				config['xAxis'] = [samples[0]]
@@ -591,7 +611,7 @@ class Report_html
 			ringsType: [],
 			ringsWeight: []
 		}.merge!(user_options)
-		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id|
+		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id, x, z|
 			options[:mod_data_structure] = 'circular'
 			config['graphType'] = 'Circular'
 			config['segregateVariablesBy'] = ['Ring']
@@ -643,6 +663,39 @@ class Report_html
 		end
 	end
 
+	def circular_genome(user_options = {}, &block)
+		default_options = {}.merge!(user_options)
+		coordinates = user_options[:genomic_coordinates]
+		html_string = canvasXpress_main(default_options, block) do |options, config, samples, vars, values, object_id, x, z|
+			config['graphType'] = 'Circular'
+			config["arcSegmentsSeparation"] = 3
+    	config["colorScheme"] = "Tableau"
+    	config["colors"] = ["#332288","#6699CC","#88CCEE","#44AA99","#117733","#999933","#DDCC77","#661100","#CC6677","#AA4466","#882255","#AA4499"]
+			config["showIdeogram"] = true
+			chr = []
+			pos = []
+			tags2remove = []
+			vars.each_with_index do |var, i|
+				coord = coordinates[var]
+				if !coord.nil?
+					tag = coord.first.gsub(/[^\dXY]/,'')
+					if tag == 'X' || tag == 'Y' || (tag.to_i > 0 && tag.to_i <= 22)
+						chr << coord.first.gsub(/[^\dXY]/,'')
+						pos << coord.last - 1
+					else
+						tags2remove << i
+					end
+				else
+					tags2remove << i
+				end
+			end
+			tags2remove.reverse_each{|i| ent = vars.delete_at(i); warn("Feature #{ent} has not valid coordinates")} # Remove entities with invalid coordinates
+			z['chr'] = chr
+			z['pos'] = pos
+		end
+		return html_string
+	end	
+
 	# EMBED FILES
 	###################################################################################
 

data/lib/report_html/version.rb

@@ -1,3 +1,3 @@
 module ReportHtml
-  VERSION = "0.4.3"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: report_html
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.6
 platform: ruby
 authors:
 - seoanezonjic
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,7 +72,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -87,9 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Gem to build html interactive reports.
 test_files: []