Merge pull request #486 from plotly/support-datetime-duration

Improve support for 'datetime/duration'

Author: robertoffmoura

plotly/plotlyfig_aux/core/updateData.m

@@ -196,6 +196,8 @@
     % check for xaxis dates
     if strcmpi(xaxis.type, 'date')
         obj.data{dataIndex}.x =  convertDate(obj.data{dataIndex}.x);
+    elseif xaxis.type == "duration"
+        obj.data{dataIndex}.x =  convertDuration(obj.data{dataIndex}.x);
     end
 
     % check for xaxis categories
@@ -208,6 +210,8 @@
     % check for yaxis dates
     if strcmpi(yaxis.type, 'date')
         obj.data{dataIndex}.y =  convertDate(obj.data{dataIndex}.y);
+    elseif yaxis.type == "duration"
+        obj.data{dataIndex}.y =  convertDuration(obj.data{dataIndex}.y);
     end
 
     % check for yaxis categories

plotly/plotlyfig_aux/handlegraphics/updateErrorbar.m

@@ -8,11 +8,11 @@
 	plotData = obj.State.Plot(plotIndex).Handle;
 
 	%-get error data-%
-	yPositiveDelta = date2NumData(plotData.YPositiveDelta);
-	yNegativeDelta = date2NumData(plotData.YNegativeDelta);
+	yPositiveDelta = plotData.YPositiveDelta;
+	yNegativeDelta = plotData.YNegativeDelta;
 
-	xPositiveDelta = date2NumData(plotData.XPositiveDelta);
-	xNegativeDelta = date2NumData(plotData.XNegativeDelta);
+	xPositiveDelta = plotData.XPositiveDelta;
+	xNegativeDelta = plotData.XNegativeDelta;
 
 	%-------------------------------------------------------------------------%
 
@@ -60,3 +60,4 @@
 	%-------------------------------------------------------------------------%
 
 end
+		

plotly/plotlyfig_aux/handlegraphics/updateHistogram2.m

@@ -168,7 +168,7 @@ function updateScene(obj, dataIndex)
     ax.showline = true;
     ax.showspikes = true;
     ax.linecolor = getStringColor(255*axx.Color);
-    ax.range = eval(sprintf('date2NumData(axisData.%sLim)', axName));
+    ax.range = eval(sprintf('axisData.%sLim', axName));
 
     %-label-%
     label = eval(sprintf('axisData.%sLabel', axName));

plotly/plotlyfig_aux/handlegraphics/updateLineseries.m

@@ -34,8 +34,8 @@ function updateLineseries(obj, plotIndex)
     end
 
     %-get trace data-%
-    xData = date2NumData(plotData.XData);
-    yData = date2NumData(plotData.YData);
+    xData = plotData.XData;
+    yData = plotData.YData;
 
     if isPolar
         rData = sqrt(xData.^2 + yData.^2);
@@ -44,7 +44,7 @@ function updateLineseries(obj, plotIndex)
     end
 
     if isPlot3D
-        zData = date2NumData(plotData.ZData);
+        zData = plotData.ZData;
     end
 
     %-------------------------------------------------------------------------%
@@ -147,9 +147,9 @@ function updateScene(obj, dataIndex)
     %-------------------------------------------------------------------------%
 
     %-scene axis configuration-%
-    scene.xaxis.range = date2NumData(axisData.XLim);
-    scene.yaxis.range = date2NumData(axisData.YLim);
-    scene.zaxis.range = date2NumData(axisData.ZLim);
+    scene.xaxis.range = axisData.XLim;
+    scene.yaxis.range = axisData.YLim;
+    scene.zaxis.range = axisData.ZLim;
 
     scene.xaxis.zeroline = false;
     scene.yaxis.zeroline = false;

plotly/plotlyfig_aux/handlegraphics/updateScatter.m

@@ -106,9 +106,9 @@ function updateScene(obj, dataIndex)
     %-------------------------------------------------------------------------%
 
     %-scene axis configuration-%
-    scene.xaxis.range = date2NumData(axisData.XLim);
-    scene.yaxis.range = date2NumData(axisData.YLim);
-    scene.zaxis.range = date2NumData(axisData.ZLim);
+    scene.xaxis.range = axisData.XLim;
+    scene.yaxis.range = axisData.YLim;
+    scene.zaxis.range = axisData.ZLim;
 
     scene.xaxis.zeroline = false;
     scene.yaxis.zeroline = false;

plotly/plotlyfig_aux/handlegraphics/updateStackedplot.m

@@ -23,14 +23,14 @@ function updateStackedplot(obj, plotIndex)
 
     else
         if istimetable(sourceTable)
-            xData = date2NumData(sourceTable.Properties.RowTimes);
+            xData = sourceTable.Properties.RowTimes;
         else
             xData = 1:size(sourceTable, 1);
         end
 
         for t = 1:nTraces
             n = nTraces - t + 1;
-            yData{t} = date2NumData(sourceTable.(displayVariables{n}));
+            yData{t} = sourceTable.(displayVariables{n});
         end
     end
 
@@ -153,7 +153,7 @@ function updateStackedplotAxis(obj, plotIndex)
             axisDomain{nAxis} = min([axisPos(1) sum(axisPos([1,3]))], 1);
             axisAnchor{nAxis} = 'y1';
 
