Changeset 423

Timestamp:

07/27/2011 04:28:20 PM (12 years ago)

Author:

marcus

Message:

refactoring

File:

• SHX/trunk/sandbox/traceplotter.py (modified) (2 diffs)

SHX/trunk/sandbox/traceplotter.py

@@ -20 +20 @@
 # space for time-scale
 TIMESCALE = 40
+# offset for time string
+TIMESCALE_OFFSET_TEXT = 8
+# length of minor/major ticks
+TIMESCALE_TICKS_MINOR = 3
+TIMESCALE_TICKS_MAJOR = 7
 
 class Traces(object):
@@ -689 +694 @@
 
         if self.traceOrder in [0, 1]:
-            PARTS = 5.
-            w = width - MARGIN-STATION_INFO
-            y = height - TIMESCALE + 10
-            sx = STATION_INFO
-            canvas.DrawLine(sx, y, w+STATION_INFO, y)
-
-            chunk = w / PARTS
-            chunk2 = chunk / 5.
-            chunk_t = (end - start) / PARTS
-            for i in range(int(PARTS)):
-                if isinstance(start, UTCDateTime):
-                    timecode = start + i*chunk_t
-                    txt = timecode.strftime("%H:%M:%S.") + \
-                                                 str(timecode.microsecond//1000)
-                else:
-                    txt = str(start + i*chunk_t)
-
-                tw, _, _, _ = canvas.GetFullTextExtent(txt)
-                x = sx+i*chunk
-                canvas.DrawText(txt, x-tw/2, y+8)
-                canvas.DrawLine(x, y, x, y+7)
-                for j in range(1,5):
-                    canvas.DrawLine(x+j*chunk2, y, x+j*chunk2, y+3)
+            PARTS = 5.  # axis split into X parts
+            length = width - MARGIN - STATION_INFO  # pixel length of time axis
+            fixpos = height - TIMESCALE + 10  # here: y coordinate
+            varpos_start = STATION_INFO  # here: x start
         elif self.traceOrder in [2, 3]:
             PARTS = 4.
-            h = height - MARGIN - STATION_INFO
-            x = width - TIMESCALE + 10
+            length = height - MARGIN - STATION_INFO
+            fixpos = width - TIMESCALE + 10  # here: x coordinate
             if self.traceOrder == 2:
-                sy = MARGIN
+                varpos_start = MARGIN  # here: y start
             elif self.traceOrder == 3:
-                sy = STATION_INFO
-            canvas.DrawLine(x, sy, x, sy+h)
-
-            chunk = h / PARTS
-            chunk2 = chunk / 5.
-            chunk_t = (end - start) / PARTS
-
-            for i in range(int(PARTS)):
-                if isinstance(start, UTCDateTime):
-                    timecode = start + i*chunk_t
-                    txt = timecode.strftime("%H:%M:%S.") + \
-                                                 str(timecode.microsecond//1000)
-                else:
-                    txt = str(start + i*chunk_t)
-
-                tw, _, _, _ = canvas.GetFullTextExtent(txt)
+                varpos_start = STATION_INFO
+
+        chunk = length / PARTS
+        chunk2 = chunk / 5.
+        chunk_t = (end - start) / PARTS
+
+        if self.traceOrder in [0, 1]:
+            canvas.DrawLine(varpos_start, fixpos, length + varpos_start, fixpos)
+        elif self.traceOrder in [2, 3]:
+            canvas.DrawLine(fixpos, varpos_start, fixpos, varpos_start + length)
+
+        for i in range(int(PARTS)):
+            if isinstance(start, UTCDateTime):
+                timecode = start + i*chunk_t
+                txt = timecode.strftime("%H:%M:%S.") + \
+                                             str(timecode.microsecond//1000)
+            else:
+                txt = str(start + i*chunk_t)
+
+            tw = canvas.GetFullTextExtent(txt)[0]
+
+            if self.traceOrder in [0, 1]:
+                varpos_current = varpos_start + i * chunk
+                # time string
+                canvas.DrawText(txt, varpos_current - tw / 2,
+                                                 fixpos + TIMESCALE_OFFSET_TEXT)
+                # major tick
+                canvas.DrawLine(varpos_current, fixpos,
+                                 varpos_current, fixpos + TIMESCALE_TICKS_MAJOR)
+                # minor ticks
+                for j in range(1, 5):
+                    canvas.DrawLine(
+                        varpos_current + j * chunk2,
+                        fixpos,
+                        varpos_current + j * chunk2,
+                        fixpos + TIMESCALE_TICKS_MINOR
+                    )
+            elif self.traceOrder in [2, 3]:
                 if self.traceOrder == 2:
-                    y = sy + (PARTS-i) * chunk
+                    varpos_current = varpos_start + (PARTS - i) * chunk
                 elif self.traceOrder == 3:
-                    y = sy + i * chunk
-                canvas.DrawRotatedText(txt, x+8, y+tw/2, 90)
-                canvas.DrawLine(x, y, x+7, y)
+                    varpos_current = varpos_start + i * chunk
+                canvas.DrawRotatedText(txt, fixpos + TIMESCALE_OFFSET_TEXT,
+                                                    varpos_current + tw / 2, 90)
+                canvas.DrawLine(fixpos, varpos_current,
+                                 fixpos + TIMESCALE_TICKS_MAJOR, varpos_current)
                 for j in range(1, 5):
                     if self.traceOrder == 2:
                         j -= 5
-                    canvas.DrawLine(x, y+j*chunk2, x+3, y+j*chunk2)
+                    canvas.DrawLine(
+                        fixpos,
+                        varpos_current + j * chunk2,
+                         fixpos + TIMESCALE_TICKS_MINOR,
+                         varpos_current + j * chunk2
+                     )
 
         # make it visible