Skip to content

Commit

Permalink
Cleaned up imports
Browse files Browse the repository at this point in the history
  • Loading branch information
cspang1 committed Oct 24, 2023
1 parent aa9bd0e commit ecb135f
Show file tree
Hide file tree
Showing 10 changed files with 82 additions and 55 deletions.
30 changes: 21 additions & 9 deletions src/asset_editor_scene.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
from math import floor, ceil
import sys
from PyQt5.QtCore import Qt, QRect, QRectF, QEvent, pyqtSlot
from PyQt5.QtGui import QPixmap, QPainter, QImage, QColor, QPen
from PyQt5.QtWidgets import QApplication, QGraphicsView, QGraphicsScene, QWidget, QStyleOptionGraphicsItem, QGraphicsPixmapItem
import math
from PyQt5.QtCore import (
Qt,
QRect,
pyqtSlot
)
from PyQt5.QtGui import (
QPixmap,
QPainter,
QImage,
QColor,
QPen
)
from PyQt5.QtWidgets import (
QGraphicsScene,
QGraphicsPixmapItem
)

class AssetEditorScene(QGraphicsScene):

Expand Down Expand Up @@ -44,10 +56,10 @@ def drawForeground(self, painter, rect):
painter.setRenderHint(QPainter.Antialiasing, True)

rect = QRect(
floor(rect.x()),
floor(rect.y()),
ceil(rect.width() + 8),
ceil(rect.height() + 8)
math.floor(rect.x()),
math.floor(rect.y()),
math.ceil(rect.width() + 8),
math.ceil(rect.height() + 8)
)

# Define grid parameters
Expand Down
7 changes: 5 additions & 2 deletions src/color_palette.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
QInputDialog,
QLineEdit
)
from PyQt5.QtGui import QColor, QImage, QPainter, QPen
from PyQt5.QtCore import Qt, pyqtSlot, pyqtSignal
from PyQt5.QtGui import QColor
from PyQt5.QtCore import (
pyqtSlot,
pyqtSignal
)

from ui.color_palette_ui import (
Ui_color_palette
Expand Down
13 changes: 5 additions & 8 deletions src/color_palette_grid.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot, QRegExp, QEvent, QRect
from PyQt5.QtWidgets import (
QWidget,
QSizePolicy
from PyQt5.QtCore import (
Qt,
pyqtSignal,
pyqtSlot
)
from PyQt5.QtWidgets import QWidget
from PyQt5.QtGui import (
QColor,
QValidator,
QPixmap,
QFont,
QRegExpValidator,
QPainter,
QPen
)
Expand Down
10 changes: 5 additions & 5 deletions src/color_picker_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
from PyQt5.QtWidgets import (
QDialog
)
from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot, QRegExp, QEvent
from PyQt5.QtCore import (
Qt, pyqtSignal,
pyqtSlot,
QRegExp
)
from PyQt5.QtGui import (
QColor,
QValidator,
QPixmap,
QFont,
QRegExpValidator,
QPainter,
QPen,
)
from ui.color_picker_dialog_ui import Ui_color_picker_dialog
from color_data import ColorData
Expand Down
16 changes: 11 additions & 5 deletions src/color_preview.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
from PyQt5.QtGui import QColor, QPainter, QPen, QBrush
from PyQt5.QtWidgets import (
QWidget,
from PyQt5.QtCore import (
Qt,
pyqtSignal,
pyqtSlot
)
# from source import Source
from PyQt5.QtGui import (
QColor,
QPainter,
QPen,
QBrush
)
from PyQt5.QtWidgets import QWidget
from ui.color_preview_ui import Ui_color_preview

class ColorPreview(QWidget, Ui_color_preview):
Expand Down
10 changes: 6 additions & 4 deletions src/editor_view.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import sys
from PyQt5.QtCore import Qt, QRectF, QEvent
from PyQt5.QtGui import QPixmap, QPainter
from PyQt5.QtWidgets import QApplication, QGraphicsView, QGraphicsScene, QWidget, QStyleOptionGraphicsItem
from PyQt5.QtCore import QEvent
from PyQt5.QtWidgets import (
QGraphicsView,
QGraphicsScene,
QStyleOptionGraphicsItem
)

class EditorView(QGraphicsView):
"""QGraphicsView into sprite/tile canvas
Expand Down
13 changes: 4 additions & 9 deletions src/eight_bit_color_grid.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot, QRegExp, QEvent, QRect
from PyQt5.QtWidgets import (
QWidget,
QSizePolicy,
QFrame
from PyQt5.QtCore import (
Qt,
pyqtSignal
)
from PyQt5.QtWidgets import QWidget
from PyQt5.QtGui import (
QColor,
QValidator,
QPixmap,
QFont,
QRegExpValidator,
QPainter,
QPen
)
Expand Down
31 changes: 21 additions & 10 deletions src/map_editor_scene.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
from math import floor, ceil
import sys
from PyQt5.QtCore import Qt, QRect, QRectF, QEvent, pyqtSlot, pyqtSignal
from PyQt5.QtGui import QPixmap, QPainter, QImage, QColor, QPen
from PyQt5.QtWidgets import QApplication, QGraphicsView, QGraphicsScene, QWidget, QStyleOptionGraphicsItem, QGraphicsPixmapItem
from collections import namedtuple
import math
from PyQt5.QtCore import (
Qt,
QRect,
pyqtSlot
)
from PyQt5.QtGui import (
QPixmap,
QPainter,
QImage,
QColor,
QPen
)
from PyQt5.QtWidgets import (
QGraphicsScene,
QGraphicsPixmapItem
)

class MapEditorScene(QGraphicsScene):

Expand Down Expand Up @@ -47,10 +58,10 @@ def drawForeground(self, painter, rect):
painter.setRenderHint(QPainter.Antialiasing, True)

rect = QRect(
floor(rect.x()),
floor(rect.y()),
ceil(rect.width() + 8),
ceil(rect.height() + 8)
math.floor(rect.x()),
math.floor(rect.y()),
math.ceil(rect.width() + 8),
math.ceil(rect.height() + 8)
)

# Define grid parameters
Expand Down
1 change: 0 additions & 1 deletion src/preferences_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
QDialog,
QFileDialog
)
from PyQt5.QtCore import QSettings
from serial.tools import list_ports
from PyQt5.QtCore import pyqtSlot
from ui.preferences_dialog_ui import Ui_preferences_dialog
Expand Down
6 changes: 4 additions & 2 deletions src/tile_map_picker.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
QInputDialog,
QLineEdit
)
from PyQt5.QtGui import QColor, QImage, QPainter, QPen
from PyQt5.QtCore import Qt, pyqtSlot, pyqtSignal
from PyQt5.QtCore import (
pyqtSlot,
pyqtSignal
)

from ui.tile_map_picker import (
Ui_tile_map_picker
Expand Down

0 comments on commit ecb135f

Please sign in to comment.