Changeset 565 for trunk

Timestamp:

05/11/11 15:07:33 (13 months ago)

Author:

ddangelo

Message:

utils now compile with MacOSX 10.6

Location:

trunk/avango-utils

Files:

• include/avango/utils/MultiValueField.h (modified) (13 diffs)
• include/avango/utils/register_multivaluefield.h (modified) (2 diffs)
• python/SConscript (modified) (1 diff)
• src/MultiValueField.cpp (modified) (1 diff)

trunk/avango-utils/include/avango/utils/MultiValueField.h

@@ -96 +96 @@
        * of the field container using this field.
        */
-      virtual bool valueHasChanged(uint i) const
+      virtual bool valueHasChanged(unsigned int i) const
       {
         return mChangedValues.at(i);
@@ -105 +105 @@
        * Call it in fieldHasChanged() of the field container using this field.
        */
-      virtual std::vector<uint> changedValueInds() const
-      {
-        std::vector<uint> inds;
-
-        for (uint i = 0; i < mChangedValues.size(); i++)
+      virtual std::vector<unsigned int> changedValueInds() const
+      {
+        std::vector<unsigned int> inds;
+
+        for (unsigned int i = 0; i < mChangedValues.size(); i++)
           if (mChangedValues[i])
             inds.push_back(i);
@@ -130 +130 @@
        * passed in v_inds. The new values should be passed in v.
        */
-      virtual void setSomeValues(const ContainerType& v, const std::vector<uint>& v_inds)
-      {
-        for (uint u = 0; u < v_inds.size(); u++)
+      virtual void setSomeValues(const ContainerType& v, const std::vector<unsigned int>& v_inds)
+      {
+        for (unsigned int u = 0; u < v_inds.size(); u++)
           set1Value(v.at(u), v_inds[u], false);
 
@@ -184 +184 @@
        * Or use the method triggerFieldChange().
        */
-      virtual void set1Value(const Value& v, uint i, bool trigger_field_change = true)
+      virtual void set1Value(const Value& v, unsigned int i, bool trigger_field_change = true)
       {
         set1Value(v, i, 0, trigger_field_change);
@@ -192 +192 @@
        * Returns value at position i.
        */
-      virtual const Value get1Value(uint i) const
+      virtual const Value get1Value(unsigned int i) const
       {
         return mValue.at(i);
@@ -200 +200 @@
        * Inserts one value before given position. Caller can decide if this should trigger a fieldChanged().
        */
-      virtual void insert1Value(const Value& v, uint before, bool trigger_field_change = true)
+      virtual void insert1Value(const Value& v, unsigned int before, bool trigger_field_change = true)
       {
         if (before > mValue.size())
@@ -208 +208 @@
         mChangedValues.insert(mChangedValues.begin() + before, true);
 
-        for (uint p = before + 1; p < mChangedValues.size(); p++)
+        for (unsigned int p = before + 1; p < mChangedValues.size(); p++)
           mChangedValues[p] = true;
 
@@ -215 +215 @@
       }
 
-      virtual void erase1Value(uint pos, bool trigger_field_change = true)
+      virtual void erase1Value(unsigned int pos, bool trigger_field_change = true)
       {
         if (pos >= mValue.size())
@@ -223 +223 @@
         mChangedValues.erase(mChangedValues.begin() + pos);
 
-        for (uint p = pos; p < mChangedValues.size(); p++)
+        for (unsigned int p = pos; p < mChangedValues.size(); p++)
           mChangedValues[p] = true;
 
@@ -243 +243 @@
         if (f != mValue.end())
         {
-          uint pos = f - mValue.begin();
+          unsigned int pos = f - mValue.begin();
           mValue.erase(f);
           mChangedValues.erase(mChangedValues.begin() + pos);
 
-          for (uint p = pos; p < mChangedValues.size(); p++)
+          for (unsigned int p = pos; p < mChangedValues.size(); p++)
             mChangedValues[p] = true;
 
@@ -265 +265 @@
 
       /**
-       * Help function for set1Value(const Value&, uint, bool). Needed in the public part since the
+       * Help function for set1Value(const Value&, unsigned int, bool). Needed in the public part since the
        * template specializations of pullValueImpl() use a non-member help function that needs to call it.
        * Should appear in the protected part.
        */
-      virtual void set1Value(const Value& v, uint i, Field* triggered_from, bool trigger_field_change = true)
+      virtual void set1Value(const Value& v, unsigned int i, Field* triggered_from, bool trigger_field_change = true)
       {
         mValue.at(i) = v;
@@ -290 +290 @@
        * Would prefer to have this in the protected part. Needed by non-member help functions.
        */
-      virtual void resize(uint sz)
+      virtual void resize(unsigned int sz)
       {
         mValue.resize(sz);
@@ -442 +442 @@
       MultiValueField<Value> *fromMVField = dynamic_cast<MultiValueField<Value>*>(fromField);
 
-      uint sz = fromMVField->getSize();
+      unsigned int sz = fromMVField->getSize();
       resize(sz);
-      uint last_changed_ind = sz;
-
-      for (uint i = 0; i < sz; i++)
+      unsigned int last_changed_ind = sz;
+
+      for (unsigned int i = 0; i < sz; i++)
       {
         if (fromMVField->valueHasChanged(i))

trunk/avango-utils/include/avango/utils/register_multivaluefield.h

@@ -120 +120 @@
 
         len = boost::python::extract<int>(inds.attr("__len__")());
-        std::vector<uint> inds_list(len);
+        std::vector<unsigned int> inds_list(len);
         for(int i = 0; i != len; ++i)
         {
           boost::python::object indx = inds.attr("__getitem__")(i);
-          inds_list[i] = boost::python::extract<uint>(indx);
+          inds_list[i] = boost::python::extract<unsigned int>(indx);
         }
 
@@ -137 +137 @@
 
       // this declaration is necessary to avoid ambiguities because of function overloading
-      void (Type::*set_1value_fptr)(const typename Type::ValueType&, uint, bool) = &Type::set1Value;
+      void (Type::*set_1value_fptr)(const typename Type::ValueType&, unsigned int, bool) = &Type::set1Value;
 
       boost::python::class_<Type, boost::python::bases<av::Field> >(name.c_str())

trunk/avango-utils/python/SConscript

@@ -31 +31 @@
 avango.build.add_library(env, 'avango-core')
 avango.build.add_library(env, 'avango-osg')
+avango.build.add_library(env, 'avango-core')
+for lib in ['osg', 'osgDB', 'osgGA', 'osgViewer', 'osgParticle', 'osgText', 'osgUtil', 'GL', 'GLU']:
+    avango.build.add_library(env, lib)
 
 lib = env.SharedLibrary("_utils.cpp")

trunk/avango-utils/src/MultiValueField.cpp

@@ -103 +103 @@
     av::utils::MultiValueField<FromType> *fromMVField = dynamic_cast<av::utils::MultiValueField<FromType>*>(fromField);
     AV_ASSERT(fromMVField);
-    uint sz(fromMVField->getSize());
+    unsigned int sz(fromMVField->getSize());
     toMVField->resize(sz);
-    uint last_changed_ind = sz;
-
-    for (uint i = 0; i < sz; i++)
+    unsigned int last_changed_ind = sz;
+
+    for (unsigned int i = 0; i < sz; i++)
     {
       if (fromMVField->valueHasChanged(i))