molde 0.1.4__tar.gz → 0.1.6__tar.gz

{molde-0.1.4 → molde-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: molde
-Version: 0.1.4
+Version: 0.1.6
 Summary: 
 Author: André Fernandes
 Author-email: fpf.andre@gmail.com
@@ -12,7 +12,6 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: moviepy (>=1.0.3,<2.0.0)
 Requires-Dist: numpy (>=2.0,<3.0)
-Requires-Dist: pyside6 (>=6.8.1,<7.0.0) ; python_version >= "3.10" and python_version < "3.14"
 Requires-Dist: qtpy (>=2.4.2,<3.0.0)
 Requires-Dist: vtk (>=9.3.1,<10.0.0)
 Description-Content-Type: text/markdown

{molde-0.1.4 → molde-0.1.6}/molde/__main__.py

@@ -1,22 +1,21 @@
 import os, sys
-from qtpy.QtWidgets import QMainWindow, QApplication, QMessageBox, QLineEdit, QTableWidgetItem, QPushButton, QLabel
-from qtpy.QtGui import QColor
-from qtpy import uic
-from qtpy.QtCore import Qt
+from PySide6.QtWidgets import QMainWindow, QApplication, QMessageBox, QLineEdit, QTableWidgetItem, QPushButton, QLabel, QSlider
+from PySide6.QtGui import QColor
+from PySide6.QtCore import Qt
 from time import time
 
 from vtkmodules.vtkFiltersSources import vtkCylinderSource
 from vtkmodules.vtkRenderingCore import vtkPolyDataMapper, vtkActor
 
-from molde import MOLDE_DIR
+from molde import MOLDE_DIR, load_ui
 from molde import stylesheets
 from molde.render_widgets.common_render_widget import CommonRenderWidget
 
 
 class Example(QMainWindow):
     def __init__(self, parent=None) -> None:
-        super().__init__(parent)
-        uic.loadUi(MOLDE_DIR / "stylesheets/mainwindow.ui", self)
+        super().__init__()
+        load_ui(MOLDE_DIR / "stylesheets/mainwindow.ui", self, MOLDE_DIR / "stylesheets")
         self.current_theme = "light"
 
         self.change_theme_button.clicked.connect(self.change_theme)
@@ -36,9 +35,13 @@ class Example(QMainWindow):
 
         self.botao1 = QPushButton()
         self.label = QLabel("Olha o sapooo")
+        self.slider = QSlider(Qt.Orientation.Horizontal)
+        self.slider.setValue(50)
         self.botao1.setText("Olha a faca")
         self.toolbar_2.addWidget(self.label)
         self.toolbar_2.addWidget(self.botao1)
+        self.toolbar_2.addWidget(self.slider)
+        self.toolbar_2.setDisabled(True)
 
         item = QTableWidgetItem("fr")
         item.setBackground(QColor("#FF0000"))  

{molde-0.1.4 → molde-0.1.6}/molde/interactor_styles/box_selection_style.py

@@ -1,7 +1,8 @@
 import numpy as np
 from vtkmodules.vtkCommonCore import vtkUnsignedCharArray
-
 from .arcball_camera_style import ArcballCameraInteractorStyle
+from vtkmodules.util.numpy_support import vtk_to_numpy, numpy_to_vtk
+
 
 
 class BoxSelectionInteractorStyle(ArcballCameraInteractorStyle):
@@ -42,25 +43,41 @@ class BoxSelectionInteractorStyle(ArcballCameraInteractorStyle):
     def update_selection(self):
         if not self.is_selecting:
             return
-
+        
         size = self.GetInteractor().GetSize()
         min_x, max_x = sorted([self._click_position[0], self._mouse_position[0]])
         min_y, max_y = sorted([self._click_position[1], self._mouse_position[1]])
         min_x, max_x = np.clip([min_x, max_x], 0, size[0])
         min_y, max_y = np.clip([min_y, max_y], 0, size[1])
 
-        # Copy the saved screen state and draw over it
-        selected_pixels = vtkUnsignedCharArray()
-        selected_pixels.DeepCopy(self._saved_pixels)
+        # Copy the saved screen state, transform to numpy and draw over it
+        selected_pixels = (
+            vtk_to_numpy(self._saved_pixels)
+            .reshape(size[1], size[0], 4)
+            .copy()
+        )
 
-        for x in range(min_x, max_x, 2):
-            for y in range(min_y, max_y, 2):
-                pixel = y * size[0] + x
-                selected_pixels.SetTuple(pixel, self.selection_color)
+        # Draw the borders
+        line_width = 2
+        selected_pixels[min_y : min_y + line_width, min_x:max_x] = self.selection_color  # bottom
+        selected_pixels[max_y : max_y + line_width, min_x:max_x] = self.selection_color  # top 
+        selected_pixels[min_y:max_y, min_x : min_x + line_width] = self.selection_color  # left 
+        selected_pixels[min_y:max_y, max_x : max_x + line_width] = self.selection_color  # right
+
+        # Fill the box with a transparent color
+        transparency = 0.3
+        def lerp(a, b, t):
+            return t*a + (1-t) * b
+
+        selected_pixels[min_y:max_y, min_x:max_x] = lerp(
+            np.array(self.selection_color),
+            selected_pixels[min_y:max_y, min_x:max_x],
+            transparency
+        )
 
         renderWindow = self.GetInteractor().GetRenderWindow()
         renderWindow.SetRGBACharPixelData(
-            0, 0, size[0] - 1, size[1] - 1, selected_pixels, 0
+            0, 0, size[0] - 1, size[1] - 1, numpy_to_vtk(selected_pixels.reshape(-1, 4)), 0
         )
         renderWindow.Frame()
 

{molde-0.1.4 → molde-0.1.6}/molde/render_widgets/common_render_widget.py

@@ -164,7 +164,7 @@ class CommonRenderWidget(QFrame):
         Supported formats are JPEG, JPG, PNG, BMP, ICO, TIFF, PPM and others.
         """
         image = self.get_screenshot()
-        with open(path, "w") as file:
+        with open(path, "wb") as file:
             image.save(file)
 
     def create_axes(self):

{molde-0.1.4 → molde-0.1.6}/molde/stylesheets/__init__.py

@@ -40,6 +40,7 @@ def get_variables(theme:Literal["light", "dark"] = "light") -> dict:
 
             "@disabled-background": color_names.GRAY_8.to_hex(),
             "@disabled-color": color_names.GRAY_7.to_hex(),
+            "@alternative-disabled-background" : color_names.GRAY_6.to_hex(),
 
             "@hover-arrow-color":  color_names.GRAY_8.to_hex(),
             "@arrow-up-image-icon": str(MOLDE_DIR / "icons/arrow_up_light_theme.svg").replace("\\", "/"),
@@ -77,6 +78,7 @@ def get_variables(theme:Literal["light", "dark"] = "light") -> dict:
 
             "@disabled-background": color_names.GRAY_0.to_hex(),
             "@disabled-color": color_names.GRAY_4.to_hex(),
+            "@alternative-disabled-background" : color_names.GRAY_2.to_hex(),
 
             "@hover-arrow-color": color_names.GRAY_1.to_hex(),
             "@arrow-up-image-icon": str(MOLDE_DIR / "icons/arrow_up_dark_theme.svg").replace("\\", "/"),

{molde-0.1.4 → molde-0.1.6}/molde/stylesheets/qslider.qss

@@ -27,7 +27,7 @@ QSlider::handle {
 QSlider::sub-page:horizontal:disabled,
 QSlider::add-page:vertical:disabled,
 QSlider::handle:disabled {
-    background: @disabled-background;
+    background: "@alternative-disabled-background";
 }
 
 QSlider::add-page:horizontal,

{molde-0.1.4 → molde-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "molde"
-version = "0.1.4"
+version = "0.1.6"
 description = ""
 authors = ["André Fernandes <fpf.andre@gmail.com>"]
 readme = "README.md"
@@ -13,12 +13,12 @@ vtk = "^9.3.1"
 numpy = "^2.0"
 moviepy = "^1.0.3"
 qtpy = "^2.4.2"
-pyside6 = {version = "^6.8.1", python = ">=3.10,<3.14"}
 
 [tool.poetry.group.dev.dependencies]
 black = "^23.12.1"
 isort = "^5.13.2"
 pytest = "^7.4.4"
+pyside6 = {version = "^6.8.1", python = ">=3.10,<3.14"}
 
 [tool.isort]
 profile = "black"