Updated SALOME GUI sources for building under Ms Visual .NET on Windows platform.

diff --git a/src/QDS/QDS.cxx b/src/QDS/QDS.cxx
index e6bdd56c877bc219e0e6c9853824afc14953e5a0..ec925779e831895bc4c2a3a310503509bf79d062 100644 (file)
--- a/src/QDS/QDS.cxx
+++ b/src/QDS/QDS.cxx
@@ -146,7 +146,7 @@ void QDS::setActiveUnitSystem( const QString& sys, const QString& comp )
   for ( QValueList<QDS_Datum*>::iterator it = _datumList.begin(); it != _datumList.end(); ++it )
   {
     QDS_Datum* datum = *it;
-    if ( !datum )
+    if ( !datum || !datum->flags( AutoUnits ) )
       continue;
 
     bool ok = aComp.IsEmpty();

diff --git a/src/QDS/QDS.h b/src/QDS/QDS.h
index c9ff5edd01bf819cd53e12305d5a24ef9a998a44..3b20b2378069355f22ff83adf44db093c2811459 100644 (file)
--- a/src/QDS/QDS.h
+++ b/src/QDS/QDS.h
@@ -32,7 +32,7 @@ class QDS_EXPORT QDS
 public:
   typedef enum { None = 0x00, Label = 0x01, Control = 0x02, Units = 0x04,
                  NotFormat = 0x08, NotAccel = 0x10, UnitsWithLabel = 0x20,
-                 All = Label | Control | Units } DatumFlags;
+                 AutoUnits = 0x40, All = Label | Control | Units } DatumFlags;
 
 public:
   static bool                       load( const QString& );

diff --git a/src/QDS/QDS_Datum.cxx b/src/QDS/QDS_Datum.cxx
index f7a76b6491c4354b46c5ec815054f461163695b8..70f3169c83cf0bf13fd33e474be34a2f62581933 100644 (file)
--- a/src/QDS/QDS_Datum.cxx
+++ b/src/QDS/QDS_Datum.cxx
@@ -390,6 +390,20 @@ void QDS_Datum::clear()
   }
 }
 
+void QDS_Datum::updateUnits()
+{
+  Handle(DDS_DicItem) item = dicItem();
+  if ( item.IsNull() )
+    return;
+
+  unitSystemChanged( activeUnitSystem( toQString( item->GetComponent() ) ) );
+}
+
+bool QDS_Datum::flags( const int f ) const
+{
+  return ( myFlags & f  ) == f;
+}
+
 void QDS_Datum::setValue( const QVariant& val )
 {
   if ( val.isValid() && val.canCast( QVariant::String ) )

diff --git a/src/QDS/QDS_Datum.h b/src/QDS/QDS_Datum.h
index 3a1a92985ac6df4b57a5e9eb7ac57d350417e1d7..cafd764378e0ffaa2fb75daf64bf14be268007b1 100644 (file)
--- a/src/QDS/QDS_Datum.h
+++ b/src/QDS/QDS_Datum.h
@@ -3,7 +3,7 @@
 
 #include "QDS.h"
 
-#include <qobject.h>
+#include <qwidget.h>
 #include <qstring.h>
 #include <qvariant.h>
 #include <qguardedptr.h>
@@ -55,6 +55,9 @@ public:
   virtual void              reset();
   virtual void              clear();
 
+  void                      updateUnits();
+  bool                      flags( const int ) const;
+
   virtual void              setValue( const QVariant& );
 
   virtual void              setStringValue( const QString& );