ENH: add seconds and microseconds

jklymak · jklymak · commit 2e09c74c6d57 · 2018-03-21T06:24:20.000-07:00
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -798,6 +798,7 @@ def __init__(self, locator, tz=None, defaultfmt='%Y-%h-%d %H:%M:%S',
         self._hourfmt = '%H'
         self._minutefmt = '%M'
         self._secondfmt = '%S'
+        self._microsecondfmt = '%f'
         self.offset_string = 'Dates!'
         self.show_offset = show_offset
 
@@ -821,6 +822,7 @@ def __call__(self, x, pos=None):
                 dayfmt = [self._dayfmt] * len(tickdate)
                 hourfmt = [self._hourfmt+':'+self._minutefmt] * len(tickdate)
                 secondfmt = [self._secondfmt] * len(tickdate)
+                microsecondfmt = [self._microsecondfmt] * len(tickdate)
 
                 # start at year....
                 diffed = False
@@ -884,15 +886,54 @@ def __call__(self, x, pos=None):
                 if remove:
                     for nn in range(0, len(tickdate)):
                         secondfmt[nn] = ''
+                else:
+                    for nn in range(0, len(tickdate)):
+                        if tickdate[nn].second == 0:
+                            secondfmt[nn] = ''
 
-                # remove time if zero:
+                # remove extra datetime.microsecond if all zero:
+                maxlen = 0
+                oldremove = remove
                 remove = True
-                for nn in range(0, len(tickdate)):
-                    if (tickdate[nn].hour != 0 or tickdate[nn].minute != 0):
-                        remove = False
+                if not oldremove:
+                    for nn in range(0, len(tickdate)):
+                        if tickdate[nn].microsecond != 0:
+                            remove = False
+                            fullst = '%d'%tickdate[nn].microsecond
+                            maxlen = max(maxlen, len(fullst.rstrip('0')))
                 if remove:
                     for nn in range(0, len(tickdate)):
-                        hourfmt[nn] = ''
+                        microsecondfmt[nn] = ''
+
+                # remove time
+                if not diffed:
+                    diffed = False
+                    for nn in range(1, len(tickdate)):
+                        if (tickdate[nn].hour == tickdate[nn-1].hour
+                                and tickdate[nn].minute ==
+                                    tickdate[nn-1].minute):
+                            hourfmt[nn] = ''
+                        else:
+                            diffed = True
+                    if not diffed and tickdate[0].second != 0:
+                        offset_fmt += ' ' + hourfmt[0]
+                        hourfmt[0] = ''
+                else:
+                    remove = True
+                    for nn in range(0, len(tickdate)):
+                        if (tickdate[nn].hour != 0 or tickdate[nn].minute != 0):
+                            remove = False
+                    if remove:
+                        for nn in range(0, len(tickdate)):
+                            hourfmt[nn] = ''
+                    else:
+                        for nn in range(0, len(tickdate)):
+                            if (tickdate[nn].hour == 0 and
+                                    tickdate[nn].minute == 0):
+                                hourfmt[nn] = ''
+                                monthfmt[nn] = self._monthfmt
+
+
 
                 ticknew = []
                 for nn in range(len(tickdate)):
@@ -917,7 +958,13 @@ def __call__(self, x, pos=None):
                             fmt += ':'
                     if not secondfmt[nn] == '':
                         fmt += secondfmt[nn]
-                    ticknew += [tickdate[nn].strftime(fmt)]
+                    if not microsecondfmt[nn] == '':
+                        fmt += '.' + microsecondfmt[nn]
+
+                    newtickla = tickdate[nn].strftime(fmt)
+                    if not microsecondfmt[nn] == '':
+                        newtickla = newtickla[:-(6-maxlen)]
+                    ticknew += [newtickla]
 
                 result = ticknew[pos]
                 self._oldticks = ticks
