From f2783a86e0d83accef360b2bd654f69a9e62cd35 Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Mon, 11 Oct 2021 19:49:44 -0400
Subject: [PATCH] On second thought, make the label dump runtime based on
 enabled log masks

---
 plugins/3d/oce/loadmodel.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/3d/oce/loadmodel.cpp b/plugins/3d/oce/loadmodel.cpp
index b7622083f9..60b7bbe6e3 100644
--- a/plugins/3d/oce/loadmodel.cpp
+++ b/plugins/3d/oce/loadmodel.cpp
@@ -85,7 +85,7 @@
 
 // log mask for wxLogTrace
 #define MASK_OCE "PLUGIN_OCE"
-//#define DUMP_LABELS
+#define MASK_OCE_EXTRA "PLUGIN_OCE_EXTRA"
 
 // precision for mesh creation; 0.07 should be good enough for ECAD viewing
 #define USER_PREC (0.14)
@@ -344,7 +344,6 @@ void getTag( const TDF_Label& aLabel, std::string& aTag )
 }
 
 
-#ifdef DUMP_LABELS
 static wxString getLabelName( const TDF_Label& aLabel )
 {
     wxString txt;
@@ -474,7 +473,6 @@ static void dumpLabels( TDF_Label aLabel, Handle( XCAFDoc_ShapeTool ) aShapeTool
     for( it.Initialize( aLabel ); it.More(); it.Next() )
         dumpLabels( it.Value(), aShapeTool, aColorTool, aDepth + 1 );
 }
-#endif
 
 
 bool getColor( DATA& data, TDF_Label label, Quantity_Color& color )
@@ -696,9 +694,11 @@ SCENEGRAPH* LoadModel( char const* filename )
     data.m_assy = XCAFDoc_DocumentTool::ShapeTool( data.m_doc->Main() );
     data.m_color = XCAFDoc_DocumentTool::ColorTool( data.m_doc->Main() );
 
-    #ifdef DUMP_LABELS
-    dumpLabels( data.m_doc->Main(), data.m_assy, data.m_color );
-    #endif
+    // Check if the log mask is enabled otherwise the dump routine may be expensive before the wxLog call
+    if( wxLog::IsAllowedTraceMask( MASK_OCE ) )
+    {
+        dumpLabels( data.m_doc->Main(), data.m_assy, data.m_color );
+    }
 
     // retrieve all free shapes
     TDF_LabelSequence frshapes;