diff --git a/jezyki-skryptowe/image-editor/editor/DialogsPanel.py b/jezyki-skryptowe/image-editor/editor/DialogsPanel.py index a52a911..a9a4628 100644 --- a/jezyki-skryptowe/image-editor/editor/DialogsPanel.py +++ b/jezyki-skryptowe/image-editor/editor/DialogsPanel.py @@ -2,7 +2,7 @@ from PyQt6.QtWidgets import QWidget, QVBoxLayout, QPushButton, QGroupBox from PyQt6.QtCore import pyqtSignal import numpy as np -from dialogs import DIALOGS +from .dialogs import DIALOGS DIALOG_PROPERTY = "dialog" diff --git a/jezyki-skryptowe/image-editor/editor/ImageEditor.py b/jezyki-skryptowe/image-editor/editor/ImageEditor.py index b9ecece..571b981 100644 --- a/jezyki-skryptowe/image-editor/editor/ImageEditor.py +++ b/jezyki-skryptowe/image-editor/editor/ImageEditor.py @@ -1,9 +1,9 @@ from PyQt6.QtWidgets import QVBoxLayout, QHBoxLayout, QWidget, QApplication -import sys +from PyQt6.QtGui import QImage -from ImageCanvas import ImageCanvas -from ImageManagePanel import ImageManagePanel -from DialogsPanel import DialogsPanel +from .ImageCanvas import ImageCanvas +from .ImageManagePanel import ImageManagePanel +from .DialogsPanel import DialogsPanel class ImageEditor(QWidget): def __init__(self): @@ -57,12 +57,3 @@ class ImageEditor(QWidget): self.canvas.updatePixmap(QImage(image.data, width, height, bytes_per_line, QImage.Format.Format_RGB888)) -def main(): - app = QApplication(sys.argv) - editor = ImageEditor() - editor.show() - sys.exit(app.exec()) - - -if __name__ == "__main__": - main() diff --git a/jezyki-skryptowe/image-editor/editor/ImageManagePanel.py b/jezyki-skryptowe/image-editor/editor/ImageManagePanel.py index a0f494a..b990b44 100644 --- a/jezyki-skryptowe/image-editor/editor/ImageManagePanel.py +++ b/jezyki-skryptowe/image-editor/editor/ImageManagePanel.py @@ -3,7 +3,7 @@ from PyQt6.QtGui import QIcon from PyQt6.QtCore import pyqtSignal import numpy as np -from ImageManager import ImageManager +from .ImageManager import ImageManager class ImageManagePanel(QWidget): on_update = pyqtSignal(np.ndarray) on_close = pyqtSignal() diff --git a/jezyki-skryptowe/image-editor/editor/dialogs/BrightnessContrastDialog.py b/jezyki-skryptowe/image-editor/editor/dialogs/BrightnessContrastDialog.py index bf3b207..9a74659 100644 --- a/jezyki-skryptowe/image-editor/editor/dialogs/BrightnessContrastDialog.py +++ b/jezyki-skryptowe/image-editor/editor/dialogs/BrightnessContrastDialog.py @@ -4,7 +4,7 @@ from PyQt6.QtWidgets import QVBoxLayout, QLabel, QSlider from PyQt6.QtCore import Qt from .ImageParameterDialog import ImageParameterDialog -import ImageProcessingWorker +from .. import ImageProcessingWorker class BrightnessContrastDialog(ImageParameterDialog): def __init__(self, image): diff --git a/jezyki-skryptowe/image-editor/editor/dialogs/ColorBalanceDialog.py b/jezyki-skryptowe/image-editor/editor/dialogs/ColorBalanceDialog.py index 56f0318..3bf7fbb 100644 --- a/jezyki-skryptowe/image-editor/editor/dialogs/ColorBalanceDialog.py +++ b/jezyki-skryptowe/image-editor/editor/dialogs/ColorBalanceDialog.py @@ -4,7 +4,7 @@ from PyQt6.QtWidgets import QVBoxLayout, QLabel, QSlider, QHBoxLayout, QGroupBox from PyQt6.QtCore import Qt from .ImageParameterDialog import ImageParameterDialog -import ImageProcessingWorker +from .. import ImageProcessingWorker class ColorBalanceDialog(ImageParameterDialog): def __init__(self, image): diff --git a/jezyki-skryptowe/image-editor/editor/dialogs/FlipDialog.py b/jezyki-skryptowe/image-editor/editor/dialogs/FlipDialog.py index af51104..c95bdf4 100644 --- a/jezyki-skryptowe/image-editor/editor/dialogs/FlipDialog.py +++ b/jezyki-skryptowe/image-editor/editor/dialogs/FlipDialog.py @@ -2,7 +2,7 @@ from PyQt6.QtWidgets import QVBoxLayout, QLabel, QCheckBox import cv2 from .ImageParameterDialog import ImageParameterDialog -import ImageProcessingWorker +from .. import ImageProcessingWorker class FlipDialog(ImageParameterDialog): def __init__(self, image): diff --git a/jezyki-skryptowe/image-editor/editor/dialogs/HCLDialog.py b/jezyki-skryptowe/image-editor/editor/dialogs/HCLDialog.py index 58e3187..004841e 100644 --- a/jezyki-skryptowe/image-editor/editor/dialogs/HCLDialog.py +++ b/jezyki-skryptowe/image-editor/editor/dialogs/HCLDialog.py @@ -2,7 +2,7 @@ import numpy as np from PyQt6.QtWidgets import QLabel, QVBoxLayout, QSlider from PyQt6.QtCore import Qt -import ImageProcessingWorker +from .. import ImageProcessingWorker from .ImageParameterDialog import ImageParameterDialog diff --git a/jezyki-skryptowe/image-editor/editor/dialogs/ResizeDialog.py b/jezyki-skryptowe/image-editor/editor/dialogs/ResizeDialog.py index 57b633b..b5ed521 100644 --- a/jezyki-skryptowe/image-editor/editor/dialogs/ResizeDialog.py +++ b/jezyki-skryptowe/image-editor/editor/dialogs/ResizeDialog.py @@ -4,7 +4,7 @@ import cv2 from PyQt6.QtWidgets import QLabel, QVBoxLayout, QHBoxLayout, QLineEdit, QCheckBox, QComboBox from PyQt6.QtGui import QIntValidator -import ImageProcessingWorker +from .. import ImageProcessingWorker from .ImageParameterDialog import ImageParameterDialog diff --git a/jezyki-skryptowe/image-editor/editor/dialogs/RotationDialog.py b/jezyki-skryptowe/image-editor/editor/dialogs/RotationDialog.py index 77ee8c9..cad33b5 100644 --- a/jezyki-skryptowe/image-editor/editor/dialogs/RotationDialog.py +++ b/jezyki-skryptowe/image-editor/editor/dialogs/RotationDialog.py @@ -1,11 +1,13 @@ from PyQt6.QtWidgets import QLabel, QVBoxLayout, QHBoxLayout, QLineEdit, QCheckBox, QSlider from PyQt6.QtGui import QIntValidator from PyQt6.QtCore import Qt -from .ImageParameterDialog import ImageParameterDialog -import ImageProcessingWorker + import numpy as np import cv2 +from .ImageParameterDialog import ImageParameterDialog +from .. import ImageProcessingWorker + class RotationDialog(ImageParameterDialog): def __init__(self, image): super().__init__(image, ImageProcessingWorker.ImageProcessingWorker) diff --git a/jezyki-skryptowe/image-editor/editor/dialogs/SaturationDialog.py b/jezyki-skryptowe/image-editor/editor/dialogs/SaturationDialog.py index 5d2af01..8839a10 100644 --- a/jezyki-skryptowe/image-editor/editor/dialogs/SaturationDialog.py +++ b/jezyki-skryptowe/image-editor/editor/dialogs/SaturationDialog.py @@ -2,7 +2,7 @@ import numpy as np from PyQt6.QtWidgets import QVBoxLayout, QLabel, QSlider from PyQt6.QtCore import Qt from .ImageParameterDialog import ImageParameterDialog -import ImageProcessingWorker +from .. import ImageProcessingWorker class SaturationDialog(ImageParameterDialog): def __init__(self, image): diff --git a/jezyki-skryptowe/image-editor/editor/dialogs/TemperatureDialog.py b/jezyki-skryptowe/image-editor/editor/dialogs/TemperatureDialog.py index 74f03f0..b1967f1 100644 --- a/jezyki-skryptowe/image-editor/editor/dialogs/TemperatureDialog.py +++ b/jezyki-skryptowe/image-editor/editor/dialogs/TemperatureDialog.py @@ -1,9 +1,10 @@ from PyQt6.QtWidgets import QVBoxLayout, QLabel, QSlider from PyQt6.QtCore import Qt -from .ImageParameterDialog import ImageParameterDialog -import ImageProcessingWorker import numpy as np +from .ImageParameterDialog import ImageParameterDialog +from .. import ImageProcessingWorker + class TemperatureAdjustmentDialog(ImageParameterDialog): def __init__(self, image): super().__init__(image, ImageProcessingWorker.RGBImageProcessingWorker) diff --git a/jezyki-skryptowe/image-editor/editor/image_editor.py b/jezyki-skryptowe/image-editor/editor/image_editor.py new file mode 100644 index 0000000..e916453 --- /dev/null +++ b/jezyki-skryptowe/image-editor/editor/image_editor.py @@ -0,0 +1,12 @@ +import sys +from PyQt6.QtWidgets import QApplication +from .ImageEditor import ImageEditor +def main(): + app = QApplication(sys.argv) + editor = ImageEditor() + editor.show() + sys.exit(app.exec()) + + +if __name__ == "__main__": + main() diff --git a/jezyki-skryptowe/image-editor/setup.py b/jezyki-skryptowe/image-editor/setup.py index 085bf04..b64ee23 100644 --- a/jezyki-skryptowe/image-editor/setup.py +++ b/jezyki-skryptowe/image-editor/setup.py @@ -7,11 +7,11 @@ setup( install_requires=[ "numpy", "opencv-python", - "PyQt6" + "PyQt6==6.4.2" ], entry_points={ 'console_scripts': [ - 'run-image-editor=editor.ImageEditor:main', + 'run-image-editor=editor.image_editor:main', ], }, classifiers=[