Sync changes from v24-0-2 (#9)

Co-authored-by: ADO Sync <ado-sync@bentley.com>

Author: chaterpaul

.github/CODEOWNERS.txt

@@ -123,6 +123,15 @@
             throw std::runtime_error("Set too many Callbacks!"); \
     }
 
+#define MAX_CALLBACK_COUNT_20 20
+#define DEFINE_FN_POINTER_CALLBACKS_20(X) \
+    switch (index) \
+    { \
+        X(0) X(1) X(2) X(3) X(4) X(5) X(6) X(7) X(8) X(9) X(10) X(11) X(12) X(13) X(14) X(15) X(16) X(17) X(18) X(19) \
+        default: \
+            throw std::runtime_error("Set too many Callbacks!"); \
+    }
+
 
 template <typename T1, typename T2>
 int GetCallbackIndex(T1 callbackPtrs[], T2 callbackFuncs[], std::string callbackIDs[], T2 & fn, const std::string & fnID, int maxCallbackCount)

InternalAPI/CallbackHelper.h

@@ -36,6 +36,9 @@ py::class_<TypeWrapper<T>> bind_TypeWrapper(py::handle scope, std::string const&
 typedef TypeWrapper<int> IntWrapper;
 typedef TypeWrapper<double> DoubleWrapper;
 typedef TypeWrapper<bool> BoolWrapper;
+typedef TypeWrapper<MSElementDescrP> MSElementDescrReceiver;
+typedef TypeWrapper<DgnModelStatus> DgnModelStatusWrapper;
+typedef TypeWrapper<ParameterStatus> ParameterStatusWrapper;
 
 // template<typename T> struct ValueSizeSize
 template <typename ValueType, typename holder_type = std::unique_ptr< ValueSizeSize<ValueType> >, typename... Args>

InternalAPI/MSPyBindTemplates.h

@@ -24,6 +24,17 @@
 #define __DOC7(n1, n2, n3, n4, n5, n6, n7)               __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6##_##n7
 #define DOC(...)                                         __EXPAND(__EXPAND(__CAT2(__DOC, __VA_SIZE(__VA_ARGS__)))(__VA_ARGS__))
 
+// Custom deleter for py holder
+struct mspydelete {
+    void operator()(RefCountedBase* p)
+    {
+        if (nullptr != p && 0 == p->Release())
+        {
+            p = nullptr;
+        }
+    }
+};
+
 
 // Opaque types of bvector
 #define DEFINE_BVECTOR_TYPE(ValueT, ArrayT) typedef bvector<ValueT> ArrayT; PYBIND11_MAKE_OPAQUE(ArrayT)
@@ -204,4 +215,3 @@ py::class_<bvector<ValueType>, holder_type> bind_PointerVector(py::handle scope,
 
     return cls;
     }
-

InternalAPI/MSPyCommon.h

@@ -162,4 +162,34 @@ struct ScopeMapManager
 
 };
 
+//=======================================================================================
+// @bsiclass                                                                        09/23
+//=======================================================================================
+struct PyNameSpaceManager
+    {
+    //WIP: need to add all namespace ID
+    public: enum NameSpaceID
+        {
+        Bentley_Geometry,
+        Bentley_DgnPlatform,
+        Bentley_DgnPlatform_Raster,
+        Bentley_GeoCoordinates,
+        };
+
+    typedef PyNameSpaceManager::NameSpaceID PyNameSpaceID;
+
+    private:
+        static bvector<PyNameSpaceID> m_namespaceIDArray;
+
+    public:
+
+        MSPYTHONDLL_EXPORT   static StatusInt UsingNameSpace(PyNameSpaceID namespaceID);
+        MSPYTHONDLL_EXPORT   static bool IsNameSpaceUsing(PyNameSpaceID namespaceID);
+        MSPYTHONDLL_EXPORT   static StatusInt DelNameSpaceUsing(PyNameSpaceID namespaceID);
+        MSPYTHONDLL_EXPORT   static void ClearNameSpaceUsing();
+        MSPYTHONDLL_EXPORT   static void SetDefaultNameSpaceList();
+
+        MSPYTHONDLL_EXPORT   static bool IsRegisteredInPython(AStringCR attrName);
+    };
+
 END_BENTLEY_MSTNPLATFORM_MSPYTHON_NAMESPACE

InternalAPI/MSPythonEngine.h

@@ -18,4 +18,18 @@ DEFINE_BVECTOR_TYPE(DgnRasterP, DgnRasterVector);
 DEFINE_BVECTOR_TYPE(DgnPlatform::GeoreferencePriority, GeoreferencePriorityVector);
 
 DEFINE_BVECTOR_TYPE(DgnECInstancePtr, DgnECInstanceVector);
