ncca-ngl 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

ncca/ngl/widgets/__main__.py

@@ -21,7 +21,7 @@ class SimpleDialog(QDialog):
         self.setMinimumWidth(200)
         layout = QGridLayout()
 
-        self.vec2_widget = Vec2Widget("Vec2 Widget", Vec2(1, 2), self)
+        self.vec2_widget = Vec2Widget(self, "Vec2 Widget", Vec2(1, 2))
         self.vec2_widget.set_x_range(-1, 1)
         self.vec2_widget.set_y_range(-2, 2)
         layout.addWidget(self.vec2_widget, 0, 0)
@@ -29,7 +29,7 @@ class SimpleDialog(QDialog):
         layout.addWidget(self.vec2_label, 0, 1)
         self.vec2_widget.valueChanged.connect(self._update_vec2)
 
-        self.vec3_widget = Vec3Widget("Vec3 Widget", Vec3(1, 2, 3), self)
+        self.vec3_widget = Vec3Widget(self, "Vec3 Widget", Vec3(1, 2, 3))
         self.vec3_widget.set_y_range(-2, 2)
         self.vec3_widget.set_z_range(-3, 3)
         layout.addWidget(self.vec3_widget, 1, 0)
@@ -37,7 +37,7 @@ class SimpleDialog(QDialog):
         layout.addWidget(self.vec3_label, 1, 1)
         self.vec3_widget.valueChanged.connect(self._update_vec3)
 
-        self.vec4_widget = Vec4Widget("Vec4 Widget", Vec4(1, 2, 3, 1.0), self)
+        self.vec4_widget = Vec4Widget(self, "Vec4 Widget", Vec4(1, 2, 3, 1.0))
         self.vec4_widget.set_y_range(-2, 2)
         self.vec4_widget.set_z_range(-3, 3)
         layout.addWidget(self.vec4_widget, 2, 0)
@@ -45,15 +45,15 @@ class SimpleDialog(QDialog):
         layout.addWidget(self.vec4_label, 2, 1)
         self.vec4_widget.valueChanged.connect(self._update_vec4)
 
-        self.transform_widget = TransformWidget("Transform Widget", self)
+        self.transform_widget = TransformWidget(self, "Transform Widget")
         layout.addWidget(self.transform_widget, 3, 0)
 
-        self.lookat = LookAtWidget("Look At", parent=self)
+        self.lookat = LookAtWidget(self, "Look At")
         layout.addWidget(self.lookat, 4, 0)
 
-        self.rgb_colour_widget = RGBColourWidget("RGB Colour Widget", 1.0, 0.0, 0.0, self)
+        self.rgb_colour_widget = RGBColourWidget(self, "RGB Colour Widget", 1.0, 0.0, 0.0)
         layout.addWidget(self.rgb_colour_widget, 5, 0)
-        self.rgba_colour_widget = RGBAColourWidget("RGB Colour Widget", 1.0, 0.0, 0.0, 1.0, self)
+        self.rgba_colour_widget = RGBAColourWidget(self, "RGB Colour Widget", 1.0, 0.0, 0.0, 1.0)
         layout.addWidget(self.rgba_colour_widget, 6, 0)
 
         self.setLayout(layout)

ncca/ngl/widgets/lookatwidget.py

@@ -11,7 +11,7 @@ class LookAtWidget(QFrame):
 
     valueChanged = Signal(Mat4)
 
-    def __init__(self, name: str, eye=Vec3(2, 2, 2), look=Vec3(0, 0, 0), parent: QWidget | None = None) -> None:
+    def __init__(self, parent: QWidget | None = None, name: str = "", eye=Vec3(2, 2, 2), look=Vec3(0, 0, 0)) -> None:
         """
         Args:
             name: The name of the widget.
@@ -38,8 +38,8 @@ class LookAtWidget(QFrame):
         content_layout = QVBoxLayout(self._content_widget)
         content_layout.setContentsMargins(0, 0, 0, 0)
 
-        self._eye = Vec3Widget("Eye", eye, self)
-        self._look = Vec3Widget("Look", look, self)
+        self._eye = Vec3Widget(self, "Eye", eye)
+        self._look = Vec3Widget(self, "Look", look)
         self._up = QComboBox(self)
         for v in ["y-up", "x-up", "z-up"]:
             self._up.addItem(v)

ncca/ngl/widgets/rgbacolourwidget.py

@@ -22,7 +22,15 @@ class RGBAColourWidget(QFrame):
     bValueChanged = Signal(float)
     aValueChanged = Signal(float)
 
-    def __init__(self, name: str, r: float, g: float, b: float, a: float, parent: QWidget | None = None) -> None:
+    def __init__(
+        self,
+        parent: QWidget | None = None,
+        name: str = "",
+        r: float = 1.0,
+        g: float = 1.0,
+        b: float = 1.0,
+        a: float = 1.0,
+    ) -> None:
         """
         Args:
             name: The name of the widget.

