From d782bc5a5b22f2d4664a73010efc65e5dc57b045 Mon Sep 17 00:00:00 2001 From: Felipe <fima@dtu.dk> Date: Thu, 30 May 2024 14:04:40 +0200 Subject: [PATCH] commenting models out --- qim3d/__init__.py | 17 ++++++++++++++--- qim3d/io/loading.py | 2 +- qim3d/utils/cli.py | 5 +++-- qim3d/viz/__init__.py | 1 - qim3d/viz/colormaps.py | 2 -- setup.py | 2 +- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/qim3d/__init__.py b/qim3d/__init__.py index beadf9df..c89b6fd0 100644 --- a/qim3d/__init__.py +++ b/qim3d/__init__.py @@ -1,3 +1,15 @@ +"""qim3d: A Python package for 3D image processing and visualization. + +The qim3d library is designed to make it easier to work with 3D imaging data in Python. +It offers a range of features, including data loading and manipulation, + image processing and filtering, visualization of 3D data, and analysis of imaging results. + +Documentation available at https://platform.qim.dk/qim3d/ + +""" + +__version__ = "0.3.6" + import logging logging.basicConfig(level=logging.ERROR) @@ -5,12 +17,11 @@ logging.basicConfig(level=logging.ERROR) from . import io from . import gui from . import viz - from . import utils -from . import models from . import processing +# Commenting out models because it takes too long to import +# from . import models -__version__ = "0.3.5" examples = io.ImgExamples() io.logger.set_level_info() diff --git a/qim3d/io/loading.py b/qim3d/io/loading.py index 1b986b7a..42eef66c 100644 --- a/qim3d/io/loading.py +++ b/qim3d/io/loading.py @@ -31,7 +31,7 @@ from qim3d.io.logger import log from qim3d.utils.internal_tools import get_file_size, sizeof, stringify_path from qim3d.utils.system import Memory -dask.config.set(scheduler="processes") # Dask parallel goes brrrrr +dask.config.set(scheduler="processes") class DataLoader: diff --git a/qim3d/utils/cli.py b/qim3d/utils/cli.py index 2280f3af..92f01e33 100644 --- a/qim3d/utils/cli.py +++ b/qim3d/utils/cli.py @@ -1,10 +1,11 @@ import argparse import webbrowser -import qim3d from qim3d.gui import annotation_tool, data_explorer, iso3d, local_thickness from qim3d.io.loading import DataLoader from qim3d.utils import image_preview +from qim3d import __version__ as version +import qim3d def main(): @@ -150,7 +151,7 @@ def main(): "--- Welcome to qim3d command-line interface ---\n" "qim3d is a Python package for 3D image processing and visualization.\n" "For more information, please visit: https://platform.qim.dk/qim3d/\n" - f"Current version of qim3d: {qim3d.__version__}\n" + f"Current version of qim3d: {version}\n" " \n" "The qim3d command-line interface provides the following subcommands:\n" "- gui: Graphical User Interfaces\n" diff --git a/qim3d/viz/__init__.py b/qim3d/viz/__init__.py index 96352d2b..080a4ebd 100644 --- a/qim3d/viz/__init__.py +++ b/qim3d/viz/__init__.py @@ -1,4 +1,3 @@ -#from .colormaps import objects from . import colormaps from .cc import plot_cc from .detection import circles diff --git a/qim3d/viz/colormaps.py b/qim3d/viz/colormaps.py index d72c94d9..547e10fb 100644 --- a/qim3d/viz/colormaps.py +++ b/qim3d/viz/colormaps.py @@ -10,8 +10,6 @@ from matplotlib.colors import LinearSegmentedColormap from matplotlib import colormaps from skimage import color -from qim3d.io.logger import log - def rearrange_colors(randRGBcolors_old, min_dist = 0.5): # Create new list for re-arranged colors randRGBcolors_new = [randRGBcolors_old.pop(0)] diff --git a/setup.py b/setup.py index 40caf8e9..017d277a 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ with open("README.md", "r", encoding="utf-8") as f: setup( name="qim3d", - version="0.3.5", + version="0.3.6", author="Felipe Delestro", author_email="fima@dtu.dk", description="QIM tools and user interfaces", -- GitLab