// Module : VISU
#include "VisuGUI_StreamLinesDlg.h"
-#include "VISU_StreamLines_i.hh"
+
+#include "VisuGUI.h"
+#include "VisuGUI_Tools.h"
+
#include "VISU_Mesh_i.hh"
#include "VISU_Gen_i.hh"
+#include "VISU_StreamLines_i.hh"
#include "VISU_StreamLinesPL.hxx"
#include "VISU_Actor.h"
-#include "QAD_Application.h"
-#include "QAD_Desktop.h"
-#include "QAD_Config.h"
-#include "QAD_MessageBox.h"
-#include "VisuGUI.h"
-#include "SALOME_Selection.h"
-#include "VTKViewer_ViewFrame.h"
+#include "SalomeApp_Application.h"
+#include "LightApp_SelectionMgr.h"
+
+#include "SVTK_ViewWindow.h"
+
+#include "SUIT_Desktop.h"
+#include "SUIT_ResourceMgr.h"
+#include "SUIT_MessageBox.h"
+
+#include "SALOME_ListIO.hxx"
+
+#include <SALOMEDSClient_SObject.hxx>
#include <limits.h>
#include <qlayout.h>
#include <qcolordialog.h>
#include <qtabwidget.h>
-
using namespace std;
-VisuGUI_StreamLinesDlg::VisuGUI_StreamLinesDlg()
- : QDialog( QAD_Application::getDesktop(), "VisuGUI_StreamLinesDlg", false, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
+VisuGUI_StreamLinesDlg::VisuGUI_StreamLinesDlg (SalomeApp_Module* theModule)
+ : QDialog(VISU::GetDesktop(theModule), "VisuGUI_StreamLinesDlg", false,
+ WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
+ myVisuGUI(theModule)
{
myPrs = NULL;
- setCaption("Stream lines Preferences");
- setSizeGripEnabled( TRUE );
+ setCaption(tr("DLG_TITLE"));
+ setSizeGripEnabled(TRUE);
QVBoxLayout* aBoxLayout = new QVBoxLayout(this);
aBoxLayout->setSpacing( 6 );
QFrame* aTopBox = new QFrame(this);
aTopBox->setMargin( 11 );
- QGridLayout* TopLayout = new QGridLayout( aTopBox );
+ QGridLayout* TopLayout = new QGridLayout( aTopBox );
TopLayout->setAlignment( Qt::AlignTop );
TopLayout->setSpacing( 8 );
TopLayout->setMargin( 11 );
// Source box
- QGroupBox* aSourceBox = new QGroupBox(tr("Source"), aTopBox);
+ QGroupBox* aSourceBox = new QGroupBox (tr("SOURCE_GRP"), aTopBox);
aSourceBox->setColumnLayout(0, Qt::Vertical);
- QGridLayout* aSrcLayout = new QGridLayout( aSourceBox->layout() );
+ QGridLayout* aSrcLayout = new QGridLayout( aSourceBox->layout() );
aSrcLayout->setSpacing( 6 );
aSrcLayout->setMargin( 0 );
-
+
QLabel* aTypeLbl = new QLabel( tr( "LBL_SOURCE_TYPE" ), aSourceBox);
aSrcLayout->addWidget(aTypeLbl, 0, 0);
mySrcCombo = new QComboBox(aSourceBox);
mySrcCombo->setEnabled((myUseSrcCombo->currentItem() == 0));
-
+
connect(myUseSrcCombo, SIGNAL(activated(int)), this, SLOT(onSourceTypeChange(int)));
// Find All prs obj
- QAD_Study* aActiveStudy = VisuGUI::GetActiveStudy();
- SALOME_Selection* aSel = SALOME_Selection::Selection( aActiveStudy->getSelection() );
- if( aSel->IObjectCount() > 0 ) {
- Handle(SALOME_InteractiveObject) aIO = aSel->firstIObject();
- if (aIO->hasEntry()){
- SALOMEDS::SObject_var aSObject = VisuGUI::GetStudyDocument()->FindObjectID(aIO->getEntry());
+ //SUIT_Study* aActiveStudy = VISU::(myVisuGUI);
+ _PTR(Study) aActiveStudy = VISU::GetCStudy(VISU::GetAppStudy(myVisuGUI));
+ LightApp_SelectionMgr* aSel = VISU::GetSelectionMgr(myVisuGUI);
+ SALOME_ListIO selected;
+ aSel->selectedObjects(selected);
+ if (selected.Extent() > 0) {
+ Handle(SALOME_InteractiveObject) aIO = selected.First();
+ if (aIO->hasEntry()) {
+ _PTR(SObject) aSObject = aActiveStudy->FindObjectID(aIO->getEntry());
aSObject = aSObject->GetFather();
aSObject = aSObject->GetFather();
aSObject = aSObject->GetFather();
aSObject = aSObject->GetFather();
mySelectionObj = aSObject;
- CORBA::Object_var anObject = VISU::SObjectToObject(mySelectionObj);
+ CORBA::Object_var anObject = VISU::ClientSObjectToObject(mySelectionObj);
VISU::Result_var aResult;
if (CORBA::is_nil(anObject)) {
mySelectionObj = mySelectionObj->GetFather();
}
- SALOMEDS::ChildIterator_var aIter = VisuGUI::GetStudyDocument()->NewChildIterator( mySelectionObj );
+ _PTR(ChildIterator) aIter = aActiveStudy->NewChildIterator(mySelectionObj);
- for (aIter->InitEx(true); aIter->More(); aIter->Next() ) {
- SALOMEDS::SObject_var aChildSObj = aIter->Value();
- CORBA::Object_var aChildObject = VISU::SObjectToObject( aChildSObj );
+ for (aIter->InitEx(true); aIter->More(); aIter->Next()) {
+ _PTR(SObject) aChildSObj = aIter->Value();
+ CORBA::Object_var aChildObject = VISU::ClientSObjectToObject(aChildSObj);
- if(!CORBA::is_nil( aChildObject ) ) {
- VISU::Prs3d_var aPrsObj = VISU::Prs3d::_narrow( aChildObject );
- if( !CORBA::is_nil( aPrsObj ) ) { // if this is a Prs object
- if ((aPrsObj->GetType() != VISU::TSTREAMLINES) &&
+ if (!CORBA::is_nil(aChildObject)) {
+ VISU::Prs3d_var aPrsObj = VISU::Prs3d::_narrow(aChildObject);
+ if (!CORBA::is_nil(aPrsObj)) { // if this is a Prs object
+ if ((aPrsObj->GetType() != VISU::TSTREAMLINES) &&
(aPrsObj->GetType() != VISU::TMESH)) {
- SALOMEDS::GenericAttribute_var anAttr;
- if ( aChildSObj->FindAttribute(anAttr, "AttributeName") ) {
- SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
- myPrsLst += QString(aName->Value());
+ _PTR(GenericAttribute) anAttr;
+ if (aChildSObj->FindAttribute(anAttr, "AttributeName")) {
+ _PTR(AttributeName) aName (anAttr);
+ myPrsLst += QString(aName->Value().c_str());
myPrsList.append(aPrsObj);
continue;
}
}
}
// else { // This is not a Prs object
- SALOMEDS::GenericAttribute_var anAttr;
+ _PTR(GenericAttribute) anAttr;
if (aChildSObj->FindAttribute(anAttr, "AttributeComment")) {
- SALOMEDS::AttributeComment_var aComment = SALOMEDS::AttributeComment::_narrow(anAttr);
+ _PTR(AttributeComment) aComment (anAttr);
string aComm = aComment->Value();
- QString strIn(aComm.c_str());
+ QString strIn (aComm.c_str());
VISU::Storable::TRestoringMap aMap;
VISU::Storable::StrToMap(strIn,aMap);
bool isExist;
VISU::VISUType aType = (VISU::VISUType)VISU::Storable::FindValue(aMap,"myType",&isExist).toInt();
if (isExist) {
- if ((aType == VISU::TFAMILY) || (aType == VISU::TGROUP) || (aType == VISU::TENTITY)) {
- SALOMEDS::GenericAttribute_var aNameAttr;
- if ( aChildSObj->FindAttribute(aNameAttr, "AttributeName") ) {
- SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(aNameAttr);
- VISU::Prs3d_var aPrsObj = VISU::Prs3d::_narrow( aChildObject );
- switch(aType) {
+ if ((aType == VISU::TFAMILY) || (aType == VISU::TGROUP) || (aType == VISU::TENTITY)) {
+ _PTR(GenericAttribute) aNameAttr;
+ if (aChildSObj->FindAttribute(aNameAttr, "AttributeName")) {
+ _PTR(AttributeName) aName (aNameAttr);
+ VISU::Prs3d_var aPrsObj = VISU::Prs3d::_narrow(aChildObject);
+ switch (aType) {
case VISU::TFAMILY:
- myFamilisLst += QString(aName->Value());
+ myFamilisLst += QString(aName->Value().c_str());
myFamilyList.append(aPrsObj);
break;
case VISU::TGROUP:
- myGroupsLst += QString(aName->Value());
+ myGroupsLst += QString(aName->Value().c_str());
myGroupList.append(aPrsObj);
break;
case VISU::TENTITY:
- myEntitiesLst += QString(aName->Value());
+ myEntitiesLst += QString(aName->Value().c_str());
myEntityList.append(aPrsObj);
break;
}
}
}
}
- }
+ }
+
// connect(myUseSrcChk, SIGNAL(toggled(bool)), mySrcCombo, SLOT(setEnabled(bool)));
aSrcLayout->addMultiCellWidget(mySrcCombo, 1, 1, 0, 1);
- QLabel* aPercentLbl = new QLabel( tr( "Used points (0..1)" ), aSourceBox);
+ QLabel* aPercentLbl = new QLabel (tr("LBL_USED_POINTS"), aSourceBox);
aSrcLayout->addWidget(aPercentLbl, 2, 0);
- myPntPercent = new QAD_SpinBoxDbl( aSourceBox, 0, 1, 0.1);
+ myPntPercent = new QtxDblSpinBox( 0, 1, 0.1, aSourceBox );
aSrcLayout->addWidget(myPntPercent, 2, 1);
TopLayout->addMultiCellWidget(aSourceBox, 0, 0, 0, 1);
-
- QLabel* aStepLenLbl = new QLabel( tr( "Step Length" ), aTopBox);
+ QLabel* aStepLenLbl = new QLabel (tr("LBL_STEP_LENGTH"), aTopBox);
TopLayout->addWidget(aStepLenLbl, 1, 0);
- myStepLen = new QAD_SpinBoxDbl( aTopBox, DBL_MIN, DBL_MAX, 0.1);
+ myStepLen = new QtxDblSpinBox( DBL_MIN, DBL_MAX, 0.1, aTopBox );
myStepLen->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
TopLayout->addWidget(myStepLen, 1, 1);
connect(myStepLen, SIGNAL(valueChanged(double)), this, SLOT(StepLengthChanged(double)));
- QLabel* aIntegStepLenLbl = new QLabel( tr( "Integration Step" ), aTopBox);
+ QLabel* aIntegStepLenLbl = new QLabel (tr("LBL_INTEGRATION_STEP"), aTopBox);
TopLayout->addWidget(aIntegStepLenLbl, 2, 0);
- myIntegStepLen = new QAD_SpinBoxDbl( aTopBox, DBL_MIN, DBL_MAX, 0.1);
+ myIntegStepLen = new QtxDblSpinBox( DBL_MIN, DBL_MAX, 0.1, aTopBox );
myIntegStepLen->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
TopLayout->addWidget(myIntegStepLen, 2, 1);
connect(myIntegStepLen, SIGNAL(valueChanged(double)), this, SLOT(IntegrationStepChanged(double)));
-
- QLabel* aPropagationLbl = new QLabel( tr( "Propagation Time" ), aTopBox);
+
+ QLabel* aPropagationLbl = new QLabel (tr("LBL_PROPAGATION_TIME"), aTopBox);
TopLayout->addWidget(aPropagationLbl, 3, 0);
- myPropTime = new QAD_SpinBoxDbl(aTopBox, DBL_MIN, DBL_MAX, 1);
+ myPropTime = new QtxDblSpinBox( DBL_MIN, DBL_MAX, 1, aTopBox );
myPropTime->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
TopLayout->addWidget(myPropTime, 3, 1);
connect(myPropTime, SIGNAL(valueChanged(double)), this, SLOT(PropagationTimeChanged(double)));
-
- QLabel* aDirLbl = new QLabel( tr( "Direction" ),aTopBox);
+
+ QLabel* aDirLbl = new QLabel (tr("LBL_DIRECTION"),aTopBox);
TopLayout->addWidget(aDirLbl, 4, 0);
myDirCombo = new QComboBox(aTopBox);
myDirCombo->insertItem("Forward");
myDirCombo->insertItem("Both");
TopLayout->addWidget(myDirCombo, 4, 1);
- myUseScalar = new QCheckBox( tr( "Magnitude coloring" ), aTopBox, "UseMagn" );
+ myUseScalar = new QCheckBox (tr("MAGNITUDE_COLORING_CHK"), aTopBox, "UseMagn");
connect( myUseScalar, SIGNAL( clicked() ), this, SLOT( enableSetColor() ) );
TopLayout->addWidget(myUseScalar, 5, 0);
- SelColor = new QPushButton( tr( "Use Color" ), aTopBox, "SelColor" );
+ SelColor = new QPushButton (tr("USE_COLOR_BTN"), aTopBox, "SelColor");
connect( SelColor, SIGNAL( clicked() ), this, SLOT( setVColor() ) );
TopLayout->addWidget( SelColor, 5, 1);
aTabBox->addTab(aTopBox, "Stream Lines");
myScalarPane = new VisuGUI_ScalarBarPane(this, false);
myScalarPane->setMargin( 5 );
- aTabBox->addTab(myScalarPane, "Scalar Bar");
+ aTabBox->addTab(myScalarPane, "Scalar Bar");
aBoxLayout->addWidget(aTabBox);
-
+
QGroupBox* aGroupButtons = new QGroupBox( this, "GroupButtons" );
aGroupButtons->setColumnLayout(0, Qt::Vertical );
aGroupButtons->layout()->setSpacing( 0 );
aGroupButtons->layout()->setMargin( 0 );
-
+
QGridLayout* aGroupButtonsLayout = new QGridLayout( aGroupButtons->layout() );
aGroupButtonsLayout->setAlignment( Qt::AlignTop );
aGroupButtonsLayout->setSpacing( 6 );
-void VisuGUI_StreamLinesDlg::initFromPrsObject(VISU::StreamLines_i* thePrs) {
+void VisuGUI_StreamLinesDlg::initFromPrsObject (VISU::StreamLines_i* thePrs)
+{
myScalarPane->initFromPrsObject(thePrs);
myPrs = thePrs;
myStepLen->setRange(aMin,aMax);
myStepLen->setValue(aStreamLinesPL->GetStepLength());
myStepLen->setLineStep((aMax-aMin)/aNbOfSteps);
-
+
aMin = aStreamLinesPL->GetMinIntegrationStep();
aMax = aStreamLinesPL->GetMaxIntegrationStep();
myIntegStepLen->setRange(aMin,aMax);
myIntegStepLen->setValue(aStreamLinesPL->GetIntegrationStep());
myIntegStepLen->setLineStep((aMax-aMin)/aNbOfSteps);
-
+
switch (thePrs->GetDirection()) {
case VISU::StreamLines::FORWARD:
myDirCombo->setCurrentItem(0);
}
myUseScalar->setChecked(thePrs->IsColored());
myPntPercent->setValue(thePrs->GetUsedPoints());
-
+
mySrcCombo->setEnabled(false);
QString aSrcEntry = thePrs->GetSourceEntry();
-
+
SALOMEDS::Color anOldColor = thePrs->GetColor();
QColor aColor = QColor(int(255*anOldColor.R),int(255*anOldColor.G),int(255*anOldColor.B));
setColor(aColor);
enableSetColor();
-
+
#define INITPRS(PRSLIST, PRSNUM) \
for (int i = 0; i < PRSLIST.count(); i++) { \
VISU::Prs3d_i* aPrs = dynamic_cast<VISU::Prs3d_i*>(VISU::GetServant(PRSLIST[i]).in()); \
return; \
} \
}
-
+
if (!aSrcEntry.isEmpty()) {
INITPRS(myEntityList, 1);
INITPRS(myFamilyList, 2);
- INITPRS(myGroupList, 3);
+ INITPRS(myGroupList, 3);
INITPRS(myPrsList, 4);
}
-
#undef INITPRS
-
}
-
-int VisuGUI_StreamLinesDlg::storeToPrsObject(VISU::StreamLines_i* thePrs) {
+int VisuGUI_StreamLinesDlg::storeToPrsObject (VISU::StreamLines_i* thePrs)
+{
bool isAccepted = myScalarPane->storeToPrsObject(thePrs);
- if(isAccepted){
+ if (isAccepted) {
thePrs->ShowColored(myUseScalar->isChecked());
- if(!thePrs->IsColored()){
+ if (!thePrs->IsColored()) {
SALOMEDS::Color aColor;
aColor.R = myColor.red()/255.;
aColor.G = myColor.green()/255.;
if ((aSrcSelection > 0) && (aSrcItem > -1)) {
VISU::VISUType aType;
QString aName;
- switch (aSrcSelection){
+ switch (aSrcSelection) {
case 1: // Entity
aPrs = myEntityList[aSrcItem];
aType = VISU::TENTITY;
aPrs = myPrsList[aSrcItem];
break;
}
- if(CORBA::is_nil(aPrs) && aSrcSelection != 4){
+ if (CORBA::is_nil(aPrs) && aSrcSelection != 4) {
aPrs = createMesh(aType, aName);
}
}
myPntPercent->value(),
aDirection);
}
- if(!isAccepted)
- QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("VISU_WARNING"),
- tr ("ERR_CANT_BUILD_PRESENTATION"),
- tr ("VISU_BUT_OK") );
+ //if (!isAccepted)
+ // SUIT_MessageBox::warn1(VisuGUI::application()->desktop(), tr("WRN_VISU"),
+ // tr("ERR_CANT_BUILD_PRESENTATION"),
+ // tr("BUT_OK"));
return isAccepted;
}
}
-VISU::Mesh_ptr VisuGUI_StreamLinesDlg::createMesh(VISU::VISUType theType, QString theName) {
- CORBA::Object_var anObject = VISU::SObjectToObject(mySelectionObj);
+VISU::Mesh_ptr VisuGUI_StreamLinesDlg::createMesh (VISU::VISUType theType, QString theName)
+{
+ return VISU::Mesh::_nil();
+/*
+ CORBA::Object_var anObject = VISU::ClientSObjectToObject(mySelectionObj);
VISU::Result_var aResult;
if (!CORBA::is_nil(anObject)) {
aResult = VISU::Result::_narrow(anObject);
}
- if(CORBA::is_nil(aResult)) {
- QAD_MessageBox::warn1(QAD_Application::getDesktop(), tr ("VISU_WARNING"),
- tr ("WRN_NO_AVAILABLE_DATA"),
- tr ("VISU_BUT_OK"));
+ if (CORBA::is_nil(aResult)) {
+ SUIT_MessageBox::warn1(VisuGUI::application()->desktop(), tr("VISU_WARNING"),
+ tr("WRN_NO_AVAILABLE_DATA"),
+ tr("BUT_OK"));
return VISU::Mesh::_nil();
}
- SALOMEDS::ChildIterator_var aIter = VisuGUI::GetStudyDocument()->NewChildIterator( mySelectionObj );
+ SALOMEDSClient_ChildIterator* aIter = VisuGUI::GetStudyDocument()->NewChildIterator( mySelectionObj );
VISU::Storable::TRestoringMap aMap;
for (aIter->InitEx(true); aIter->More(); aIter->Next() ) {
- SALOMEDS::SObject_var aChildSObj = aIter->Value();
- SALOMEDS::GenericAttribute_var anAttr;
+ SALOMEDSClient_SObject* aChildSObj = aIter->Value();
+ SALOMEDSClient_GenericAttribute* anAttr;
if (aChildSObj->FindAttribute(anAttr, "AttributeComment")) {
- SALOMEDS::AttributeComment_var aComment = SALOMEDS::AttributeComment::_narrow(anAttr);
- CORBA::String_var aComm = aComment->Value();
+ SALOMEDSClient_AttributeComment* aComment = dynamic_cast<SALOMEDSClient_AttributeComment*>( anAttr );
+ CORBA::String_var aComm = aComment->Value().c_str();
QString strIn(aComm.in());
aMap.clear();
VISU::Storable::StrToMap(strIn,aMap);
if (isExist) {
if (aType != theType) continue;
- SALOMEDS::GenericAttribute_var aNameAttr;
- if ( aChildSObj->FindAttribute(aNameAttr, "AttributeName") ) {
- SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(aNameAttr);
+ SALOMEDSClient_GenericAttribute* aNameAttr;
+ if ( aChildSObj->FindAttribute(aNameAttr, "AttributeName") ) {
+ SALOMEDSClient_AttributeName* aName = dynamic_cast<SALOMEDSClient_AttributeName*>(aNameAttr);
if (QString(aName->Value()) == theName) break; //use current map
}
}
VISU::Mesh_var aMesh;
QString aMeshName = VISU::Storable::FindValue(aMap,"myMeshName");
switch (theType) {
- case VISU::TFAMILY:
+ case VISU::TFAMILY:
{
VISU::Entity anEntity = (VISU::Entity)VISU::Storable::FindValue(aMap,"myEntityId").toInt();
aMesh = VisuGUI::GetVisuGen()->FamilyMeshOnEntity(aResult,aMeshName.latin1(),anEntity,theName.latin1());
}
if(!CORBA::is_nil(aMesh)){ // Create Actor
VISU::Mesh_i* pPresent = dynamic_cast<VISU::Mesh_i*>(VISU::GetServant(aMesh).in());
- if(VTKViewer_ViewFrame* vf = VisuGUI::GetVtkViewFrame()){
+ if(SVTK_ViewWindow* vf = VISU::GetViewWindow()){
try{
pPresent->SetPresentationType(VISU::POINT);
VISU_Actor *anActor = pPresent->CreateActor();
vf->AddActor(anActor);
}catch(...){
- QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("VISU_WARNING"),
- tr ("ERR_CANT_CREATE_ACTOR"),
- tr ("VISU_BUT_OK") );
+ SUIT_MessageBox::warn1 ( VisuGUI::application()->desktop(), tr("VISU_WARNING"),
+ tr("ERR_CANT_CREATE_ACTOR"),
+ tr("BUT_OK") );
}
- }
- }else{
- QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("VISU_WARNING"),
- tr ("ERR_CANT_BUILD_PRESENTATION"),
- tr ("VISU_BUT_OK") );
+ }
+ } else {
+ SUIT_MessageBox::warn1(VisuGUI::application()->desktop(), tr("VISU_WARNING"),
+ tr("ERR_CANT_BUILD_PRESENTATION"),
+ tr("BUT_OK"));
}
return aMesh._retn();
+*/
}
void VisuGUI_StreamLinesDlg::accept() {
- if (myScalarPane->check()) QDialog::accept();
+ if (myScalarPane->check())
+ QDialog::accept();
}
