Rename library to ImageTopoDec

Noremos · Noremos · commit 8d2c7026eafd · 2024-12-10T11:11:46.000+03:00
diff --git a/PrjBarlib/Tests/bartest.py b/PrjBarlib/Tests/bartest.py
@@ -5,8 +5,8 @@
 
 import os
 
-import raster_barcode as bcc
-import raster_barcode.barplot as bcp
+import ImageTopoDec as bcc
+import ImageTopoDec.barplot as bcp
 import cv2
 
 img = cv2.imread('/Users/sam/Edu/bar/12/1.png', cv2.IMREAD_GRAYSCALE)
diff --git a/PrjBarlib/modules/python/BarcodeProject/ImageTopoDec/__init__.py b/PrjBarlib/modules/python/BarcodeProject/ImageTopoDec/__init__.py
@@ -0,0 +1,3 @@
+# ImageTopoDec/__init__.py
+
+from .barcode import *
diff --git a/PrjBarlib/modules/python/BarcodeProject/ImageTopoDec/barcode.py b/PrjBarlib/modules/python/BarcodeProject/ImageTopoDec/barcode.py
diff --git a/PrjBarlib/modules/python/BarcodeProject/ImageTopoDec/barplot.py b/PrjBarlib/modules/python/BarcodeProject/ImageTopoDec/barplot.py
@@ -37,7 +37,7 @@ def plot_barcode_lines(lines : set[bc.Barline] | bc.Baritem | bc.Barline, name,
 
 	k = 1
 	for line in lines:
-		x_coords = [line.start().getAvgUchar(), line.end.getAvgUchar()]
+		x_coords = [line.start().getAvgUchar(), line.end().getAvgUchar()]
 		heights = [k, k]
 		ax.plot(x_coords, heights, linestyle='-', color=colors[k % len(colors)], linewidth= 1)
 		k += 1
diff --git a/PrjBarlib/modules/python/BarcodeProject/ImageTopoDec/bin_state.py b/PrjBarlib/modules/python/BarcodeProject/ImageTopoDec/bin_state.py
diff --git a/PrjBarlib/modules/python/BarcodeProject/README.md b/PrjBarlib/modules/python/BarcodeProject/README.md
@@ -3,9 +3,9 @@
 
 Example:
 
-	import raster_barcode as bc
-	import raster_barcode.barcode as bcc
-	import raster_barcode.barplot as bcp
+	import ImageTopoDec as bc
+	import ImageTopoDec.barcode as bcc
+	import ImageTopoDec.barplot as bcp
 	import cv2
 
 
diff --git a/PrjBarlib/modules/python/BarcodeProject/ex.py b/PrjBarlib/modules/python/BarcodeProject/ex.py
@@ -12,7 +12,7 @@
 
 # сам модуль
 # sys.path.append('/Users/sam/Edu/library/Barcode/PrjBarlib/build/Python')
-import raster_barcode as bc
+import ImageTopoDec as bc
 import cv2
 
 
diff --git a/PrjBarlib/modules/python/BarcodeProject/raster_barcode/__init__.py b/PrjBarlib/modules/python/BarcodeProject/raster_barcode/__init__.py
diff --git a/PrjBarlib/modules/python/BarcodeProject/setup.py b/PrjBarlib/modules/python/BarcodeProject/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(
-    name="raster_barcode",
+    name="ImageTopoDec",
     version="1.0.0",
     description="Python wrapper for the Barcode library.",
     author="Art A",
@@ -25,7 +25,7 @@
         "matplotlib",
     ],
     package_data={
-        "raster_barcode": [
+        "ImageTopoDec": [
             "libbarpy.so",
             "libbarpy.pyi",
             "libbarpy.pyd"
diff --git a/PrjBarlib/modules/python/BarcodeProject/test.sh b/PrjBarlib/modules/python/BarcodeProject/test.sh
@@ -2,5 +2,5 @@ source ../.venv/bin/activate
 python -m build
 # stubgen -m libbarpy
 pip uninstall -y ImageTopoDec
-pip install dist/raster_barcode-1.0.0-py3-none-any.whl
-ls ../.venv/lib/python3.13/site-packages/raster_barcode
+pip install dist/ImageTopoDec-1.0.0-py3-none-any.whl
+ls ../.venv/lib/python3.13/site-packages/ImageTopoDec
diff --git a/PrjBarlib/modules/python/example.ipynb b/PrjBarlib/modules/python/example.ipynb
@@ -6,8 +6,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import raster_barcode as bc\n",
-    "import raster_barcode.barcode as bcc\n",
+    "import ImageTopoDec as bc\n",
+    "import ImageTopoDec.barcode as bcc\n",
     "import cv2\n",
     "import matplotlib.pyplot as plt"
    ]
@@ -175,7 +175,7 @@
     }
    ],
    "source": [
-    "import raster_barcode.barplot as bcp\n",
+    "import ImageTopoDec.barplot as bcp\n",
     "bcp.plot_barcode_lines(barc, 'test', True)"
    ]
   }
