aspose_slides_cloud 20.5.0 → 20.12.0

data/lib/aspose_slides_cloud/models/bubble_chart_data_point.rb

@@ -24,49 +24,28 @@ require 'date'
 
 module AsposeSlidesCloud
   # Bubble chart data point.
-  class BubbleChartDataPoint
-    # X-value
-    attr_accessor :x_value
-
-    # Y-value
-    attr_accessor :y_value
-
+  class BubbleChartDataPoint < ScatterChartDataPoint
     # Bubble size.
     attr_accessor :bubble_size
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
-      {
-        :'x_value' => :'XValue',
-        :'y_value' => :'YValue',
-        :'bubble_size' => :'BubbleSize'
-      }
+      super.merge({
+        :'bubble_size' => :'BubbleSize',
+      })
     end
 
     # Attribute type mapping.
     def self.swagger_types
-      {
-        :'x_value' => :'Float',
-        :'y_value' => :'Float',
-        :'bubble_size' => :'Float'
-      }
+      super.merge({
+        :'bubble_size' => :'Float',
+      })
     end
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
-
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
-
-      if attributes.has_key?(:'XValue')
-        self.x_value = attributes[:'XValue']
-      end
-
-      if attributes.has_key?(:'YValue')
-        self.y_value = attributes[:'YValue']
-      end
+      super
 
       if attributes.has_key?(:'BubbleSize')
         self.bubble_size = attributes[:'BubbleSize']
@@ -76,15 +55,7 @@ module AsposeSlidesCloud
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
-      invalid_properties = Array.new
-      if @x_value.nil?
-        invalid_properties.push('invalid value for "x_value", x_value cannot be nil.')
-      end
-
-      if @y_value.nil?
-        invalid_properties.push('invalid value for "y_value", y_value cannot be nil.')
-      end
-
+      invalid_properties = super
       if @bubble_size.nil?
         invalid_properties.push('invalid value for "bubble_size", bubble_size cannot be nil.')
       end
@@ -95,8 +66,7 @@ module AsposeSlidesCloud
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @x_value.nil?
-      return false if @y_value.nil?
+      return false if !super
       return false if @bubble_size.nil?
       true
     end
@@ -129,15 +99,27 @@ module AsposeSlidesCloud
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.swagger_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+        mapKey = self.class.attribute_map[key]
+        if !mapKey.nil?
+          val = attributes[mapKey]
+          if val.nil?
+            mapKeyString = mapKey.to_s
+            mapKeyString[0] = mapKeyString[0].downcase
+            mapKey = mapKeyString.to_sym
+            val = attributes[mapKey]
+          end
+          if !val.nil?
+            if type =~ /\AArray<(.*)>/i
+              # check to ensure the input is an array given that the the attribute
+              # is documented as an array but the input is not
+              if val.is_a?(Array)
+                self.send("#{key}=", val.map { |v| _deserialize($1, v) })
+              end
+            else
+              self.send("#{key}=", _deserialize(type, val))
+            end
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self

data/lib/aspose_slides_cloud/models/bubble_series.rb

@@ -24,61 +24,7 @@ require 'date'
 
 module AsposeSlidesCloud
   # A bubble series.
-  class BubbleSeries
-    # Series type.
-    attr_accessor :type
-
-    # Series name.
-    attr_accessor :name
-
-    # True if each data marker in the series has a different color.
-    attr_accessor :is_color_varied
-
-    # Invert solid color for the series.
-    attr_accessor :inverted_solid_fill_color
-
-    # True if curve smoothing is turned on. Applies only to line and scatter connected by lines charts.
-    attr_accessor :smooth
-
-    # True if the series is plotted on second value axis.
-    attr_accessor :plot_on_second_axis
-
-    # Series order.
-    attr_accessor :order
-
-    # The number format for the series y values.
-    attr_accessor :number_format_of_y_values
-
-    # The number format for the series x values.
-    attr_accessor :number_format_of_x_values
-
-    # The number format for the series values.
-    attr_accessor :number_format_of_values
-
-    # The number format for the series bubble sizes.
-    attr_accessor :number_format_of_bubble_sizes
-
-    # True if the series shall invert its colors if the value is negative. Applies to bar, column and bubble series.
-    attr_accessor :invert_if_negative
-
-    # The distance of an open pie slice from the center of the pie chart is expressed as a percentage of the pie diameter.
-    attr_accessor :explosion
-
-    # Series marker.
-    attr_accessor :marker
-
-    # Fill properties set for the series.
-    attr_accessor :fill_format
-
-    # Effect properties set for the series.
-    attr_accessor :effect_format
-
-    # Line properties set for the series.
-    attr_accessor :line_format
-
-    # Data point type.
-    attr_accessor :data_point_type
-
+  class BubbleSeries < Series
     # Gets or sets the values.
     attr_accessor :data_points
 
