itrm 0.2.1__tar.gz → 0.2.2__tar.gz

{itrm-0.2.1/src/itrm.egg-info → itrm-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itrm
-Version: 0.2.1
+Version: 0.2.2
 Summary: Interactive Terminal Utilities
 Home-page: https://gitlab.com/davidwoodburn/itrm
 Author: David Woodburn

{itrm-0.2.1 → itrm-0.2.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = itrm
-version = 0.2.1
+version = 0.2.2
 author = David Woodburn
 author_email = david.woodburn@icloud.com
 description = Interactive Terminal Utilities

{itrm-0.2.1 → itrm-0.2.2}/src/itrm/itrm.py

@@ -83,14 +83,16 @@ class config: # configuration settings
             config.darks = DARK_BLUES
             config.lites = LITE_BLUES
         else:
-            raise ValueError("cmap must be one of "
-                    + "'colors', 'grays', 'reds', 'greens', or 'blues'")
+            raise ValueError('cmap must be one of '
+                    + '"colors", "viridis", "grays", '
+                    + '"reds", "greens", or "blues"')
 
 
 class persistent: # persistent, run-time values
     t_last = None # last time value
     orig_term_attr = None # original terminal attributes
     rows_last = None # last number of plot rows
+    tmp = 0.0
 
 
 class limits: # x and y data limits
@@ -103,7 +105,6 @@ class limits: # x and y data limits
         self.k_min = k_min # indices of minimum x
         self.k_max = k_max # indices of maximum x
         self.k_xc = k_xc   # indices of x near cursor
-        self.tmp = 0.0
 
 
 class term_ws: # terminal window size and sub-character resolution
@@ -420,8 +421,8 @@ def iplot(x, y=None, label=None, rows=1, cols=1, lg=None, overlay=False):
             first = False
         else:
             if report:
-                rstr = view_str + f" < t:{tupdate:4f} >"
-                #rstr = view_str + f" < {view.tmp}, {K} >"
+                #rstr = view_str + f" < t:{tupdate:4f} >"
+                rstr = view_str + f" < {persistent.tmp} >" # FIXME
                 redraw_graph(C, D, F, row_zero, rstr, label,
                         ccol, cstr, cF, view, lims)
             else:
@@ -650,7 +651,7 @@ def heat(matrix):
         for row in range(0, (rows - rows%2), 2):
             for col in range(cols):
                 print("\x1b[38;5;%dm\x1b[48;5;%dm\u2580" %
-                        (M[row, col], M[row + 1, col]), end="", flush=True)
+                        (M[row, col], M[row+1, col]), end="", flush=True)
             print("\x1b[0m", flush=True)
         if rows % 2 == 1:
             for col in range(cols):
@@ -1172,20 +1173,69 @@ def limits_xy(x, y, tws, equal_axes):
 
 
 def get_row_zero(lims, tws):
-    # Expand the limits to align zero with the nearest half row so that the zero
-    # marker is true. FIXME This formula is likely wrong!
-    if (lims.y_min < 0) and (lims.y_max > 0):
-        idx_zero = round((tws.rows - 1.0/tws.subrows)
-                * lims.y_max/(lims.y_max - lims.y_min)
-                - 0.5)*tws.subrows + tws.subrows/2
-        slope = max((tws.subrows*tws.rows - 1 - idx_zero)/lims.y_min,
-                -idx_zero/lims.y_max)
-        lims.y_min = (tws.subrows*tws.rows - 1 - idx_zero)/slope
-        lims.y_max = -idx_zero/slope
-        row_zero = math.floor((tws.rows - 1/tws.subrows)*
-                (lims.y_max)/(lims.y_max - lims.y_min))
+    """
+    Expand the limits to align zero with the nearest row so that the zero marker
+    is true.
+    """
+
+    # Alias the current min and max y values.
+    a = lims.y_min
+    b = lims.y_max
+
+    if (a < 0) and (b > 0):
+        # Get the real-valued and integer-valued center rows.
+        C = tws.rows*b/(b-a) - 0.5
+        Cl = math.floor(C) # lower value
+        Ch = math.ceil(C) # higher value
+
+        # Get the scaling factors.
+        kl = (Cl + 0.5)/tws.rows
+        kh = (Ch + 0.5)/tws.rows
+
+        # Given the two scaling factors, get the new low values from fixed high
+        # values and the new high values from fixed low values.
+        Al = b*(kl - 1)/kl
+        Ah = b*(kh - 1)/kh
+        Bl = a*kl/(kl - 1)
+        Bh = a*kh/(kh - 1)
+
+        # Between the two new low values, check which is at least as low as the
+        # original.
+        if Al <= a:
+            A = Al
+            CA = Cl
+        elif Ah <= a:
+            A = Ah
+            CA = Ch
+        else:
+            A = -np.inf
+
+        # Between the two new high values, check which is at least as high as
+        # the original.
+        if Bl >= b:
+            B = Bl
+            CB = Cl
+        elif Bh >= b:
+            B = Bh
+            CB = Ch
+        else:
+            B = np.inf
+
+        # Pick the pair which results in the smallest increase in range.
+        if (b - A > 2*(b - a)) and (B - a > 2*(b - a)):
+            row_zero = -1
+        elif (b - A) < (B - a):
+            lims.y_min = A
+            lims.y_max = b
+            row_zero = CA
+        else:
+            lims.y_min = a
+            lims.y_max = B
+            row_zero = CB
     else:
+        # Set the zero row to something invalid.
         row_zero = -1
+
     return row_zero, lims
 
 
@@ -1239,8 +1289,8 @@ def data_to_matrix(x, y, view, tws, j_cursor):
         # Scale the data to dots. First dot is 0; last dot is Cols - 1.
         X = Cols*(x[j, mm] - view.x_min)/x_span - 0.5
         Y = Rows*(view.y_max - y[j, mm])/y_span - 0.5
-        X = np.clip(np.round(X).astype(int), 0, Cols - 1)
-        Y = np.clip(np.round(Y).astype(int), 0, Rows - 1)
+        X = np.clip(np.round(X).astype(int), 0, Cols-1)
+        Y = np.clip(np.round(Y).astype(int), 0, Rows-1)
 
         # Map locations to a large matrix.
         M[Y, X] = 1 # Puts a 1 wherever the curve coordinates are.
@@ -1359,7 +1409,7 @@ def zoom_in_indices(x, view):
         # Get subset of `x` within the old view.
         ka = view.k_min[j]
         kb = view.k_max[j]
-        xj_view = x[j, ka:kb + 1]
+        xj_view = x[j, ka:kb+1]
 
         # Get the new index of minimum.
         mm_min = (xj_view >= view.x_min).nonzero()[0]
@@ -1379,7 +1429,7 @@ def zoom_out_indices(x, view):
         # Get subsets of `x` left or right of the old view.
         kb = view.k_min[j]
         ka = view.k_max[j]
-        xj_left = x[j, :kb + 1]
+        xj_left = x[j, :kb+1]
         xj_right = x[j, ka:]
 
         # Get the new index of minimum.
@@ -1401,17 +1451,17 @@ def pan_indices(x, view):
         ka = view.k_min[j]
         kb = view.k_max[j]
         if (x[j, ka] >= view.x_min) and (x[j, kb] >= view.x_max): # <--
-            xj_min = x[j, :ka + 1];     k_min_ref = 0
-            xj_max = x[j, :kb + 1];     k_max_ref = 0
+            xj_min = x[j, :ka+1];       k_min_ref = 0
+            xj_max = x[j, :kb+1];       k_max_ref = 0
         elif (x[j, ka] < view.x_min) and (x[j, kb] < view.x_max): # -->
             xj_min = x[j, ka:];         k_min_ref = ka
             xj_max = x[j, kb:];         k_max_ref = kb
         elif (x[j, ka] >= view.x_min) and (x[j, kb] < view.x_max): # <->
-            xj_min = x[j, :ka + 1];     k_min_ref = 0
+            xj_min = x[j, :ka+1];       k_min_ref = 0
             xj_max = x[j, kb:];         k_max_ref = kb
         elif (x[j, ka] < view.x_min) and (x[j, kb] >= view.x_max): # >-<
-            xj_min = x[j, ka:kb + 1];   k_min_ref = ka
-            xj_max = x[j, ka:kb + 1];   k_max_ref = ka
+            xj_min = x[j, ka:kb+1];     k_min_ref = ka
+            xj_max = x[j, ka:kb+1];     k_max_ref = ka
 
         # Get the new index of minimum.
         mm_min = (xj_min >= view.x_min).nonzero()[0]
@@ -1432,7 +1482,7 @@ def center_view_x(xc, view):
 def get_column(xc, view, tws):
     x_span = view.x_max - view.x_min
     ccol = round(tws.cols*(xc - view.x_min)/x_span - 0.5)
-    ccol = min(max(ccol, 0), tws.cols - 1)
+    ccol = min(max(ccol, 0), tws.cols-1)
     return ccol
 
 
@@ -1452,8 +1502,8 @@ def get_cursor_y(x, y, view, tws, ccol, j_cursor):
     for j in jj:
         ka = view.k_min[j]
         kb = view.k_max[j]
-        xj_view = x[j, ka:kb + 1]
-        yj_view = y[j, ka:kb + 1]
+        xj_view = x[j, ka:kb+1]
+        yj_view = y[j, ka:kb+1]
         is_valid_x = np.isfinite(xj_view)
         is_valid_y = np.isfinite(yj_view)
         is_in = (xj_view >= xc_a) & (xj_view <= xc_b)
@@ -1484,8 +1534,8 @@ def get_view_y(x, y, view, j_cursor):
     for j in jj:
         ka = view.k_min[j]
         kb = view.k_max[j]
-        xj_view = x[j, ka:kb + 1]
-        yj_view = y[j, ka:kb + 1]
+        xj_view = x[j, ka:kb+1]
+        yj_view = y[j, ka:kb+1]
         is_valid_x = np.isfinite(xj_view)
         is_valid_y = np.isfinite(yj_view)
         mm = (is_valid_x & is_valid_y).nonzero()[0]
@@ -1557,7 +1607,7 @@ def matrix_to_ascii(M):
 
 def matrix_to_stars(M):
     I, J = M.shape
-    C = 0x20*np.ones((I, 2*J + 1), dtype=int)
+    C = 0x20*np.ones((I, 2*J+1), dtype=int)
     C[:, 1:-1:2] += 0xA*M
     return C
 
@@ -1728,7 +1778,7 @@ def redraw_graph(C, D, F=None, row_zero=-1, view_str=None, label=None,
             x_view = (view.x_max + view.x_min)/2
             col_center = round(cols*(x_view - lims.x_min)/x_span)
             col_a = max(0, round(col_center - bar_width/2))
-            col_b = min(cols - 1, col_a + bar_width)
+            col_b = min(cols-1, col_a + bar_width)
         # Draw the bar.
         print("\x1b[38;5;238m", end="", flush=True)
         for col in range(cols):

{itrm-0.2.1 → itrm-0.2.2/src/itrm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itrm
-Version: 0.2.1
+Version: 0.2.2
 Summary: Interactive Terminal Utilities
 Home-page: https://gitlab.com/davidwoodburn/itrm
 Author: David Woodburn