Enable columns or rows for both directions

Author: mimvoid

spritesheetExporter/spritesheet_exporter.py

@@ -25,7 +25,9 @@ class SpritesheetExporter:
     unique_frames: bool
 
     horizontal: bool
-    size: int
+    columns: int
+    rows: int
+
     start: int
     end: int
 
@@ -261,11 +263,11 @@ def _process_frames(self, src: Document, dest: Document):
 
             # Layers are ordered by when they were added, so using `i` is fine
             if self.horizontal:
-                x_pos = (i % self.size) * width
-                y_pos = (i // self.size) * height
+                x_pos = (i % self.columns) * width
+                y_pos = (i // self.columns) * height
             else:
-                x_pos = (i // self.size) * width
-                y_pos = (i % self.size) * height
+                x_pos = (i // self.rows) * width
+                y_pos = (i % self.rows) * height
 
             layer.move(x_pos, y_pos)
 
@@ -338,29 +340,29 @@ def export(self, debug=False):
         self._copy_frames(doc, sheet)
         num_frames = len(sheet.topLevelNodes())
 
-        if self.size == DEFAULT_SPACE:
-            # Pack the sprites as densely as possible with a square fit
-            self.size = ceil(sqrt(num_frames))
-            columns, rows = self.size, self.size
-        else:
+        if self.columns != DEFAULT_SPACE:
             # Remove empty sprite cells
-            self.size = min(self.size, num_frames)
-
-            columns = self.size
-            rows = ceil(num_frames / columns)
-            if not self.horizontal:
-                columns, rows = rows, columns
+            self.columns = min(self.columns, num_frames)
+            self.rows = ceil(num_frames / self.columns)
+        elif self.rows != DEFAULT_SPACE:
+            self.rows = min(self.rows, num_frames)
+            self.columns = ceil(num_frames / self.rows)
+        else:
+            # Pack the sprites as densely as possible with a square fit
+            size = ceil(sqrt(num_frames))
+            self.columns = size
+            self.rows = size
 
-        sheet.setWidth(columns * width)
-        sheet.setHeight(rows * height)
+        sheet.setWidth(self.columns * width)
+        sheet.setHeight(self.rows * height)
 
         if debug:
             print(
                 f"New document name: {sheet.name()}",
                 f"New document size: {sheet.width()}x{sheet.height()}",
                 f"Number of frames: {num_frames}",
-                f"Columns: {columns}",
-                f"Rows: {rows}",
+                f"Columns: {self.columns}",
+                f"Rows: {self.rows}",
                 sep="\n",
             )
 

spritesheetExporter/ui.py

@@ -10,6 +10,7 @@
     QFormLayout,
     QGridLayout,
     QGroupBox,
+    QButtonGroup,
     QPushButton,
     QFileDialog,
     QSpinBox,
@@ -144,8 +145,9 @@ class SpritePlacement(QFormLayout):
     h_dir = QRadioButton("Horizontal")
     v_dir = QRadioButton("Vertical")
 
-    columns = QSpinBox(value=DEFAULT_SPACE, minimum=DEFAULT_SPACE)
-    rows = QSpinBox(value=DEFAULT_SPACE, minimum=DEFAULT_SPACE)
+    columns = QRadioButton("Columns")
+    rows = QRadioButton("Rows")
+    size = QSpinBox(value=DEFAULT_SPACE, minimum=DEFAULT_SPACE)
 
     def __init__(self):
         super().__init__()
@@ -156,47 +158,42 @@ def __init__(self):
         self.h_dir.setToolTip("Order the sprites horizontally")
         self.v_dir.setToolTip("Order the sprites vertically")
 
-        self.columns.setSpecialValueText("Auto")
-        self.columns.setToolTip("Number of columns in the spritesheet")
+        self.size.setSpecialValueText("Auto")
+        self.size.setToolTip("Number of columns or rows in the spritesheet")
 
-        self.rows.setEnabled(False)
-        self.rows.setSpecialValueText("Auto")
-        self.rows.setToolTip("Number of rows in the spritesheet")
+        self.columns.setChecked(True)
 
-        self.h_dir.toggled.connect(self.toggle_horizontal)
-        self.v_dir.toggled.connect(self.toggle_vertical)
+        dirs = QVBoxLayout()
+        dirs.addWidget(self.h_dir)
+        dirs.addWidget(self.v_dir)
+        dirs_buttons = QButtonGroup()
+        dirs_buttons.addButton(self.h_dir)
+        dirs_buttons.addButton(self.v_dir)
 
-        col_layout = QFormLayout()
-        col_layout.setHorizontalSpacing(4)
-        col_layout.addRow("Columns:", self.columns)
+        sizes = QHBoxLayout()
 
-        row_layout = QFormLayout()
-        row_layout.setHorizontalSpacing(4)
-        row_layout.addRow("Rows:", self.rows)
+        size_buttons_box = QVBoxLayout()
+        size_buttons_box.addWidget(self.columns)
+        size_buttons_box.addWidget(self.rows)
+        size_buttons = QButtonGroup(size_buttons_box)
+        size_buttons.addButton(self.columns)
+        size_buttons.addButton(self.rows)
 
-        field = QGridLayout()
-        field.addWidget(self.h_dir, 0, 0)
-        field.addWidget(self.v_dir, 0, 1)
-        field.addLayout(col_layout, 1, 0)
-        field.addLayout(row_layout, 1, 1)
+        sizes.addLayout(size_buttons_box)
+        sizes.addWidget(self.size)
 
-        self.addRow("Sprite placement:", field)
-
-    def toggle_horizontal(self, checked: bool):
-        self.columns.setEnabled(checked)
-        self.rows.setEnabled(not checked)
-
-    def toggle_vertical(self, checked: bool):
-        self.columns.setEnabled(not checked)
-        self.rows.setEnabled(checked)
+        self.addRow("Sprite placement:", dirs)
+        self.addRow("Spritesheet size:", sizes)
 
     def apply_settings(self, exporter: SpritesheetExporter):
-        if self.h_dir.isChecked():
-            exporter.horizontal = True
-            exporter.size = self.columns.value()
+        exporter.horizontal = self.h_dir.isChecked()
+
+        if self.columns.isChecked():
+            exporter.columns = self.size.value()
+            exporter.rows = DEFAULT_SPACE
         else:
-            exporter.horizontal = False
-            exporter.size = self.rows.value()
+            exporter.columns = DEFAULT_SPACE
+            exporter.rows = self.size.value()
 
 
 class SpinBoxes(QFormLayout):