ncca/ngl/widgets/rgbcolourwidget.py

@@ -21,7 +21,9 @@ class RGBColourWidget(QFrame):
     gValueChanged = Signal(float)
     bValueChanged = Signal(float)
 
-    def __init__(self, name: str, r: float, g: float, b: float, parent: QWidget | None = None) -> None:
+    def __init__(
+        self, parent: QWidget | None = None, name: str = "", r: float = 1.0, g: float = 1.0, b: float = 1.0
+    ) -> None:
         """
         Args:
             name: The name of the widget.

ncca/ngl/widgets/transformwidget.py

@@ -12,7 +12,7 @@ class TransformWidget(QFrame):
     valueChanged = Signal(Mat4)
     _rotation_order = ["xyz", "yzx", "zxy", "xzy", "yxz", "zyx"]
 
-    def __init__(self, name: str, parent: QWidget | None = None) -> None:
+    def __init__(self, parent: QWidget | None = None, name: str = "") -> None:
         """
         Args:
             name: The name of the widget.
@@ -39,9 +39,9 @@ class TransformWidget(QFrame):
         content_layout = QVBoxLayout(self._content_widget)
         content_layout.setContentsMargins(0, 0, 0, 0)
 
-        self._position = Vec3Widget("Position", Vec3(0.0, 0.0, 0.0), self)
-        self._rotation = Vec3Widget("Rotation", Vec3(0.0, 0.0, 0.0), self)
-        self._scale = Vec3Widget("Scale", Vec3(1.0, 1.0, 1.0), self)
+        self._position = Vec3Widget(self, "Position", Vec3(0.0, 0.0, 0.0))
+        self._rotation = Vec3Widget(self, "Rotation", Vec3(0.0, 0.0, 0.0))
+        self._scale = Vec3Widget(self, "Scale", Vec3(1.0, 1.0, 1.0))
         self._rot_order = QComboBox(self)
         for v in self._rotation_order:
             self._rot_order.addItem(v)
@@ -79,3 +79,21 @@ class TransformWidget(QFrame):
         tx.set_scale(scale.x, scale.y, scale.z)
         print(tx.get_matrix())
         self.valueChanged.emit(tx.get_matrix())
+
+    def name(self) -> str:
+        """
+        Returns:
+            The name of the widget.
+        """
+        return self._name
+
+    def set_name(self, name: str) -> None:
+        """Sets the name of the widget.
+
+        Args:
+            name: The new name of the widget.
+        """
+        self._name = name
+        self._label.setText(name)
+
+    name = Property(str, name, set_name)

ncca/ngl/widgets/vec2widget.py

@@ -11,7 +11,7 @@ class Vec2Widget(QFrame):
     xValueChanged = Signal(float)
     yValueChanged = Signal(float)
 
-    def __init__(self, name: str, value: Vec2 = Vec2(0.0, 0.0), parent: QWidget | None = None) -> None:
+    def __init__(self, parent: QWidget | None = None, name: str = "", value: Vec2 = Vec2(0.0, 0.0)) -> None:
         """
         Args:
             name: The name of the widget.

ncca/ngl/widgets/vec3widget.py

@@ -12,7 +12,7 @@ class Vec3Widget(QFrame):
     yValueChanged = Signal(float)
     zValueChanged = Signal(float)
 
-    def __init__(self, name: str, value: Vec3 = Vec3(0.0, 0.0, 0.0), parent: QWidget | None = None) -> None:
+    def __init__(self, parent: QWidget | None = None, name: str = "", value: Vec3 = Vec3(0.0, 0.0, 0.0)) -> None:
         """
         Args:
             name: The name of the widget.

ncca/ngl/widgets/vec4widget.py

@@ -13,7 +13,7 @@ class Vec4Widget(QFrame):
     zValueChanged = Signal(float)
     wValueChanged = Signal(float)
 
