Changeset 503

Timestamp:

08/03/10 17:08:42 (18 months ago)

Author:

gwesche

Message:

A new multi field type that supports setting and getting individual components. Checked in under utils to test its usefulness and correctness.

Location:

trunk/avango-utils

Files:

• SConscript (modified) (2 diffs)
• include/avango/utils/MultiValueField.h (added)
• include/avango/utils/SConscript (modified) (1 diff)
• include/avango/utils/register_multivaluefield.h (added)
• python/_utils.cpp (modified) (3 diffs)
• src/Init.cpp (modified) (2 diffs)
• src/MultiValueField.cpp (added)
• src/SConscript (modified) (1 diff)
• src/tests (added)
• src/tests/SConscript (added)
• src/tests/TestAvangoUtils.cpp (added)
• src/tests/TestMultiValueFields.cpp (added)
• tests/SConscript (modified) (1 diff)
• tests/TestMultiValueFields.py (added)
• tests/runtests.py (modified) (2 diffs)

trunk/avango-utils/SConscript

@@ -26 +26 @@
 Alias('all', Alias('utils'))
 Alias('check', Alias('check-utils'))
+Alias('check-utils', Alias('check-utils-src'))
 Alias('install', Alias('install-utils'))
 
@@ -33 +34 @@
     'python/SConscript',
     'tests/SConscript',
+    'src/tests/SConscript',
 ])
 

trunk/avango-utils/include/avango/utils/SConscript

@@ -35 +35 @@
     ProximitySensor.h
     Trackball.h
+    MultiValueField.h
+    register_multivaluefield.h
     windows_specific_utils.h
     ''')

trunk/avango-utils/python/_utils.cpp

@@ -35 +35 @@
 #include "../include/avango/utils/Bool3And.h"
 #include "../include/avango/utils/Trackball.h"
+#include "../include/avango/utils/MultiValueField.h"
+#include "../include/avango/utils/register_multivaluefield.h"
 
 #include <iostream>
@@ -139 +141 @@
 }
 
+void init_MultiValueFields()
+{
+  av::python::register_multivaluefield<av::utils::MVFBool>("MVFBool");
+  av::python::register_multivaluefield<av::utils::MVFDouble>("MVFDouble");
+  av::python::register_multivaluefield<av::utils::MVFFloat>("MVFFloat");
+  av::python::register_multivaluefield<av::utils::MVFInt>("MVFInt");
+  av::python::register_multivaluefield<av::utils::MVFLong>("MVFLong");
+  av::python::register_multivaluefield<av::utils::MVFUInt>("MVFUInt");
+  av::python::register_multivaluefield<av::utils::MVFULong>("MVFULong");
+  av::python::register_multivaluefield<av::utils::MVFString>("MVFString");
+
+  // osg related multi value fields
+  av::python::register_multivaluefield<av::utils::MVFMatrix>("MVFMatrix");
+  av::python::register_multivaluefield<av::utils::MVFVec2>("MVFVec2");
+  av::python::register_multivaluefield<av::utils::MVFVec3>("MVFVec3");
+  av::python::register_multivaluefield<av::utils::MVFVec4>("MVFVec4");
+  av::python::register_multivaluefield<av::utils::MVFQuat>("MVFQuat");
+}
+
 BOOST_PYTHON_MODULE(_utils)
 {
@@ -153 +174 @@
 
   def("print_registered_field_containers",print_actual_registered_field_containers);
+
+  av::utils::initMultiValueFields();
+  av::utils::initMultiValueOSGFields();
+  init_MultiValueFields();
 }

trunk/avango-utils/src/Init.cpp

@@ -29 +29 @@
 #include "../include/avango/utils/Bool3And.h"
 #include "../include/avango/utils/Trackball.h"
+#include "../include/avango/utils/MultiValueField.h"
 
 #include <avango/Logger.h>
@@ -50 +51 @@
     av::utils::Bool3And::initClass();
     av::utils::Trackball::initClass();
+    av::utils::initMultiValueFields();
+    av::utils::initMultiValueOSGFields();
 
     AV_TYPED_INIT_ABSTRACT(av::Type::badType(), "av::utils::Init", true);

trunk/avango-utils/src/SConscript

@@ -37 +37 @@
     ProximitySensor.cpp
     Trackball.cpp
+    MultiValueField.cpp
     Init.cpp
     ''')

trunk/avango-utils/tests/SConscript

@@ -35 +35 @@
     TestConverters.py
     TestInterpolators.py
+    TestMultiValueFields.py
     runtests.py
     __init__.py

trunk/avango-utils/tests/runtests.py

@@ -32 +32 @@
 from avango.utils.tests import TestConverters
 from avango.utils.tests import TestInterpolators
+from avango.utils.tests import TestMultiValueFields
 
 if __name__ == '__main__':
@@ -43 +44 @@
         TestConverters.Suite(),
         TestInterpolators.Suite(),
+        TestMultiValueFields.Suite(),
     ]
     alltests = unittest.TestSuite(suites)