-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include <SALOME_ListIO.hxx>
#include <SUIT_OverrideCursor.h>
#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
#include <SVTK_Selector.h>
#include <SVTK_ViewModel.h>
#include <SVTK_ViewWindow.h>
//================================================================================
StdMeshersGUI_SubShapeSelectorWdg
-::StdMeshersGUI_SubShapeSelectorWdg( QWidget * parent, TopAbs_ShapeEnum aSubShType ):
+::StdMeshersGUI_SubShapeSelectorWdg( QWidget * parent,
+ TopAbs_ShapeEnum subShType,
+ const bool toShowList,
+ const bool toShowActivateBtn ):
QWidget( parent ),
- myPreviewActor( 0 ),
- myMaxSize( -1 )
+ myMaxSize( -1 ),
+ myPreviewActor( 0 )
{
QPixmap image0( SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap( "SMESH", tr( "ICON_SELECT" ) ) );
- QGridLayout* edgesLayout = new QGridLayout( this );
- edgesLayout->setMargin( MARGIN );
- edgesLayout->setSpacing( SPACING );
-
- myListWidget = new QListWidget( this );
- myAddButton = new QPushButton( tr( "SMESH_BUT_ADD" ), this );
- myRemoveButton = new QPushButton( tr( "SMESH_BUT_REMOVE" ), this );
+ QGridLayout* layout = new QGridLayout( this );
+ layout->setMargin( MARGIN );
+ layout->setSpacing( SPACING );
+
+ if ( toShowList )
+ {
+ QPixmap iconSelect (SUIT_Session::session()->resourceMgr()->loadPixmap("SMESH", tr("ICON_SELECT")));
+ myListWidget = new QListWidget( this );
+ myActivateButton = new QPushButton( iconSelect, "", this );
+ myAddButton = new QPushButton( tr( "SMESH_BUT_ADD" ), this );
+ myRemoveButton = new QPushButton( tr( "SMESH_BUT_REMOVE" ), this );
+ myListWidget->setSelectionMode( QListWidget::ExtendedSelection );
+ myListWidget->setMinimumWidth(300);
+ myListWidget->setWrapping(true);
+ myActivateButton->setCheckable( true );
+ }
+ else
+ {
+ myListWidget = 0;
+ myActivateButton = 0;
+ myAddButton = 0;
+ myRemoveButton = 0;
+ }
myInfoLabel = new QLabel( this );
myPrevButton = new QPushButton( "<<", this );
myNextButton = new QPushButton( ">>", this );
- myListWidget->setSelectionMode( QListWidget::ExtendedSelection );
-
- edgesLayout->addWidget(myListWidget, 0, 0, 3, 3);
- edgesLayout->addWidget(myAddButton, 0, 3);
- edgesLayout->addWidget(myRemoveButton, 1, 3);
- edgesLayout->addWidget(myInfoLabel, 3, 0, 1, 3);
- edgesLayout->addWidget(myPrevButton, 4, 0);
- edgesLayout->addWidget(myNextButton, 4, 2);
- edgesLayout->setRowStretch(2, 5);
- edgesLayout->setColumnStretch(1, 5);
-
- myListWidget->setMinimumWidth(300);
- myInfoLabel->setMinimumWidth(300);
- myInfoLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+ if ( myListWidget )
+ {
+ int row = 0;
+ layout->addWidget(myListWidget, row, 0, 3+toShowActivateBtn, 3);
+ if ( toShowActivateBtn )
+ layout->addWidget( myActivateButton, row++, 3 );
+ else
+ myActivateButton->hide();
+ layout->addWidget(myAddButton, row, 3);
+ layout->addWidget(myRemoveButton, ++row, 3);
+ ++row;
+ layout->addWidget(myInfoLabel, ++row, 0, 1, 3);
+ layout->addWidget(myPrevButton, ++row, 0);
+ layout->addWidget(myNextButton, row, 2);
+
+ layout->setRowStretch(row-2, 5);
+ layout->setColumnStretch(1, 5);
+ }
+ else // show only Prev and Next buttons
+ {
+ layout->addWidget(myInfoLabel, 0, 0, 1, 2);
+ layout->addWidget(myPrevButton, 1, 0);
+ layout->addWidget(myNextButton, 1, 1);
+ }
+ //myInfoLabel->setMinimumWidth(300);
+ //myInfoLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
myInfoLabel->setAlignment(Qt::AlignCenter);
- mySubShType = aSubShType;
+ mySubShType = subShType;
init();
}
void StdMeshersGUI_SubShapeSelectorWdg::init()
{
myParamValue = "";
- myIsNotCorrected = true; // to dont call the GetCorrectedValue method twice
myListOfIDs.clear();
mySelectedIDs.clear();
- myAddButton->setEnabled( false );
- myRemoveButton->setEnabled( false );
-
mySMESHGUI = SMESHGUI::GetSMESHGUI();
mySelectionMgr = SMESH::GetSelectionMgr( mySMESHGUI );
- mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
+ mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode( ActorSelection );
myFilter=0;
- //setFilter();
- connect( myAddButton, SIGNAL(clicked()), SLOT(onAdd()));
- connect( myRemoveButton, SIGNAL(clicked()), SLOT(onRemove()));
+ if ( myListWidget )
+ {
+ myAddButton->setEnabled( false );
+ myRemoveButton->setEnabled( false );
+
+ connect( myListWidget, SIGNAL(itemSelectionChanged()), this, SLOT(onListSelectionChanged()));
+ connect( myActivateButton, SIGNAL( toggled(bool) ), SLOT( ActivateSelection(bool)));
+ connect( myAddButton, SIGNAL(clicked()), SLOT(onAdd()));
+ connect( myRemoveButton, SIGNAL(clicked()), SLOT(onRemove()));
+ }
connect( myPrevButton, SIGNAL(clicked()), SLOT(onPrevious()));
connect( myNextButton, SIGNAL(clicked()), SLOT(onNext()));
-
+
connect( mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(selectionIntoArgument()));
- connect( myListWidget, SIGNAL(itemSelectionChanged()), this, SLOT(onListSelectionChanged()));
updateState();
}
void StdMeshersGUI_SubShapeSelectorWdg::setFilter()
{
- SalomeApp_Study* study = mySMESHGUI->activeStudy();
- GEOM_TypeFilter* typeFilter = new GEOM_TypeFilter(study, mySubShType, /*isShapeType=*/true );
- GEOM_CompoundFilter* gpoupFilter = new GEOM_CompoundFilter(study);
- gpoupFilter->addSubType( mySubShType );
- myGeomFilters.append( typeFilter );
- myGeomFilters.append( gpoupFilter );
- myFilter = new SMESH_LogicalFilter( myGeomFilters, SMESH_LogicalFilter::LO_OR );
- mySelectionMgr->installFilter( myFilter );
+ // if ( !myFilter )
+ // {
+ // SalomeApp_Study* study = mySMESHGUI->activeStudy();
+ // GEOM_TypeFilter* typeFilter = new GEOM_TypeFilter(study, mySubShType, /*isShapeType=*/true );
+ // GEOM_CompoundFilter* gpoupFilter = new GEOM_CompoundFilter(study);
+ // gpoupFilter->addSubType( mySubShType );
+ // myGeomFilters.append( typeFilter );
+ // myGeomFilters.append( gpoupFilter );
+ // myFilter = new SMESH_LogicalFilter( myGeomFilters, SMESH_LogicalFilter::LO_OR );
+ // }
+ // mySelectionMgr->installFilter( myFilter );
}
//================================================================================
}
}
+//================================================================================
+/*!
+ * \brief Connect/disconnect to change of selection
+ */
+//================================================================================
+
+void StdMeshersGUI_SubShapeSelectorWdg::ActivateSelection( bool toActivate )
+{
+ // adjust state of myActivateButton
+ if ( myActivateButton &&
+ myActivateButton != sender() &&
+ myActivateButton->isChecked() != toActivate )
+ {
+ myActivateButton->toggle();
+ return;
+ }
+
+ if ( !mySelectionMgr ) return;
+
+ if ( toActivate )
+ {
+ connect( mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(selectionIntoArgument()));
+ }
+ else
+ {
+ disconnect(mySelectionMgr, 0, this, 0 );
+ }
+
+ if ( sender() == myActivateButton )
+ ShowPreview( toActivate );
+}
+
//================================================================================
/*!
* \brief Clears selected IDs. This is a workaround of a bug that
//=================================================================================
// function : selectionIntoArgument()
-// purpose : Called when selection as changed or other case
+// purpose : Called when selection has changed or in other cases
//=================================================================================
void StdMeshersGUI_SubShapeSelectorWdg::selectionIntoArgument()
{
GEOM::GEOM_Object_var aGeomObj = GetGeomObjectByEntry( IO->getEntry() );
if ( !CORBA::is_nil( aGeomObj ) ) { // Selected Object From Study
- GEOM::GEOM_Object_var aGeomFatherObj = aGeomObj->GetMainShape();
- QString aFatherEntry = "";
- QString aMainFatherEntry = "";
- TopoDS_Shape shape;
- if ( !CORBA::is_nil( aGeomFatherObj ) ) {
- // Get Main Shape
- GEOM::GEOM_Object_var aGeomMain = GetGeomObjectByEntry( myEntry.c_str() );
- if ( !CORBA::is_nil( aGeomMain ) && aGeomMain->GetType() == 37 ) { // Main Shape is a Group
- GEOM::GEOM_Object_var aMainFatherObj = aGeomMain->GetMainShape();
- if ( !CORBA::is_nil( aMainFatherObj ) )
- aMainFatherEntry = aMainFatherObj->GetStudyEntry();
- }
- aFatherEntry = aGeomFatherObj->GetStudyEntry();
- }
-
- if (( ! aFatherEntry.isEmpty() ) &&
- ( aFatherEntry == myEntry.c_str() || aFatherEntry == aMainFatherEntry ) )
+ // commented for IPAL52836
+ //
+ // GEOM::GEOM_Object_var aGeomFatherObj = aGeomObj->GetMainShape();
+ // QString aFatherEntry = "";
+ // QString aMainFatherEntry = "";
+ // TopoDS_Shape shape;
+ // if ( !CORBA::is_nil( aGeomFatherObj ) ) {
+ // // Get Main Shape
+ // GEOM::GEOM_Object_var aGeomMain = GetGeomObjectByEntry( myEntry.c_str() );
+ // if ( !CORBA::is_nil( aGeomMain ) && aGeomMain->GetType() == 37 ) { // Main Shape is a Group
+ // GEOM::GEOM_Object_var aMainFatherObj = aGeomMain->GetMainShape();
+ // if ( !CORBA::is_nil( aMainFatherObj ) )
+ // aMainFatherEntry = aMainFatherObj->GetStudyEntry();
+ // }
+ // aFatherEntry = aGeomFatherObj->GetStudyEntry();
+ // }
+
+ // if (( ! aFatherEntry.isEmpty() ) &&
+ // ( aFatherEntry == myEntry.c_str() || aFatherEntry == aMainFatherEntry ) )
{
+ TopoDS_Shape shape;
if ( aGeomObj->GetType() == 37 /*GEOM_GROUP*/ ) { // Selected Group that belongs the main object
GEOMBase::GetShape(aGeomObj, shape);
if ( !shape.IsNull() ) {
}
}
}
- } else if ( aGeomObj->GetType() == 28 /*GEOM_SUBSHAPE*/ ) {
- GEOMBase::GetShape(aGeomObj, shape);
+ } else if ( aGeomObj->GetType() == 28 /*GEOM_SUBSHAPE*/ ||
+ myEntry == IO->getEntry() )
+ {
+ GEOMBase::GetShape(aGeomObj, shape);
if ( !shape.IsNull() && shape.ShapeType() == mySubShType ) {
int index = myPreviewActor->GetIndexByShape( shape );
if ( index ) {
}
}
// update add button
- myAddButton->setEnabled( ( myListWidget->count() < myMaxSize || myMaxSize == -1 ) &&
- mySelectedIDs.size() > 0 &&
- ( mySelectedIDs.size() <= myMaxSize || myMaxSize == -1 ) );
-
- //Connect Selected Ids in viewer and dialog's Ids list
- bool signalsBlocked = myListWidget->blockSignals( true );
- myListWidget->clearSelection();
- if ( mySelectedIDs.size() > 0 ) {
- for (int i = 0; i < mySelectedIDs.size(); i++) {
- QString anID = QString(" %1").arg( mySelectedIDs.at(i) );
- QList<QListWidgetItem*> anItems = myListWidget->findItems ( anID, Qt::MatchExactly );
- QListWidgetItem* item;
- foreach(item, anItems)
- item->setSelected(true);
+ if ( myListWidget )
+ {
+ 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 );
+ myListWidget->clearSelection();
+ if ( mySelectedIDs.size() > 0 ) {
+ for (int i = 0; i < mySelectedIDs.size(); i++) {
+ QString anID = QString(" %1").arg( mySelectedIDs.at(i) );
+ QList<QListWidgetItem*> anItems = myListWidget->findItems ( anID, Qt::MatchExactly );
+ QListWidgetItem* item;
+ foreach(item, anItems)
+ item->setSelected(true);
+ }
}
+ myListWidget->blockSignals( signalsBlocked );
}
- myListWidget->blockSignals( signalsBlocked );
+
+ emit shapeSelected();
}
//=================================================================================
//=================================================================================
void StdMeshersGUI_SubShapeSelectorWdg::onAdd()
{
- if ( mySelectedIDs.size() < 1 )
+ if ( mySelectedIDs.size() < 1 || !myListWidget )
return;
myListWidget->blockSignals( true );
//=================================================================================
void StdMeshersGUI_SubShapeSelectorWdg::onRemove()
{
- if ( myListWidget->count() < 1 )
+ if ( myListWidget->count() < 1 || !myListWidget )
return;
myListWidget->blockSignals( true );
{
if ( myPreviewActor ) {
myPreviewActor->previous();
- myListWidget->clearSelection();
+ if ( myListWidget )
+ myListWidget->clearSelection();
updateButtons();
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->Repaint();
{
if ( myPreviewActor ) {
myPreviewActor->next();
- myListWidget->clearSelection();
+ if ( myListWidget )
+ myListWidget->clearSelection();
updateButtons();
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->Repaint();
if ( !myPreviewActor )
return;
- //mySelectionMgr->clearSelected();
- TColStd_MapOfInteger aIndexes;
+ myPreviewActor->HighlightAll( false );
QList<QListWidgetItem*> selItems = myListWidget->selectedItems();
QListWidgetItem* anItem;
foreach(anItem, selItems)
myPreviewActor->HighlightID( anItem->text().toInt() );
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->Repaint();
+
// update remove button
myRemoveButton->setEnabled( selItems.size() > 0 );
else
myMainShape = GetTopoDSByEntry( myMainEntry.c_str() );
updateState();
- myIsNotCorrected = true;
}
}
//=================================================================================
void StdMeshersGUI_SubShapeSelectorWdg::updateState()
{
- bool state = false;
- if ( !myGeomShape.IsNull() )
- state = true;
- myInfoLabel->setVisible( false );
+ bool state = ( !myGeomShape.IsNull() );
+
+ myInfoLabel ->setVisible( false );
myPrevButton->setVisible( false );
myNextButton->setVisible( false );
-
- myListWidget->setEnabled( state );
- myAddButton->setEnabled( mySelectedIDs.size() > 0 );
-
- if (state) {
+
+ if ( myListWidget )
+ {
+ myListWidget->setEnabled( state );
+ myAddButton->setEnabled( mySelectedIDs.size() > 0 );
+ }
+ if ( state ) {
SUIT_OverrideCursor wc;
- myPreviewActor = new SMESH_PreviewActorsCollection();
+ if ( !myPreviewActor )
+ myPreviewActor = new SMESH_PreviewActorsCollection();
myPreviewActor->SetSelector( mySelector );
myPreviewActor->Init( myGeomShape, myMainShape, mySubShType, myEntry.c_str() );
myPreviewActor->SetShown( false );
GEOM::GEOM_Object_var StdMeshersGUI_SubShapeSelectorWdg::GetGeomObjectByEntry( const QString& theEntry )
{
GEOM::GEOM_Object_var aGeomObj;
- SALOMEDS::Study_var aStudy = SMESHGUI::GetSMESHGen()->GetCurrentStudy();
- if ( !aStudy->_is_nil() )
+ SALOMEDS::SObject_var aSObj = SMESH_Gen_i::getStudyServant()->FindObjectID( theEntry.toLatin1().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();
}
{
SMESH::long_array_var anArray = new SMESH::long_array;
- // if ( myMainEntry != "" && myIsNotCorrected )
- // myListOfIDs = GetCorrectedListOfIDs( true );
-
int size = myListOfIDs.size();
anArray->length( size );
for (int i = 0; i < size; i++)
for ( int i = 0; i < size; i++ )
mySelectedIDs.append( theIds[ i ] );
- myListWidget->blockSignals( true );
- myListWidget->clear();
- myListWidget->blockSignals( false );
+ if ( myListWidget )
+ {
+ myListWidget->blockSignals( true );
+ myListWidget->clear();
+ myListWidget->blockSignals( false );
+ }
bool isOk = true;
if ( myPreviewActor )
for ( int i = 0; i < size && isOk; i++ )
isOk = ( theIds[ i ] > 0 && theIds[ i ] <= aMainMap.Extent() );
}
- // mySelectedIDs = GetCorrectedListOfIDs( false, &isOk );
onAdd();
return isOk;
}
-//=================================================================================
-// function : SetMainShapeEntry
-// purpose : Called to set the Entry of main shape of the mesh
-//=================================================================================
-// void StdMeshersGUI_SubShapeSelectorWdg::SetMainShapeEntry( const QString& theEntry )
-// {
-// myMainEntry = theEntry;
-// myMainShape = GetTopoDSByEntry( theEntry );
-// myIsNotCorrected = true;
-// }
-
//=================================================================================
// function : GetMainShapeEntry
// purpose : Called to get the Main Object Entry
return myMainEntry.c_str();
}
-//=================================================================================
-// function : GetCorrectedListOfIds
-// purpose : Called to convert the list of IDs from sub-shape IDs to main shape IDs
-//=================================================================================
-// QList<int>
-// StdMeshersGUI_SubShapeSelectorWdg::GetCorrectedListOfIDs( bool fromSubshapeToMainshape,
-// bool* isOK )
-// {
-// if (( myMainShape.IsNull() || myGeomShape.IsNull() ) && fromSubshapeToMainshape )
-// return myListOfIDs;
-// else if (( myMainShape.IsNull() /*||*/&& myGeomShape.IsNull() ) && !fromSubshapeToMainshape )
-// return mySelectedIDs;
-
-// if ( !fromSubshapeToMainshape ) // called from SetListOfIDs
-// {
-// if ( myMainShape.IsNull() )
-// std::swap( myMainShape, myGeomShape );
-// }
-
-// QList<int> aList;
-// TopTools_IndexedMapOfShape aGeomMap, aMainMap;
-// TopExp::MapShapes(myMainShape, aMainMap);
-// if ( !myGeomShape.IsNull() )
-// TopExp::MapShapes(myGeomShape, aGeomMap);
-
-// bool ok = true;
-// if ( fromSubshapeToMainshape ) // convert indexes from sub-shape to mainshape
-// {
-// int size = myListOfIDs.size();
-// for (int i = 0; i < size; i++) {
-// int index = myListOfIDs.at(i);
-// if ( aGeomMap.Extent() < index )
-// {
-// ok = false;
-// }
-// else
-// {
-// TopoDS_Shape aSubShape = aGeomMap.FindKey( index );
-// if ( mySubShType != aSubShape.ShapeType() )
-// ok = false;
-// if ( !aMainMap.Contains( aSubShape ))
-// ok = false;
-// else
-// index = aMainMap.FindIndex( aSubShape );
-// }
-// aList.append( index );
-// }
-// myIsNotCorrected = false;
-// }
-// else // convert indexes from main shape to sub-shape, or just check indices
-// {
-// int size = mySelectedIDs.size();
-// for (int i = 0; i < size; i++) {
-// int index = mySelectedIDs.at(i);
-// if ( aMainMap.Extent() < index )
-// {
-// ok = false;
-// }
-// else
-// {
-// TopoDS_Shape aSubShape = aMainMap.FindKey( index );
-// if ( mySubShType != aSubShape.ShapeType() )
-// ok = false;
-// if ( !aGeomMap.Contains( aSubShape ) && !aGeomMap.IsEmpty() )
-// ok = false;
-// else
-// index = aGeomMap.FindIndex( aSubShape );
-// }
-// aList.append( index );
-// }
-// }
-// if ( isOK ) *isOK = ok;
-
-// return aList;
-// }
-
void StdMeshersGUI_SubShapeSelectorWdg::updateButtons()
{
if ( myPreviewActor ) {