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
ContrĂ´le du choix des pas de temps
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_CreatePatternDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
old mode 100755
(executable)
new mode 100644
(file)
index
a39a62e
..
e501d95
--- a/
src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
@@
-105,10
+105,7
@@
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";
+ myHelpFileName = "pattern_mapping.html";
Init( theType );
}
Init( theType );
}
@@
-247,7
+244,7
@@
SMESHGUI_CreatePatternDlg::~SMESHGUI_CreatePatternDlg()
//=======================================================================
// function : onProject()
//=======================================================================
// function : onProject()
-// purpose : SLOT. Called when state of "Project nodes on ther face"
+// purpose : SLOT. Called when state of "Project nodes on
o
ther face"
// checkbox is changed
//=======================================================================
void SMESHGUI_CreatePatternDlg::onProject( bool )
// checkbox is changed
//=======================================================================
void SMESHGUI_CreatePatternDlg::onProject( bool )
@@
-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,14
+392,14
@@
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();
QFile aFile( fName );
aFile.open( QIODevice::WriteOnly );
QString aData( myPattern->GetString() );
long aLen = aData.length();
QFile aFile( fName );
aFile.open( QIODevice::WriteOnly );
- long aWritten = aFile.write( aData.to
Latin1
(), aLen );
+ long aWritten = aFile.write( aData.to
Utf8
(), aLen );
aFile.close();
if ( aWritten != aLen ) {
aFile.close();
if ( aWritten != aLen ) {
@@
-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;
@@
-625,7
+622,7
@@
void SMESHGUI_CreatePatternDlg::onSelectionDone()
//=======================================================================
// function : onDeactivate()
//=======================================================================
// function : onDeactivate()
-// purpose : SLOT called when dialog must be deativated
+// purpose : SLOT called when dialog must be dea
c
tivated
//=======================================================================
void SMESHGUI_CreatePatternDlg::onDeactivate()
{
//=======================================================================
void SMESHGUI_CreatePatternDlg::onDeactivate()
{
@@
-639,7
+636,7
@@
void SMESHGUI_CreatePatternDlg::onDeactivate()
//=======================================================================
void SMESHGUI_CreatePatternDlg::enterEvent( QEvent* )
{
//=======================================================================
void SMESHGUI_CreatePatternDlg::enterEvent( QEvent* )
{
- // there is a stange problem that enterEvent() comes after onSave()
+ // there is a st
r
ange problem that enterEvent() comes after onSave()
if ( isVisible () ) {
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled( true );
if ( isVisible () ) {
mySMESHGUI->EmitSignalDeactivateDialog();
setEnabled( true );