@@ -106,183 +52,45 @@ module AsposeSlidesCloud
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
-      {
-        :'type' => :'Type',
-        :'name' => :'Name',
-        :'is_color_varied' => :'IsColorVaried',
-        :'inverted_solid_fill_color' => :'InvertedSolidFillColor',
-        :'smooth' => :'Smooth',
-        :'plot_on_second_axis' => :'PlotOnSecondAxis',
-        :'order' => :'Order',
-        :'number_format_of_y_values' => :'NumberFormatOfYValues',
-        :'number_format_of_x_values' => :'NumberFormatOfXValues',
-        :'number_format_of_values' => :'NumberFormatOfValues',
-        :'number_format_of_bubble_sizes' => :'NumberFormatOfBubbleSizes',
-        :'invert_if_negative' => :'InvertIfNegative',
-        :'explosion' => :'Explosion',
-        :'marker' => :'Marker',
-        :'fill_format' => :'FillFormat',
-        :'effect_format' => :'EffectFormat',
-        :'line_format' => :'LineFormat',
-        :'data_point_type' => :'DataPointType',
-        :'data_points' => :'DataPoints'
-      }
+      super.merge({
+        :'data_points' => :'DataPoints',
+      })
     end
 
     # Attribute type mapping.
     def self.swagger_types
-      {
-        :'type' => :'String',
-        :'name' => :'String',
-        :'is_color_varied' => :'BOOLEAN',
-        :'inverted_solid_fill_color' => :'String',
-        :'smooth' => :'BOOLEAN',
-        :'plot_on_second_axis' => :'BOOLEAN',
-        :'order' => :'Integer',
-        :'number_format_of_y_values' => :'String',
-        :'number_format_of_x_values' => :'String',
-        :'number_format_of_values' => :'String',
-        :'number_format_of_bubble_sizes' => :'String',
-        :'invert_if_negative' => :'BOOLEAN',
-        :'explosion' => :'Integer',
-        :'marker' => :'SeriesMarker',
-        :'fill_format' => :'FillFormat',
-        :'effect_format' => :'EffectFormat',
-        :'line_format' => :'LineFormat',
-        :'data_point_type' => :'String',
-        :'data_points' => :'Array<BubbleChartDataPoint>'
-      }
+      super.merge({
+        :'data_points' => :'Array<BubbleChartDataPoint>',
+      })
     end
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
-
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
-
-      if attributes.has_key?(:'Type')
-        self.type = attributes[:'Type']
-      end
-
-      if attributes.has_key?(:'Name')
-        self.name = attributes[:'Name']
-      end
-
-      if attributes.has_key?(:'IsColorVaried')
-        self.is_color_varied = attributes[:'IsColorVaried']
-      end
-
-      if attributes.has_key?(:'InvertedSolidFillColor')
-        self.inverted_solid_fill_color = attributes[:'InvertedSolidFillColor']
-      end
-
-      if attributes.has_key?(:'Smooth')
-        self.smooth = attributes[:'Smooth']
-      end
-
-      if attributes.has_key?(:'PlotOnSecondAxis')
-        self.plot_on_second_axis = attributes[:'PlotOnSecondAxis']
-      end
-
-      if attributes.has_key?(:'Order')
-        self.order = attributes[:'Order']
-      end
-
-      if attributes.has_key?(:'NumberFormatOfYValues')
-        self.number_format_of_y_values = attributes[:'NumberFormatOfYValues']
-      end
-
-      if attributes.has_key?(:'NumberFormatOfXValues')
-        self.number_format_of_x_values = attributes[:'NumberFormatOfXValues']
-      end
-
-      if attributes.has_key?(:'NumberFormatOfValues')
-        self.number_format_of_values = attributes[:'NumberFormatOfValues']
-      end
-
-      if attributes.has_key?(:'NumberFormatOfBubbleSizes')
-        self.number_format_of_bubble_sizes = attributes[:'NumberFormatOfBubbleSizes']
-      end
-
-      if attributes.has_key?(:'InvertIfNegative')
-        self.invert_if_negative = attributes[:'InvertIfNegative']
-      end
-
-      if attributes.has_key?(:'Explosion')
-        self.explosion = attributes[:'Explosion']
-      end
-
-      if attributes.has_key?(:'Marker')
-        self.marker = attributes[:'Marker']
-      end
-
-      if attributes.has_key?(:'FillFormat')
-        self.fill_format = attributes[:'FillFormat']
-      end
-
-      if attributes.has_key?(:'EffectFormat')
-        self.effect_format = attributes[:'EffectFormat']
-      end
-
-      if attributes.has_key?(:'LineFormat')
-        self.line_format = attributes[:'LineFormat']
-      end
-
-      if attributes.has_key?(:'DataPointType')
-        self.data_point_type = attributes[:'DataPointType']
-      end
+      super
 
       if attributes.has_key?(:'DataPoints')
         if (value = attributes[:'DataPoints']).is_a?(Array)
           self.data_points = value
         end
       end