-        case {'x', 'Y'}
+        case {'y', 'Y'}
             nAxis = length(plotData.AxesProperties);
             yPos = linspace(axisPos(2), sum(axisPos([2,4])), nAxis+1);
             yOffset = diff(yPos)*0.1; yOffset(1) = 0;
@@ -182,7 +182,7 @@ function updateStackedplotAxis(obj, plotIndex)
         %-general-%
         ax{a}.domain = axisDomain{a};
         ax{a}.anchor = axisAnchor{a};
-        ax{a}.range = date2NumData(axisLim{a});
+        ax{a}.range = axisLim{a};
 
         ax{a}.side = 'left';
         ax{a}.mirror = false;
@@ -205,14 +205,11 @@ function updateStackedplotAxis(obj, plotIndex)
         if isnumeric(axisLim{a})
             [tickVals, tickText, expoFormat(a)] = getNumTicks(axisLim{a}, nTicks);
 
-            [tickVals, tickText] = rmTicks(ax{a}.range, tickVals, tickText, 's');
-            [tickVals, tickText] = rmTicks(ax{a}.range, tickVals, tickText, 'e');
 
         elseif isduration(axisLim{a}) || isdatetime(axisLim{a})
             [tickVals, tickText] = getDateTicks(axisLim{a}, nTicks);
             expoFormat(a) = 0;
 
-            [tickVals, tickText] = rmTicks(ax{a}.range, tickVals, tickText, 's');
         end
 
         ax{a}.showticklabels = true;
@@ -242,23 +239,23 @@ function updateStackedplotAxis(obj, plotIndex)
 function [tickVals, tickText] = getDateTicks(axisLim, nTicks)
 
     %-by year-%
-    yearLim = year(date2NumData(axisLim));
+    yearLim = year(axisLim);
     isYear = length(unique(yearLim)) > 1;
     refYear = [1, 2, 5];
 
     if isYear
         yearTick = getTickVals(yearLim, refYear, 1, nTicks);
 
         for n = 1:length(yearTick)
-            tickVals(n) = datenum(datetime(yearTick(n),1,1,'Format','yy'));
+            tickVals(n) = datetime(yearTick(n),1,1,'Format','yy');
             tickText{n} = num2str(yearTick(n));
         end
 
         return;
     end
 
     %-by month-%
-    monthLim = month(date2NumData(axisLim));
+    monthLim = month(axisLim);
     isMonth = length(unique(monthLim)) > 1;
 
     if isMonth
@@ -267,7 +264,7 @@ function updateStackedplotAxis(obj, plotIndex)
     end
 
     %-by day-%
-    dayLim = day(date2NumData(axisLim));
+    dayLim = day(axisLim);
     isDay = length(unique(dayLim)) > 1;
     refDay = [0.5, 1];
 
@@ -282,7 +279,6 @@ function updateStackedplotAxis(obj, plotIndex)
             tickText{n} = datestr(tickVals(n), 'mmm dd, HH:MM');
         end
 
-        tickVals = datenum(tickVals);
         return;
     end
 end
@@ -392,23 +388,3 @@ function updateExponentFormat(obj, expoFormat, xySource, axName)
         obj.PlotlyDefaults.anIndex = anIndex;
     end
 end
-
-function [tickVals, tickText] = rmTicks(axisLim, tickVals, tickText, rmCase)
-    rangeLim = range(axisLim);
-
-    switch rmCase
-        case 's'
-            if abs(axisLim(1)-tickVals(1)) < rangeLim * 0.01
-                tickVals = tickVals(2:end);
-                tickText = tickText(2:end);
-            end
-            
-        case 'e'
-            if abs(axisLim(end)-tickVals(end)) < rangeLim * 0.01
-                tickVals = tickVals(1:end-1);
-                tickText = tickText(1:end-1);
-            end
-
-    end
-end
-

plotly/plotlyfig_aux/helpers/date2NumData.m

@@ -90,10 +90,6 @@
     tickLabels = eval(sprintf('axisData.%sTickLabel', axisName));
     tickValues = eval(sprintf('axisData.%sTick', axisName));
 
-    if isduration(tickValues) || isdatetime(tickValues)
-        tickValues = datenum(tickValues); 
-    end
-
     %-------------------------------------------------------------------------%
 
     %-there is not tick label case-%
@@ -133,8 +129,23 @@
                 axis.range = log10(axisLim);
             end
 
-        elseif isduration(axisLim) || isdatetime(axisLim)
-            axis.range = datenum(axisLim);
+        elseif isduration(axisLim)
+            [temp,type] = convertDuration(axisLim);
+            if (~isduration(temp)) % duration class has specified .Format
+                axis.range = temp;
+                axis.type = 'duration';
+                axis.title = type;
+                axis.tickvals = convertDuration(axis.tickvals);
+            else
+                nticks = eval(['length(axisData.' axisName 'Tick)-1;']);
+                delta = 0.1;
+                axis.range = [-delta nticks+delta];
+                axis.type = 'duration - specified format';
+            end
+
+        elseif isdatetime(axisLim)
+            axis.range = axisLim;
+            axis.type = 'date';
 
         elseif iscategorical(axisLim)
             axis.autorange = true;
@@ -289,5 +300,3 @@
 
     %-------------------------------------------------------------------------%
 end
-
-