+// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// 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 "GEOMGUI_OCCSelector.h"
-#include <SalomeApp_DataSubOwner.h>
+#include <LightApp_DataSubOwner.h>
#include <OCCViewer_ViewModel.h>
-#include <SALOME_InteractiveObject.hxx>
-
#include <AIS_ListOfInteractive.hxx>
#include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <SelectMgr_EntityOwner.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx>
#include <SelectMgr_Selection.hxx>
#include <SelectBasics_SensitiveEntity.hxx>
+#include <StdSelect_BRepOwner.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
-#include <SelectMgr_IndexedMapOfOwner.hxx>
#include <NCollection_DataMap.hxx>
+#include <SUIT_Session.h>
+#include <SalomeApp_Study.h>
+
//================================================================
// Function : GEOMGUI_OCCSelector
// Purpose :
//================================================================
GEOMGUI_OCCSelector::GEOMGUI_OCCSelector( OCCViewer_Viewer* viewer, SUIT_SelectionMgr* mgr )
-: SalomeApp_OCCSelector( viewer, mgr )
+: LightApp_OCCSelector( viewer, mgr )
{
}
{
for ( ic->InitSelected(); ic->MoreSelected(); ic->NextSelected() )
{
- Handle(SelectMgr_EntityOwner) anOwner = ic->SelectedOwner();
+ Handle(StdSelect_BRepOwner) anOwner = Handle(StdSelect_BRepOwner)::DownCast(ic->SelectedOwner());
if ( anOwner.IsNull() )
continue;
if ( !entryStr.isEmpty() )
{
- SalomeApp_DataOwner* owner;
+ LightApp_DataOwner* owner;
if ( index > -1 ) // Local Selection
- owner = new SalomeApp_DataSubOwner( entryStr, index );
+ owner = new LightApp_DataSubOwner( entryStr, index );
else // Global Selection
- owner = new SalomeApp_DataOwner( entryStr );
+ owner = new LightApp_DataOwner( entryStr );
aList.append( SUIT_DataOwnerPtr( owner ) );
}
if ( !entryStr.isEmpty() )
{
- SalomeApp_DataOwner* owner = new SalomeApp_DataOwner( entryStr );
+ LightApp_DataOwner* owner = new LightApp_DataOwner( entryStr );
aList.append( SUIT_DataOwnerPtr( owner ) );
}
}
}
+ // add externally selected objects
+ SUIT_DataOwnerPtrList::const_iterator anExtIter;
+ for(anExtIter = mySelectedExternals.begin(); anExtIter != mySelectedExternals.end(); anExtIter++) {
+ aList.append(*anExtIter);
+ }
+
}
//================================================================
Handle(AIS_InteractiveContext) ic = vw->getAISContext();
-#ifndef WNT
NCollection_DataMap<TCollection_AsciiString, TColStd_IndexedMapOfInteger> indexesMap; // "entry - list_of_int" map for LOCAL selection
-#else
- NCollection_DataMap<Standard_CString, TColStd_IndexedMapOfInteger> indexesMap; // "entry - list_of_int" map for LOCAL selection
-#endif
QMap<QString,int> globalSelMap; // only Key=entry from this map is used. value(int) is NOT used at all.
SelectMgr_IndexedMapOfOwner ownersmap; // map of owners to be selected
// "entry - to - list_of_ids" map
for ( SUIT_DataOwnerPtrList::const_iterator itr = aList.begin(); itr != aList.end(); ++itr )
{
- const SalomeApp_DataSubOwner* subOwner = dynamic_cast<const SalomeApp_DataSubOwner*>( (*itr).operator->() );
+ const LightApp_DataSubOwner* subOwner = dynamic_cast<const LightApp_DataSubOwner*>( (*itr).operator->() );
if ( subOwner )
{
QString entry = subOwner->entry();
#ifndef WNT
- if ( indexesMap.IsBound( TCollection_AsciiString((char*)entry.latin1())))
+ if ( indexesMap.IsBound( TCollection_AsciiString(entry.toLatin1().data())))
#else
- if ( indexesMap.IsBound( (char*)entry.latin1()))
+ if ( indexesMap.IsBound( (char*)entry.toLatin1()))
#endif
{
- TColStd_IndexedMapOfInteger& subIndexes = indexesMap.ChangeFind((char*)entry.latin1());
+ TColStd_IndexedMapOfInteger& subIndexes = indexesMap.ChangeFind(entry.toLatin1().data());
subIndexes.Add( subOwner->index() );
//indexesMap.replace( entry, subIndexes );
}
{
TColStd_IndexedMapOfInteger subIndexes;
subIndexes.Add( subOwner->index() );
- indexesMap.Bind((char*)entry.latin1(), subIndexes);
+ indexesMap.Bind(entry.toLatin1().data(), subIndexes);
}
}
else // the owner is NOT a sub owner, maybe it is a DataOwner == GLOBAL selection
{
- const SalomeApp_DataOwner* owner = dynamic_cast<const SalomeApp_DataOwner*>( (*itr).operator->() );
+ const LightApp_DataOwner* owner = dynamic_cast<const LightApp_DataOwner*>( (*itr).operator->() );
if ( owner )
{
- globalSelMap[owner->entry()] = 1;
+ SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
+ QString anEntry = appStudy->referencedToEntry( owner->entry() );
+
+ globalSelMap[anEntry] = 1;
}
}
}
for ( int i = 1, n = owners.Extent(); i <= n; i++ )
{
- Handle(SelectMgr_EntityOwner) anOwner = owners( i );
+
+ Handle(StdSelect_BRepOwner) anOwner = Handle(StdSelect_BRepOwner)::DownCast(owners( i ));
+
if ( anOwner.IsNull() || !anOwner->HasShape() )
continue;
if ( !anOwner->ComesFromDecomposition() && globalSelMap.contains( entryStr ) )
{
ownersmap.Add( anOwner );
+ globalSelMap[entryStr]++;
}
// LOCAL selection
else
{
Handle(AIS_Shape) aisShape = Handle(AIS_Shape)::DownCast( io );
- if ( !aisShape.IsNull() && indexesMap.IsBound( (char*)entryStr.latin1() ) )
+ if ( !aisShape.IsNull() && indexesMap.IsBound( entryStr.toLatin1().data() ) )
{
TopoDS_Shape shape = aisShape->Shape();
TopTools_IndexedMapOfShape aMapOfShapes;
TopExp::MapShapes( shape, aMapOfShapes );
- const TColStd_IndexedMapOfInteger& subIndexes = indexesMap.ChangeFind((char*)entryStr.latin1());
+ const TColStd_IndexedMapOfInteger& subIndexes = indexesMap.ChangeFind(entryStr.toLatin1().data());
const TopoDS_Shape& aSubShape = anOwner->Shape();
int aSubShapeId = aMapOfShapes.FindIndex( aSubShape );
}
vw->update();
+
+ // fill extra selected
+ mySelectedExternals.clear();
+ for ( SUIT_DataOwnerPtrList::const_iterator itr2 = aList.begin(); itr2 != aList.end(); ++itr2 ) {
+ const LightApp_DataSubOwner* subOwner = dynamic_cast<const LightApp_DataSubOwner*>( (*itr2).operator->() );
+ if ( !subOwner )
+ {
+ const LightApp_DataOwner* owner = dynamic_cast<const LightApp_DataOwner*>( (*itr2).operator->() );
+ if ( owner )
+ {
+ SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
+ QString anEntry = appStudy->referencedToEntry( owner->entry() );
+ if (globalSelMap[anEntry] == 1) mySelectedExternals.append(*itr2);
+ }
+ }
+ }
}