+      self.data_point_type = "Bubble"
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
-      invalid_properties = Array.new
-      if @data_point_type.nil?
-        invalid_properties.push('invalid value for "data_point_type", data_point_type cannot be nil.')
-      end
-
+      invalid_properties = super
       invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      type_validator = EnumAttributeValidator.new('String', ['ClusteredColumn', 'StackedColumn', 'PercentsStackedColumn', 'ClusteredColumn3D', 'StackedColumn3D', 'PercentsStackedColumn3D', 'Column3D', 'ClusteredCylinder', 'StackedCylinder', 'PercentsStackedCylinder', 'Cylinder3D', 'ClusteredCone', 'StackedCone', 'PercentsStackedCone', 'Cone3D', 'ClusteredPyramid', 'StackedPyramid', 'PercentsStackedPyramid', 'Pyramid3D', 'Line', 'StackedLine', 'PercentsStackedLine', 'LineWithMarkers', 'StackedLineWithMarkers', 'PercentsStackedLineWithMarkers', 'Line3D', 'Pie', 'Pie3D', 'PieOfPie', 'ExplodedPie', 'ExplodedPie3D', 'BarOfPie', 'PercentsStackedBar', 'ClusteredBar3D', 'ClusteredBar', 'StackedBar', 'StackedBar3D', 'PercentsStackedBar3D', 'ClusteredHorizontalCylinder', 'StackedHorizontalCylinder', 'PercentsStackedHorizontalCylinder', 'ClusteredHorizontalCone', 'StackedHorizontalCone', 'PercentsStackedHorizontalCone', 'ClusteredHorizontalPyramid', 'StackedHorizontalPyramid', 'PercentsStackedHorizontalPyramid', 'Area', 'StackedArea', 'PercentsStackedArea', 'Area3D', 'StackedArea3D', 'PercentsStackedArea3D', 'ScatterWithMarkers', 'ScatterWithSmoothLinesAndMarkers', 'ScatterWithSmoothLines', 'ScatterWithStraightLinesAndMarkers', 'ScatterWithStraightLines', 'HighLowClose', 'OpenHighLowClose', 'VolumeHighLowClose', 'VolumeOpenHighLowClose', 'Surface3D', 'WireframeSurface3D', 'Contour', 'WireframeContour', 'Doughnut', 'ExplodedDoughnut', 'Bubble', 'BubbleWith3D', 'Radar', 'RadarWithMarkers', 'FilledRadar', 'SeriesOfMixedTypes', 'Treemap', 'Sunburst', 'Histogram', 'ParetoLine', 'BoxAndWhisker', 'Waterfall', 'Funnel'])
-      return false unless type_validator.valid?(@type)
-      return false if @data_point_type.nil?
-      data_point_type_validator = EnumAttributeValidator.new('String', ['OneValue', 'Scatter', 'Bubble'])
-      return false unless data_point_type_validator.valid?(@data_point_type)
+      return false if !super
       true
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] type Object to be assigned
-    def type=(type)
-      validator = EnumAttributeValidator.new('String', ['ClusteredColumn', 'StackedColumn', 'PercentsStackedColumn', 'ClusteredColumn3D', 'StackedColumn3D', 'PercentsStackedColumn3D', 'Column3D', 'ClusteredCylinder', 'StackedCylinder', 'PercentsStackedCylinder', 'Cylinder3D', 'ClusteredCone', 'StackedCone', 'PercentsStackedCone', 'Cone3D', 'ClusteredPyramid', 'StackedPyramid', 'PercentsStackedPyramid', 'Pyramid3D', 'Line', 'StackedLine', 'PercentsStackedLine', 'LineWithMarkers', 'StackedLineWithMarkers', 'PercentsStackedLineWithMarkers', 'Line3D', 'Pie', 'Pie3D', 'PieOfPie', 'ExplodedPie', 'ExplodedPie3D', 'BarOfPie', 'PercentsStackedBar', 'ClusteredBar3D', 'ClusteredBar', 'StackedBar', 'StackedBar3D', 'PercentsStackedBar3D', 'ClusteredHorizontalCylinder', 'StackedHorizontalCylinder', 'PercentsStackedHorizontalCylinder', 'ClusteredHorizontalCone', 'StackedHorizontalCone', 'PercentsStackedHorizontalCone', 'ClusteredHorizontalPyramid', 'StackedHorizontalPyramid', 'PercentsStackedHorizontalPyramid', 'Area', 'StackedArea', 'PercentsStackedArea', 'Area3D', 'StackedArea3D', 'PercentsStackedArea3D', 'ScatterWithMarkers', 'ScatterWithSmoothLinesAndMarkers', 'ScatterWithSmoothLines', 'ScatterWithStraightLinesAndMarkers', 'ScatterWithStraightLines', 'HighLowClose', 'OpenHighLowClose', 'VolumeHighLowClose', 'VolumeOpenHighLowClose', 'Surface3D', 'WireframeSurface3D', 'Contour', 'WireframeContour', 'Doughnut', 'ExplodedDoughnut', 'Bubble', 'BubbleWith3D', 'Radar', 'RadarWithMarkers', 'FilledRadar', 'SeriesOfMixedTypes', 'Treemap', 'Sunburst', 'Histogram', 'ParetoLine', 'BoxAndWhisker', 'Waterfall', 'Funnel'])
-      unless validator.valid?(type)
-        fail ArgumentError, 'invalid value for "type", must be one of #{validator.allowable_values}.'
-      end
-      @type = type
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] data_point_type Object to be assigned
-    def data_point_type=(data_point_type)
-      validator = EnumAttributeValidator.new('String', ['OneValue', 'Scatter', 'Bubble'])
-      unless validator.valid?(data_point_type)
-        fail ArgumentError, 'invalid value for "data_point_type", must be one of #{validator.allowable_values}.'
-      end
-      @data_point_type = data_point_type
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -327,15 +135,27 @@ module AsposeSlidesCloud
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.swagger_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+        mapKey = self.class.attribute_map[key]
+        if !mapKey.nil?
+          val = attributes[mapKey]
+          if val.nil?
+            mapKeyString = mapKey.to_s
+            mapKeyString[0] = mapKeyString[0].downcase
+            mapKey = mapKeyString.to_sym
+            val = attributes[mapKey]
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+          if !val.nil?
+            if type =~ /\AArray<(.*)>/i
+              # check to ensure the input is an array given that the the attribute
+              # is documented as an array but the input is not
+              if val.is_a?(Array)
+                self.send("#{key}=", val.map { |v| _deserialize($1, v) })
+              end
+            else
+              self.send("#{key}=", _deserialize(type, val))
+            end
+          end
+        end
       end
 
       self

