From e6f2c3d6970727bebc8a54a7039880c8550248fa Mon Sep 17 00:00:00 2001 From: ouv Date: Thu, 30 Sep 2010 14:49:34 +0000 Subject: [PATCH] Issue 0020874: [CEA] Graduated axes in GEOM --- configure.ac | 1 + doc/salome/gui/images/graduatedaxes2.png | Bin 0 -> 16385 bytes doc/salome/gui/input/occ_3d_viewer.doc | 36 ++ src/LightApp/resources/LightApp.xml | 1 + src/Makefile.am | 10 +- src/OCCViewer/Makefile.am | 15 +- src/OCCViewer/OCCViewer_CubeAxesDlg.cxx | 321 +++++++++++++++++ src/OCCViewer/OCCViewer_CubeAxesDlg.h | 99 ++++++ src/OCCViewer/OCCViewer_FontWidget.cxx | 99 ++++++ src/OCCViewer/OCCViewer_FontWidget.h | 50 +++ src/OCCViewer/OCCViewer_ViewModel.h | 41 +++ src/OCCViewer/OCCViewer_ViewWindow.cxx | 326 ++++++++++++++++-- src/OCCViewer/OCCViewer_ViewWindow.h | 6 +- src/OCCViewer/resources/OCCViewer_images.ts | 4 + src/OCCViewer/resources/OCCViewer_msg_en.ts | 8 + .../resources/occ_view_graduated_axes.png | Bin 0 -> 650 bytes src/SVTK/Makefile.am | 11 +- src/SVTK/SVTK_CubeAxesDlg.cxx | 298 ++-------------- src/SVTK/SVTK_CubeAxesDlg.h | 55 ++- src/SVTK/SVTK_FontWidget.cxx | 78 ++--- src/SVTK/SVTK_FontWidget.h | 28 +- src/SVTK/SVTK_NonIsometricDlg.cxx | 6 +- src/SVTK/SVTK_NonIsometricDlg.h | 4 +- src/SVTK/SVTK_SetRotationPointDlg.cxx | 6 +- src/SVTK/SVTK_SetRotationPointDlg.h | 4 +- src/SVTK/SVTK_UpdateRateDlg.cxx | 6 +- src/SVTK/SVTK_UpdateRateDlg.h | 4 +- src/SVTK/SVTK_ViewParameterDlg.cxx | 2 +- src/SVTK/SVTK_ViewParameterDlg.h | 4 +- src/SVTK/SVTK_ViewWindow.cxx | 1 + src/SVTK/resources/SVTK_msg_en.ts | 67 ---- src/SalomeApp/resources/SalomeApp.xml | 1 + src/ViewerTools/Makefile.am | 55 +++ src/ViewerTools/ViewerTools.h | 41 +++ .../ViewerTools_CubeAxesDlgBase.cxx | 322 +++++++++++++++++ src/ViewerTools/ViewerTools_CubeAxesDlgBase.h | 119 +++++++ src/ViewerTools/ViewerTools_DialogBase.cxx | 79 +++++ src/ViewerTools/ViewerTools_DialogBase.h | 54 +++ .../ViewerTools_FontWidgetBase.cxx | 128 +++++++ src/ViewerTools/ViewerTools_FontWidgetBase.h | 71 ++++ .../resources/ViewerTools_msg_en.ts | 95 +++++ 41 files changed, 2051 insertions(+), 505 deletions(-) create mode 100644 doc/salome/gui/images/graduatedaxes2.png create mode 100644 src/OCCViewer/OCCViewer_CubeAxesDlg.cxx create mode 100644 src/OCCViewer/OCCViewer_CubeAxesDlg.h create mode 100644 src/OCCViewer/OCCViewer_FontWidget.cxx create mode 100644 src/OCCViewer/OCCViewer_FontWidget.h create mode 100755 src/OCCViewer/resources/occ_view_graduated_axes.png create mode 100755 src/ViewerTools/Makefile.am create mode 100644 src/ViewerTools/ViewerTools.h create mode 100644 src/ViewerTools/ViewerTools_CubeAxesDlgBase.cxx create mode 100644 src/ViewerTools/ViewerTools_CubeAxesDlgBase.h create mode 100644 src/ViewerTools/ViewerTools_DialogBase.cxx create mode 100644 src/ViewerTools/ViewerTools_DialogBase.h create mode 100644 src/ViewerTools/ViewerTools_FontWidgetBase.cxx create mode 100644 src/ViewerTools/ViewerTools_FontWidgetBase.h create mode 100644 src/ViewerTools/resources/ViewerTools_msg_en.ts diff --git a/configure.ac b/configure.ac index bc7d43df9..2ccf2effd 100644 --- a/configure.ac +++ b/configure.ac @@ -625,6 +625,7 @@ AC_OUTPUT([ \ src/ObjBrowser/Makefile \ src/Prs/Makefile \ src/OBJECT/Makefile \ + src/ViewerTools/Makefile \ src/GLViewer/Makefile \ src/VTKViewer/Makefile \ src/SVTK/Makefile \ diff --git a/doc/salome/gui/images/graduatedaxes2.png b/doc/salome/gui/images/graduatedaxes2.png new file mode 100644 index 0000000000000000000000000000000000000000..aa9dbf3ccb402714fa3d2b7c64549f58ce245c22 GIT binary patch literal 16385 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 \image html occviewer_axialscale.png \n
Scaling - represents objects deformed (stretched or stuffed) along the axes of coordinates.
+
+ +\image html image109.png +\n
Graduated axes - allows to define parameters of axes +and graduate them (available only with Open CASCADE 6.3 service pack 10)
+ +\image html graduatedaxes2.png + +
    +
  • Axis name
    • +
      +
    • Is visible - if checked the axis name is displayed in the +viewer.
      • +
    • Name - allows to redefine the name of the axis.
      • +
    • Font - allows to define color of the font of +axis name.
      • +
    +
  • Labels
    • +
      +
    • Is visible - if checked the labels are displayed in the +viewer.
      • +
    • Number - allows to define the number of labels.
      • +
    • Offset - allows to define the distance between labels.
      • +
    • Font - allows to define color of the font of +labels names.
      • +
    +
  • Tick marks
    • +
      +
    • Is visible - if checked the tick marks are displayed in the +viewer.
      • +
    • Length - allows to define the length of tick marks.
      • +
    +
  • Is visible - if checked the axis is displayed in the +viewer.
    • +
+
Note! OCC Viewer features a special Polyline Selection mechanism, which allows selecting an arbitraty part of the graphic area using a polygon frame, instead of the usual selection with a rectangular frame. diff --git a/src/LightApp/resources/LightApp.xml b/src/LightApp/resources/LightApp.xml index bdfbfae04..ba6c4c54e 100644 --- a/src/LightApp/resources/LightApp.xml +++ b/src/LightApp/resources/LightApp.xml @@ -60,6 +60,7 @@ + diff --git a/src/Makefile.am b/src/Makefile.am index 8b684ec2e..7d4de20d2 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,6 +49,7 @@ if ENABLE_VTKVIEWER SUBDIRS_VTKVIEWER = VTKViewer if ENABLE_SALOMEOBJECT SUBDIRS_VTKVIEWER += SVTK + SUBDIRS_VIEWERTOOLS = ViewerTools endif endif @@ -57,6 +58,7 @@ endif ## if ENABLE_OCCVIEWER SUBDIRS_OCCVIEWER = OCCViewer + SUBDIRS_VIEWERTOOLS = ViewerTools if ENABLE_SALOMEOBJECT SUBDIRS_OCCVIEWER += SOCC endif @@ -114,10 +116,10 @@ if ENABLE_PYCONSOLE SUBDIRS_PY_LIGHT = SALOME_SWIG SALOME_PY SALOME_PYQT endif -SUBDIRS = $(SUBDIRS_COMMON) $(SUBDIRS_OBJECT) $(SUBDIRS_GLVIEWER) $(SUBDIRS_VTKVIEWER) $(SUBDIRS_OCCVIEWER) \ - $(SUBDIRS_PLOT2DVIEWER) $(SUBDIRS_SUPERVGRAPHVIEWER) $(SUBDIRS_QXGRAPHVIEWER) $(SUBDIRS_PYCONSOLE) \ - $(SUBDIRS_LIGHT) $(SUBDIRS_CORBA) $(SUBDIRS_PY_LIGHT) +SUBDIRS = $(SUBDIRS_COMMON) $(SUBDIRS_OBJECT) $(SUBDIRS_VIEWERTOOLS) $(SUBDIRS_GLVIEWER) $(SUBDIRS_VTKVIEWER) \ + $(SUBDIRS_OCCVIEWER) $(SUBDIRS_PLOT2DVIEWER) $(SUBDIRS_SUPERVGRAPHVIEWER) $(SUBDIRS_QXGRAPHVIEWER) \ + $(SUBDIRS_PYCONSOLE) $(SUBDIRS_LIGHT) $(SUBDIRS_CORBA) $(SUBDIRS_PY_LIGHT) DIST_SUBDIRS = CASCatch Qtx Style DDS QDS ObjBrowser SUIT SUITApp STD CAF CAM LogWindow Prs Event OpenGLUtils \ - OBJECT GLViewer VTKViewer SVTK OCCViewer SOCC Plot2d SPlot2d SUPERVGraph QxGraph QxScene \ + OBJECT ViewerTools GLViewer VTKViewer SVTK OCCViewer SOCC Plot2d SPlot2d SUPERVGraph QxGraph QxScene \ PyInterp PyConsole LightApp ResExporter TOOLSGUI Session SalomeApp SALOME_SWIG SALOME_PY SALOME_PYQT diff --git a/src/OCCViewer/Makefile.am b/src/OCCViewer/Makefile.am index a9ab7c7c7..4d56e731b 100755 --- a/src/OCCViewer/Makefile.am +++ b/src/OCCViewer/Makefile.am @@ -44,6 +44,8 @@ salomeinclude_HEADERS = \ OCCViewer_AxialScaleDlg.h \ OCCViewer_SetRotationPointDlg.h \ OCCViewer_Trihedron.h \ + OCCViewer_FontWidget.h \ + OCCViewer_CubeAxesDlg.h \ OCCViewer_ToolTip.h dist_libOCCViewer_la_SOURCES = \ @@ -60,6 +62,8 @@ dist_libOCCViewer_la_SOURCES = \ OCCViewer_ClippingDlg.cxx \ OCCViewer_AxialScaleDlg.cxx \ OCCViewer_Trihedron.cxx \ + OCCViewer_FontWidget.cxx \ + OCCViewer_CubeAxesDlg.cxx \ OCCViewer_ToolTip.cxx MOC_FILES = \ @@ -74,8 +78,10 @@ MOC_FILES = \ OCCViewer_SetRotationPointDlg_moc.cxx \ OCCViewer_ClippingDlg_moc.cxx \ OCCViewer_AxialScaleDlg_moc.cxx \ + OCCViewer_FontWidget_moc.cxx \ + OCCViewer_CubeAxesDlg_moc.cxx \ OCCViewer_ToolTip_moc.cxx - + nodist_libOCCViewer_la_SOURCES = $(MOC_FILES) dist_salomeres_DATA = \ @@ -86,6 +92,7 @@ dist_salomeres_DATA = \ resources/occ_view_clipping.png \ resources/occ_view_clipping_pressed.png \ resources/occ_view_scaling.png \ + resources/occ_view_graduated_axes.png \ resources/occ_view_ambient.png \ resources/occ_view_fitall.png \ resources/occ_view_fitarea.png \ @@ -109,7 +116,9 @@ nodist_salomeres_DATA = \ OCCViewer_msg_fr.qm libOCCViewer_la_CPPFLAGS = $(QT_INCLUDES) $(OGL_INCLUDES) $(CAS_CPPFLAGS) \ - -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx -I$(srcdir)/../OpenGLUtils + -I$(srcdir)/../SUIT -I$(srcdir)/../ViewerTools -I$(srcdir)/../Qtx \ + -I$(srcdir)/../OpenGLUtils libOCCViewer_la_LDFLAGS = $(OGL_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_VIEWER) -libOCCViewer_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la ../OpenGLUtils/libOpenGLUtils.la +libOCCViewer_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la \ + ../ViewerTools/libViewerTools.la ../OpenGLUtils/libOpenGLUtils.la diff --git a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx new file mode 100644 index 000000000..198b0f57a --- /dev/null +++ b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx @@ -0,0 +1,321 @@ +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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 "OCCViewer_CubeAxesDlg.h" + +#include "OCCViewer_FontWidget.h" +#include "OCCViewer_ViewPort3d.h" +#include "OCCViewer_ViewWindow.h" + +#include "QtxAction.h" +#include "QtxIntSpinBox.h" + +#include +#include +#include + +#include + +#ifdef OCC_VERSION_SERVICEPACK +#define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8 | OCC_VERSION_SERVICEPACK) +#else +#define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8) +#endif + +/*! + \class OCCViewer_CubeAxesDlg::AxisWidget + \brief Axis tab widget of the "Graduated axis" dialog box + \internal +*/ + +/*! + Constructor +*/ +OCCViewer_AxisWidget::OCCViewer_AxisWidget (QWidget* theParent) +: ViewerTools_AxisWidgetBase(theParent) +{ +} + +/*! + Destructor +*/ +OCCViewer_AxisWidget::~OCCViewer_AxisWidget() +{ +} + +/*! + Create font widget +*/ +ViewerTools_FontWidgetBase* OCCViewer_AxisWidget::createFontWidget( QWidget* theParent ) +{ + OCCViewer_FontWidget* aFontWidget = new OCCViewer_FontWidget( theParent ); + aFontWidget->Initialize(); + return aFontWidget; +} + +/*! + Set axis data +*/ +void OCCViewer_AxisWidget::SetData( const AxisData& theAxisData ) +{ + myNameGrp->setChecked( theAxisData.DrawName ); + myAxisName->setText( theAxisData.Name ); + myNameFont->SetData( theAxisData.NameColor, 0, false, false, false ); + + myLabelsGrp->setChecked( theAxisData.DrawValues ); + myLabelNumber->setValue( theAxisData.NbValues ); + myLabelOffset->setValue( theAxisData.Offset ); + myLabelsFont->SetData( theAxisData.Color, 0, false, false, false ); + + myTicksGrp->setChecked( theAxisData.DrawTickmarks ); + myTickLength->setValue( theAxisData.TickmarkLength ); +} + +/*! + Get axis data +*/ +void OCCViewer_AxisWidget::GetData( AxisData& theAxisData ) +{ + theAxisData.DrawName = myNameGrp->isChecked(); + theAxisData.Name = myAxisName->text(); + + int aNameFamily; + bool aNameBold, aNameItalic, aNameShadow; + myNameFont->GetData( theAxisData.NameColor, aNameFamily, aNameBold, aNameItalic, aNameShadow ); + + theAxisData.DrawValues = myLabelsGrp->isChecked(); + theAxisData.NbValues = myLabelNumber->value(); + theAxisData.Offset = myLabelOffset->value(); + + int aLabelFamily; + bool aLabelBold, aLabelItalic, aLabelShadow; + myLabelsFont->GetData( theAxisData.Color, aLabelFamily, aLabelBold, aLabelItalic, aLabelShadow ); + + theAxisData.DrawTickmarks = myTicksGrp->isChecked(); + theAxisData.TickmarkLength = myTickLength->value(); +} + +/* + Class : OCCViewer_CubeAxesDlg + Description : Dialog for specifying cube axes properties +*/ + +/*! + Constructor +*/ +OCCViewer_CubeAxesDlg::OCCViewer_CubeAxesDlg(QtxAction* theAction, + OCCViewer_ViewWindow* theParent, + const char* theName): + ViewerTools_CubeAxesDlgBase(theAction, + theParent, + theName), + myMainWindow(theParent) +{ +} + +/*! + Destructor +*/ +OCCViewer_CubeAxesDlg::~OCCViewer_CubeAxesDlg() +{ +} + +/*! + Create axis widget +*/ +ViewerTools_AxisWidgetBase* OCCViewer_CubeAxesDlg::createAxisWidget( QWidget* theParent ) +{ + OCCViewer_AxisWidget* anAxisWidget = new OCCViewer_AxisWidget( theParent ); + anAxisWidget->initialize(); + return anAxisWidget; +} + +/*! + Update dialog fields, connect signals and slots, show dialog +*/ +void OCCViewer_CubeAxesDlg::initialize() +{ + ViewerTools_CubeAxesDlgBase::initialize(); + + for( int i = 0; i < 3; i++ ) + { + if( OCCViewer_AxisWidget* anAxisWidget = dynamic_cast( myAxes[ i ] ) ) + { + OCCViewer_AxisWidget::AxisData anAxisData; + switch( i ) + { + case 0: + anAxisData.Name = "X"; + anAxisData.NameColor = anAxisData.Color = Qt::red; + break; + case 1: + anAxisData.Name = "Y"; + anAxisData.NameColor = anAxisData.Color = Qt::green; + break; + case 2: + anAxisData.Name = "Z"; + anAxisData.NameColor = anAxisData.Color = Qt::blue; + break; + } + anAxisData.DrawName = true; + anAxisData.DrawValues = true; + anAxisData.NbValues = 3; + anAxisData.Offset = 2; + anAxisData.DrawTickmarks = true; + anAxisData.TickmarkLength = 5; + anAxisWidget->SetData( anAxisData ); + } + } +} + +/*! + Update dialog fields, connect signals and slots, show dialog +*/ +void OCCViewer_CubeAxesDlg::Update() +{ + ViewerTools_CubeAxesDlgBase::Update(); +} + +/*! + Verify validity of entry data +*/ +bool OCCViewer_CubeAxesDlg::onApply() +{ + bool isOk = ViewerTools_CubeAxesDlgBase::onApply(); + + try + { + QWidget *aCurrWid = this->focusWidget(); + aCurrWid->clearFocus(); + aCurrWid->setFocus(); + + if( OCCViewer_ViewPort3d* aViewPort = myMainWindow->getViewPort() ) + { + Handle(V3d_View) aView = aViewPort->getView(); + if( !aView.IsNull() ) + ApplyData( aView ); + } + } + catch(...) + { + isOk = false; + } + + return isOk; +} + +/*! + Get graduated trihedron parameters +*/ +void OCCViewer_CubeAxesDlg::GetData( bool& theIsVisible, OCCViewer_AxisWidget::AxisData theAxisData[3] ) +{ + theIsVisible = myIsVisible->isChecked(); + for( int i = 0; i < 3; i++ ) + if( OCCViewer_AxisWidget* anAxisWidget = dynamic_cast( myAxes[ i ] ) ) + anAxisWidget->GetData( theAxisData[i] ); +} + +/*! + Set graduated trihedron parameters +*/ +void OCCViewer_CubeAxesDlg::SetData( bool theIsVisible, OCCViewer_AxisWidget::AxisData theAxisData[3] ) +{ + myIsVisible->setChecked( theIsVisible ); + for( int i = 0; i < 3; i++ ) + if( OCCViewer_AxisWidget* anAxisWidget = dynamic_cast( myAxes[ i ] ) ) + anAxisWidget->SetData( theAxisData[i] ); +} + +/*! + Apply graduated trihedron parameters +*/ +void OCCViewer_CubeAxesDlg::ApplyData( const Handle(V3d_View)& theView ) +{ +#if OCC_VERSION_LARGE > 0x06030009 // available only with OCC-6.3-sp10 and higher version + if( theView.IsNull() ) + return; + + if( myIsVisible->isChecked() ) + { + OCCViewer_AxisWidget::AxisData anAxisData[3]; + for( int i = 0; i < 3; i++ ) + if( OCCViewer_AxisWidget* anAxisWidget = dynamic_cast( myAxes[ i ] ) ) + anAxisWidget->GetData( anAxisData[i] ); + + theView->GraduatedTrihedronDisplay( + anAxisData[0].Name.toLatin1().constData(), + anAxisData[1].Name.toLatin1().constData(), + anAxisData[2].Name.toLatin1().constData(), + anAxisData[0].DrawName, + anAxisData[1].DrawName, + anAxisData[2].DrawName, + anAxisData[0].DrawValues, + anAxisData[1].DrawValues, + anAxisData[2].DrawValues, + Standard_True, // draw grid + anAxisData[0].NbValues - 1, + anAxisData[1].NbValues - 1, + anAxisData[2].NbValues - 1, + anAxisData[0].Offset, + anAxisData[1].Offset, + anAxisData[2].Offset, + anAxisData[0].Offset + 20, // tmp + anAxisData[1].Offset + 20, // tmp + anAxisData[2].Offset + 20, // tmp + anAxisData[0].DrawTickmarks, + anAxisData[1].DrawTickmarks, + anAxisData[2].DrawTickmarks, + anAxisData[0].TickmarkLength, + anAxisData[1].TickmarkLength, + anAxisData[2].TickmarkLength, + Quantity_NOC_WHITE, // grid color + Quantity_Color( anAxisData[0].NameColor.redF(), + anAxisData[0].NameColor.greenF(), + anAxisData[0].NameColor.blueF(), + Quantity_TOC_RGB ), + Quantity_Color( anAxisData[1].NameColor.redF(), + anAxisData[1].NameColor.greenF(), + anAxisData[1].NameColor.blueF(), + Quantity_TOC_RGB ), + Quantity_Color( anAxisData[2].NameColor.redF(), + anAxisData[2].NameColor.greenF(), + anAxisData[2].NameColor.blueF(), + Quantity_TOC_RGB ), + Quantity_Color( anAxisData[0].Color.redF(), + anAxisData[0].Color.greenF(), + anAxisData[0].Color.blueF(), + Quantity_TOC_RGB ), + Quantity_Color( anAxisData[1].Color.redF(), + anAxisData[1].Color.greenF(), + anAxisData[1].Color.blueF(), + Quantity_TOC_RGB ), + Quantity_Color( anAxisData[2].Color.redF(), + anAxisData[2].Color.greenF(), + anAxisData[2].Color.blueF(), + Quantity_TOC_RGB ) ); + } + else + theView->GraduatedTrihedronErase(); + + theView->Redraw(); +#endif +} diff --git a/src/OCCViewer/OCCViewer_CubeAxesDlg.h b/src/OCCViewer/OCCViewer_CubeAxesDlg.h new file mode 100644 index 000000000..b570d380c --- /dev/null +++ b/src/OCCViewer/OCCViewer_CubeAxesDlg.h @@ -0,0 +1,99 @@ +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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 +// + +#ifndef OCCVIEWER_CUBEAXESDLG_H +#define OCCVIEWER_CUBEAXESDLG_H + +#include "OCCViewer.h" + +#include + +#include + +class OCCViewer_ViewWindow; + +/*! + * Class : OCCViewer_AxisWidget + * Description : Axis tab widget of the "Graduated axis" dialog box +*/ +class OCCVIEWER_EXPORT OCCViewer_AxisWidget : public ViewerTools_AxisWidgetBase +{ +public: + struct AxisData + { + bool DrawName; + QString Name; + QColor NameColor; + bool DrawValues; + int NbValues; + int Offset; + QColor Color; + bool DrawTickmarks; + int TickmarkLength; + }; + +public: + OCCViewer_AxisWidget( QWidget* ); + ~OCCViewer_AxisWidget(); + +public: + void SetData( const AxisData& ); + void GetData( AxisData& ); + +protected: + virtual ViewerTools_FontWidgetBase* createFontWidget( QWidget* ); +}; + +/*! + * Class : OCCViewer_CubeAxesDlg + * Description : Dialog for specifynig cube axes properties + */ +class OCCVIEWER_EXPORT OCCViewer_CubeAxesDlg : public ViewerTools_CubeAxesDlgBase +{ + Q_OBJECT + +public: + OCCViewer_CubeAxesDlg(QtxAction* theAction, + OCCViewer_ViewWindow* theParent, + const char* theName); + virtual ~OCCViewer_CubeAxesDlg(); + + virtual void initialize(); + + void GetData( bool& theIsVisible, OCCViewer_AxisWidget::AxisData theAxisData[3] ); + void SetData( bool theIsVisible, OCCViewer_AxisWidget::AxisData theAxisData[3] ); + + void ApplyData( const Handle(V3d_View)& theView ); + + virtual void Update(); + +private slots: + virtual bool onApply(); + +private: + virtual ViewerTools_AxisWidgetBase* createAxisWidget( QWidget* ); + +private: + OCCViewer_ViewWindow* myMainWindow; +}; + +#endif diff --git a/src/OCCViewer/OCCViewer_FontWidget.cxx b/src/OCCViewer/OCCViewer_FontWidget.cxx new file mode 100644 index 000000000..d0a61ae6c --- /dev/null +++ b/src/OCCViewer/OCCViewer_FontWidget.cxx @@ -0,0 +1,99 @@ +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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 "OCCViewer_FontWidget.h" + +#include + +//#include + +/*! + * Class : OCCViewer_FontWidget + * Description : Dialog for specifynig font + */ + +/*! + Constructor +*/ +OCCViewer_FontWidget::OCCViewer_FontWidget( QWidget* theParent ) +: ViewerTools_FontWidgetBase( theParent ) +{ +} + +/*! + Destructor +*/ +OCCViewer_FontWidget::~OCCViewer_FontWidget() +{ +} + +void OCCViewer_FontWidget::InitializeFamilies() +{ + //myFamily->insertItem( myFamily->count(), tr( "ARIAL" ) ); + //myFamily->insertItem( myFamily->count(), tr( "COURIER" ) ); + //myFamily->insertItem( myFamily->count(), tr( "TIMES" ) ); +} + +void OCCViewer_FontWidget::SetData( const QColor& theColor, + const int theFamily, + const bool theBold, + const bool theItalic, + const bool theShadow ) +{ + ViewerTools_FontWidgetBase::SetData( theColor, + theFamily, + theBold, + theItalic, + theShadow ); + + /* + if ( theFamily == VTK_ARIAL ) + myFamily->setCurrentIndex( 0 ); + else if ( theFamily == VTK_COURIER ) + myFamily->setCurrentIndex( 1 ); + else + myFamily->setCurrentIndex( 2 ); + */ +} + +void OCCViewer_FontWidget::GetData( QColor& theColor, + int& theFamily, + bool& theBold, + bool& theItalic, + bool& theShadow ) const +{ + ViewerTools_FontWidgetBase::GetData( theColor, + theFamily, + theBold, + theItalic, + theShadow ); + + /* + int anItem = myFamily->currentIndex(); + if ( anItem == 0 ) + theFamily = VTK_ARIAL; + else if ( anItem == 1 ) + theFamily = VTK_COURIER; + else + theFamily = VTK_TIMES; + */ +} diff --git a/src/OCCViewer/OCCViewer_FontWidget.h b/src/OCCViewer/OCCViewer_FontWidget.h new file mode 100644 index 000000000..506d583dd --- /dev/null +++ b/src/OCCViewer/OCCViewer_FontWidget.h @@ -0,0 +1,50 @@ +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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 +// + +#ifndef OCCVIEWER_FONTWIDGET_H +#define OCCVIEWER_FONTWIDGET_H + +#include "OCCViewer.h" + +#include + +/*! + * Class : OCCViewer_FontWidget + * Description : Dialog for specifynig font + */ +class OCCVIEWER_EXPORT OCCViewer_FontWidget : public ViewerTools_FontWidgetBase +{ + Q_OBJECT + +public: + OCCViewer_FontWidget( QWidget* ); + virtual ~OCCViewer_FontWidget(); + + virtual void SetData( const QColor&, const int, const bool, const bool, const bool ); + + virtual void GetData( QColor&, int&, bool&, bool&, bool& ) const; + +protected: + virtual void InitializeFamilies(); +}; + +#endif diff --git a/src/OCCViewer/OCCViewer_ViewModel.h b/src/OCCViewer/OCCViewer_ViewModel.h index 925b2dc05..fc0463e79 100755 --- a/src/OCCViewer/OCCViewer_ViewModel.h +++ b/src/OCCViewer/OCCViewer_ViewModel.h @@ -65,6 +65,47 @@ public: QString name; bool isVisible; double size; + // graduated trihedron + bool gtIsVisible; + bool gtDrawNameX; + bool gtDrawNameY; + bool gtDrawNameZ; + QString gtNameX; + QString gtNameY; + QString gtNameZ; + int gtNameColorRX; + int gtNameColorGX; + int gtNameColorBX; + int gtNameColorRY; + int gtNameColorGY; + int gtNameColorBY; + int gtNameColorRZ; + int gtNameColorGZ; + int gtNameColorBZ; + bool gtDrawValuesX; + bool gtDrawValuesY; + bool gtDrawValuesZ; + int gtNbValuesX; + int gtNbValuesY; + int gtNbValuesZ; + int gtOffsetX; + int gtOffsetY; + int gtOffsetZ; + int gtColorRX; + int gtColorGX; + int gtColorBX; + int gtColorRY; + int gtColorGY; + int gtColorBY; + int gtColorRZ; + int gtColorGZ; + int gtColorBZ; + bool gtDrawTickmarksX; + bool gtDrawTickmarksY; + bool gtDrawTickmarksZ; + int gtTickmarkLengthX; + int gtTickmarkLengthY; + int gtTickmarkLengthZ; }; typedef QList viewAspectList; diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx index fd0992fba..9ac36b842 100755 --- a/src/OCCViewer/OCCViewer_ViewWindow.cxx +++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx @@ -32,6 +32,7 @@ #include "OCCViewer_ClippingDlg.h" #include "OCCViewer_SetRotationPointDlg.h" #include "OCCViewer_AxialScaleDlg.h" +#include "OCCViewer_CubeAxesDlg.h" #include #include @@ -73,6 +74,14 @@ #include #include +#include + +#ifdef OCC_VERSION_SERVICEPACK +#define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8 | OCC_VERSION_SERVICEPACK) +#else +#define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8) +#endif + static QEvent* l_mbPressEvent = 0; #ifdef WIN32 @@ -250,6 +259,11 @@ void OCCViewer_ViewWindow::initLayout() createActions(); createToolBar(); + + // Graduated axes dialog + QtxAction* anAction = dynamic_cast( toolMgr()->action( GraduatedAxesId ) ); + myCubeAxesDlg = new OCCViewer_CubeAxesDlg( anAction, this, "OCCViewer_CubeAxesDlg" ); + myCubeAxesDlg->initialize(); } /*! @@ -1131,6 +1145,13 @@ void OCCViewer_ViewWindow::createActions() connect(aAction, SIGNAL(triggered()), this, SLOT(onAxialScale())); toolMgr()->registerAction( aAction, AxialScaleId ); + // Graduated axes + aAction = new QtxAction(tr("MNU_GRADUATED_AXES"), aResMgr->loadPixmap( "OCCViewer", tr( "ICON_OCCVIEWER_GRADUATED_AXES" ) ), + tr( "MNU_GRADUATED_AXES" ), 0, this); + aAction->setStatusTip(tr("DSC_GRADUATED_AXES")); + connect(aAction, SIGNAL(triggered()), this, SLOT(onGraduatedAxes())); + toolMgr()->registerAction( aAction, GraduatedAxesId ); + // Active only ambient light or not aAction = new QtxAction(tr("MNU_AMBIENT"), aResMgr->loadPixmap( "OCCViewer", tr( "ICON_OCCVIEWER_AMBIENT" ) ), tr( "MNU_AMBIENT" ), 0, this); @@ -1195,6 +1216,9 @@ void OCCViewer_ViewWindow::createToolBar() toolMgr()->append( toolMgr()->separator(), tid ); toolMgr()->append( ClippingId, tid ); toolMgr()->append( AxialScaleId, tid ); +#if OCC_VERSION_LARGE > 0x06030009 // available only with OCC-6.3-sp10 and higher version + toolMgr()->append( GraduatedAxesId, tid ); +#endif toolMgr()->append( AmbientId, tid ); } @@ -1394,6 +1418,15 @@ void OCCViewer_ViewWindow::onAxialScale() myScalingDlg->show(); } +/*! + Shows Graduated Axes dialog +*/ +void OCCViewer_ViewWindow::onGraduatedAxes() +{ + myCubeAxesDlg->Update(); + myCubeAxesDlg->show(); +} + void OCCViewer_ViewWindow::onAmbientToogle() { Handle(V3d_Viewer) viewer = myViewPort->getViewer(); @@ -1453,6 +1486,54 @@ void OCCViewer_ViewWindow::performRestoring( const viewAspect& anItem ) myModel->setTrihedronShown( anItem.isVisible ); myModel->setTrihedronSize( anItem.size ); +#if OCC_VERSION_LARGE > 0x06030009 // available only with OCC-6.3-sp10 and higher version + // graduated trihedron + bool anIsVisible = anItem.gtIsVisible; + OCCViewer_AxisWidget::AxisData anAxisData[3]; + anAxisData[0].DrawName = anItem.gtDrawNameX; + anAxisData[1].DrawName = anItem.gtDrawNameZ; + anAxisData[2].DrawName = anItem.gtDrawNameZ; + anAxisData[0].Name = anItem.gtNameX; + anAxisData[1].Name = anItem.gtNameZ; + anAxisData[2].Name = anItem.gtNameZ; + anAxisData[0].NameColor = QColor( anItem.gtNameColorRX, + anItem.gtNameColorGX, + anItem.gtNameColorBX ); + anAxisData[1].NameColor = QColor( anItem.gtNameColorRY, + anItem.gtNameColorGY, + anItem.gtNameColorBY ); + anAxisData[2].NameColor = QColor( anItem.gtNameColorRZ, + anItem.gtNameColorGZ, + anItem.gtNameColorBZ ); + anAxisData[0].DrawValues = anItem.gtDrawValuesX; + anAxisData[1].DrawValues = anItem.gtDrawValuesY; + anAxisData[2].DrawValues = anItem.gtDrawValuesZ; + anAxisData[0].NbValues = anItem.gtNbValuesX; + anAxisData[1].NbValues = anItem.gtNbValuesY; + anAxisData[2].NbValues = anItem.gtNbValuesZ; + anAxisData[0].Offset = anItem.gtOffsetX; + anAxisData[1].Offset = anItem.gtOffsetY; + anAxisData[2].Offset = anItem.gtOffsetZ; + anAxisData[0].Color = QColor( anItem.gtColorRX, + anItem.gtColorGX, + anItem.gtColorBX ); + anAxisData[1].Color = QColor( anItem.gtColorRY, + anItem.gtColorGY, + anItem.gtColorBY ); + anAxisData[2].Color = QColor( anItem.gtColorRZ, + anItem.gtColorGZ, + anItem.gtColorBZ ); + anAxisData[0].DrawTickmarks = anItem.gtDrawTickmarksX; + anAxisData[1].DrawTickmarks = anItem.gtDrawTickmarksY; + anAxisData[2].DrawTickmarks = anItem.gtDrawTickmarksZ; + anAxisData[0].TickmarkLength = anItem.gtTickmarkLengthX; + anAxisData[1].TickmarkLength = anItem.gtTickmarkLengthY; + anAxisData[2].TickmarkLength = anItem.gtTickmarkLengthZ; + + myCubeAxesDlg->SetData( anIsVisible, anAxisData ); + myCubeAxesDlg->ApplyData( aView3d ); +#endif + myRestoreFlag = 0; } @@ -1681,6 +1762,54 @@ viewAspect OCCViewer_ViewWindow::getViewParams() const params.isVisible= isShown; params.size = size; +#if OCC_VERSION_LARGE > 0x06030009 // available only with OCC-6.3-sp10 and higher version + // graduated trihedron + bool anIsVisible = false; + OCCViewer_AxisWidget::AxisData anAxisData[3]; + myCubeAxesDlg->GetData( anIsVisible, anAxisData ); + + params.gtIsVisible = anIsVisible; + params.gtDrawNameX = anAxisData[0].DrawName; + params.gtDrawNameY = anAxisData[1].DrawName; + params.gtDrawNameZ = anAxisData[2].DrawName; + params.gtNameX = anAxisData[0].Name; + params.gtNameY = anAxisData[1].Name; + params.gtNameZ = anAxisData[2].Name; + params.gtNameColorRX = anAxisData[0].NameColor.red(); + params.gtNameColorGX = anAxisData[0].NameColor.green(); + params.gtNameColorBX = anAxisData[0].NameColor.blue(); + params.gtNameColorRY = anAxisData[1].NameColor.red(); + params.gtNameColorGY = anAxisData[1].NameColor.green(); + params.gtNameColorBY = anAxisData[1].NameColor.blue(); + params.gtNameColorRZ = anAxisData[2].NameColor.red(); + params.gtNameColorGZ = anAxisData[2].NameColor.green(); + params.gtNameColorBZ = anAxisData[2].NameColor.blue(); + params.gtDrawValuesX = anAxisData[0].DrawValues; + params.gtDrawValuesY = anAxisData[1].DrawValues; + params.gtDrawValuesZ = anAxisData[2].DrawValues; + params.gtNbValuesX = anAxisData[0].NbValues; + params.gtNbValuesY = anAxisData[1].NbValues; + params.gtNbValuesZ = anAxisData[2].NbValues; + params.gtOffsetX = anAxisData[0].Offset; + params.gtOffsetY = anAxisData[1].Offset; + params.gtOffsetZ = anAxisData[2].Offset; + params.gtColorRX = anAxisData[0].Color.red(); + params.gtColorGX = anAxisData[0].Color.green(); + params.gtColorBX = anAxisData[0].Color.blue(); + params.gtColorRY = anAxisData[1].Color.red(); + params.gtColorGY = anAxisData[1].Color.green(); + params.gtColorBY = anAxisData[1].Color.blue(); + params.gtColorRZ = anAxisData[2].Color.red(); + params.gtColorGZ = anAxisData[2].Color.green(); + params.gtColorBZ = anAxisData[2].Color.blue(); + params.gtDrawTickmarksX = anAxisData[0].DrawTickmarks; + params.gtDrawTickmarksY = anAxisData[1].DrawTickmarks; + params.gtDrawTickmarksZ = anAxisData[2].DrawTickmarks; + params.gtTickmarkLengthX = anAxisData[0].TickmarkLength; + params.gtTickmarkLengthY = anAxisData[1].TickmarkLength; + params.gtTickmarkLengthZ = anAxisData[2].TickmarkLength; +#endif + return params; } @@ -1693,11 +1822,71 @@ QString OCCViewer_ViewWindow::getVisualParameters() { viewAspect params = getViewParams(); QString retStr; - retStr.sprintf( "%.12e*%.12e*%.12e*%.12e*%.12e*%.12e*%.12e*%.12e*%.12e*%.12e*%.12e*%.12e*%.12e*%.12e*%.12e*%.12e", params.scale, - params.centerX, params.centerY, params.projX, params.projY, params.projZ, params.twist, - params.atX, params.atY, params.atZ, params.eyeX, params.eyeY, params.eyeZ, - params.scaleX, params.scaleY, params.scaleZ ); - retStr += QString().sprintf("*%u*%.2f", params.isVisible, params.size ); + + retStr += QString().sprintf( "scale=%.12e*", params.scale ); + retStr += QString().sprintf( "centerX=%.12e*", params.centerX ); + retStr += QString().sprintf( "centerY=%.12e*", params.centerY ); + retStr += QString().sprintf( "projX=%.12e*", params.projX ); + retStr += QString().sprintf( "projY=%.12e*", params.projY ); + retStr += QString().sprintf( "projZ=%.12e*", params.projZ ); + retStr += QString().sprintf( "twist=%.12e*", params.twist ); + retStr += QString().sprintf( "atX=%.12e*", params.atX ); + retStr += QString().sprintf( "atY=%.12e*", params.atY ); + retStr += QString().sprintf( "atZ=%.12e*", params.atZ ); + retStr += QString().sprintf( "eyeX=%.12e*", params.eyeX ); + retStr += QString().sprintf( "eyeY=%.12e*", params.eyeY ); + retStr += QString().sprintf( "eyeZ=%.12e*", params.eyeZ ); + retStr += QString().sprintf( "scaleX=%.12e*", params.scaleX ); + retStr += QString().sprintf( "scaleY=%.12e*", params.scaleY ); + retStr += QString().sprintf( "scaleZ=%.12e*", params.scaleZ ); + + retStr += QString().sprintf( "isVisible=%.u*", params.isVisible ); + retStr += QString().sprintf( "size=%.2f", params.size ); + +#if OCC_VERSION_LARGE > 0x06030009 // available only with OCC-6.3-sp10 and higher version + // graduated trihedron + retStr += QString().sprintf( "*gtIsVisible=%u*", params.gtIsVisible ); + retStr += QString().sprintf( "gtDrawNameX=%u*", params.gtDrawNameX ); + retStr += QString().sprintf( "gtDrawNameY=%u*", params.gtDrawNameY ); + retStr += QString().sprintf( "gtDrawNameZ=%u*", params.gtDrawNameZ ); + retStr += QString().sprintf( "gtNameX=%s*", params.gtNameX.toLatin1().constData() ); + retStr += QString().sprintf( "gtNameY=%s*", params.gtNameY.toLatin1().constData() ); + retStr += QString().sprintf( "gtNameZ=%s*", params.gtNameZ.toLatin1().constData() ); + retStr += QString().sprintf( "gtNameColorRX=%u*", params.gtNameColorRX ); + retStr += QString().sprintf( "gtNameColorGX=%u*", params.gtNameColorGX ); + retStr += QString().sprintf( "gtNameColorBX=%u*", params.gtNameColorBX ); + retStr += QString().sprintf( "gtNameColorRY=%u*", params.gtNameColorRY ); + retStr += QString().sprintf( "gtNameColorGY=%u*", params.gtNameColorGY ); + retStr += QString().sprintf( "gtNameColorBY=%u*", params.gtNameColorBY ); + retStr += QString().sprintf( "gtNameColorRZ=%u*", params.gtNameColorRZ ); + retStr += QString().sprintf( "gtNameColorGZ=%u*", params.gtNameColorGZ ); + retStr += QString().sprintf( "gtNameColorBZ=%u*", params.gtNameColorBZ ); + retStr += QString().sprintf( "gtDrawValuesX=%u*", params.gtDrawValuesX ); + retStr += QString().sprintf( "gtDrawValuesY=%u*", params.gtDrawValuesY ); + retStr += QString().sprintf( "gtDrawValuesZ=%u*", params.gtDrawValuesZ ); + retStr += QString().sprintf( "gtNbValuesX=%u*", params.gtNbValuesX ); + retStr += QString().sprintf( "gtNbValuesY=%u*", params.gtNbValuesY ); + retStr += QString().sprintf( "gtNbValuesZ=%u*", params.gtNbValuesZ ); + retStr += QString().sprintf( "gtOffsetX=%u*", params.gtOffsetX ); + retStr += QString().sprintf( "gtOffsetY=%u*", params.gtOffsetY ); + retStr += QString().sprintf( "gtOffsetZ=%u*", params.gtOffsetZ ); + retStr += QString().sprintf( "gtColorRX=%u*", params.gtColorRX ); + retStr += QString().sprintf( "gtColorGX=%u*", params.gtColorGX ); + retStr += QString().sprintf( "gtColorBX=%u*", params.gtColorBX ); + retStr += QString().sprintf( "gtColorRY=%u*", params.gtColorRY ); + retStr += QString().sprintf( "gtColorGY=%u*", params.gtColorGY ); + retStr += QString().sprintf( "gtColorBY=%u*", params.gtColorBY ); + retStr += QString().sprintf( "gtColorRZ=%u*", params.gtColorRZ ); + retStr += QString().sprintf( "gtColorGZ=%u*", params.gtColorGZ ); + retStr += QString().sprintf( "gtColorBZ=%u*", params.gtColorBZ ); + retStr += QString().sprintf( "gtDrawTickmarksX=%u*", params.gtDrawTickmarksX ); + retStr += QString().sprintf( "gtDrawTickmarksY=%u*", params.gtDrawTickmarksY ); + retStr += QString().sprintf( "gtDrawTickmarksZ=%u*", params.gtDrawTickmarksZ ); + retStr += QString().sprintf( "gtTickmarkLengthX=%u*", params.gtTickmarkLengthX ); + retStr += QString().sprintf( "gtTickmarkLengthY=%u*", params.gtTickmarkLengthY ); + retStr += QString().sprintf( "gtTickmarkLengthZ=%u", params.gtTickmarkLengthZ ); +#endif + return retStr; } @@ -1707,36 +1896,109 @@ QString OCCViewer_ViewWindow::getVisualParameters() */ void OCCViewer_ViewWindow::setVisualParameters( const QString& parameters ) { + viewAspect params; QStringList paramsLst = parameters.split( '*' ); - if ( paramsLst.size() >= 15 ) { - viewAspect params; - params.scale = paramsLst[0].toDouble(); - params.centerX = paramsLst[1].toDouble(); - params.centerY = paramsLst[2].toDouble(); - params.projX = paramsLst[3].toDouble(); - params.projY = paramsLst[4].toDouble(); - params.projZ = paramsLst[5].toDouble(); - params.twist = paramsLst[6].toDouble(); - params.atX = paramsLst[7].toDouble(); - params.atY = paramsLst[8].toDouble(); - params.atZ = paramsLst[9].toDouble(); - params.eyeX = paramsLst[10].toDouble(); - params.eyeY = paramsLst[11].toDouble(); - params.eyeZ = paramsLst[12].toDouble(); - if ( paramsLst.size() == 18 ) { - params.scaleX = paramsLst[13].toDouble(); - params.scaleY = paramsLst[14].toDouble(); - params.scaleZ = paramsLst[15].toDouble(); - params.isVisible = paramsLst[16].toDouble(); - params.size = paramsLst[17].toDouble(); - } - else { - params.scaleX = 1.; - params.scaleY = 1.; - params.scaleZ = 1.; + if( parameters.contains( '=' ) ) // new format - "scale=1.000e+00*centerX=0.000e+00..." + { + QStringList::const_iterator it = paramsLst.begin(), itEnd = paramsLst.end(); + for( ; it != itEnd; it++ ) { + QString param = *it; + QString paramName = param.section( '=', 0, 0 ); + QString paramStr = param.section( '=', 1, 1 ); + double paramDouble = paramStr.toDouble(); + int paramInt = paramStr.toInt(); + if( paramName == "scale" ) params.scale = paramDouble; + else if( paramName == "centerX" ) params.centerX = paramDouble; + else if( paramName == "centerY" ) params.centerY = paramDouble; + else if( paramName == "projX" ) params.projX = paramDouble; + else if( paramName == "projY" ) params.projY = paramDouble; + else if( paramName == "projZ" ) params.projZ = paramDouble; + else if( paramName == "twist" ) params.twist = paramDouble; + else if( paramName == "atX" ) params.atX = paramDouble; + else if( paramName == "atY" ) params.atY = paramDouble; + else if( paramName == "atZ" ) params.atZ = paramDouble; + else if( paramName == "eyeX" ) params.eyeX = paramDouble; + else if( paramName == "eyeY" ) params.eyeY = paramDouble; + else if( paramName == "eyeZ" ) params.eyeZ = paramDouble; + else if( paramName == "scaleX" ) params.scaleX = paramDouble; + else if( paramName == "scaleY" ) params.scaleY = paramDouble; + else if( paramName == "scaleZ" ) params.scaleZ = paramDouble; + else if( paramName == "isVisible" ) params.isVisible = paramInt; + else if( paramName == "size" ) params.size = paramDouble; + // graduated trihedron + else if( paramName == "gtIsVisible" ) params.gtIsVisible = paramInt; + else if( paramName == "gtDrawNameX" ) params.gtDrawNameX = paramInt; + else if( paramName == "gtDrawNameY" ) params.gtDrawNameY = paramInt; + else if( paramName == "gtDrawNameZ" ) params.gtDrawNameZ = paramInt; + else if( paramName == "gtNameX" ) params.gtNameX = paramStr; + else if( paramName == "gtNameY" ) params.gtNameY = paramStr; + else if( paramName == "gtNameZ" ) params.gtNameZ = paramStr; + else if( paramName == "gtNameColorRX" ) params.gtNameColorRX = paramInt; + else if( paramName == "gtNameColorGX" ) params.gtNameColorGX = paramInt; + else if( paramName == "gtNameColorBX" ) params.gtNameColorBX = paramInt; + else if( paramName == "gtNameColorRY" ) params.gtNameColorRY = paramInt; + else if( paramName == "gtNameColorGY" ) params.gtNameColorGY = paramInt; + else if( paramName == "gtNameColorBY" ) params.gtNameColorBY = paramInt; + else if( paramName == "gtNameColorRZ" ) params.gtNameColorRZ = paramInt; + else if( paramName == "gtNameColorGZ" ) params.gtNameColorGZ = paramInt; + else if( paramName == "gtNameColorBZ" ) params.gtNameColorBZ = paramInt; + else if( paramName == "gtDrawValuesX" ) params.gtDrawValuesX = paramInt; + else if( paramName == "gtDrawValuesY" ) params.gtDrawValuesY = paramInt; + else if( paramName == "gtDrawValuesZ" ) params.gtDrawValuesZ = paramInt; + else if( paramName == "gtNbValuesX" ) params.gtNbValuesX = paramInt; + else if( paramName == "gtNbValuesY" ) params.gtNbValuesY = paramInt; + else if( paramName == "gtNbValuesZ" ) params.gtNbValuesZ = paramInt; + else if( paramName == "gtOffsetX" ) params.gtOffsetX = paramInt; + else if( paramName == "gtOffsetY" ) params.gtOffsetY = paramInt; + else if( paramName == "gtOffsetZ" ) params.gtOffsetZ = paramInt; + else if( paramName == "gtColorRX" ) params.gtColorRX = paramInt; + else if( paramName == "gtColorGX" ) params.gtColorGX = paramInt; + else if( paramName == "gtColorBX" ) params.gtColorBX = paramInt; + else if( paramName == "gtColorRY" ) params.gtColorRY = paramInt; + else if( paramName == "gtColorGY" ) params.gtColorGY = paramInt; + else if( paramName == "gtColorBY" ) params.gtColorBY = paramInt; + else if( paramName == "gtColorRZ" ) params.gtColorRZ = paramInt; + else if( paramName == "gtColorGZ" ) params.gtColorGZ = paramInt; + else if( paramName == "gtColorBZ" ) params.gtColorBZ = paramInt; + else if( paramName == "gtDrawTickmarksX" ) params.gtDrawTickmarksX = paramInt; + else if( paramName == "gtDrawTickmarksY" ) params.gtDrawTickmarksY = paramInt; + else if( paramName == "gtDrawTickmarksZ" ) params.gtDrawTickmarksZ = paramInt; + else if( paramName == "gtTickmarkLengthX" ) params.gtTickmarkLengthX = paramInt; + else if( paramName == "gtTickmarkLengthY" ) params.gtTickmarkLengthY = paramInt; + else if( paramName == "gtTickmarkLengthZ" ) params.gtTickmarkLengthZ = paramInt; + } + } + else // old format - "1.000e+00*0.000e+00..." + { + if ( paramsLst.size() >= 15 ) { + params.scale = paramsLst[0].toDouble(); + params.centerX = paramsLst[1].toDouble(); + params.centerY = paramsLst[2].toDouble(); + params.projX = paramsLst[3].toDouble(); + params.projY = paramsLst[4].toDouble(); + params.projZ = paramsLst[5].toDouble(); + params.twist = paramsLst[6].toDouble(); + params.atX = paramsLst[7].toDouble(); + params.atY = paramsLst[8].toDouble(); + params.atZ = paramsLst[9].toDouble(); + params.eyeX = paramsLst[10].toDouble(); + params.eyeY = paramsLst[11].toDouble(); + params.eyeZ = paramsLst[12].toDouble(); + if ( paramsLst.size() == 18 ) { + params.scaleX = paramsLst[13].toDouble(); + params.scaleY = paramsLst[14].toDouble(); + params.scaleZ = paramsLst[15].toDouble(); + params.isVisible = paramsLst[16].toDouble(); + params.size = paramsLst[17].toDouble(); + } + else { + params.scaleX = 1.; + params.scaleY = 1.; + params.scaleZ = 1.; + } } - performRestoring( params ); } + performRestoring( params ); } /*! diff --git a/src/OCCViewer/OCCViewer_ViewWindow.h b/src/OCCViewer/OCCViewer_ViewWindow.h index 56558b5b7..02300ef18 100755 --- a/src/OCCViewer/OCCViewer_ViewWindow.h +++ b/src/OCCViewer/OCCViewer_ViewWindow.h @@ -35,6 +35,7 @@ class OCCViewer_ClippingDlg; class OCCViewer_AxialScaleDlg; class OCCViewer_SetRotationPointDlg; class OCCViewer_Viewer; +class OCCViewer_CubeAxesDlg; class viewAspect; class QtxAction; @@ -50,7 +51,7 @@ public: enum { DumpId, FitAllId, FitRectId, ZoomId, PanId, GlobalPanId, ChangeRotationPointId, RotationId, FrontId, BackId, TopId, BottomId, LeftId, RightId, ResetId, CloneId, ClippingId, MemId, RestoreId, - TrihedronShowId, AxialScaleId, AmbientId, SwitchInteractionStyleId }; + TrihedronShowId, AxialScaleId, GraduatedAxesId, AmbientId, SwitchInteractionStyleId }; enum OperationType{ NOTHING, PANVIEW, ZOOMVIEW, ROTATE, PANGLOBAL, WINDOWFIT, FITALLVIEW, RESETVIEW, @@ -111,6 +112,7 @@ public slots: void onCloneView(); void onClipping( bool on ); void onAxialScale(); + void onGraduatedAxes(); void onAmbientToogle(); void onMemorizeView(); void onRestoreView(); @@ -179,6 +181,8 @@ protected: OCCViewer_Viewer* myModel; OCCViewer_ViewPort3d* myViewPort; + OCCViewer_CubeAxesDlg* myCubeAxesDlg; + RotationPointType myCurrPointType; RotationPointType myPrevPointType; gp_Pnt mySelectedPoint; diff --git a/src/OCCViewer/resources/OCCViewer_images.ts b/src/OCCViewer/resources/OCCViewer_images.ts index bdd523e49..bcc888b20 100644 --- a/src/OCCViewer/resources/OCCViewer_images.ts +++ b/src/OCCViewer/resources/OCCViewer_images.ts @@ -112,6 +112,10 @@ ICON_OCCVIEWER_SCALING occ_view_scaling.png + + ICON_OCCVIEWER_GRADUATED_AXES + occ_view_graduated_axes.png + ICON_OCCVIEWER_AMBIENT occ_view_ambient.png diff --git a/src/OCCViewer/resources/OCCViewer_msg_en.ts b/src/OCCViewer/resources/OCCViewer_msg_en.ts index 8b19e4c5b..aea134ee6 100644 --- a/src/OCCViewer/resources/OCCViewer_msg_en.ts +++ b/src/OCCViewer/resources/OCCViewer_msg_en.ts @@ -207,6 +207,14 @@ MNU_SCALING Scaling + + DSC_GRADUATED_AXES + Graduated axes + + + MNU_GRADUATED_AXES + Graduated axes + DSC_AMBIENT Toogle keep only ambient light diff --git a/src/OCCViewer/resources/occ_view_graduated_axes.png b/src/OCCViewer/resources/occ_view_graduated_axes.png new file mode 100755 index 0000000000000000000000000000000000000000..2b44c06fe8f81517d47267c43b62963b1a40ace5 GIT binary patch literal 650 zcmV;50(Jd~P)z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ;07*naRCwBA`2YVu13vJ;#00+rGyo7lOhl>^2V!nw z6aoYg6EUs>(l3CN1Th8z1P}uOFY`hTtpZ{%5TB5F00G1ZGLVsx5tqD-v9a-EdQCNfLQPa2gtCsK+A5ow_`|FR8+v2prCjU#9x5;7eD|p;W6xQM@I)% zNswVkaw;im)@h0~(eq!v4A!D0vqkfUqTOAz&=O z72}z~P*n2)XZiygwjW4+hNeGeXkLE?5I{H$B#=8+11XSg&w&`EmJON~p8y09x`9ld z_NV`DKWORzWII9=Edx~ZZzvm-#Xf;F1Mxj*8Uz`@1_t3dn`h<~8@7^L|d)KHL1 ze}W8xNdg2A*vnoHXZ{0SrUEUZ_(8!0HSim -#include -#include -#include #include #include #include -#include #include #include @@ -53,176 +48,29 @@ \internal */ -class SVTK_CubeAxesDlg::AxisWidget : public QFrame -{ -public: - AxisWidget( QWidget* ); - ~AxisWidget(); - - void UseName( const bool ); - void SetName( const QString& ); - void SetNameFont( const QColor&, const int, const bool, const bool, const bool ); - bool ReadData( vtkAxisActor2D* ); - bool Apply( vtkAxisActor2D* ); - -private: - // name - QGroupBox* myNameGrp; - QLineEdit* myAxisName; - SVTK_FontWidget* myNameFont; - - // labels - QGroupBox* myLabelsGrp; - QtxIntSpinBox* myLabelNumber; - QtxIntSpinBox* myLabelOffset; - SVTK_FontWidget* myLabelsFont; - - // tick marks - QGroupBox* myTicksGrp; - QtxIntSpinBox* myTickLength; - - friend class SVTK_CubeAxesDlg; -}; - /*! Constructor */ -SVTK_CubeAxesDlg::AxisWidget::AxisWidget (QWidget* theParent) -: QFrame(theParent) +SVTK_AxisWidget::SVTK_AxisWidget (QWidget* theParent) +: ViewerTools_AxisWidgetBase(theParent) { - QList< QLabel* > aLabels; - - // "Name" grp - - myNameGrp = new QGroupBox(SVTK_CubeAxesDlg::tr("AXIS_NAME"), this); - myNameGrp->setCheckable( true ); - - QVBoxLayout* aVBox = new QVBoxLayout; - - QHBoxLayout* aHBox = new QHBoxLayout; - aHBox->setSpacing(5); - QLabel* aLabel = new QLabel(SVTK_CubeAxesDlg::tr("NAME")); - aHBox->addWidget(aLabel); - myAxisName = new QLineEdit; - aHBox->addWidget(myAxisName); - aLabels.append(aLabel); - aVBox->addLayout(aHBox); - - aHBox = new QHBoxLayout; - aHBox->setSpacing(5); - aLabel = new QLabel(SVTK_CubeAxesDlg::tr("FONT")); - aHBox->addWidget(aLabel); - myNameFont = new SVTK_FontWidget(myNameGrp); - aHBox->addWidget(myNameFont); - aLabels.append(aLabel); - aVBox->addLayout(aHBox); - - myNameGrp->setLayout(aVBox); - - // "Labels" grp - - myLabelsGrp = new QGroupBox(SVTK_CubeAxesDlg::tr("LABELS"), this); - myLabelsGrp->setCheckable( true ); - - aVBox = new QVBoxLayout; - - aHBox = new QHBoxLayout; - aHBox->setSpacing(5); - aLabel = new QLabel(SVTK_CubeAxesDlg::tr("NUMBER")); - aHBox->addWidget(aLabel); - myLabelNumber = new QtxIntSpinBox(0,25,1,myLabelsGrp); - aHBox->addWidget(myLabelNumber); - aLabels.append(aLabel); - aVBox->addLayout(aHBox); - - aHBox = new QHBoxLayout; - aHBox->setSpacing(5); - aLabel = new QLabel(SVTK_CubeAxesDlg::tr("OFFSET")); - aHBox->addWidget(aLabel); - myLabelOffset = new QtxIntSpinBox(0,100,1,myLabelsGrp); - aHBox->addWidget(myLabelOffset); - aLabels.append(aLabel); - aVBox->addLayout(aHBox); - - aHBox = new QHBoxLayout; - aHBox->setSpacing(5); - aLabel = new QLabel(SVTK_CubeAxesDlg::tr("FONT")); - aHBox->addWidget(aLabel); - myLabelsFont = new SVTK_FontWidget(myLabelsGrp); - aHBox->addWidget(myLabelsFont); - aLabels.append(aLabel); - aVBox->addLayout(aHBox); - - myLabelsGrp->setLayout(aVBox); - - // "Tick marks" grp - - myTicksGrp = new QGroupBox(SVTK_CubeAxesDlg::tr("TICK_MARKS"), this); - myTicksGrp->setCheckable( true ); - - aVBox = new QVBoxLayout; - - aHBox = new QHBoxLayout; - aHBox->setSpacing(5); - aLabel = new QLabel(SVTK_CubeAxesDlg::tr("LENGTH")); - aHBox->addWidget(aLabel); - myTickLength = new QtxIntSpinBox(0,100,1,myTicksGrp); - aHBox->addWidget(myTickLength); - aLabels.append(aLabel); - aVBox->addLayout(aHBox); - - myTicksGrp->setLayout(aVBox); - - // Layout - - QVBoxLayout* aLay = new QVBoxLayout(this); - aLay->setMargin(5); - aLay->setSpacing(5); - aLay->addWidget(myNameGrp); - aLay->addWidget(myLabelsGrp); - aLay->addWidget(myTicksGrp); - - // init - myNameGrp->setChecked( true ); - myLabelsGrp->setChecked( true ); - myTicksGrp->setChecked( true ); - - // Adjust label widths - QList< QLabel* >::iterator anIter; - int aMaxWidth = 0; - for (anIter = aLabels.begin(); anIter != aLabels.end(); anIter++) - aMaxWidth = qMax(aMaxWidth, (*anIter)->sizeHint().width()); - for (anIter = aLabels.begin(); anIter != aLabels.end(); anIter++) - (*anIter)->setFixedWidth(aMaxWidth); } /*! Destructor */ -SVTK_CubeAxesDlg::AxisWidget::~AxisWidget() +SVTK_AxisWidget::~SVTK_AxisWidget() { } -void SVTK_CubeAxesDlg::AxisWidget::UseName(const bool toUse) +ViewerTools_FontWidgetBase* SVTK_AxisWidget::createFontWidget( QWidget* theParent ) { - myNameGrp->setChecked(toUse); + SVTK_FontWidget* aFontWidget = new SVTK_FontWidget( theParent ); + aFontWidget->Initialize(); + return aFontWidget; } -void SVTK_CubeAxesDlg::AxisWidget::SetName(const QString& theName) -{ - myAxisName->setText(theName); -} - -void SVTK_CubeAxesDlg::AxisWidget::SetNameFont(const QColor& theColor, - const int theFont, - const bool theIsBold, - const bool theIsItalic, - const bool theIsShadow) -{ - myNameFont->SetData(theColor, theFont, theIsBold, theIsItalic, theIsShadow); -} - -bool SVTK_CubeAxesDlg::AxisWidget::ReadData(vtkAxisActor2D* theActor) +bool SVTK_AxisWidget::ReadData(vtkAxisActor2D* theActor) { if (theActor == 0) return false; @@ -293,7 +141,7 @@ bool SVTK_CubeAxesDlg::AxisWidget::ReadData(vtkAxisActor2D* theActor) return true; } -bool SVTK_CubeAxesDlg::AxisWidget::Apply(vtkAxisActor2D* theActor) +bool SVTK_AxisWidget::Apply(vtkAxisActor2D* theActor) { if (theActor == 0) return false; @@ -378,86 +226,28 @@ bool SVTK_CubeAxesDlg::AxisWidget::Apply(vtkAxisActor2D* theActor) SVTK_CubeAxesDlg::SVTK_CubeAxesDlg(QtxAction* theAction, SVTK_ViewWindow* theParent, const char* theName): - SVTK_DialogBase(theAction, - theParent, - theName), + ViewerTools_CubeAxesDlgBase(theAction, + theParent, + theName), myMainWindow(theParent) { - setWindowTitle(tr("CAPTION")); - - QVBoxLayout* aLay = new QVBoxLayout(this); - aLay->setMargin(5); - aLay->setSpacing(5); - aLay->addWidget(createMainFrame(this)); - aLay->addWidget(createButtonFrame(this)); - - connect(theParent, SIGNAL(Show( QShowEvent * )), this, SLOT(onParentShow())); - connect(theParent, SIGNAL(Hide( QHideEvent * )), this, SLOT(onParentHide())); } /*! - Create frame containing dialog's input fields -*/ -QWidget* SVTK_CubeAxesDlg::createMainFrame(QWidget* theParent) -{ - QFrame* aFrame = new QFrame(theParent); - - myTabWg = new QTabWidget(aFrame); - - myAxes[ 0 ] = new AxisWidget(myTabWg); - myAxes[ 1 ] = new AxisWidget(myTabWg); - myAxes[ 2 ] = new AxisWidget(myTabWg); - - myTabWg->addTab(myAxes[ 0 ], tr("X_AXIS")); - myTabWg->addTab(myAxes[ 1 ], tr("Y_AXIS")); - myTabWg->addTab(myAxes[ 2 ], tr("Z_AXIS")); - - myIsVisible = new QCheckBox(tr("IS_VISIBLE"), aFrame); - - QVBoxLayout* aLay = new QVBoxLayout(aFrame); - aLay->setMargin(0); - aLay->setSpacing(5); - aLay->addWidget(myTabWg); - aLay->addWidget(myIsVisible); - - return aFrame; -} - -/*! - Create frame containing buttons + Destructor */ -QWidget* SVTK_CubeAxesDlg::createButtonFrame(QWidget* theParent) +SVTK_CubeAxesDlg::~SVTK_CubeAxesDlg() { - QFrame* aFrame = new QFrame(theParent); - aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken); - - myOkBtn = new QPushButton(tr("BUT_OK"), aFrame); - myApplyBtn = new QPushButton(tr("BUT_APPLY"), aFrame); - myCloseBtn = new QPushButton(tr("BUT_CLOSE"), aFrame); - - QSpacerItem* aSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum); - - QHBoxLayout* aLay = new QHBoxLayout(aFrame); - aLay->setMargin(5); - aLay->setSpacing(5); - - aLay->addWidget(myOkBtn); - aLay->addWidget(myApplyBtn); - aLay->addItem(aSpacer); - aLay->addWidget(myCloseBtn); - - connect(myOkBtn, SIGNAL(clicked()), SLOT(onOk())); - connect(myApplyBtn, SIGNAL(clicked()), SLOT(onApply())); - connect(myCloseBtn, SIGNAL(clicked()), SLOT(onClose())); - - return aFrame; } /*! - Destructor + Create axis widget */ -SVTK_CubeAxesDlg::~SVTK_CubeAxesDlg() +ViewerTools_AxisWidgetBase* SVTK_CubeAxesDlg::createAxisWidget( QWidget* theParent ) { + SVTK_AxisWidget* anAxisWidget = new SVTK_AxisWidget( theParent ); + anAxisWidget->initialize(); + return anAxisWidget; } /*! @@ -465,29 +255,23 @@ SVTK_CubeAxesDlg::~SVTK_CubeAxesDlg() */ void SVTK_CubeAxesDlg::Update() { + ViewerTools_CubeAxesDlgBase::Update(); + myActor = myMainWindow->GetCubeAxes(); - myAxes[ 0 ]->ReadData(myActor->GetXAxisActor2D()); - myAxes[ 1 ]->ReadData(myActor->GetYAxisActor2D()); - myAxes[ 2 ]->ReadData(myActor->GetZAxisActor2D()); + ((SVTK_AxisWidget*)myAxes[ 0 ])->ReadData(myActor->GetXAxisActor2D()); + ((SVTK_AxisWidget*)myAxes[ 1 ])->ReadData(myActor->GetYAxisActor2D()); + ((SVTK_AxisWidget*)myAxes[ 2 ])->ReadData(myActor->GetZAxisActor2D()); myIsVisible->setChecked(myActor->GetVisibility() ? true : false); } -/*! - Verify validity of entry data -*/ -bool SVTK_CubeAxesDlg::isValid() const -{ - return true; -} - /*! Verify validity of entry data */ bool SVTK_CubeAxesDlg::onApply() { - bool isOk = true; + bool isOk = ViewerTools_CubeAxesDlgBase::onApply(); try { @@ -495,16 +279,15 @@ bool SVTK_CubeAxesDlg::onApply() aCurrWid->clearFocus(); aCurrWid->setFocus(); - isOk = isOk && myAxes[ 0 ]->Apply(myActor->GetXAxisActor2D()); - isOk = isOk && myAxes[ 1 ]->Apply(myActor->GetYAxisActor2D()); - isOk = isOk && myAxes[ 2 ]->Apply(myActor->GetZAxisActor2D()); - + isOk = isOk && ((SVTK_AxisWidget*)myAxes[ 0 ])->Apply(myActor->GetXAxisActor2D()); + isOk = isOk && ((SVTK_AxisWidget*)myAxes[ 1 ])->Apply(myActor->GetYAxisActor2D()); + isOk = isOk && ((SVTK_AxisWidget*)myAxes[ 2 ])->Apply(myActor->GetZAxisActor2D()); - //myActor->SetXLabel(myAxes[ 0 ]->myAxisName->text()); - //myActor->SetYLabel(myAxes[ 1 ]->myAxisName->text()); - //myActor->SetZLabel(myAxes[ 2 ]->myAxisName->text()); + //myActor->SetXLabel(myAxes[ 0 ]->myAxisName->text()); // to remove? + //myActor->SetYLabel(myAxes[ 1 ]->myAxisName->text()); // to remove? + //myActor->SetZLabel(myAxes[ 2 ]->myAxisName->text()); // to remove? - //myActor->SetNumberOfLabels(myActor->GetXAxisActor2D()->GetNumberOfLabels()); + //myActor->SetNumberOfLabels(myActor->GetXAxisActor2D()->GetNumberOfLabels()); // to remove? if (myIsVisible->isChecked()) myActor->VisibilityOn(); else @@ -520,20 +303,3 @@ bool SVTK_CubeAxesDlg::onApply() return isOk; } - -/*! - SLOT called when "Ok" button pressed. -*/ -void SVTK_CubeAxesDlg::onOk() -{ - if (onApply()) - onClose(); -} - -/*! - SLOT: called when "Close" button pressed. Close dialog -*/ -void SVTK_CubeAxesDlg::onClose() -{ - reject(); -} diff --git a/src/SVTK/SVTK_CubeAxesDlg.h b/src/SVTK/SVTK_CubeAxesDlg.h index 6d615b8c6..57efc3b02 100644 --- a/src/SVTK/SVTK_CubeAxesDlg.h +++ b/src/SVTK/SVTK_CubeAxesDlg.h @@ -27,59 +27,58 @@ #ifndef SVTK_CubeAxesDlg_H #define SVTK_CubeAxesDlg_H -#include "SVTK_DialogBase.h" +#include "SVTK.h" -class QWidget; -class QPushButton; -class QTabWidget; -class QCheckBox; +#include -class QtxAction; +class SVTK_ViewWindow; class SVTK_CubeAxesActor2D; -class SVTK_FontWidget; -class SVTK_AxisWidget; -class SVTK_ViewWindow; +class vtkAxisActor2D; + +/*! + * Class : SVTK_AxisWidget + * Description : Axis tab widget of the "Graduated axis" dialog box +*/ +class SVTK_EXPORT SVTK_AxisWidget : public ViewerTools_AxisWidgetBase +{ +public: + SVTK_AxisWidget( QWidget* ); + ~SVTK_AxisWidget(); + +public: + bool ReadData( vtkAxisActor2D* ); + bool Apply( vtkAxisActor2D* ); + +protected: + virtual ViewerTools_FontWidgetBase* createFontWidget( QWidget* ); +}; /*! * Class : SVTK_CubeAxesDlg * Description : Dialog for specifynig cube axes properties */ -class SVTK_CubeAxesDlg : public SVTK_DialogBase +class SVTK_EXPORT SVTK_CubeAxesDlg : public ViewerTools_CubeAxesDlgBase { Q_OBJECT - class AxisWidget; - public: SVTK_CubeAxesDlg(QtxAction* theAction, SVTK_ViewWindow* theParent, const char* theName); virtual ~SVTK_CubeAxesDlg(); - void Update(); + virtual void Update(); private slots: - void onOk(); - bool onApply(); - void onClose(); + virtual bool onApply(); private: - QWidget* createButtonFrame( QWidget* ); - QWidget* createMainFrame ( QWidget* ); - bool isValid() const; + virtual ViewerTools_AxisWidgetBase* createAxisWidget( QWidget* ); private: - SVTK_ViewWindow *myMainWindow; + SVTK_ViewWindow* myMainWindow; SVTK_CubeAxesActor2D* myActor; - - QTabWidget* myTabWg; - QCheckBox* myIsVisible; - - QPushButton* myOkBtn; - QPushButton* myApplyBtn; - QPushButton* myCloseBtn; - AxisWidget* myAxes[ 3 ]; }; #endif diff --git a/src/SVTK/SVTK_FontWidget.cxx b/src/SVTK/SVTK_FontWidget.cxx index b8e3b28a8..fdbb838ba 100644 --- a/src/SVTK/SVTK_FontWidget.cxx +++ b/src/SVTK/SVTK_FontWidget.cxx @@ -27,11 +27,7 @@ // #include "SVTK_FontWidget.h" -#include #include -#include -#include -#include #include @@ -44,30 +40,8 @@ Constructor */ SVTK_FontWidget::SVTK_FontWidget( QWidget* theParent ) -: QWidget( theParent ) +: ViewerTools_FontWidgetBase( theParent ) { - myColorBtn = new QToolButton( this ); - myColorBtn->setMinimumWidth( 20 ); - - myFamily = new QComboBox( this ); - myFamily->insertItem( myFamily->count(), tr( "ARIAL" ) ); - myFamily->insertItem( myFamily->count(), tr( "COURIER" ) ); - myFamily->insertItem( myFamily->count(), tr( "TIMES" ) ); - - myBold = new QCheckBox( tr( "BOLD" ), this ); - myItalic = new QCheckBox( tr( "ITALIC" ), this ); - myShadow = new QCheckBox( tr( "SHADOW" ), this ); - - QHBoxLayout* aHBLayout = new QHBoxLayout; - aHBLayout->setSpacing( 5 ); - aHBLayout->addWidget(myColorBtn); - aHBLayout->addWidget(myFamily); - aHBLayout->addWidget(myBold); - aHBLayout->addWidget(myItalic); - aHBLayout->addWidget(myShadow); - this->setLayout(aHBLayout); - - connect( myColorBtn, SIGNAL( clicked() ), SLOT( onColor() ) ); } /*! @@ -77,32 +51,24 @@ SVTK_FontWidget::~SVTK_FontWidget() { } -void SVTK_FontWidget::SetColor( const QColor& theColor ) -{ - QPalette palette; - palette.setColor(myColorBtn->backgroundRole(), theColor); - myColorBtn->setPalette(palette); -} - -QColor SVTK_FontWidget::GetColor() const +void SVTK_FontWidget::InitializeFamilies() { - return myColorBtn->palette().color( myColorBtn->backgroundRole() ); -} - -void SVTK_FontWidget::onColor() -{ - QColor aColor = QColorDialog::getColor( GetColor(), this ); - if ( aColor.isValid() ) - SetColor( aColor ); + myFamily->insertItem( myFamily->count(), tr( "ARIAL" ) ); + myFamily->insertItem( myFamily->count(), tr( "COURIER" ) ); + myFamily->insertItem( myFamily->count(), tr( "TIMES" ) ); } void SVTK_FontWidget::SetData( const QColor& theColor, - const int theFamily, - const bool theBold, - const bool theItalic, - const bool theShadow ) + const int theFamily, + const bool theBold, + const bool theItalic, + const bool theShadow ) { - SetColor( theColor ); + ViewerTools_FontWidgetBase::SetData( theColor, + theFamily, + theBold, + theItalic, + theShadow ); if ( theFamily == VTK_ARIAL ) myFamily->setCurrentIndex( 0 ); @@ -110,10 +76,6 @@ void SVTK_FontWidget::SetData( const QColor& theColor, myFamily->setCurrentIndex( 1 ); else myFamily->setCurrentIndex( 2 ); - - myBold->setChecked( theBold ); - myItalic->setChecked( theItalic ); - myShadow->setChecked( theShadow ); } void SVTK_FontWidget::GetData( QColor& theColor, @@ -122,17 +84,17 @@ void SVTK_FontWidget::GetData( QColor& theColor, bool& theItalic, bool& theShadow ) const { - theColor = GetColor(); + ViewerTools_FontWidgetBase::GetData( theColor, + theFamily, + theBold, + theItalic, + theShadow ); - int anItem =myFamily->currentIndex(); + int anItem = myFamily->currentIndex(); if ( anItem == 0 ) theFamily = VTK_ARIAL; else if ( anItem == 1 ) theFamily = VTK_COURIER; else theFamily = VTK_TIMES; - - theBold = myBold->isChecked(); - theItalic = myItalic->isChecked(); - theShadow = myShadow->isChecked(); } diff --git a/src/SVTK/SVTK_FontWidget.h b/src/SVTK/SVTK_FontWidget.h index 6150dfe5f..dde1e4be7 100644 --- a/src/SVTK/SVTK_FontWidget.h +++ b/src/SVTK/SVTK_FontWidget.h @@ -29,19 +29,13 @@ #include "SVTK.h" -#include - -class QToolButton; -class QComboBox; -class QCheckBox; -class QColor; - +#include /*! * Class : SVTK_FontWidget * Description : Dialog for specifynig font */ -class SVTK_EXPORT SVTK_FontWidget : public QWidget +class SVTK_EXPORT SVTK_FontWidget : public ViewerTools_FontWidgetBase { Q_OBJECT @@ -49,22 +43,12 @@ public: SVTK_FontWidget( QWidget* ); virtual ~SVTK_FontWidget(); - void SetColor( const QColor& ); - QColor GetColor() const; - - void SetData( const QColor&, const int, const bool, const bool, const bool ); - - void GetData( QColor&, int&, bool&, bool&, bool& ) const; + virtual void SetData( const QColor&, const int, const bool, const bool, const bool ); -private slots: - void onColor(); + virtual void GetData( QColor&, int&, bool&, bool&, bool& ) const; -private: - QToolButton* myColorBtn; - QComboBox* myFamily; - QCheckBox* myBold; - QCheckBox* myItalic; - QCheckBox* myShadow; +protected: + virtual void InitializeFamilies(); }; #endif diff --git a/src/SVTK/SVTK_NonIsometricDlg.cxx b/src/SVTK/SVTK_NonIsometricDlg.cxx index a1c5c6da0..ac35cdc10 100644 --- a/src/SVTK/SVTK_NonIsometricDlg.cxx +++ b/src/SVTK/SVTK_NonIsometricDlg.cxx @@ -47,9 +47,9 @@ SVTK_NonIsometricDlg ::SVTK_NonIsometricDlg(QtxAction* theAction, SVTK_ViewWindow* theParent, const char* theName): - SVTK_DialogBase(theAction, - theParent, - theName), + ViewerTools_DialogBase(theAction, + theParent, + theName), m_MainWindow(theParent) { setWindowTitle(tr("DLG_TITLE")); diff --git a/src/SVTK/SVTK_NonIsometricDlg.h b/src/SVTK/SVTK_NonIsometricDlg.h index 1e2573d1d..dced659d9 100644 --- a/src/SVTK/SVTK_NonIsometricDlg.h +++ b/src/SVTK/SVTK_NonIsometricDlg.h @@ -29,7 +29,7 @@ #ifndef SVTK_NONISOMETRICDLG_H #define SVTK_NONISOMETRICDLG_H -#include "SVTK_DialogBase.h" +#include class SVTK_ViewWindow; @@ -39,7 +39,7 @@ class QtxAction; class QPushButton; -class SVTK_NonIsometricDlg : public SVTK_DialogBase +class SVTK_NonIsometricDlg : public ViewerTools_DialogBase { Q_OBJECT; diff --git a/src/SVTK/SVTK_SetRotationPointDlg.cxx b/src/SVTK/SVTK_SetRotationPointDlg.cxx index 28ac37ec7..eec869920 100755 --- a/src/SVTK/SVTK_SetRotationPointDlg.cxx +++ b/src/SVTK/SVTK_SetRotationPointDlg.cxx @@ -55,9 +55,9 @@ SVTK_SetRotationPointDlg ::SVTK_SetRotationPointDlg(QtxAction* theAction, SVTK_ViewWindow* theParent, const char* theName): - SVTK_DialogBase(theAction, - theParent, - theName), + ViewerTools_DialogBase(theAction, + theParent, + theName), myMainWindow(theParent), myPriority(0.0), myEventCallbackCommand(vtkCallbackCommand::New()), diff --git a/src/SVTK/SVTK_SetRotationPointDlg.h b/src/SVTK/SVTK_SetRotationPointDlg.h index e87335e3f..ed807b66c 100755 --- a/src/SVTK/SVTK_SetRotationPointDlg.h +++ b/src/SVTK/SVTK_SetRotationPointDlg.h @@ -31,7 +31,7 @@ #include "SVTK.h" -#include "SVTK_DialogBase.h" +#include #include @@ -48,7 +48,7 @@ class QCheckBox; class vtkCallbackCommand; class vtkObject; -class SVTK_EXPORT SVTK_SetRotationPointDlg : public SVTK_DialogBase +class SVTK_EXPORT SVTK_SetRotationPointDlg : public ViewerTools_DialogBase { Q_OBJECT; diff --git a/src/SVTK/SVTK_UpdateRateDlg.cxx b/src/SVTK/SVTK_UpdateRateDlg.cxx index 373471ffe..d73408be7 100644 --- a/src/SVTK/SVTK_UpdateRateDlg.cxx +++ b/src/SVTK/SVTK_UpdateRateDlg.cxx @@ -169,9 +169,9 @@ SVTK_UpdateRateDlg ::SVTK_UpdateRateDlg(QtxAction* theAction, SVTK_ViewWindow* theParent, const char* theName): - SVTK_DialogBase(theAction, - theParent, - theName), + ViewerTools_DialogBase(theAction, + theParent, + theName), myPriority(0.0), myEventCallbackCommand(vtkCallbackCommand::New()), myRWInteractor(theParent->GetInteractor()), diff --git a/src/SVTK/SVTK_UpdateRateDlg.h b/src/SVTK/SVTK_UpdateRateDlg.h index 045c2d35a..61ec0a622 100644 --- a/src/SVTK/SVTK_UpdateRateDlg.h +++ b/src/SVTK/SVTK_UpdateRateDlg.h @@ -29,7 +29,7 @@ #ifndef SVTK_UPDATERATEDLG_H #define SVTK_UPDATERATEDLG_H -#include "SVTK_DialogBase.h" +#include #include @@ -46,7 +46,7 @@ class vtkCallbackCommand; class vtkObject; -class SVTK_UpdateRateDlg : public SVTK_DialogBase +class SVTK_UpdateRateDlg : public ViewerTools_DialogBase { Q_OBJECT; diff --git a/src/SVTK/SVTK_ViewParameterDlg.cxx b/src/SVTK/SVTK_ViewParameterDlg.cxx index 600250b4d..b4400f558 100755 --- a/src/SVTK/SVTK_ViewParameterDlg.cxx +++ b/src/SVTK/SVTK_ViewParameterDlg.cxx @@ -56,7 +56,7 @@ using namespace std; SVTK_ViewParameterDlg::SVTK_ViewParameterDlg(QtxAction* theAction, SVTK_ViewWindow* theParent, const char* theName): - SVTK_DialogBase(theAction, theParent, theName), + ViewerTools_DialogBase(theAction, theParent, theName), myMainWindow(theParent), myPriority(0.0), myEventCallbackCommand(vtkCallbackCommand::New()), diff --git a/src/SVTK/SVTK_ViewParameterDlg.h b/src/SVTK/SVTK_ViewParameterDlg.h index b98770063..acef99e54 100755 --- a/src/SVTK/SVTK_ViewParameterDlg.h +++ b/src/SVTK/SVTK_ViewParameterDlg.h @@ -28,7 +28,7 @@ #include "SVTK.h" -#include "SVTK_DialogBase.h" +#include #include #include @@ -47,7 +47,7 @@ class QButtonGroup; class vtkCallbackCommand; class vtkObject; -class SVTK_EXPORT SVTK_ViewParameterDlg : public SVTK_DialogBase +class SVTK_EXPORT SVTK_ViewParameterDlg : public ViewerTools_DialogBase { Q_OBJECT; diff --git a/src/SVTK/SVTK_ViewWindow.cxx b/src/SVTK/SVTK_ViewWindow.cxx index a8fa48f19..440bf08ce 100755 --- a/src/SVTK/SVTK_ViewWindow.cxx +++ b/src/SVTK/SVTK_ViewWindow.cxx @@ -165,6 +165,7 @@ void SVTK_ViewWindow::Initialize(SVTK_ViewModelBase* theModel) myUpdateRateDlg = new SVTK_UpdateRateDlg( getAction( UpdateRate ), this, "SVTK_UpdateRateDlg" ); myNonIsometricDlg = new SVTK_NonIsometricDlg( getAction( NonIsometric ), this, "SVTK_NonIsometricDlg" ); myCubeAxesDlg = new SVTK_CubeAxesDlg( getAction( GraduatedAxes ), this, "SVTK_CubeAxesDlg" ); + myCubeAxesDlg->initialize(); mySetRotationPointDlg = new SVTK_SetRotationPointDlg ( getAction( ChangeRotationPointId ), this, "SVTK_SetRotationPointDlg" ); myViewParameterDlg = new SVTK_ViewParameterDlg diff --git a/src/SVTK/resources/SVTK_msg_en.ts b/src/SVTK/resources/SVTK_msg_en.ts index 3663ce51e..8593ed6fa 100644 --- a/src/SVTK/resources/SVTK_msg_en.ts +++ b/src/SVTK/resources/SVTK_msg_en.ts @@ -188,67 +188,8 @@ Interaction Style Switch - - SVTK_CubeAxesDlg - - X_AXIS - X axis - - - Y_AXIS - Y axis - - - Z_AXIS - Z axis - - - CAPTION - Graduated axes - - - IS_VISIBLE - Is visible - - - FONT - Font - - - NAME - Name - - - TICK_MARKS - Tick marks - - - LABELS - Labels - - - LENGTH - Length - - - NUMBER - Number - - - OFFSET - Offset - - - AXIS_NAME - Axis name - - SVTK_FontWidget - - BOLD - Bold - ARIAL Arial @@ -257,14 +198,6 @@ TIMES Times - - ITALIC - Italic - - - SHADOW - Shadow - COURIER Courier diff --git a/src/SalomeApp/resources/SalomeApp.xml b/src/SalomeApp/resources/SalomeApp.xml index 542811fc7..0a037a064 100644 --- a/src/SalomeApp/resources/SalomeApp.xml +++ b/src/SalomeApp/resources/SalomeApp.xml @@ -69,6 +69,7 @@ + diff --git a/src/ViewerTools/Makefile.am b/src/ViewerTools/Makefile.am new file mode 100755 index 000000000..eefbd3a19 --- /dev/null +++ b/src/ViewerTools/Makefile.am @@ -0,0 +1,55 @@ +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES = libViewerTools.la + +salomeinclude_HEADERS= \ + ViewerTools.h \ + ViewerTools_CubeAxesDlgBase.h \ + ViewerTools_DialogBase.h \ + ViewerTools_FontWidgetBase.h + +dist_libViewerTools_la_SOURCES= \ + ViewerTools_CubeAxesDlgBase.cxx \ + ViewerTools_DialogBase.cxx \ + ViewerTools_FontWidgetBase.cxx + +MOC_FILES= \ + ViewerTools_CubeAxesDlgBase_moc.cxx \ + ViewerTools_DialogBase_moc.cxx \ + ViewerTools_FontWidgetBase_moc.cxx + +nodist_libViewerTools_la_SOURCES= $(MOC_FILES) + +nodist_salomeres_DATA = \ + ViewerTools_msg_en.qm + +libViewerTools_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + -I$(srcdir)/../Qtx + +libViewerTools_la_LDFLAGS = \ + $(QT_MT_LIBS) + +libViewerTools_la_LIBADD = ../Qtx/libqtx.la diff --git a/src/ViewerTools/ViewerTools.h b/src/ViewerTools/ViewerTools.h new file mode 100644 index 000000000..f79e2c23d --- /dev/null +++ b/src/ViewerTools/ViewerTools.h @@ -0,0 +1,41 @@ +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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 +// + +#ifndef VIEWERTOOLS_H +#define VIEWERTOOLS_H + +#ifdef WIN32 +# if defined VIEWERTOOLS_EXPORTS +# define VIEWERTOOLS_EXPORT __declspec(dllexport) +# else +# define VIEWERTOOLS_EXPORT __declspec(dllimport) +# endif +#else +# define VIEWERTOOLS_EXPORT +#endif + +#if defined WIN32 +#pragma warning ( disable: 4251 ) +#pragma warning ( disable: 4786 ) +#endif + +#endif diff --git a/src/ViewerTools/ViewerTools_CubeAxesDlgBase.cxx b/src/ViewerTools/ViewerTools_CubeAxesDlgBase.cxx new file mode 100644 index 000000000..f3f1e0e08 --- /dev/null +++ b/src/ViewerTools/ViewerTools_CubeAxesDlgBase.cxx @@ -0,0 +1,322 @@ +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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 "ViewerTools_CubeAxesDlgBase.h" + +#include "ViewerTools_FontWidgetBase.h" + +#include "QtxAction.h" +#include "QtxIntSpinBox.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +/*! + * Class : ViewerTools_AxisWidgetBase + * Description : Axis tab widget of the "Graduated axis" dialog box +*/ + +/*! + Constructor +*/ +ViewerTools_AxisWidgetBase::ViewerTools_AxisWidgetBase (QWidget* theParent) +: QFrame(theParent) +{ +} + +/*! + Destructor +*/ +ViewerTools_AxisWidgetBase::~ViewerTools_AxisWidgetBase() +{ +} + +/*! + Initialize controls +*/ +void ViewerTools_AxisWidgetBase::initialize() +{ + QList< QLabel* > aLabels; + + // "Name" grp + + myNameGrp = new QGroupBox(ViewerTools_CubeAxesDlgBase::tr("AXIS_NAME"), this); + myNameGrp->setCheckable( true ); + + QVBoxLayout* aVBox = new QVBoxLayout; + + QHBoxLayout* aHBox = new QHBoxLayout; + aHBox->setSpacing(5); + QLabel* aLabel = new QLabel(ViewerTools_CubeAxesDlgBase::tr("NAME")); + aHBox->addWidget(aLabel); + myAxisName = new QLineEdit; + aHBox->addWidget(myAxisName); + aLabels.append(aLabel); + aVBox->addLayout(aHBox); + + aHBox = new QHBoxLayout; + aHBox->setSpacing(5); + aLabel = new QLabel(ViewerTools_CubeAxesDlgBase::tr("FONT")); + aHBox->addWidget(aLabel); + myNameFont = createFontWidget(myNameGrp); + aHBox->addWidget(myNameFont); + aLabels.append(aLabel); + aVBox->addLayout(aHBox); + + myNameGrp->setLayout(aVBox); + + // "Labels" grp + + myLabelsGrp = new QGroupBox(ViewerTools_CubeAxesDlgBase::tr("LABELS"), this); + myLabelsGrp->setCheckable( true ); + + aVBox = new QVBoxLayout; + + aHBox = new QHBoxLayout; + aHBox->setSpacing(5); + aLabel = new QLabel(ViewerTools_CubeAxesDlgBase::tr("NUMBER")); + aHBox->addWidget(aLabel); + myLabelNumber = new QtxIntSpinBox(2,25,1,myLabelsGrp); + aHBox->addWidget(myLabelNumber); + aLabels.append(aLabel); + aVBox->addLayout(aHBox); + + aHBox = new QHBoxLayout; + aHBox->setSpacing(5); + aLabel = new QLabel(ViewerTools_CubeAxesDlgBase::tr("OFFSET")); + aHBox->addWidget(aLabel); + myLabelOffset = new QtxIntSpinBox(0,100,1,myLabelsGrp); + aHBox->addWidget(myLabelOffset); + aLabels.append(aLabel); + aVBox->addLayout(aHBox); + + aHBox = new QHBoxLayout; + aHBox->setSpacing(5); + aLabel = new QLabel(ViewerTools_CubeAxesDlgBase::tr("FONT")); + aHBox->addWidget(aLabel); + myLabelsFont = createFontWidget(myLabelsGrp); + aHBox->addWidget(myLabelsFont); + aLabels.append(aLabel); + aVBox->addLayout(aHBox); + + myLabelsGrp->setLayout(aVBox); + + // "Tick marks" grp + + myTicksGrp = new QGroupBox(ViewerTools_CubeAxesDlgBase::tr("TICK_MARKS"), this); + myTicksGrp->setCheckable( true ); + + aVBox = new QVBoxLayout; + + aHBox = new QHBoxLayout; + aHBox->setSpacing(5); + aLabel = new QLabel(ViewerTools_CubeAxesDlgBase::tr("LENGTH")); + aHBox->addWidget(aLabel); + myTickLength = new QtxIntSpinBox(0,100,1,myTicksGrp); + aHBox->addWidget(myTickLength); + aLabels.append(aLabel); + aVBox->addLayout(aHBox); + + myTicksGrp->setLayout(aVBox); + + // Layout + + QVBoxLayout* aLay = new QVBoxLayout(this); + aLay->setMargin(5); + aLay->setSpacing(5); + aLay->addWidget(myNameGrp); + aLay->addWidget(myLabelsGrp); + aLay->addWidget(myTicksGrp); + + // init + myNameGrp->setChecked( true ); + myLabelsGrp->setChecked( true ); + myTicksGrp->setChecked( true ); + + // Adjust label widths + QList< QLabel* >::iterator anIter; + int aMaxWidth = 0; + for (anIter = aLabels.begin(); anIter != aLabels.end(); anIter++) + aMaxWidth = qMax(aMaxWidth, (*anIter)->sizeHint().width()); + for (anIter = aLabels.begin(); anIter != aLabels.end(); anIter++) + (*anIter)->setFixedWidth(aMaxWidth); +} + +void ViewerTools_AxisWidgetBase::UseName(const bool toUse) +{ + myNameGrp->setChecked(toUse); +} + +void ViewerTools_AxisWidgetBase::SetName(const QString& theName) +{ + myAxisName->setText(theName); +} + +void ViewerTools_AxisWidgetBase::SetNameFont(const QColor& theColor, + const int theFont, + const bool theIsBold, + const bool theIsItalic, + const bool theIsShadow) +{ + myNameFont->SetData(theColor, theFont, theIsBold, theIsItalic, theIsShadow); +} + +/* + Class : ViewerTools_CubeAxesDlgBase + Description : Dialog for specifying cube axes properties +*/ + +/*! + Constructor +*/ +ViewerTools_CubeAxesDlgBase::ViewerTools_CubeAxesDlgBase(QtxAction* theAction, + QWidget* theParent, + const char* theName): + ViewerTools_DialogBase(theAction, + theParent, + theName) +{ + setWindowTitle(tr("CAPTION")); +} + +/*! + Initialize controls +*/ +void ViewerTools_CubeAxesDlgBase::initialize() +{ + QVBoxLayout* aLay = new QVBoxLayout(this); + aLay->setMargin(5); + aLay->setSpacing(5); + aLay->addWidget(createMainFrame(this)); + aLay->addWidget(createButtonFrame(this)); +} + +/*! + Create frame containing dialog's input fields +*/ +QWidget* ViewerTools_CubeAxesDlgBase::createMainFrame(QWidget* theParent) +{ + QFrame* aFrame = new QFrame(theParent); + + myTabWg = new QTabWidget(aFrame); + + myAxes[ 0 ] = createAxisWidget(myTabWg); + myAxes[ 1 ] = createAxisWidget(myTabWg); + myAxes[ 2 ] = createAxisWidget(myTabWg); + + myTabWg->addTab(myAxes[ 0 ], tr("X_AXIS")); + myTabWg->addTab(myAxes[ 1 ], tr("Y_AXIS")); + myTabWg->addTab(myAxes[ 2 ], tr("Z_AXIS")); + + myIsVisible = new QCheckBox(tr("IS_VISIBLE"), aFrame); + + QVBoxLayout* aLay = new QVBoxLayout(aFrame); + aLay->setMargin(0); + aLay->setSpacing(5); + aLay->addWidget(myTabWg); + aLay->addWidget(myIsVisible); + + return aFrame; +} + +/*! + Create frame containing buttons +*/ +QWidget* ViewerTools_CubeAxesDlgBase::createButtonFrame(QWidget* theParent) +{ + QFrame* aFrame = new QFrame(theParent); + aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken); + + myOkBtn = new QPushButton(tr("BUT_OK"), aFrame); + myApplyBtn = new QPushButton(tr("BUT_APPLY"), aFrame); + myCloseBtn = new QPushButton(tr("BUT_CLOSE"), aFrame); + + QSpacerItem* aSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum); + + QHBoxLayout* aLay = new QHBoxLayout(aFrame); + aLay->setMargin(5); + aLay->setSpacing(5); + + aLay->addWidget(myOkBtn); + aLay->addWidget(myApplyBtn); + aLay->addItem(aSpacer); + aLay->addWidget(myCloseBtn); + + connect(myOkBtn, SIGNAL(clicked()), SLOT(onOk())); + connect(myApplyBtn, SIGNAL(clicked()), SLOT(onApply())); + connect(myCloseBtn, SIGNAL(clicked()), SLOT(onClose())); + + return aFrame; +} + +/*! + Destructor +*/ +ViewerTools_CubeAxesDlgBase::~ViewerTools_CubeAxesDlgBase() +{ +} + +/*! + Update dialog fields, connect signals and slots, show dialog +*/ +void ViewerTools_CubeAxesDlgBase::Update() +{ +} + +/*! + Verify validity of entry data +*/ +bool ViewerTools_CubeAxesDlgBase::isValid() const +{ + return true; +} + +/*! + Verify validity of entry data +*/ +bool ViewerTools_CubeAxesDlgBase::onApply() +{ + return true; +} + +/*! + SLOT called when "Ok" button pressed. +*/ +void ViewerTools_CubeAxesDlgBase::onOk() +{ + if (onApply()) + onClose(); +} + +/*! + SLOT: called when "Close" button pressed. Close dialog +*/ +void ViewerTools_CubeAxesDlgBase::onClose() +{ + reject(); +} diff --git a/src/ViewerTools/ViewerTools_CubeAxesDlgBase.h b/src/ViewerTools/ViewerTools_CubeAxesDlgBase.h new file mode 100644 index 000000000..d7e7b8539 --- /dev/null +++ b/src/ViewerTools/ViewerTools_CubeAxesDlgBase.h @@ -0,0 +1,119 @@ +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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 +// + +#ifndef VIEWERTOOLS_CUBEAXESDLGBASE_H +#define VIEWERTOOLS_CUBEAXESDLGBASE_H + +#include "ViewerTools_DialogBase.h" + +#include + +class QWidget; +class QPushButton; +class QTabWidget; +class QCheckBox; +class QGroupBox; +class QLineEdit; + +class QtxAction; +class QtxIntSpinBox; + +class ViewerTools_FontWidgetBase; + +/*! + * Class : ViewerTools_AxisWidgetBase + * Description : Axis tab widget of the "Graduated axis" dialog box +*/ +class VIEWERTOOLS_EXPORT ViewerTools_AxisWidgetBase : public QFrame +{ +public: + ViewerTools_AxisWidgetBase( QWidget* ); + ~ViewerTools_AxisWidgetBase(); + + void UseName( const bool ); + void SetName( const QString& ); + void SetNameFont( const QColor&, const int, const bool, const bool, const bool ); + +public: + virtual void initialize(); + +protected: + virtual ViewerTools_FontWidgetBase* createFontWidget( QWidget* ) = 0; + +protected: + // name + QGroupBox* myNameGrp; + QLineEdit* myAxisName; + ViewerTools_FontWidgetBase* myNameFont; + + // labels + QGroupBox* myLabelsGrp; + QtxIntSpinBox* myLabelNumber; + QtxIntSpinBox* myLabelOffset; + ViewerTools_FontWidgetBase* myLabelsFont; + + // tick marks + QGroupBox* myTicksGrp; + QtxIntSpinBox* myTickLength; +}; + +/*! + * Class : ViewerTools_CubeAxesDlgBase + * Description : Dialog for specifying cube axes properties + */ +class VIEWERTOOLS_EXPORT ViewerTools_CubeAxesDlgBase : public ViewerTools_DialogBase +{ + Q_OBJECT + +public: + ViewerTools_CubeAxesDlgBase(QtxAction* theAction, + QWidget* theParent, + const char* theName); + virtual ~ViewerTools_CubeAxesDlgBase(); + + virtual void initialize(); + + virtual void Update(); + +protected slots: + virtual void onOk(); + virtual bool onApply(); + virtual void onClose(); + +protected: + virtual QWidget* createButtonFrame( QWidget* ); + virtual QWidget* createMainFrame ( QWidget* ); + virtual bool isValid() const; + + virtual ViewerTools_AxisWidgetBase* createAxisWidget( QWidget* ) = 0; + +protected: + QTabWidget* myTabWg; + QCheckBox* myIsVisible; + + QPushButton* myOkBtn; + QPushButton* myApplyBtn; + QPushButton* myCloseBtn; + ViewerTools_AxisWidgetBase* myAxes[ 3 ]; +}; + +#endif diff --git a/src/ViewerTools/ViewerTools_DialogBase.cxx b/src/ViewerTools/ViewerTools_DialogBase.cxx new file mode 100644 index 000000000..2fc0e407b --- /dev/null +++ b/src/ViewerTools/ViewerTools_DialogBase.cxx @@ -0,0 +1,79 @@ +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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 "ViewerTools_DialogBase.h" + +#include "QtxAction.h" + +/*! + Constructor +*/ +ViewerTools_DialogBase +::ViewerTools_DialogBase(QtxAction* theAction, + QWidget* theParent, + const char* theName, + bool theModal, + Qt::WindowFlags theWFalgs): + QDialog(theParent, + theWFalgs | Qt::WindowTitleHint | Qt::WindowSystemMenuHint), + myAction(theAction) +{ + setObjectName(theName); + setModal(theModal); + + connect(theParent, SIGNAL(Show( QShowEvent * )), this, SLOT(onParentShow())); + connect(theParent, SIGNAL(Hide( QHideEvent * )), this, SLOT(onParentHide())); +} + +/* + * Destroys the object and frees any allocated resources + */ +ViewerTools_DialogBase +::~ViewerTools_DialogBase() +{ + // no need to delete child widgets, Qt does it all for us +} + +void +ViewerTools_DialogBase +::onParentShow() +{ + if(myAction->isChecked()) + show(); + else + hide(); +} + +void +ViewerTools_DialogBase +::onParentHide() +{ + hide(); +} + +void +ViewerTools_DialogBase +::done( int r ) +{ + myAction->setChecked( false ); + QDialog::done( r ); +} diff --git a/src/ViewerTools/ViewerTools_DialogBase.h b/src/ViewerTools/ViewerTools_DialogBase.h new file mode 100644 index 000000000..e9fcd56c3 --- /dev/null +++ b/src/ViewerTools/ViewerTools_DialogBase.h @@ -0,0 +1,54 @@ +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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 +// + +#ifndef VIEWERTOOLS_DIALOGBASE_H +#define VIEWERTOOLS_DIALOGBASE_H + +#include "ViewerTools.h" + +#include + +class QtxAction; + +class VIEWERTOOLS_EXPORT ViewerTools_DialogBase : public QDialog +{ + Q_OBJECT; + +public: + ViewerTools_DialogBase(QtxAction* theAction, + QWidget* theParent, + const char* theName = "", + bool theModal = FALSE, + Qt::WindowFlags theWFalgs = 0); + + ~ViewerTools_DialogBase(); + +protected slots: + void onParentShow(); + void onParentHide(); + virtual void done( int ); + +protected: + QtxAction* myAction; +}; + +#endif // VIEWERTOOLS_DIALOGBASE_H diff --git a/src/ViewerTools/ViewerTools_FontWidgetBase.cxx b/src/ViewerTools/ViewerTools_FontWidgetBase.cxx new file mode 100644 index 000000000..2558546f2 --- /dev/null +++ b/src/ViewerTools/ViewerTools_FontWidgetBase.cxx @@ -0,0 +1,128 @@ +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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 "ViewerTools_FontWidgetBase.h" + +#include +#include +#include +#include +#include + +/*! + * Class : ViewerTools_FontWidgetBase + * Description : Dialog for specifynig font + */ + +/*! + Constructor +*/ +ViewerTools_FontWidgetBase::ViewerTools_FontWidgetBase( QWidget* theParent ) +: QWidget( theParent ) +{ +} + +/*! + Destructor +*/ +ViewerTools_FontWidgetBase::~ViewerTools_FontWidgetBase() +{ +} + +void ViewerTools_FontWidgetBase::Initialize() +{ + myColorBtn = new QToolButton( this ); + myColorBtn->setMinimumWidth( 20 ); + + myFamily = new QComboBox( this ); + InitializeFamilies(); + + myBold = new QCheckBox( tr( "BOLD" ), this ); + myItalic = new QCheckBox( tr( "ITALIC" ), this ); + myShadow = new QCheckBox( tr( "SHADOW" ), this ); + + QHBoxLayout* aHBLayout = new QHBoxLayout; + aHBLayout->setMargin( 0 ); + aHBLayout->setSpacing( 5 ); + aHBLayout->addWidget(myColorBtn); + aHBLayout->addWidget(myFamily); + aHBLayout->addWidget(myBold); + aHBLayout->addWidget(myItalic); + aHBLayout->addWidget(myShadow); + aHBLayout->addStretch(); + this->setLayout(aHBLayout); + + connect( myColorBtn, SIGNAL( clicked() ), SLOT( onColor() ) ); + + if( myFamily->count() == 0 ) + { + myFamily->hide(); + myBold->hide(); + myItalic->hide(); + myShadow->hide(); + } +} + +void ViewerTools_FontWidgetBase::SetColor( const QColor& theColor ) +{ + QPalette palette; + palette.setColor(myColorBtn->backgroundRole(), theColor); + myColorBtn->setPalette(palette); +} + +QColor ViewerTools_FontWidgetBase::GetColor() const +{ + return myColorBtn->palette().color( myColorBtn->backgroundRole() ); +} + +void ViewerTools_FontWidgetBase::onColor() +{ + QColor aColor = QColorDialog::getColor( GetColor(), this ); + if ( aColor.isValid() ) + SetColor( aColor ); +} + +void ViewerTools_FontWidgetBase::SetData( const QColor& theColor, + const int theFamily, + const bool theBold, + const bool theItalic, + const bool theShadow ) +{ + SetColor( theColor ); + + myBold->setChecked( theBold ); + myItalic->setChecked( theItalic ); + myShadow->setChecked( theShadow ); +} + +void ViewerTools_FontWidgetBase::GetData( QColor& theColor, + int& theFamily, + bool& theBold, + bool& theItalic, + bool& theShadow ) const +{ + theColor = GetColor(); + + theBold = myBold->isChecked(); + theItalic = myItalic->isChecked(); + theShadow = myShadow->isChecked(); +} diff --git a/src/ViewerTools/ViewerTools_FontWidgetBase.h b/src/ViewerTools/ViewerTools_FontWidgetBase.h new file mode 100644 index 000000000..9ade57abc --- /dev/null +++ b/src/ViewerTools/ViewerTools_FontWidgetBase.h @@ -0,0 +1,71 @@ +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 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 +// + +#ifndef VIEWERTOOLS_FONTWIDGETBASE_H +#define VIEWERTOOLS_FONTWIDGETBASE_H + +#include "ViewerTools.h" + +#include + +class QToolButton; +class QComboBox; +class QCheckBox; +class QColor; + +/*! + * Class : ViewerTools_FontWidgetBase + * Description : Dialog for specifying font + */ +class VIEWERTOOLS_EXPORT ViewerTools_FontWidgetBase : public QWidget +{ + Q_OBJECT + +public: + ViewerTools_FontWidgetBase( QWidget* ); + virtual ~ViewerTools_FontWidgetBase(); + + void SetColor( const QColor& ); + QColor GetColor() const; + + virtual void SetData( const QColor&, const int, const bool, const bool, const bool ); + + virtual void GetData( QColor&, int&, bool&, bool&, bool& ) const; + +public: + virtual void Initialize(); + +protected: + virtual void InitializeFamilies() = 0; + +protected slots: + void onColor(); + +protected: + QToolButton* myColorBtn; + QComboBox* myFamily; + QCheckBox* myBold; + QCheckBox* myItalic; + QCheckBox* myShadow; +}; + +#endif diff --git a/src/ViewerTools/resources/ViewerTools_msg_en.ts b/src/ViewerTools/resources/ViewerTools_msg_en.ts new file mode 100644 index 000000000..fe8c8598d --- /dev/null +++ b/src/ViewerTools/resources/ViewerTools_msg_en.ts @@ -0,0 +1,95 @@ + + + + ViewerTools_CubeAxesDlgBase + + X_AXIS + X axis + + + Y_AXIS + Y axis + + + Z_AXIS + Z axis + + + CAPTION + Graduated axes + + + IS_VISIBLE + Is visible + + + FONT + Font + + + NAME + Name + + + TICK_MARKS + Tick marks + + + LABELS + Labels + + + LENGTH + Length + + + NUMBER + Number + + + OFFSET + Offset + + + AXIS_NAME + Axis name + + + + ViewerTools_FontWidgetBase + + BOLD + Bold + + + ITALIC + Italic + + + SHADOW + Shadow + + + -- 2.39.2