#include "SalomeApp_Module.h"
#include "SalomeApp_Study.h"
#include "SalomeApp_Application.h"
+
+#include "OB_Browser.h"
+#include "LightApp_DataObject.h"
#include "LightApp_SelectionMgr.h"
#include "SALOME_ListIO.hxx"
}
bool
- CheckLock( _PTR(Study) theStudy )
+ CheckLock( _PTR(Study) theStudy,
+ QWidget* theWidget )
{
- if(IsStudyLocked(theStudy))
- {
- SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>
- (SUIT_Session::session()->activeApplication());
- if (anApp)
- {
- SUIT_MessageBox::warn1(anApp->desktop(),
- QObject::tr("WRN_VISU_WARNING"),
- QObject::tr("WRN_STUDY_LOCKED"),
- QObject::tr("BUT_OK"));
- return true;
+ if(IsStudyLocked(theStudy)){
+ SUIT_MessageBox::warn1(theWidget,
+ QObject::tr("WRN_VISU_WARNING"),
+ QObject::tr("WRN_STUDY_LOCKED"),
+ QObject::tr("BUT_OK"));
+ return true;
+ }
+ return false;
+ }
+
+ LightApp_DataObject*
+ FindDataObject(SUIT_DataObject* theDataObject,
+ const QString& theEntry,
+ int theLevel)
+ {
+ int aLevel = theDataObject->level() + 2;
+ QString aSourceEntry = theEntry.section(':',0,aLevel);
+ DataObjectList aList;
+ theDataObject->children(aList);
+ DataObjectListIterator aDataObjectIter(aList);
+ while(SUIT_DataObject* aDataObject = aDataObjectIter.current()){
+ if(LightApp_DataObject* aChildDataObject = dynamic_cast<LightApp_DataObject*>(aDataObject)){
+ QString anEntry = aChildDataObject->entry();
+ QString aCurrentEntry = anEntry.section(':',0,aLevel);
+ if(aSourceEntry == aCurrentEntry){
+ if(theLevel == aLevel){
+ return aChildDataObject;
+ }else{
+ return FindDataObject(aChildDataObject,theEntry,theLevel);
}
+ }
}
+ ++aDataObjectIter;
+ }
+ return NULL;
+ }
+
+ LightApp_DataObject*
+ FindDataObject(CAM_Module* theModule,
+ _PTR(SObject) theSObject)
+ {
+ CAM_DataModel* aDataModel = theModule->dataModel();
+ CAM_DataObject* aRootDataObject = aDataModel->root();
+ if(_PTR(SComponent) aComponent = theSObject)
+ return dynamic_cast<LightApp_DataObject*>(aRootDataObject);
+
+ int aLevel = theSObject->Depth();
+ std::string anEntry = theSObject->GetID();
+ return FindDataObject(aRootDataObject,anEntry.c_str(),aLevel);
+ }
+
+ void
+ UpdateObjBrowser(SalomeApp_Module* theModule,
+ bool theIsUpdateDataModel,
+ _PTR(SObject) theSObject)
+ {
+ LightApp_DataObject* aDataObject = NULL;
+ if(theSObject)
+ aDataObject = FindDataObject(theModule,theSObject);
+
+ theModule->updateObjBrowser(theIsUpdateDataModel,aDataObject);
+ theModule->getApp()->updateActions();
+ }
+
+ bool
+ IsSObjectTable( _PTR(SObject) theSObject )
+ {
+ if ( theSObject ) {
+ _PTR(GenericAttribute) anAttr;
+ if (theSObject->FindAttribute( anAttr, "AttributeTableOfInteger" ))
+ return true;
+ if (theSObject->FindAttribute( anAttr, "AttributeTableOfReal" ))
+ return true;
+ }
return false;
}
Handle(SALOME_InteractiveObject)* theIO,
VISU::Storable::TRestoringMap* theMap)
{
- if (CheckLock(GetCStudy(GetAppStudy(theModule))))
+ if (CheckLock(GetCStudy(GetAppStudy(theModule)),GetDesktop(theModule)))
return NULL;
CORBA::Object_var anObject = GetSelectedObj(theModule, theIO);
}
void
- DeleteSObject (SalomeApp_Module* theModule,
- _PTR(Study) theStudy,
- _PTR(SObject) theSObject)
+ DeleteSObject(VisuGUI* theModule,
+ _PTR(Study) theStudy,
+ _PTR(SObject) theSObject)
{
- //SalomeApp_Study* study = GetAppStudy( theModule );
-
_PTR(ChildIterator) aChildIter = theStudy->NewChildIterator(theSObject);
for (aChildIter->InitEx(true); aChildIter->More(); aChildIter->Next()) {
_PTR(SObject) aChildSObject = aChildIter->Value();
CORBA::Object_var aChildObj = VISU::ClientSObjectToObject(aChildSObject);
- VisuGUI* aMod = dynamic_cast<VisuGUI*>(theModule);
- if(aMod) RemoveScalarBarPosition(aMod,aChildObj);
+ RemoveScalarBarPosition(theModule,aChildObj);
ErasePrs(theModule, aChildObj);
}
CORBA::Object_var anObj = VISU::ClientSObjectToObject(theSObject);
if (!CORBA::is_nil(anObj)) {
- VisuGUI* aMod = dynamic_cast<VisuGUI*>(theModule);
- if(aMod) RemoveScalarBarPosition(aMod,anObj);
+ RemoveScalarBarPosition(theModule,anObj);
ErasePrs(theModule, anObj);
+
VISU::RemovableObject_var aRemovableObject = VISU::RemovableObject::_narrow(anObj);
if (!CORBA::is_nil(aRemovableObject)) {
aRemovableObject->RemoveFromStudy();
}
void
- DeletePrs3d(SalomeApp_Module* theModule,
+ DeletePrs3d(VisuGUI* theModule,
VISU::Prs3d_i* thePrs,
const Handle(SALOME_InteractiveObject)& theIO)
{
if (!thePrs)
return;
- if (CheckLock(GetCStudy(GetAppStudy(theModule))))
+ if (CheckLock(GetCStudy(GetAppStudy(theModule)),GetDesktop(theModule)))
return;
- SALOMEDS::SObject_var aSObject = thePrs->GetSObject();
- CORBA::String_var anEntry = aSObject->GetID();
- LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(theModule);
- Remove(aSelectionMgr,theIO);
- TViewWindows aViewWindows = GetViews(theModule);
- for(int i = 0, iEnd = aViewWindows.size(); i < iEnd; i++){
- SVTK_ViewWindow* aView = aViewWindows[i];
- if(VISU_Actor* anActor = FindActor(aView,anEntry.in())){
- aView->RemoveActor(anActor);
- anActor->Delete();
- }
- }
- thePrs->RemoveFromStudy();
- VisuGUI* aMod = dynamic_cast<VisuGUI*>(theModule);
- Prs3d_i* aPrs_i = dynamic_cast<Prs3d_i*>(thePrs);
- if (aMod && aPrs_i)
- RemoveScalarBarPosition(aMod,aPrs_i);
+ RemoveScalarBarPosition(theModule,thePrs);
+ thePrs->RemoveFromStudy();
}
void
VISU::Prs3d_i* thePrs)
{
if ( SVTK_ViewWindow* vw = GetViewWindow( theModule ) ){
- VISU_Actor* anVISUActor = FindActor( vw, thePrs );
-
- if (anVISUActor) {
+ if (VISU_Actor* anVISUActor = FindActor( vw, thePrs )) {
anVISUActor->VisibilityOff();
}
}
ChangeRepresentation (const SalomeApp_Module* theModule,
VISU::PresentationType theType)
{
- SUIT_ViewWindow* aView = GetActiveView(theModule, SVTK_Viewer::Type());
- if (!aView) return;
- SVTK_ViewWindow* vw = dynamic_cast<SVTK_ViewWindow*>( aView );
+ SVTK_ViewWindow* vw = GetViewWindow( theModule, false );
if( !vw )
return;
_PTR(SObject) theSource,
VISU::Result_var& theResult)
{
+ if(theSource->Depth() < 3) // Bug of SALOMEDS : can\t get father from root object
+ return NULL;
+
_PTR(SObject) aSObj = theSource->GetFather();
if (!aSObj)
return NULL;
return NULL;
theResult = VISU::Result::_narrow(anObject);
- VISU::Result_i* pResult = dynamic_cast<VISU::Result_i*>(VISU::GetServant(anObject).in());
- if (pResult == NULL)
- SUIT_MessageBox::warn1(GetDesktop(theModule),
- QObject::tr("WRN_VISU"),
- QObject::tr("WRN_NO_AVAILABLE_DATA"),
- QObject::tr("BUT_OK"));
- return pResult;
+ return dynamic_cast<VISU::Result_i*>(VISU::GetServant(anObject).in());
}
// Views
/*SVTK_ViewWindow*
GetViewWindow(const SalomeApp_Module* theModule, const bool theCreate )
{
- if(SalomeApp_Application* anApp = theModule->getApp()){
- if(SUIT_ViewManager* aViewManager = anApp->getViewManager( SVTK_Viewer::Type(), theCreate )){
- if(SUIT_ViewWindow* aViewWindow = aViewManager->getActiveView()){
- return dynamic_cast<SVTK_ViewWindow*>(aViewWindow);
- }
+ if (SalomeApp_Application* anApp = theModule->getApp())
+ {
+ SVTK_ViewWindow* wnd = dynamic_cast<SVTK_ViewWindow*>(anApp->desktop()->activeWindow());
+ if( wnd )
+ return wnd;
+ else
+ {
+ if(SUIT_ViewManager* aViewManager = anApp->getViewManager( SVTK_Viewer::Type(), theCreate ))
+ return dynamic_cast<SVTK_ViewWindow*>( aViewManager->getActiveView() );
}
}
return NULL;
if(aActor = thePrs->CreateActor())
aView->AddActor(aActor);
}catch(std::exception& exc){
- SUIT_MessageBox::warn1(GetDesktop(theModule),
- QObject::tr("WRN_VISU"),
- QObject::tr("ERR_CANT_CREATE_ACTOR") + ": " + QObject::tr(exc.what()),
- QObject::tr("BUT_OK"));
+ SUIT_MessageBox::warn1
+ (GetDesktop(theModule), QObject::tr("WRN_VISU"),
+ QObject::tr("ERR_CANT_CREATE_ACTOR") + ": " + QObject::tr(exc.what()),
+ QObject::tr("BUT_OK"));
}
QApplication::restoreOverrideCursor();
}
vtkRenderer *aRen = vw->getRenderer();
vtkActorCollection *anActColl = aRen->GetActors();
+ anActColl->InitTraversal();
vtkActor *anActor;
VISU_Actor* anVISUActor = NULL;
VISU_Actor* aResActor = NULL;
- for(anActColl->InitTraversal(); (anActor = anActColl->GetNextActor()) != NULL; ){
- if(!SALOME_Actor::SafeDownCast(anActor))
- continue;
- if(anActor->IsA("VISU_Actor")){
- anVISUActor = VISU_Actor::SafeDownCast(anActor);
+ while(vtkActor *anActor = anActColl->GetNextActor()){
+ anVISUActor = VISU_Actor::SafeDownCast(anActor);
+ if(anVISUActor){
VISU::Prs3d_i* aPrs = anVISUActor->GetPrs3d();
if(aPrs == NULL) continue;
if (thePrs == aPrs) {
- aResActor = anVISUActor->GetParent();
try {
+ aResActor = anVISUActor;
thePrs->UpdateActor(aResActor);
aResActor->VisibilityOn();
- } catch (std::runtime_error& ex) {
+ } catch (std::runtime_error& exc) {
aResActor->VisibilityOff();
- INFOS(ex.what());
- SUIT_MessageBox::warn1(GetDesktop(theModule), QObject::tr("WRN_VISU"),
- QObject::tr("ERR_CANT_CREATE_ACTOR") + ": " + QObject::tr(ex.what()),
- QObject::tr("BUT_OK"));
+ INFOS(exc.what());
+ SUIT_MessageBox::warn1
+ (GetDesktop(theModule), QObject::tr("WRN_VISU"),
+ QObject::tr("ERR_CANT_CREATE_ACTOR") + ": " + QObject::tr(exc.what()),
+ QObject::tr("BUT_OK"));
}
} else if (theDispOnly) {
- anVISUActor->GetParent()->VisibilityOff();
+ anVISUActor->VisibilityOff();
} else {
}
} else if (theDispOnly && anActor->GetVisibility()) {
FindActor(SVTK_ViewWindow* theViewWindow,
const char* theEntry)
{
- using namespace VTK;
+ using namespace SVTK;
if(vtkRenderer* aRenderer = theViewWindow->getRenderer()){
if(vtkActorCollection* aCollection = aRenderer->GetActors()){
if(VISU_Actor* anActor = Find<VISU_Actor>(aCollection,TIsSameEntry<VISU_Actor>(theEntry))){
- return anActor->GetParent();
+ return anActor;
}
}
}
VISU::Prs3d_i* thePrs)
{
QApplication::setOverrideCursor(Qt::waitCursor);
- bool isPublished = false;
SALOMEDS::SObject_var aSObject = thePrs->GetSObject();
CORBA::String_var anEntry = aSObject->GetID();
try {
- thePrs->Update();
-
- TViewWindows aViewWindows = GetViews(theModule);
- for (int i = 0, iEnd = aViewWindows.size(); i < iEnd; i++) {
- SVTK_ViewWindow* aView = aViewWindows[i];
- if (VISU_Actor* anActor = FindActor(aView, anEntry.in())) {
- isPublished = true;
- thePrs->UpdateActor(anActor);
- }
- }
- } catch (std::runtime_error& ex) {
- INFOS(ex.what());
+ thePrs->UpdateActors();
+ } catch (std::runtime_error& exc) {
+ INFOS(exc.what());
QApplication::restoreOverrideCursor();
- SUIT_MessageBox::warn1 (GetDesktop(theModule), QObject::tr("WRN_VISU"),
- QObject::tr("ERR_CANT_BUILD_PRESENTATION") + ": " + QObject::tr(ex.what()),
- QObject::tr("BUT_OK"));
+ SUIT_MessageBox::warn1
+ (GetDesktop(theModule), QObject::tr("WRN_VISU"),
+ QObject::tr("ERR_CANT_BUILD_PRESENTATION") + ": " + QObject::tr(exc.what()),
+ QObject::tr("BUT_OK"));
- TViewWindows aViewWindows = GetViews(theModule);
- for (int i = 0, iEnd = aViewWindows.size(); i < iEnd; i++) {
- SVTK_ViewWindow* aView = aViewWindows[i];
- if (VISU_Actor* anActor = FindActor(aView, anEntry.in())) {
- aView->RemoveActor(anActor);
- anActor->Delete();
- }
- }
+ thePrs->RemoveActors();
return;
}
QApplication::restoreOverrideCursor();
-
- if (!isPublished)
- PublishInView(theModule, thePrs);
}
static bool ComputeVisiblePropBounds(SVTK_ViewWindow* theViewWindow,
}
}
PlotContainer( theModule, pContainer, VISU::eDisplay );
+
+ QString anEntry = pContainer->GetEntry();
+ _PTR(Study) aStudy = theTableSO->GetStudy();
+ _PTR(SObject) aContainerSO = aStudy->FindObjectID(anEntry.latin1());
+ _PTR(SObject) aParentSO = aContainerSO->GetFather();
+ UpdateObjBrowser(theModule,true,aParentSO);
}
}
}
theModule->getApp()->updateActions();
} catch (std::runtime_error& exc) {
INFOS(exc.what());
- SUIT_MessageBox::warn1 (GetDesktop(theModule),
- QObject::tr("WRN_VISU"),
- QObject::tr("ERR_CANT_CREATE_ACTOR") + ": " + QObject::tr(exc.what()),
- QObject::tr("BUT_OK"));
+ SUIT_MessageBox::warn1
+ (GetDesktop(theModule), QObject::tr("WRN_VISU"),
+ QObject::tr("ERR_CANT_CREATE_ACTOR") + ": " + QObject::tr(exc.what()),
+ QObject::tr("BUT_OK"));
}
}
}
case VISU::TVECTORS:
case VISU::TSTREAMLINES:
case VISU::TPLOT3D:
+ case VISU::TSCALARMAPONDEFORMEDSHAPE:
{
PortableServer::ServantBase_var aServant = VISU::GetServant(aCORBAObject);
if (aServant.in()) {
