molde 0.1.2__tar.gz → 0.1.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: molde
-Version: 0.1.2
+Version: 0.1.4
 Summary: 
 Author: André Fernandes
 Author-email: fpf.andre@gmail.com
@@ -12,8 +12,8 @@ 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: pyqt5 (>=5.15.10,<6.0.0)
-Requires-Dist: pyqt5-qt5 (==5.15.2)
+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/__init__.py

@@ -0,0 +1,12 @@
+from pathlib import Path
+from qtpy.uic import loadUi
+from .colors import Color
+from PySide6.QtCore import QDir
+
+MOLDE_DIR = Path(__file__).parent
+UI_DIR = MOLDE_DIR / "ui_files/"
+
+def load_ui(uifile: str | Path, baseinstance, working_directory: str| Path = None):
+    if working_directory is not None:
+        working_directory = QDir(working_directory)
+    return loadUi(uifile, baseinstance, working_directory)

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

@@ -1,8 +1,8 @@
 import os, sys
-from PyQt5.QtWidgets import QMainWindow, QApplication, QMessageBox, QLineEdit, QTableWidgetItem, QPushButton, QLabel
-from PyQt5.QtGui import QColor
-from PyQt5 import uic
-from PyQt5.QtCore import Qt
+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 time import time
 
 from vtkmodules.vtkFiltersSources import vtkCylinderSource
@@ -20,11 +20,11 @@ class Example(QMainWindow):
         self.current_theme = "light"
 
         self.change_theme_button.clicked.connect(self.change_theme)
-        self.render_widget: CommonRenderWidget
-        self.render_widget.create_axes()
-        self.render_widget.create_scale_bar()
-        self.render_widget.create_color_bar()
-        self.render_widget.set_info_text("Hola\nque\ntal?")
+        # self.render_widget: CommonRenderWidget
+        # self.render_widget.create_axes()
+        # self.render_widget.create_scale_bar()
+        # self.render_widget.create_color_bar()
+        # self.render_widget.set_info_text("Hola\nque\ntal?")
 
         cylinder = vtkCylinderSource()
         cylinder.SetResolution(8)
@@ -32,7 +32,7 @@ class Example(QMainWindow):
         cylinder_mapper.SetInputConnection(cylinder.GetOutputPort())
         cylinder_actor = vtkActor()
         cylinder_actor.SetMapper(cylinder_mapper)
-        self.render_widget.add_actors(cylinder_actor)
+        # self.render_widget.add_actors(cylinder_actor)
 
         self.botao1 = QPushButton()
         self.label = QLabel("Olha o sapooo")
@@ -51,7 +51,7 @@ class Example(QMainWindow):
         else:
             self.current_theme = "light"
         
-        self.render_widget.set_theme(self.current_theme)
+        # self.render_widget.set_theme(self.current_theme)
         stylesheets.set_theme(self.current_theme)
     
     def closeEvent(self, event):

{molde-0.1.2 → molde-0.1.4}/molde/actors/common_symbols_actor.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 
 from molde import Color
