Merge from V6_2_BR 23/12/2010

diff --git a/Makefile.am b/Makefile.am
index 78e039f5960fe90eaa084da760b171467f34109f..295b31fae39a972826ff48bbf86cedf44ea52643 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,7 @@ SUBDIRS = $(IDLDIR) adm_local resources src doc bin
 
 DIST_SUBDIRS = idl adm_local resources src doc bin 
 
-DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh
+DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh hack_libtool
 
 salomeinclude_DATA = GUI_version.h
 

diff --git a/configure.ac b/configure.ac
index 71bfdaa3679098f75c4d948711270f1081ba25d2..dac158ee454b759231093f24c6fe8841053db9db 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -605,6 +605,9 @@ sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\
   $(pwd)/hack_libtool \1 \"\$[@]\" \n\
 }\n\
 CC=\"hack_libtool\"%g" libtool
+sed -i "s%\(\s*\)for searchdir in \$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path; do%\1searchdirs=\"\$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path\"\n\1for searchdir in \$searchdirs; do%g" libtool
+sed -i "s%\(\s*\)searchdirs=\"\$newlib_search_path \$lib_search_path \(.*\)\"%\1searchdirs=\"\$newlib_search_path \$lib_search_path\"\n\1sss_beg=\"\"\n\1sss_end=\"\2\"%g" libtool
+sed -i "s%\(\s*\)\(for searchdir in \$searchdirs; do\)%\1for sss in \$searchdirs; do\n\1  if ! test -d \$sss; then continue; fi\n\1  ssss=\$(cd \$sss; pwd)\n\1  if test \"\$ssss\" != \"\" \&\& test -d \$ssss; then\n\1    case \$ssss in\n\1      /usr/lib | /usr/lib64 ) ;;\n\1      * ) sss_beg=\"\$sss_beg \$ssss\" ;;\n\1    esac\n\1  fi\n\1done\n\1searchdirs=\"\$sss_beg \$sss_end\"\n\1\2%g" libtool
 ],[])
 
 # This list is initiated using autoscan and must be updated manually

diff --git a/doc/salome/gui/images/pref24.png b/doc/salome/gui/images/pref24.png
index a9b9a56be4972f11e4111acf56513fcb9155e8d3..c75cbfb70c64d76ee361d8b9052184dadf9913ea 100755 (executable)
Binary files a/doc/salome/gui/images/pref24.png and b/doc/salome/gui/images/pref24.png differ

diff --git a/doc/salome/gui/input/mesh_preferences.doc b/doc/salome/gui/input/mesh_preferences.doc
index 0b5a756d79a10a6bfc4961e0e1fbaf4d32b156d2..ebed193cd754ba47cadb4e731846ef74ff418672 100644 (file)
--- a/doc/salome/gui/input/mesh_preferences.doc
+++ b/doc/salome/gui/input/mesh_preferences.doc
@@ -164,6 +164,11 @@ placement (<b>X</b> and <b>Y</b>) and lookout (<b>Width</b> and
 side)</li>
 <li><b>Y</b>: ordinate of the origin of the bar (from the bottom)</li>
 </ul>
+<li><b>Distribution</b> in this menu you can Show/Hide distribution histogram of the values of the <b>Scalar Bar</b> and specify the <b>Coloring Type</b> of the histogram</li>
+<ul>
+<li><b>Multicolor</b> the histogram is colored as <b>Scalar Bar</b></li>
+<li><b>Monocolor</b> the histogram is colored as selected with <b>Distribution color</b> selector</li>
+<ul>
 </ul>
 
 */

diff --git a/src/LightApp/resources/LightApp_msg_en.ts b/src/LightApp/resources/LightApp_msg_en.ts
index 6ac1fc0585841d354b7db86fcf2ec284f2567b31..89910ee1268865b6a5bb9fcb1bab32d48380582d 100644 (file)
--- a/src/LightApp/resources/LightApp_msg_en.ts
+++ b/src/LightApp/resources/LightApp_msg_en.ts
@@ -140,7 +140,7 @@ The changes will be applied on the next application session.</translation>
     </message>
     <message>
         <source>PREF_ZOOMING_AT_CENTER</source>