diff --git a/PrjBarlib/modules/python/example.py b/PrjBarlib/modules/python/example.py
@@ -13,8 +13,8 @@
 # сам модуль
 # sys.path.append('/Users/sam/Edu/library/Barcode/PrjBarlib/build/Python')
 
-import raster_barcode as bc
-import raster_barcode.barcode as bcc
+import ImageTopoDec as bc
+import ImageTopoDec.barcode as bcc
 import cv2
 
 
diff --git a/PrjBarlib/modules/python/make_package.bat b/PrjBarlib/modules/python/make_package.bat
@@ -4,7 +4,7 @@ set scriptpath=%~dp0
 
 set BUILD_DIR=%1
 set PYTHON_BIN=%2
-set OUTPUT_DIR=%BUILD_DIR%\BarcodeProject\raster_barcode
+set OUTPUT_DIR=%BUILD_DIR%\BarcodeProject\ImageTopoDec
 
 if "%PYTHON_BIN%"=="" set PYTHON_BIN=python3
 
@@ -27,5 +27,5 @@ py -m build
 @REM %PYTHON_BIN% setup.py bdist_wheel
 
 @REM REM Test install
-@REM pip install dist\raster_barcode-*.whl
+@REM pip install dist\ImageTopoDec-*.whl
 
diff --git a/PrjBarlib/modules/python/make_package.sh b/PrjBarlib/modules/python/make_package.sh
@@ -2,7 +2,7 @@
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 BUILD_DIR="$1"
-OUTPUT_DIR="$1/BarcodeProject/raster_barcode"
+OUTPUT_DIR="$1/BarcodeProject/ImageTopoDec"
 
 PYTHON_BIN="$2"
 if [ -z "$PYTHON_BIN" ]; then
@@ -29,5 +29,5 @@ python -m build
 
 
 # Test install
-# pip install dist/raster_barcode-*.whl
+# pip install dist/ImageTopoDec-*.whl
 
diff --git a/PrjBarlib/premake5.lua b/PrjBarlib/premake5.lua
@@ -184,14 +184,14 @@ project "Barlib"
 		print("Enabling postbuild commands")
 		pythonBin = getPythonNameInDirsro(_OPTIONS["python-version"])
 		projectDir = "%[%{!cfg.targetdir}/BarcodeProject/]"
-		libraryDir =  projectDir .. "/raster_barcode/]"
+		libraryDir =  projectDir .. "/ImageTopoDec/]"
 
 	end
 
 
 	-- pythonBin = "python" .. _OPTIONS["python-version"]
 	-- outProjectDir = "%{!cfg.targetdir}/BarcodeProject/"
-	-- outLibraryDir =  outProjectDir .. "raster_barcode/"
+	-- outLibraryDir =  outProjectDir .. "ImageTopoDec/"
 
 	-- srcPythonModules = "%[%{prj.location}/modules/python/"
 
diff --git a/PrjBarlib/test.sh b/PrjBarlib/test.sh
@@ -2,6 +2,6 @@ rm -rf ./.venv
 python3 -m venv ../.venv
 source ../.venv/bin/activate
 
-pip install ../dist/raster_barcode-*.whl
+pip install ../dist/ImageTopoDec-*.whl
 pip install opencv-python
 python3 modules/python/example.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# ImageTopoDec/__init__.py`
	`2`	`+`
	`3`	`+from .barcode import *`