From 6ef3d1a3dea6c41ee5adede4f6a05d7dc3fc0faa Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 10 Jun 2010 06:47:39 +0000 Subject: [PATCH] Merge from V5_1_4_BR (5_1_4rc2) 09/06/2010 --- .../input/importing_exporting_tables_page.doc | 9 +- doc/salome/gui/VISU/input/point_marker.doc | 6 +- .../gui/VISU/input/table_presentations.doc | 15 ++- src/PIPELINE/VISU_GaussPointsPL.cxx | 4 + src/VISUGUI/VISU_msg_en.ts | 92 ++++++++++++++++++- src/VISUGUI/VisuGUI.cxx | 5 +- src/VISU_I/VISU_Prs3d_i.cc | 1 + 7 files changed, 114 insertions(+), 18 deletions(-) diff --git a/doc/salome/gui/VISU/input/importing_exporting_tables_page.doc b/doc/salome/gui/VISU/input/importing_exporting_tables_page.doc index 9b9a4fd1..b66a1176 100644 --- a/doc/salome/gui/VISU/input/importing_exporting_tables_page.doc +++ b/doc/salome/gui/VISU/input/importing_exporting_tables_page.doc @@ -15,8 +15,9 @@ select Table from File item. choose the necessary *.txt, *.tab or *.csv file containing tables and click \b Open button. -Checkbox "Use first string as title" is checked if it is needed to use -information from first string of file as titles of columns of table. +If the checkbox "Use first string as title" is on, the +information from the first string of the file is used as titles of +table columns. @@ -34,11 +35,11 @@ tables. contain your exported table, and click \b OK button. Your table will be exported. -You can perform export table to *.txt or *.tab file +You can export table to *.txt or *.tab file \image html exporttables1.png -Or you can perform export table to *.csv file +Or you can export table to *.csv file \image html exporttables2.png diff --git a/doc/salome/gui/VISU/input/point_marker.doc b/doc/salome/gui/VISU/input/point_marker.doc index efd0bcd9..c7654438 100644 --- a/doc/salome/gui/VISU/input/point_marker.doc +++ b/doc/salome/gui/VISU/input/point_marker.doc @@ -9,7 +9,7 @@ shapes or by loading a custom texture from an external file. - Standard point markers The Post-Pro module provides a set of predefined point marker shapes -which can be used to display points in 3D viewer. +which can be used to display points in the 3D viewer. Each standard point marker has two attributes: type (defines shape form) and scale factor (defines shape size). @@ -23,9 +23,9 @@ form) and scale factor (defines shape size). It is also possible to load a point marker shape from an external file. This file should provide a description of the point texture as a set -of lines; each line is represented as sequence of "0" and "1" symbols, +of lines; each line is represented as a sequence of "0" and "1" symbols, where "1" symbol means an opaque pixel and "0" symbol means a -transparent pixel. The width of the texture correspond to the length +transparent pixel. The width of the texture corresponds to the length of the longest line in the file, expanded to the nearest byte-aligned value. The height of the texture is equal to the number of non-empty lines in the file. Note that missing symbols are replaced by "0". diff --git a/doc/salome/gui/VISU/input/table_presentations.doc b/doc/salome/gui/VISU/input/table_presentations.doc index 44a153bf..2e5f9b5c 100644 --- a/doc/salome/gui/VISU/input/table_presentations.doc +++ b/doc/salome/gui/VISU/input/table_presentations.doc @@ -27,11 +27,10 @@ in the context menu. \image html viewtable.png -When the Enable editing option is checked, contents of the table -are editable. -\note At the current moment this mode allows to sort table data only. -Sorting is performed by clicking on header of the column, by which the data -has to be sorted. +When the Enable editing option is checked, the table contents are editable. +\note At the current moment this mode only allows to sort table data. +The sorting is performed by clicking on the header of the column, by which the data +is sorted. Sort policy option allows to specify how the empty cells will be processed during the sort procedure. The following options are available: @@ -40,11 +39,11 @@ during the sort procedure. The following options are available:
  • Empty cells are considered as highest values
  • Empty cells are always first
  • Empty cells are always last
    • -
  • Empty cells are ignored (means that positions of the empty cells -will not change after sorting)
    • +
  • Empty cells are ignored (this means that the positions of empty cells +will not change after the sorting)
    • -Adjust Cells button allows to adjust size of the table cells according +Adjust Cells button allows to adjust the size of table cells according to their contents. It is also possible to create diff --git a/src/PIPELINE/VISU_GaussPointsPL.cxx b/src/PIPELINE/VISU_GaussPointsPL.cxx index 43887c4f..06c33ffc 100644 --- a/src/PIPELINE/VISU_GaussPointsPL.cxx +++ b/src/PIPELINE/VISU_GaussPointsPL.cxx @@ -678,6 +678,10 @@ VISU_GaussPointsPL vtkFloatingPointType* aScalarRange = GetScalarRange(); vtkFloatingPointType aDeltaScalarRange = aScalarRange[1] - aScalarRange[0]; + // to avoid FPE if the minimum is equal to maximum + if( aDeltaScalarRange < 1.0 / VTK_LARGE_FLOAT ) + return aMinSize; + return aMinSize + aDelta*(aVal - aScalarRange[0]) / aDeltaScalarRange; } diff --git a/src/VISUGUI/VISU_msg_en.ts b/src/VISUGUI/VISU_msg_en.ts index dc6074dd..f31cf5bc 100644 --- a/src/VISUGUI/VISU_msg_en.ts +++ b/src/VISUGUI/VISU_msg_en.ts @@ -2959,7 +2959,7 @@ Please select another field. MODEMode: LINEARLinear - COSINUSOIDAL1 - cos( t ) / 2 + COSINUSOIDAL( 1 - cos( t ) ) / 2 SINUSOIDALsin( t - Pi / 2 ) NUMBER_OF_STEPSNumber Steps: @@ -3847,6 +3847,96 @@ Please, refer to the QT documentation. Shrink Factor: + + VisuGUI_PrimitiveBox + + ALPHA_TEXTURE + Alpha Channel Texture (16x16) : + + + ALPHA_THRESHOLD + Alpha Channel Threshold : + + + CLAMP + Maximum Size (Clamp) : + + + FACE_LIMIT + Notify when number of faces exceeds : + + + FACE_NUMBER + Number of faces : + + + GEOMETRICAL_SPHERE + Geometrical Sphere + + + MAIN_TEXTURE + Main Texture (16x16) : + + + OPENGL_POINT + OpenGL Point + + + POINT_SPRITE + Point Sprite + + + PRIMITIVE_TITLE + Primitive + + + RESOLUTION + Resolution : + + + + VisuGUI_SizeBox + + COLOR + Color : + + + COLOR_TITLE + Color + + + GEOM_SIZE + Size of points (%) : + + + INCREMENT + +/- Ratio : + + + MAGNIFICATION + Magnification (%) : + + + MAX_SIZE + max size (%) : + + + MIN_SIZE + Range values for min size (%) : + + + OUTSIDE_SIZE + Percentage of normal size(%) : + + + SIZE_TITLE + Size + + + UNIFORM_COLOR + Uniform Color + + VISU_TableDlg diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index fd2a36c3..213f1edd 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -1454,6 +1454,7 @@ VisuGUI if( VISU::Prs3d_i* aPrs = aPrsList[i] ) { VTKViewer_MarkerDlg* aDlg = new VTKViewer_MarkerDlg( GetDesktop( this ) ); + aDlg->setHelpData( "VISU", "point_marker_page.html" ); aDlg->setCustomMarkerMap( aMarkerMap[ aStudyId ] ); @@ -3747,8 +3748,8 @@ void VisuGUI::createPreferences() // Set property for precision value for spinboxes for ( ii = 0; ii < nbQuantities; ii++ ){ - setPreferenceProperty( precs[ii], "min", ii == 2 ? 0 : -10 ); - setPreferenceProperty( precs[ii], "max", ii == 2 ? 3 : 10 ); + setPreferenceProperty( precs[ii], "min", ii == 2 ? 0 : -14 ); + setPreferenceProperty( precs[ii], "max", ii == 2 ? 3 : 14 ); setPreferenceProperty( precs[ii], "precision", 2 ); } diff --git a/src/VISU_I/VISU_Prs3d_i.cc b/src/VISU_I/VISU_Prs3d_i.cc index 11cb28d2..21a797ae 100644 --- a/src/VISU_I/VISU_Prs3d_i.cc +++ b/src/VISU_I/VISU_Prs3d_i.cc @@ -842,4 +842,5 @@ VISU::Prs3d_i return false; theMarkerTexture = aMarkerIter->second.second; + return true; } -- 2.39.2