data/lib/aspose_slides_cloud/models/chart.rb

@@ -24,58 +24,7 @@ require 'date'
 
 module AsposeSlidesCloud
   # Represents chart resource
-  class Chart
-    # Gets or sets the link to this resource.
-    attr_accessor :self_uri
-
-    # List of alternate links.
-    attr_accessor :alternate_links
-
-    # Gets or sets the name.
-    attr_accessor :name
-
-    # Gets or sets the width.
-    attr_accessor :width
-
-    # Gets or sets the height.
-    attr_accessor :height
-
-    # Gets or sets the alternative text.
-    attr_accessor :alternative_text
-
-    # The title of alternative text associated with the shape.
-    attr_accessor :alternative_text_title
-
-    # Gets or sets a value indicating whether this ShapeBase is hidden.
-    attr_accessor :hidden
-
-    # Gets or sets the X
-    attr_accessor :x
-
-    # Gets or sets the Y.
-    attr_accessor :y
-
-    # Gets z-order position of shape
-    attr_accessor :z_order_position
-
-    # Gets or sets the link to shapes.
-    attr_accessor :shapes
-
-    # Gets or sets the fill format.
-    attr_accessor :fill_format
-
-    # Gets or sets the effect format.
-    attr_accessor :effect_format
-
-    # Gets or sets the line format.
-    attr_accessor :line_format
-
-    # Shape type.
-    attr_accessor :type
-
-    # Combined shape type.
-    attr_accessor :shape_type
-
+  class Chart < ShapeBase
     # Gets or sets the type of the chart.
     attr_accessor :chart_type
 
@@ -133,24 +82,7 @@ module AsposeSlidesCloud
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
-      {
-        :'self_uri' => :'SelfUri',
-        :'alternate_links' => :'AlternateLinks',
-        :'name' => :'Name',
-        :'width' => :'Width',
-        :'height' => :'Height',
-        :'alternative_text' => :'AlternativeText',
-        :'alternative_text_title' => :'AlternativeTextTitle',
-        :'hidden' => :'Hidden',
-        :'x' => :'X',
-        :'y' => :'Y',
-        :'z_order_position' => :'ZOrderPosition',
-        :'shapes' => :'Shapes',
-        :'fill_format' => :'FillFormat',
-        :'effect_format' => :'EffectFormat',
-        :'line_format' => :'LineFormat',
-        :'type' => :'Type',
-        :'shape_type' => :'ShapeType',
+      super.merge({
         :'chart_type' => :'ChartType',
         :'show_data_labels_over_maximum' => :'ShowDataLabelsOverMaximum',
         :'series' => :'Series',
@@ -161,30 +93,13 @@ module AsposeSlidesCloud
         :'floor' => :'Floor',
         :'legend' => :'Legend',
         :'axes' => :'Axes',
-        :'plot_area' => :'PlotArea'
-      }
+        :'plot_area' => :'PlotArea',
+      })
     end
 
     # Attribute type mapping.
     def self.swagger_types
