[core] attribute & desc: Introduce GeometryAttribute & update ShapeAttribute

Author: gregoire-dl

meshroom/core/attribute.py

@@ -11,10 +11,14 @@
     PushButtonParam,
     StringParam,
 )
+from .geometryAttribute import (
+    Geometry,
+    Size2d,
+    Vec2d,
+)
 from .shapeAttribute import (
     Shape,
     ShapeList,
-    Size2d,
     Point2d,
     Line2d,
     Rectangle,

meshroom/core/desc/__init__.py

@@ -0,0 +1,61 @@
+from meshroom.core.desc import GroupAttribute, FloatParam
+
+class Geometry(GroupAttribute):
+    """ 
+    Base attribute for all Geometry attribute.
+    Countains several attributes (inherit from GroupAttribute).
+    """
+    def __init__(self, groupDesc, name, label, description, group="allParams", advanced=False, semantic="",
+                 enabled=True, visible=True, exposed=False):
+        # GroupAttribute constructor
+        super(Geometry, self).__init__(groupDesc=groupDesc, name=name, label=label, description=description,
+                                       group=group, advanced=advanced, semantic=semantic,
+                                       enabled=enabled, visible=visible, exposed=exposed)
+
+    def getInstanceType(self):
+        """ 
+        Return the correct Attribute instance corresponding to the description. 
+        """
+        # Import within the method to prevent cyclic dependencies
+        from meshroom.core.attribute import GeometryAttribute
+        return GeometryAttribute
+    
+class Size2d(Geometry):
+    """
+    Size2d is a Geometry attribute that allows to specify a 2d size.
+    """
+    def __init__(self, name, label, description, width, height, widthRange=None, heightRange=None,
+                 keyable=False, keyType=None, group="allParams", advanced=False, semantic="",
+                 enabled=True, visible=True, exposed=False):
+        # Geometry group desciption
+        groupDesc = [
+            FloatParam(name="width", label="Width", description="Width size.", value=width, range=widthRange,
+                       keyable=keyable, keyType=keyType, group=group, advanced=advanced, 
+                       enabled=enabled, visible=visible, exposed=exposed),
+            FloatParam(name="height", label="Height", description="Height size.", value=height, range=heightRange,
+                       keyable=keyable, keyType=keyType, group=group, advanced=advanced, 
+                       enabled=enabled, visible=visible, exposed=exposed)
+        ]
+        # GeometryAttribute constructor
+        super(Size2d, self).__init__(groupDesc, name, label, description, group=None, advanced=advanced, 
+                                     semantic=semantic, enabled=enabled, visible=visible, exposed=exposed)
+        
+class Vec2d(Geometry):
+    """
+    Vec2d is a Geometry attribute that allows to specify a 2d vector.
+    """
+    def __init__(self, name, label, description, x, y, xRange=None, yRange=None,
+                 keyable=False, keyType=None, group="allParams", advanced=False, semantic="",
+                 enabled=True, visible=True, exposed=False):
+        # Geometry group desciption
+        groupDesc = [
+            FloatParam(name="x", label="X", description="X coordinate.", value=x, range=xRange,
+                       keyable=keyable, keyType=keyType, group=group, advanced=advanced, 
+                       enabled=enabled, visible=visible, exposed=exposed),
+            FloatParam(name="y", label="Y", description="Y coordinate.", value=y, range=yRange,
+                       keyable=keyable, keyType=keyType, group=group, advanced=advanced, 
+                       enabled=enabled, visible=visible, exposed=exposed)
+        ]
+        # GeometryAttribute constructor
+        super(Vec2d, self).__init__(groupDesc, name, label, description, group=None, advanced=advanced, 
+                                     semantic=semantic, enabled=enabled, visible=visible, exposed=exposed)

meshroom/core/desc/geometryAttribute.py

@@ -1,12 +1,21 @@
-from meshroom.core.desc import ListAttribute, GroupAttribute, FloatParam
+from meshroom.core.desc import ListAttribute, GroupAttribute, StringParam, FloatParam, Geometry, Size2d, Vec2d
 
 class Shape(GroupAttribute):
     """ 
     Base attribute for all Shape attribute.
     Countains several attributes (inherit from GroupAttribute).
     """
-    def __init__(self, groupDesc, name, label, description, group="allParams", advanced=False, semantic="",
+    def __init__(self, geometryGroupDesc, name, label, description, group="allParams", advanced=False, semantic="",
                  enabled=True, visible=True, exposed=False):
+        # Shape group desciption
+        groupDesc = [
+            StringParam(name="userName", label="User Name", description="User shape name.", value="",
+                        group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed),
+            StringParam(name="userColor", label="User Color", description="User shape color.", value="#2a82da",
+                        group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed),
+            Geometry(geometryGroupDesc, name="geometry", label="Geometry", description="Shape geometry.", 
+                     group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed)
+        ]
         # GroupAttribute constructor
         super(Shape, self).__init__(groupDesc=groupDesc, name=name, label=label, description=description,
                                     group=group, advanced=advanced, semantic=semantic,
@@ -40,42 +49,23 @@ def getInstanceType(self):
         from meshroom.core.attribute import ShapeListAttribute
         return ShapeListAttribute
 
-class Size2d(Shape):
-    """
-    Size2d is a Shape attribute that allows to specify a 2d size.
-    Note: This attribute is not displayable.
-    """
-    def __init__(self, name, label, description, keyable=False, keyType=None, 
-                 group="allParams", advanced=False, semantic="",
-                 enabled=True, visible=True, exposed=False):
-        # Shape group desciption
-        groupDesc = [
-            FloatParam(name="width", label="Width", description="Width size.", value=-1.0, keyable=keyable, keyType=keyType, 
-                       group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed),
-            FloatParam(name="height", label="Height", description="Height size.", value=-1.0, keyable=keyable, keyType=keyType, 
-                       group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed)
-        ]
-        # ShapeAttribute constructor
-        super(Size2d, self).__init__(groupDesc, name, label, description, group=None, advanced=advanced, semantic=semantic,
-                                      enabled=enabled, visible=visible, exposed=exposed)
-
 class Point2d(Shape):
     """
     Point2d is a Shape attribute that allows to display and modify a 2d point.
     """
     def __init__(self, name, label, description, keyable=False, keyType=None, 
                  group="allParams", advanced=False, semantic="",
                  enabled=True, visible=True, exposed=False):
-        # Shape group desciption
-        groupDesc = [
+        # Geometry group desciption
+        geometryGroupDesc = [
             FloatParam(name="x", label="X", description="X coordinate.", value=-1.0, keyable=keyable, keyType=keyType, 
                        group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed),
             FloatParam(name="y", label="Y", description="Y coordinate.", value=-1.0, keyable=keyable, keyType=keyType, 
                        group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed)
         ]
         # ShapeAttribute constructor
-        super(Point2d, self).__init__(groupDesc, name, label, description, group=None, advanced=advanced, semantic=semantic,
-                                      enabled=enabled, visible=visible, exposed=exposed)
+        super(Point2d, self).__init__(geometryGroupDesc, name, label, description, group=None, advanced=advanced,
+                                      semantic=semantic, enabled=enabled, visible=visible, exposed=exposed)
 
 class Line2d(Shape):
     """
@@ -84,16 +74,16 @@ class Line2d(Shape):
     def __init__(self, name, label, description, keyable=False, keyType=None, 
                  group="allParams", advanced=False, semantic="",
                  enabled=True, visible=True, exposed=False):
-        # Shape group desciption
-        groupDesc = [
-            Point2d(name="a", label="A", description="Line A point.", keyable=keyable, keyType=keyType, 
-                    group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed),
-            Point2d(name="b", label="B", description="Line B point.", keyable=keyable, keyType=keyType, 
-                    group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed)
+        # Geometry group desciption
+        geometryGroupDesc = [
+            Vec2d(name="a", label="A", description="Line A point.", x=-1.0, y=-1.0, keyable=keyable, keyType=keyType, 
+                  group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed),
+            Vec2d(name="b", label="B", description="Line B point.", x=-1.0, y=-1.0, keyable=keyable, keyType=keyType, 
+                  group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed)
         ]
         # ShapeAttribute constructor
-        super(Line2d, self).__init__(groupDesc, name, label, description, group=None, advanced=advanced, semantic=semantic,
-                                      enabled=enabled, visible=visible, exposed=exposed)
+        super(Line2d, self).__init__(geometryGroupDesc, name, label, description, group=None, advanced=advanced,
+                                     semantic=semantic, enabled=enabled, visible=visible, exposed=exposed)
 
 class Rectangle(Shape):
     """
@@ -102,16 +92,18 @@ class Rectangle(Shape):
     def __init__(self, name, label, description, keyable=False, keyType=None, 
                  group="allParams", advanced=False, semantic="",
                  enabled=True, visible=True, exposed=False):
-        # Shape group desciption
-        groupDesc = [
-            Point2d(name="center", label="Center", description="Rectangle center.", keyable=keyable, keyType=keyType, 
-                    group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed),
-            Size2d(name="size", label="Size", description="Rectangle size.", keyable=keyable, keyType=keyType, 
-                    group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed)
+        # Geometry group desciption
+        geometryGroupDesc = [
+            Vec2d(name="center", label="Center", description="Rectangle center.", x=-1.0, y=-1.0, 
+                  keyable=keyable, keyType=keyType, group=group, advanced=advanced, 
+                  enabled=enabled, visible=visible, exposed=exposed),
+            Size2d(name="size", label="Size", description="Rectangle size.", width=-1.0, height=-1.0,
+                   keyable=keyable, keyType=keyType, group=group, advanced=advanced, 
+                   enabled=enabled, visible=visible, exposed=exposed)
         ]
         # ShapeAttribute constructor
-        super(Rectangle, self).__init__(groupDesc, name, label, description, group=None, advanced=advanced, semantic=semantic,
-                                      enabled=enabled, visible=visible, exposed=exposed)
+        super(Rectangle, self).__init__(geometryGroupDesc, name, label, description, group=None, advanced=advanced,
+                                        semantic=semantic, enabled=enabled, visible=visible, exposed=exposed)
 
 class Circle(Shape):
     """
@@ -120,13 +112,15 @@ class Circle(Shape):
     def __init__(self, name, label, description, keyable=False, keyType=None, 
                  group="allParams", advanced=False, semantic="",
                  enabled=True, visible=True, exposed=False):
-        # Shape group desciption
-        groupDesc = [
-            Point2d(name="center", label="Center", description="Circle center.", keyable=keyable, keyType=keyType, 
-                    group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed),
-            FloatParam(name="radius", label="Radius", description="Circle radius.", value=-1.0, keyable=keyable, keyType=keyType, 
-                       group=group, advanced=advanced, enabled=enabled, visible=visible, exposed=exposed)
+        # Geometry group desciption
+        geometryGroupDesc = [
+            Vec2d(name="center", label="Center", description="Circle center.", x=-1.0, y=-1.0, 
+                  keyable=keyable, keyType=keyType, group=group, advanced=advanced, 
+                  enabled=enabled, visible=visible, exposed=exposed),
+            FloatParam(name="radius", label="Radius", description="Circle radius.", value=-1.0, 
+                       keyable=keyable, keyType=keyType, group=group, advanced=advanced, 
+                       enabled=enabled, visible=visible, exposed=exposed)
         ]
         # ShapeAttribute constructor
-        super(Circle, self).__init__(groupDesc, name, label, description, group=None, advanced=advanced, semantic=semantic,
-                                      enabled=enabled, visible=visible, exposed=exposed)
+        super(Circle, self).__init__(geometryGroupDesc, name, label, description, group=None, advanced=advanced,
+                                     semantic=semantic, enabled=enabled, visible=visible, exposed=exposed)

meshroom/core/desc/shapeAttribute.py

@@ -377,49 +377,49 @@ def __init__(self, graph, attribute, key, observation, parent=None):
         self.attrName = attribute.fullName
         self.key = key
         self.observation = observation.toVariant()
-        self.oldObservation = attribute.getObservation(key)
+        self.oldObservation = attribute.geometry.getObservation(key)
         self.setText(f"Set observation for shape attribute '{attribute.fullName}' at key: '{key}'")
 
     def redoImpl(self):
         if self.graph.attribute(self.attrName) is not None:
-            self.graph.attribute(self.attrName).setObservation(self.key, self.observation)
+            self.graph.attribute(self.attrName).geometry.setObservation(self.key, self.observation)
         else:
-            self.graph.internalAttribute(self.attrName).setObservation(self.key, self.observation)
+            self.graph.internalAttribute(self.attrName).geometry.setObservation(self.key, self.observation)
         return True
 
     def undoImpl(self):
         if self.graph.attribute(self.attrName) is not None:
             if self.oldObservation is None:
-                self.graph.attribute(self.attrName).removeObservation(self.key)
+                self.graph.attribute(self.attrName).geometry.removeObservation(self.key)
             else:
-                self.graph.attribute(self.attrName).setObservation(self.key, self.oldObservation)
+                self.graph.attribute(self.attrName).geometry.setObservation(self.key, self.oldObservation)
         else:
             if self.oldObservation is None:
-                self.graph.internalAttribute(self.attrName).removeObservation(self.key)
+                self.graph.internalAttribute(self.attrName).geometry.removeObservation(self.key)
             else:
-                self.graph.internalAttribute(self.attrName).setObservation(self.key, self.oldObservation)
+                self.graph.internalAttribute(self.attrName).geometry.setObservation(self.key, self.oldObservation)
         return True
 
 class RemoveObservationCommand(GraphCommand):
     def __init__(self, graph, attribute, key, parent=None):
         super().__init__(graph, parent)
         self.attrName = attribute.fullName
         self.key = key
-        self.oldObservation = attribute.getObservation(key)
+        self.oldObservation = attribute.geometry.getObservation(key)
         self.setText(f"Remove observation for shape attribute '{attribute.fullName}' at key: '{key}'")
 
     def redoImpl(self):
         if self.graph.attribute(self.attrName) is not None:
-            self.graph.attribute(self.attrName).removeObservation(self.key)
+            self.graph.attribute(self.attrName).geometry.removeObservation(self.key)
         else:
-            self.graph.internalAttribute(self.attrName).removeObservation(self.key)
+            self.graph.internalAttribute(self.attrName).geometry.removeObservation(self.key)
         return True
 
     def undoImpl(self):
         if self.graph.attribute(self.attrName) is not None:
-            self.graph.attribute(self.attrName).setObservation(self.key, self.oldObservation)
+            self.graph.attribute(self.attrName).geometry.setObservation(self.key, self.oldObservation)
         else:
-            self.graph.internalAttribute(self.attrName).setObservation(self.key, self.oldObservation)
+            self.graph.internalAttribute(self.attrName).geometry.setObservation(self.key, self.oldObservation)
         return True
 
 class AddEdgeCommand(GraphCommand):

meshroom/ui/commands.py

@@ -84,16 +84,16 @@ def hasObservation(self, key: str) -> bool:
         label = Property(str, lambda self: self._name, constant=True)
         # The shape type (Point2d, Line2d, Rectangle, Circle, etc.).
         type = Property(str, lambda self: self._type, constant=True)
-        # Whether the shape is keyabale (multiple observations).
-        shapeKeyable = Property(bool,lambda self: self._keyable, constant=True)
         # The shape properties (color, stroke, etc.).
         properties = Property(Variant, lambda self: self._properties, constant=True)
         # The shape current observation.
         observation = Property(Variant, _getObservation, notify=viewIdChanged)
+        # Whether the shape is keyabale (multiple observations).
+        observationKeyable = Property(bool,lambda self: self._keyable, constant=True)
         # The shape list of observation keys.
         observationKeys = Property(Variant, lambda self: [key for key in self._observations], constant=True)
         # The number of observation defined.
-        nbObservations = Property(int, _getNbObservations, constant=True) 
+        nbObservations = Property(int, _getNbObservations, constant=True)
         # Whether the shape is displayable.
         isVisible = Property(bool, _getVisible, _setVisible, notify=visibleChanged)
 

meshroom/ui/components/shapes/shapeFile.py

@@ -19,29 +19,11 @@ Column {
     property var shapeAttribute
     property alias isNeasted: itemHeader.isNeasted
     property alias isLinkChild: itemHeader.isLinkChild
-
-
-    function hasCurrentObservation() {
-        return shapeAttribute ? shapeAttribute.hasObservation(_reconstruction ? _reconstruction.selectedViewId : "-1") : false
-    }
-
-    // Reload hasObservation property
-    // When shape attribute observations changed (signal)
-    Connections {
-        target: shapeAttribute
-        function onObservationsChanged() { itemHeader.hasShapeObservation = hasCurrentObservation() }
-    }
-    // When reconstruction view id changed (signal)
-    Connections {
-        target: _reconstruction
-        function onSelectedViewIdChanged() { itemHeader.hasShapeObservation = hasCurrentObservation() }
-    }
 
     // Item Header
     ItemUtils.ItemHeader {
         id: itemHeader
         model: shapeAttribute
-        hasShapeObservation: hasCurrentObservation()
         isShape: true
         isAttribute: true
     }

meshroom/ui/qml/Shapes/Editor/Items/ShapeAttributeItem.qml

@@ -23,7 +23,6 @@ Column {
     ItemUtils.ItemHeader {
         id: itemHeader
         model: shapeData
-        hasShapeObservation: shapeData.hasObservation(_reconstruction.selectedViewId)
         isShape: true
         isAttribute: false
     }