-DEFINE_BVECTOR_TYPE(DgnTagDefinition, DgnTagDefinitionArray);
+DEFINE_BVECTOR_TYPE(DgnTagDefinition, DgnTagDefinitionArray);
+
+DEFINE_BVECTOR_TYPE(MaterialCP, MaterialList);
+
+DEFINE_BMAP_TYPE(MaterialMap::MapType, MaterialMapPtr, MaterialMapPtrList);
+
+DEFINE_BVECTOR_TYPE(DgnFileP, DgnFiles);
+
+DEFINE_BVECTOR_TYPE(IDgnECChangeListenerP, DgnECChangeListeners);
+
+DEFINE_BVECTOR_TYPE(DgnInstanceChangeRecordP, DgnInstanceChangeRecords);
+
+DEFINE_BVECTOR_TYPE(DgnRelationChangeRecordP, DgnRelationChangeRecords);
+
+DEFINE_BVECTOR_TYPE(SheetSizeDefinition, SheetSizeDefinitionVector);

InternalAPI/OpqueTypes_DgnPlatform.h

@@ -793,6 +793,31 @@ void PythonScriptEngine::exec(WCharCP stms, WCharCP funcName, ScriptContext* glo
 
     }
 
+/*---------------------------------------------------------------------------------**//***
+ @bsimethod                                                                       12/2024
+ +---------------+---------------+---------------+---------------+---------------+------*/
+static void getCachedTypes(std::unordered_map<std::type_index, std::string>& before_type_cache)
+    {
+    auto& internals = py::detail::get_internals();
+    for (const auto& item : internals.registered_types_cpp)
+        before_type_cache[item.first] = item.second->type->tp_name;
+    }
+
+/*---------------------------------------------------------------------------------**//***
+ @bsimethod                                                                       12/2024
+ +---------------+---------------+---------------+---------------+---------------+------*/
+static void removeCachedtypes(const std::unordered_map<std::type_index, std::string>& before_type_cache)
+    {
+    auto& internals = py::detail::get_internals();
+    for (auto it = internals.registered_types_cpp.begin(); it != internals.registered_types_cpp.end();) 
+        {
+        if (before_type_cache.find(it->first) == before_type_cache.end())
+            it = internals.registered_types_cpp.erase(it);
+        else 
+            ++it;
+        }
+    }
+
 /*---------------------------------------------------------------------------------**//*** 
  @bsimethod                                                                       2/2023 
  +---------------+---------------+---------------+---------------+---------------+------*/ 
@@ -826,21 +851,27 @@ void PythonScriptEngine::eval_file(WCharCP scriptFile, WCharCP funcName, ScriptC
         localDict = pyLocalDict->m_dict;
 
     m_engineProcessing = true;
+
+    // The cache of types registered by pybind11 before running the script
+    std::unordered_map<std::type_index, std::string> before_type_cache;
+    getCachedTypes(before_type_cache);
+
     // User want to run a file directly
     if (strFileOrModule.EndsWithI(L".py"))
         {
-        // Run file
         try
             {
-            // Python returns errors if the local dictionary is empty
+            // Run file, Python returns errors if the local dictionary is empty
             py::eval_file(py::cast(scriptFile), globalDict, py::len(localDict) > 0 ? localDict : py::object ());
             }
         catch (py::error_already_set& e)
             {
+            removeCachedtypes(before_type_cache);
             ScriptEngineManager::Get().InjectError( e.what ());
             }
         catch (std::exception& err)
             {
+            removeCachedtypes(before_type_cache);
             ScriptEngineManager::Get().InjectException(err);
             }
         }
@@ -870,6 +901,7 @@ void PythonScriptEngine::eval_file(WCharCP scriptFile, WCharCP funcName, ScriptC
             }        
         catch (std::exception& err)
             {
+            removeCachedtypes(before_type_cache);
             ScriptEngineManager::Get().InjectException(err);
             }        
         }
@@ -1017,6 +1049,38 @@ void PythonScriptEngine::InitSearchPath ()
     UsingNameSpace(PyNameSpaceManager::Bentley_DgnPlatform_Raster);
     }
 
+ /*---------------------------------------------------------------------------------**//***
+   @bsimethod                                   Chris Wu                   08/24
++---------------+---------------+---------------+---------------+---------------+------*/
+ bool PyNameSpaceManager::IsRegisteredInPython(AStringCR attrName)
+    {
+     try 
+        {
+         PyObject* modulesDict = PyImport_GetModuleDict();
+         PyObject* key, * value;
+         Py_ssize_t pos = 0;
+
+         while (PyDict_Next(modulesDict, &pos, &key, &value))
+            {
+             if (!PyModule_Check(value))
+                 continue;
+
+             const char* moduleName = PyModule_GetName(value);
+             auto module = py::module_::import(moduleName);
+
+             if (py::hasattr(module, attrName.c_str()))
+                 return true;
+            }
+        }
+     catch (py::error_already_set& e) 
+        {
+         e.clear();
+        }
+
+     return false;
+    }
+
+ 
 /*---------------------------------------------------------------------------------**//***
     @bsimethod                                   Chris Wu                   05/24
 +---------------+---------------+---------------+---------------+---------------+------*/

MSPythonCore/ScriptEngineManager/source/MSPythonEngine.cpp

