]> SALOME platform Git repositories - modules/visu.git/commitdiff
Salome HOME
Merge from V5_1_main 10/06/2010 V6_1_BR TRIPOLI_302 TRIPOLI_303 V6_1_0 V6_1_0a1 V6_1_0a2 V6_1_0rc1 V6_1_0rc2 V6_1_0rc3 V6_main_20100615 V6_main_20101011 before_mergefrom_V6_1_BR_07Sep10 mergefrom_V5_1_main_10Jun10 mergefrom_V6_1_BR_07Sep10 mergeto_V6_main_07Sep10
authorvsr <vsr@opencascade.com>
Thu, 10 Jun 2010 10:04:05 +0000 (10:04 +0000)
committervsr <vsr@opencascade.com>
Thu, 10 Jun 2010 10:04:05 +0000 (10:04 +0000)
13 files changed:
doc/salome/gui/VISU/input/importing_exporting_tables_page.doc
doc/salome/gui/VISU/input/point_marker.doc
doc/salome/gui/VISU/input/table_presentations.doc
resources/SalomeApp.xml
src/PIPELINE/VISU_GaussPointsPL.cxx
src/PIPELINE/VISU_StreamLinesPL.cxx
src/PIPELINE/VISU_StreamLinesPL.hxx
src/VISUGUI/VISU_msg_en.ts
src/VISUGUI/VisuGUI.cxx
src/VISU_I/VISU_DumpPython.cc
src/VISU_I/VISU_Prs3d_i.cc
src/VISU_I/VISU_TableDlg.cxx
src/VISU_I/VISU_TableDlg.h

index 9b9a4fd11591574a6446f8996d46a62917364f07..b66a117635882061f961ecb7452be831f3ddcc23 100644 (file)
@@ -15,8 +15,9 @@ select <b>Table from File</b> item.</li>
 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.
 
 </li>
 
@@ -34,11 +35,11 @@ tables.</li>
 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
 
index efd0bcd9282971be68ae739658512248ab195821..c7654438c08a27f2433875efa0bfdc624967b627 100644 (file)
@@ -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 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".
index 44a153bf3235da7cfe13b21b67092e12f94a6dc6..2e5f9b5c3fa0e6ade4add1f542edbdffe1bf0964 100644 (file)
@@ -27,11 +27,10 @@ in the context menu.
 
 \image html viewtable.png
 
-When the <b>Enable editing</b> 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 <b>Enable editing</b> 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.
 
 <b>Sort policy</b> 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:
 <li><b>Empty cells are considered as highest values</b></li>
 <li><b>Empty cells are always first</b></li>
 <li><b>Empty cells are always last</b></li>
-<li><b>Empty cells are ignored</b> (means that positions of the empty cells
-will not change after sorting)</li>
+<li><b>Empty cells are ignored</b> (this means that the positions of empty cells
+will not change after the sorting)</li>
 </ul>
 
-<b>Adjust Cells</b> button allows to adjust size of the table cells according
+<b>Adjust Cells</b> button allows to adjust the size of table cells according
 to their contents.
 
 It is also possible to create 
index 74dc330c6fcf9cc17a631ce73948ca99b0e8e0f1..cf894dfcc7235fa17130da753128b892fd376379 100644 (file)
     <parameter name="scalar_bar_active_local"    value="0"/>
     <parameter name="scalar_bar_bicolor"         value="1"/>
     <parameter name="scalar_bar_spacing"         value="0.01"/>
+    <parameter name="stream_lines_used_points"   value="0.01"/>
     <parameter name="sweeping_number_cycles" value="1"   />
     <parameter name="sweeping_number_steps"  value="20"  />
     <parameter name="sweeping_time_step"     value="0.2" />
index 43887c4fcf0ab362a5d96380871d925ed807b284..06c33ffc3db9f0311fe08501a166dd753e3ee9d8 100644 (file)
@@ -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;
 }
 
index 6eb70ecc4dd8e6a5286217264ce7231eebd1ff7d..a23956c23ebe973ff162d805610d80cc7177fafa 100644 (file)
@@ -36,6 +36,9 @@
 
 #include "VTKViewer_GeometryFilter.h"
 
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+
 #include <algorithm>
 
 #include <vtkCell.h>
@@ -68,8 +71,9 @@ VISU_StreamLinesPL
   myCenters = vtkCellCenters::New();
   myGeomFilter = VTKViewer_GeometryFilter::New();
   myPointsFilter = VISU_MaskPointsFilter::New();