-        <translation>Relative to the view's center</translation>
+        <translation>Relative to the view&apos;s center</translation>
     </message>
     <message>
         <source>PREF_ZOOMING_AT_CURSOR</source>
@@ -664,7 +664,7 @@ File does not exist</translation>
         <translation>Preferences for module &quot;%1&quot; not supported</translation>
     </message>
     <message>
-       <source>PREF_TAB_SHORTCUTS</source>
+        <source>PREF_TAB_SHORTCUTS</source>
         <translation>Shortcuts</translation>
     </message>
     <message>

diff --git a/src/LightApp/resources/LightApp_msg_fr.ts b/src/LightApp/resources/LightApp_msg_fr.ts
index 8606a27c1fa6656842cd24be69cb54a81b489b2b..4545c36bf3d7e94e174f96f7dcd861f44295d0bb 100755 (executable)
--- a/src/LightApp/resources/LightApp_msg_fr.ts
+++ b/src/LightApp/resources/LightApp_msg_fr.ts
@@ -134,6 +134,18 @@ Les modifications seront appliquées à la prochaine session.</translation>
         <source>PREF_KEYFREE_STYLE</source>
         <translation>Style sans clavier</translation>
     </message>
+    <message>
+        <source>PREF_ZOOMING</source>
+        <translation>Mode de zoom:</translation>
+    </message>
+    <message>
+        <source>PREF_ZOOMING_AT_CENTER</source>
+        <translation>Relatif au centre de la vue</translation>
+    </message>
+    <message>
+        <source>PREF_ZOOMING_AT_CURSOR</source>
+        <translation>Relatif au curseur</translation>
+    </message>
     <message>
         <source>PREF_INCREMENTAL_SPEED</source>
         <translation>Incrément de vitesse:</translation>
@@ -422,6 +434,22 @@ Les modifications seront appliquées à la prochaine session.</translation>
         <source>PREF_VIEWER_BACKGROUND</source>
         <translation>Couleur de l&apos;arrière-plan</translation>
     </message>
+    <message>
+        <source>PREF_XYVIEWER_BACKGROUND</source>
+        <translation>Couleur de l&apos;arrière-plan (vue XY)</translation>
+    </message>
+    <message>
+        <source>PREF_XZVIEWER_BACKGROUND</source>
+        <translation>Couleur de l&apos;arrière-plan (vue XZ)</translation>
+    </message>
+    <message>
+        <source>PREF_YZVIEWER_BACKGROUND</source>
+        <translation>Couleur de l&apos;arrière-plan (vue YZ)</translation>
+    </message>
+    <message>
+        <source>PREF_3DVIEWER_BACKGROUND</source>
+        <translation>Couleur de l&apos;arrière-plan (vue 3D)</translation>
+    </message>
     <message>
         <source>PREF_FONT</source>
         <translation>Police</translation>

diff --git a/src/OCCViewer/OCCViewer_ViewFrame.cxx b/src/OCCViewer/OCCViewer_ViewFrame.cxx
index e0eedf65faa0cc142b213b3cd4549a3224d0fa42..57d135544d95baac055f8b58577dfde6e1ef3202 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewFrame.cxx
+++ b/src/OCCViewer/OCCViewer_ViewFrame.cxx
@@ -161,6 +161,13 @@ void OCCViewer_ViewFrame::setInteractionStyle( const int i )
   }
 }
 
+//**************************************************************************************
+void OCCViewer_ViewFrame::setZoomingStyle( const int i ) 
+{ 
+  foreach (OCCViewer_ViewWindow* aView, myViews) {
+    aView->setZoomingStyle(i); 
+  }
+}
   
 //**************************************************************************************
 void OCCViewer_ViewFrame::connectViewSignals(OCCViewer_ViewWindow* theView)

diff --git a/src/OCCViewer/OCCViewer_ViewFrame.h b/src/OCCViewer/OCCViewer_ViewFrame.h
index 19212da77efbc7f8056b1855c70a32baf6dc35c3..16db7560774a415dedb69f33398be6a355cab70a 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewFrame.h
+++ b/src/OCCViewer/OCCViewer_ViewFrame.h
@@ -67,6 +67,9 @@ public:
   virtual int  interactionStyle() const { return getView(MAIN_VIEW)->interactionStyle(); }
   virtual void setInteractionStyle( const int i );
 
