various cli fixes including for #35

Author: ptooley

pypop/cli/cli.py

@@ -271,6 +271,8 @@ def hybrid_cli_metrics():
 
     metrics = MPI_OpenMP_Metrics(statistics)
 
+    print(config.metric_table)
+
     # Create and save table
     if not config.no_metric_table:
         metric_table = metrics.plot_table(

pypop/notebook_interface/plotting.py

@@ -90,14 +90,13 @@ def _repr_html_(self):
 
         return file_html(self.figure, INLINE, "")
 
-    def _repr_png_(self):
-        if not environ.get("PYPOP_HEADLESS"):
+    def _repr_png_(self, force=False):
+        if not environ.get("PYPOP_HEADLESS") and not force:
             return None
 
-        try:
-            window_size = [int(1.1 * x) for x in self._plot_dims]
-        except AttributeError:
-            window_size = (900, 600)
+        self.figure.min_border = 10
+
+        window_size = [1.1*self.figure.plot_width, 1.1*self.figure.plot_height]
 
         self.figure.toolbar_location = None
 
@@ -119,7 +118,7 @@ def save_html(self, path):
             fh.write(imgcode)
 
     def save_png(self, path):
-        imgdata = self._repr_png_()
+        imgdata = self._repr_png_(force=True)
 
         with open(path, "wb") as fh:
             fh.write(imgdata)
@@ -511,7 +510,7 @@ def _build_plot(self):
             tools=["save"],
             min_border=0,
             aspect_ratio=1.5,
-            sizing_mode="scale_width",
+            sizing_mode="fixed",
             x_range=x_axis_range,
             y_range=y_axis_range,
             title=self.title

setup.py

@@ -30,13 +30,13 @@
     include_package_data=True,
     entry_points={
         "console_scripts": [
-            "pypop-mpi-metrics = pypop.cli:mpi_cli_metrics",
-            "pypop-hybrid-metrics = pypop.cli:hybrid_cli_metrics",
-            "pypop-openmp-metrics = pypop.cli:openmp_cli_metrics",
-            "pypop-preprocess = pypop.cli:preprocess_traces",
-            "pypop-idealise-prv = pypop.cli:dimemas_idealise_cli",
-            "pypop-copy-examples = pypop.cli:copy_examples",
-            "pypop-gui = pypop.cli:pypop_gui",
+            "pypop-mpi-metrics = pypop.cli.cli:mpi_cli_metrics",
+            "pypop-hybrid-metrics = pypop.cli.cli:hybrid_cli_metrics",
+            "pypop-openmp-metrics = pypop.cli.cli:openmp_cli_metrics",
+            "pypop-preprocess = pypop.cli.cli:preprocess_traces",
+            "pypop-idealise-prv = pypop.cli.cli:dimemas_idealise_cli",
+            "pypop-copy-examples = pypop.cli.cli:copy_examples",
+            "pypop-gui = pypop.cli.cli:pypop_gui",
         ]
     },
 )