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/V8_5_asterstudy'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI.cxx
diff --git
a/src/SMESHGUI/SMESHGUI.cxx
b/src/SMESHGUI/SMESHGUI.cxx
index 99aa9608c63e6f87fdd1e38b8854f1b5c6352baa..1225963f69b6af8558c3af9f92c514c5bc047428 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI.cxx
+++ b/
src/SMESHGUI/SMESHGUI.cxx
@@
-811,7
+811,7
@@
namespace
bool is_ok = false;
while (!is_ok) {
bool is_ok = false;
while (!is_ok) {
-
//
MESSAGE("******* Loop on file dialog ***********");
+ MESSAGE("******* Loop on file dialog ***********");
isOkToWrite =true;
if ( fd->exec() )
aFilename = fd->selectedFile();
isOkToWrite =true;
if ( fd->exec() )
aFilename = fd->selectedFile();
@@
-820,13
+820,15
@@
namespace
break;
}
aFormat = aFilterMap[fd->selectedNameFilter()];
break;
}
aFormat = aFilterMap[fd->selectedNameFilter()];
-
//
MESSAGE("selected minor: " << aFormat << " file: " << aFilename.toUtf8().constData());
+ MESSAGE("selected minor: " << aFormat << " file: " << aFilename.toUtf8().constData());
toOverwrite = fv->isOverwrite(aFilename);
toOverwrite = fv->isOverwrite(aFilename);
+ MESSAGE("toOverwrite:" << toOverwrite);
is_ok = true;
if ( !aFilename.isEmpty() ) {
if( !toOverwrite ) {
// can't append to an existing using other format
bool isVersionOk = SMESHGUI::GetSMESHGen()->CheckWriteCompatibility( aFilename.toUtf8().constData() );
is_ok = true;
if ( !aFilename.isEmpty() ) {
if( !toOverwrite ) {
// can't append to an existing using other format
bool isVersionOk = SMESHGUI::GetSMESHGen()->CheckWriteCompatibility( aFilename.toUtf8().constData() );
+ MESSAGE("Append check, isVersionOk:" << isVersionOk);
if ( !isVersionOk ) {
int aRet = SUIT_MessageBox::warning(SMESHGUI::desktop(),
QObject::tr("SMESH_WRN_WARNING"),
if ( !isVersionOk ) {
int aRet = SUIT_MessageBox::warning(SMESHGUI::desktop(),
QObject::tr("SMESH_WRN_WARNING"),
@@
-866,7
+868,7
@@
namespace
QObject::tr("SMESH_BUT_YES"),
QObject::tr("SMESH_BUT_NO"),
QObject::tr("SMESH_BUT_CANCEL"), 0, 2);
QObject::tr("SMESH_BUT_YES"),
QObject::tr("SMESH_BUT_NO"),
QObject::tr("SMESH_BUT_CANCEL"), 0, 2);
-
//
MESSAGE("answer collision name " << aRet);
+ MESSAGE("answer collision name " << aRet);
if (aRet == 0) {
toOverwrite = true;
isOkToWrite = true;
if (aRet == 0) {
toOverwrite = true;
isOkToWrite = true;
@@
-877,7
+879,7
@@
namespace
}
}
}
}
}
}
- //MESSAGE(" ****** end of file dialog loop")
+ MESSAGE(" ****** end of file dialog loop, toOverwrite:" << toOverwrite << " isOkToWrite:" << isOkToWrite);
toCreateGroups = fd->IsChecked(0);
toFindOutDim = fd->IsChecked(1);
fieldSelWdg->GetSelectedFields();
toCreateGroups = fd->IsChecked(0);
toFindOutDim = fd->IsChecked(1);
fieldSelWdg->GetSelectedFields();
@@
-914,7
+916,7
@@
namespace
// }
if ( isMED && isOkToWrite)
{
// }
if ( isMED && isOkToWrite)
{
-
//
MESSAGE("OK to write MED file "<< aFilename.toUtf8().constData());
+ MESSAGE("OK to write MED file "<< aFilename.toUtf8().constData());
aMeshIter = aMeshList.begin();
for( int aMeshIndex = 0; aMeshIter != aMeshList.end(); aMeshIter++, aMeshIndex++ )
{
aMeshIter = aMeshList.begin();
for( int aMeshIndex = 0; aMeshIter != aMeshList.end(); aMeshIter++, aMeshIndex++ )
{
@@
-5098,6
+5100,11
@@
void SMESHGUI::createPreferences()
setPreferenceProperty( doubleNodesTol, "max", 1000000.0 );
setPreferenceProperty( doubleNodesTol, "step", 0.0000001 );
setPreferenceProperty( doubleNodesTol, "max", 1000000.0 );
setPreferenceProperty( doubleNodesTol, "step", 0.0000001 );
+ /*
+ int cinc = addPreference(tr("PREF_CONTROLS_INCREMENT"), qaGroup, LightApp_Preferences::IntSpin, "SMESH", "controls_increment");
+ setPreferenceProperty( cinc, "min", 0 );
+ setPreferenceProperty( cinc, "max", 5 );
+ */
int exportgroup = addPreference( tr( "PREF_GROUP_EXPORT" ), genTab );
setPreferenceProperty( exportgroup, "columns", 2 );
int exportgroup = addPreference( tr( "PREF_GROUP_EXPORT" ), genTab );
setPreferenceProperty( exportgroup, "columns", 2 );
@@
-5331,6
+5338,10
@@
void SMESHGUI::createPreferences()
addPreference( tr( "PREF_ELEMENTS" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_element" );
addPreference( tr( "PREF_OBJECTS" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_object" );
addPreference( tr( "PREF_ELEMENTS" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_element" );
addPreference( tr( "PREF_OBJECTS" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_object" );
+ int sinc = addPreference(tr("PREF_SELECTION_INCREMENT"), selTab, LightApp_Preferences::IntSpin, "SMESH", "selection_increment");
+ setPreferenceProperty( sinc, "min", 0 );
+ setPreferenceProperty( sinc, "max", 5 );
+
// Scalar Bar tab ------------------------------------------------------------------------
int sbarTab = addPreference( tr( "SMESH_SCALARBAR" ) );
int fontGr = addPreference( tr( "SMESH_FONT_SCALARBAR" ), sbarTab );
// Scalar Bar tab ------------------------------------------------------------------------
int sbarTab = addPreference( tr( "SMESH_SCALARBAR" ) );
int fontGr = addPreference( tr( "SMESH_FONT_SCALARBAR" ), sbarTab );
@@
-5430,7
+5441,8
@@
void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
name== "highlight_color" ||
name=="selection_precision_node" ||
name=="selection_precision_element" ||
name== "highlight_color" ||
name=="selection_precision_node" ||
name=="selection_precision_element" ||
- name=="selection_precision_object" )
+ name=="selection_precision_object" ||
+ name=="selection_increment")
{
SMESH::UpdateSelectionProp( this );
}
{
SMESH::UpdateSelectionProp( this );
}
@@
-6259,7
+6271,7
@@
void SMESHGUI::restoreVisualParameters (int savePoint)
// Check that the entry corresponds to a real object in the Study
// as the object may be deleted or modified after the visual state is saved.
// Check that the entry corresponds to a real object in the Study
// as the object may be deleted or modified after the visual state is saved.
- _PTR(SObject) so = studyDS->FindObjectID(entry.to
Latin1
().data());
+ _PTR(SObject) so = studyDS->FindObjectID(entry.to
Utf8
().data());
if (!so) continue; //Skip the not existent entry
std::vector<std::string> paramNames = ip->getAllParameterNames( *entIt );
if (!so) continue; //Skip the not existent entry
std::vector<std::string> paramNames = ip->getAllParameterNames( *entIt );
@@
-6326,7
+6338,7
@@
void SMESHGUI::restoreVisualParameters (int savePoint)
SMESH_Actor* aGeomAc = SMESH_Actor::SafeDownCast(ac);
if (aGeomAc->hasIO()) {
Handle(SALOME_InteractiveObject) io = aGeomAc->getIO();
SMESH_Actor* aGeomAc = SMESH_Actor::SafeDownCast(ac);
if (aGeomAc->hasIO()) {
Handle(SALOME_InteractiveObject) io = aGeomAc->getIO();
- if (io->hasEntry() && strcmp(io->getEntry(), entry.to
Latin1
().data()) == 0) {
+ if (io->hasEntry() && strcmp(io->getEntry(), entry.to
Utf8
().data()) == 0) {
isFound = true;
vtkActors.Bind(viewIndex, aGeomAc);
}
isFound = true;
vtkActors.Bind(viewIndex, aGeomAc);
}
@@
-7012,7
+7024,7
@@
void SMESHGUI::message( const QString& msg )
// get study
_PTR(Study) study = dynamic_cast<SalomeApp_Study*>( application()->activeStudy() )->studyDS();
// get mesh name
// get study
_PTR(Study) study = dynamic_cast<SalomeApp_Study*>( application()->activeStudy() )->studyDS();
// get mesh name
- _PTR(SObject) obj = study->FindObjectID( entry.to
Latin1
().constData() );
+ _PTR(SObject) obj = study->FindObjectID( entry.to
Utf8
().constData() );
QString name;
if ( obj )
name = SMESH::fromUtf8(obj->GetName());
QString name;
if ( obj )
name = SMESH::fromUtf8(obj->GetName());
@@
-7121,7
+7133,7
@@
bool SMESHGUI::renameObject( const QString& entry, const QString& name) {
aType == SMESH::SUBMESH_EDGE || aType == SMESH::SUBMESH_VERTEX ||
aType == SMESH::HYPOTHESIS || aType == SMESH::ALGORITHM) {
if ( !name.isEmpty() ) {
aType == SMESH::SUBMESH_EDGE || aType == SMESH::SUBMESH_VERTEX ||
aType == SMESH::HYPOTHESIS || aType == SMESH::ALGORITHM) {
if ( !name.isEmpty() ) {
- SMESHGUI::GetSMESHGen()->SetName(obj->GetIOR().c_str(), qPrintable(name) );
+ SMESHGUI::GetSMESHGen()->SetName(obj->GetIOR().c_str(), q
Utf8
Printable(name) );
// update name of group object and its actor
Handle(SALOME_InteractiveObject) IObject =
// update name of group object and its actor
Handle(SALOME_InteractiveObject) IObject =
@@
-7129,9
+7141,9
@@
bool SMESHGUI::renameObject( const QString& entry, const QString& name) {
SMESH::SMESH_GroupBase_var aGroupObject = SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>(IObject);
if( !aGroupObject->_is_nil() ) {
SMESH::SMESH_GroupBase_var aGroupObject = SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>(IObject);
if( !aGroupObject->_is_nil() ) {
- aGroupObject->SetName( qPrintable(name) );
+ aGroupObject->SetName( q
Utf8
Printable(name) );
if ( SMESH_Actor *anActor = SMESH::FindActorByEntry( qPrintable(entry) ) )
if ( SMESH_Actor *anActor = SMESH::FindActorByEntry( qPrintable(entry) ) )
- anActor->setName( qPrintable(name) );
+ anActor->setName( q
Utf8
Printable(name) );
}
return true;
}
}
return true;
}