requirements and cleanup

xoolive · Oct 9, 2018 · d456504 · d456504
1 parent 4bd1e64
commit d456504
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/setup.py b/setup.py
@@ -33,20 +33,20 @@
         "scipy",
         "matplotlib",
         "pandas",
-        "cython",
-        "geodesy",
         "Cartopy",
         "Shapely",
         "requests",
-        "maya",
-        "appdirs",
-        "paramiko",
-        "tqdm>=4.26",
+        "maya",  # human-friendly datetimes
+        "appdirs",  # proper configuration directories
+        "paramiko",  # ssh connections
+        "PyQt5",
+        "ipywidgets",  # IPython widgets for traffic
+        "tornado",  # dependency for matplotlib with WebAgg
+        "ipympl",  # interactive matplotlib in notebooks
+        "tqdm>=4.26",  # progressbars
+        "geodesy",
         "cartotools==1.0",
         "pyModeS==2.0",
     ],
-    dependency_links=[
-        "https://github.com/xoolive/cartotools.git#whl=cartotools-1.0"
-    ],
     python_requires=">=3.6",
 )
diff --git a/traffic/qtgui/layout.py b/traffic/qtgui/layout.py
@@ -539,22 +539,12 @@ def set_icons(self) -> None:
         icon_path = Path(__file__).absolute().parent.parent.parent / "icons"
 
         if sys.platform == "linux":
-            # icon_mini = QtGui.QIcon(
-            #     (icon_path / "travel-mini-white.svg").as_posix()
-            # )
             icon_full = QtGui.QIcon((icon_path / "travel-white.svg").as_posix())
         else:
-            # icon_mini = QtGui.QIcon(
-            #     (icon_path / "travel-mini-grey.svg").as_posix()
-            # )
             icon_full = QtGui.QIcon((icon_path / "travel-grey.svg").as_posix())
 
         self.setWindowIcon(icon_full)
 
-        # self.trayIcon = QSystemTrayIcon(icon_mini, self)
-        # not useful yet...
-        # self.trayIcon.show()
-
     def set_time_range(self) -> None:
         assert self._traffic is not None
         self.time_slider.setEnabled(True)

diff --git a/traffic/qtgui/plot.py b/traffic/qtgui/plot.py
@@ -104,6 +104,12 @@ def plot_callsigns(
             if (up - low) / up < 0.05:
                 self.ax.set_ylim(up - .05 * up, up + .05 * up)
 
+        if len(callsigns) > 0 and len(secondary_y) > 0:
+            ax2, _ = next(iter(self.ax.get_shared_x_axes()))
+            low, up = ax2.get_ylim()
+            if (up - low) / up < 0.05:
+                ax2.set_ylim(up - .05 * up, up + .05 * up)
+
         self.draw()
 
     def draw(self):