ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-15 10:08:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from BR_phase16 branch (09/12/09)

Browse Source
This commit is contained in:
vsr 2009-12-09 13:26:30 +00:00
parent 499b281dc4
commit f697bd6392
5 changed files with 650 additions and 682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
View File

@ -18,7 +18,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "GEOM_SelectionFilter.h"
#include "GEOM_Client.hxx"
@ -65,6 +65,19 @@ bool GEOM_SelectionFilter::isOk( const SUIT_DataOwner* sOwner ) const
if ( getShape( obj, shape ) )
return contains( shape.ShapeType() ) && isShapeOk( shape );
}
// IMP 0020435: fine local selection
{
const LightApp_DataOwner* owner = dynamic_cast<const LightApp_DataOwner*>(sOwner);
if (owner) {
QString entry = owner->entry();
int index = entry.lastIndexOf("_");
if (index > 0) {
return true;
}
}
}
return false;
}
@ -72,7 +85,8 @@ bool GEOM_SelectionFilter::isOk( const SUIT_DataOwner* sOwner ) const
// function : getObject
// purpose :
//=======================================================================
GEOM::GEOM_Object_ptr GEOM_SelectionFilter::getObject( const SUIT_DataOwner* sOwner, const bool extractReference ) const
GEOM::GEOM_Object_ptr GEOM_SelectionFilter::getObject (const SUIT_DataOwner* sOwner,
const bool extractReference) const
{
GEOM::GEOM_Object_var anObj;

38
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -1025,6 +1025,44 @@ SALOME_Prs* GEOM_Displayer::buildPresentation( const QString& entry,
return prs;
}
//=================================================================
/*!
* GEOM_Displayer::buildSubshapePresentation
* Builds/finds object's presentation for the current viewer
* Calls corresponding Update() method by means of double dispatch
* For not published objects (for Mantis issue 0020435)
*/
//=================================================================
SALOME_Prs* GEOM_Displayer::buildSubshapePresentation(const TopoDS_Shape& aShape,
const QString& entry,
SALOME_View* theViewFrame)
{
SALOME_Prs* prs = 0;
internalReset();
myViewFrame = theViewFrame ? theViewFrame : GetActiveView();
if (myViewFrame)
{
prs = LightApp_Displayer::buildPresentation(entry, theViewFrame);
if (prs)
{
Handle(SALOME_InteractiveObject) theIO = new SALOME_InteractiveObject();
theIO->setEntry(entry.toLatin1().constData());
if (!theIO.IsNull())
{
// set interactive object
setIO(theIO);
// finally set shape
setShape(aShape);
myType = GEOM_SUBSHAPE;
}
UpdatePrs(prs); // Update presentation by using of the double dispatch
}
}
return prs;
}
//=================================================================
/*!
* GEOM_Displayer::internalReset

7
src/GEOMGUI/GEOM_Displayer.h
View File

@ -155,9 +155,14 @@ public:
static SALOMEDS::Color getUniqueColor( const QList<SALOMEDS::Color>& );
/* Builds presentation of not published object */
virtual SALOME_Prs* buildSubshapePresentation(const TopoDS_Shape& aShape,
const QString&,
SALOME_View* = 0);
protected:
/* internal methods */
/* Builds presentation accordint to the current viewer type */
/* Builds presentation according to the current viewer type */
virtual SALOME_Prs* buildPresentation( const QString&, SALOME_View* = 0 );
/* Sets interactive object */

697
src/GroupGUI/GroupGUI_GroupDlg.cxx
View File

@ -22,32 +22,49 @@
// GEOM GEOMGUI : GUI for Geometry component
// File : GroupGUI_GroupDlg.cxx
// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
//
#include "GroupGUI_GroupDlg.h"
#include <LightApp_SelectionMgr.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Desktop.h>
#include <SUIT_OverrideCursor.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include "GroupGUI_GroupDlg.h"
#include <DlgRef.h>
#include <GEOMBase.h>
#include <GeometryGUI.h>
#include <GEOMImpl_Types.hxx>
#include <GEOM_Displayer.h>
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <LightApp_SelectionMgr.h>
#include <OCCViewer_ViewModel.h>
#include <OCCViewer_ViewManager.h>
#include <SVTK_ViewModel.h>
#include <SALOME_Prs.h>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Desktop.h>
#include <SUIT_OverrideCursor.h>
#include <SUIT_Session.h>
#include <SUIT_ViewWindow.h>
#include <SUIT_ViewManager.h>
#include <QLabel>
#include <QListWidget>
#include <QLineEdit>
#include <QMap>
#include <AIS_ListOfInteractive.hxx>
#include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TColStd_MapOfInteger.hxx>
#include <TColStd_DataMapIteratorOfDataMapOfIntegerInteger.hxx>
#include <GEOMImpl_Types.hxx>
enum { ALL_SUBSHAPES = 0, GET_IN_PLACE, SUBSHAPES_OF_SHAPE2, SUBSHAPES_OF_INVISIBLE_SHAPE2 };
GroupGUI_GroupDlg::GroupGUI_GroupDlg (Mode mode, GeometryGUI* theGeometryGUI, QWidget* parent)
@ -104,25 +121,30 @@ GroupGUI_GroupDlg::GroupGUI_GroupDlg( Mode mode, GeometryGUI* theGeometryGUI, QW
myShape2Name->setReadOnly(true);
myShape2Name->setEnabled(false);
mySelectionWayGroupBox = new QGroupBox( tr("SHAPE_SEL_RESTR"), GroupMedium );
mySelectionWayGroup = new QButtonGroup( mySelectionWayGroupBox );
QRadioButton* allSubs = new QRadioButton( tr( "NO_RESTR" ) , mySelectionWayGroupBox );
QRadioButton* inPlaceSubs = new QRadioButton( tr( "GEOM_PARTS_OF_SHAPE2" ), mySelectionWayGroupBox );
QRadioButton* shape2Subs = new QRadioButton( tr( "SUBSHAPES_OF_SHAPE2" ) , mySelectionWayGroupBox );
QVBoxLayout* mySelWayLayout = new QVBoxLayout( mySelectionWayGroupBox );
mySelWayLayout->setMargin( 9 );
mySelWayLayout->setSpacing( 6 );
mySelWayLayout->addWidget( allSubs );
mySelWayLayout->addWidget( inPlaceSubs );
mySelWayLayout->addWidget( shape2Subs );
mySelectionWayGroup->addButton( allSubs, ALL_SUBSHAPES );
mySelectionWayGroup->addButton( inPlaceSubs, GET_IN_PLACE );
mySelectionWayGroup->addButton( shape2Subs, SUBSHAPES_OF_SHAPE2 );
myRestrictGroupBox = new QGroupBox(tr("SHAPE_SEL_RESTR"), GroupMedium);
myRestrictGroup = new QButtonGroup(myRestrictGroupBox);
QRadioButton* allSubs = new QRadioButton(tr("NO_RESTR") , myRestrictGroupBox);
QRadioButton* inPlaceSubs = new QRadioButton(tr("GEOM_PARTS_OF_SHAPE2"), myRestrictGroupBox);
QRadioButton* shape2Subs = new QRadioButton(tr("SUBSHAPES_OF_SHAPE2") , myRestrictGroupBox);
QVBoxLayout* aRestrictLayout = new QVBoxLayout(myRestrictGroupBox);
aRestrictLayout->setMargin(9);
aRestrictLayout->setSpacing(6);
aRestrictLayout->addWidget(allSubs);
aRestrictLayout->addWidget(inPlaceSubs);
aRestrictLayout->addWidget(shape2Subs);
myRestrictGroup->addButton(allSubs, ALL_SUBSHAPES);
myRestrictGroup->addButton(inPlaceSubs, GET_IN_PLACE);
myRestrictGroup->addButton(shape2Subs, SUBSHAPES_OF_SHAPE2);
allSubs->setChecked(true);
myShowOnlyBtn = new QPushButton(tr("Show only selected"), GroupMedium);
myHideSelBtn = new QPushButton(tr("Hide selected"), GroupMedium);
myShowAllBtn = new QPushButton(tr("Show all sub-shapes"), GroupMedium);
mySelAllBtn = new QPushButton(tr("SELECT_ALL"), GroupMedium);
myAddBtn = new QPushButton(tr("ADD"), GroupMedium);
myRemBtn = new QPushButton(tr("REMOVE"), GroupMedium);
myIdList = new QListWidget(GroupMedium);
myIdList->setSelectionMode(QAbstractItemView::ExtendedSelection);
@ -135,11 +157,17 @@ GroupGUI_GroupDlg::GroupGUI_GroupDlg( Mode mode, GeometryGUI* theGeometryGUI, QW
aMedLayout->addWidget(aSecondLabel, 1, 0);
aMedLayout->addWidget(mySelBtn2, 1, 1);
aMedLayout->addWidget(myShape2Name, 1, 2, 1, 2);
aMedLayout->addWidget( mySelectionWayGroupBox, 2, 0, 3, 3 );
aMedLayout->addWidget( mySelAllBtn, 2, 3 );
aMedLayout->addWidget( myAddBtn, 3, 3 );
aMedLayout->addWidget( myRemBtn, 4, 3 );
aMedLayout->addWidget( myIdList, 5, 0, 1, 4 );
aMedLayout->addWidget(myRestrictGroupBox, 2, 0, 3, 3);
aMedLayout->addWidget(myShowOnlyBtn, 2, 3);
aMedLayout->addWidget(myHideSelBtn, 3, 3);
aMedLayout->addWidget(myShowAllBtn, 4, 3);
aMedLayout->addWidget(mySelAllBtn, 5, 3);
aMedLayout->addWidget(myAddBtn, 6, 3);
aMedLayout->addWidget(myRemBtn, 7, 3);
aMedLayout->addWidget(myIdList, 5, 0, 3, 3);
aMedLayout->setRowStretch(5, 1);
QVBoxLayout* layout = new QVBoxLayout(centralWidget());
@ -161,12 +189,9 @@ GroupGUI_GroupDlg::~GroupGUI_GroupDlg()
//=================================================================================
void GroupGUI_GroupDlg::Init()
{
// san -- TODO: clear selected sub-shapes...
//mySelSubBtn->setChecked( true );
LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
//unset shape type to avoid preparation of selection before exact user shape type selection
//setConstructorId( -1 ); //non valid shape type
unsetConstructorId();
myIsShapeType = false;
@ -216,10 +241,13 @@ void GroupGUI_GroupDlg::Init()
connect(buttonOk(), SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
connect( mySelectionWayGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( SetEditCurrentArgument() ) );
connect( mySelAllBtn, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
connect(myRestrictGroup, SIGNAL(buttonClicked(int)), this, SLOT(SetEditCurrentArgument()));
connect(mySelAllBtn, SIGNAL(clicked()), this, SLOT(selectAllSubShapes()));
connect(myAddBtn, SIGNAL(clicked()), this, SLOT(add()));
connect(myRemBtn, SIGNAL(clicked()), this, SLOT(remove()));
connect(myShowOnlyBtn, SIGNAL(clicked()), this, SLOT(showOnlySelected()));
connect(myHideSelBtn, SIGNAL(clicked()), this, SLOT(showOnlySelected()));
connect(myShowAllBtn, SIGNAL(clicked()), this, SLOT(showOnlySelected()));
connect(myIdList, SIGNAL(itemSelectionChanged()), this, SLOT(selectionChanged()));
setInPlaceObj(GEOM::GEOM_Object::_nil());
@ -239,14 +267,14 @@ void GroupGUI_GroupDlg::enterEvent( QEvent* e )
ActivateThisDialog();
}
//=======================================================================
//=================================================================================
//function : closeEvent
//purpose : remove temporary geom object
//=======================================================================
//=================================================================================
void GroupGUI_GroupDlg::closeEvent(QCloseEvent* e)
{
setInPlaceObj(GEOM::GEOM_Object::_nil());
erasePreview(true);
GEOMBase_Skeleton::closeEvent(e);
}
@ -278,6 +306,7 @@ bool GroupGUI_GroupDlg::ClickOnApply()
}
else
activateSelection();
return true;
}
@ -289,30 +318,12 @@ void GroupGUI_GroupDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
this, SLOT(SelectionIntoArgument()));
activateSelection();
}
//=================================================================================
// function : LineEditReturnPressed()
// purpose :
//=================================================================================
void GroupGUI_GroupDlg::LineEditReturnPressed()
{
QLineEdit* send = ( QLineEdit* )sender();
if ( send == myMainName && !myEditCurrentArgument ) {
myEditCurrentArgument = myMainName;
activateSelection();
}
else
GEOMBase_Skeleton::LineEditReturnPressed();
updateState();
}
//=================================================================================
// function : SetEditCurrentArgument()
// purpose :
@ -325,32 +336,19 @@ void GroupGUI_GroupDlg::SetEditCurrentArgument()
myEditCurrentArgument = myMainName;
myShape2Name->setText("");
}
else if ( /*(QRadioButton*)sender() == mySelSubBtn ||*/ send == mySelAllBtn )
myEditCurrentArgument = 0;
else if ( send == mySelBtn2 || sender() == mySelectionWayGroup ) {
else if (send == mySelBtn2 || sender() == myRestrictGroup) {
setInPlaceObj(GEOM::GEOM_Object::_nil());
//if ( myPlaceCheckBox->isChecked() )
myShape2Name->setText("");
if ( subSelectionWay() != ALL_SUBSHAPES )
{
if (subSelectionWay() != ALL_SUBSHAPES) {
myEditCurrentArgument = myShape2Name;
}
else {
//myEditCurrentArgument = myMainName;
myEditCurrentArgument = 0;
}
}
activateSelection();
if ( send == mySelAllBtn ) {
// myShape2Name->setText( "" );
// myPlaceCheckBox->setChecked( false );
// mySelBtn2->setEnabled( false );
// myShape2Name->setEnabled( false );
selectAllSubShapes();
}
else
updateState();
}
@ -402,37 +400,17 @@ void GroupGUI_GroupDlg::onGetInPlace()
}
}
//=======================================================================
//=================================================================================
//function : setInPlaceObj
//purpose : temporarily add an object to study and remove old InPlaceObj
//=======================================================================
//=================================================================================
void GroupGUI_GroupDlg::setInPlaceObj(GEOM::GEOM_Object_var theObj, const bool isVisible)
{
if (!myInPlaceObj->_is_equivalent(theObj))
{
const char* tmpName = "__InPlaceObj__";
// remove old InPlaceObj
if ( !myInPlaceObj->_is_nil() ) {
if ( myInPlaceObjSelectState == GET_IN_PLACE ||
myInPlaceObjSelectState == SUBSHAPES_OF_INVISIBLE_SHAPE2 ) {
// hide temporary object or initially invisible shape 2 (issue 0014047)
GEOM_Displayer aDisplayer(getStudy());
aDisplayer.Erase( myInPlaceObj, true );
}
if (_PTR(SObject) SO = getStudy()->studyDS()->FindObject( tmpName )) {
getStudy()->studyDS()->NewBuilder()->RemoveObjectWithChildren( SO );
getGeomEngine()->RemoveObject(myInPlaceObj);
}
}
// publish InPlaceObj to enable localSelection(InPlaceObj)
if ( !theObj->_is_nil() && subSelectionWay() == GET_IN_PLACE ) {
SALOMEDS::Study_var aStudyDS = GeometryGUI::ClientStudyToStudy(getStudy()->studyDS());
SALOMEDS::SObject_var aSO =
getGeomEngine()->AddInStudy(aStudyDS, theObj, tmpName, myMainObj);
}
myInPlaceObj = theObj;
}
// build map of indices
myMain2InPlaceIndices.Clear();
if (!myInPlaceObj->_is_nil()) {
@ -459,21 +437,21 @@ void GroupGUI_GroupDlg::setInPlaceObj( GEOM::GEOM_Object_var theObj, const bool
//=================================================================================
void GroupGUI_GroupDlg::SelectionIntoArgument()
{
// if (myPlaceCheckBox->isChecked() && myEditCurrentArgument == myShape2Name )
if (subSelectionWay() != ALL_SUBSHAPES && myEditCurrentArgument == myShape2Name) {
onGetInPlace();
return;
}
LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
SALOME_ListIO aSelList;
aSelMgr->selectedObjects(aSelList);
if (myEditCurrentArgument == myMainName) { // Selection of a main shape is active
myEditCurrentArgument->setText("");
myIdList->clear();
if (aSelList.Extent() == 1) {
LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
SALOME_ListIO aSelList;
aSelMgr->selectedObjects(aSelList);
int nbSel = aSelList.Extent();
if (nbSel == 1) {
Standard_Boolean aResult = Standard_False;
GEOM::GEOM_Object_var anObj =
GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
@ -485,12 +463,12 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
myEditCurrentArgument = 0;
activateSelection();
updateState();
return;
}
}
else {
myMainObj = GEOM::GEOM_Object::_nil();
}
}
else { // an attempt to synchronize list box selection with 3d viewer
if (myBusy) {
return;
@ -501,79 +479,9 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
myIdList->clearSelection();
TColStd_IndexedMapOfInteger aMapIndex;
int nbSel = getSelectedSubshapes(aMapIndex);
LightApp_SelectionMgr::MapEntryOfMapOfInteger aMap;
aSelMgr->selectedSubOwners( aMap );
if ( aMap.Size() == 1 )
aMapIndex = LightApp_SelectionMgr::MapEntryOfMapOfInteger::Iterator( aMap ).Value();
bool subselected = aMapIndex.Extent();
// convert inPlace indices to main indices
//if ( subselected && myPlaceCheckBox->isChecked() )
if ( subselected && subSelectionWay() != ALL_SUBSHAPES )
{
TColStd_IndexedMapOfInteger aMapIndex2;
TColStd_DataMapIteratorOfDataMapOfIntegerInteger m2ip( myMain2InPlaceIndices );
for ( ; m2ip.More(); m2ip.Next() ) {
int inPlaceId = m2ip.Value();
if ( aMapIndex.Contains( inPlaceId )) {
aMapIndex2.Add( m2ip.Key() );
}
}
aMapIndex = aMapIndex2;
}
// try to find out and process the object browser selection
if ( !subselected ) {
globalSelection( GEOM_ALLSHAPES );
GEOM::ListOfGO anObjects;
GEOMBase::ConvertListOfIOInListOfGO(aSelList, anObjects);
GEOM::GEOM_ILocalOperations_var aLocOp = getGeomEngine()->GetILocalOperations( getStudyId() );
GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
for (int i = 0; i < anObjects.length(); i++)
{
GEOM::GEOM_Object_var aGeomObj = anObjects[i];
GEOM::ListOfGO_var aSubObjects = new GEOM::ListOfGO();
TopoDS_Shape aShape;
if ( GEOMBase::GetShape(aGeomObj, aShape, getShapeType()) )
{
aSubObjects->length(1);
aSubObjects[0] = aGeomObj;
}
else if (aGeomObj->GetType() == GEOM_GROUP)
aSubObjects = aShapesOp->MakeExplode( aGeomObj, getShapeType(), false);
else
continue;
for (int i = 0; i < aSubObjects->length(); i++)
{
TopoDS_Shape aShape;
if ( GEOMBase::GetShape(aSubObjects[i], aShape, getShapeType()) )
{
CORBA::Long anIndex;
anIndex = aLocOp->GetSubShapeIndex( myMainObj, aSubObjects[i] );
if ( anIndex >= 0 ) {
//if ( myPlaceCheckBox->isChecked() && ! myMain2InPlaceIndices.IsBound( anIndex ))
if ( subSelectionWay() != ALL_SUBSHAPES &&
! myMain2InPlaceIndices.IsBound( anIndex ))
continue;
aMapIndex.Add( anIndex );
}
}
}
}
if ( !myMainObj->_is_nil() && myIsShapeType/*&& mySelSubBtn->isChecked()*/)
if ( subSelectionWay() == ALL_SUBSHAPES )
localSelection( myMainObj, getShapeType() );
else if ( !myInPlaceObj->_is_nil() )
localSelection( myInPlaceObj, getShapeType() );
}
if (aMapIndex.Extent() >= 1) {
if (nbSel) {
QMap<int, int> aMap;
for (int i = 0, n = myIdList->count(); i < n; i++)
aMap.insert(myIdList->item(i)->text().toInt(), i);
@ -584,9 +492,9 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
}
}
myIdList->blockSignals(isBlocked);
}
updateState();
updateState(nbSel);
}
}
//=================================================================================
@ -595,13 +503,16 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
//=================================================================================
void GroupGUI_GroupDlg::ConstructorsClicked(int constructorId)
{
if (!myIsShapeType && getConstructorId() != constructorId)
if (getConstructorId() != constructorId)
setConstructorId(constructorId);
myIsShapeType = true;
myIdList->clear();
myEditCurrentArgument = 0;
setInPlaceObj(myInPlaceObj); // to rebuild myMain2InPlaceIndices
activateSelection();
updateState();
setInPlaceObj( myInPlaceObj ); // to rebuild myMain2InPlaceIndices
}
//=================================================================================
@ -614,15 +525,12 @@ void GroupGUI_GroupDlg::selectAllSubShapes()
return;
GEOM::ListOfLong_var aSubShapes;
// if ( !myPlaceCheckBox->isChecked() )
if ( subSelectionWay() == ALL_SUBSHAPES )
{
if ( !myIsShapeType )
return;
myIdList->clear();
GEOM::GEOM_IShapesOperations_var aShOp = getGeomEngine()->GetIShapesOperations(getStudyId());
aSubShapes = aShOp->SubShapeAllIDs(myMainObj, getShapeType(), false);
if (aSubShapes->length() > 0) {
if (subSelectionWay() == ALL_SUBSHAPES)
{
myIdList->clear(); // for sorted final list?
if (!aShOp->IsDone())
return;
@ -635,6 +543,7 @@ void GroupGUI_GroupDlg::selectAllSubShapes()
for (int i = 0; m2ip.More(); i++, m2ip.Next())
aSubShapes[i] = m2ip.Key();
}
bool isBlocked = myIdList->signalsBlocked();
myIdList->blockSignals(true);
@ -659,6 +568,105 @@ void GroupGUI_GroupDlg::selectAllSubShapes()
myIdList->blockSignals(isBlocked);
highlightSubShapes();
}
}
//=================================================================================
// function : showOnlySelected
// purpose :
//=================================================================================
void GroupGUI_GroupDlg::showOnlySelected()
{
if (CORBA::is_nil(myMainObj) || !myIsShapeType)
return;
QPushButton* send = (QPushButton*)sender();
if (send == myShowAllBtn) {
activateSelection();
return;
}
LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
SALOME_ListIO aSelList;
aSelMgr->selectedObjects(aSelList);
GEOM_Displayer* aDisplayer = getDisplayer();
if (send == myHideSelBtn) {
aDisplayer->Erase(aSelList, false, true);
}
else {
aDisplayer->EraseAll();
aDisplayer->Display(aSelList, true);
}
}
//=================================================================================
// function : getSelectedSubshapes
// purpose :
//=================================================================================
int GroupGUI_GroupDlg::getSelectedSubshapes (TColStd_IndexedMapOfInteger& theMapIndex)
{
theMapIndex.Clear();
SalomeApp_Application* app = myGeomGUI->getApp();
if (!app) return 0;
LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
SALOME_ListIO aSelList;
aSelMgr->selectedObjects(aSelList);
// try to find out and process the global selection
// (of not published objects and of published sub-shapes)
{
SALOME_ListIteratorOfListIO anIter (aSelList);
for (int i = 0; anIter.More(); anIter.Next(), i++)
{
Handle(SALOME_InteractiveObject) anIObj = anIter.Value();
QString anEntry = anIObj->getEntry();
QString str = "_";
int index = anEntry.lastIndexOf(str);
if (index > 0) // selection among special preview
{
anEntry.remove(0, index+1);
int anIndex = anEntry.toInt();
if (anIndex)
theMapIndex.Add(anIndex);
}
else // selection among published shapes
{
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>(app->activeStudy());
if (!appStudy) return 0;
_PTR(Study) aStudy = appStudy->studyDS();
_PTR(SObject) aSObj (aStudy->FindObjectID(anEntry.toLatin1().constData()));
GEOM::GEOM_Object_var aGeomObj =
GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(aSObj));
TopoDS_Shape aShape;
if (GEOMBase::GetShape(aGeomObj, aShape)) {
if (aGeomObj->GetType() == GEOM_GROUP || aShape.ShapeType() == getShapeType()) {
TopTools_IndexedMapOfShape aMainMap;
TopoDS_Shape aMainShape = GEOM_Client().GetShape(GeometryGUI::GetGeomGen(), myMainObj);
TopExp::MapShapes(aMainShape, aMainMap);
TopExp_Explorer anExp (aShape, getShapeType());
for (; anExp.More(); anExp.Next()) {
TopoDS_Shape aSubShape = anExp.Current();
int anIndex = aMainMap.FindIndex(aSubShape);
if (anIndex >= 0) {
if (subSelectionWay() != ALL_SUBSHAPES &&
!myMain2InPlaceIndices.IsBound(anIndex))
continue;
theMapIndex.Add(anIndex);
}
}
}
}
}
} // for aSelList
}
return theMapIndex.Extent();
}
//=================================================================================
// function : add
@ -666,86 +674,14 @@ void GroupGUI_GroupDlg::selectAllSubShapes()
//=================================================================================
void GroupGUI_GroupDlg::add()
{
TColStd_IndexedMapOfInteger aMapIndex;
int nbSel = getSelectedSubshapes(aMapIndex);
TColStd_MapOfInteger aMap;
for (int i = 0, n = myIdList->count(); i < n; i++)
aMap.Add(myIdList->item(i)->text().toInt());
TColStd_IndexedMapOfInteger aMapIndex;
SALOME_ListIO aSelIOs;
SalomeApp_Application* app = myGeomGUI->getApp();
if ( app ) {
LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
if ( aSelMgr ) {
LightApp_SelectionMgr::MapEntryOfMapOfInteger aMap;
aSelMgr->selectedSubOwners( aMap );
if ( aMap.Size() == 1 )
aMapIndex = LightApp_SelectionMgr::MapEntryOfMapOfInteger::Iterator( aMap ).Value();
else { // selected the same subshape as the main object
SALOME_ListIO aSelList;
TColStd_IndexedMapOfInteger aMap;
aSelMgr->selectedObjects(aSelList);
if (aSelList.Extent() == 1) {
Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aRes);
if ( aSelectedObject->_is_equivalent(myMainObj) )
aMapIndex.Add(1); // add index of the only subshape of selected type
}
}
}
}
GEOM::ListOfGO anObjects;
// get selected sub-shapes of myInPlaceObj
if ( aMapIndex.Extent() > 0 && !myInPlaceObj->_is_nil() )
{
GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
anObjects.length( aMapIndex.Extent() );
for ( int i = 1; i <= aMapIndex.Extent(); i++ )
anObjects[ i-1 ] = aShapesOp->GetSubShape( myInPlaceObj, aMapIndex( i ));
aMapIndex.Clear();
}
// try to find out and process the object browser selection or InPlace sub-shapes
if ( !aMapIndex.Extent() )
{
if ( anObjects.length() == 0 )
GEOMBase::ConvertListOfIOInListOfGO(aSelIOs, anObjects);
GEOM::GEOM_ILocalOperations_var aLocOp = getGeomEngine()->GetILocalOperations( getStudyId() );
GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
for (int i = 0; i < anObjects.length(); i++)
{
GEOM::GEOM_Object_var aGeomObj = anObjects[i];
GEOM::ListOfGO_var aSubObjects = new GEOM::ListOfGO();
TopoDS_Shape aShape;
if ( GEOMBase::GetShape(aGeomObj, aShape, getShapeType()) )
{
aSubObjects->length(1);
aSubObjects[0] = aGeomObj;
}
else if (aGeomObj->GetType() == GEOM_GROUP)
aSubObjects = aShapesOp->MakeExplode( aGeomObj, getShapeType(), false);
else
break;
for (int i = 0; i < aSubObjects->length(); i++)
{
TopoDS_Shape aShape;
if ( GEOMBase::GetShape(aSubObjects[i], aShape, getShapeType()) )
{
CORBA::Long anIndex;
anIndex = aLocOp->GetSubShapeIndex( myMainObj, aSubObjects[i] );
if ( anIndex >= 0 )
aMapIndex.Add( anIndex );
}
}
}
}
if ( aMapIndex.Extent() >= 1 ) {
if (nbSel > 0) {
bool isBlocked = myIdList->signalsBlocked();
myIdList->blockSignals(true);
@ -782,14 +718,13 @@ void GroupGUI_GroupDlg::remove()
highlightSubShapes();
}
//=======================================================================
//=================================================================================
//function : subSelectionWay
//purpose :
//=======================================================================
//=================================================================================
int GroupGUI_GroupDlg::subSelectionWay() const
{
return mySelectionWayGroup->checkedId();
return myRestrictGroup->checkedId();
}
//=================================================================================
@ -824,30 +759,70 @@ void GroupGUI_GroupDlg::setShapeType( const TopAbs_ShapeEnum theType )
if (!myIsShapeType)
{
myIsShapeType = true;
// workaround top avoid set checked button 0
// workaround to avoid set checked button 0
setConstructorId(anId);
}
}
//=================================================================================
// function : activateSelection
// purpose : Activate selection in accordance with myEditCurrentArgument
//=================================================================================
void GroupGUI_GroupDlg::activateSelection()
{
globalSelection( GEOM_ALLSHAPES );
erasePreview(false);
// local selection
if ( !myMainObj->_is_nil() && !myEditCurrentArgument/* && mySelSubBtn->isChecked()*/
&& myIsShapeType) { // check if shape type is already choosen by user
if (!myMainObj->_is_nil() &&
!myEditCurrentArgument &&
myIsShapeType) // check if shape type is already choosen by user
{
GEOM_Displayer* aDisplayer = getDisplayer();
// if ( !myPlaceCheckBox->isChecked() )
SUIT_ViewWindow* aViewWindow = 0;
SUIT_Study* activeStudy = SUIT_Session::session()->activeApplication()->activeStudy();
if (activeStudy)
aViewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
if (aViewWindow == 0) return;
SUIT_ViewManager* aViewManager = aViewWindow->getViewManager();
if (aViewManager->getType() != OCCViewer_Viewer::Type() &&
aViewManager->getType() != SVTK_Viewer::Type())
return;
SUIT_ViewModel* aViewModel = aViewManager->getViewModel();
SALOME_View* aView = dynamic_cast<SALOME_View*>(aViewModel);
if (aView == 0) return;
TopoDS_Shape aMainShape = GEOM_Client().GetShape(GeometryGUI::GetGeomGen(), myMainObj);
TopoDS_Shape aRestrictionShape;
if (subSelectionWay() == ALL_SUBSHAPES)
localSelection( myMainObj, getShapeType() );
aRestrictionShape = aMainShape;
else if (!myInPlaceObj->_is_nil())
localSelection( myInPlaceObj, getShapeType() );
aRestrictionShape = GEOM_Client().GetShape(GeometryGUI::GetGeomGen(), myInPlaceObj);
else ;
TopTools_IndexedMapOfShape aSubShapesMap;
TopExp::MapShapes(aMainShape, aSubShapesMap);
CORBA::String_var aMainEntry = myMainObj->GetStudyEntry();
QString anEntryBase = aMainEntry.in();
TopExp_Explorer anExp (aRestrictionShape, getShapeType());
for (; anExp.More(); anExp.Next())
{
TopoDS_Shape aSubShape = anExp.Current();
int index = aSubShapesMap.FindIndex(aSubShape);
QString anEntry = anEntryBase + QString("_%1").arg(index);
SALOME_Prs* aPrs = aDisplayer->buildSubshapePresentation(aSubShape, anEntry, aView);
if (aPrs) {
displayPreview(aPrs, true, false); // append, do not update
}
}
aDisplayer->UpdateViewer();
}
globalSelection(GEOM_ALLSHAPES);
SelectionIntoArgument();
}
@ -856,110 +831,19 @@ void GroupGUI_GroupDlg::activateSelection()
// function : updateState
// purpose :
//=================================================================================
void GroupGUI_GroupDlg::updateState()
void GroupGUI_GroupDlg::updateState (bool isAdd)
{
bool isAdd = false;
TColStd_IndexedMapOfInteger aMapIndex;
SALOME_ListIO aSelIOs;
SalomeApp_Application* app = myGeomGUI->getApp();
if ( app ) {
LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
if ( aSelMgr ) {
LightApp_SelectionMgr::MapEntryOfMapOfInteger aMap;
aSelMgr->selectedSubOwners( aMap );
if ( aMap.Size() == 1 )
aMapIndex = LightApp_SelectionMgr::MapEntryOfMapOfInteger::Iterator( aMap ).Value();
else { // selected the same subshape as the main object
SALOME_ListIO aSelList;
aSelMgr->selectedObjects(aSelList);
if (aSelList.Extent() == 1) {
myBusy = true;
Standard_Boolean aRes = Standard_False;
GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aRes);
if ( aSelectedObject->_is_equivalent(myMainObj) ) {
aMapIndex.Add(1); // add index of the only subshape of selected type
TColStd_MapOfInteger anIds; // higlight selected index
anIds.Add(1);
aSelMgr->AddOrRemoveIndex(aSelList.First(), anIds, false);
}
myBusy = false;
}
}
}
}
// try to find out and process the object browser selection
if ( !aMapIndex.Extent() && !CORBA::is_nil( myMainObj ) ) {
GEOM::ListOfGO anObjects;
//GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), anObjects);
GEOMBase::ConvertListOfIOInListOfGO(aSelIOs, anObjects);
GEOM::GEOM_ILocalOperations_var aLocOp = getGeomEngine()->GetILocalOperations( getStudyId() );
GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
isAdd = true;
for (int i = 0; i < anObjects.length(); i++)
{
GEOM::GEOM_Object_var aGeomObj = anObjects[i];
GEOM::ListOfGO_var aSubObjects = new GEOM::ListOfGO();
TopoDS_Shape aShape;
if ( GEOMBase::GetShape(aGeomObj, aShape, getShapeType()) ) {
aSubObjects->length(1);
aSubObjects[0] = aGeomObj;
}
else if (aGeomObj->GetType() == GEOM_GROUP) {
aSubObjects = aShapesOp->MakeExplode( aGeomObj, getShapeType(), false);
}
else {
aMapIndex.Clear();
break;
}
for (int i = 0; i < aSubObjects->length(); i++)
{
TopoDS_Shape aShape;
aSubObjects[i];
if ( GEOMBase::GetShape(aSubObjects[i], aShape, getShapeType()) )
{
CORBA::Long anIndex;
anIndex = aLocOp->GetSubShapeIndex( myMainObj, aSubObjects[i] );
if ( anIndex >= 0 )
aMapIndex.Add( anIndex );
else
isAdd = false;
}
else
isAdd = false;
if ( !isAdd ) {
aMapIndex.Clear();
break;
}
}
if ( !isAdd ) {
aMapIndex.Clear();
break;
}
}
}
isAdd = aMapIndex.Extent() > 0;
myAddBtn->setEnabled(!myEditCurrentArgument && !CORBA::is_nil(myMainObj) && isAdd);
//myShowOnlyBtn->setEnabled(!myEditCurrentArgument && !CORBA::is_nil(myMainObj) && isAdd);
bool hasSel = myIdList->selectedItems().count() > 0;
myRemBtn->setEnabled(hasSel);
//mySelSubBtn->setEnabled( !CORBA::is_nil( myMainObj ) );
//myPlaceCheckBox->setEnabled( !CORBA::is_nil( myMainObj ) );
mySelectionWayGroupBox->setEnabled( !CORBA::is_nil( myMainObj ) );
myRestrictGroupBox->setEnabled(!CORBA::is_nil(myMainObj));
mySelAllBtn->setEnabled(!CORBA::is_nil(myMainObj));
// mySelBtn2->setEnabled( myPlaceCheckBox->isChecked() );
// myShape2Name->setEnabled( myPlaceCheckBox->isChecked() );
mySelBtn2->setEnabled( subSelectionWay() != ALL_SUBSHAPES);
myShape2Name->setEnabled(subSelectionWay() != ALL_SUBSHAPES);
// if ( !myPlaceCheckBox->isChecked() )
if (subSelectionWay() == ALL_SUBSHAPES)
setInPlaceObj(GEOM::GEOM_Object::_nil());
}
@ -982,19 +866,6 @@ void GroupGUI_GroupDlg::highlightSubShapes()
if (CORBA::is_nil(myMainObj))
return;
Standard_Boolean isOk;
char* objIOR;
if ( myInPlaceObj->_is_nil() )
objIOR = GEOMBase::GetIORFromObject( myMainObj );
else
objIOR = GEOMBase::GetIORFromObject( myInPlaceObj );
Handle(GEOM_AISShape) aSh = GEOMBase::ConvertIORinGEOMAISShape( objIOR, isOk, true );
free( objIOR );
if ( !isOk || aSh.IsNull() )
return;
TColStd_MapOfInteger anIds;
myBusy = true;
@ -1004,30 +875,66 @@ void GroupGUI_GroupDlg::highlightSubShapes()
{
if (myIdList->item(ii)->isSelected()) {
int id = myIdList->item(ii)->text().toInt();
// if ( myPlaceCheckBox->isChecked() )
if ( subSelectionWay() != ALL_SUBSHAPES )
{
if ( myMain2InPlaceIndices.IsBound( id ) )
id = myMain2InPlaceIndices( id );
else {
if (subSelectionWay() != ALL_SUBSHAPES &&
!myMain2InPlaceIndices.IsBound(id)) {
myIdList->item(ii)->setSelected(false);
continue;
}
}
else {
anIds.Add(id);
}
}
}
SalomeApp_Application* app = myGeomGUI->getApp();
LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
aSelMgr->clearSelected();
aSelMgr->AddOrRemoveIndex(aSh->getIO(), anIds, false);
SUIT_ViewWindow* aViewWindow = 0;
SUIT_Study* activeStudy = app->activeStudy();
if (activeStudy)
aViewWindow = app->desktop()->activeWindow();
if (aViewWindow == 0) return;
SUIT_ViewManager* aViewManager = aViewWindow->getViewManager();
if (aViewManager->getType() != OCCViewer_Viewer::Type() &&
aViewManager->getType() != SVTK_Viewer::Type())
return;
SUIT_ViewModel* aViewModel = aViewManager->getViewModel();
SALOME_View* aView = dynamic_cast<SALOME_View*>(aViewModel);
if (aView == 0) return;
// TODO: use here GEOMBase_Helper::myPreview instead of ic->DisplayedObjects()
OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)aViewManager)->getOCCViewer();
Handle(AIS_InteractiveContext) ic = v3d->getAISContext();
AIS_ListOfInteractive List;
ic->DisplayedObjects(List);
SALOME_ListIO aSelList;
AIS_ListIteratorOfListOfInteractive ite (List);
for (; ite.More(); ite.Next()) {
if (ite.Value()->IsInstance(STANDARD_TYPE(GEOM_AISShape))) {
Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(ite.Value());
if (aSh->hasIO()) {
Handle(SALOME_InteractiveObject) anIO = aSh->getIO();
QString anEntry = anIO->getEntry();
int index = anEntry.lastIndexOf("_");
anEntry.remove(0, index+1);
int anIndex = anEntry.toInt();
if (anIds.Contains(anIndex))
aSelList.Append(anIO);
}
}
}
aSelMgr->setSelectedObjects(aSelList);
myBusy = false;
if (nn < 3000)
updateState();
updateState(aSelList.Extent() > 0);
else {
myAddBtn->setEnabled(true);
myAddBtn->setEnabled(true);
myRemBtn->setEnabled(true);
}
@ -1078,8 +985,6 @@ bool GroupGUI_GroupDlg::isValid( QString& theMessage )
//=================================================================================
bool GroupGUI_GroupDlg::execute(ObjectList& objects)
{
setInPlaceObj( GEOM::GEOM_Object::_nil() );
GEOM::GEOM_IGroupOperations_var anOper = GEOM::GEOM_IGroupOperations::_narrow(getOperation());
GEOM::GEOM_Object_var aGroup;

14
src/GroupGUI/GroupGUI_GroupDlg.h
View File

@ -22,7 +22,7 @@
// GEOM GEOMGUI : GUI for Geometry component
// File : GroupGUI_GroupDlg.h
// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
//
#ifndef GROUPGUI_GROUPDLG_H
#define GROUPGUI_GROUPDLG_H
@ -30,6 +30,7 @@
#include <TopAbs_ShapeEnum.hxx>
#include <TColStd_DataMapOfIntegerInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
class QGroupBox;
class QLineEdit;
@ -74,6 +75,7 @@ private slots:
void selectAllSubShapes();
void add();
void remove();
void showOnlySelected();
void selectionChanged();
private:
@ -83,10 +85,11 @@ private:
TopAbs_ShapeEnum getShapeType() const;
void setShapeType( const TopAbs_ShapeEnum );
void activateSelection();
void updateState();
void updateState(bool isAdd = false);
void highlightSubShapes();
void onGetInPlace();
void setInPlaceObj( GEOM::GEOM_Object_var, const bool isVisible=1);
int getSelectedSubshapes (TColStd_IndexedMapOfInteger& theMapIndex);
private:
Mode myMode;
@ -102,11 +105,14 @@ private:
QLineEdit* myMainName;
QPushButton* mySelBtn2;
QLineEdit* myShape2Name;
QGroupBox* mySelectionWayGroupBox;
QButtonGroup* mySelectionWayGroup;
QGroupBox* myRestrictGroupBox;
QButtonGroup* myRestrictGroup;
QPushButton* mySelAllBtn;
QPushButton* myAddBtn;
QPushButton* myRemBtn;
QPushButton* myShowOnlyBtn;
QPushButton* myHideSelBtn;
QPushButton* myShowAllBtn;
QListWidget* myIdList;
};