-    def __init__(self, name: str, value: Vec4 = Vec4(0.0, 0.0, 0.0, 1.0), parent: QWidget | None = None) -> None:
+    def __init__(self, parent: QWidget | None = None, name: str = "", value: Vec4 = Vec4(0.0, 0.0, 0.0, 1.0)) -> None:
         """
         Args:
             name: The name of the widget.

{ncca_ngl-0.3.1.dist-info → ncca_ngl-0.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ncca-ngl
-Version: 0.3.1
+Version: 0.3.3
 Summary: A Python version of the NGL graphics library.
 Author: Jon Macey
 Author-email: Jon Macey <jmacey@bournemouth.ac.uk>

{ncca_ngl-0.3.1.dist-info → ncca_ngl-0.3.3.dist-info}/RECORD

@@ -63,20 +63,20 @@ ncca/ngl/vec4.py,sha256=mLl23D-3yAxh7GsP44ilRto-PMqIDxJjcZpNl2MyqGQ,6751
 ncca/ngl/vec4_array.py,sha256=PSJXfG0g2AT4oQCLHiVAP6EC5n7vMXRQy0N1rGvv1iw,3426
 ncca/ngl/widgets/NGLDebug.log,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ncca/ngl/widgets/__init__.py,sha256=KBrwCwgDLIl-eAp0Q5HQcmNkfZ9q6waPC_4A8-g9PG0,413
-ncca/ngl/widgets/__main__.py,sha256=iRqjBJOHBV3MR8cf00hjIKO4rVDuAuwBWvOSnwTwKJo,2736
+ncca/ngl/widgets/__main__.py,sha256=EetuulVqYJV7zxxFXunb12XA6boza7vm5Raayj3UeMI,2729
 ncca/ngl/widgets/glsl/phong.frag,sha256=iP-4cx0Qh7CS4tDbQmSdDX4huW3_XqleQaXdRBAiZ3A,853
 ncca/ngl/widgets/glsl/phong.vert,sha256=3v1dZba9FTS0ly-3rtEYMTiKPGIzfezDjhu-4m4SwDY,333
 ncca/ngl/widgets/glsl/picking.frag,sha256=372ZzBC1KME9i6lmO7yvUnio9YHp7u6wqiV2cGesTxs,100
 ncca/ngl/widgets/glsl/picking.vert,sha256=Bbn2vZ-lk3nD8qfXfIIaxan2V85XkpWUipYRWCMXobw,128
-ncca/ngl/widgets/lookatwidget.py,sha256=SWNuSeWqndgH5nToAmVYPG_LvjcqKFOvxLivEqg4WJ8,3083
+ncca/ngl/widgets/lookatwidget.py,sha256=2o1tFE5d9UgWTtBesnhX8bC84ccGcl5nTXxjKOCiM30,3088
 ncca/ngl/widgets/mat4widget.py,sha256=7vXs5h2EtA6zy3rTpXd8dtlOg2CFeQHlrg4a4F1RMak,202
-ncca/ngl/widgets/rgbacolourwidget.py,sha256=KrMRCtF-IaguHypljPe0fhcrCCybOYTKGsh7W-NZdpY,5319
-ncca/ngl/widgets/rgbcolourwidget.py,sha256=edFfM6aI1IChO5Bbhi4TyyCEOhIPsLFnveCfcgcxCo0,4704
+ncca/ngl/widgets/rgbacolourwidget.py,sha256=dA_Ph7kTtd6ZqSvINt4qCbksMOWrsnT4TeuPfvaw4IQ,5411
+ncca/ngl/widgets/rgbcolourwidget.py,sha256=Z5t_JNUggbCDIpT3kmBtOWXtxrMNJZJxZCBGBOjBFlI,4741
 ncca/ngl/widgets/transformation_widget.py,sha256=qeEYXKEwUVdWBKz3oXiW6kbTm-MyXghoh0rfU7J3yAE,10568
-ncca/ngl/widgets/transformwidget.py,sha256=SepF8BjnyBePpSP2NI7aUzJJLR_l_syKR3FKjC23Ruk,3482
-ncca/ngl/widgets/vec2widget.py,sha256=K8r0DTDsHAP2x_32UzDP60JWiHdsHcYMPdqf2VHsSCs,4325
-ncca/ngl/widgets/vec3widget.py,sha256=fEGFhzPxVieh5wb5k-PYiRbxomTiAfy2BfX6SYD7VvI,4929
-ncca/ngl/widgets/vec4widget.py,sha256=018fKQk9cQtkEf9HHEC4WttchU_ixbeH-DQUWWGGhSo,5626
-ncca_ngl-0.3.1.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-ncca_ngl-0.3.1.dist-info/METADATA,sha256=HHCXj19iCTb0rPkiPbws_2W3J_3OpSDgqCYaVDHF-yg,1596
-ncca_ngl-0.3.1.dist-info/RECORD,,
+ncca/ngl/widgets/transformwidget.py,sha256=_1SdGspsf4pzLHZWY2YG8moK_9KOYKx7xDIK3t9eAnI,3877
+ncca/ngl/widgets/vec2widget.py,sha256=w4GqwuiNewc2UI5PrSn6ZZYEaB_cxkpxGgrpMQ82WsM,4330
+ncca/ngl/widgets/vec3widget.py,sha256=PnmqdQ1j77v0PQC-p4lT3mTQd_Qi2Iwv9XzSP1Mpa7M,4934
+ncca/ngl/widgets/vec4widget.py,sha256=mT7c5paDaRxn-vSv7lbffg7isyD8T-6sUxOUMqJXBZs,5631
+ncca_ngl-0.3.3.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+ncca_ngl-0.3.3.dist-info/METADATA,sha256=CZCLDKRDuVkByNC2H1aDk-rK3IZt1Y0YJfQrhJ2SZ9U,1596
+ncca_ngl-0.3.3.dist-info/RECORD,,