-  myPercents = 0.3;
   mySource = NULL;
+
+  myPercents = GetUsedPointsDefault();
 }
 
 
@@ -173,7 +177,7 @@ VISU_StreamLinesPL
   size_t anIsPossible = CheckAvailableMemory(aSize);
   if(!anIsPossible){
     vtkFloatingPointType aMaxStepLength = std::max(GetMaxStepLength(theDataSet),thePropogationTime);
-    vtkFloatingPointType aMinStepLength = GetMinStepLength(theDataSet);
+    vtkFloatingPointType aMinStepLength = GetMinStepLength(theDataSet,thePercents);
     vtkFloatingPointType aDeltaStepLength = (aMaxStepLength - aMinStepLength)/aStepLengthIncrease;
     for(int i = 2, aStepChanged = 1, aPerecentsChanged = 1; aStepChanged || aPerecentsChanged; i++){
       vtkFloatingPointType aStepLength = theStepLength + aDeltaStepLength;
@@ -223,10 +227,12 @@ VISU_StreamLinesPL
                                       thePercents);
 
   thePropogationTime = CorrectPropagationTime(thePropogationTime,
-                                              aPointSet);
+                                              aPointSet,
+                                              thePercents);
 
   theStepLength = CorrectStepLength(theStepLength,
-                                    aPointSet);
+                                    aPointSet,
+                                    thePercents);
 
   size_t anIsAccepted = FindPossibleParams(aPointSet,
                                            theStepLength,
@@ -310,10 +316,11 @@ VISU_StreamLinesPL
 //----------------------------------------------------------------------------
 size_t
 VISU_StreamLinesPL
-::IsPossible(vtkPointSet* theDataSet, 
-             vtkFloatingPointType thePercents)
+::IsPossible(vtkPointSet* theDataSet)
 {
-  vtkFloatingPointType aStepLength = GetBaseStepLength(theDataSet);
+  vtkFloatingPointType aPercents = GetUsedPointsDefault();
+  vtkFloatingPointType aStepLength = GetBaseStepLength(theDataSet,
+                                                       aPercents);
   vtkFloatingPointType aBasePropTime = GetBasePropagationTime(theDataSet);
   VISU_MaskPointsFilter *aPointsFilter = VISU_MaskPointsFilter::New();
   aPointsFilter->SetInput(theDataSet);
@@ -322,7 +329,7 @@ VISU_StreamLinesPL
   size_t aRes = FindPossibleParams(aDataSet,
                                    aStepLength,
                                    aBasePropTime,
-                                   thePercents);
+                                   aPercents);
   aPointsFilter->Delete();
   return aRes;
 }
@@ -489,12 +496,13 @@ VISU_StreamLinesPL
 //----------------------------------------------------------------------------
 vtkFloatingPointType
 VISU_StreamLinesPL
-::GetMinPropagationTime(vtkDataSet* theDataSet)
+::GetMinPropagationTime(vtkDataSet* theDataSet, 
+                        vtkFloatingPointType thePercents)
 {
   if(!theDataSet) 
     return -1.0;
 
-  return GetMinStepLength(theDataSet);
+  return GetMinStepLength(theDataSet, thePercents);
 }
 
 
@@ -503,7 +511,7 @@ vtkFloatingPointType
 VISU_StreamLinesPL
 ::GetMinPropagationTime()
 {
-  return GetMinPropagationTime(GetExtractorFilter()->GetOutput());
+  return GetMinPropagationTime(GetExtractorFilter()->GetOutput(), GetUsedPoints());
 }
 
 