+from molde.utils import transform_polydata
 from vtkmodules.vtkCommonCore import (
     vtkDoubleArray,
     vtkIntArray,
@@ -27,8 +28,20 @@ class CommonSymbolsActor(vtkActor):
         self._shapes: dict[str, vtkPolyData] = dict()
         self._symbols: list[Symbol] = list()
 
-    def register_shape(self, name: str, shape: vtkPolyData):
-        self._shapes[name] = shape
+    def register_shape(
+        self,
+        name: str,
+        shape: vtkPolyData,
+        position: Triple = (0, 0, 0),
+        rotation: Triple = (0, 0, 0),
+        scale: Triple = (1, 1, 1),
+    ):
+        self._shapes[name] = transform_polydata(
+            shape,
+            position,
+            rotation,
+            scale,
+        )
 
     def add_symbol(
         self,
@@ -96,6 +109,18 @@ class CommonSymbolsActor(vtkActor):
         self.data.GetPointData().AddArray(scales)
         self.data.GetPointData().SetScalars(colors)
 
+    def set_zbuffer_offsets(self, factor: float, units: float):
+        """
+        This functions is usefull to make a object appear in front of the others.
+        If the object should never be hidden, the parameters should be set to
+        factor = 1 and offset = -66000.
+        """
+        self.mapper.SetResolveCoincidentTopologyToPolygonOffset()
+        self.mapper.SetRelativeCoincidentTopologyLineOffsetParameters(factor, units)
+        self.mapper.SetRelativeCoincidentTopologyPolygonOffsetParameters(factor, units)
+        self.mapper.SetRelativeCoincidentTopologyPointOffsetParameter(units)
+        self.mapper.Update()
+
 
 class CommonSymbolsActorFixedSize(CommonSymbolsActor):
     def build(self):
@@ -136,13 +161,4 @@ class CommonSymbolsActorVariableSize(CommonSymbolsActor):
         self.mapper.SetScalarModeToUsePointData()
         self.mapper.SetOrientationModeToDirection()
 
-        # shows the actor in front of everything else
-        # offset = -66000
-        offset = 0
-        factor = 1.3
-        self.mapper.SetResolveCoincidentTopologyToPolygonOffset()
-        self.mapper.SetRelativeCoincidentTopologyLineOffsetParameters(factor, offset)
-        self.mapper.SetRelativeCoincidentTopologyPolygonOffsetParameters(factor, offset)
-        self.mapper.SetRelativeCoincidentTopologyPointOffsetParameter(offset)
-
         self.mapper.Update()

{molde-0.1.2 → molde-0.1.4}/molde/colors/color.py

@@ -1,5 +1,5 @@
 import typing
-from PyQt5.QtGui import QColor
+from qtpy.QtGui import QColor
 import numpy as np
 
 
@@ -35,6 +35,12 @@ class Color:
         Initialize the color class with an instance of QColor
         '''
     
+    @typing.overload
+    def __init__(self, color: "Color"):
+        '''
+        Initialize the color class with an instance it's own class
+        '''
+    
     @typing.overload
     def __init__(self):
         '''
@@ -54,6 +60,9 @@ class Color:
         
         elif len(args) == 1 and isinstance(args[0], QColor):
             self.from_qcolor(*args)
+        
+        elif len(args) == 1 and isinstance(args[0], Color):
+            self.from_color(*args)
 
         elif len(args) in [3, 4] and all_int:
             self.from_rgba(*args)
@@ -98,6 +107,13 @@ class Color:
     def from_qcolor(self, color: QColor) -> "Color":
         return self.from_rgba(color.red(), color.green(), color.blue(), color.alpha())
 
+    def from_color(self, color: "Color"):
+        self.r = color.r
+        self.g = color.g
+        self.b = color.b
+        self.a = color.a
+        return self
+
     def to_rgb(self) -> tuple[int, int, int]:
         return (self.r, self.g, self.b)
 
@@ -118,3 +134,17 @@ class Color:
 
     def to_qt(self) -> QColor:
         return QColor(self.r, self.g, self.b, self.a)
+
+    def copy(self):
+        return Color(self.r, self.g, self.b, self.a)
+    
+    def apply_factor(self, factor: float|int):
+        new_color = self.copy()
+        new_color.r = int(np.clip(self.r*factor, 0, 255))
+        new_color.g = int(np.clip(self.g*factor, 0, 255))
+        new_color.b = int(np.clip(self.b*factor, 0, 255))
+
+        return new_color
+
+
+        

{molde-0.1.2 → molde-0.1.4}/molde/poly_data/__init__.py

@@ -11,9 +11,3 @@ from .simple_shapes import (
     create_cone_source,
     create_cube_source,
 )
-
-from .complex_shapes import (
-    create_spring_source,
-    create_damper_source,
-    create_mass_source,
-)

{molde-0.1.2 → molde-0.1.4}/molde/poly_data/arrows.py

@@ -1,6 +1,6 @@
 from vtkmodules.vtkFiltersSources import vtkArrowSource
 from vtkmodules.vtkFiltersCore import vtkAppendPolyData
-from vibra.utils.polydata_utils import transform_polydata
+from molde.utils.poly_data_utils import transform_polydata
 
 
 def create_arrow_source():

{molde-0.1.2 → molde-0.1.4}/molde/poly_data/simple_shapes.py

@@ -1,4 +1,4 @@
-from vibra.utils.polydata_utils import transform_polydata
+from molde.utils.poly_data_utils import transform_polydata
 from vtkmodules.vtkFiltersSources import (
     vtkConeSource,
     vtkCubeSource,

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

@@ -3,8 +3,8 @@ from threading import Lock
 from typing import Literal
 
 from PIL import Image
-from PyQt5.QtCore import pyqtSignal
-from PyQt5.QtWidgets import QFrame, QStackedLayout
+from qtpy.QtCore import Signal
+from qtpy.QtWidgets import QFrame, QStackedLayout
 from vtkmodules.qt.QVTKRenderWindowInteractor import QVTKRenderWindowInteractor
 from vtkmodules.util.numpy_support import vtk_to_numpy
 from vtkmodules.vtkCommonCore import VTK_FONT_FILE, vtkLookupTable
@@ -40,10 +40,10 @@ class CommonRenderWidget(QFrame):
     A vtk widget must always have a renderer, even if it is empty.
     """
 
-    left_clicked = pyqtSignal(int, int)
-    left_released = pyqtSignal(int, int)
-    right_clicked = pyqtSignal(int, int)
-    right_released = pyqtSignal(int, int)
+    left_clicked = Signal(int, int)
+    left_released = Signal(int, int)
+    right_clicked = Signal(int, int)
+    right_released = Signal(int, int)
 
     def __init__(self, parent=None, *, theme="dark"):
         super().__init__(parent)
@@ -58,22 +58,10 @@ class CommonRenderWidget(QFrame):
 
         self.renderer.ResetCamera()
 
-        self.render_interactor.AddObserver(
-            "LeftButtonPressEvent",
-            self.left_click_press_event
-        )
-        self.render_interactor.AddObserver(
-            "LeftButtonReleaseEvent",
-            self.left_click_release_event
-        )
-        self.render_interactor.AddObserver(
-            "RightButtonPressEvent",
-            self.right_click_press_event
-        )
-        self.render_interactor.AddObserver(
-            "RightButtonReleaseEvent",
-            self.right_click_release_event
-        )
+        self.render_interactor.AddObserver("LeftButtonPressEvent", self.left_click_press_event)
+        self.render_interactor.AddObserver("LeftButtonReleaseEvent", self.left_click_release_event)
+        self.render_interactor.AddObserver("RightButtonPressEvent", self.right_click_press_event)
+        self.render_interactor.AddObserver("RightButtonReleaseEvent", self.right_click_release_event)
 
         layout = QStackedLayout()
         layout.addWidget(self.render_interactor)
@@ -105,7 +93,7 @@ class CommonRenderWidget(QFrame):
 
     def remove_all_actors(self):
         self.remove_actors(*self.get_widget_actors())
-    
+
     def remove_all_props(self):
         self.renderer.RemoveAllViewProps()
 
@@ -158,15 +146,23 @@ class CommonRenderWidget(QFrame):
         image = Image.fromarray(array).transpose(Image.FLIP_TOP_BOTTOM)
         return image
 
-    def get_thumbnail(self):
+    def get_thumbnail(self) -> Image.Image:
         image = self.get_screenshot()
-        return image.thumbnail((512, 512))
+        w, h = image.size
+        s = min(w, h)
+        box = (
+            (w - s) // 2,
+            (h - s) // 2,
+            (w + s) // 2,
+            (h + s) // 2,
+        )
+        return image.crop(box).resize((512, 512))
 
     def save_image(self, path: str | Path):
-        '''
+        """
         Saves the render as an image.
         Supported formats are JPEG, JPG, PNG, BMP, ICO, TIFF, PPM and others.
-        '''
+        """
         image = self.get_screenshot()
         with open(path, "w") as file:
             image.save(file)
@@ -261,7 +257,7 @@ class CommonRenderWidget(QFrame):
         colorbar_title.SetFontFamily(VTK_FONT_FILE)
         colorbar_title.SetFontFile(font_file)
 
-        colorbar_label:vtkTextProperty = self.colorbar_actor.GetLabelTextProperty()
+        colorbar_label: vtkTextProperty = self.colorbar_actor.GetLabelTextProperty()
         colorbar_label.ShadowOff()
         colorbar_label.ItalicOff()
         colorbar_label.BoldOn()

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

@@ -1,5 +1,5 @@
 from typing import Literal
-from PyQt5.QtWidgets import QApplication, QWidget
+from qtpy.QtWidgets import QApplication, QWidget
 from molde import MOLDE_DIR
 from molde.colors import color_names
 
@@ -31,12 +31,12 @@ def get_variables(theme:Literal["light", "dark"] = "light") -> dict:
             "@background": color_names.GRAY_9.to_hex(),
             "@background-variant": color_names.GRAY_8.to_hex(),
 
-            "@input-color": "#F0F0F5",
             "@on-primary": color_names.WHITE.to_hex(),
             "@on-background": color_names.BLACK.to_hex(),
 
             "@border-color": color_names.GRAY_7.to_hex(),
-            "@input-color": color_names.GRAY_9.to_hex(),
+            "@checkbox-border-color": color_names.GRAY_6.to_hex(),
+            "@input-color": color_names.GRAY_8.to_hex(),
 
             "@disabled-background": color_names.GRAY_8.to_hex(),
             "@disabled-color": color_names.GRAY_7.to_hex(),
@@ -72,6 +72,7 @@ def get_variables(theme:Literal["light", "dark"] = "light") -> dict:
             "@on-primary": color_names.WHITE.to_hex(),
 
             "@border-color": color_names.GRAY_2.to_hex(),
+            "@checkbox-border-color": color_names.GRAY_4.to_hex(),
             "@input-color": color_names.GRAY_3.to_hex(),
 
             "@disabled-background": color_names.GRAY_0.to_hex(),

{molde-0.1.2 → molde-0.1.4}/molde/stylesheets/qcheckbox.qss

@@ -2,6 +2,11 @@ QCheckBox {
     padding: 5px 10px;
 }
 
+QCheckBox::indicator {
+    border-radius: 3px;
+    border: 1px solid @checkbox-border-color;
+}
+
 QCheckBox::indicator:checked {
     background-image: url("@check-box-image-icon");
     background-repeat: no-repeat;

{molde-0.1.2 → molde-0.1.4}/molde/stylesheets/qinputs.qss

@@ -3,8 +3,6 @@ QLineEdit, QLineEdit::clear-button, QDoubleSpinBox, QSpinBox, QComboBox {
     border: 1px solid @border-color;
     border-radius: 5px;
     padding: 4px 4px;
-    min-width: 40px;
-    min-height: 15px;
 }
 
 QLineEdit::disabled,
@@ -14,6 +12,12 @@ QSpinBox::disabled {
     color: @disabled-color;
 }
 
+QLineEdit[status=information] {
+    background-color: @disabled-background;
+    border: 0px;
+    color: @on-background;
+}
+
 QSpinBox::up-button,
 QDoubleSpinBox::up-button {
     background-image: url("@arrow-up-image-icon");
@@ -73,7 +77,6 @@ QComboBox::drop-down:disabled {
     background-color: @disabled-background;
 }
 
-QSpinBox,
-QDoubleSpinBox {
-    border: 2px solid @background;
+QComboBox QAbstractItemView::item:hover{
+    background-color: @background-variant;
 }

{molde-0.1.2 → molde-0.1.4}/molde/stylesheets/qlayouts.qss

@@ -9,7 +9,8 @@ QFrame[frameShape="2"] {
 }
 
 QWidget QFrame[frameShape="1"],
-QWidget QFrame[frameShape="2"] {
+QWidget QFrame[frameShape="2"], 
+QWidget QFrame[frameShape="6"] {
     border: 1px solid @border-color;
     border-radius: @border-radius;
     padding: 0;

{molde-0.1.2 → molde-0.1.4}/molde/stylesheets/qpushbutton.qss

@@ -5,7 +5,6 @@ QPushButton {
     border-radius: 5px;
     text-align: center;
     padding: 4px 8px;
-    min-width: 50px;
 }
 
 QPushButton::hover {
@@ -88,4 +87,5 @@ QPushButton[status=danger]::disabled {
 
 QDialogButtonBox QPushButton {
     min-width: 65px;
-}
+}
+

{molde-0.1.2 → molde-0.1.4}/molde/stylesheets/qtabwidget.qss

@@ -22,7 +22,6 @@ QTabBar::tab:hover {
 QTabBar::tab:focus {
     border: 2px solid @primary-darker;
     border-bottom: 3px solid @primary-darker;
-    /* background-color: @primary; */
 }
 
 QTabWidget::pane:focus {

{molde-0.1.2 → molde-0.1.4}/molde/stylesheets/qtoolbar.qss

@@ -31,20 +31,10 @@ QToolBar QComboBox {
     height: 15px;
 }
 
-/* QToolBar QLineEdit:disabled {
-    background-color: @disabled-color;
-    color: rgb(100, 100, 100)
-}
- */
-
 QToolBar QSlider:disabled {
     background-color: @disabled-background;
 }
 
-QToolBar QPushButton {
-    min-width: 0px;
-}
-
 QToolBar QLabel {
     margin: 2px;
 }

{molde-0.1.2 → molde-0.1.4}/molde/utils/__init__.py

@@ -1,5 +1,5 @@
 from .format_sequences import format_long_sequence
-from .poly_data_utils import set_polydata_colors, set_polydata_property
+from .poly_data_utils import set_polydata_colors, set_polydata_property, read_obj_file, read_stl_file, transform_polydata
 from .tree_info import TreeInfo
 
 

molde-0.1.4/molde/utils/poly_data_utils.py

@@ -0,0 +1,66 @@
+from pathlib import Path
+
+from vtkmodules.vtkCommonCore import vtkUnsignedCharArray, vtkUnsignedIntArray
+from vtkmodules.vtkCommonDataModel import vtkPolyData
+from vtkmodules.vtkCommonTransforms import vtkTransform
+from vtkmodules.vtkFiltersGeneral import vtkTransformPolyDataFilter
+from vtkmodules.vtkIOGeometry import vtkOBJReader, vtkSTLReader
+
+
+def set_polydata_colors(data: vtkPolyData, color: tuple) -> vtkUnsignedCharArray:
+    n_cells = data.GetNumberOfCells()
+    cell_colors = vtkUnsignedCharArray()
+    cell_colors.SetName("colors")
+    cell_colors.SetNumberOfComponents(3)
+    cell_colors.SetNumberOfTuples(n_cells)
+    cell_colors.FillComponent(0, color[0])
+    cell_colors.FillComponent(1, color[1])
+    cell_colors.FillComponent(2, color[2])
+    data.GetCellData().SetScalars(cell_colors)
+    return cell_colors
+
+
+def set_polydata_property(
+    data: vtkPolyData, property_data: int, property_name: str
+) -> vtkUnsignedIntArray:
+    n_cells = data.GetNumberOfCells()
+    cell_identifier = vtkUnsignedIntArray()
+    cell_identifier.SetName(property_name)
+    cell_identifier.SetNumberOfTuples(n_cells)
+    cell_identifier.Fill(property_data)
+    data.GetCellData().AddArray(cell_identifier)
+    return cell_identifier
+
+
+def read_obj_file(path: str | Path) -> vtkPolyData:
+    reader = vtkOBJReader()
+    reader.SetFileName(str(path))
+    reader.Update()
+    return reader.GetOutput()
+
+
+def read_stl_file(path: str | Path) -> vtkPolyData:
+    reader = vtkSTLReader()
+    reader.SetFileName(str(path))
+    reader.Update()
+    return reader.GetOutput()
+
+
+def transform_polydata(
+    polydata: vtkPolyData,
+    position=(0, 0, 0),
+    rotation=(0, 0, 0),
+    scale=(1, 1, 1),
+) -> vtkPolyData:
+    transform = vtkTransform()
+    transform.Translate(position)
+    transform.Scale(scale)
+    transform.RotateX(rotation[0])
+    transform.RotateY(rotation[1])
+    transform.RotateZ(rotation[2])
+    transform.Update()
+    transformation = vtkTransformPolyDataFilter()
+    transformation.SetTransform(transform)
+    transformation.SetInputData(polydata)
+    transformation.Update()
+    return transformation.GetOutput()

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "molde"
-version = "0.1.2"
+version = "0.1.4"
 description = ""
 authors = ["André Fernandes <fpf.andre@gmail.com>"]
 readme = "README.md"
@@ -10,10 +10,10 @@ packages = [{ include = "molde" }]
 [tool.poetry.dependencies]
 python = ">=3.10"
 vtk = "^9.3.1"
-pyqt5-qt5 = "5.15.2"
-pyqt5 = "^5.15.10"
 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"

molde-0.1.2/molde/__init__.py

@@ -1,6 +0,0 @@
-from pathlib import Path
-
-from .colors import Color
-
-MOLDE_DIR = Path(__file__).parent
-UI_DIR = MOLDE_DIR / "ui_files/"

molde-0.1.2/molde/poly_data/complex_shapes.py

@@ -1,26 +0,0 @@
-from vibra import SYMBOLS_DIR
-from vibra.utils.polydata_utils import read_obj_file, read_stl_file, transform_polydata
-
-
-def create_spring_source():
-    polydata = read_stl_file(SYMBOLS_DIR / "stl_files/spring_symbol.STL")
-    return transform_polydata(
-        polydata,
-        position=(-1.25, -0.18, 0.18),
-        rotation=(0, 90, 0),
-    )
-
-
-def create_damper_source():
-    polydata = read_obj_file(SYMBOLS_DIR / "structural/lumped_damper.obj")
-    return transform_polydata(
-        polydata,
-        position=(-0.145, 0, 0),
-    )
-
-
-def create_mass_source():
-    return transform_polydata(
-        read_obj_file(SYMBOLS_DIR / "structural/new_lumped_mass.obj"),
-        rotation=(0, -90, 0),
-    )

molde-0.1.2/molde/utils/poly_data_utils.py

@@ -1,25 +0,0 @@
-from vtkmodules.vtkCommonCore import vtkUnsignedCharArray, vtkUnsignedIntArray
-from vtkmodules.vtkCommonDataModel import vtkPolyData
-
-
-def set_polydata_colors(data: vtkPolyData, color: tuple) -> vtkUnsignedCharArray:
-    n_cells = data.GetNumberOfCells()
-    cell_colors = vtkUnsignedCharArray()
-    cell_colors.SetName("colors")
-    cell_colors.SetNumberOfComponents(3)
-    cell_colors.SetNumberOfTuples(n_cells)
-    cell_colors.FillComponent(0, color[0])
-    cell_colors.FillComponent(1, color[1])
-    cell_colors.FillComponent(2, color[2])
-    data.GetCellData().SetScalars(cell_colors)
-    return cell_colors
-
-
-def set_polydata_property(data: vtkPolyData, property_data: int, property_name: str) -> vtkUnsignedIntArray:
-    n_cells = data.GetNumberOfCells()
-    cell_identifier = vtkUnsignedIntArray()
-    cell_identifier.SetName(property_name)
-    cell_identifier.SetNumberOfTuples(n_cells)
-    cell_identifier.Fill(property_data)
-    data.GetCellData().AddArray(cell_identifier)
-    return cell_identifier