Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into V8_1_BR
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_CreatePatternDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
index 9413696e9852a5884a721a276a850e3128c64dde..6627b417af6d794901769676461aba1f1a87c6d8 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-105,9
+105,6
@@
SMESHGUI_CreatePatternDlg::SMESHGUI_CreatePatternDlg( SMESHGUI* theModule,
aDlgLay->setStretchFactor( aMainFrame, 1 );
aDlgLay->setStretchFactor( aMainFrame, 1 );
- if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ) )
- mySelector = aViewWindow->GetSelector();
-
myHelpFileName = "pattern_mapping_page.html";
Init( theType );
myHelpFileName = "pattern_mapping_page.html";
Init( theType );
@@
-381,7
+378,7
@@
void SMESHGUI_CreatePatternDlg::onSave()
SUIT_FileDlg* aDlg = new SUIT_FileDlg( this, false );
aDlg->setWindowTitle( tr( "SAVE_PATTERN" ) );
aDlg->setFileMode( QFileDialog::AnyFile );
SUIT_FileDlg* aDlg = new SUIT_FileDlg( this, false );
aDlg->setWindowTitle( tr( "SAVE_PATTERN" ) );
aDlg->setFileMode( QFileDialog::AnyFile );
- aDlg->setFilter( tr( "PATTERN_FILT" ) );
+ aDlg->set
Name
Filter( tr( "PATTERN_FILT" ) );
if ( myName->text() != "" )
aDlg->selectFile( myName->text() );
if ( myName->text() != "" )
aDlg->selectFile( myName->text() );
@@
-395,7
+392,7
@@
void SMESHGUI_CreatePatternDlg::onSave()
if ( QFileInfo( fName ).suffix().isEmpty() )
fName = autoExtension( fName );
if ( QFileInfo( fName ).suffix().isEmpty() )
fName = autoExtension( fName );
- fName = QDir::
convert
Separators( fName );
+ fName = QDir::
toNative
Separators( fName );
QString aData( myPattern->GetString() );
long aLen = aData.length();
QString aData( myPattern->GetString() );
long aLen = aData.length();
@@
-572,7
+569,7
@@
void SMESHGUI_CreatePatternDlg::onSelectionDone()
{
try {
SALOME_ListIO aList;
{
try {
SALOME_ListIO aList;
- mySelectionMgr->selectedObjects( aList
, SVTK_Viewer::Type()
);
+ mySelectionMgr->selectedObjects( aList );
if ( aList.Extent() != 1 )
return;
if ( aList.Extent() != 1 )
return;