-      {
-        :'self_uri' => :'ResourceUri',
-        :'alternate_links' => :'Array<ResourceUri>',
-        :'name' => :'String',
-        :'width' => :'Float',
-        :'height' => :'Float',
-        :'alternative_text' => :'String',
-        :'alternative_text_title' => :'String',
-        :'hidden' => :'BOOLEAN',
-        :'x' => :'Float',
-        :'y' => :'Float',
-        :'z_order_position' => :'Integer',
-        :'shapes' => :'ResourceUriElement',
-        :'fill_format' => :'FillFormat',
-        :'effect_format' => :'EffectFormat',
-        :'line_format' => :'LineFormat',
-        :'type' => :'String',
-        :'shape_type' => :'String',
+      super.merge({
         :'chart_type' => :'String',
         :'show_data_labels_over_maximum' => :'BOOLEAN',
         :'series' => :'Array<Series>',
@@ -195,91 +110,14 @@ module AsposeSlidesCloud
         :'floor' => :'ChartWall',
         :'legend' => :'Legend',
         :'axes' => :'Axes',
-        :'plot_area' => :'PlotArea'
-      }
+        :'plot_area' => :'PlotArea',
+      })
     end
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
-
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
-
-      if attributes.has_key?(:'SelfUri')
-        self.self_uri = attributes[:'SelfUri']
-      end
-
-      if attributes.has_key?(:'AlternateLinks')
-        if (value = attributes[:'AlternateLinks']).is_a?(Array)
-          self.alternate_links = value
-        end
-      end
-
-      if attributes.has_key?(:'Name')
-        self.name = attributes[:'Name']
-      end
-
-      if attributes.has_key?(:'Width')
-        self.width = attributes[:'Width']
-      end
-
-      if attributes.has_key?(:'Height')
-        self.height = attributes[:'Height']
-      end
-
-      if attributes.has_key?(:'AlternativeText')
-        self.alternative_text = attributes[:'AlternativeText']
-      end
-
-      if attributes.has_key?(:'AlternativeTextTitle')
-        self.alternative_text_title = attributes[:'AlternativeTextTitle']
-      end
-
-      if attributes.has_key?(:'Hidden')
-        self.hidden = attributes[:'Hidden']
-      end
-
-      if attributes.has_key?(:'X')
-        self.x = attributes[:'X']
-      end
-
-      if attributes.has_key?(:'Y')
-        self.y = attributes[:'Y']
-      end
-
-      if attributes.has_key?(:'ZOrderPosition')
-        self.z_order_position = attributes[:'ZOrderPosition']
-      end
-
-      if attributes.has_key?(:'Shapes')
-        self.shapes = attributes[:'Shapes']
-      end
-
-      if attributes.has_key?(:'FillFormat')
-        self.fill_format = attributes[:'FillFormat']
-      end
-
-      if attributes.has_key?(:'EffectFormat')
-        self.effect_format = attributes[:'EffectFormat']
-      end
-
-      if attributes.has_key?(:'LineFormat')
-        self.line_format = attributes[:'LineFormat']
-      end
-
-      if attributes.has_key?(:'Type')
-        self.type = attributes[:'Type']
-      else
-        self.type = "Chart"
-      end
-
-      if attributes.has_key?(:'ShapeType')
-        self.shape_type = attributes[:'ShapeType']
-      else
-        self.shape_type = "Chart"
-      end
+      super
 
       if attributes.has_key?(:'ChartType')
         self.chart_type = attributes[:'ChartType']
@@ -328,24 +166,13 @@ module AsposeSlidesCloud
       if attributes.has_key?(:'PlotArea')
         self.plot_area = attributes[:'PlotArea']
       end
+      self.type = "Chart"
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
-      invalid_properties = Array.new
-      if @z_order_position.nil?
-        invalid_properties.push('invalid value for "z_order_position", z_order_position cannot be nil.')
-      end
-
-      if @type.nil?
-        invalid_properties.push('invalid value for "type", type cannot be nil.')
-      end
-
-      if @shape_type.nil?
-        invalid_properties.push('invalid value for "shape_type", shape_type cannot be nil.')
-      end
-
+      invalid_properties = super
       if @chart_type.nil?
         invalid_properties.push('invalid value for "chart_type", chart_type cannot be nil.')
       end