@@ -532,9 +540,10 @@ VISU_StreamLinesPL
 vtkFloatingPointType
 VISU_StreamLinesPL
 ::CorrectPropagationTime(vtkFloatingPointType thePropagationTime, 
-                         vtkDataSet* theDataSet)
+                         vtkDataSet* theDataSet, 
+                         vtkFloatingPointType thePercents)
 {
-  vtkFloatingPointType aMinPropagationTime = GetMinPropagationTime(theDataSet);
+  vtkFloatingPointType aMinPropagationTime = GetMinPropagationTime(theDataSet, thePercents);
   if(aMinPropagationTime > thePropagationTime)
     thePropagationTime = aMinPropagationTime;
 
@@ -573,10 +582,11 @@ VISU_StreamLinesPL
 //----------------------------------------------------------------------------
 vtkFloatingPointType 
 VISU_StreamLinesPL
-::GetMinStepLength(vtkDataSet* theDataSet)
+::GetMinStepLength(vtkDataSet* theDataSet, 
+                   vtkFloatingPointType thePercents)
 {
   static vtkFloatingPointType aNbOfStepsOfIntStep = 1.0E+1;
-  vtkFloatingPointType anIntStep = GetMinIntegrationStep(theDataSet);
+  vtkFloatingPointType anIntStep = GetMinIntegrationStep(theDataSet, thePercents);
   vtkFloatingPointType aStepLength = anIntStep * aNbOfStepsOfIntStep / GetVelocityCoeff(theDataSet);
   return aStepLength;
 }
@@ -587,7 +597,7 @@ vtkFloatingPointType
 VISU_StreamLinesPL
 ::GetMinStepLength()
 {
-  return GetMinStepLength(GetExtractorFilter()->GetOutput());
+  return GetMinStepLength(GetExtractorFilter()->GetOutput(), GetUsedPoints());
 }
 
 
@@ -614,9 +624,10 @@ VISU_StreamLinesPL
 vtkFloatingPointType
 VISU_StreamLinesPL
 ::CorrectStepLength(vtkFloatingPointType theStep, 
-                    vtkDataSet* theDataSet)
+                    vtkDataSet* theDataSet, 
+                    vtkFloatingPointType thePercents)
 {
-  vtkFloatingPointType aMinStep = GetMinStepLength(theDataSet);
+  vtkFloatingPointType aMinStep = GetMinStepLength(theDataSet, thePercents);
   if(theStep < aMinStep) 
     theStep = aMinStep;
 
@@ -631,17 +642,28 @@ VISU_StreamLinesPL
 //----------------------------------------------------------------------------
 vtkFloatingPointType
 VISU_StreamLinesPL
-::GetBaseStepLength(vtkDataSet* theDataSet)
+::GetBaseStepLength(vtkDataSet* theDataSet, 
+                    vtkFloatingPointType thePercents)
 {
   static vtkFloatingPointType anAvgNbOfSteps = 1.0E+2;
   vtkFloatingPointType aPropagationTime = GetBasePropagationTime(theDataSet);
   vtkFloatingPointType aStepLength = aPropagationTime/anAvgNbOfSteps;
-  aStepLength = CorrectStepLength(aStepLength,theDataSet);
+  aStepLength = CorrectStepLength(aStepLength,theDataSet,thePercents);
 
   return aStepLength;
 }
 
 
+//----------------------------------------------------------------------------
+vtkFloatingPointType
+VISU_StreamLinesPL
+::GetUsedPointsDefault()
+{
+  SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr();
+  return aResourceMgr->doubleValue("VISU", "stream_lines_used_points", 0.01);
+}
+
+
 //----------------------------------------------------------------------------
 void
 VISU_StreamLinesPL
@@ -650,12 +672,14 @@ VISU_StreamLinesPL
   Superclass::Init();
 
   vtkDataSet* aDataSet = GetExtractorFilter()->GetOutput();
-  vtkFloatingPointType anIntStep = GetBaseIntegrationStep(aDataSet);
+  vtkFloatingPointType anIntStep = GetBaseIntegrationStep(aDataSet, GetUsedPoints());
   vtkFloatingPointType aPropagationTime = GetBasePropagationTime(aDataSet);
-  vtkFloatingPointType aStepLength = GetBaseStepLength(aDataSet);
+  vtkFloatingPointType aStepLength = GetBaseStepLength(aDataSet, GetUsedPoints());
   SetParams(anIntStep,
             aPropagationTime,
-            aStepLength);
+            aStepLength,
+            NULL,
+            GetUsedPoints());
 }
 
 
index 009424b0230554a3df8bdb9b1499a83af5f1dcb9..b1f71ff618dcc71bede627b88dfbaf75bdf4ae61 100644 (file)
@@ -61,8 +61,8 @@ public:
   SetParams(vtkFloatingPointType theIntStep,
             vtkFloatingPointType thePropogationTime,
             vtkFloatingPointType theStepLength,
-            vtkPointSet* theSource = NULL,
-            vtkFloatingPointType thePercents = 0.3,
+            vtkPointSet* theSource,
+            vtkFloatingPointType thePercents,
             int theDirection = VTK_INTEGRATE_BOTH_DIRECTIONS);
 
   virtual