@@ -1558,7 +1558,7 @@ def primitiveToSmartSolid(bodyId):
     return False
 
 '''
-Prerequisite: Open MSPythonSamples\data\SolidModeling.dgn  
+Prerequisite: Open MSPythonSamples\\data\\SolidModeling.dgn  
 '''
 #main
 if __name__ == "__main__":

…nSamples/3DModeling/SolidModification.py …g/SolidModification/SolidModification.pyMSPythonSamples/3DModeling/SolidModification.py renamed to MSPythonSamples/3DModeling/SolidModification/SolidModification.py MSPythonSamples/3DModeling/SolidModification.py renamed to MSPythonSamples/3DModeling/SolidModification/SolidModification.py

@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+'''
+/*--------------------------------------------------------------------------------------+
+| $Copyright: (c) 2024 Bentley Systems, Incorporated. All rights reserved. $
++--------------------------------------------------------------------------------------*/
+'''
+
+'''
+Running this sample needs to open GlassColor.dgn.
+This sample shows how to change the glass panels color from darker to lighter from the top row to bottom row.
+'''
+
+from MSPyBentley import *
+from MSPyBentleyGeom import *
+from MSPyECObjects import *
+from MSPyDgnPlatform import *
+from MSPyMstnPlatform import *
+from MSPyDgnView import *
+import random
+
+
+''' Check whether the element color need to be changed. '''
+def needToChangeColor(msElement):
+    # Element should be graphic, visible, not deleted and not construction
+    if ((not msElement.ehdr.isGraphics) or msElement.hdr.dhdr.props.b.invisible
+        or msElement.ehdr.deleted or msElement.hdr.dhdr.props.b.elementClass != 0):
+        return False
+    
+    # Element should be on level "A-GLAZ" or "A-WALL-METL"
+    ret1 = Level.GetIdFromName (ISessionMgr.ActiveDgnModelRef, 0, "A-GLAZ")
+    if(ret1[0] != BentleyStatus.eSUCCESS):
+        return False
+    ret2 = Level.GetIdFromName (ISessionMgr.ActiveDgnModelRef, 0, "A-WALL-METL")
+    if(ret2[0] != BentleyStatus.eSUCCESS):
+        return False
+
+    levelID1 = ret1[1]
+    levelID2 = ret2[1]
+    if(msElement.ehdr.level != levelID1 and msElement.ehdr.level != levelID2):
+        return False
+    
+    return True
+
+def GetElementByXCoordinate():
+    ACTIVEMODEL = ISessionMgr.ActiveDgnModelRef
+    dgnModel = ACTIVEMODEL.GetDgnModel()
+    graphicalElements = dgnModel.GetGraphicElements()
+    categorizedElementsByX = {}
+    for elementRef in graphicalElements:
+        eeh = EditElementHandle(elementRef, dgnModel)
+        msElement = eeh.GetElement ()
+
+        if(not needToChangeColor(msElement)):
+            continue
+
+        # Categorize elements by z-coordinate
+        xCoordinate = msElement.hdr.dhdr.range.xlowlim
+        if round(xCoordinate/10000000) not in categorizedElementsByX:
+            categorizedElementsByX[round(xCoordinate/10000000)] = []
+        categorizedElementsByX[round(xCoordinate/10000000)].append(elementRef)
+
+    return categorizedElementsByX
+
+''' Change the glass panels color '''
+def ChangeGlassWallColor(graphicalElements):
+    ACTIVEMODEL = ISessionMgr.ActiveDgnModelRef
+    dgnModel = ACTIVEMODEL.GetDgnModel()
+    categorizedElements = {}
+    for elementRef in graphicalElements:
+        eeh = EditElementHandle(elementRef, dgnModel)
+        msElement = eeh.GetElement ()
+
+        if(not needToChangeColor(msElement)):
+            continue
+
+        # Categorize elements by z-coordinate
+        zCoordinate = msElement.hdr.dhdr.range.zlowlim
+        if zCoordinate not in categorizedElements:
+            categorizedElements[zCoordinate] = []
+        categorizedElements[zCoordinate].append(elementRef)
+
+
+    color = 80
+    transparency = 0
+    # Change glass panels color for each row
+    for zCoordinate in sorted(categorizedElements, reverse=True):
+        for elementRef in categorizedElements[zCoordinate]:
+            eeh = EditElementHandle(elementRef, dgnModel)
+            propertiesSetter = ElementPropertiesSetter()
+            propertiesSetter.SetColor(round(color))
+            propertiesSetter.SetTransparency(transparency)
+            if True == propertiesSetter.Apply(eeh):
+                eeh.ReplaceInModel(elementRef)
+
+        if (len(categorizedElements) > 1):
+            color += 15/(len(categorizedElements) - 1)
+            transparency += 0.8/(len(categorizedElements) - 1)
+
+def ChangeGlassColor():
+    categorizedElementsByX = GetElementByXCoordinate()
+    for xCoordinate in sorted(categorizedElementsByX, reverse=True):
+        ChangeGlassWallColor(categorizedElementsByX[xCoordinate])
+
+if __name__ == "__main__":
+    ChangeGlassColor()
+    
+