mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-12-27 01:40:34 +05:00
Bug fixes.
This commit is contained in:
parent
f10ba4a5f2
commit
577ebb1ccd
@ -494,3 +494,12 @@ GEOM::GEOM_Object_ptr BlocksGUI_ExplodeDlg::getFather (GEOM::GEOM_Object_ptr)
|
|||||||
{
|
{
|
||||||
return myObject;
|
return myObject;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//================================================================
|
||||||
|
// Function : getNewObjectName
|
||||||
|
// Purpose : Redefine this method to return proper name for a new object
|
||||||
|
//================================================================
|
||||||
|
const char* BlocksGUI_ExplodeDlg::getNewObjectName() const
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
@ -54,6 +54,8 @@ protected:
|
|||||||
virtual bool execute (ObjectList& objects);
|
virtual bool execute (ObjectList& objects);
|
||||||
virtual GEOM::GEOM_Object_ptr getFather(GEOM::GEOM_Object_ptr theObj);
|
virtual GEOM::GEOM_Object_ptr getFather(GEOM::GEOM_Object_ptr theObj);
|
||||||
|
|
||||||
|
virtual const char* getNewObjectName() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void Init();
|
void Init();
|
||||||
void enterEvent (QEvent* e);
|
void enterEvent (QEvent* e);
|
||||||
|
@ -2478,13 +2478,13 @@ msgid "STB_MUL_TRANSFORM"
|
|||||||
msgstr "Multi-transformation"
|
msgstr "Multi-transformation"
|
||||||
|
|
||||||
msgid "TOP_EXPLODE_BLOCKS"
|
msgid "TOP_EXPLODE_BLOCKS"
|
||||||
msgstr "Expload on Blocks"
|
msgstr "Explode on Blocks"
|
||||||
|
|
||||||
msgid "MEN_EXPLODE_BLOCKS"
|
msgid "MEN_EXPLODE_BLOCKS"
|
||||||
msgstr "Expload on Blocks"
|
msgstr "Explode on Blocks"
|
||||||
|
|
||||||
msgid "STB_EXPLODE_BLOCKS"
|
msgid "STB_EXPLODE_BLOCKS"
|
||||||
msgstr "Expload on Blocks"
|
msgstr "Explode on Blocks"
|
||||||
|
|
||||||
msgid "TOP_PROPAGATE"
|
msgid "TOP_PROPAGATE"
|
||||||
msgstr "Propagate"
|
msgstr "Propagate"
|
||||||
@ -2592,13 +2592,13 @@ msgid "MEN_MEASURES"
|
|||||||
msgstr "Measures"
|
msgstr "Measures"
|
||||||
|
|
||||||
msgid "TOP_POINT_COORDS"
|
msgid "TOP_POINT_COORDS"
|
||||||
msgstr "Point corrdinates"
|
msgstr "Point coordinates"
|
||||||
|
|
||||||
msgid "MEN_POINT_COORDS"
|
msgid "MEN_POINT_COORDS"
|
||||||
msgstr "Point corrdinates"
|
msgstr "Point coordinates"
|
||||||
|
|
||||||
msgid "STB_POINT_COORDS"
|
msgid "STB_POINT_COORDS"
|
||||||
msgstr "Point corrdinates"
|
msgstr "Point coordinates"
|
||||||
|
|
||||||
msgid "TOP_BASIC_PROPS"
|
msgid "TOP_BASIC_PROPS"
|
||||||
msgstr "Basic properties"
|
msgstr "Basic properties"
|
||||||
|
@ -682,7 +682,7 @@ void GeometryGUI::initialize( CAM_Application* app )
|
|||||||
createGeomAction( 504, "ARCHIMEDE" );
|
createGeomAction( 504, "ARCHIMEDE" );
|
||||||
createGeomAction( 505, "FILLET" );
|
createGeomAction( 505, "FILLET" );
|
||||||
createGeomAction( 506, "CHAMFER" );
|
createGeomAction( 506, "CHAMFER" );
|
||||||
createGeomAction( 507, "CLIPPING" );
|
//createGeomAction( 507, "CLIPPING" );
|
||||||
|
|
||||||
createGeomAction( 9998, "MUL_TRANSFORM" );
|
createGeomAction( 9998, "MUL_TRANSFORM" );
|
||||||
createGeomAction( 9995, "EXPLODE_BLOCKS" );
|
createGeomAction( 9995, "EXPLODE_BLOCKS" );
|
||||||
@ -822,7 +822,7 @@ void GeometryGUI::initialize( CAM_Application* app )
|
|||||||
createMenu( separator(), operId, -1 );
|
createMenu( separator(), operId, -1 );
|
||||||
createMenu( 505, transId, -1 );
|
createMenu( 505, transId, -1 );
|
||||||
createMenu( 506, transId, -1 );
|
createMenu( 506, transId, -1 );
|
||||||
createMenu( 507, transId, -1 );
|
//createMenu( 507, transId, -1 );
|
||||||
|
|
||||||
int blockId = createMenu( tr( "MEN_BLOCKS" ), operId, -1 );
|
int blockId = createMenu( tr( "MEN_BLOCKS" ), operId, -1 );
|
||||||
createMenu( 9998, blockId, -1 );
|
createMenu( 9998, blockId, -1 );
|
||||||
|
@ -35,6 +35,7 @@
|
|||||||
#include "SalomeApp_SelectionMgr.h"
|
#include "SalomeApp_SelectionMgr.h"
|
||||||
#include "SalomeApp_Tools.h"
|
#include "SalomeApp_Tools.h"
|
||||||
#include "SUIT_Session.h"
|
#include "SUIT_Session.h"
|
||||||
|
#include "SUIT_OverrideCursor.h"
|
||||||
|
|
||||||
#include <qlineedit.h>
|
#include <qlineedit.h>
|
||||||
#include <qlayout.h>
|
#include <qlayout.h>
|
||||||
@ -287,7 +288,7 @@ void MeasureGUI_Skeleton::redisplayPreview()
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
QApplication::setOverrideCursor( Qt::waitCursor );
|
SUIT_OverrideCursor();
|
||||||
|
|
||||||
getDisplayer()->SetColor( Quantity_NOC_VIOLET );
|
getDisplayer()->SetColor( Quantity_NOC_VIOLET );
|
||||||
getDisplayer()->SetToActivate( false );
|
getDisplayer()->SetToActivate( false );
|
||||||
|
@ -32,7 +32,9 @@ using namespace std;
|
|||||||
#include "SalomeApp_Application.h"
|
#include "SalomeApp_Application.h"
|
||||||
#include "SalomeApp_SelectionMgr.h"
|
#include "SalomeApp_SelectionMgr.h"
|
||||||
#include "SalomeApp_Tools.h"
|
#include "SalomeApp_Tools.h"
|
||||||
|
|
||||||
#include "SUIT_Session.h"
|
#include "SUIT_Session.h"
|
||||||
|
#include "SUIT_OverrideCursor.h"
|
||||||
|
|
||||||
#include "SALOME_ListIteratorOfListIO.hxx"
|
#include "SALOME_ListIteratorOfListIO.hxx"
|
||||||
|
|
||||||
@ -279,9 +281,10 @@ bool RepairGUI_FreeFacesDlg::execute( ObjectList& objects )
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SUIT_OverrideCursor();
|
||||||
|
|
||||||
TopExp::MapShapes( aSelShape, anIndices);
|
TopExp::MapShapes( aSelShape, anIndices);
|
||||||
SALOME_Prs* aPrs = 0;
|
SALOME_Prs* aPrs = 0;
|
||||||
QApplication::setOverrideCursor( Qt::waitCursor );
|
|
||||||
|
|
||||||
for ( int i = 0, n = aFaceLst->length(); i < n; i++ )
|
for ( int i = 0, n = aFaceLst->length(); i < n; i++ )
|
||||||
{
|
{
|
||||||
|
@ -36,8 +36,10 @@ using namespace std;
|
|||||||
#include "SalomeApp_SelectionMgr.h"
|
#include "SalomeApp_SelectionMgr.h"
|
||||||
#include "SalomeApp_Study.h"
|
#include "SalomeApp_Study.h"
|
||||||
#include "SalomeApp_Tools.h"
|
#include "SalomeApp_Tools.h"
|
||||||
|
|
||||||
#include "SUIT_Session.h"
|
#include "SUIT_Session.h"
|
||||||
#include "SUIT_MessageBox.h"
|
#include "SUIT_MessageBox.h"
|
||||||
|
#include "SUIT_OverrideCursor.h"
|
||||||
|
|
||||||
#include "SALOME_ListIteratorOfListIO.hxx"
|
#include "SALOME_ListIteratorOfListIO.hxx"
|
||||||
|
|
||||||
@ -375,14 +377,15 @@ bool RepairGUI_GlueDlg::onAcceptLocal( const bool publish, const bool useTransac
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
if ( ( !publish && !useTransaction ) || openCommand() ) {
|
if ( ( !publish && !useTransaction ) || openCommand() ) {
|
||||||
QApplication::setOverrideCursor( Qt::waitCursor );
|
|
||||||
|
SUIT_OverrideCursor wc;
|
||||||
|
|
||||||
SUIT_Session::session()->activeApplication()->putInfo( "" );
|
SUIT_Session::session()->activeApplication()->putInfo( "" );
|
||||||
ObjectList objects;
|
ObjectList objects;
|
||||||
// JFA 28.12.2004 if ( !execute( objects ) || !getOperation()->IsDone() ) {
|
// JFA 28.12.2004 if ( !execute( objects ) || !getOperation()->IsDone() ) {
|
||||||
if ( !execute( objects ) ) { // JFA 28.12.2004 // To enable warnings
|
if ( !execute( objects ) ) { // JFA 28.12.2004 // To enable warnings
|
||||||
while( QApplication::overrideCursor() )
|
wc.suspend();
|
||||||
QApplication::restoreOverrideCursor();
|
abortCommand();
|
||||||
abortCommand();
|
|
||||||
showError();
|
showError();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -423,9 +426,8 @@ bool RepairGUI_GlueDlg::onAcceptLocal( const bool publish, const bool useTransac
|
|||||||
// JFA 28.12.2004 BEGIN // To enable warnings
|
// JFA 28.12.2004 BEGIN // To enable warnings
|
||||||
if ( !getOperation()->_is_nil() ) {
|
if ( !getOperation()->_is_nil() ) {
|
||||||
if ( !getOperation()->IsDone() ) {
|
if ( !getOperation()->IsDone() ) {
|
||||||
while( QApplication::overrideCursor() )
|
wc.suspend();
|
||||||
QApplication::restoreOverrideCursor();
|
QString msgw = QObject::tr( getOperation()->GetErrorCode() );
|
||||||
QString msgw = QObject::tr( getOperation()->GetErrorCode() );
|
|
||||||
SUIT_MessageBox::warn1((QWidget*)(SUIT_Session::session()->activeApplication()->desktop()),
|
SUIT_MessageBox::warn1((QWidget*)(SUIT_Session::session()->activeApplication()->desktop()),
|
||||||
QObject::tr( "WRN_WARNING" ),
|
QObject::tr( "WRN_WARNING" ),
|
||||||
msgw,
|
msgw,
|
||||||
|
Loading…
Reference in New Issue
Block a user