batoolset 0.1.7__tar.gz → 0.1.8__tar.gz

{batoolset-0.1.7 → batoolset-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batoolset
-Version: 0.1.7
+Version: 0.1.8
 Summary: An aggregate of functions I find useful
 Home-page: https://github.com/baigouy/batoolset
 Author: Benoit Aigouy
@@ -39,6 +39,7 @@ Requires-Dist: Deprecated
 Requires-Dist: Requests
 Requires-Dist: pyautogui
 Requires-Dist: imagecodecs
+Requires-Dist: psutil
 Provides-Extra: all
 Requires-Dist: python-javabridge; extra == "all"
 Requires-Dist: python-bioformats; extra == "all"

{batoolset-0.1.7 → batoolset-0.1.8}/batoolset/GUI/multi_image_display.py

@@ -11,9 +11,9 @@ from qtpy.QtWidgets import QApplication, QGridLayout, QScrollArea, QLabel, QVBox
     QStyleOptionTitleBar, QMessageBox, QDialogButtonBox
 # from deprecated_demos.ta.wshed import Wshed
 from batoolset.ta.segmentation.neo_wshed import wshed
-# from batoolset.draw.widgets.paint import Createpaintwidget
+# from batoolset.drawings.widgets.paint import Createpaintwidget
 from batoolset.img import Img, RGB_to_int24
-from batoolset.draw.shapes.rect2d import Rect2D
+from batoolset.drawings.shapes.rect2d import Rect2D
 
 # TODO add shortcuts to zoom and so on so that I can handle it better
 # TODO maybe store the raw image in it

{batoolset-0.1.7 → batoolset-0.1.8}/batoolset/GUI/paint2.py

@@ -2,17 +2,16 @@
 # NB this will ultimately become the one and only paint widget in the app --> all others or most of them should disappear and be replaced by that
 # TODO need add the save but only for the mask edit item!!!
 import os
-
-from batoolset.pyqt.tools import getCtrlModifier
 from batoolset.settings.global_settings import set_UI # set the UI to qtpy
 set_UI()
+from batoolset.pyqts.tools import getCtrlModifier
 import traceback
 from qtpy.QtGui import QKeySequence
 from skimage.measure import label, regionprops
 from qtpy.QtCore import QRect, QTimer, Qt
 from qtpy.QtWidgets import QWidget, QApplication, QMessageBox
 from batoolset.dialogs.opensave import saveFileDialog
-from batoolset.draw.widgets.vectorial import VectorialDrawPane
+from batoolset.drawings.widgets.vectorial import VectorialDrawPane
 from qtpy.QtWidgets import QMenu
 from qtpy import QtCore, QtGui, QtWidgets
 from batoolset.img import toQimage, Img, get_white_bounds, RGB_to_int24, is_binary, auto_scale, save_as_tiff

{batoolset-0.1.7 → batoolset-0.1.8}/batoolset/GUI/scrollablepaint.py

@@ -15,9 +15,9 @@ from qtpy.QtWidgets import QScrollArea, QVBoxLayout, QWidget, QSpinBox, QComboBo
     QHBoxLayout, QAction, QSlider
 import qtawesome as qta
 from qtpy.QtCore import Qt, QTimer
-from batoolset.draw.shapes.freehand2d import Freehand2D
-from batoolset.draw.shapes.image2d import Image2D
-from batoolset.draw.shapes.rect2d import Rect2D
+from batoolset.drawings.shapes.freehand2d import Freehand2D
+from batoolset.drawings.shapes.image2d import Image2D
+from batoolset.drawings.shapes.rect2d import Rect2D
 from batoolset.img import Img, int24_to_RGB, has_metadata
 from batoolset.GUI.paint2 import Createpaintwidget
 

batoolset-0.1.7/batoolset/binarytools/cell_center_detector.py → batoolset-0.1.8/batoolset/binaries/tools.py

@@ -1,8 +1,13 @@
+# this will contain a set of binary tools
+from skimage.draw import ellipse
+import numpy as np
+import matplotlib.pyplot as plt
+from skimage import data, filters
+from skimage.filters.thresholding import threshold_otsu
 import math
 from skimage.measure import label, regionprops
 from timeit import default_timer as timer
-import numpy as np
-import matplotlib.pyplot as plt
+
 
 def add_2d_border(image2d):
     """
@@ -285,6 +290,118 @@ def _get_seeds(cells, horiz_gradient, vertical_gradient):
 
     return combined_gradients_ready_for_wshed, highest_pixels
 
+def ellipsoidify_dots(binary_dots):
+    """
+    Replaces all 2D dots detected by an equivalent ellipse using bbox radius to draw the dot.
+
+    Args:
+        binary_dots (ndarray): An image that contains dots (typically obtained through binarization of an image).
+
+    Returns:
+        ndarray: The modified image with dots replaced by ellipses.
+
+    Examples:
+        >>> binary_dots = np.array([[0, 0, 0, 0],
+        ...                         [0, 1, 0, 0],
+        ...                         [0, 0, 0, 0]])
+        >>> result = ellipsoidify_dots(binary_dots)
+        >>> print(result)
+        [[0 0 0 0]
+         [0 1 0 0]
+         [0 0 0 0]]
+    """
+    # Check if the image is 3D
+    if len(binary_dots.shape) == 3:
+        # If image is 3D, loop over all images and apply ellipsoidify_dots to each channel
+        for iii, img_2D in enumerate(binary_dots):
+            binary_dots[iii] = ellipsoidify_dots(img_2D)
+        return binary_dots
+
+    # Label the dots in the binary image
+    lab_dots = label(binary_dots, connectivity=None, background=0)
+    rps_dots = regionprops(lab_dots)
+
+    # Iterate over each labeled region (dot)
+    for region in rps_dots:
+        centroid = region.centroid
+        bbox = region.bbox
+        # Draw an ellipse that fits the dot
+        rr, cc = ellipse(centroid[0], centroid[1], r_radius=abs(bbox[0] - bbox[2]) / 2,
+                         c_radius=abs(bbox[1] - bbox[3]) / 2, shape=binary_dots.shape)
+        binary_dots[rr, cc] = binary_dots.max()
+
+    return binary_dots
+# should also work for 3D even though the 3D version is not super elegant
+
+def tst_all_auto_thresholds(img):
+    # Apply all thresholding methods and display results
+    fig, ax = filters.try_all_threshold(img, figsize=(8, 5), verbose=False)
+
+    # Show plot
+    plt.show()
+
+def yen_thresholding(img,return_threshold=False):
+    # Apply Yen thresholding method
+    thresh = filters.threshold_yen(img)
+    if return_threshold:
+        return thresh
+    # Apply threshold to image
+    return apply_threshold(img, thresh)
+
+def triangle_threshold(img, return_threshold=False):
+    # Apply triangle thresholding method
+    thresh = filters.threshold_triangle(img)
+    if return_threshold:
+        return thresh
+    # Apply threshold to image
+    return apply_threshold(img, thresh)
+
+def isodata_threshold(img, return_threshold=False):
+    # Apply triangle thresholding method
+    thresh = filters.threshold_isodata(img)
+    # thresh = threshold_otsu(img)
+    if return_threshold:
+        return thresh
+    # Apply threshold to image
+    return apply_threshold(img, thresh)
+
+def otsu_threshold(img, return_threshold=False):
+    # Apply triangle thresholding method
+    # thresh = filters.otsu_threshold(img)
+    thresh = threshold_otsu(img)
+    if return_threshold:
+        return thresh
+    # Apply threshold to image
+    return apply_threshold(img, thresh)
+
+def mean_threshold(img, return_threshold=False):
+    # Apply triangle thresholding method
+    thresh = filters.threshold_mean(img)
+    if return_threshold:
+        return thresh
+    # Apply threshold to image
+    return apply_threshold(img, thresh)
+
+def apply_threshold(img, threshold):
+    # Apply threshold to image
+    binary = img > threshold
+    return binary
+
+def smart_threshold_above(img,max_fraction, increment=0.01):
+    norm = np.copy(img)
+    factor = norm.max()
+    norm= norm/norm.max()
+    # for vvv in range(0,1,increment):
+    threshold = 1.
+    while threshold-increment>0.:
+        if np.count_nonzero(norm>=threshold)/img.size >= max_fraction:
+            return threshold*factor
+        threshold-=increment
+
 
 if __name__ == '__main__':
-    start = timer()
+    from batoolset.img import Img
+    img =Img('/E/Sample_images/cells_escaping_silencing_test_count/Apotome/MAX_IP-ApoTome-01.tif')
+    # img =Img('/E/Sample_images/cells_escaping_silencing_test_count/R1-14,5kb T2A DsRed X2  TgA/R1-14,5kb T2A DsRed X2  TgA 0004/wing_deep.tif')
+    # img =Img('/E/Sample_images/cells_escaping_silencing_test_count/HT 14,5kbT2ADsRed/A5 No Wari 14,5T2A DsRed X1 Female 0001/wing_deep.tif')
+    print(smart_threshold_above(img, 0.36))

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/Position.py

@@ -21,7 +21,7 @@ def sorting_key(obj):
             return ('free','relative') # if the object does not have a position assume it obeys free/relative positioning
 
 def groupby_position(objects):
-    from batoolset.draw.shapes.txt2d import TAText2D
+    from batoolset.drawings.shapes.txt2d import TAText2D
     if isinstance(objects, TAText2D):
         objects = [objects]
     # Sort the objects based on their positions

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/automated_alignment_drawing_refactored.py

@@ -6,8 +6,8 @@ from qtpy.QtGui import QTransform,QPolygon
 from qtpy.QtWidgets import QApplication, QWidget
 from qtpy.QtGui import QPainter, QPen, QBrush, QColor
 from qtpy.QtCore import Qt, QPointF, QRectF,QPoint
-from batoolset.draw.shapes.polyline2d import PolyLine2D
-from batoolset.draw.shapes.transform2D import get_centroid, get_points, Transform2D
+from batoolset.drawings.shapes.polyline2d import PolyLine2D
+from batoolset.drawings.shapes.transform2D import get_centroid, get_points, Transform2D
 
 def compute_translation_corrections(img1, minimal_return=True):
     old_scale = img1.scale

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/circle2d.py

@@ -1,4 +1,4 @@
-from batoolset.draw.shapes.ellipse2d import *
+from batoolset.drawings.shapes.ellipse2d import *
 from batoolset.tools.logger import TA_logger
 
 logger = TA_logger()

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/compute_optimal_size_all_merged.py

@@ -1,4 +1,4 @@
-from batoolset.draw.shapes.rectangle2d import Rectangle2D
+from batoolset.drawings.shapes.rectangle2d import Rectangle2D
 # from PyQt5.QtCore import QRectF, QSizeF
 from qtpy.QtCore import QRectF, QSizeF
 

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/freehand2d.py

@@ -4,10 +4,10 @@ import os
 from qtpy import QtCore
 from qtpy.QtCore import QPointF, Qt
 from qtpy.QtGui import QPainter, QBrush, QPen, QImage, QColor
-# from batoolset.draw.shapes.polygon2d import Polygon2D
+# from batoolset.drawings.shapes.polygon2d import Polygon2D
 # from qtpy.Qt
 # from qtpy.Qt import (QPaintEngine, QPaintDevice,  QTransform, QBrush)
-from batoolset.draw.shapes.polygon2d import Polygon2D
+from batoolset.drawings.shapes.polygon2d import Polygon2D
 
 from batoolset.tools.logger import TA_logger
 logger = TA_logger()

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/group.py

@@ -3,7 +3,7 @@ from batoolset.settings.global_settings import set_UI # set the UI to qtpy
 set_UI()
 import matplotlib.pyplot as plt
 import numpy as np
-# from batoolset.draw.shapes.vectorgraphics2d import VectorGraphics2D
+# from batoolset.drawings.shapes.vectorgraphics2d import VectorGraphics2D
 from batoolset.img import Img
 from batoolset.lists.tools import move_left, move_right, is_iterable
 import random
@@ -11,16 +11,16 @@ import sys
 import traceback
 # this will replace cols or rows and will be able to do both but more flexibly
 from timeit import default_timer as timer
-from batoolset.serialization.tools import create_objects_from_dict
-from batoolset.draw.shapes.image2d import Image2D
-from batoolset.draw.shapes.rectangle2d import Rectangle2D
-from batoolset.draw.shapes.txt2d import TAText2D
+from batoolset.serializations.tools import create_objects_from_dict
+from batoolset.drawings.shapes.image2d import Image2D
+from batoolset.drawings.shapes.rectangle2d import Rectangle2D
+from batoolset.drawings.shapes.txt2d import TAText2D
 from qtpy.QtCore import QRectF, QSizeF,QPointF
 from qtpy.QtWidgets import QApplication
 from qtpy.QtGui import QPainter, QColor, QBrush, QPen, QTransform
 from batoolset.figure.alignment import pack2, align2, align_positions
 from batoolset.tests.tools import are_ratios_almost_equal
-from batoolset.draw.shapes.compute_optimal_size_all_merged import resize_rects_within_total_width, \
+from batoolset.drawings.shapes.compute_optimal_size_all_merged import resize_rects_within_total_width, \
     resize_rects_within_total_height
 
 ORIENTATIONS = ["X","Y"] #,"grid"

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/image2d.py

@@ -5,15 +5,15 @@ from batoolset.luts.lut_minimal_test import PaletteCreator, list_available_luts,
 from batoolset.files.tools import smart_name_parser
 from batoolset.files.tools import get_consolidated_filename_from_parent
 from batoolset.strings.tools import reload_string_list, is_string_a_list_string, find_letter_before_h
-from batoolset.draw.shapes.automated_alignment_drawing_refactored import compute_translation_corrections
-from batoolset.pyqt.tools import check_antialiasing, copy_transform_without_rotation, rotate_image, copy_scale_only, \
+from batoolset.drawings.shapes.automated_alignment_drawing_refactored import compute_translation_corrections
+from batoolset.pyqts.tools import check_antialiasing, copy_transform_without_rotation, rotate_image, copy_scale_only, \
     copy_scale_and_translation_only, crop_image, get_shape_after_rotation_and_crop, tst_translation
-from batoolset.serialization.tools import create_objects_from_dict, object_to_xml
-from batoolset.matplolib.tools import get_fig_rect
+from batoolset.serializations.tools import create_objects_from_dict, object_to_xml
+from batoolset.matplolibs.tools import get_fig_rect
 import os
 import traceback
-from batoolset.draw.shapes.Position import groupby_position, Position
-from batoolset.draw.shapes.rectangle2d import Rectangle2D
+from batoolset.drawings.shapes.Position import groupby_position, Position
+from batoolset.drawings.shapes.rectangle2d import Rectangle2D
 import numpy as np
 import matplotlib.pyplot as plt
 from qtpy import QtGui
@@ -21,12 +21,12 @@ from qtpy.QtGui import QPainter, QColor, QBrush, QPen, QTransform, QFontMetrics,
 from qtpy.QtCore import Qt
 from qtpy.QtSvg import QSvgGenerator
 from qtpy.QtSvg import QSvgRenderer
-from batoolset.draw.shapes.line2d import Line2D
-from batoolset.draw.shapes.point2d import Point2D
+from batoolset.drawings.shapes.line2d import Line2D
+from batoolset.drawings.shapes.point2d import Point2D
 from batoolset.figure.alignment import alignRight, alignLeft, alignTop, alignBottom, alignCenterH, alignCenterV, packY, \
     packX, packYreverse, pack2, packing_modes
-from batoolset.draw.shapes.scalebar import ScaleBar
-from batoolset.draw.shapes.txt2d import TAText2D
+from batoolset.drawings.shapes.scalebar import ScaleBar
+from batoolset.drawings.shapes.txt2d import TAText2D
 
 from batoolset.img import Img, toQimage, RGB_to_BGR, guess_dimensions, max_proj, min_proj, avg_proj
 from qtpy.QtCore import QRectF, QPointF, QSize, QRect

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/point2d.py

@@ -5,7 +5,7 @@ from math import sqrt
 
 from qtpy.QtCore import QRectF
 
-from batoolset.draw.shapes.circle2d import *
+from batoolset.drawings.shapes.circle2d import *
 from batoolset.tools.logger import TA_logger
 logger = TA_logger()
 

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/polygon2d.py

@@ -1,7 +1,7 @@
 from batoolset.settings.global_settings import set_UI # set the UI to qtpy
 set_UI()
 import os
-from batoolset.draw.shapes.tools import rect_intersects_polygon, create_rect_centered_at, qpolygonf_to_list
+from batoolset.drawings.shapes.tools import rect_intersects_polygon, create_rect_centered_at, qpolygonf_to_list
 from qtpy import QtCore
 from qtpy.QtCore import QPointF, Qt
 from qtpy.QtGui import QPolygonF, QTransform

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/polyline2d.py

@@ -6,7 +6,7 @@ from qtpy.QtCore import QPointF, Qt
 from qtpy.QtGui import QPainter, QBrush, QPen, QImage, QColor, QPolygonF
 # from qtpy.Qt
 # from qtpy.Qt import (QPaintEngine, QPaintDevice,  QTransform, QBrush)
-from batoolset.draw.shapes.polygon2d import Polygon2D
+from batoolset.drawings.shapes.polygon2d import Polygon2D
 
 from batoolset.tools.logger import TA_logger
 

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/scalebar.py

@@ -3,9 +3,9 @@ set_UI()
 from qtpy.QtGui import QTransform,QPen, QColor
 from qtpy.QtCore import QPointF
 from batoolset.figure.alignment import pack2, align2, align_positions
-from batoolset.draw.shapes.rectangle2d import Rectangle2D
-from batoolset.draw.shapes.txt2d import TAText2D
-from batoolset.draw.shapes.Position import Position
+from batoolset.drawings.shapes.rectangle2d import Rectangle2D
+from batoolset.drawings.shapes.txt2d import TAText2D
+from batoolset.drawings.shapes.Position import Position
 # logger
 from batoolset.tools.logger import TA_logger
 

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/serializablefont.py

@@ -1,6 +1,6 @@
-from batoolset.draw.shapes.Position import Position
-from batoolset.draw.shapes.txt2d import TAText2D
-from batoolset.pyqt.tools import get_html_text_with_font
+from batoolset.drawings.shapes.Position import Position
+from batoolset.drawings.shapes.txt2d import TAText2D
+from batoolset.pyqts.tools import get_html_text_with_font
 from batoolset.settings.global_settings import set_UI # set the UI to qtpy
 set_UI()
 from qtpy.QtGui import QFont

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/square2d.py

@@ -1,11 +1,10 @@
 import os
-
-from batoolset.draw.shapes.rectangle2d import Rectangle2D
 from batoolset.settings.global_settings import set_UI # set the UI to qtpy
 set_UI()
+from batoolset.drawings.shapes.rectangle2d import Rectangle2D
 from qtpy.QtCore import QPointF
 
-from batoolset.draw.shapes.rect2d import Rect2D
+from batoolset.drawings.shapes.rect2d import Rect2D
 
 from batoolset.tools.logger import TA_logger
 

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/transform2D.py

@@ -1,17 +1,17 @@
 from batoolset.settings.global_settings import set_UI # set the UI to qtpy
 set_UI()
-from batoolset.draw.shapes.freehand2d import Freehand2D
-from batoolset.draw.shapes.polyline2d import PolyLine2D
-from batoolset.serialization.tools import clone_object
+from batoolset.drawings.shapes.freehand2d import Freehand2D
+from batoolset.drawings.shapes.polyline2d import PolyLine2D
+from batoolset.serializations.tools import clone_object
 from qtpy.QtCore import QRectF, QPointF,QPoint
 from qtpy.QtGui import QTransform, QPolygonF,QPolygon
 import numpy as np
-from batoolset.draw.shapes import polyline2d, freehand2d
-from batoolset.draw.shapes.ellipse2d import Ellipse2D
-from batoolset.draw.shapes.line2d import Line2D
-from batoolset.draw.shapes.point2d import Point2D
-from batoolset.draw.shapes.polygon2d import Polygon2D
-from batoolset.draw.shapes.rectangle2d import Rectangle2D
+from batoolset.drawings.shapes import polyline2d, freehand2d
+from batoolset.drawings.shapes.ellipse2d import Ellipse2D
+from batoolset.drawings.shapes.line2d import Line2D
+from batoolset.drawings.shapes.point2d import Point2D
+from batoolset.drawings.shapes.polygon2d import Polygon2D
+from batoolset.drawings.shapes.rectangle2d import Rectangle2D
 
 
 def translated(shape, point):

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/shapes/txt2d.py

@@ -1,9 +1,9 @@
 # TODO allow text for be written at an angle and determine it size then
 from batoolset.settings.global_settings import set_UI # set the UI to qtpy
 set_UI()
-from batoolset.pyqt.tools import get_painter_transform_and_rotation
-from batoolset.draw.shapes.textorientation import get_angle
-from batoolset.draw.shapes.Position import Position
+from batoolset.pyqts.tools import get_painter_transform_and_rotation
+from batoolset.drawings.shapes.textorientation import get_angle
+from batoolset.drawings.shapes.Position import Position
 from qtpy import QtCore
 from qtpy.QtCore import QRect
 from qtpy.QtGui import QTextDocument, QTextOption
@@ -13,7 +13,7 @@ import sys
 from qtpy import QtGui
 from qtpy.QtCore import Qt
 from qtpy.QtWidgets import QApplication
-from batoolset.draw.shapes.rectangle2d import Rectangle2D
+from batoolset.drawings.shapes.rectangle2d import Rectangle2D
 # log errors
 from batoolset.tools.logger import TA_logger
 logger = TA_logger()

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/widgets/col.py

@@ -3,7 +3,7 @@
 import os
 from batoolset.settings.global_settings import set_UI # set the UI to qtpy
 set_UI()
-from batoolset.draw.shapes.rect2d import Rect2D
+from batoolset.drawings.shapes.rect2d import Rect2D
 from qtpy.QtCore import QPointF, QRectF
 # logger
 from batoolset.tools.logger import TA_logger
@@ -220,7 +220,7 @@ class col(Rect2D):
         painter.restore()
 
 if __name__ == '__main__':
-    from batoolset.draw.shapes.image2d import Image2D  # KEEP Really required to avoid circular imports
+    from batoolset.drawings.shapes.image2d import Image2D  # KEEP Really required to avoid circular imports
 
     img1 = Image2D('/E/Sample_images/counter/00.png')
     img2 = Image2D('/E/Sample_images/counter/01.png')

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/widgets/image_group.py

@@ -1,7 +1,7 @@
 import os
 from batoolset.settings.global_settings import set_UI # set the UI to qtpy
 set_UI()
-from batoolset.draw.shapes.rect2d import Rect2D
+from batoolset.drawings.shapes.rect2d import Rect2D
 from qtpy.QtCore import QPointF, QRectF
 from deprecated import deprecated
 # logger

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/widgets/image_organizer.py

@@ -64,7 +64,7 @@ def packY(things_to_align, space=3):
         img = things_to_align[i]
         print('2',img)
         if isinstance(img, list):
-            from batoolset.draw.widgets.image_group import group
+            from batoolset.drawings.widgets.image_group import group
             img = group(*img)
         # should I create a row of objects in fact I need a group and move everything with that --> TODO --> maybe
         if i != 0:

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/widgets/paint.py

@@ -5,7 +5,7 @@ from qtpy.QtCore import QRect, QTimer
 from qtpy.QtGui import QPixmap
 from qtpy.QtWidgets import QWidget
 
-from batoolset.draw.widgets.vectorial import VectorialDrawPane
+from batoolset.drawings.widgets.vectorial import VectorialDrawPane
 from qtpy.QtWidgets import QMenu, QApplication
 from qtpy import QtCore, QtGui
 

{batoolset-0.1.7/batoolset/draw → batoolset-0.1.8/batoolset/drawings}/widgets/vectorial.py

@@ -3,22 +3,21 @@
 
 
 import os
-
-from batoolset.draw.shapes.txt2d import TAText2D
-from batoolset.pyqt.tools import getCtrlModifier
 from batoolset.settings.global_settings import set_UI # set the UI to qtpy
 set_UI()
+from batoolset.drawings.shapes.txt2d import TAText2D
+from batoolset.pyqts.tools import getCtrlModifier
 from qtpy import QtCore
-from batoolset.draw.shapes.polygon2d import Polygon2D
-from batoolset.draw.shapes.line2d import Line2D
-from batoolset.draw.shapes.rect2d import Rect2D
-from batoolset.draw.shapes.square2d import Square2D
-from batoolset.draw.shapes.ellipse2d import Ellipse2D
-from batoolset.draw.shapes.circle2d import Circle2D
-from batoolset.draw.shapes.freehand2d import Freehand2D
-from batoolset.draw.shapes.point2d import Point2D
-from batoolset.draw.shapes.polyline2d import PolyLine2D
-from batoolset.draw.shapes.image2d import Image2D
+from batoolset.drawings.shapes.polygon2d import Polygon2D
+from batoolset.drawings.shapes.line2d import Line2D
+from batoolset.drawings.shapes.rect2d import Rect2D
+from batoolset.drawings.shapes.square2d import Square2D
+from batoolset.drawings.shapes.ellipse2d import Ellipse2D
+from batoolset.drawings.shapes.circle2d import Circle2D
+from batoolset.drawings.shapes.freehand2d import Freehand2D
+from batoolset.drawings.shapes.point2d import Point2D
+from batoolset.drawings.shapes.polyline2d import PolyLine2D
+from batoolset.drawings.shapes.image2d import Image2D
 from qtpy.QtCore import QPointF, QRectF
 from batoolset.tools.logger import TA_logger # logging
 logger = TA_logger()

{batoolset-0.1.7 → batoolset-0.1.8}/batoolset/figure/alignment.py

@@ -9,7 +9,7 @@ set_UI()
 from deprecated import deprecated
 from qtpy.QtCore import QRectF
 
-from batoolset.draw.shapes.point2d import Point2D
+from batoolset.drawings.shapes.point2d import Point2D
 from batoolset.tools.logger import TA_logger
 import numpy as np
 
@@ -231,7 +231,7 @@ packing_modes = ['X','Y', '-X', '-Y']
 #                 last = img.x() + img.width(all=True)
 
 def pack2(space=3, mode=packing_modes[0], extra_border_mode=False, *objects_to_pack): # a cleaned and better version of packX
-    from batoolset.draw.shapes.image2d import Image2D
+    from batoolset.drawings.shapes.image2d import Image2D
 
     # check position
 

{batoolset-0.1.7 → batoolset-0.1.8}/batoolset/figure/column.py

@@ -24,9 +24,9 @@ set_UI()# panel1D --> orientation --> hor/ver
 # panel2D --> more stuff and same size required
 import random
 
-from batoolset.draw.shapes.image2d import Image2D
-from batoolset.draw.shapes.point2d import Point2D
-from batoolset.draw.shapes.rect2d import Rect2D
+from batoolset.drawings.shapes.image2d import Image2D
+from batoolset.drawings.shapes.point2d import Point2D
+from batoolset.drawings.shapes.rect2d import Rect2D
 from qtpy.QtCore import QPointF, QRectF
 # from sympy import nsolve, exp, Symbol
 # logger

{batoolset-0.1.7 → batoolset-0.1.8}/batoolset/figure/fig_tools.py

@@ -225,7 +225,7 @@ def get_common_scaling_factor_taking_incompressibility_into_account(dimensions_i
     return common_scaling
 
 def get_master_bounds2(group_of_shapes):
-    # from batoolset.draw.shapes.group import Group
+    # from batoolset.drawings.shapes.group import Group
     bounds = QRectF()
 
     if group_of_shapes is None:

{batoolset-0.1.7 → batoolset-0.1.8}/batoolset/figure/minimal_debugger_scale_etc.py

@@ -8,7 +8,7 @@
 # can one use words for that
 
 
-from batoolset.draw.shapes.image2d import Image2D
+from batoolset.drawings.shapes.image2d import Image2D
 from batoolset.figure.alignment import packX
 from batoolset.figure.column import Column
 # from batoolset.figure.fig_tools import preview, get_common_scaling_factor

{batoolset-0.1.7 → batoolset-0.1.8}/batoolset/figure/panel.py

@@ -31,7 +31,7 @@
 import os
 from batoolset.settings.global_settings import set_UI # set the UI to qtpy
 set_UI()
-from batoolset.draw.shapes.rect2d import Rect2D
+from batoolset.drawings.shapes.rect2d import Rect2D
 from qtpy.QtCore import QPointF, QRectF
 
 # from batoolset.figure.fig_tools import preview
@@ -337,10 +337,10 @@ class Panel(Rect2D):
                 #     logger.debug('not enough images so adding empty images with same size as last entry')
                 #     row += Image2D(width=last_size.width(), height=last_size.height())
             if row is not None and not len(row) == 0:
-                from batoolset.draw.widgets.image_organizer import packX
+                from batoolset.drawings.widgets.image_organizer import packX
                 # packing seems correct then need align top
                 packX(row, self.space) # ça ça marche
-                from batoolset.draw.widgets.image_organizer import alignTop
+                from batoolset.drawings.widgets.image_organizer import alignTop
                 alignTop(row) # ça ça marche
                 # seems ok too
 
@@ -355,10 +355,10 @@ class Panel(Rect2D):
         print('fig len', len(fig))  # --> ok
         #     logger.error('empty panel created there has to be an error somewhere')
 
-        from batoolset.draw.widgets.image_organizer import packY
+        from batoolset.drawings.widgets.image_organizer import packY
         # not necessarily that by the way
         # packY(fig, space=self.space)
-        from batoolset.draw.widgets.image_organizer import sameHeight
+        from batoolset.drawings.widgets.image_organizer import sameHeight
 
         # required
 
@@ -367,7 +367,7 @@ class Panel(Rect2D):
         sameHeight(self.images, space=self.space) # bug here
         print('arfter same height', self.boundingRect())
 
-        from batoolset.draw.widgets.image_group import group
+        from batoolset.drawings.widgets.image_group import group
         if self.width() != 0:
             group(*self.images).setToWidth(self.width())
         if self.height() !=0:
@@ -412,7 +412,7 @@ class Panel(Rect2D):
         # maybe bug is just because of not properly handling set to with and set to height
 
         # why the hell do I have a figure in panel really need to recode that
-        from batoolset.draw.widgets.col import col
+        from batoolset.drawings.widgets.col import col
         fig = col(space=self.space)
         self.rows=[]
 
@@ -502,7 +502,7 @@ class Panel(Rect2D):
     #     return extra_space
 
 if __name__ == '__main__':
-    from batoolset.draw.shapes.image2d import Image2D  # KEEP Really required to avoid circular imports
+    from batoolset.drawings.shapes.image2d import Image2D  # KEEP Really required to avoid circular imports
 
     img0 = Image2D('/E/Sample_images/counter/00.png')
     # img0.setLetter(TAText2D(