@@ -356,39 +183,13 @@ module AsposeSlidesCloud
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @z_order_position.nil?
-      return false if @type.nil?
-      type_validator = EnumAttributeValidator.new('String', ['Shape', 'Chart', 'Table', 'PictureFrame', 'VideoFrame', 'AudioFrame', 'SmartArt', 'OleObjectFrame', 'GroupShape', 'GraphicalObject', 'Connector', 'SmartArtShape'])
-      return false unless type_validator.valid?(@type)
-      return false if @shape_type.nil?
-      shape_type_validator = EnumAttributeValidator.new('String', ['Custom', 'Line', 'LineInverse', 'Triangle', 'RightTriangle', 'Rectangle', 'Diamond', 'Parallelogram', 'Trapezoid', 'NonIsoscelesTrapezoid', 'Pentagon', 'Hexagon', 'Heptagon', 'Octagon', 'Decagon', 'Dodecagon', 'FourPointedStar', 'FivePointedStar', 'SixPointedStar', 'SevenPointedStar', 'EightPointedStar', 'TenPointedStar', 'TwelvePointedStar', 'SixteenPointedStar', 'TwentyFourPointedStar', 'ThirtyTwoPointedStar', 'RoundCornerRectangle', 'OneRoundCornerRectangle', 'TwoSamesideRoundCornerRectangle', 'TwoDiagonalRoundCornerRectangle', 'OneSnipOneRoundCornerRectangle', 'OneSnipCornerRectangle', 'TwoSamesideSnipCornerRectangle', 'TwoDiagonalSnipCornerRectangle', 'Plaque', 'Ellipse', 'Teardrop', 'HomePlate', 'Chevron', 'PieWedge', 'Pie', 'BlockArc', 'Donut', 'NoSmoking', 'RightArrow', 'LeftArrow', 'UpArrow', 'DownArrow', 'StripedRightArrow', 'NotchedRightArrow', 'BentUpArrow', 'LeftRightArrow', 'UpDownArrow', 'LeftUpArrow', 'LeftRightUpArrow', 'QuadArrow', 'CalloutLeftArrow', 'CalloutRightArrow', 'CalloutUpArrow', 'CalloutDownArrow', 'CalloutLeftRightArrow', 'CalloutUpDownArrow', 'CalloutQuadArrow', 'BentArrow', 'UTurnArrow', 'CircularArrow', 'LeftCircularArrow', 'LeftRightCircularArrow', 'CurvedRightArrow', 'CurvedLeftArrow', 'CurvedUpArrow', 'CurvedDownArrow', 'SwooshArrow', 'Cube', 'Can', 'LightningBolt', 'Heart', 'Sun', 'Moon', 'SmileyFace', 'IrregularSeal1', 'IrregularSeal2', 'FoldedCorner', 'Bevel', 'Frame', 'HalfFrame', 'Corner', 'DiagonalStripe', 'Chord', 'CurvedArc', 'LeftBracket', 'RightBracket', 'LeftBrace', 'RightBrace', 'BracketPair', 'BracePair', 'StraightConnector1', 'BentConnector2', 'BentConnector3', 'BentConnector4', 'BentConnector5', 'CurvedConnector2', 'CurvedConnector3', 'CurvedConnector4', 'CurvedConnector5', 'Callout1', 'Callout2', 'Callout3', 'Callout1WithAccent', 'Callout2WithAccent', 'Callout3WithAccent', 'Callout1WithBorder', 'Callout2WithBorder', 'Callout3WithBorder', 'Callout1WithBorderAndAccent', 'Callout2WithBorderAndAccent', 'Callout3WithBorderAndAccent', 'CalloutWedgeRectangle', 'CalloutWedgeRoundRectangle', 'CalloutWedgeEllipse', 'CalloutCloud', 'Cloud', 'Ribbon', 'Ribbon2', 'EllipseRibbon', 'EllipseRibbon2', 'LeftRightRibbon', 'VerticalScroll', 'HorizontalScroll', 'Wave', 'DoubleWave', 'Plus', 'ProcessFlow', 'DecisionFlow', 'InputOutputFlow', 'PredefinedProcessFlow', 'InternalStorageFlow', 'DocumentFlow', 'MultiDocumentFlow', 'TerminatorFlow', 'PreparationFlow', 'ManualInputFlow', 'ManualOperationFlow', 'ConnectorFlow', 'PunchedCardFlow', 'PunchedTapeFlow', 'SummingJunctionFlow', 'OrFlow', 'CollateFlow', 'SortFlow', 'ExtractFlow', 'MergeFlow', 'OfflineStorageFlow', 'OnlineStorageFlow', 'MagneticTapeFlow', 'MagneticDiskFlow', 'MagneticDrumFlow', 'DisplayFlow', 'DelayFlow', 'AlternateProcessFlow', 'OffPageConnectorFlow', 'BlankButton', 'HomeButton', 'HelpButton', 'InformationButton', 'ForwardOrNextButton', 'BackOrPreviousButton', 'EndButton', 'BeginningButton', 'ReturnButton', 'DocumentButton', 'SoundButton', 'MovieButton', 'Gear6', 'Gear9', 'Funnel', 'PlusMath', 'MinusMath', 'MultiplyMath', 'DivideMath', 'EqualMath', 'NotEqualMath', 'CornerTabs', 'SquareTabs', 'PlaqueTabs', 'ChartX', 'ChartStar', 'ChartPlus', 'Chart', 'Table', 'PictureFrame', 'VideoFrame', 'AudioFrame', 'Diagram', 'OleObjectFrame', 'GroupShape', 'GraphicalObject', 'NotDefined'])
-      return false unless shape_type_validator.valid?(@shape_type)
+      return false if !super
       return false if @chart_type.nil?
       chart_type_validator = EnumAttributeValidator.new('String', ['ClusteredColumn', 'StackedColumn', 'PercentsStackedColumn', 'ClusteredColumn3D', 'StackedColumn3D', 'PercentsStackedColumn3D', 'Column3D', 'ClusteredCylinder', 'StackedCylinder', 'PercentsStackedCylinder', 'Cylinder3D', 'ClusteredCone', 'StackedCone', 'PercentsStackedCone', 'Cone3D', 'ClusteredPyramid', 'StackedPyramid', 'PercentsStackedPyramid', 'Pyramid3D', 'Line', 'StackedLine', 'PercentsStackedLine', 'LineWithMarkers', 'StackedLineWithMarkers', 'PercentsStackedLineWithMarkers', 'Line3D', 'Pie', 'Pie3D', 'PieOfPie', 'ExplodedPie', 'ExplodedPie3D', 'BarOfPie', 'PercentsStackedBar', 'ClusteredBar3D', 'ClusteredBar', 'StackedBar', 'StackedBar3D', 'PercentsStackedBar3D', 'ClusteredHorizontalCylinder', 'StackedHorizontalCylinder', 'PercentsStackedHorizontalCylinder', 'ClusteredHorizontalCone', 'StackedHorizontalCone', 'PercentsStackedHorizontalCone', 'ClusteredHorizontalPyramid', 'StackedHorizontalPyramid', 'PercentsStackedHorizontalPyramid', 'Area', 'StackedArea', 'PercentsStackedArea', 'Area3D', 'StackedArea3D', 'PercentsStackedArea3D', 'ScatterWithMarkers', 'ScatterWithSmoothLinesAndMarkers', 'ScatterWithSmoothLines', 'ScatterWithStraightLinesAndMarkers', 'ScatterWithStraightLines', 'HighLowClose', 'OpenHighLowClose', 'VolumeHighLowClose', 'VolumeOpenHighLowClose', 'Surface3D', 'WireframeSurface3D', 'Contour', 'WireframeContour', 'Doughnut', 'ExplodedDoughnut', 'Bubble', 'BubbleWith3D', 'Radar', 'RadarWithMarkers', 'FilledRadar', 'SeriesOfMixedTypes', 'Treemap', 'Sunburst', 'Histogram', 'ParetoLine', 'BoxAndWhisker', 'Waterfall', 'Funnel'])
       return false unless chart_type_validator.valid?(@chart_type)
       true
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] type Object to be assigned
-    def type=(type)
-      validator = EnumAttributeValidator.new('String', ['Shape', 'Chart', 'Table', 'PictureFrame', 'VideoFrame', 'AudioFrame', 'SmartArt', 'OleObjectFrame', 'GroupShape', 'GraphicalObject', 'Connector', 'SmartArtShape'])
-      unless validator.valid?(type)
-        fail ArgumentError, 'invalid value for "type", must be one of #{validator.allowable_values}.'
-      end
-      @type = type
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] shape_type Object to be assigned
-    def shape_type=(shape_type)
-      validator = EnumAttributeValidator.new('String', ['Custom', 'Line', 'LineInverse', 'Triangle', 'RightTriangle', 'Rectangle', 'Diamond', 'Parallelogram', 'Trapezoid', 'NonIsoscelesTrapezoid', 'Pentagon', 'Hexagon', 'Heptagon', 'Octagon', 'Decagon', 'Dodecagon', 'FourPointedStar', 'FivePointedStar', 'SixPointedStar', 'SevenPointedStar', 'EightPointedStar', 'TenPointedStar', 'TwelvePointedStar', 'SixteenPointedStar', 'TwentyFourPointedStar', 'ThirtyTwoPointedStar', 'RoundCornerRectangle', 'OneRoundCornerRectangle', 'TwoSamesideRoundCornerRectangle', 'TwoDiagonalRoundCornerRectangle', 'OneSnipOneRoundCornerRectangle', 'OneSnipCornerRectangle', 'TwoSamesideSnipCornerRectangle', 'TwoDiagonalSnipCornerRectangle', 'Plaque', 'Ellipse', 'Teardrop', 'HomePlate', 'Chevron', 'PieWedge', 'Pie', 'BlockArc', 'Donut', 'NoSmoking', 'RightArrow', 'LeftArrow', 'UpArrow', 'DownArrow', 'StripedRightArrow', 'NotchedRightArrow', 'BentUpArrow', 'LeftRightArrow', 'UpDownArrow', 'LeftUpArrow', 'LeftRightUpArrow', 'QuadArrow', 'CalloutLeftArrow', 'CalloutRightArrow', 'CalloutUpArrow', 'CalloutDownArrow', 'CalloutLeftRightArrow', 'CalloutUpDownArrow', 'CalloutQuadArrow', 'BentArrow', 'UTurnArrow', 'CircularArrow', 'LeftCircularArrow', 'LeftRightCircularArrow', 'CurvedRightArrow', 'CurvedLeftArrow', 'CurvedUpArrow', 'CurvedDownArrow', 'SwooshArrow', 'Cube', 'Can', 'LightningBolt', 'Heart', 'Sun', 'Moon', 'SmileyFace', 'IrregularSeal1', 'IrregularSeal2', 'FoldedCorner', 'Bevel', 'Frame', 'HalfFrame', 'Corner', 'DiagonalStripe', 'Chord', 'CurvedArc', 'LeftBracket', 'RightBracket', 'LeftBrace', 'RightBrace', 'BracketPair', 'BracePair', 'StraightConnector1', 'BentConnector2', 'BentConnector3', 'BentConnector4', 'BentConnector5', 'CurvedConnector2', 'CurvedConnector3', 'CurvedConnector4', 'CurvedConnector5', 'Callout1', 'Callout2', 'Callout3', 'Callout1WithAccent', 'Callout2WithAccent', 'Callout3WithAccent', 'Callout1WithBorder', 'Callout2WithBorder', 'Callout3WithBorder', 'Callout1WithBorderAndAccent', 'Callout2WithBorderAndAccent', 'Callout3WithBorderAndAccent', 'CalloutWedgeRectangle', 'CalloutWedgeRoundRectangle', 'CalloutWedgeEllipse', 'CalloutCloud', 'Cloud', 'Ribbon', 'Ribbon2', 'EllipseRibbon', 'EllipseRibbon2', 'LeftRightRibbon', 'VerticalScroll', 'HorizontalScroll', 'Wave', 'DoubleWave', 'Plus', 'ProcessFlow', 'DecisionFlow', 'InputOutputFlow', 'PredefinedProcessFlow', 'InternalStorageFlow', 'DocumentFlow', 'MultiDocumentFlow', 'TerminatorFlow', 'PreparationFlow', 'ManualInputFlow', 'ManualOperationFlow', 'ConnectorFlow', 'PunchedCardFlow', 'PunchedTapeFlow', 'SummingJunctionFlow', 'OrFlow', 'CollateFlow', 'SortFlow', 'ExtractFlow', 'MergeFlow', 'OfflineStorageFlow', 'OnlineStorageFlow', 'MagneticTapeFlow', 'MagneticDiskFlow', 'MagneticDrumFlow', 'DisplayFlow', 'DelayFlow', 'AlternateProcessFlow', 'OffPageConnectorFlow', 'BlankButton', 'HomeButton', 'HelpButton', 'InformationButton', 'ForwardOrNextButton', 'BackOrPreviousButton', 'EndButton', 'BeginningButton', 'ReturnButton', 'DocumentButton', 'SoundButton', 'MovieButton', 'Gear6', 'Gear9', 'Funnel', 'PlusMath', 'MinusMath', 'MultiplyMath', 'DivideMath', 'EqualMath', 'NotEqualMath', 'CornerTabs', 'SquareTabs', 'PlaqueTabs', 'ChartX', 'ChartStar', 'ChartPlus', 'Chart', 'Table', 'PictureFrame', 'VideoFrame', 'AudioFrame', 'Diagram', 'OleObjectFrame', 'GroupShape', 'GraphicalObject', 'NotDefined'])
-      unless validator.valid?(shape_type)
-        fail ArgumentError, 'invalid value for "shape_type", must be one of #{validator.allowable_values}.'
-      end
-      @shape_type = shape_type
-    end
-
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] chart_type Object to be assigned
     def chart_type=(chart_type)
