fixed issue wth BND_UUID

mcneel · Feb 6, 2025 · 6e3f378 · 6e3f378
1 parent f92d5a1
commit 6e3f378
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 14 deletions.
diff --git a/src/bindings/bindings.cpp b/src/bindings/bindings.cpp
@@ -112,7 +112,7 @@ BND_TUPLE NullTuple()
 {
 #if defined(ON_PYTHON_COMPILE)
 #if defined(NANOBIND)
-  UNIMPLEMENTED_EXCEPTION;
+  return py::tuple();
 #else
   return py::none();
 #endif

diff --git a/src/bindings/bnd_instance.cpp b/src/bindings/bnd_instance.cpp
@@ -44,12 +44,11 @@ BND_TUPLE BND_InstanceDefinitionGeometry::GetObjectIds() const
   return rc;
 }
 
-//TODO: This function is not working properly due to issues casting from BND_UUID
 std::vector<BND_UUID> BND_InstanceDefinitionGeometry::GetObjectIds2() const
 {
   const ON_SimpleArray<ON_UUID>& list = m_idef->InstanceGeometryIdList();
   int count = list.Count();
-  std::vector<BND_UUID> rc(count);
+  std::vector<BND_UUID> rc;
   for (int i = 0; i < count; i++)
     rc.push_back(ON_UUID_to_Binding(list[i]));
   return rc;

diff --git a/src/bindings/bnd_uuid.cpp b/src/bindings/bnd_uuid.cpp
@@ -23,7 +23,7 @@ ON_UUID Binding_to_ON_UUID(const BND_UUID& id)
 #if !defined(NANOBIND)
   std::string s = py::str(id);
 #else
-  std::string s = py::cast<std::string>(id);
+  std::string s = py::cast<std::string>(id.attr("hex"));
 #endif
   return ON_UuidFromString(s.c_str());
 }

diff --git a/tests/python/test_File3dm_DimStyleTable.py b/tests/python/test_File3dm_DimStyleTable.py
@@ -2,7 +2,6 @@
 import unittest
 
 #objective: to test creating file with bitmaps
-@unittest.skip("BAD CAST")
 class TestFile3dmBitmapTable(unittest.TestCase):
 
     def test_deleteDimStyle(self):

diff --git a/tests/python/test_File3dm_LayerTable.py b/tests/python/test_File3dm_LayerTable.py
@@ -31,8 +31,7 @@ def test_createFileWithLayers(self):
 
         self.assertTrue(qtyLayers == 2 and qtyLayers2 == 2)
 
-#objective: to test creating file with layers and deleting a layer
-    @unittest.skip("BAD CAST")
+    #objective: to test creating file with layers and deleting a layer
     def test_deleteLayer(self):
         file3dm = rhino3dm.File3dm()
         file3dm.ApplicationName = 'python'

diff --git a/tests/python/test_File3dm_MaterialTable.py b/tests/python/test_File3dm_MaterialTable.py
@@ -4,7 +4,6 @@
 #objective: to test creating file with bitmaps
 class TestFile3dmMaterialTable(unittest.TestCase):
 
-    @unittest.skip("BAD CAST")
     def test_deleteMaterial(self):
         file3dm = rhino3dm.File3dm()
         file3dm.ApplicationName = 'python'

diff --git a/tests/python/test_File3dm_ObjectTable.py b/tests/python/test_File3dm_ObjectTable.py
@@ -88,7 +88,6 @@ def test_negativeIndexing(self) -> None:
         with self.subTest(msg="Test negative indexing"):
             self.assertEqual(file_3dm.Objects[-2].Geometry.Location, rhino3dm.Point3d(0, 0, 0))
 
-    #@unittest.skip("BAD CAST")
     def test_deleteObject(self):
         file3dm = rhino3dm.File3dm()
         file3dm.ApplicationName = 'python'
@@ -105,7 +104,7 @@ def test_deleteObject(self):
 
         qtyObjects = len(file3dm.Objects)
 
-        file3dm.Objects.Delete(str(id1))
+        file3dm.Objects.Delete(id1)
 
         qtyObjects2 = len(file3dm.Objects)
 

diff --git a/tests/python/test_Instance.py b/tests/python/test_Instance.py
@@ -1,18 +1,16 @@
 import unittest
 import rhino3dm
+import uuid
 
 #objective
 class TestInstance(unittest.TestCase):
 
-    @unittest.skip("need to fix UUID interop")
     def test_instanceGetObjectIDs(self):
         file3dm = rhino3dm.File3dm.Read('../models/blocks.3dm')
         instanceDefinition = file3dm.InstanceDefinitions[0]
         ids = instanceDefinition.GetObjectIds2()
         self.assertTrue(type(ids) == list)
-        self.assertTrue(type(ids[0]) == str)
-
-
+        self.assertTrue(type(ids[0]) == uuid.UUID)
 
 if __name__ == '__main__':
     print("running tests")