From 7816e99565d79a20b6154dfb68333162c7dcdfe3 Mon Sep 17 00:00:00 2001 From: Randy Morgan Date: Sun, 29 Apr 2012 09:40:39 +0900 Subject: examples and read me clean up as well as implementing outlineLevel for row and col. --- lib/axlsx/workbook/worksheet/col.rb | 3 ++- lib/axlsx/workbook/worksheet/row.rb | 47 +++++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/axlsx/workbook/worksheet/col.rb b/lib/axlsx/workbook/worksheet/col.rb index 7a34ad40..fb19a1bd 100644 --- a/lib/axlsx/workbook/worksheet/col.rb +++ b/lib/axlsx/workbook/worksheet/col.rb @@ -60,7 +60,8 @@ module Axlsx # @see Col#outline def outlineLevel=(v) - Axlsx.validate_boolean(v) + Axlsx.validate_unsigned_numeric(v) + raise ArgumentError, 'outlineLevel must be between 0 and 7' unless 0 <= v && v <= 7 @outlineLevel = v end diff --git a/lib/axlsx/workbook/worksheet/row.rb b/lib/axlsx/workbook/worksheet/row.rb index cdfa1a05..0112da75 100644 --- a/lib/axlsx/workbook/worksheet/row.rb +++ b/lib/axlsx/workbook/worksheet/row.rb @@ -5,6 +5,7 @@ module Axlsx # @see Worksheet#add_row class Row + SERIALIZABLE_ATTRIBUTES = [:hidden, :outlineLevel, :collapsed, :style] # The worksheet this row belongs to # @return [Worksheet] attr_reader :worksheet @@ -17,13 +18,29 @@ module Axlsx # @return [Float] attr_reader :height + # Flag indicating if the outlining of the affected column(s) is in the collapsed state. + # @return [Boolean] + attr_reader :collapsed + + # Flag indicating if the affected column(s) are hidden on this worksheet. + # @return [Boolean] + attr_reader :hidden + + # Outline level of affected column(s). Range is 0 to 7. + # @return [Integer] + attr_reader :outlineLevel + + # Default style for the affected column(s). Affects cells not yet allocated in the column(s). In other words, this style applies to new columns. + # @return [Integer] + attr_reader :style + # TODO 18.3.1.73 - # collapsed + # # collapsed # customFormat - # hidden - # outlineLevel + # # hidden + # # outlineLevel # ph - # s (style) + # # s (style) # spans # thickTop # thickBottom @@ -53,6 +70,25 @@ module Axlsx array_to_cells(values, options) end + # @see Row#collapsed + def collapsed=(v) + Axlsx.validate_boolean(v) + @collapsed = v + end + + # @see Row#hidden + def hidden=(v) + Axlsx.validate_boolean(v) + @hidden = v + end + + # @see Row#outline + def outlineLevel=(v) + Axlsx.validate_unsigned_numeric(v) + @outlineLevel = v + end + + # The index of this row in the worksheet # @return [Integer] def index @@ -65,6 +101,9 @@ module Axlsx # @return [String] def to_xml_string(r_index, str = '') str << '' else -- cgit v1.2.3