Create pixutils.formats module

pixutils/__init__.py

@@ -1,4 +0,0 @@
-from __future__ import annotations
-
-from .pixelformats import *
-from .metaformats import *

pixutils/conv/conv.py

@@ -6,8 +6,7 @@
 import numpy as np
 import numpy.typing as npt
 
-from pixutils import PixelFormat
-from pixutils.pixelformats import PixelColorEncoding
+from pixutils.formats import PixelFormat, PixelColorEncoding
 
 from .yuv import yuv_to_bgr888
 from .rgb import rgb_to_bgr888

pixutils/conv/qt.py

@@ -7,8 +7,8 @@
 from __future__ import annotations
 
 from PyQt6 import QtGui
-from pixutils import PixelFormat
-from .conv import PixelFormats, buffer_to_bgr888
+from pixutils.formats import PixelFormat, PixelFormats
+from .conv import buffer_to_bgr888
 
 def bgr888_to_pix(rgb):
     # QImage doesn't seem to like a numpy view

pixutils/conv/raw.py

@@ -5,7 +5,7 @@
 import numpy as np
 import numpy.typing as npt
 
-from pixutils import PixelFormat
+from pixutils.formats import PixelFormat
 
 __all__ = [ 'raw_to_bgr888' ]
 

pixutils/conv/rgb.py

@@ -4,7 +4,7 @@
 import numpy as np
 import numpy.typing as npt
 
-from pixutils import PixelFormat, PixelFormats
+from pixutils.formats import PixelFormat, PixelFormats
 
 def rgb_to_bgr888(fmt: PixelFormat, w, h, data: npt.NDArray[np.uint8]):
     if fmt == PixelFormats.RGB888:

pixutils/conv/yuv.py

@@ -3,7 +3,8 @@
 
 import numpy as np
 import numpy.typing as npt
-from pixutils import PixelFormats
+
+from pixutils.formats import PixelFormats
 
 YCBCR_VALUES = {
     'bt601': {

pixutils/formats/__init__.py

@@ -0,0 +1,3 @@
+from .pixelformats import *
+from .metaformats import *
+from .fourcc_str import *

tests/test_conv.py

@@ -5,9 +5,8 @@
 import unittest
 import numpy as np
 
-from pixutils import PixelFormats
+from pixutils.formats import PixelFormats, str_to_fourcc
 from pixutils.conv import buffer_to_bgr888
-from pixutils.fourcc_str import str_to_fourcc
 
 TEST_PATH = os.path.dirname(os.path.abspath(__file__))
 

tests/test_dummy.py

@@ -2,20 +2,20 @@
 
 import unittest
 import pixutils
-import pixutils.fourcc_str
+import pixutils.formats
 
 class TestDummy(unittest.TestCase):
     def test_dummy(self):
-        self.assertEqual(pixutils.PixelFormats.RGB888.name, 'RGB888')
+        self.assertEqual(pixutils.formats.PixelFormats.RGB888.name, 'RGB888')
 
 class TestFourcc(unittest.TestCase):
     def test_fourcc(self):
-        self.assertEqual(pixutils.fourcc_str.str_to_fourcc('XR24'), 0x34325258)
-        self.assertEqual(pixutils.fourcc_str.fourcc_to_str(0x34325258), 'XR24')
+        self.assertEqual(pixutils.formats.fourcc_str.str_to_fourcc('XR24'), 0x34325258)
+        self.assertEqual(pixutils.formats.fourcc_str.fourcc_to_str(0x34325258), 'XR24')
         with self.assertRaises(ValueError):
-            pixutils.fourcc_str.str_to_fourcc('ABCDE')
+            pixutils.formats.fourcc_str.str_to_fourcc('ABCDE')
         with self.assertRaises(ValueError):
-            pixutils.fourcc_str.str_to_fourcc('ABC')
+            pixutils.formats.fourcc_str.str_to_fourcc('ABC')
 
 if __name__ == '__main__':
     unittest.main()

tests/view.py

@@ -11,10 +11,9 @@
 from PyQt6.QtCore import Qt
 from PyQt6 import QtWidgets
 
-from pixutils import PixelFormats
+from pixutils.formats import PixelFormats, str_to_fourcc
 from pixutils.conv import buffer_to_bgr888
 from pixutils.conv.qt import bgr888_to_pix
-from pixutils.fourcc_str import str_to_fourcc
 
 TEST_PATH = os.path.dirname(os.path.abspath(__file__))