- changed time to time0

Author: hirokawa

src/cssrlib/cssrlib.py

@@ -449,7 +449,7 @@ def ssig2rsig(self, sys: sGNSS, utyp: uTYP, ssig):
 
     def set_time(self, t):
         """ set observation time (week, tow) """
-        self.time = t
+        self.time0 = t
         week, tow = time2gpst(t)
         self.week = week
         self.tow0 = tow//86400*86400

src/cssrlib/plot.py

@@ -114,20 +114,25 @@ def draw_circle(ax, ccrs, p, col, nc=10, alpha=0.5):
             transform=ccrs)
 
 
-def plot_enu(t, enu, smode=None, ztd=None, ylim=1.0, figtype=1):
+def plot_enu(t, enu, smode=None, ztd=None, ylim=1.0, ylim_v=None, figtype=1):
     """ plot ENU coordinates """
 
     lbl_t = ['East [m]', 'North [m]', 'Up [m]']
     fmt = '%H:%M'
 
     fig = plt.figure(figsize=[7, 9])
     fig.set_rasterized(True)
+    idx2 = np.array([])
 
     if smode is not None:
+        idx2 = np.where(smode == 2)[0]  # dgps
         idx4 = np.where(smode == 4)[0]  # fix
         idx5 = np.where(smode == 5)[0]  # float
         idx0 = np.where(smode == 0)[0]  # none
 
+    if ylim_v is None:
+        ylim_v = ylim
+
     if figtype == 1:  # ENU versus t
 
         nfig = 3 if ztd is None else 4
@@ -136,14 +141,19 @@ def plot_enu(t, enu, smode=None, ztd=None, ylim=1.0, figtype=1):
             plt.subplot(nfig, 1, k+1)
             if smode is None:
                 plt.plot(t, enu[:, k])
+            elif len(idx2) > 0:  # DGPS
+                plt.plot(t[idx0], enu[idx0, k], 'r.', label='none')
+                plt.plot(t[idx2], enu[idx2, k], 'y.', label='dgps')
             else:
                 plt.plot(t[idx0], enu[idx0, k], 'r.', label='none')
                 plt.plot(t[idx5], enu[idx5, k], 'y.', label='float')
                 plt.plot(t[idx4], enu[idx4, k], 'g.', label='fix')
 
             plt.ylabel(lbl_t[k])
             plt.grid()
-            plt.ylim([-ylim, ylim])
+            lim = ylim_v if k == 2 else ylim
+            plt.ylim([-lim, lim])
+
             plt.gca().xaxis.set_major_formatter(md.DateFormatter(fmt))
 
         if ztd is not None:
@@ -159,18 +169,21 @@ def plot_enu(t, enu, smode=None, ztd=None, ylim=1.0, figtype=1):
                          markersize=8, label='fix')
 
             plt.ylabel('ZTD [cm]')
+            plt.ylim([0, 40])
             plt.grid()
             plt.gca().xaxis.set_major_formatter(md.DateFormatter(fmt))
 
-            plt.xlabel('Time [HH:MM]')
-
+        plt.xlabel('Time [HH:MM]')
         plt.legend()
 
     elif figtype == 2:  # horizontal coordinates
         fig.add_subplot(111)
 
         if smode is None:
             plt.plot(enu[:, 0], enu[:, 1])
+        elif idx2 is not None:  # DGPS
+            plt.plot(enu[idx0, 0], enu[idx0, 1], 'r.', label='none')
+            plt.plot(enu[idx2, 0], enu[idx2, 1], 'y.', label='dgps')
         else:
             plt.plot(enu[idx0, 0], enu[idx0, 1], 'r.', label='none')
             plt.plot(enu[idx5, 0], enu[idx5, 1], 'y.', label='float')

src/cssrlib/utils.py

@@ -9,7 +9,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 from cssrlib.gnss import time2str, sys2str, ecef2pos, ecef2enu, timediff
-from cssrlib.gnss import gtime_t, char2sys, rSigRnx, uGNSS, uTYP, uSIG
+from cssrlib.gnss import gtime_t, rSigRnx
 from cssrlib.peph import atxdec, searchpcv
 from cssrlib.plot import plot_enu
 
@@ -126,13 +126,15 @@ def prepare_signal(self, obsfile=None):
     def save_output(self, t, ne, ppp=None):
         """ output result """
 
-        self.t[ne] = timediff(self.nav.t, self.t0)/86400.0
+        self.t[ne] = timediff(t, self.t0)/86400.0
 
         sol = self.nav.xa[0:3] if self.nav.smode == 4 else self.nav.x[0:3]
         self.enu[ne, :] = ecef2enu(self.pos_ref, sol-self.xyz_ref)
         self.smode[ne] = self.nav.smode
 
-        if ppp is not None:
+        if ppp is None:
+            self.ztd = None
+        else:
             self.ztd[ne] = self.nav.xa[ppp.IT(self.nav.na)] \
                 if self.nav.smode == 4 else self.nav.x[ppp.IT(self.nav.na)]
 
@@ -175,7 +177,8 @@ def plot(self, ttl='test', fig_type=1, ylim=1, ylim_v=2, gfmt='png',
         """ plot utility """
 
         if fig_type == 1:
-            plot_enu(self.t, self.enu, self.smode, ylim=ylim, ylim_v=ylim_v)
+            plot_enu(self.t, self.enu, self.smode,
+                     self.ztd, ylim=ylim, ylim_v=ylim_v)
         elif fig_type == 2:
             plot_enu(self.t, self.enu, self.smode, figtype=fig_type, ylim=ylim)