Add name and metadata explicitly

Signed-off-by: Spencer Magnusson <spencer.magnusson@dreamworks.com>

Author: semagnum

src/opentimelineio/color.cpp

@@ -9,32 +9,36 @@
 namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
 
 Color::Color(
-    double const r,
-    double const g,
-    double const b,
-    double const a)
-    : _r(r),
+    double const         r,
+    double const         g,
+    double const         b,
+    double const         a,
+    std::string const&   name,
+    AnyDictionary const& metadata)
+    : Parent(name, metadata),
+    _r(r),
     _g(g),
     _b(b),
     _a(a) {}
 
-Color::Color(Color const& other) : _r(other.r()),
+Color::Color(Color const& other) : Parent(other.name(), other.metadata()),
+                                   _r(other.r()),
                                    _g(other.g()),
                                    _b(other.b()),
                                    _a(other.a()) {}
 
-const Color Color::pink(1.0, 0.0, 1.0, 1.0);
-const Color Color::red(1.0, 0.0, 0.0, 1.0);
-const Color Color::orange(1.0, 0.5, 0.0, 1.0);
-const Color Color::yellow(1.0, 1.0, 0.0, 1.0);
-const Color Color::green(0.0, 1.0, 0.0, 1.0);
-const Color Color::cyan(0.0, 1.0, 1.0, 1.0);
-const Color Color::blue(0.0, 0.0, 1.0, 1.0);
-const Color Color::purple(0.5, 0.0, 0.5, 1.0);
-const Color Color::magenta(1.0, 0.0, 1.0, 1.0);
-const Color Color::black(0.0, 0.0, 0.0, 1.0);
-const Color Color::white(1.0, 1.0, 1.0, 1.0);
-const Color Color::transparent(0.0, 0.0, 0.0, 0.0);
+const Color Color::pink(1.0, 0.0, 1.0, 1.0, "Pink");
+const Color Color::red(1.0, 0.0, 0.0, 1.0, "Red");
+const Color Color::orange(1.0, 0.5, 0.0, 1.0, "Orange");
+const Color Color::yellow(1.0, 1.0, 0.0, 1.0, "Yellow");
+const Color Color::green(0.0, 1.0, 0.0, 1.0, "Green");
+const Color Color::cyan(0.0, 1.0, 1.0, 1.0, "Cyan");
+const Color Color::blue(0.0, 0.0, 1.0, 1.0, "Blue");
+const Color Color::purple(0.5, 0.0, 0.5, 1.0, "Purple");
+const Color Color::magenta(1.0, 0.0, 1.0, 1.0, "Magenta");
+const Color Color::black(0.0, 0.0, 0.0, 1.0, "Black");
+const Color Color::white(1.0, 1.0, 1.0, 1.0, "White");
+const Color Color::transparent(0.0, 0.0, 0.0, 0.0, "Transparent");
 
 std::string
 Color::to_hex()

src/opentimelineio/color.h

@@ -23,10 +23,13 @@ class Color: public SerializableObjectWithMetadata
 
     using Parent = SerializableObjectWithMetadata;
 
-    Color(double const r = 1.f,
-          double const g = 1.f,
-          double const b = 1.f,
-          double const a = 1.f);
+    Color(
+        double const         r        = 1.f,
+        double const         g        = 1.f,
+        double const         b        = 1.f,
+        double const         a        = 1.f,
+        std::string const&   name     = "Color",
+        AnyDictionary const& metadata = AnyDictionary());
 
     Color(Color const& other);
 

src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp

@@ -206,9 +206,11 @@ static void define_bases2(py::module m) {
     EffectVectorProxy::define_py_class(m, "EffectVector");
 
     py::class_<Color, SOWithMetadata, managing_ptr<Color>>(m, "Color", py::dynamic_attr(), R"docstring(:class:`Color` is a definition of red, green, blue, and alpha double floating point values, allowing conversion between different formats. To be considered interoperable, the sRGB transfer function encoded values, ranging between zero and one, are expected to be accurate to within 1/255 of the intended value. Round-trip conversions may not be guaranteed outside that.)docstring")
-        .def(py::init([](double r, double g, double b, double a) {
-            return new Color(r, g, b, a);
-        }), "r"_a = 1.0, "g"_a = 1.0, "b"_a = 1.0, "a"_a = 1.0)
+        .def(py::init([](double r, double g, double b, double a, std::string name, py::object metadata) {
+            return new Color(r, g, b, a, name, py_to_any_dictionary(metadata));
+        }), "r"_a = 1.0, "g"_a = 1.0, "b"_a = 1.0, "a"_a = 1.0,
+            py::arg_v("name"_a = std::string()),
+            py::arg_v("metadata"_a = py::none()))
         .def_property("r", &Color::r, &Color::set_r)
         .def_property("g", &Color::g, &Color::set_g)
         .def_property("b", &Color::b, &Color::set_b)

src/py-opentimelineio/opentimelineio/schema/color.py

@@ -7,25 +7,31 @@
 
 @add_method(_otio.Color)
 def __str__(self):
-    return 'Color({}, {}, {}, {})'.format(
+    return 'Color({}, ({}, {}, {}, {}), {})'.format(
+        repr(self.name),
         self.r,
         self.g,
         self.b,
         self.a,
+        str(self.metadata)
     )
 
 
 @add_method(_otio.Color)
 def __repr__(self):
     return (
         'otio.schema.Color('
+        'name={}, '
         'r={}, '
         'g={}, '
         'b={}, '
-        'a={})'.format(
+        'a={}, '
+        'metadata={})'.format(
+            repr(self.name),
             repr(self.r),
             repr(self.g),
             repr(self.b),
             repr(self.a),
+            repr(self.metadata)
         )
     )