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
Unicode support: correct handling of unicode on GUI level
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_SubShapeSelectorWdg.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
b/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
index 03eeb40826441d93012ab4ab671c4542983a4bb7..017d77876b6fc98db37658af4e08a675a6132cb7 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
@@
-387,6
+387,7
@@
void StdMeshersGUI_SubShapeSelectorWdg::selectionIntoArgument()
myAddButton->setEnabled(( myListWidget->count() < myMaxSize || myMaxSize == -1 ) &&
( mySelectedIDs.size() > 0 ) &&
( mySelectedIDs.size() <= myMaxSize || myMaxSize == -1 ) );
myAddButton->setEnabled(( myListWidget->count() < myMaxSize || myMaxSize == -1 ) &&
( mySelectedIDs.size() > 0 ) &&
( mySelectedIDs.size() <= myMaxSize || myMaxSize == -1 ) );
+ myRemoveButton->setEnabled( mySelectedIDs.size() > 0 );
//Connect Selected Ids in viewer and dialog's Ids list
bool signalsBlocked = myListWidget->blockSignals( true );
//Connect Selected Ids in viewer and dialog's Ids list
bool signalsBlocked = myListWidget->blockSignals( true );
@@
-577,16
+578,12
@@
void StdMeshersGUI_SubShapeSelectorWdg::updateState()
GEOM::GEOM_Object_var StdMeshersGUI_SubShapeSelectorWdg::GetGeomObjectByEntry( const QString& theEntry )
{
GEOM::GEOM_Object_var aGeomObj;
GEOM::GEOM_Object_var StdMeshersGUI_SubShapeSelectorWdg::GetGeomObjectByEntry( const QString& theEntry )
{
GEOM::GEOM_Object_var aGeomObj;
- SALOMEDS::S
tudy_var aStudy = SMESHGUI::GetSMESHGen()->GetCurrentStudy(
);
- if (
!aStudy
->_is_nil() )
+ SALOMEDS::S
Object_var aSObj = SMESH_Gen_i::getStudyServant()->FindObjectID( theEntry.toUtf8().data()
);
+ if (
!aSObj
->_is_nil() )
{
{
- SALOMEDS::SObject_var aSObj = aStudy->FindObjectID( theEntry.toLatin1().data() );
- if (!aSObj->_is_nil() )
- {
- CORBA::Object_var obj = aSObj->GetObject();
- aGeomObj = GEOM::GEOM_Object::_narrow(obj);
- aSObj->UnRegister();
- }
+ CORBA::Object_var obj = aSObj->GetObject();
+ aGeomObj = GEOM::GEOM_Object::_narrow(obj);
+ aSObj->UnRegister();
}
return aGeomObj._retn();
}
}
return aGeomObj._retn();
}