updat use_pch_style

DingWB · Sep 16, 2024 · 2458f71 · 2458f71
1 parent 4ca08c0
commit 2458f71
Showing 8 changed files with 20 additions and 15 deletions.
diff --git a/PyComplexHeatmap/__init__.py b/PyComplexHeatmap/__init__.py
@@ -4,11 +4,14 @@
 from .clustermap import (heatmap, ClusterMapPlotter, composite,
                          DendrogramPlotter)
 from .oncoPrint import oncoprint, oncoPrintPlotter
-from .annotations import *
-from .dotHeatmap import *
-from .colors import *
-from .utils import set_default_style
-import fire
+from .annotations import (
+	HeatmapAnnotation,anno_lineplot,anno_img,
+	anno_scatterplot,anno_barplot,anno_boxplot,
+	anno_label,anno_simple,AnnotationBase
+)
+from .dotHeatmap import DotClustermapPlotter,dotHeatmap2d
+from .colors import define_cmap
+from .utils import use_pch_style
 # __all__=['*']
 from ._version import version as __version__
 # __version__ = "1.6.5"

diff --git a/PyComplexHeatmap/clustermap.py b/PyComplexHeatmap/clustermap.py
@@ -5,12 +5,9 @@
 import matplotlib
 import matplotlib.pylab as plt
 from scipy.cluster import hierarchy
-import collections
 import warnings
-import copy
-from .utils import mm2inch
-
 from .utils import (
+	mm2inch,
 	_check_mask,
 	_calculate_luminance,
 	despine,

diff --git a/PyComplexHeatmap/utils.py b/PyComplexHeatmap/utils.py
@@ -14,7 +14,7 @@
 
 
 # =============================================================================
-def set_default_style():
+def use_pch_style():
 	from matplotlib import rcParams
 
 	D = {
@@ -26,7 +26,7 @@ def set_default_style():
 		"legend.frameon": True,
 		"legend.fontsize": 10,
 		# Savefig
-		"figure.dpi": 100,
+		# "figure.dpi": 100,
 		"savefig.bbox": "tight",
 		"savefig.dpi": 300,
 		"savefig.pad_inches": 0.05,
@@ -954,4 +954,4 @@ def plot_legend_list(
 
 
 # =============================================================================
-# set_default_style()
+# use_pch_style()
diff --git a/notebooks/advanced_usage.ipynb b/notebooks/advanced_usage.ipynb
@@ -17,6 +17,7 @@
     "import PyComplexHeatmap\n",
     "# print(PyComplexHeatmap.__version__)\n",
     "from PyComplexHeatmap import *\n",
+    "use_pch_style() # or plt.style.use('default') to restore default style\n",
     "# import matplotlib; print(matplotlib.__version__)"
    ]
   },

diff --git a/notebooks/dotHeatmap.ipynb b/notebooks/dotHeatmap.ipynb
@@ -18,7 +18,8 @@
     "plt.rcParams['pdf.fonttype']=42\n",
     "sys.path.append(os.path.expanduser(\"~/Projects/Github/PyComplexHeatmap/\"))\n",
     "import PyComplexHeatmap\n",
-    "from PyComplexHeatmap import *"
+    "from PyComplexHeatmap import *\n",
+    "use_pch_style() # or plt.style.use('default') to restore default style"
    ]
   },
   {

diff --git a/notebooks/oncoPrint.ipynb b/notebooks/oncoPrint.ipynb
@@ -16,6 +16,7 @@
    "outputs": [],
    "source": [
     "import os,sys\n",
+    "import pandas as pd\n",
     "%matplotlib inline\n",
     "import matplotlib.pylab as plt\n",
     "import pickle\n",
@@ -25,8 +26,8 @@
     "plt.rcParams['font.sans-serif']='Arial'\n",
     "plt.rcParams['pdf.fonttype']=42\n",
     "# sys.path.append(os.path.expanduser(\"~/Projects/Github/PyComplexHeatmap/\"))\n",
-    "import PyComplexHeatmap\n",
-    "from PyComplexHeatmap import *"
+    "from PyComplexHeatmap import *\n",
+    "use_pch_style() # or plt.style.use('default') to restore default style"
    ]
   },
   {

diff --git a/notebooks/oncoPrint2.ipynb b/notebooks/oncoPrint2.ipynb
@@ -18,6 +18,7 @@
     "import os,sys\n",
     "# sys.path.append(os.path.expanduser(\"~/Projects/Github/PyComplexHeatmap/\"))\n",
     "from PyComplexHeatmap import *\n",
+    "use_pch_style() # or plt.style.use('default') to restore default style\n",
     "import pandas as pd\n",
     "import random"
    ]

diff --git a/notebooks/single_cell_methylation.ipynb b/notebooks/single_cell_methylation.ipynb
@@ -34,6 +34,7 @@
     "plt.rcParams['pdf.fonttype']=42\n",
     "# sys.path.append(os.path.expanduser(\"~/Projects/Github/PyComplexHeatmap/\"))\n",
     "import PyComplexHeatmap as pch\n",
+    "pch.use_pch_style() # or plt.style.use('default') to restore default style\n",
     "print(pch.__version__)"
    ]
   },