mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-04-08 10:47:27 +05:00
PAL11563: Naming Policy. Export to MED groups with duplicated names forbidden: ask user whether to rename automatically or cancel exporting.
This commit is contained in:
parent
56ee43a2eb
commit
e8c71ef8da
@ -146,7 +146,7 @@
|
|||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
namespace{
|
namespace{
|
||||||
// Decalarations
|
// Declarations
|
||||||
//=============================================================
|
//=============================================================
|
||||||
void ImportMeshesFromFile(SMESH::SMESH_Gen_ptr theComponentMesh,
|
void ImportMeshesFromFile(SMESH::SMESH_Gen_ptr theComponentMesh,
|
||||||
int theCommandID);
|
int theCommandID);
|
||||||
@ -260,30 +260,45 @@ namespace{
|
|||||||
switch ( theCommandID ) {
|
switch ( theCommandID ) {
|
||||||
case 125:
|
case 125:
|
||||||
case 122:
|
case 122:
|
||||||
aFilterMap.insert( QObject::tr("MED 2.1 (*.med)"), SMESH::MED_V2_1 );
|
{
|
||||||
aFilterMap.insert( QObject::tr("MED 2.2 (*.med)"), SMESH::MED_V2_2 );
|
if (aMesh->HasDuplicatedGroupNamesMED()) {
|
||||||
|
int aRet = SUIT_MessageBox::warn2
|
||||||
|
(SMESHGUI::desktop(),
|
||||||
|
QObject::tr("SMESH_WRN_WARNING"),
|
||||||
|
QObject::tr("SMESH_EXPORT_MED_DUPLICATED_GRP").arg(anIObject->getName()),
|
||||||
|
QObject::tr("SMESH_BUT_YES"), QObject::tr("SMESH_BUT_NO"),
|
||||||
|
0, 1, 0);
|
||||||
|
if (aRet)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
aFilterMap.insert( QObject::tr("MED 2.1 (*.med)"), SMESH::MED_V2_1 );
|
||||||
|
aFilterMap.insert( QObject::tr("MED 2.2 (*.med)"), SMESH::MED_V2_2 );
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case 124:
|
case 124:
|
||||||
case 121:
|
case 121:
|
||||||
aFilter = QObject::tr("DAT files (*.dat)");
|
aFilter = QObject::tr("DAT files (*.dat)");
|
||||||
break;
|
break;
|
||||||
case 126:
|
case 126:
|
||||||
case 123: {
|
case 123:
|
||||||
if(aMesh->NbPyramids()){
|
{
|
||||||
int aRet = SUIT_MessageBox::warn2(SMESHGUI::desktop(),
|
if (aMesh->NbPyramids()) {
|
||||||
QObject::tr("SMESH_WRN_WARNING"),
|
int aRet = SUIT_MessageBox::warn2
|
||||||
QObject::tr("SMESH_EXPORT_UNV").arg(anIObject->getName()),
|
(SMESHGUI::desktop(),
|
||||||
QObject::tr("SMESH_BUT_YES"),
|
QObject::tr("SMESH_WRN_WARNING"),
|
||||||
QObject::tr("SMESH_BUT_NO"),
|
QObject::tr("SMESH_EXPORT_UNV").arg(anIObject->getName()),
|
||||||
0,1,0);
|
QObject::tr("SMESH_BUT_YES"), QObject::tr("SMESH_BUT_NO"),
|
||||||
if(aRet)
|
0, 1, 0);
|
||||||
return;
|
if (aRet)
|
||||||
}
|
return;
|
||||||
aFilter = QObject::tr("IDEAS files (*.unv)");
|
}
|
||||||
|
aFilter = QObject::tr("IDEAS files (*.unv)");
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
}}
|
}
|
||||||
|
|
||||||
QString aFilename;
|
QString aFilename;
|
||||||
SMESH::MED_VERSION aFormat;
|
SMESH::MED_VERSION aFormat;
|
||||||
@ -295,41 +310,42 @@ namespace{
|
|||||||
|
|
||||||
if ( theCommandID != 122 && theCommandID != 125 )
|
if ( theCommandID != 122 && theCommandID != 125 )
|
||||||
aFilename = SUIT_FileDlg::getFileName(SMESHGUI::desktop(), "", aFilter, aTitle, false);
|
aFilename = SUIT_FileDlg::getFileName(SMESHGUI::desktop(), "", aFilter, aTitle, false);
|
||||||
else
|
else {
|
||||||
{
|
QStringList filters;
|
||||||
QStringList filters;
|
QMap<QString, SMESH::MED_VERSION>::const_iterator it = aFilterMap.begin();
|
||||||
for ( QMap<QString, SMESH::MED_VERSION>::const_iterator it = aFilterMap.begin(); it != aFilterMap.end(); ++it )
|
for ( ; it != aFilterMap.end(); ++it )
|
||||||
filters.push_back( it.key() );
|
filters.push_back( it.key() );
|
||||||
|
|
||||||
//SUIT_FileDlg* fd = new SUIT_FileDlg( SMESHGUI::desktop(), false, true, true );
|
//SUIT_FileDlg* fd = new SUIT_FileDlg( SMESHGUI::desktop(), false, true, true );
|
||||||
SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg( SMESHGUI::desktop(), false, QObject::tr("SMESH_AUTO_GROUPS") ,true, true );
|
SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg
|
||||||
fd->setCaption( aTitle );
|
( SMESHGUI::desktop(), false, QObject::tr("SMESH_AUTO_GROUPS") ,true, true );
|
||||||
fd->setFilters( filters );
|
fd->setCaption( aTitle );
|
||||||
fd->setSelectedFilter( QObject::tr("MED 2.2 (*.med)") );
|
fd->setFilters( filters );
|
||||||
fd->SetChecked(toCreateGroups);
|
fd->setSelectedFilter( QObject::tr("MED 2.2 (*.med)") );
|
||||||
bool is_ok = false;
|
fd->SetChecked(toCreateGroups);
|
||||||
while(!is_ok){
|
bool is_ok = false;
|
||||||
fd->exec();
|
while (!is_ok) {
|
||||||
aFilename = fd->selectedFile();
|
fd->exec();
|
||||||
aFormat = aFilterMap[fd->selectedFilter()];
|
aFilename = fd->selectedFile();
|
||||||
is_ok = true;
|
aFormat = aFilterMap[fd->selectedFilter()];
|
||||||
if( !aFilename.isEmpty()
|
is_ok = true;
|
||||||
&& (aMesh->NbPolygons()>0 or aMesh->NbPolyhedrons()>0)
|
if ( !aFilename.isEmpty()
|
||||||
&& aFormat==SMESH::MED_V2_1){
|
&& (aMesh->NbPolygons()>0 or aMesh->NbPolyhedrons()>0)
|
||||||
int aRet = SUIT_MessageBox::warn2(SMESHGUI::desktop(),
|
&& aFormat==SMESH::MED_V2_1) {
|
||||||
QObject::tr("SMESH_WRN_WARNING"),
|
int aRet = SUIT_MessageBox::warn2(SMESHGUI::desktop(),
|
||||||
QObject::tr("SMESH_EXPORT_MED_V2_1").arg(anIObject->getName()),
|
QObject::tr("SMESH_WRN_WARNING"),
|
||||||
QObject::tr("SMESH_BUT_YES"),
|
QObject::tr("SMESH_EXPORT_MED_V2_1").arg(anIObject->getName()),
|
||||||
QObject::tr("SMESH_BUT_NO"),
|
QObject::tr("SMESH_BUT_YES"),
|
||||||
0,1,0);
|
QObject::tr("SMESH_BUT_NO"),
|
||||||
if(aRet){
|
0,1,0);
|
||||||
is_ok = false;
|
if (aRet) {
|
||||||
}
|
is_ok = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
toCreateGroups = fd->IsChecked();
|
}
|
||||||
delete fd;
|
toCreateGroups = fd->IsChecked();
|
||||||
}
|
delete fd;
|
||||||
|
}
|
||||||
if ( !aFilename.isEmpty() ) {
|
if ( !aFilename.isEmpty() ) {
|
||||||
// Check whether the file already exists and delete it if yes
|
// Check whether the file already exists and delete it if yes
|
||||||
QFile aFile( aFilename );
|
QFile aFile( aFilename );
|
||||||
|
@ -1260,6 +1260,13 @@ msgid "SMESH_EXPORT_UNV"
|
|||||||
msgstr "During export mesh with name - \"%1\" to UNV\n"
|
msgstr "During export mesh with name - \"%1\" to UNV\n"
|
||||||
" pyramid's elements will be missed"
|
" pyramid's elements will be missed"
|
||||||
|
|
||||||
|
msgid "SMESH_EXPORT_MED_DUPLICATED_GRP"
|
||||||
|
msgstr "There are duplicated group names in mesh \"%1\".\n"
|
||||||
|
"You can cancel exporting and rename them,\n"
|
||||||
|
"otherwise some group names in the resulting MED file\n"
|
||||||
|
"will not match ones in the study.\n"
|
||||||
|
"Do you want to continue ?"
|
||||||
|
|
||||||
msgid "SMESH_EXPORT_MED_V2_1"
|
msgid "SMESH_EXPORT_MED_V2_1"
|
||||||
msgstr "During export mesh with name - \"%1\" to MED 2.1\n"
|
msgstr "During export mesh with name - \"%1\" to MED 2.1\n"
|
||||||
"polygons and polyhedrons elements will be missed\n"
|
"polygons and polyhedrons elements will be missed\n"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user