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
0022628: [CEA 1202] The default icon disposition is not correct in french and in...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshPatternDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
index 48b0a82b9770be9aacd217a92254f73474a5f355..46bf3ef55f73d3773143e785055c307d01a84b01 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
@@
-119,13
+119,13
@@
SMESHGUI_MeshPatternDlg::SMESHGUI_MeshPatternDlg( SMESHGUI* theModule )
aDlgLay->setMargin( MARGIN );
aDlgLay->setSpacing( SPACING );
aDlgLay->setMargin( MARGIN );
aDlgLay->setSpacing( SPACING );
-
QWidget* a
MainFrame = createMainFrame ( this );
+
my
MainFrame = createMainFrame ( this );
QWidget* aBtnFrame = createButtonFrame( this );
QWidget* aBtnFrame = createButtonFrame( this );
- aDlgLay->addWidget(
a
MainFrame );
+ aDlgLay->addWidget(
my
MainFrame );
aDlgLay->addWidget( aBtnFrame );
aDlgLay->addWidget( aBtnFrame );
- aDlgLay->setStretchFactor(
a
MainFrame, 1 );
+ aDlgLay->setStretchFactor(
my
MainFrame, 1 );
mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
@@
-948,7
+948,7
@@
void SMESHGUI_MeshPatternDlg::displayPreview()
// Create and display actor
vtkDataSetMapper* aMapper = vtkDataSetMapper::New();
// Create and display actor
vtkDataSetMapper* aMapper = vtkDataSetMapper::New();
- aMapper->SetInput(aGrid);
+ aMapper->SetInput
Data
(aGrid);
myPreviewActor = SALOME_Actor::New();
myPreviewActor->PickableOff();
myPreviewActor = SALOME_Actor::New();
myPreviewActor->PickableOff();
@@
-1201,11
+1201,16
@@
void SMESHGUI_MeshPatternDlg::onTypeChanged (int theType)
myNode2Lbl->show();
myNode2 ->show();
}
myNode2Lbl->show();
myNode2 ->show();
}
-
mySelInput = Mesh;
activateSelection();
updateWgState();
displayPreview();
mySelInput = Mesh;
activateSelection();
updateWgState();
displayPreview();
+ myPicture2d->hide();
+ myPicture2d->show();
+ myPicture2d->resize(minimumSizeHint());
+ myMainFrame->hide();
+ myMainFrame->show();
+ resize(minimumSizeHint());
}
//=======================================================================
}
//=======================================================================
@@
-1331,8
+1336,10
@@
void SMESHGUI_MeshPatternDlg::onModeToggled (bool on)
{
on ? myRefineGrp->show() : myRefineGrp->hide();
on ? myGeomGrp->hide() : myGeomGrp->show();
{
on ? myRefineGrp->show() : myRefineGrp->hide();
on ? myGeomGrp->hide() : myGeomGrp->show();
-
+ myMainFrame->hide();
+ myMainFrame->show();
displayPreview();
displayPreview();
+ resize(minimumSizeHint());
}
//=======================================================================
}
//=======================================================================