#include "VisuGUI.h"
#include "VisuGUI_Tools.h"
-//#include "VisuGUI_MagnitudeDlg.h"
+#include "VisuGUI_DeformedShapeDlg.h"
#include "VisuGUI_CutPlanesDlg.h"
+#include "VisuGUI_Plot3DDlg.h"
#include "VisuGUI_VectorsDlg.h"
#include "VisuGUI_IsoSurfacesDlg.h"
#include "VisuGUI_StreamLinesDlg.h"
#include "VISU_IsoSurfaces_i.hh"
#include "VISU_DeformedShape_i.hh"
#include "VISU_CutPlanes_i.hh"
+#include "VISU_Plot3D_i.hh"
#include "VISU_CutLines_i.hh"
#include "VISU_Vectors_i.hh"
#include "VISU_StreamLines_i.hh"
+#include "VISU_ViewManager_i.hh"
+
#include "VISU_ScalarBarActor.hxx"
+#include "VISU_Actor.h"
+#include "SalomeApp_Study.h"
#include "SalomeApp_Application.h"
+#include "SVTK_ViewWindow.h"
+
#include "SUIT_OverrideCursor.h"
#include "SUIT_MessageBox.h"
#include "SUIT_Desktop.h"
#include "SUIT_FileDlg.h"
-#include "VTKViewer_ViewWindow.h"
+#include <vtkRenderer.h>
-#include <qlayout.h>
#include <qhbox.h>
-#include <qhgroupbox.h>
+#include <qgrid.h>
+#include <qlayout.h>
+#include <qslider.h>
+#include <qthread.h>
+#include <qlistbox.h>
#include <qwt_wheel.h>
+#include <qhgroupbox.h>
#include <qlcdnumber.h>
-#include <qlistbox.h>
#include <qvgroupbox.h>
-#include <qthread.h>
-//static double MAXVALUE = 1.0E+300;
+#define MAXVAL 1e10
+
+ArrangeDlg::ArrangeDlg(QWidget* theParent, VISU_TimeAnimation* theAnimator)
+ : QDialog(theParent, "ArrangeDlg", true, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
+ myAnimator(theAnimator), myViewWindow(theAnimator->getViewer())
+{
+ myCurrent = 0;
+ init();
+ QStringList aFieldNames;
+ // Find names of fields
+ for (int i = 0; i < theAnimator->getNbFields(); i++) {
+ aFieldNames.append(VISU::getValue(theAnimator->getFieldData(i).myField, "myName"));
+ Offset aOffs;
+ aOffs.myOffset[0] = myAnimator->getFieldData(i).myOffset[0];
+ aOffs.myOffset[1] = myAnimator->getFieldData(i).myOffset[1];
+ aOffs.myOffset[2] = myAnimator->getFieldData(i).myOffset[2];
+ myOffsets.append(aOffs);
+ }
+ myFieldLst->insertStringList(aFieldNames);
+ myFieldLst->setSelected(0, true);
+}
+
+ArrangeDlg::ArrangeDlg(QWidget* theParent, SVTK_ViewWindow* theViewWindow)
+ : QDialog(theParent, "ArrangeDlg", true, WStyle_Customize |
+ WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
+ myAnimator(0), myViewWindow(theViewWindow)
+{
+ myCurrent = 0;
+ init();
+ QStringList aPrsNames;
+ vtkActor* anActor;
+ vtkActorCollection *anActColl = myViewWindow->getRenderer()->GetActors();
+ for (anActColl->InitTraversal(); (anActor = anActColl->GetNextActor()) != NULL;) {
+ VISU_Actor* anVISUActor = dynamic_cast<VISU_Actor*>(anActor);
+ if (anVISUActor)
+ if (anVISUActor->GetVisibility() != 0) {
+ VISU::Prs3d_i* aPrs = anVISUActor->GetParent()->GetPrs3d();
+ if (aPrs) {
+ if (!myPrsMap.contains(aPrs)) {
+ SALOMEDS::SObject_var aSObject = aPrs->GetSObject();
+ if(!aSObject->_is_nil()){
+ SALOMEDS::GenericAttribute_var anAttr;
+ if (aSObject->FindAttribute(anAttr, "AttributeName")) {
+ SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
+ string aNam = aName->Value();
+ QString strIn(aNam.c_str());
+ aPrsNames.append(strIn);
+ myPrsMap[aPrs] = myOffsets.count();
+ Offset aOffs;
+ anVISUActor->GetPosition(aOffs.myOffset);
+ myOffsets.append(aOffs);
+ }
+ }
+ }
+ }
+ }
+ }
+ myFieldLst->insertStringList(aPrsNames);
+ myFieldLst->setSelected(0, true);
+}
+
+void ArrangeDlg::init()
+{
+ setCaption("Arrange Presentations");
+ setSizeGripEnabled( TRUE );
+
+ QVBoxLayout* aMainLayout = new QVBoxLayout(this, 7, 6);
+ aMainLayout->setSpacing(5);
+
+ QButtonGroup* aBtnGrp = new QButtonGroup(2, Qt::Horizontal, this);
+ aBtnGrp->setExclusive(true);
+ aMainLayout->addWidget(aBtnGrp);
+
+ QRadioButton* aAutoBtn = new QRadioButton("Auto", aBtnGrp);
+ aBtnGrp->insert(aAutoBtn, AutoMode);
+
+ QRadioButton* aManualBtn = new QRadioButton("Manual", aBtnGrp);
+ aBtnGrp->insert(aManualBtn, ManualMode);
+ aBtnGrp->setButton(AutoMode);
+
+ myStackWgt = new QWidgetStack(this);
+ aMainLayout->addWidget(myStackWgt);
+
+ // AUTO Pane
+ QVBox* aAutoPane = new QVBox(myStackWgt);
+ aAutoPane->setSpacing(5);
+ // Axis Group
+ myAxisGrp = new QButtonGroup(3, Qt::Horizontal,"Axis", aAutoPane);
+
+ QRadioButton* aXBtn = new QRadioButton("X",myAxisGrp );
+ myAxisGrp->insert(aXBtn, XAxis);
+
+ QRadioButton* aYBtn = new QRadioButton("Y",myAxisGrp );
+ myAxisGrp->insert(aYBtn, YAxis);
+
+ QRadioButton* aZBtn = new QRadioButton("Z",myAxisGrp );
+ myAxisGrp->insert(aZBtn, ZAxis);
+
+ myAxisGrp->setButton(XAxis);
+
+ //Distance Input
+ QHBox* aDistPane = new QHBox(aAutoPane);
+ aDistPane->setSpacing(5);
+ new QLabel("Relative Distance", aDistPane);
+ myDistVal = new QtxDblSpinBox (-10,10, 0.5, aDistPane);
+ myDistVal->setValue(1);
+
+ myStackWgt->addWidget(aAutoPane, AutoMode);
+
+ // Manual Pane
+ QHBox* aManualPane = new QHBox(myStackWgt);
+ aManualPane->setSpacing(10);
+
+ myFieldLst = new QListBox(aManualPane);
+ connect( myFieldLst, SIGNAL( highlighted(int) ),
+ this, SLOT( onFieldChange(int) ) );
+
+ QGrid* aCoordPane = new QGrid(2, aManualPane);
+ aCoordPane->setSpacing(5);
+
+ new QLabel("X", aCoordPane);
+ myCoord[0] = new QtxDblSpinBox(aCoordPane);
+ myCoord[0]->setRange(-MAXVAL, MAXVAL);
+
+ new QLabel("Y", aCoordPane);
+ myCoord[1] = new QtxDblSpinBox(aCoordPane);
+ myCoord[1]->setRange(-MAXVAL, MAXVAL);
+
+ new QLabel("Z", aCoordPane);
+ myCoord[2] = new QtxDblSpinBox(aCoordPane);
+ myCoord[2]->setRange(-MAXVAL, MAXVAL);
+
+ myStackWgt->addWidget(aManualPane, ManualMode);
+
+ myStackWgt->raiseWidget(AutoMode);
+
+ connect(aBtnGrp, SIGNAL(clicked(int)), myStackWgt, SLOT(raiseWidget(int)) );
+
+ SUIT_Study* aSUITStudy = myViewWindow->getViewManager()->study();
+ SalomeApp_Study* anAppStudy = dynamic_cast<SalomeApp_Study*>(aSUITStudy);
+ _PTR(Study) aCStudy = VISU::GetCStudy(anAppStudy);
+ if (!myAnimator && !aCStudy->GetProperties()->IsLocked()) {
+ mySaveChk = new QCheckBox ("Save to presentation", this);
+ mySaveChk->setChecked(false);
+ aMainLayout->addWidget(mySaveChk);
+ } else {
+ mySaveChk = 0;
+ }
+
+ // Common buttons ===========================================================
+ QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" );
+ GroupButtons->setColumnLayout(0, Qt::Vertical );
+ GroupButtons->layout()->setSpacing( 0 );
+ GroupButtons->layout()->setMargin( 0 );
+ QGridLayout* GroupButtonsLayout = new QGridLayout( GroupButtons->layout() );
+ GroupButtonsLayout->setAlignment( Qt::AlignTop );
+ GroupButtonsLayout->setSpacing( 6 );
+ GroupButtonsLayout->setMargin( 11 );
+
+ QPushButton* buttonOk = new QPushButton( tr( "&OK" ), GroupButtons, "buttonOk" );
+ buttonOk->setAutoDefault( TRUE );
+ buttonOk->setDefault( TRUE );
+ GroupButtonsLayout->addWidget( buttonOk, 0, 0 );
+ GroupButtonsLayout->addItem( new QSpacerItem( 5, 5, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 );
+
+ QPushButton* buttonCancel = new QPushButton( tr( "&Cancel" ) , GroupButtons, "buttonCancel" );
+ buttonCancel->setAutoDefault( TRUE );
+ GroupButtonsLayout->addWidget( buttonCancel, 0, 2 );
+
+ aMainLayout->addWidget( GroupButtons );
+
+ connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) );
+ connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
+}
+
+void ArrangeDlg::accept()
+{
+ if (myAnimator) {
+ acceptAnimation();
+ } else {
+ acceptViewWindow();
+ }
+ QDialog::accept();
+}
+
+void ArrangeDlg::onFieldChange(int theCurrent)
+{
+ if (myCurrent != theCurrent) {
+ Offset& aOffs = myOffsets[myCurrent];
+ aOffs.myOffset[0] = myCoord[0]->value();
+ aOffs.myOffset[1] = myCoord[1]->value();
+ aOffs.myOffset[2] = myCoord[2]->value();
+ }
+ myCurrent = theCurrent;
+ const Offset& aNewOffs = myOffsets[myCurrent];
+ myCoord[0]->setValue(aNewOffs.myOffset[0]);
+ myCoord[1]->setValue(aNewOffs.myOffset[1]);
+ myCoord[2]->setValue(aNewOffs.myOffset[2]);
+}
+
+void ArrangeDlg::acceptAnimation()
+{
+ if (getMode() == ManualMode) {
+ // Save from GUI
+ Offset& aOffs = myOffsets[myCurrent];
+ aOffs.myOffset[0] = myCoord[0]->value();
+ aOffs.myOffset[1] = myCoord[1]->value();
+ aOffs.myOffset[2] = myCoord[2]->value();
+
+ for (int i = 0; i < myAnimator->getNbFields(); i++) {
+ Offset aOffs = myOffsets[i];
+ myAnimator->getFieldData(i).myOffset[0] = aOffs.myOffset[0];
+ myAnimator->getFieldData(i).myOffset[1] = aOffs.myOffset[1];
+ myAnimator->getFieldData(i).myOffset[2] = aOffs.myOffset[2];
+ }
+ } else {
+ QApplication::setOverrideCursor( Qt::waitCursor );
+ FieldData& aData = myAnimator->getFieldData(0);
+ if (aData.myPrs.empty())
+ myAnimator->generatePresentations(0);
+ VISU_Actor* aActor = aData.myPrs[0]->CreateActor();
+ float aBounds[6];
+ aActor->GetBounds(aBounds);
+ aActor->Delete();
+ float aDist = 0;
+ int aAxis = getAxis();
+ switch (aAxis) {
+ case XAxis:
+ aDist = fabs(aBounds[1] - aBounds[0]);
+ break;
+ case YAxis:
+ aDist = fabs(aBounds[3] - aBounds[2]);
+ break;
+ case ZAxis:
+ aDist = fabs(aBounds[5] - aBounds[4]);
+ }
+
+ float dx = fabs(aBounds[1] - aBounds[0]);
+ float dy = fabs(aBounds[3] - aBounds[2]);
+ float dz = fabs(aBounds[5] - aBounds[4]);
+ float max = (dx > dy) ? dx : dy;
+ max = (dz > max) ? dz : max;
+ max /= 100.0;
+
+ if (aDist < max) {
+ // set base distance between centers of bounding boxes
+ // to minimal (but big enough) size of current bounding box
+ if (dx < max) dx = FLT_MAX;
+ if (dy < max) dy = FLT_MAX;
+ if (dz < max) dz = FLT_MAX;
+
+ aDist = (dx < dy) ? dx : dy;
+ aDist = (dz < aDist) ? dz : aDist;
+ }
+ aDist = aDist * getDistance();
+ for (int i = 0; i < myAnimator->getNbFields(); i++) {
+ myAnimator->getFieldData(i).myOffset[0] = 0;
+ myAnimator->getFieldData(i).myOffset[1] = 0;
+ myAnimator->getFieldData(i).myOffset[2] = 0;
+ myAnimator->getFieldData(i).myOffset[aAxis] = aDist * i;
+ }
+
+ QApplication::restoreOverrideCursor();
+ }
+}
+
+void ArrangeDlg::acceptViewWindow()
+{
+ if (getMode() == ManualMode) {
+ // Save from GUI
+ Offset& aOffs = myOffsets[myCurrent];
+ aOffs.myOffset[0] = myCoord[0]->value();
+ aOffs.myOffset[1] = myCoord[1]->value();
+ aOffs.myOffset[2] = myCoord[2]->value();
+
+ QMap<VISU::Prs3d_i*, int>::Iterator it;
+ for (it = myPrsMap.begin(); it != myPrsMap.end(); ++it) {
+ VISU::Prs3d_i* aPrs = it.key();
+ Offset& aOffs = myOffsets[it.data()];
+ if (VISU_Actor* anActor = VISU::GetActor(aPrs, myViewWindow))
+ anActor->SetPosition(aOffs.myOffset);
+ if (mySaveChk)
+ if (mySaveChk->isChecked())
+ aPrs->SetOffset(aOffs.myOffset);
+ }
+ } else {
+ float aDist = 0;
+ float aShift = 0;
+ float aPrevDist = 0;
+ float aPrevShift = 0;
+ int i;
+ QMap<VISU::Prs3d_i*, int>::Iterator it;
+ for (it = myPrsMap.begin(), i = 0; it != myPrsMap.end(); ++it, i++) {
+ VISU::Prs3d_i* aPrs = it.key();
+ if (VISU_Actor* aActor = VISU::GetActor(aPrs, myViewWindow)) {
+ int aAxis = getAxis();
+
+ float aZeroOffset[3];
+ aZeroOffset[0] = aZeroOffset[1] = aZeroOffset[2] = 0;
+ aActor->SetPosition(aZeroOffset);
+ aActor->GetMapper()->Update();
+
+ float aBounds[6];
+ aActor->GetBounds(aBounds);
+ switch (aAxis) {
+ case XAxis:
+ aDist = fabs(aBounds[1] - aBounds[0]);
+ break;
+ case YAxis:
+ aDist = fabs(aBounds[3] - aBounds[2]);
+ break;
+ case ZAxis:
+ aDist = fabs(aBounds[5] - aBounds[4]);
+ }
+ float aOffset[3];
+ aOffset[0] = (aBounds[1] < aBounds[0]) ? -aBounds[1] : -aBounds[0];
+ aOffset[1] = (aBounds[3] < aBounds[2]) ? -aBounds[3] : -aBounds[2];
+ aOffset[2] = (aBounds[5] < aBounds[4]) ? -aBounds[5] : -aBounds[4];
+
+ if (i > 0) {
+ float aCCDist = (aDist + aPrevDist) / 2.0;
+
+ float dx = fabs(aBounds[1] - aBounds[0]);
+ float dy = fabs(aBounds[3] - aBounds[2]);
+ float dz = fabs(aBounds[5] - aBounds[4]);
+ float max = (dx > dy) ? dx : dy;
+ max = (dz > max) ? dz : max;
+ max /= 100.0;
+
+ if (aCCDist < max) {
+ // set base distance between centers of bounding boxes
+ // to minimal (but big enough) size of current bounding box
+ if (dx < max) dx = FLT_MAX;
+ if (dy < max) dy = FLT_MAX;
+ if (dz < max) dz = FLT_MAX;
+
+ aCCDist = (dx < dy) ? dx : dy;
+ aCCDist = (dz < aCCDist) ? dz : aCCDist;
+ }
+
+ //-------------------------------->
+ // aShift
+ // aDist / 2
+ // <-->
+ // .--------------. .------.
+ //----------->| | | |
+ // aPrevShift '--------------' '------'
+ // <------>
+ // aPrevDist / 2
+ //
+ // <--------------->
+ // (aDist + aPrevDist) * getDistance() / 2
+
+ aShift = aPrevShift + aPrevDist/2.0 + aCCDist*getDistance() - aDist/2.0;
+ }
+
+ aOffset[aAxis] += aShift;
+ aActor->SetPosition(aOffset);
+ if (mySaveChk)
+ if (mySaveChk->isChecked())
+ aPrs->SetOffset(aOffset);
+
+ aPrevDist = aDist;
+ aPrevShift = aShift;
+ }
+ }
+ }
+ myViewWindow->getRenderer()->ResetCameraClippingRange();
+ myViewWindow->Repaint();
+}
-SetupDlg::SetupDlg (QWidget* theParent, VISU_TimeAnimation* theAnimator)
- : QDialog(theParent, "SetupDlg", true, WStyle_Customize |
- WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+//*****************************************************************************************************
+//*****************************************************************************************************
+//*****************************************************************************************************
+SetupDlg::SetupDlg (VisuGUI* theModule, VISU_TimeAnimation* theAnimator)
+ : QDialog(VISU::GetDesktop(theModule), "SetupDlg", true, WStyle_Customize |
+ WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
+ myModule(theModule)
{
setCaption("Setup Animation");
setSizeGripEnabled( TRUE );
this, SLOT( onFieldChange(int) ) );
- QVGroupBox* aPropBox = new QVGroupBox("Properties", aPropFrame);
+ QVBox* aSetupBox = new QVBox(aPropFrame);
+ aSetupBox->setSpacing(5);
+
+ QVGroupBox* aPropBox = new QVGroupBox("Properties", aSetupBox);
+ //QVGroupBox* aPropBox = new QVGroupBox("Properties", aPropFrame);
myTypeCombo = new QComboBox(aPropBox);
connect( myTypeCombo, SIGNAL( activated(int) ),
this, SLOT( onTypeChanged(int) ) );
connect( myPropBtn, SIGNAL( clicked() ),
this, SLOT( onPreferencesDlg() ) );
+ if (myAnimator->getNbFields() > 1) {
+ myArrangeBtn = new QPushButton("Arrange...", aSetupBox);
+ connect( myArrangeBtn, SIGNAL( clicked() ), this, SLOT( onArrangeDlg() ) );
+ }
onFieldChange(0);
aMainLayout->addWidget(aPropFrame);
aMainLayout->addWidget(aBtnBox);
}
+//************************************************************************
+enum PrsComboItem {
+ TSCALARMAP_ITEM = 0, // VISU::TSCALARMAP
+ TISOSURFACE_ITEM = 1, // VISU::TISOSURFACE
+ TCUTPLANES_ITEM = 2, // VISU::TCUTPLANES
+ TPLOT3D_ITEM = 3, // VISU::TPLOT3D
+ TDEFORMEDSHAPE_ITEM = 4, // VISU::TDEFORMEDSHAPE
+ TVECTORS_ITEM = 5, // VISU::TVECTORS
+ TSTREAMLINES_ITEM = 6 // VISU::TSTREAMLINES
+};
+
//************************************************************************
void SetupDlg::onFieldChange (int theIndex)
{
FieldData& aData = myAnimator->getFieldData(theIndex);
myTypeCombo->clear();
- myTypeCombo->insertItem("Scalar Map");
- myTypeCombo->insertItem("Iso Surfaces");
- myTypeCombo->insertItem("Cut Planes");
+ // ATTENTION: append items in the same order like it is done in the PrsComboItem enumeration
+ myTypeCombo->insertItem("Scalar Map"); // item 0
+ myTypeCombo->insertItem("Iso Surfaces"); // item 1
+ myTypeCombo->insertItem("Cut Planes"); // item 2
+ myTypeCombo->insertItem("Plot 3D"); // item 3
_PTR(SObject) aSObject = aData.myField;
long aNumComp = VISU::getValue(aSObject, "myNumComponent").toLong();
if (aNumComp > 1) {
- myTypeCombo->insertItem("Deformed Shape");
- myTypeCombo->insertItem("Vectors");
- myTypeCombo->insertItem("Stream Lines");
+ myTypeCombo->insertItem("Deformed Shape"); // item 4
+ myTypeCombo->insertItem("Vectors"); // item 5
+ myTypeCombo->insertItem("Stream Lines"); // item 6
}
switch (aData.myPrsType) {
case VISU::TSCALARMAP: //Scalar Map
- myTypeCombo->setCurrentItem(0);
+ myTypeCombo->setCurrentItem(TSCALARMAP_ITEM);
break;
case VISU::TISOSURFACE: //Iso Surfaces
- myTypeCombo->setCurrentItem(1);
+ myTypeCombo->setCurrentItem(TISOSURFACE_ITEM);
break;
case VISU::TCUTPLANES: //Cut Planes
- myTypeCombo->setCurrentItem(2);
+ myTypeCombo->setCurrentItem(TCUTPLANES_ITEM);
+ break;
+ case VISU::TPLOT3D: //Plot 3D
+ myTypeCombo->setCurrentItem(TPLOT3D_ITEM);
break;
case VISU::TDEFORMEDSHAPE: //Deformed Shape
- myTypeCombo->setCurrentItem(3);
+ myTypeCombo->setCurrentItem(TDEFORMEDSHAPE_ITEM);
break;
case VISU::TVECTORS: //Vectors
- myTypeCombo->setCurrentItem(4);
+ myTypeCombo->setCurrentItem(TVECTORS_ITEM);
break;
case VISU::TSTREAMLINES: //Stream Lines
- myTypeCombo->setCurrentItem(5);
+ myTypeCombo->setCurrentItem(TSTREAMLINES_ITEM);
aData.myPrsType = VISU::TSTREAMLINES;
break;
}
{
FieldData& aData = myAnimator->getFieldData(myFieldLst->currentItem());
switch (theIndex) {
- case 0: //Scalar Map
+ case TSCALARMAP_ITEM: //Scalar Map
aData.myPrsType = VISU::TSCALARMAP;
break;
- case 1: //Iso Surfaces
+ case TISOSURFACE_ITEM: //Iso Surfaces
aData.myPrsType = VISU::TISOSURFACE;
break;
- case 2: //Cut Planes
+ case TCUTPLANES_ITEM: //Cut Planes
aData.myPrsType = VISU::TCUTPLANES;
break;
- case 3: //Deformed Shape
+ case TPLOT3D_ITEM: //Plot 3D
+ aData.myPrsType = VISU::TPLOT3D;
+ break;
+ case TDEFORMEDSHAPE_ITEM: //Deformed Shape
aData.myPrsType = VISU::TDEFORMEDSHAPE;
break;
- case 4: //Vectors
+ case TVECTORS_ITEM: //Vectors
aData.myPrsType = VISU::TVECTORS;
break;
- case 5: //Stream Lines
+ case TSTREAMLINES_ITEM: //Stream Lines
aData.myPrsType = VISU::TSTREAMLINES;
break;
}
//************************************************************************
void SetupDlg::onPreferencesDlg()
{
- MESSAGE("SetupDlg::onPreferencesDlg() is not implemented");
-/* SUIT_OverrideCursor c;
+ SUIT_OverrideCursor c;
FieldData& aData = myAnimator->getFieldData(myFieldLst->currentItem());
if (aData.myPrs.empty())
myAnimator->generatePresentations(myFieldLst->currentItem());
// }
-#define EDITPRS(TYPE, DLG) {DLG* aDlg = new DLG(); aDlg->initFromPrsObject(dynamic_cast<TYPE*>(aData.myPrs[0])); if (aDlg->exec()) { for (int i = 0; i < aData.myNbFrames; i++) aDlg->storeToPrsObject(dynamic_cast<TYPE*>(aData.myPrs[i])); } delete aDlg;}
+#define EDITPRS(TYPE, DLG) {\
+ DLG* aDlg = new DLG (myModule);\
+ aDlg->initFromPrsObject(dynamic_cast<TYPE*>(aData.myPrs[0]));\
+ if (aDlg->exec())\
+ { \
+ for (int i = 0; i < aData.myNbFrames; i++)\
+ aDlg->storeToPrsObject(dynamic_cast<TYPE*>(aData.myPrs[i]));\
+ } \
+ delete aDlg;}
switch (myTypeCombo->currentItem()) {
- case 0: //Scalar Map
+ case TSCALARMAP_ITEM: //Scalar Map
+ c.suspend();
EDITPRS(VISU::ScalarMap_i, VisuGUI_ScalarBarDlg);
break;
- case 1: //Iso Surfaces
+ case TISOSURFACE_ITEM: //Iso Surfaces
+ c.suspend();
EDITPRS(VISU::IsoSurfaces_i, VisuGUI_IsoSurfacesDlg);
break;
- case 2: //Cut Planes
- // EDITPRS(VISU::CutPlanes_i, VisuGUI_CutPlanesDlg);
- {
- VisuGUI_CutPlanesDlg* aDlg = new VisuGUI_CutPlanesDlg(false, true);
+ case TCUTPLANES_ITEM: //Cut Planes
+ c.suspend();
+ EDITPRS(VISU::CutPlanes_i, VisuGUI_CutPlanesDlg);
+ /*{
+ VisuGUI_CutPlanesDlg* aDlg = new VisuGUI_CutPlanesDlg (myModule);
//_CS_PhB :operator [] .at aDlg->initFromPrsObject(dynamic_cast<VISU::CutPlanes_i*>(aData.myPrs.at(0)));
aDlg->initFromPrsObject(dynamic_cast<VISU::CutPlanes_i*>(aData.myPrs[0]));
aDlg->storeToPrsObject(dynamic_cast<VISU::CutPlanes_i*>(aData.myPrs[i]));
}
delete aDlg;
- }
+ }*/
+ break;
+ case TPLOT3D_ITEM: //Plot 3D
+ c.suspend();
+ EDITPRS(VISU::Plot3D_i, VisuGUI_Plot3DDlg);
break;
- case 3: //Deformed Shape
- EDITPRS(VISU::DeformedShape_i, VisuGUI_MagnitudeDlg);
+ case TDEFORMEDSHAPE_ITEM: //Deformed Shape
+ c.suspend();
+ EDITPRS(VISU::DeformedShape_i, VisuGUI_DeformedShapeDlg);
break;
- case 4: //Vectors
+ case TVECTORS_ITEM: //Vectors
+ c.suspend();
EDITPRS(VISU::Vectors_i, VisuGUI_VectorsDlg);
break;
- case 5: //Stream Lines
+ case TSTREAMLINES_ITEM: //Stream Lines
+ c.suspend();
EDITPRS(VISU::StreamLines_i, VisuGUI_StreamLinesDlg);
break;
}
#undef EDITPRS
-*/
+}
+
+
+//************************************************************************
+void SetupDlg::onArrangeDlg()
+{
+ ArrangeDlg aDlg(this, myAnimator);
+ aDlg.exec();
}
//************************************************************************
static QPixmap MYpausePixmap(pauseIco);
-VisuGUI_TimeAnimationDlg::VisuGUI_TimeAnimationDlg (QWidget* parent, _PTR(Study) theStudy)
- : QDialog(parent, "VisuGUI_TimeAnimationDlg", false, WStyle_Customize |
- WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose)
+VisuGUI_TimeAnimationDlg::VisuGUI_TimeAnimationDlg (VisuGUI* theModule, _PTR(Study) theStudy)
+ : QDialog(VISU::GetDesktop(theModule), "VisuGUI_TimeAnimationDlg", false, WStyle_Customize |
+ WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose),
+ myModule(theModule),
+ myStudy(theStudy)
{
setCaption("Animation");
setSizeGripEnabled( TRUE );
- myStudy = theStudy;
isClosing = false;
- //myAnimator = new VISU_TimeAnimation (VISU::GetDSStudy(theStudy));
myAnimator = new VISU_TimeAnimation (theStudy);
myAnimator->setSpeed(1);
myAnimator->setViewer(VISU::GetViewWindow());
aMainLayout->addWidget(myPlayFrame);
+ QHBox* aPublishBox = new QHBox(this);
+ aPublishBox->setSpacing(5);
+
+ myPublishBtn = new QPushButton("Publish to study", aPublishBox);
+ connect(myPublishBtn, SIGNAL(clicked()), this, SLOT(publishToStudy()));
+
+ mySaveBtn = new QPushButton("Save Animation", aPublishBox);
+ mySaveBtn->setEnabled(myAnimator->isSavedInStudy());
+ connect(mySaveBtn, SIGNAL(clicked()), this, SLOT(saveToStudy()));
+
+ aMainLayout->addWidget(aPublishBox);
+
+
QHBox* aBtnBox = new QHBox(this);
QHBoxLayout* aBtnLayout = new QHBoxLayout(aBtnBox->layout());
aBtnLayout->addStretch();
QPushButton* aCloseBtn = new QPushButton(tr("BUT_CLOSE"), aBtnBox);
connect(aCloseBtn, SIGNAL(clicked()), this, SLOT(close()));
+ SUIT_Study* aStudy = VISU::GetAppStudy(myModule);
+ connect(aStudy, SIGNAL(destroyed()), this, SLOT(close()));
+
aMainLayout->addWidget(aBtnBox);
myPlayFrame->setEnabled(false);
void VisuGUI_TimeAnimationDlg::addField (_PTR(SObject) theSObject)
{
myPlayFrame->setEnabled(false);
- myAnimator->addField(VISU::GetSObject(theSObject));
+ myAnimator->addField(theSObject);
}
//************************************************************************
void VisuGUI_TimeAnimationDlg::closeEvent (QCloseEvent* theEvent)
{
myAnimator->stopAnimation();
+ myAnimator->wait(500);
if (myAnimator->running() && (! myAnimator->finished())) {
isClosing = true;
myEvent = theEvent;
void VisuGUI_TimeAnimationDlg::onSetupDlg()
{
if (myAnimator->getNbFrames() > 0) myAnimator->firstFrame();
- SetupDlg* aDlg = new SetupDlg(this, myAnimator);
+ SetupDlg* aDlg = new SetupDlg (myModule, myAnimator);
aDlg->exec();
myPlayFrame->setEnabled(false);
delete aDlg;
myGenBtn->setEnabled(true);
}
}
+
+//************************************************************************
+void VisuGUI_TimeAnimationDlg::saveToStudy()
+{
+ myAnimator->saveAnimation();
+ VISU::UpdateObjBrowser(myModule, true);
+}
+
+//************************************************************************
+void VisuGUI_TimeAnimationDlg::publishToStudy()
+{
+ myAnimator->publishInStudy();
+ VISU::UpdateObjBrowser(myModule, true);
+ mySaveBtn->setEnabled(myAnimator->isSavedInStudy());
+}
+
+//************************************************************************
+void VisuGUI_TimeAnimationDlg::restoreFromStudy(_PTR(SObject) theAnimation)
+{
+ myAnimator->restoreFromStudy(theAnimation);
+ mySaveBtn->setEnabled(myAnimator->isSavedInStudy());
+}
