-// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// File : GEOMBase_Helper.cxx
// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
+#include <QRegExp>
+
#include "GEOMBase_Helper.h"
#include "GEOMBase.h"
#include "GEOM_Operation.h"
bool res = false;
if ( !getStudy() || hasCommand() )
{
- MESSAGE("Getting out from openCommand()")
+ MESSAGE("Getting out from openCommand()");
return res;
}
}
else
{
- MESSAGE("anOp->_is_nil() = true")
- }
+ MESSAGE("anOp->_is_nil() = true");
+ }
return res;
}
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
if ( !appStudy )
{
- MESSAGE("appStudy is empty")
+ MESSAGE("appStudy is empty");
return false;
}
_PTR(Study) aStudy = appStudy->studyDS();
}
if ( nbObjs ) {
+ const QString anOpName( typeid(*this).name() );
+ // The operator name may have the following format: 24PrimitiveGUI_CylinderDlg
+ // clean it up to get the simple operator (here Cylinder) name into the log.
+ const QRegExp rx("^[^\w]*_(.*)Dlg$");
+ const int pos = rx.indexIn(anOpName);
+ SalomeApp_Application::logStructuredUserEvent( "Geom",
+ "geometry",
+ pos == -1 ? anOpName : rx.cap(1),
+ "applied" );
commitCommand();
updateObjBrowser();
if( SUIT_Application* anApp = SUIT_Session::session()->activeApplication() ) {
LightApp_Application* aLightApp = dynamic_cast<LightApp_Application*>( anApp );
if(aLightApp) {
- QString anOpName( typeid(*this).name() );
aLightApp->emitOperationFinished( "Geometry", anOpName, anEntryList );
if ( !isDisableBrowsing() )
catch( const SALOME::SALOME_Exception& e ) {
SalomeApp_Tools::QtCatchCorbaException( e );
abortCommand();
- MESSAGE("Exception caught")
- }
+ MESSAGE("Exception caught");
+ }
updateViewer();
- MESSAGE("result ="<<result)
- return result;
+ MESSAGE("result ="<<result);
+ return result;
}
// It should perform the required operation and put all new or modified objects into
// <objects> argument.Should return <false> if some error occurs during its execution.
//================================================================
-bool GEOMBase_Helper::execute( ObjectList& objects )
+bool GEOMBase_Helper::execute( ObjectList& )
{
return false;
}
// for <theObj> or a nil reference if <theObj> should be published
// as a top-level object.
//================================================================
-GEOM::GEOM_Object_ptr GEOMBase_Helper::getFather( GEOM::GEOM_Object_ptr theObj )
+GEOM::GEOM_Object_ptr GEOMBase_Helper::getFather( GEOM::GEOM_Object_ptr )
{
return GEOM::GEOM_Object::_nil();
}
// Function : getObjectName
// Purpose : Redefine this method to return proper name for the given object
//================================================================
-QString GEOMBase_Helper::getObjectName(GEOM::GEOM_Object_ptr object) const
+QString GEOMBase_Helper::getObjectName( GEOM::GEOM_Object_ptr ) const
{
return QString();
}
// Function : getNewObjectName
// Purpose : Redefine this method to return proper name for a new object
//================================================================
-QString GEOMBase_Helper::getNewObjectName (int) const
+QString GEOMBase_Helper::getNewObjectName( int ) const
{
return QString();
}