OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

DRAW - Static plugin factory refactor #233

Browse Source 
Reorganize Static plug-in mapping to be more transparent.
This commit is contained in:
dpasukhi 2025-01-04 11:35:31 +00:00
parent 9e3e17d41e
commit ba2f25cfa5
2 changed files with 140 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

328
src/DRAWEXE/DRAWEXE.cxx
View File

@ -13,8 +13,8 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <Draw.hxx>
#include <DBRep.hxx> #include <DBRep.hxx>
#include <Draw.hxx>
#include <DrawTrSurf.hxx> #include <DrawTrSurf.hxx>
#include <Message.hxx> #include <Message.hxx>
#include <Message_PrinterOStream.hxx> #include <Message_PrinterOStream.hxx>
@ -28,34 +28,38 @@
#include <BOPTest.hxx> #include <BOPTest.hxx>
#include <DPrsStd.hxx> #include <DPrsStd.hxx>
#if defined(HAVE_OPENGL) || defined(HAVE_GLES2) #if defined(HAVE_OPENGL) || defined(HAVE_GLES2)
#include <OpenGlTest.hxx> #include <OpenGlTest.hxx>
#endif #endif
#include <TObjDRAW.hxx> #include <TObjDRAW.hxx>
#include <ViewerTest.hxx> #include <ViewerTest.hxx>
#include <XSDRAW.hxx>
#include <XDEDRAW.hxx> #include <XDEDRAW.hxx>
#include <XSDRAWSTEP.hxx> #include <XSDRAW.hxx>
#include <XSDRAWIGES.hxx> #include <XSDRAWDE.hxx>
#include <XSDRAWGLTF.hxx> #include <XSDRAWGLTF.hxx>
#include <XSDRAWIGES.hxx>
#include <XSDRAWOBJ.hxx> #include <XSDRAWOBJ.hxx>
#include <XSDRAWPLY.hxx> #include <XSDRAWPLY.hxx>
#include <XSDRAWVRML.hxx> #include <XSDRAWSTEP.hxx>
#include <XSDRAWSTL.hxx> #include <XSDRAWSTL.hxx>
#include <XSDRAWVRML.hxx>
#endif #endif
Standard_IMPORT Standard_Boolean Draw_Interprete (const char* theCommand); Standard_IMPORT Standard_Boolean Draw_Interprete(const char* theCommand);
#if defined(__EMSCRIPTEN__) #if defined(__EMSCRIPTEN__)
#include <emscripten/bind.h> #include <emscripten/bind.h>
#include <emscripten/emscripten.h> #include <emscripten/emscripten.h>
#include <emscripten/threading.h> #include <emscripten/threading.h>
//! Signal async command completion to Module.evalAsyncCompleted callback. //! Signal async command completion to Module.evalAsyncCompleted callback.
EM_JS(void, occJSEvalAsyncCompleted, (int theResult), { EM_JS(void, occJSEvalAsyncCompleted, (int theResult), {
if (Module.evalAsyncCompleted != undefined) { if (Module.evalAsyncCompleted != undefined)
Module.evalAsyncCompleted (theResult); {
} else { Module.evalAsyncCompleted(theResult);
console.error ("Module.evalAsyncCompleted() is undefined"); }
else
{
console.error("Module.evalAsyncCompleted() is undefined");
} }
}); });
@ -64,14 +68,14 @@ class DRAWEXE
{ {
public: public:
//! Evaluate Tcl command. //! Evaluate Tcl command.
static int eval (const std::string& theCommand) static int eval(const std::string& theCommand)
{ {
int aRes = 0; int aRes = 0;
try try
{ {
OCC_CATCH_SIGNALS OCC_CATCH_SIGNALS
//aRes = Draw::GetInterpretor().Eval (theCommand.c_str()); //aRes = Draw::GetInterpretor().Eval (theCommand.c_str());
aRes = Draw_Interprete (theCommand.c_str()) ? 1 : 0; aRes = Draw_Interprete(theCommand.c_str()) ? 1 : 0;
} }
catch (Standard_Failure& anExcept) catch (Standard_Failure& anExcept)
{ {
@ -81,54 +85,56 @@ public:
} }
//! Check if Tcl command is complete. //! Check if Tcl command is complete.
static bool isComplete (const std::string& theCommand) static bool isComplete(const std::string& theCommand)
{ {
return Draw::GetInterpretor().Complete (theCommand.c_str()); return Draw::GetInterpretor().Complete(theCommand.c_str());
} }
//! Evaluate Tcl command asynchronously. //! Evaluate Tcl command asynchronously.
static void evalAsync (const std::string& theCommand) static void evalAsync(const std::string& theCommand)
{ {
#if defined(__EMSCRIPTEN_PTHREADS__) #if defined(__EMSCRIPTEN_PTHREADS__)
std::string* aCmdPtr = new std::string (theCommand); std::string* aCmdPtr = new std::string(theCommand);
OSD_Thread aThread (&evalAsyncEntry); OSD_Thread aThread(&evalAsyncEntry);
aThread.Run (aCmdPtr); aThread.Run(aCmdPtr);
#else #else
// fallback synchronous implementation // fallback synchronous implementation
int aRes = eval (theCommand); int aRes = eval(theCommand);
occJSEvalAsyncCompleted (aRes); occJSEvalAsyncCompleted(aRes);
#endif #endif
} }
#if defined(__EMSCRIPTEN_PTHREADS__) #if defined(__EMSCRIPTEN_PTHREADS__)
private: private:
//! Thread entry for async command execution. //! Thread entry for async command execution.
static Standard_Address evalAsyncEntry (Standard_Address theData) static Standard_Address evalAsyncEntry(Standard_Address theData)
{ {
OSD::SetSignal (false); OSD::SetSignal(false);
std::string* aCmdPtr = (std::string* )theData; std::string* aCmdPtr = (std::string*)theData;
const std::string aCmd = *aCmdPtr; const std::string aCmd = *aCmdPtr;
delete aCmdPtr; delete aCmdPtr;
int aRes = eval (aCmd); int aRes = eval(aCmd);
emscripten_async_run_in_main_runtime_thread (EM_FUNC_SIG_VI, evalAsyncCompletedEntry, aRes); emscripten_async_run_in_main_runtime_thread(EM_FUNC_SIG_VI, evalAsyncCompletedEntry, aRes);
return 0; return 0;
} }
//! Notify Module.evalAsyncCompleted about async cmd completion. //! Notify Module.evalAsyncCompleted about async cmd completion.
static void evalAsyncCompletedEntry (int theResult) static void evalAsyncCompletedEntry(int theResult) { occJSEvalAsyncCompleted(theResult); }
{ #endif
occJSEvalAsyncCompleted (theResult);
}
#endif
}; };
//! Print message to Module.printMessage callback. //! Print message to Module.printMessage callback.
EM_JS(void, occJSPrintMessage, (const char* theStr, int theGravity), { EM_JS(void, occJSPrintMessage, (const char* theStr, int theGravity), {
if (Module.printMessage != undefined && Module.printMessage != null) { if (Module.printMessage != undefined && Module.printMessage != null)
Module.printMessage (UTF8ToString(theStr), theGravity); {
} else if (Module.print != undefined && Module.print != null) { Module.printMessage(UTF8ToString(theStr), theGravity);
Module.print (UTF8ToString(theStr)); }
} else { else if (Module.print != undefined && Module.print != null)
{
Module.print(UTF8ToString(theStr));
}
else
{
//console.info (UTF8ToString(theStr)); //console.info (UTF8ToString(theStr));
} }
}); });
@ -138,176 +144,116 @@ class DRAWEXE_WasmModulePrinter : public Message_Printer
{ {
DEFINE_STANDARD_RTTI_INLINE(DRAWEXE_WasmModulePrinter, Message_Printer) DEFINE_STANDARD_RTTI_INLINE(DRAWEXE_WasmModulePrinter, Message_Printer)
public: public:
//! Main constructor. //! Main constructor.
DRAWEXE_WasmModulePrinter (const Message_Gravity theTraceLevel = Message_Info) DRAWEXE_WasmModulePrinter(const Message_Gravity theTraceLevel = Message_Info)
{ {
SetTraceLevel (theTraceLevel); SetTraceLevel(theTraceLevel);
} }
//! Destructor. //! Destructor.
virtual ~DRAWEXE_WasmModulePrinter() {} virtual ~DRAWEXE_WasmModulePrinter() {}
protected: protected:
//! Puts a message. //! Puts a message.
virtual void send (const TCollection_AsciiString& theString, virtual void send(const TCollection_AsciiString& theString,
const Message_Gravity theGravity) const Standard_OVERRIDE const Message_Gravity theGravity) const Standard_OVERRIDE
{ {
if (theGravity >= myTraceLevel) if (theGravity >= myTraceLevel)
{ {
occJSPrintMessage (theString.ToCString(), (int )theGravity); occJSPrintMessage(theString.ToCString(), (int)theGravity);
} }
} }
}; };
EMSCRIPTEN_BINDINGS(DRAWEXE) { EMSCRIPTEN_BINDINGS(DRAWEXE)
emscripten::function("eval", &DRAWEXE::eval); {
emscripten::function("evalAsync", &DRAWEXE::evalAsync); emscripten::function("eval", &DRAWEXE::eval);
emscripten::function("evalAsync", &DRAWEXE::evalAsync);
emscripten::function("isComplete", &DRAWEXE::isComplete); emscripten::function("isComplete", &DRAWEXE::isComplete);
} }
#endif #endif
#ifdef OCCT_NO_PLUGINS #ifdef OCCT_NO_PLUGINS
#include <functional>
#include <string>
#include <unordered_map>
//! Mimic pload command by loading pre-defined set of statically linked plugins. //! Mimic pload command by loading pre-defined set of statically linked plugins.
static Standard_Integer Pload (Draw_Interpretor& theDI, static Standard_Integer Pload(Draw_Interpretor& theDI,
Standard_Integer theNbArgs, Standard_Integer theNbArgs,
const char** theArgVec) const char** theArgVec)
{ {
// Define a map of aPlugin keys to their corresponding factory methods
std::unordered_map<std::string, std::function<void(Draw_Interpretor&)>> aPluginMap = {
{"TOPTEST", BOPTest::Factory},
{"DCAF", DPrsStd::Factory},
{"AISV", ViewerTest::Factory},
#if defined(HAVE_OPENGL)
{"GL", OpenGlTest::Factory},
{"OPENGL", OpenGlTest::Factory},
#endif
#if defined(HAVE_GLES2)
{"GLES", OpenGlTest::Factory},
{"OPENGLES", OpenGlTest::Factory},
#endif
{"XSDRAW", XSDRAW::Factory},
{"XDEDRAW", XDEDRAW::Factory},
{"STEP", XSDRAWSTEP::Factory},
{"IGES", XSDRAWIGES::Factory},
{"PLY", XSDRAWPLY::Factory},
{"GLTF", XSDRAWGLTF::Factory},
{"VRML", XSDRAWVRML::Factory},
{"STL", XSDRAWSTL::Factory},
{"OBJ", XSDRAWOBJ::Factory},
{"DE", XSDRAWDE::Factory}};
// Define a map of aliases to their corresponding aPlugin keys
std::unordered_map<std::string, std::vector<std::string>> anAliasMap = {
{"DEFAULT", {"MODELING"}},
{"MODELING", {"TOPTEST"}},
{"VISUALIZATION", {"AISV"}},
{"OCAFKERNEL", {"DCAF"}},
{"DATAEXCHANGEKERNEL", {"XSDRAW", "DE"}},
{"OCAF", {"VISUALIZATION", "OCAFKERNEL"}},
{"DATAEXCHANGE", {"XDE", "VISUALIZATION"}},
{"XDE", {"DATAEXCHANGEKERNEL", "XDEDRAW", "STEP", "IGES", "GLTF", "OBJ", "PLY", "STL", "VRML"}},
{"ALL", {"MODELING", "OCAFKERNEL", "DATAEXCHANGE"}}};
NCollection_IndexedMap<TCollection_AsciiString> aPlugins; NCollection_IndexedMap<TCollection_AsciiString> aPlugins;
for (Standard_Integer anArgIter = 1; anArgIter < theNbArgs; ++anArgIter)
std::function<void(const TCollection_AsciiString&)> processAlias;
processAlias = [&](const TCollection_AsciiString& theAlias) -> void
{ {
TCollection_AsciiString anArg (theArgVec[anArgIter]); auto anAliasIt = anAliasMap.find(theAlias.ToCString());
anArg.UpperCase(); if (anAliasIt != anAliasMap.end())
if (anArg == "DEFAULT")
{ {
aPlugins.Add ("TOPTEST"); for (const auto& aPlugin : anAliasIt->second)
} {
else if (anArg == "MODELING") processAlias(TCollection_AsciiString(aPlugin.c_str()));
{ }
aPlugins.Add ("TOPTEST");
}
else if (anArg == "VISUALIZATION")
{
aPlugins.Add ("AISV");
}
else if (anArg == "OCAFKERNEL")
{
aPlugins.Add ("DCAF");
}
else if (anArg == "DATAEXCHANGEKERNEL")
{
aPlugins.Add ("XSDRAW");
}
else if (anArg == "OCAF")
{
aPlugins.Add ("AISV");
aPlugins.Add ("DCAF");
}
else if (anArg == "DATAEXCHANGE")
{
aPlugins.Add ("XSDRAW");
aPlugins.Add ("XSDRAWSTEP");
aPlugins.Add ("XSDRAWIGES");
aPlugins.Add ("XSDRAWGLTF");
aPlugins.Add ("XSDRAWOBJ");
aPlugins.Add ("XSDRAWPLY");
aPlugins.Add ("XSDRAWVRML");
aPlugins.Add ("XSDRAWSTL");
aPlugins.Add ("XDEDRAW");
aPlugins.Add ("AISV");
}
else if (anArg == "XDE")
{
aPlugins.Add ("XSDRAW");
aPlugins.Add ("XDEDRAW");
}
else if (anArg == "ALL")
{
aPlugins.Add ("TOPTEST");
aPlugins.Add ("DCAF");
aPlugins.Add ("XSDRAW");
aPlugins.Add ("XDEDRAW");
aPlugins.Add ("AISV");
aPlugins.Add ("XSDRAWSTEP");
aPlugins.Add ("XSDRAWIGES");
aPlugins.Add ("XSDRAWGLTF");
aPlugins.Add ("XSDRAWOBJ");
aPlugins.Add ("XSDRAWPLY");
aPlugins.Add ("XSDRAWVRML");
aPlugins.Add ("XSDRAWSTL");
} }
else else
{ {
aPlugins.Add (anArg); aPlugins.Add(theAlias);
} }
};
for (Standard_Integer anArgIter = 1; anArgIter < theNbArgs; ++anArgIter)
{
TCollection_AsciiString anArg(theArgVec[anArgIter]);
anArg.UpperCase();
processAlias(anArg);
} }
for (NCollection_IndexedMap<TCollection_AsciiString>::Iterator aPluginIter (aPlugins); for (NCollection_IndexedMap<TCollection_AsciiString>::Iterator aPluginIter(aPlugins);
aPluginIter.More(); aPluginIter.Next()) aPluginIter.More();
aPluginIter.Next())
{ {
const TCollection_AsciiString& aPlugin = aPluginIter.Value(); const TCollection_AsciiString& aPlugin = aPluginIter.Value();
if (aPlugin == "TOPTEST") auto anIter = aPluginMap.find(aPlugin.ToCString());
if (anIter != aPluginMap.end())
{ {
BOPTest::Factory (theDI); anIter->second(theDI);
}
else if (aPlugin == "DCAF")
{
DPrsStd::Factory (theDI);
}
else if (aPlugin == "AISV")
{
ViewerTest::Factory (theDI);
}
#if defined(HAVE_OPENGL)
else if (aPlugin == "GL"
|| aPlugin == "OPENGL")
{
OpenGlTest::Factory (theDI);
}
#endif
#if defined(HAVE_GLES2)
else if (aPlugin == "GLES"
|| aPlugin == "OPENGLES")
{
OpenGlTest::Factory (theDI);
}
#endif
else if (aPlugin == "XSDRAW")
{
XSDRAW::Factory (theDI);
}
else if (aPlugin == "XDEDRAW")
{
XDEDRAW::Factory (theDI);
}
else if (aPlugin == "STEP")
{
XSDRAWSTEP::Factory (theDI);
}
else if (aPlugin == "IGES")
{
XSDRAWIGES::Factory (theDI);
}
else if (aPlugin == "PLY")
{
XSDRAWPLY::Factory (theDI);
}
else if (aPlugin == "GLTF")
{
XSDRAWGLTF::Factory (theDI);
}
else if (aPlugin == "VRML")
{
XSDRAWVRML::Factory (theDI);
}
else if (aPlugin == "STL")
{
XSDRAWSTL::Factory (theDI);
}
else if (aPlugin == "OBJ")
{
XSDRAWOBJ::Factory (theDI);
} }
else else
{ {
@ -322,29 +268,33 @@ static Standard_Integer Pload (Draw_Interpretor& theDI,
//======================================================================= //=======================================================================
//function : Draw_InitAppli //function : Draw_InitAppli
//purpose : //purpose :
//======================================================================= //=======================================================================
void Draw_InitAppli (Draw_Interpretor& theDI) void Draw_InitAppli(Draw_Interpretor& theDI)
{ {
#if defined(__EMSCRIPTEN__) #if defined(__EMSCRIPTEN__)
// open JavaScript console within the Browser to see this output // open JavaScript console within the Browser to see this output
Message_Gravity aGravity = Message_Info; Message_Gravity aGravity = Message_Info;
Handle(Message_PrinterSystemLog) aJSConsolePrinter = new Message_PrinterSystemLog ("DRAWEXE", aGravity); Handle(Message_PrinterSystemLog) aJSConsolePrinter = new Message_PrinterSystemLog("DRAWEXE",
Message::DefaultMessenger()->AddPrinter (aJSConsolePrinter); aGravity);
Message::DefaultMessenger()->AddPrinter(aJSConsolePrinter);
// replace printer into std::cout by a printer into a custom callback Module.printMessage accepting message gravity // replace printer into std::cout by a printer into a custom callback Module.printMessage accepting message gravity
Message::DefaultMessenger()->RemovePrinters (STANDARD_TYPE(Message_PrinterOStream)); Message::DefaultMessenger()->RemovePrinters(STANDARD_TYPE(Message_PrinterOStream));
Handle(DRAWEXE_WasmModulePrinter) aJSModulePrinter = new DRAWEXE_WasmModulePrinter (aGravity); Handle(DRAWEXE_WasmModulePrinter) aJSModulePrinter = new DRAWEXE_WasmModulePrinter(aGravity);
Message::DefaultMessenger()->AddPrinter (aJSModulePrinter); Message::DefaultMessenger()->AddPrinter(aJSModulePrinter);
#endif #endif
Draw::Commands (theDI); Draw::Commands(theDI);
DBRep::BasicCommands (theDI); DBRep::BasicCommands(theDI);
DrawTrSurf::BasicCommands (theDI); DrawTrSurf::BasicCommands(theDI);
#ifdef OCCT_NO_PLUGINS #ifdef OCCT_NO_PLUGINS
theDI.Add ("pload" , "pload [[Key1] [Key2] ...]: Loads Draw plugins", theDI.Add("pload",
__FILE__, Pload, "Draw Plugin"); "pload [[Key1] [Key2] ...]: Loads Draw plugins",
__FILE__,
Pload,
"Draw Plugin");
#endif #endif
} }

1
src/DRAWEXE/EXTERNLIB_STATIC
View File

@ -9,6 +9,7 @@ TKXSDRAWOBJ
TKXSDRAWPLY TKXSDRAWPLY
TKXSDRAWVRML TKXSDRAWVRML
TKXSDRAWSTL TKXSDRAWSTL
TKXSDRAWDE
TKOpenGlTest TKOpenGlTest
TKOpenGlesTest TKOpenGlesTest
TKViewerTest TKViewerTest