From 9695e03009d7539b78d1018bcea42e1d06ba2fee Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 15 Jul 2011 11:20:16 +0000 Subject: [PATCH] Merge from V6_3_BR 15/07/2011 --- configure.ac | 3 ++- doc/salome/gui/VISU/doxyfile_idl.in | 4 ++-- doc/salome/gui/VISU/static/header_py.html.in | 23 ++++++++++++++++++++ src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx | 3 ++- src/VISUGUI/VisuGUI_SizeBox.cxx | 15 +++++-------- src/VISU_I/VISU_CorbaMedConvertor.cxx | 9 ++++++++ 6 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 doc/salome/gui/VISU/static/header_py.html.in diff --git a/configure.ac b/configure.ac index e1fb0ab8..8808187e 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Modified by : Marc Tajchman (CEA) # Modified by : Mikhail Ponikarov (OCN) # -AC_INIT([Salome2 Project VISU module], [6.3.0], [webmaster.salome@opencascade.com], [SalomeVISU]) +AC_INIT([Salome2 Project VISU module], [6.3.1], [webmaster.salome@opencascade.com], [SalomeVISU]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -395,6 +395,7 @@ AC_OUTPUT([ \ doc/salome/gui/VISU/doxyfile \ doc/salome/gui/VISU/doxyfile_idl \ doc/salome/gui/VISU/static/header.html \ + doc/salome/gui/VISU/static/header_py.html \ doc/salome/tui/Makefile \ doc/salome/tui/doxyfile \ doc/salome/tui/static/header.html \ diff --git a/doc/salome/gui/VISU/doxyfile_idl.in b/doc/salome/gui/VISU/doxyfile_idl.in index 9f7a5375..4f8b50ba 100755 --- a/doc/salome/gui/VISU/doxyfile_idl.in +++ b/doc/salome/gui/VISU/doxyfile_idl.in @@ -109,7 +109,7 @@ RECURSIVE = NO #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = visugen_doc -HTML_HEADER = @builddir@/static/header.html +HTML_HEADER = @builddir@/static/header_py.html HTML_FOOTER = @srcdir@/static/footer.html HTML_STYLESHEET = @srcdir@/static/doxygen.css TOC_EXPAND = YES @@ -157,4 +157,4 @@ DOT_CLEANUP = YES #External reference options #--------------------------------------------------------------------------- GENERATE_TAGFILE = visugen_doc.tag -SEARCHENGINE = YES \ No newline at end of file +SEARCHENGINE = YES diff --git a/doc/salome/gui/VISU/static/header_py.html.in b/doc/salome/gui/VISU/static/header_py.html.in new file mode 100644 index 00000000..36e6a0c3 --- /dev/null +++ b/doc/salome/gui/VISU/static/header_py.html.in @@ -0,0 +1,23 @@ + + + + +$title + + + + + + + + + + + +
+
Version: @VERSION@
+
Home
+ +
diff --git a/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx b/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx index 741fa360..ff01bda3 100644 --- a/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx +++ b/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx @@ -230,7 +230,8 @@ void VisuGUI_SelectionPrefDlg::update() ( int )( aColor[2] * 255.0 ) ) ); myInfoWindowGroup->setChecked( aPickingSettings->GetInfoWindowEnabled() ); - vtkFloatingPointType transparency = aPickingSettings->GetInfoWindowTransparency() * 100.0; + // VSR 28.06.2011 : IPAL 22513: add 0.5 to eliminate any prevision problems + vtkFloatingPointType transparency = aPickingSettings->GetInfoWindowTransparency() * 100.0 + 0.5; myTransparencySpinBox->setValue( (int) transparency ); myPositionComboBox->setCurrentIndex( aPickingSettings->GetInfoWindowPosition() ); myCameraGroup->setChecked( aPickingSettings->GetCameraMovementEnabled() ); diff --git a/src/VISUGUI/VisuGUI_SizeBox.cxx b/src/VISUGUI/VisuGUI_SizeBox.cxx index eb01fe98..7343a5c7 100644 --- a/src/VISUGUI/VisuGUI_SizeBox.cxx +++ b/src/VISUGUI/VisuGUI_SizeBox.cxx @@ -276,8 +276,7 @@ float VisuGUI_SizeBox::getOutsideSize() const void VisuGUI_SizeBox::setOutsideSize( float theOutsideSize ) { - theOutsideSize*=100.; - myOutsideSizeSpinBox->setValue( ( int ) theOutsideSize ); + myOutsideSizeSpinBox->setValue( ( int ) ( theOutsideSize * 100. + 0.5 ) ); } float VisuGUI_SizeBox::getGeomSize() const @@ -287,8 +286,7 @@ float VisuGUI_SizeBox::getGeomSize() const void VisuGUI_SizeBox::setGeomSize( float theGeomSize ) { - theGeomSize*=100.; - myGeomSizeSpinBox->setValue( ( int ) theGeomSize ); + myGeomSizeSpinBox->setValue( ( int ) ( theGeomSize * 100. + 0.5 ) ); } float VisuGUI_SizeBox::getMinSize() const @@ -298,8 +296,7 @@ float VisuGUI_SizeBox::getMinSize() const void VisuGUI_SizeBox::setMinSize( float theMinSize ) { - theMinSize*=100.; - myMinSizeSpinBox->setValue( ( int ) theMinSize ); + myMinSizeSpinBox->setValue( ( int ) ( theMinSize * 100. + 0.5 ) ); } float VisuGUI_SizeBox::getMaxSize() const @@ -309,8 +306,7 @@ float VisuGUI_SizeBox::getMaxSize() const void VisuGUI_SizeBox::setMaxSize( float theMaxSize ) { - theMaxSize*=100.; - myMaxSizeSpinBox->setValue( (int) theMaxSize ); + myMaxSizeSpinBox->setValue( (int) ( theMaxSize * 100. + 0.5 ) ); } float VisuGUI_SizeBox::getMagnification() const @@ -320,8 +316,7 @@ float VisuGUI_SizeBox::getMagnification() const void VisuGUI_SizeBox::setMagnification( float theMagnification ) { - theMagnification*=100.; - myMagnificationSpinBox->setValue( (int) theMagnification ); + myMagnificationSpinBox->setValue( (int) ( theMagnification * 100. + 0.5 ) ); } float VisuGUI_SizeBox::getIncrement() const diff --git a/src/VISU_I/VISU_CorbaMedConvertor.cxx b/src/VISU_I/VISU_CorbaMedConvertor.cxx index 31424078..f888ebb3 100644 --- a/src/VISU_I/VISU_CorbaMedConvertor.cxx +++ b/src/VISU_I/VISU_CorbaMedConvertor.cxx @@ -1431,6 +1431,15 @@ namespace long int aSize; int* aValuePtr = ReceiverFactory::getValue(aSender, aSize); myConnIndex.assign(aValuePtr, aValuePtr + aSize); + + // since the connectivity indices for polygones are stored together with other elements + // we should cut the indices by a value of the first one + if( aSize > 0 ) + { + int anOffset = myConnIndex.front() - 1; + for( int anIndex = 0; anIndex < aSize; anIndex++ ) + myConnIndex[ anIndex ] -= anOffset; + } } } -- 2.30.2