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
Update copyrights
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index dc1a29fa3b5c42cf4c09a45bd8222090c01842d6..eb3ad132baaa9c4f8df40e88437623e52702fe54 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-192,7
+192,7
@@
void SMESHGUI_GroupDlg::initDialog( bool create)
QPixmap image0( SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap( "SMESH", tr( "ICON_SELECT" ) ) );
setWindowTitle( create ? tr( "SMESH_CREATE_GROUP_TITLE" ) : tr( "SMESH_EDIT_GROUP_TITLE" ) );
QPixmap image0( SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap( "SMESH", tr( "ICON_SELECT" ) ) );
setWindowTitle( create ? tr( "SMESH_CREATE_GROUP_TITLE" ) : tr( "SMESH_EDIT_GROUP_TITLE" ) );
- myHelpFileName = create ? "creating_groups
_page.html" : "editing_groups_page
.html";
+ myHelpFileName = create ? "creating_groups
.html" : "editing_groups
.html";
setSizeGripEnabled( true);
setSizeGripEnabled( true);
@@
-516,7
+516,7
@@
QString SMESHGUI_GroupDlg::GetDefaultName(const QString& theOperation)
bool isUnique = false;
while (!isUnique) {
aName = theOperation + "_" + QString::number(++aNumber);
bool isUnique = false;
while (!isUnique) {
aName = theOperation + "_" + QString::number(++aNumber);
- isUnique = (aSet.count(std::string(
SMESH::toUtf8(aName
))) == 0);
+ isUnique = (aSet.count(std::string(
aName.toUtf8().constData(
))) == 0);
}
return aName;
}
return aName;
@@
-531,7
+531,7
@@
void SMESHGUI_GroupDlg::setDefaultName() const
do
{
aResName = aPrefix + QString::number( i++ );
do
{
aResName = aPrefix + QString::number( i++ );
- anObj = SMESH::getStudy()->FindObject(
SMESH::toUtf8(aResName
) );
+ anObj = SMESH::getStudy()->FindObject(
aResName.toUtf8().constData(
) );
}
while ( anObj );
myName->setText(aResName);
}
while ( anObj );
myName->setText(aResName);
@@
-597,7
+597,7
@@
void SMESHGUI_GroupDlg::init (SMESH::SMESH_GroupBase_ptr theGroup,
SALOMEDS::Color aColor = theGroup->GetColor();
setGroupColor( aColor );
SALOMEDS::Color aColor = theGroup->GetColor();
setGroupColor( aColor );
- myMeshGroupLine->setText(
SMESH::fromUtf8(theGroup->GetName()
));
+ myMeshGroupLine->setText(
theGroup->GetName(
));
int aType = 0;
switch(theGroup->GetType()) {
int aType = 0;
switch(theGroup->GetType()) {
@@
-684,7
+684,7
@@
void SMESHGUI_GroupDlg::init (SMESH::SMESH_GroupBase_ptr theGroup,
{
myNameChanged = true;
myName->blockSignals(true);
{
myNameChanged = true;
myName->blockSignals(true);
- myName->setText(
SMESH::fromUtf8(theGroup->GetName()
));
+ myName->setText(
theGroup->GetName(
));
myName->blockSignals(false);
}
myName->blockSignals(false);
}
@@
-1050,7
+1050,7
@@
bool SMESHGUI_GroupDlg::onApply()
if (myGeomObjects->length() == 1) {
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
if (myGeomObjects->length() == 1) {
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
-
SMESH::toUtf8(myName->text()
),
+
myName->text().toUtf8(
),
myGeomObjects[0]);
}
else {
myGeomObjects[0]);
}
else {
@@
-1091,11
+1091,11
@@
bool SMESHGUI_GroupDlg::onApply()
aNewGeomGroupName += myName->text();
SALOMEDS::SObject_var aNewGroupSO =
geomGen->AddInStudy(aGroupVar,
aNewGeomGroupName += myName->text();
SALOMEDS::SObject_var aNewGroupSO =
geomGen->AddInStudy(aGroupVar,
-
SMESH::toUtf8(aNewGeomGroupName
), aMeshShape);
+
aNewGeomGroupName.toUtf8(
), aMeshShape);
}
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
}
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
-
SMESH::toUtf8(myName->text()
),
+
myName->text().toUtf8(
),
aGroupVar);
}
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnGeom );
aGroupVar);
}
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnGeom );
@@
-1119,7
+1119,7
@@
bool SMESHGUI_GroupDlg::onApply()
return false;
myGroupOnFilter = myMesh->CreateGroupFromFilter(aType,
return false;
myGroupOnFilter = myMesh->CreateGroupFromFilter(aType,
-
SMESH::toUtf8(myName->text()
),
+
myName->text().toUtf8(
),
myFilter);
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnFilter );
isCreation = true;
myFilter);
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnFilter );
isCreation = true;
@@
-1143,7
+1143,7
@@
bool SMESHGUI_GroupDlg::onApply()
if( aMeshGroupSO )
anEntryList.append( aMeshGroupSO->GetID().c_str() );
if( aMeshGroupSO )
anEntryList.append( aMeshGroupSO->GetID().c_str() );
- resultGroup->SetName(
SMESH::toUtf8(myName->text().trimmed()
));
+ resultGroup->SetName(
myName->text().trimmed().toUtf8(
));
if ( isCreation )
{
if ( isCreation )
{
@@
-1174,7
+1174,7
@@
bool SMESHGUI_GroupDlg::onApply()
if ( !anActor ) return false;
myActorsList.append( anActor );
}
if ( !anActor ) return false;
myActorsList.append( anActor );
}
- anActor->setName(
SMESH::toUtf8(myName->text()
));
+ anActor->setName(
myName->text().toUtf8(
));
QColor c;
int delta;
switch ( myTypeId ) {
QColor c;
int delta;
switch ( myTypeId ) {
@@
-1192,7
+1192,7
@@
bool SMESHGUI_GroupDlg::onApply()
anActor->SetSufaceColor( aColor.R, aColor.G, aColor.B, delta ); break;
break;
}
anActor->SetSufaceColor( aColor.R, aColor.G, aColor.B, delta ); break;
break;
}
- // update a visible group accoding to a changed contents
+ // update a visible group acco
r
ding to a changed contents
if ( !isConversion && anActor->GetVisibility() )
{
SMESH::Update( anIO, true );
if ( !isConversion && anActor->GetVisibility() )
{
SMESH::Update( anIO, true );
@@
-1420,8
+1420,9
@@
void SMESHGUI_GroupDlg::onObjectSelectionChanged()
aGroupMainShape = aGeomGroup;
aGroupMainShape->Register();
}
aGroupMainShape = aGeomGroup;
aGroupMainShape->Register();
}
+ CORBA::String_var entry = aGroupMainShape->GetStudyEntry();
_PTR(SObject) aGroupMainShapeSO =
_PTR(SObject) aGroupMainShapeSO =
- SMESH::getStudy()->FindObjectID(
aGroupMainShape->GetStudyEntry()
);
+ SMESH::getStudy()->FindObjectID(
entry.in()
);
_PTR(SObject) anObj, aRef;
bool isRefOrSubShape = false;
_PTR(SObject) anObj, aRef;
bool isRefOrSubShape = false;
@@
-1445,10
+1446,10
@@
void SMESHGUI_GroupDlg::onObjectSelectionChanged()
myGeomObjects->length(i);
if ( i == 0 )
myGeomObjects->length(i);
if ( i == 0 )
-
{
-
myIsBusy = false;
-
return;
-
}
+ {
+ myIsBusy = false;
+ return;
+ }
aNbSel = i;
}
aNbSel = i;
}
@@
-2303,7
+2304,7
@@
void SMESHGUI_GroupDlg::onHelp()
//=================================================================================
// function : SMESHGUI_GroupDlg::onDeactivate
//=================================================================================
// function : SMESHGUI_GroupDlg::onDeactivate
-// purpose : SLOT called when dialog must be deativated
+// purpose : SLOT called when dialog must be dea
c
tivated
//=================================================================================
void SMESHGUI_GroupDlg::onDeactivate()
{
//=================================================================================
void SMESHGUI_GroupDlg::onDeactivate()
{