@@ -159,15 +159,16 @@ public:
   static
   vtkFloatingPointType
   GetMinIntegrationStep(vtkDataSet* theDataSet, 
-                        vtkFloatingPointType thePercents = 0.3);
+                        vtkFloatingPointType thePercents);
   static
   vtkFloatingPointType
   GetBaseIntegrationStep(vtkDataSet* theDataSet, 
-                         vtkFloatingPointType thePercents = 0.3);
+                         vtkFloatingPointType thePercents);
   
   static 
   vtkFloatingPointType
-  GetMinPropagationTime(vtkDataSet* theDataSet);
+  GetMinPropagationTime(vtkDataSet* theDataSet, 
+                        vtkFloatingPointType thePercents);
 
   static
   vtkFloatingPointType
@@ -179,7 +180,8 @@ public:
 
   static
   vtkFloatingPointType
-  GetMinStepLength(vtkDataSet* theDataSet);
+  GetMinStepLength(vtkDataSet* theDataSet, 
+                   vtkFloatingPointType thePercents);
 
   static
   vtkFloatingPointType
@@ -187,7 +189,8 @@ public:
 
   static
   vtkFloatingPointType
-  GetBaseStepLength(vtkDataSet* theDataSet);
+  GetBaseStepLength(vtkDataSet* theDataSet, 
+                    vtkFloatingPointType thePercents);
 
   static
   vtkFloatingPointType
@@ -195,8 +198,7 @@ public:
 
   static
   size_t
-  IsPossible(vtkPointSet* theDataSet, 
-             vtkFloatingPointType thePercents = 0.3);
+  IsPossible(vtkPointSet* theDataSet);
 
 protected:
   VISU_StreamLinesPL();
@@ -214,7 +216,7 @@ protected:
   GetNecasseryMemorySize(vtkIdType theNbOfPoints, 
                          vtkFloatingPointType theStepLength, 
                          vtkFloatingPointType thePropogationTime, 
-                         vtkFloatingPointType thePercents = 0.3);
+                         vtkFloatingPointType thePercents);
 
   static
   size_t
@@ -227,17 +229,23 @@ protected:
   vtkFloatingPointType
   CorrectIntegrationStep(vtkFloatingPointType theStep, 
                          vtkDataSet* theDataSet, 
-                         vtkFloatingPointType thePercents = 0.3);
+                         vtkFloatingPointType thePercents);
 
   static 
   vtkFloatingPointType
   CorrectPropagationTime(vtkFloatingPointType thePropagationTime, 
-                         vtkDataSet* theDataSet);
+                         vtkDataSet* theDataSet, 
+                         vtkFloatingPointType thePercents);
 
   static
   vtkFloatingPointType
   CorrectStepLength(vtkFloatingPointType theStep, 
-                    vtkDataSet* theDataSet);
+                    vtkDataSet* theDataSet, 
+                    vtkFloatingPointType thePercents);
+
+  static
+  vtkFloatingPointType
+  GetUsedPointsDefault();
 
   VISU_StreamLine* myStream;
   vtkPointSet* mySource;
index 7c4cfd7a0166d6eb39ab4b42032e41fc9de1eee5..f31cf5bc582a6a3cd86928638278502991e30f67 100644 (file)
@@ -413,6 +413,18 @@ number of time stamps or number of components is not the same!</translation>
             <source>VISU_STREAM_LINES</source>
             <translation>Stream Lines</translation>
         </message>
+        <message>
+            <source>VISU_STREAM_LINES_PREF</source>
+            <translation>Stream Lines Preferences</translation>
+        </message>
+        <message>
+            <source>VISU_STREAM_LINES_PREF</source>
+            <translation>Stream Lines Preferences</translation>
+        </message>
+        <message>
+            <source>VISU_STREAM_LINES_USED_POINTS</source>
+            <translation>Used points</translation>
+        </message>
         <message>
             <source>VISU_SWEEPING_MODES</source>
             <translation>Mode of the sweeping </translation>
@@ -2947,7 +2959,7 @@ Please select another field.</translation>
 
         <message><source>MODE</source><translation>Mode:</translation></message>
         <message><source>LINEAR</source><translation>Linear</translation></message>
-        <message><source>COSINUSOIDAL</source><translation>1 - cos( t ) / 2</translation></message>
+        <message><source>COSINUSOIDAL</source><translation>( 1 - cos( t ) ) / 2</translation></message>
         <message><source>SINUSOIDAL</source><translation>sin( t - Pi / 2 )</translation></message>
 
         <message><source>NUMBER_OF_STEPS</source><translation>Number Steps:</translation></message>
