Multiple fixes (see GUITHARE_V2.3.5_ReleaseNotes.doc, section "Additional modificatio...

diff --git a/src/GLViewer/GLViewer_ViewPort2d.cxx b/src/GLViewer/GLViewer_ViewPort2d.cxx
index 05df5a9dca07f73652df3efb03bddfb265a4529c..3eb8d48d78ca515c670485727cfd4e8569b6d441 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort2d.cxx
+++ b/src/GLViewer/GLViewer_ViewPort2d.cxx
@@ -117,7 +117,7 @@ GLViewer_ViewPort2d::GLViewer_ViewPort2d( QWidget* parent, GLViewer_ViewFrame* t
   myIsLegendEnabled = false;
   myLegendXOffset = 10.0;
   myLegendYOffset = 10.0;
-  myLegendFont = QFont( "Arial", 9 );
+  myLegendFont = QFont( "Times", 12 );
 }
 
 /*!

diff --git a/src/GLViewer/GLViewer_ViewPort2d.h b/src/GLViewer/GLViewer_ViewPort2d.h
index a8134c3eb02af5e7a6d3f436cbc8108747a24cea..de9d2c1c047adc4a74c5665cd4a586139f59cc0b 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort2d.h
+++ b/src/GLViewer/GLViewer_ViewPort2d.h
@@ -207,6 +207,9 @@ public:
   //! Sets the legend text
   void                   setLegendText( const QString& theText ) { myLegendText = theText; }
 
+  //! Sets the legend font
+  void                   setLegendFont( const QFont& theFont ) { myLegendFont = theFont; }
+
 signals:
   //! Emits after any transformation
   void                   vpUpdateValues();

diff --git a/src/LightApp/resources/LightApp.xml b/src/LightApp/resources/LightApp.xml
index c05531b7635bb88107385a32aef1d700d57a0611..1740d70e777261204481fc2bb444b982e2cb77dd 100644 (file)
--- a/src/LightApp/resources/LightApp.xml
+++ b/src/LightApp/resources/LightApp.xml
@@ -88,7 +88,7 @@
   <section name="Study">
     <!-- General study settings -->
     <parameter name="store_positions" value="true" />
-    <parameter name="backup_studies" value="5.0" />
+    <parameter name="backup_studies" value="0.0" />
   </section>
   <section name="Activate">
     <!-- StartUp settings -->

diff --git a/src/SUIT/SUIT_Session.cxx b/src/SUIT/SUIT_Session.cxx
index fecc67c4369aa30c0fe633b2fccb03df1c90deb1..3dff0ed3a88167c9bc9afabde7fdb52740fefcca 100755 (executable)
--- a/src/SUIT/SUIT_Session.cxx
+++ b/src/SUIT/SUIT_Session.cxx
@@ -536,6 +536,13 @@ void SUIT_Session::createBackupTimer()
   if ( !app )
     return;
 
+  // With the block below, the following limitation appears:
+  // If the user changes the value of "Backup every N minutes" from 0 to some non-zero value,
+  // it is necessary to restart the application to make it generate the backup folder.
+  double aBackupTime = app->getBackupTime();
+  if( aBackupTime < 1e-3 )
+    return;
+
   myBTimer = new QTimer( this );
   connect( myBTimer, SIGNAL( timeout() ), this, SLOT( onBTimer() ) );