@@ -162,7 +162,6 @@ def select_step360(v1, v2, nv, include_last=True, threshold_factor=3600):
162
162
threshold_factor = threshold_factor )
163
163
164
164
165
-
166
165
class LocatorBase (object ):
167
166
def __init__ (self , den , include_last = True ):
168
167
self .den = den
@@ -211,25 +210,21 @@ def __call__(self, v1, v2):
211
210
threshold_factor = 1 )
212
211
213
212
214
-
215
213
class FormatterDMS (object ):
216
-
217
214
deg_mark = "^{\circ}"
218
215
min_mark = "^{\prime}"
219
216
sec_mark = "^{\prime\prime}"
220
217
221
- fmt_d = "$%d" + deg_mark + "$"
222
- fmt_ds = r"$%d.\!\!" + deg_mark + "%s $"
218
+ fmt_d = "$%d" + deg_mark + "$"
219
+ fmt_ds = r"$%d.%s" + deg_mark + " $"
223
220
224
221
# %s for signe
225
- fmt_d_m = r"$%s%d" + deg_mark + "\,%02d" + min_mark + "$"
226
- fmt_d_ms = r"$%s%d" + deg_mark + "\,%02d.\mkern-4mu" + min_mark + "%s$"
227
-
228
-
229
- fmt_d_m_partial = "$%s%d" + deg_mark + "\,%02d" + min_mark + "\,"
230
- fmt_s_partial = "%02d" + sec_mark + "$"
231
- fmt_ss_partial = "%02d.\!\!" + sec_mark + "%s$"
222
+ fmt_d_m = r"$%s%d" + deg_mark + "\,%02d" + min_mark + "$"
223
+ fmt_d_ms = r"$%s%d" + deg_mark + "\,%02d.%s" + min_mark + "$"
232
224
225
+ fmt_d_m_partial = "$%s%d" + deg_mark + "\,%02d" + min_mark + "\,"
226
+ fmt_s_partial = "%02d" + sec_mark + "$"
227
+ fmt_ss_partial = "%02d.%s" + sec_mark + "$"
233
228
234
229
def _get_number_fraction (self , factor ):
235
230
## check for fractional numbers
@@ -320,23 +315,22 @@ def __call__(self, direction, factor, values):
320
315
else : # factor > 3600.
321
316
return [r"$%s^{\circ}$" % (str (v ),) for v in ss * values ]
322
317
318
+
323
319
class FormatterHMS (FormatterDMS ):
324
320
deg_mark = "^\mathrm{h}"
325
321
min_mark = "^\mathrm{m}"
326
322
sec_mark = "^\mathrm{s}"
327
323
328
- fmt_d = "$%d" + deg_mark + "$"
329
- fmt_ds = r"$%d.\!\!" + deg_mark + "%s $"
324
+ fmt_d = "$%d" + deg_mark + "$"
325
+ fmt_ds = r"$%d.%s" + deg_mark + " $"
330
326
331
327
# %s for signe
332
- fmt_d_m = r"$%s%d" + deg_mark + "\,%02d" + min_mark + "$"
333
- fmt_d_ms = r"$%s%d" + deg_mark + "\,%02d.\!\!" + min_mark + "%s$"
334
-
335
-
336
- fmt_d_m_partial = "$%s%d" + deg_mark + "\,%02d" + min_mark + "\,"
337
- fmt_s_partial = "%02d" + sec_mark + "$"
338
- fmt_ss_partial = "%02d.\!\!" + sec_mark + "%s$"
328
+ fmt_d_m = r"$%s%d" + deg_mark + "\,%02d" + min_mark + "$"
329
+ fmt_d_ms = r"$%s%d" + deg_mark + "\,%02d.%s" + min_mark + "$"
339
330
331
+ fmt_d_m_partial = "$%s%d" + deg_mark + "\,%02d" + min_mark + "\,"
332
+ fmt_s_partial = "%02d" + sec_mark + "$"
333
+ fmt_ss_partial = "%02d.%s" + sec_mark + "$"
340
334
341
335
def __call__ (self , direction , factor , values ): # hour
342
336
return FormatterDMS .__call__ (self , direction , factor , np .asarray (values )/ 15. )
0 commit comments