@@ -3835,6 +3847,96 @@ Please, refer to the QT documentation.</translation>
             <translation>Shrink Factor:</translation>
         </message>
     </context>
+    <context>
+        <name>VisuGUI_PrimitiveBox</name>
+        <message>
+            <source>ALPHA_TEXTURE</source>
+            <translation>Alpha Channel Texture (16x16) : </translation>
+        </message>
+        <message>
+            <source>ALPHA_THRESHOLD</source>
+            <translation>Alpha Channel Threshold : </translation>
+        </message>
+        <message>
+            <source>CLAMP</source>
+            <translation>Maximum Size (Clamp) : </translation>
+        </message>
+        <message>
+            <source>FACE_LIMIT</source>
+            <translation>Notify when number of faces exceeds : </translation>
+        </message>
+        <message>
+            <source>FACE_NUMBER</source>
+            <translation>Number of faces : </translation>
+        </message>
+        <message>
+            <source>GEOMETRICAL_SPHERE</source>
+            <translation>Geometrical Sphere</translation>
+        </message>
+        <message>
+            <source>MAIN_TEXTURE</source>
+            <translation>Main Texture (16x16) : </translation>
+        </message>
+        <message>
+            <source>OPENGL_POINT</source>
+            <translation>OpenGL Point</translation>
+        </message>
+        <message>
+            <source>POINT_SPRITE</source>
+            <translation>Point Sprite</translation>
+        </message>
+        <message>
+            <source>PRIMITIVE_TITLE</source>
+            <translation>Primitive</translation>
+        </message>
+        <message>
+            <source>RESOLUTION</source>
+            <translation>Resolution : </translation>
+        </message>
+    </context>
+    <context>
+        <name>VisuGUI_SizeBox</name>
+        <message>
+            <source>COLOR</source>
+            <translation>Color : </translation>
+        </message>
+        <message>
+            <source>COLOR_TITLE</source>
+            <translation>Color</translation>
+        </message>
+        <message>
+            <source>GEOM_SIZE</source>
+            <translation>Size of points (%) : </translation>
+        </message>
+        <message>
+            <source>INCREMENT</source>
+            <translation>+/- Ratio : </translation>
+        </message>
+        <message>
+            <source>MAGNIFICATION</source>
+            <translation>Magnification (%) : </translation>
+        </message>
+        <message>
+            <source>MAX_SIZE</source>
+            <translation>max size (%) : </translation>
+        </message>
+        <message>
+            <source>MIN_SIZE</source>
+            <translation>Range values for min size (%) : </translation>
+        </message>
+        <message>
+            <source>OUTSIDE_SIZE</source>
+            <translation>Percentage of normal size(%) : </translation>
+        </message>
+        <message>
+            <source>SIZE_TITLE</source>
+            <translation>Size</translation>
+        </message>
+        <message>
+            <source>UNIFORM_COLOR</source>
+            <translation>Uniform Color</translation>
+        </message>
+    </context>
     <context>
         <name>VISU_TableDlg</name>
         <message>
index 8cc895f5d8cb8ee0ab04d03b63e14c920d3e0748..213f1edd57038d5cce85b35a9d5732f8e4f07ca5 100644 (file)
@@ -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 );
   }   
 
@@ -3998,6 +3999,18 @@ void VisuGUI::createPreferences()
   addPreference( tr( "Generate data table" ), cutLineGr, LightApp_Preferences::Bool, "VISU", "generate_data_table" );
   addPreference( tr( "Generate curves" ), cutLineGr, LightApp_Preferences::Bool, "VISU", "generate_curves" );
 