+  virtual int  zoomingStyle() const { return getView(MAIN_VIEW)->zoomingStyle(); }
+  virtual void setZoomingStyle( const int );
+
   virtual void setViewManager( SUIT_ViewManager* );
 
   virtual bool eventFilter(QObject* watched, QEvent* e) { return SUIT_ViewWindow::eventFilter(watched, e); }

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx
index a8977bc2ef23b6578ea400d5df3d3a11a9f37e24..dd2952d1c7d65f4cffbafef06eaf0df290ebbb12 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@ -334,9 +334,13 @@ bool OCCViewer_ViewWindow::eventFilter( QObject* watched, QEvent* e )
     case QEvent::Wheel:
       {
         QWheelEvent* aEvent = (QWheelEvent*) e;
-        double aDelta = aEvent->delta();
-        double aScale = (aDelta < 0) ? 100./(-aDelta) : aDelta/100.;
-        myViewPort->getView()->SetZoom(aScale);
+       myViewPort->startZoomAtPoint( aEvent->x(), aEvent->y() );
+       double delta = (double)( aEvent->delta() ) / ( 15 * 8 );
+       int x  = aEvent->x();
+       int y  = aEvent->y();
+       int x1 = (int)( aEvent->x() + width()*delta/100 );
+       int y1 = (int)( aEvent->y() + height()*delta/100 );
+       myViewPort->zoom( x, y, x1, y1 );
       }
       return true;
 

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.h b/src/OCCViewer/OCCViewer_ViewWindow.h
index 3837db444ab77f3431e5b3c28b8af9007a13bf42..6dbbd582be756f4b083207b63279463021c256cd 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewWindow.h
+++ b/src/OCCViewer/OCCViewer_ViewWindow.h
@@ -97,8 +97,8 @@ public:
   virtual int                     interactionStyle() const;
   virtual void                    setInteractionStyle( const int );
  
-  int                     zoomingStyle() const;
-  void                    setZoomingStyle( const int );
+  virtual int                     zoomingStyle() const;
+  virtual void                    setZoomingStyle( const int );
  
   void setTransformEnabled( const OperationType, const bool );
   bool transformEnabled( const OperationType ) const;

