-// GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// This library is free software; you can redistribute it and/or
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-//
-//
-// File : RepairGUI_GlueDlg.cxx
-// Author : Lucien PIGNOLONI
-// Module : GEOM
-// $Header$
+// GEOM RepairGUI : GUI for Geometry component
+// File : RepairGUI_GlueDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
#include "RepairGUI_GlueDlg.h"
-#include "DlgRef_1Sel_Ext.h"
-#include "GEOMImpl_Types.hxx"
-
-#include "QtxDblSpinBox.h"
-#include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Tools.h"
-
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_OverrideCursor.h"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+#include <SalomeApp_DoubleSpinBox.h>
+
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
+#include <SalomeApp_Study.h>
+#include <SalomeApp_Tools.h>
+#include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_OverrideCursor.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_ViewManager.h>
+#include <OCCViewer_ViewModel.h>
+#include <SALOME_ListIteratorOfListIO.hxx>
+
+#include <GEOMImpl_Types.hxx>
#include <TCollection_AsciiString.hxx>
-#include <qapplication.h>
-#include <qlabel.h>
-
-using namespace std;
-
#define DEFAULT_TOLERANCE_VALUE 1e-07
//=================================================================================
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
-RepairGUI_GlueDlg::RepairGUI_GlueDlg(QWidget* parent, const char* name, bool modal, WFlags fl)
- :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+RepairGUI_GlueDlg::RepairGUI_GlueDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+ bool modal )
+ : GEOMBase_Skeleton( theGeometryGUI, parent, modal ),
+ myCurrConstrId( -1 )
{
- QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_GLUE_FACES")));
- QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+ QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_GLUE_FACES" ) ) );
+ QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_GLUE_FACES2" ) ));
+ QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
- setCaption(tr("GEOM_GLUE_TITLE"));
+ setWindowTitle( tr( "GEOM_GLUE_TITLE" ) );
/***************************************************************/
- GroupConstructors->setTitle(tr("GEOM_GLUE_TITLE"));
- RadioButton1->setPixmap(image0);
- RadioButton2->close(TRUE);
- RadioButton3->close(TRUE);
-
- GroupPoints = new DlgRef_1Sel_Ext(this, "GroupPoints");
- GroupPoints->GroupBox1->setTitle(tr("GEOM_GLUE"));
- GroupPoints->TextLabel1->setText(tr("GEOM_SELECTED_SHAPE"));
- GroupPoints->PushButton1->setPixmap(image1);
+ mainFrame()->GroupConstructors->setTitle( tr( "GEOM_GLUE_TITLE" ) );
+ mainFrame()->RadioButton1->setIcon( image0 );
+ mainFrame()->RadioButton2->setIcon( image2 );
+ mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+ mainFrame()->RadioButton3->close();
+
+ GroupPoints = new DlgRef_1SelExt( centralWidget() );
+ GroupPoints->GroupBox1->setTitle( tr( "GEOM_GLUE" ) );
+ GroupPoints->TextLabel1->setText( tr( "GEOM_SELECTED_SHAPE" ) );
+ GroupPoints->PushButton1->setIcon( image1 );
GroupPoints->LineEdit1->setReadOnly( true );
-
- Layout1->addWidget(GroupPoints, 2, 0);
-
- QGridLayout* aLay = new QGridLayout( 0, 2, 2, 0, 6, "aLay" );
- QLabel* aLbl1 = new QLabel( tr( "GEOM_TOLERANCE" ), GroupPoints->GroupBox1 );
- myTolEdt = new QtxDblSpinBox( 0, 100, 1e-7, GroupPoints->GroupBox1 );//QAD_SpinBoxDbl( GroupPoints->GroupBox1, 0, 100, 1e-7, 10, 1e-10 );
- myTolEdt->setPrecision( 10 );
+
+ QLabel* aTolLab = new QLabel( tr( "GEOM_TOLERANCE" ), GroupPoints->Box );
+ myTolEdt = new SalomeApp_DoubleSpinBox( GroupPoints->Box );
+ initSpinBox( myTolEdt, 0., 100., DEFAULT_TOLERANCE_VALUE, "len_tol_precision" );
myTolEdt->setValue( DEFAULT_TOLERANCE_VALUE );
- aLay->addWidget( aLbl1, 0, 0 );
- aLay->addWidget( myTolEdt, 0, 1 );
+ QGridLayout* boxLayout = new QGridLayout( GroupPoints->Box );
+ boxLayout->setMargin( 0 ); boxLayout->setSpacing( 6 );
+ boxLayout->addWidget( aTolLab, 0, 0 );
+ boxLayout->addWidget( myTolEdt, 0, 2 );
+ /***************************************************************/
+
+ GroupPoints2 = new DlgRef_1SelExt( centralWidget() );
+ GroupPoints2->GroupBox1->setTitle( tr( "GEOM_GLUE" ) );
+ GroupPoints2->TextLabel1->setText( tr( "GEOM_SELECTED_SHAPE" ) );
+ GroupPoints2->PushButton1->setIcon( image1 );
+ GroupPoints2->LineEdit1->setReadOnly( true );
+
+ QLabel* aTolLab2 = new QLabel( tr( "GEOM_TOLERANCE" ), GroupPoints2->Box );
+ myTolEdt2 = new SalomeApp_DoubleSpinBox( GroupPoints2->Box );
+ initSpinBox( myTolEdt2, 0., 100., DEFAULT_TOLERANCE_VALUE, "len_tol_precision" );
+ myTolEdt2->setValue( DEFAULT_TOLERANCE_VALUE );
+
+ myDetectBtn = new QPushButton( tr( "GEOM_DETECT" ) + QString( " [%1]" ).arg( tr( "GLUE_FACES" ) ),
+ GroupPoints2->Box );
+ mySubShapesChk = new QCheckBox( tr( "SELECT_FACES" ), GroupPoints2->Box );
+
+ boxLayout = new QGridLayout( GroupPoints2->Box );
+ boxLayout->setMargin( 0 ); boxLayout->setSpacing( 6 );
+ boxLayout->addWidget( aTolLab2, 0, 0 );
+ boxLayout->addWidget( myTolEdt2, 0, 2 );
+ boxLayout->addWidget( myDetectBtn, 1, 0, 1, 3 );
+ boxLayout->addWidget( mySubShapesChk, 2, 0, 1, 3 );
+
+ QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+ layout->setMargin( 0 ); layout->setSpacing( 6 );
+ layout->addWidget( GroupPoints );
+ layout->addWidget( GroupPoints2 );
- GroupPoints->getGroupBoxLayout()->addLayout( aLay, 3, 0 );
/***************************************************************/
+ setHelpFileName( "glue_faces_operation_page.html" );
+
+ // Disable second way of gluing if OCC viewer is not active one
+ if ( myGeomGUI->getApp()->desktop()->activeWindow()->getViewManager()->getType()
+ != OCCViewer_Viewer::Type() )
+ mainFrame()->RadioButton2->setEnabled( false );
+
Init();
}
myObject = GEOM::GEOM_Object::_nil();
//myGeomGUI->SetState( 0 );
- globalSelection( GEOM_COMPOUND );
+ //globalSelection( GEOM_COMPOUND );
+
+ mainFrame()->GroupBoxPublish->show();
+ //Hide preview checkbox
+ mainFrame()->CheckBoxPreview->hide();
/* signals and slots connections */
- connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
- connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
- connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
+ connect( buttonOk(), SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+ connect( buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+ connect( this, SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
- connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
- connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+ connect( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+ connect( GroupPoints->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
- connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
- connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+ connect( GroupPoints2->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+ connect( GroupPoints2->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+ connect( myTolEdt2, SIGNAL( valueChanged( double ) ), this, SLOT( onTolerChanged( double ) ) );
+ connect( mySubShapesChk, SIGNAL( stateChanged( int ) ), this, SLOT( onSubShapesChk() ) );
- connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
- SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+ connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+ this, SLOT( SelectionIntoArgument() ) );
+
+ connect( myDetectBtn, SIGNAL( clicked() ), this, SLOT( onDetect() ) );
initName( tr( "GLUE_NEW_OBJ_NAME" ) );
+
+ ConstructorsClicked( 0 );
+
+ activateSelection();
+ updateButtonState();
+}
+
+
+//=================================================================================
+// function : ConstructorsClicked()
+// purpose : Radio button management
+//=================================================================================
+void RepairGUI_GlueDlg::ConstructorsClicked( int constructorId )
+{
+ if ( myCurrConstrId == constructorId )
+ return;
+
+ disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
+
+ switch ( constructorId ) {
+ case 0:
+ GroupPoints2->hide();
+ GroupPoints->show();
+ GroupPoints->LineEdit1->setText( "" );
+ myEditCurrentArgument = GroupPoints->LineEdit1;
+
+ if ( myCurrConstrId >= 0 ) {
+ // i.e. it is not initialisation
+ // copy tolerance from previous tolerance field
+ myTolEdt->setValue( myTolEdt2->value() );
+ }
+ break;
+ case 1:
+ GroupPoints->hide();
+ GroupPoints2->show();
+ GroupPoints->LineEdit1->setText( "" );
+ myEditCurrentArgument = GroupPoints2->LineEdit1;
+
+ if ( myCurrConstrId >= 0 ) {
+ // i.e. it is not initialisation
+ // copy tolerance from previous tolerance field
+ myTolEdt2->setValue( myTolEdt->value() );
+ mySubShapesChk->setChecked( false );
+ clearTemporary();
+ }
+ break;
+ }
+
+ myCurrConstrId = constructorId;
+
+ myEditCurrentArgument->setFocus();
+
+ connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+ this, SLOT( SelectionIntoArgument() ) );
+
+ qApp->processEvents();
+ updateGeometry();
+ resize( minimumSizeHint() );
+
+ processPreview();
+ updateButtonState();
+ activateSelection();
+ SelectionIntoArgument();
}
//=================================================================================
void RepairGUI_GlueDlg::ClickOnOk()
{
+ setIsApplyAndClose( true );
if ( ClickOnApply() )
ClickOnCancel();
}
-
//=================================================================================
// function : ClickOnApply()
// purpose :
initName();
- GroupPoints->LineEdit1->setText("");
- myObject = GEOM::GEOM_Object::_nil();
-
- globalSelection( GEOM_COMPOUND );
+ //GroupPoints->LineEdit1->setText("");
+ //myObject = GEOM::GEOM_Object::_nil();
- return true;
-}
+ //globalSelection( GEOM_COMPOUND );
+ ConstructorsClicked( getConstructorId() );
-//=================================================================================
-// function : ClickOnCancel()
-// purpose :
-//=================================================================================
-void RepairGUI_GlueDlg::ClickOnCancel()
-{
- GEOMBase_Skeleton::ClickOnCancel();
+ return true;
}
//=================================================================================
void RepairGUI_GlueDlg::SelectionIntoArgument()
{
+ if ( mySubShapesChk->isChecked() && getConstructorId() == 1 ) {
+ updateButtonState();
+ return;
+ }
+
erasePreview();
- myEditCurrentArgument->setText("");
+ myEditCurrentArgument->setText( "" );
myObject = GEOM::GEOM_Object::_nil();
- if ( IObjectCount() == 1 ) {
- Handle(SALOME_InteractiveObject) anIO = firstIObject();
- Standard_Boolean aRes;
- myObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes );
- if ( aRes )
+ LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+ SALOME_ListIO aSelList;
+ aSelMgr->selectedObjects(aSelList);
+
+ if ( aSelList.Extent() == 1 ) {
+ Handle(SALOME_InteractiveObject) anIO = aSelList.First();
+ myObject = GEOMBase::ConvertIOinGEOMObject( anIO );
+ if ( !CORBA::is_nil( myObject ) )
myEditCurrentArgument->setText( GEOMBase::GetName( myObject ) );
}
+ updateButtonState();
}
//=================================================================================
void RepairGUI_GlueDlg::SetEditCurrentArgument()
{
const QObject* send = sender();
- if ( send == GroupPoints->PushButton1 ) {
+ if ( send == GroupPoints->PushButton1 || send == GroupPoints2->PushButton1 ) {
myEditCurrentArgument->setFocus();
SelectionIntoArgument();
}
void RepairGUI_GlueDlg::LineEditReturnPressed()
{
const QObject* send = sender();
- if( send == GroupPoints->LineEdit1 ) {
+ if ( send == GroupPoints->LineEdit1 ) {
myEditCurrentArgument = GroupPoints->LineEdit1;
GEOMBase_Skeleton::LineEditReturnPressed();
}
-}
-
-
-//=================================================================================
-// function : DeactivateActiveDialog()
-// purpose :
-//=================================================================================
-void RepairGUI_GlueDlg::DeactivateActiveDialog()
-{
- //myGeomGUI->SetState( -1 );
- GEOMBase_Skeleton::DeactivateActiveDialog();
+ else if ( send == GroupPoints2->LineEdit1 ) {
+ myEditCurrentArgument = GroupPoints2->LineEdit1;
+ GEOMBase_Skeleton::LineEditReturnPressed();
+ }
}
void RepairGUI_GlueDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
- connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
- SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+ connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+ this, SLOT( SelectionIntoArgument() ) );
- GroupPoints->LineEdit1->setText("");
- myObject = GEOM::GEOM_Object::_nil();
+ //GroupPoints->LineEdit1->setText("");
+ //GroupPoints2->LineEdit1->setText("");
+ //myObject = GEOM::GEOM_Object::_nil();
//myGeomGUI->SetState( 0 );
- globalSelection( GEOM_COMPOUND );
+ //globalSelection( GEOM_COMPOUND );
+ activateSelection();
}
// function : enterEvent()
// purpose : Mouse enter onto the dialog to activate it
//=================================================================================
-void RepairGUI_GlueDlg::enterEvent(QEvent* e)
+void RepairGUI_GlueDlg::enterEvent( QEvent* )
{
- if ( !GroupConstructors->isEnabled() )
+ if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog();
}
-//=================================================================================
-// function : closeEvent()
-// purpose :
-//=================================================================================
-void RepairGUI_GlueDlg::closeEvent(QCloseEvent* e)
-{
- //myGeomGUI->SetState( -1 );
- GEOMBase_Skeleton::closeEvent( e );
-}
-
//=================================================================================
// function : createOperation
// purpose :
//=================================================================================
bool RepairGUI_GlueDlg::isValid( QString& msg )
{
- return !myObject->_is_nil() && ( IsPreview() || myTolEdt->value() > 0. );
+ bool ok = true;
+ double v = 0;
+ switch ( getConstructorId() )
+ {
+ case 0:
+ v = myTolEdt->value();
+ ok = myTolEdt->isValid( msg, !IsPreview() );
+ break;
+ case 1:
+ v = myTolEdt2->value();
+ ok = myTolEdt2->isValid( msg, !IsPreview() );
+ break;
+ }
+ return !myObject->_is_nil() && ( IsPreview() || v > 0. ) && ok;
}
//=================================================================================
bool RepairGUI_GlueDlg::execute( ObjectList& objects )
{
bool aResult = false;
- GEOM::GEOM_Object_var anObj = GEOM::GEOM_IShapesOperations::_narrow
- ( getOperation() )->MakeGlueFaces( myObject, myTolEdt->value() );
- aResult = !anObj->_is_nil();
- if ( aResult )
- objects.push_back( anObj._retn() );
+ objects.clear();
+
+ GEOM::GEOM_IShapesOperations_var anOper = GEOM::GEOM_IShapesOperations::_narrow( getOperation() );
+ switch ( getConstructorId() ) {
+ case 0:
+ {
+ GEOM::GEOM_Object_var anObj = anOper->MakeGlueFaces( myObject, myTolEdt->value(), true );
+ aResult = !anObj->_is_nil();
+ if ( aResult && !IsPreview() )
+ {
+ QStringList aParameters;
+ aParameters << myTolEdt->text();
+ anObj->SetParameters(aParameters.join(":").toLatin1().constData());
+
+ objects.push_back( anObj._retn() );
+ }
+ break;
+ }
+ case 1:
+ {
+ if ( IsPreview() ) {
+ // if this method is used for displaying preview then we must detect glue faces only
+ for ( int i = 0; i < myTmpObjs.count(); i++ ) {
+ myTmpObjs[i].get()->Register(); // increment counter, since calling function will call UnRegister()
+ objects.push_back( myTmpObjs[i].copy() );
+ }
+ return !myTmpObjs.isEmpty();
+ } // IsPreview
+
+ // Make glue face by list.
+ // Iterate through myTmpObjs and verifies where each object is currently selected or not.
+ QSet<QString> selected;
+
+ // Get names of selected objects
+ LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+ SALOME_ListIO aSelList;
+ aSelMgr->selectedObjects(aSelList);
+
+ SALOME_ListIteratorOfListIO it (aSelList);
+ for (; it.More(); it.Next())
+ selected.insert(it.Value()->getName());
+
+ // Iterate through result and select objects with names from selection
+ // ObjectList toRemoveFromEnggine;
+
+ // make glue faces
+ GEOM::ListOfGO_var aListForGlue = new GEOM::ListOfGO();
+ aListForGlue->length( myTmpObjs.count() );
+ int added = 0;
+ for ( int i = 0; i < myTmpObjs.count(); i++ ) {
+ CORBA::String_var tmpior = myGeomGUI->getApp()->orb()->object_to_string(myTmpObjs[i].get());
+ if ( selected.contains( tmpior.in() ) )
+ aListForGlue[ added++ ] = myTmpObjs[i].copy();
+ }
+ aListForGlue->length( added );
+
+ GEOM::GEOM_Object_var anObj = anOper->MakeGlueFacesByList( myObject, myTolEdt2->value(), aListForGlue.in(), true );
+
+ aResult = !anObj->_is_nil();
+
+ if ( aResult )
+ {
+ if ( !IsPreview() )
+ {
+ QStringList aParameters;
+ aParameters << myTolEdt2->text();
+ anObj->SetParameters(aParameters.join(":").toLatin1().constData());
+ }
+ objects.push_back( anObj._retn() );
+ }
+
+ // Remove from engine useless objects
+ clearTemporary();
+
+ updateButtonState();
+
+ break;
+ } // case 1
+ } // switch
return aResult;
}
+//=================================================================================
+// function : restoreSubShapes
+// purpose :
+//=================================================================================
+void RepairGUI_GlueDlg::restoreSubShapes( SALOMEDS::Study_ptr theStudy,
+ SALOMEDS::SObject_ptr theSObject )
+{
+ if ( mainFrame()->CheckBoxRestoreSS->isChecked() ) {
+ GEOM::find_shape_method aFindMethod = GEOM::FSM_GetInPlace;
+ if ( getConstructorId() == 0 ) // MakeGlueFaces
+ aFindMethod = GEOM::FSM_GetInPlaceByHistory;
+
+ // empty list of arguments means that all arguments should be restored
+ getGeomEngine()->RestoreSubShapesSO( theStudy, theSObject, GEOM::ListOfGO(),
+ aFindMethod, /*theInheritFirstArg=*/true,
+ mainFrame()->CheckBoxAddPrefix->isChecked() );
+ }
+}
+
//================================================================
// Function : clearShapeBufferLocal
// Purpose :
if ( CORBA::is_nil( theObj ) )
return;
- string IOR = myGeomGUI->getApp()->orb()->object_to_string( theObj );
- TCollection_AsciiString asciiIOR( strdup( IOR.c_str() ) );
+ CORBA::String_var IOR = myGeomGUI->getApp()->orb()->object_to_string( theObj );
+ TCollection_AsciiString asciiIOR( (char *)( IOR.in() ) );
myGeomGUI->GetShapeReader().RemoveShapeFromBuffer( asciiIOR );
if ( !getStudy() || !( getStudy()->studyDS() ) )
return;
_PTR(Study) aStudy = getStudy()->studyDS();
- _PTR(SObject) aSObj ( aStudy->FindObjectIOR( IOR ) );
+ _PTR(SObject) aSObj ( aStudy->FindObjectIOR( std::string( IOR.in() ) ) );
if ( !aSObj )
return;
// It perfroms user input validation, then it
// performs a proper operation and manages transactions, etc.
//================================================================
-bool RepairGUI_GlueDlg::onAcceptLocal( const bool publish, const bool useTransaction )
+bool RepairGUI_GlueDlg::onAcceptLocal()
{
if ( !getStudy() || !( getStudy()->studyDS() ) )
return false;
bool aLocked = aStudy->GetProperties()->IsLocked();
if ( aLocked ) {
MESSAGE("GEOMBase_Helper::onAccept - ActiveStudy is locked");
- SUIT_MessageBox::warn1 ( (QWidget*)(SUIT_Session::session()->activeApplication()->desktop()),
- QObject::tr("WRN_WARNING"),
- QObject::tr("WRN_STUDY_LOCKED"),
- QObject::tr("BUT_OK") );
+ SUIT_MessageBox::warning( this, tr( "WRN_WARNING" ), tr( "WRN_STUDY_LOCKED" ), tr( "BUT_OK" ) );
return false;
}
erasePreview( false );
try {
- if ( ( !publish && !useTransaction ) || openCommand() ) {
-
+ if ( openCommand() ) {
SUIT_OverrideCursor wc;
-
- SUIT_Session::session()->activeApplication()->putInfo( "" );
+
+ myGeomGUI->getApp()->putInfo( "" );
ObjectList objects;
- // JFA 28.12.2004 if ( !execute( objects ) || !getOperation()->IsDone() ) {
- if ( !execute( objects ) ) { // JFA 28.12.2004 // To enable warnings
- wc.suspend();
+
+ if ( !execute( objects ) ) {
+ wc.suspend();
abortCommand();
- showError();
+ showError();
}
else {
- const int nbObjs = objects.size();
- bool withChildren = false;
- for ( ObjectList::iterator it = objects.begin(); it != objects.end(); ++it ) {
- if ( publish ) {
- QString aName("");
- if ( nbObjs > 1 )
- aName = strlen( getNewObjectName() ) ? GEOMBase::GetDefaultName( getNewObjectName() ) : GEOMBase::GetDefaultName( getPrefix( *it ) );
- else {
- aName = getNewObjectName();
- // PAL6521: use a prefix, if some dialog box doesn't reimplement getNewObjectName()
- if ( aName.isEmpty() )
- aName = GEOMBase::GetDefaultName( getPrefix( *it ) );
- }
- addInStudy( *it, aName.latin1() );
- withChildren = false;
- display( *it, false );
- }
- else { // asv : fix of PAL6454. If publish==false, then the original shape was modified, and need to be re-cached in GEOM_Client
- // before redisplay
- clearShapeBufferLocal( *it );
- withChildren = true;
- redisplay( *it, withChildren, false );
+ const int nbObjs = objects.size();
+ for ( ObjectList::iterator it = objects.begin(); it != objects.end(); ++it ) {
+ QString aName = getNewObjectName();
+ if ( nbObjs > 1 ) {
+ if ( aName.isEmpty() )
+ aName = getPrefix( *it );
+ aName = GEOMBase::GetDefaultName( aName );
}
- }
-
- if ( nbObjs ) {
- commitCommand();
- updateObjBrowser();
- SUIT_Session::session()->activeApplication()->putInfo( QObject::tr("GEOM_PRP_DONE") );
- }
- else {
- abortCommand();
+ else {
+ // PAL6521: use a prefix, if some dialog box doesn't reimplement getNewObjectName()
+ if ( aName.isEmpty() )
+ aName = GEOMBase::GetDefaultName( getPrefix( *it ) );
+ }
+ addInStudy( *it, aName.toLatin1().data() );
+ display( *it, false );
+ }
+
+ if ( nbObjs ) {
+ commitCommand();
+ updateObjBrowser();
+ myGeomGUI->getApp()->putInfo( QObject::tr("GEOM_PRP_DONE") );
+ }
+ else {
+ abortCommand();
}
// JFA 28.12.2004 BEGIN // To enable warnings
- if ( !getOperation()->_is_nil() ) {
- if ( !getOperation()->IsDone() ) {
- wc.suspend();
- QString msgw = QObject::tr( getOperation()->GetErrorCode() );
- SUIT_MessageBox::warn1((QWidget*)(SUIT_Session::session()->activeApplication()->desktop()),
- QObject::tr( "WRN_WARNING" ),
- msgw,
- QObject::tr( "BUT_OK" ));
- }
+ GEOM::GEOM_IShapesOperations_var anOper = GEOM::GEOM_IShapesOperations::_narrow( getOperation() );
+ if ( !CORBA::is_nil(anOper) && !anOper->IsDone() ) {
+ wc.suspend();
+ QString msgw = QObject::tr( anOper->GetErrorCode() );
+ SUIT_MessageBox::warning( this, tr( "WRN_WARNING" ), msgw, tr( "BUT_OK" ) );
}
// JFA 28.12.2004 END
}
}
updateViewer();
+ activateSelection();
+ updateButtonState();
return true;
}
+
+
+//=================================================================================
+// function : onDetect
+// purpose :
+//=================================================================================
+void RepairGUI_GlueDlg::onDetect()
+{
+ clearTemporary();
+ QString msg;
+ if ( !isValid( msg ) ) {
+ showError( msg );
+ return;
+ }
+
+ buttonOk()->setEnabled( false );
+ buttonApply()->setEnabled( false );
+ globalSelection( GEOM_ALLSHAPES );
+
+ GEOM::GEOM_IShapesOperations_var anOper = GEOM::GEOM_IShapesOperations::_narrow( getOperation() );
+ GEOM::ListOfGO_var aList = anOper->GetGlueFaces( myObject.in(), myTolEdt2->value() );
+
+ for ( int i = 0, n = aList->length(); i < n; i++ )
+ myTmpObjs << GEOM::GeomObjPtr( aList[i].in() );
+
+ if ( !myTmpObjs.isEmpty() ) {
+ msg = tr( "FACES_FOR_GLUING_ARE_DETECTED" ).arg( myTmpObjs.count() );
+ mySubShapesChk->setChecked( true );
+ }
+ else {
+ msg = tr( "THERE_ARE_NO_FACES_FOR_GLUING" );
+ }
+
+ connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+ this, SLOT( SelectionIntoArgument() ) ) ;
+ SUIT_MessageBox::information( this, tr( "GEOM_FREE_BOUNDS_TLT" ), msg, tr( "Close" ) );
+ updateButtonState();
+ activateSelection();
+}
+
+//=================================================================================
+// function : activateSelection
+// purpose : Redisplay preview and Activate selection
+//=================================================================================
+void RepairGUI_GlueDlg::activateSelection()
+{
+ erasePreview( false );
+
+ int anId = getConstructorId();
+ if ( anId == 0 ) {
+ // Case of whole gluing
+ disconnect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+ this, SLOT( SelectionIntoArgument() ) );
+
+ globalSelection( GEOM_ALLSHAPES );
+ if ( myObject->_is_nil())
+ SelectionIntoArgument();
+
+ connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+ this, SLOT( SelectionIntoArgument() ) );
+ }
+ else {
+ // Second case of gluing
+ if ( !mySubShapesChk->isChecked() )
+ globalSelection( GEOM_ALLSHAPES );
+ else {
+ displayPreview( true, true, false, false, 2/*line width*/, 1/*display mode*/, Quantity_NOC_RED );
+ disconnect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+ this, SLOT( SelectionIntoArgument() ) ) ;
+ globalSelection( GEOM_PREVIEW );
+ connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+ this, SLOT( SelectionIntoArgument() ) ) ;
+ }
+ }
+ updateViewer();
+}
+
+//=================================================================================
+// function : updateButtonState
+// purpose : Update button state
+//=================================================================================
+void RepairGUI_GlueDlg::updateButtonState()
+{
+ int anId = getConstructorId();
+ bool hasMainObj = !myObject->_is_nil();
+ if ( anId == 0 ) {
+ buttonOk()->setEnabled( hasMainObj );
+ buttonApply()->setEnabled( hasMainObj );
+ }
+ else
+ {
+ LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+ SALOME_ListIO aSelList;
+ aSelMgr->selectedObjects(aSelList);
+
+ SALOME_ListIteratorOfListIO it (aSelList);
+ bool wasSelected = it.More() > 0;
+ bool wasDetected = !myTmpObjs.isEmpty();
+ buttonOk()->setEnabled( hasMainObj && wasDetected && wasSelected );
+ buttonApply()->setEnabled( hasMainObj && wasDetected && wasSelected );
+ mySubShapesChk->setEnabled( hasMainObj && wasDetected );
+ myDetectBtn->setEnabled( hasMainObj );
+ if ( !hasMainObj || !wasDetected )
+ mySubShapesChk->setChecked( false );
+ }
+}
+
+//=================================================================================
+// function : clearTemporary
+// purpose : Remove temporary objects from engine
+//=================================================================================
+void RepairGUI_GlueDlg::clearTemporary()
+{
+ myTmpObjs.clear();
+}
+
+//=================================================================================
+// function : onTolerChanged
+// purpose : Remove temporary objects from engine
+//=================================================================================
+void RepairGUI_GlueDlg::onTolerChanged( double /*theVal*/ )
+{
+ clearTemporary();
+ activateSelection();
+ updateButtonState();
+}
+
+//=================================================================================
+// function : onSubShapesChk
+// purpose : Update selection mode
+//=================================================================================
+void RepairGUI_GlueDlg::onSubShapesChk()
+{
+ if ( !mySubShapesChk->isChecked() )
+ clearTemporary();
+ activateSelection();
+ updateButtonState();
+}
+
+//=================================================================================
+// function : ClickOnCancel
+// purpose : Remove temporary objects from engine and call method of base class
+//=================================================================================
+void RepairGUI_GlueDlg::ClickOnCancel()
+{
+ clearTemporary();
+ GEOMBase_Skeleton::ClickOnCancel();
+}