+  // TAB: "StreamLines"
+  int streamLinesTab = addPreference( tr( "VISU_STREAM_LINES" ) );
+
+  // group: "StreamLines preferences"
+  int streamLinesGr = addPreference( tr( "VISU_STREAM_LINES_PREF" ), streamLinesTab );
+  setPreferenceProperty( cutLineGr, "columns", 1 );
+  int usedPoints = addPreference( tr( "VISU_STREAM_LINES_USED_POINTS" ), streamLinesGr,
+                                  LightApp_Preferences::DblSpin, "VISU", "stream_lines_used_points" );
+  setPreferenceProperty( usedPoints, "min",  0 );
+  setPreferenceProperty( usedPoints, "max",  1 );
+  setPreferenceProperty( usedPoints, "step", 0.1 );
+
   // TAB: "Sweep, Animation, 3D Cache"
   int animationTab = addPreference( tr( "Sweep, Animation" ) );
   {
index 80bcd374ef4fdc56f14d282a23b28ed93c6a2bfa..5ba81d944e9bd36e267a7cf4b0cfb651e713a8bf 100644 (file)
@@ -1713,7 +1713,11 @@ namespace VISU
              std::string aName =
                 GenerateName(theSObject,theName2EntryMap,theEntry2NameMap);
               QString aFirstStrAsTitle =
-                VISU::Storable::FindValue(aMap,"myFirstStrAsTitle",&anIsExist);
+                VISU::Storable::FindValue(aMap,"myFirstStrAsTitle",&anIsExist).trimmed().toLower();
+             if ( aFirstStrAsTitle == "1" || aFirstStrAsTitle == "true" )
+               aFirstStrAsTitle = "True";
+             else
+               aFirstStrAsTitle = "False";
              theStr<<thePrefix<<aName<<" = aVisu.ImportTables('"
                     <<aFileName.toLatin1().data()<<"',"
                     <<aFirstStrAsTitle.toLatin1().data()<<")"<<endl;
index 11cb28d2be48b99272acf8157d70297f03bc28f8..21a797ae3b033073b9108a99f0aa25581759c2e4 100644 (file)
@@ -842,4 +842,5 @@ VISU::Prs3d_i
     return false;
 
   theMarkerTexture = aMarkerIter->second.second;
+  return true;
 }
index 46a6b9935c98888d0d39b9a26aa648182288f489..df08dc62ceeaac96c17e8bc01e52bf930e327344 100644 (file)
@@ -591,11 +591,11 @@ void VISU_TableDlg::TableWidget::initialize( _PTR(Study) study, VISU::Table_i* t
   setEditEnabled( false );
   showColumnTitles( false );
 
-  updateTableFromServant();
+  updateTableFromServant( true );
   updateButtonsState();
 }
 
-void VISU_TableDlg::TableWidget::updateTableFromServant()
+void VISU_TableDlg::TableWidget::updateTableFromServant( bool adjust )
 {
   _PTR(SObject) aSObject = myStudy->FindObjectID( myTableObj->GetObjectEntry() );
   if ( aSObject ) {
@@ -652,7 +652,7 @@ void VISU_TableDlg::TableWidget::updateTableFromServant()
             }
             setRowData( i-1, strlist );
           }
-          adjustTable();
+          if ( adjust ) adjustTable();
         }
         catch( ... ) {
           MESSAGE("VISU_TableDlg::TableWidget::initialize : Exception has been caught !!!");
@@ -710,7 +710,7 @@ void VISU_TableDlg::TableWidget::updateTableFromServant()
             }
             setRowData( i-1, strlist );
           }
-          adjustTable();
+          if ( adjust ) adjustTable();
         }
         catch( ... ) {
           MESSAGE("VISU_TableDlg::TableWidget::initialize : Exception has been caught !!!");
@@ -731,7 +731,7 @@ void VISU_TableDlg::TableWidget::setEditEnabled( bool enable )
   if( !enable ) {
     myTable->horizontalHeader()->setSortIndicatorShown( false );
     myTable->verticalHeader()->setSortIndicatorShown( false );
-    adjustTable();
+    //adjustTable();
   }
 
   mySortPolicyLabel->setEnabled( enable );
@@ -1146,7 +1146,7 @@ void VISU_TableDlg::TableWidget::columnClicked( int column )
                            ( VISU::SortPolicy )mySortPolicyCombo->currentIndex() );
     myTable->horizontalHeader()->setSortIndicatorShown( true );
     myTable->verticalHeader()->setSortIndicatorShown( false );
-    updateTableFromServant();
+    updateTableFromServant( false );
   }
 }
 /*!
@@ -1161,7 +1161,7 @@ void VISU_TableDlg::TableWidget::rowClicked( int row )
                               ( VISU::SortPolicy )mySortPolicyCombo->currentIndex() );
     myTable->horizontalHeader()->setSortIndicatorShown( false );
     myTable->verticalHeader()->setSortIndicatorShown( true );
-    updateTableFromServant();
+    updateTableFromServant( false );
   }
   */
 }
index a911a6ce42f6a559e685cab42acf7f6e4cc3ed06..c2161c887c29cc33368c2fd7ea721239e61c8044 100644 (file)
@@ -141,7 +141,7 @@ public slots:
   void    rowClicked( int );
 
 protected:
-  void    updateTableFromServant();
+  void    updateTableFromServant( bool adjust );
 
 private:
   _PTR(Study)            myStudy;