diff --git a/src/PyConsole/PyConsole_Editor.cxx b/src/PyConsole/PyConsole_Editor.cxx
index 54496b36fb836d75b3def6227d2eefa5020d9818..c1bce6b3e75969b0227d7ac5f749fd31537d1a6f 100644 (file)
--- a/src/PyConsole/PyConsole_Editor.cxx
+++ b/src/PyConsole/PyConsole_Editor.cxx
@@ -486,7 +486,7 @@ void PyConsole_Editor::mouseReleaseEvent( QMouseEvent* event )
 {
   if ( event->button() == Qt::LeftButton ) {
     QTextEdit::mouseReleaseEvent( event );
-    copy();
+    //copy();
   }
   else if ( event->button() == Qt::MidButton ) {
     QString text;

diff --git a/src/Qtx/QtxDoubleSpinBox.cxx b/src/Qtx/QtxDoubleSpinBox.cxx
index 50717e4f9b53c604c254c17539144331a3706533..9c508ebd5539553fb2e80201f7dd54d87c227560 100644 (file)
--- a/src/Qtx/QtxDoubleSpinBox.cxx
+++ b/src/Qtx/QtxDoubleSpinBox.cxx
@@ -258,13 +258,19 @@ QString QtxDoubleSpinBox::removeTrailingZeroes( const QString& src ) const
 
   QString iPart = src.left( idx );
   QString fPart = src.mid( idx + 1 );
+  QString ePart = "";
+  int idx1 = fPart.lastIndexOf( QRegExp( "e[+|-]?[0-9]+" ) );
+  if ( idx1 >= 0 ) {
+    ePart = fPart.mid( idx1 );
+    fPart = fPart.left( idx1 );
+  }
 
-  while ( !fPart.isEmpty() && fPart.at( fPart.length() - 1 ) == '0' )
-    fPart.remove( fPart.length() - 1, 1 );
+  fPart.remove( QRegExp( "0+$" ) );
 
   QString res = iPart;
   if ( !fPart.isEmpty() )
     res += delim + fPart;
+  res += ePart;
 
   return res;
 }
@@ -316,9 +322,8 @@ QValidator::State QtxDoubleSpinBox::validate( QString& str, int& pos ) const
   v.setNotation( myPrecision >= 0 ? QDoubleValidator::StandardNotation : 
                                     QDoubleValidator::ScientificNotation );
 
-  if ( overhead == 0 ) {
+  if ( overhead == 0 )
     state = v.validate( str, pos );
-  }
   else
     {
       if ( str.length() >= overhead && str.startsWith( pref ) &&

diff --git a/src/SVTK/SVTK_InteractorStyle.cxx b/src/SVTK/SVTK_InteractorStyle.cxx
index ec679bdcb1e093efaa15bdffd82f80ea3e019eee..483a3fbbb975546ce26708be487e4bf16498c9d3 100644 (file)
--- a/src/SVTK/SVTK_InteractorStyle.cxx
+++ b/src/SVTK/SVTK_InteractorStyle.cxx
@@ -430,6 +430,26 @@ void SVTK_InteractorStyle::OnRightButtonUp()
                          x, y );
 }
 
+/*!
+  To handle mouse wheel forward event (reimplemented from #vtkInteractorStyle)
+*/
+void SVTK_InteractorStyle::OnMouseWheelForward()
+{
+  int x, y;
+  GetEventPosition( this->Interactor, x, y );
+  myOtherPoint = QPoint(x, y);
+}
+
+/*!
+  To handle mouse wheel backward event (reimplemented from #vtkInteractorStyle)
+*/
+void SVTK_InteractorStyle::OnMouseWheelBackward()
+{
+  int x, y;
+  GetEventPosition( this->Interactor, x, y );
+  myOtherPoint = QPoint(x, y);
+}
+
 /*!
   To handle mouse move event
 */

diff --git a/src/SVTK/SVTK_InteractorStyle.h b/src/SVTK/SVTK_InteractorStyle.h
index 4eac463ce4c7e77e0f6844cf30bb31b8df89b27d..88f523509f83fec9417e8604d02a8e6ac4244a9f 100644 (file)
--- a/src/SVTK/SVTK_InteractorStyle.h
+++ b/src/SVTK/SVTK_InteractorStyle.h
@@ -201,6 +201,12 @@ class SVTK_EXPORT SVTK_InteractorStyle: public vtkInteractorStyle
   //! To handle right mouse button up event (reimplemented from #vtkInteractorStyle)
   virtual void OnRightButtonUp();
 
+  //! To handle mouse wheel forward event (reimplemented from #vtkInteractorStyle)
+  virtual void OnMouseWheelForward();
+
+  //! To handle mouse wheel backward event (reimplemented from #vtkInteractorStyle)
+  virtual void OnMouseWheelBackward();
+
   //! To handle keyboard event (reimplemented from #vtkInteractorStyle)
   virtual void OnChar();
 

diff --git a/src/SVTK/SVTK_RenderWindowInteractor.cxx b/src/SVTK/SVTK_RenderWindowInteractor.cxx
index eef4ade04e6daf74aa0fec284246eb5f546ad941..4835c94e0345b40a6c6b42f02184974b2b3c81e9 100644 (file)
--- a/src/SVTK/SVTK_RenderWindowInteractor.cxx
+++ b/src/SVTK/SVTK_RenderWindowInteractor.cxx
@@ -320,6 +320,14 @@ QVTK_RenderWindowInteractor
 {
   activateWindow();
   setFocus();
+  GetDevice()->SetEventInformationFlipY(event->x(), 
+                                        event->y(),
+                                        event->modifiers() & Qt::ControlModifier,
+                                        event->modifiers() & Qt::ShiftModifier);
+  if ( event->delta()>0)
+    GetDevice()->MouseWheelForwardEvent();
+  else
+    GetDevice()->MouseWheelBackwardEvent();
 }