@@ -420,7 +221,6 @@ module AsposeSlidesCloud
           effect_format == o.effect_format &&
           line_format == o.line_format &&
           type == o.type &&
-          shape_type == o.shape_type &&
           chart_type == o.chart_type &&
           show_data_labels_over_maximum == o.show_data_labels_over_maximum &&
           series == o.series &&
@@ -443,7 +243,7 @@ module AsposeSlidesCloud
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [self_uri, alternate_links, name, width, height, alternative_text, alternative_text_title, hidden, x, y, z_order_position, shapes, fill_format, effect_format, line_format, type, shape_type, chart_type, show_data_labels_over_maximum, series, categories, title, back_wall, side_wall, floor, legend, axes, plot_area].hash
+      [self_uri, alternate_links, name, width, height, alternative_text, alternative_text_title, hidden, x, y, z_order_position, shapes, fill_format, effect_format, line_format, type, chart_type, show_data_labels_over_maximum, series, categories, title, back_wall, side_wall, floor, legend, axes, plot_area].hash
     end
 
     # Builds the object from hash
@@ -452,15 +252,27 @@ module AsposeSlidesCloud
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.swagger_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+        mapKey = self.class.attribute_map[key]
+        if !mapKey.nil?
+          val = attributes[mapKey]
+          if val.nil?
+            mapKeyString = mapKey.to_s
+            mapKeyString[0] = mapKeyString[0].downcase
+            mapKey = mapKeyString.to_sym
+            val = attributes[mapKey]
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+          if !val.nil?
+            if type =~ /\AArray<(.*)>/i
+              # check to ensure the input is an array given that the the attribute
+              # is documented as an array but the input is not
+              if val.is_a?(Array)
+                self.send("#{key}=", val.map { |v| _deserialize($1, v) })
+              end
+            else
+              self.send("#{key}=", _deserialize(type, val))
+            end
+          end
+        end
       end
 
       self