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

Add object selection in Dependency Tree

Browse Source
This commit is contained in:
mpa 2014-05-23 17:04:32 +04:00
parent 30c1376c61
commit 328ea5246c
2 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/DependencyTree/DependencyTree_View.cxx
View File

@ -89,6 +89,7 @@ myIsUpdate( true )
GEOMUtils::ConvertStringToTree( buf, myTreeModel ); GEOMUtils::ConvertStringToTree( buf, myTreeModel );
aSelMgr->clearSelected();
} }
DependencyTree_View::~DependencyTree_View() DependencyTree_View::~DependencyTree_View()
@ -345,6 +346,7 @@ void DependencyTree_View::drawTree()
} }
} }
centerOn( scene()->sceneRect().center() ); centerOn( scene()->sceneRect().center() );
fitAll( true );
} }
@ -362,7 +364,6 @@ void DependencyTree_View::drawWard( const GEOMUtils::LevelsList theWard, const i
for (node = levelInfo.begin(); node != levelInfo.end(); node++ ) { for (node = levelInfo.begin(); node != levelInfo.end(); node++ ) {
DependencyTree_Object* object = myTreeMap[ node->first ]; DependencyTree_Object* object = myTreeMap[ node->first ];
if( !isItemAdded( object ) ) { if( !isItemAdded( object ) ) {
std::cout<< "\n\n\n addItem = " << object->getEntry() << std::endl;
addItem( object ); addItem( object );
myLevelMap[ node->first ] = myCurrentLevel; myLevelMap[ node->first ] = myCurrentLevel;
myLevelsObject[ myCurrentLevel ].push_back( node->first ); myLevelsObject[ myCurrentLevel ].push_back( node->first );
@ -506,6 +507,7 @@ void DependencyTree_View::init( GraphicsView_ViewFrame* theViewFrame )
setNodesMovable( resMgr->booleanValue( "Geometry", "dependency_tree_move_nodes", true ) ); setNodesMovable( resMgr->booleanValue( "Geometry", "dependency_tree_move_nodes", true ) );
setHierarchyType( resMgr->integerValue( "Geometry", "dependency_tree_hierarchy_type", 0 ) ); setHierarchyType( resMgr->integerValue( "Geometry", "dependency_tree_hierarchy_type", 0 ) );
} }
void DependencyTree_View::onMoveNodes( bool theIsMoveNodes ) void DependencyTree_View::onMoveNodes( bool theIsMoveNodes )
@ -564,7 +566,11 @@ void DependencyTree_View::updateView()
qthread = new DependencyTree_ComputeDlg_QThread(this);// = DependencyTree_ComputeDlg_QThread(this);// const_cast<DependencyTree_View*>(this) ); qthread = new DependencyTree_ComputeDlg_QThread(this);// = DependencyTree_ComputeDlg_QThread(this);// const_cast<DependencyTree_View*>(this) );
cancelAction->setVisible( true ); cancelAction->setVisible( true );
progressAction->setVisible(true); progressAction->setVisible(true);
startTimer(100); // millisecs myNodesMovable->setEnabled(false);
myHierarchyDepth->setEnabled( false);
myDisplayAscendants->setEnabled( false );
myDisplayDescendants->setEnabled( false );
myTimer = startTimer(100); // millisecs
qthread->start(); qthread->start();
} }
@ -578,6 +584,10 @@ void DependencyTree_View::onCancel()
qthread->cancel(); qthread->cancel();
cancelButton->setText( tr("CANCELING")); cancelButton->setText( tr("CANCELING"));
cancelButton->setEnabled(false); cancelButton->setEnabled(false);
killTimer( myTimer );
qthread->killTimer( myTimer );
qthread->deleteLater();
} }
void DependencyTree_View::timerEvent(QTimerEvent *event) void DependencyTree_View::timerEvent(QTimerEvent *event)
@ -592,6 +602,10 @@ void DependencyTree_View::timerEvent(QTimerEvent *event)
progressAction->setVisible(false); progressAction->setVisible(false);
cancelButton->setText( tr("CANCEL")); cancelButton->setText( tr("CANCEL"));
cancelButton->setEnabled(true); cancelButton->setEnabled(true);
myNodesMovable->setEnabled( true );
myHierarchyDepth->setEnabled( true );
myDisplayAscendants->setEnabled( true );
myDisplayDescendants->setEnabled( true );
} }
event->accept(); event->accept();
@ -707,39 +721,25 @@ int DependencyTree_View::select( const QRectF& theRect, bool theIsAppend )
{ {
GraphicsView_ViewPort::select( theRect, theIsAppend ); GraphicsView_ViewPort::select( theRect, theIsAppend );
// SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
//
// LightApp_SelectionMgr* aSelMgr = app->selectionMgr(); LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
//
// // get selection // get selection
// SALOME_ListIO listIO; SALOME_ListIO listIO;
// aSelMgr->clearSelected();
// SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>(app->activeStudy()); SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>(app->activeStudy());
// SALOMEDS::Study_var aStudyDS = GeometryGUI::ClientStudyToStudy( study->studyDS()); SALOMEDS::Study_var aStudyDS = GeometryGUI::ClientStudyToStudy( study->studyDS());
// int StudyId = aStudyDS->StudyId(); int StudyId = aStudyDS->StudyId();
// for( initSelected(); moreSelected(); nextSelected() ) for( initSelected(); moreSelected(); nextSelected() )
// if( DependencyTree_Object* aDepObject = dynamic_cast<DependencyTree_Object*>( selectedObject() ) ) { if( DependencyTree_Object* aDepObject = dynamic_cast<DependencyTree_Object*>( selectedObject() ) ) {
// GEOM::_objref_GEOM_BaseObject* object = GeometryGUI::GetGeomGen()->GetObject( StudyId, aDepObject->getEntry().c_str() );
// _PTR(SObject) SO ( aStudyDS->FindObjectID( aDepObject->getEntry().c_str() ) ); CORBA::String_var aChildEntry = object->GetStudyEntry();
// if ( SO ) { //;&& QString(SO->GetID().c_str()) == QString(SO->GetFatherComponent()->GetID().c_str()) ) { Handle(SALOME_InteractiveObject) tmpIO =
// _PTR(SComponent) SC ( SO->GetFatherComponent() ); new SALOME_InteractiveObject( aChildEntry.in(), "GEOM", "TEMP_IO");
// // if component is selected listIO.Append(tmpIO);
// _PTR(ChildIterator) anIter ( aStudyDS->NewChildIterator( SO ) ); }
// anIter->InitEx( true ); aSelMgr->setSelectedObjects( listIO, true );
// while( anIter->More() ) {
// _PTR(SObject) valSO ( anIter->Value() );
// _PTR(SObject) refSO;
// if ( !valSO->ReferencedObject( refSO ) ) {
// listIO.Append( new SALOME_InteractiveObject(valSO->GetID().c_str(),
// SC->ComponentDataType().c_str(),
// valSO->GetName().c_str()) );
// }
// anIter->Next();
// }
// break;
// }
// }
// aSelMgr->setSelectedObjects( listIO, true );
} }
//================================================================================ //================================================================================

2
src/DependencyTree/DependencyTree_View.h
View File

@ -137,6 +137,8 @@ private:
std::string myData; std::string myData;
int myTimer;
bool myIsUpdate; bool myIsUpdate;
GraphicsView_ViewFrame* myViewFrame; GraphicsView_ViewFrame* myViewFrame;