-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// 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
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
aDlgLay->setStretchFactor( aMainFrame, 1 );
- if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ) )
- mySelector = aViewWindow->GetSelector();
-
- myHelpFileName = "pattern_mapping_page.html";
+ myHelpFileName = "pattern_mapping.html";
Init( theType );
}
aLay->addWidget( myHelpBtn );
connect( myOkBtn, SIGNAL( clicked() ), this, SLOT( onOk() ) );
- connect( myCloseBtn, SIGNAL( clicked() ), this, SLOT( onClose() ) );
+ connect( myCloseBtn, SIGNAL( clicked() ), this, SLOT( reject() ) );
connect( mySaveBtn, SIGNAL( clicked() ), this, SLOT( onSave() ) );
connect( myHelpBtn, SIGNAL( clicked() ), this, SLOT( onHelp() ) );
//=======================================================================
// function : onProject()
-// purpose : SLOT. Called when state of "Project nodes on ther face"
+// purpose : SLOT. Called when state of "Project nodes on other face"
// checkbox is changed
//=======================================================================
void SMESHGUI_CreatePatternDlg::onProject( bool )
connect( mySMESHGUI, SIGNAL( SignalDeactivateActiveDialog() ),
this, SLOT( onDeactivate() ) );
connect( mySMESHGUI, SIGNAL( SignalCloseAllDialogs() ),
- this, SLOT( onClose() ) );
+ this, SLOT( reject() ) );
mySwitch2d->setEnabled( theType == Type_2d );
mySwitch3d->setEnabled( theType == Type_3d );
SUIT_FileDlg* aDlg = new SUIT_FileDlg( this, false );
aDlg->setWindowTitle( tr( "SAVE_PATTERN" ) );
aDlg->setFileMode( QFileDialog::AnyFile );
- aDlg->setFilter( tr( "PATTERN_FILT" ) );
+ aDlg->setNameFilter( tr( "PATTERN_FILT" ) );
if ( myName->text() != "" )
aDlg->selectFile( myName->text() );
if ( QFileInfo( fName ).suffix().isEmpty() )
fName = autoExtension( fName );
- fName = QDir::convertSeparators( fName );
+ fName = QDir::toNativeSeparators( fName );
QString aData( myPattern->GetString() );
long aLen = aData.length();
}
//=======================================================================
-// function : onClose()
+// function : reject()
// purpose : SLOT called when "Close" button pressed. Close dialog
//=======================================================================
-void SMESHGUI_CreatePatternDlg::onClose()
+void SMESHGUI_CreatePatternDlg::reject()
{
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ) )
aViewWindow->SetSelectionMode( ActorSelection );
disconnect( mySelectionMgr, 0, this, 0 );
disconnect( mySMESHGUI, 0, this, 0 );
mySMESHGUI->ResetState();
- reject();
+ QDialog::reject();
emit Close();
}
{
try {
SALOME_ListIO aList;
- mySelectionMgr->selectedObjects( aList, SVTK_Viewer::Type() );
+ mySelectionMgr->selectedObjects( aList );
if ( aList.Extent() != 1 )
return;
//=======================================================================
// function : onDeactivate()
-// purpose : SLOT called when dialog must be deativated
+// purpose : SLOT called when dialog must be deactivated
//=======================================================================
void SMESHGUI_CreatePatternDlg::onDeactivate()
{
//=======================================================================
void SMESHGUI_CreatePatternDlg::enterEvent( QEvent* )
{
- // there is a stange problem that enterEvent() comes after onSave()
+ // there is a strange problem that enterEvent() comes after onSave()
if ( isVisible () ) {
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled( true );
}
}
-//=================================================================================
-// function : closeEvent()
-// purpose : Close dialog box
-//=================================================================================
-void SMESHGUI_CreatePatternDlg::closeEvent( QCloseEvent* )
-{
- onClose();
-}
-
//=======================================================================
// function : onSelBtnClicked()
// purpose : SLOT. Called when -> button clicked.