Merge pull request #345 from plotly/issue204_fixed_heatmap

Issue204 fixed heatmap

Author: gilbertogalvis

plotly/plotlyfig.m

@@ -450,7 +450,11 @@ function validate(obj)
 
             % handle title (for feed)
             if obj.PlotOptions.CleanFeedTitle
-                cleanFeedTitle(obj);
+                try
+                    cleanFeedTitle(obj);
+                catch
+                    % TODO to the future
+                end
             end
 
             %get args
@@ -642,7 +646,7 @@ function validate(obj)
                     updateAxis(obj,n);
                 catch
                     % TODO to the future
-                    disp('catch at line 643 in plotlyfog.m file')
+                    % disp('catch at line 647 in plotlyfig.m file')
                 end
             end
 
@@ -657,18 +661,22 @@ function validate(obj)
                     end
                 catch
                     % TODO to the future
-                    disp('catch at line 660 in plotlyfog.m file')
+                    % disp('catch at line 664 in plotlyfig.m file')
                 end
 
             end
 
             % update annotations
             for n = 1:obj.State.Figure.NumTexts
                 try
-                    updateAnnotation(obj,n);
+                    if ~strcmpi(obj.State.Plot(dataIndex).Class, 'heatmap')
+                        updateAnnotation(obj,n);
+                    else
+                        obj.PlotOptions.CleanFeedTitle = false;
+                    end
                 catch
                     % TODO to the future
-                    disp('catch at line 671 in plotlyfog.m file')
+                    % disp('catch at line 679 in plotlyfig.m file')
                 end
             end
 
@@ -973,6 +981,7 @@ function delete(obj)
                         ||  strcmpi(fieldname,'mesh3d') || strcmpi(fieldname,'bar') ...
                         ||  strcmpi(fieldname,'scatterpolar') || strcmpi(fieldname,'barpolar') ...
                         ||  strcmpi(fieldname,'scene') ||  strcmpi(fieldname,'layout') ...
+                        ||  strcmpi(fieldname,'heatmap') ...
                         )
                         fprintf(['\nWhoops! ' exception.message(1:end-1) ' in ' fieldname '\n\n']);
                     end

plotly/plotlyfig_aux/core/updateData.m

@@ -22,6 +22,8 @@
         switch lower(obj.State.Plot(dataIndex).Class)
 
             %--CORE PLOT OBJECTS--%
+            case 'heatmap'
+                updateHeatmap(obj, dataIndex);
             case 'image'
                 updateImage(obj, dataIndex);
             case 'line'
@@ -152,7 +154,7 @@
     end
 catch
     % TODO to the future
-    disp('catch at line 155 in updateData.m file')
+    % disp('catch at line 157 in updateData.m file')
 end
 
 %-------------------------------------------------------------------------%

plotly/plotlyfig_aux/handlegraphics/updateHeatmap.m

@@ -0,0 +1,52 @@
+function obj = updateHeatmap(obj,heatIndex)
+
+%-------------------------------------------------------------------------%
+
+%-HEATMAP DATA STRUCTURE- %
+heat_data = get(obj.State.Plot(heatIndex).Handle);
+%-------------------------------------------------------------------------%
+
+%-heatmap type-%
+obj.data{heatIndex}.type = 'heatmap';
+
+%-------------------------------------------------------------------------%
+
+%-format data-%
+obj.data{heatIndex}.x = heat_data.XData;
+obj.data{heatIndex}.y = heat_data.YData;
+obj.data{heatIndex}.z = heat_data.ColorData(end:-1:1, :);
+
+%-------------------------------------------------------------------------%
+
+%-heatmap colorscale-%
+cmap = heat_data.Colormap;
+len = length(cmap)-1;
+
+for c = 1: length(cmap)
+    col = 255 * cmap(c, :);
+    obj.data{heatIndex}.colorscale{c} = { (c-1)/len , ['rgb(' num2str(col(1)) ',' num2str(col(2)) ',' num2str(col(3)) ')'  ]  };
+end
+
+%-------------------------------------------------------------------------%
+
+%-setting plot-%
+obj.data{heatIndex}.hoverinfo = 'text';
+obj.data{heatIndex}.text = heat_data.ColorData(end:-1:1, :);
+obj.data{heatIndex}.hoverlabel.bgcolor = 'white';
+
+%-------------------------------------------------------------------------%
+
+%-show colorbar-%
+obj.data{heatIndex}.showscale = false;
+if strcmpi(heat_data.ColorbarVisible, 'on')
+    obj.data{heatIndex}.showscale = true;
+end
+
+%-------------------------------------------------------------------------%
+
+%-hist visible-%
+obj.data{heatIndex}.visible = strcmp(heat_data.Visible,'on');
+
+%-------------------------------------------------------------------------%
+
+end

plotly/plotlyfig_aux/helpers/parseString.m

@@ -247,6 +247,8 @@
             end
         end
     end
+else
+    formatStr = 'untitled';
 end