Color conversion methods.

diff --git a/src/CAF/CAF_Tools.cxx b/src/CAF/CAF_Tools.cxx
index 41b56f6e1514a76ebe43e6b3728a536bd32b192d..c32d4a27e75441383622a9fcafd1c54edeec6242 100755 (executable)
--- a/src/CAF/CAF_Tools.cxx
+++ b/src/CAF/CAF_Tools.cxx
@@ -29,7 +29,26 @@
 */
 QString CAF_Tools::toQString ( const TCollection_ExtendedString& src )
 {
-    return QString( (const QChar*)src.ToExtString(), src.Length() );
+  return QString( (const QChar*)src.ToExtString(), src.Length() );
+}
+
+/*!
+    Converts TCollection_AsciiString'src' to Qt string. [ static ]
+*/
+QString CAF_Tools::toQString( const TCollection_AsciiString& src )
+{
+  return QString( src.ToCString() );
+}
+
+/*!
+    Converts Qt string to TCollection_AsciiString. [ static ]
+*/
+TCollection_AsciiString CAF_Tools::toAsciiString( const QString& src )
+{
+  TCollection_AsciiString res;
+  if ( !src.isEmpty() )
+    res = TCollection_AsciiString( (char*)src.latin1() );
+  return res;
 }
 
 /*!
@@ -37,8 +56,24 @@ QString CAF_Tools::toQString ( const TCollection_ExtendedString& src )
 */
 TCollection_ExtendedString CAF_Tools::toExtString ( const QString& src )
 {
-    TCollection_ExtendedString result;
-    for ( int i = 0; i < (int)src.length(); i++ )
-        result.Insert( i + 1, src[ i ].unicode() );
-    return result;
+  TCollection_ExtendedString result;
+  for ( int i = 0; i < (int)src.length(); i++ )
+    result.Insert( i + 1, src[ i ].unicode() );
+  return result;
+}
+
+Quantity_Color CAF_Tools::color( const QColor& c )
+{
+  Quantity_Color aColor;
+  if ( c.isValid() )
+    aColor = Quantity_Color( c.red()   / 255., c.green() / 255.,
+                             c.blue()  / 255., Quantity_TOC_RGB );
+  return aColor;
+}
+
+QColor CAF_Tools::color( const Quantity_Color& c )
+{
+  return QColor ( int( c.Red()   * 255 ),
+                  int( c.Green() * 255 ),
+                  int( c.Blue()  * 255 ) );
 }

diff --git a/src/CAF/CAF_Tools.h b/src/CAF/CAF_Tools.h
index 8af84f9fea1a84d0fc3090c22f79ff65de7e9819..e04d1c9d89f4d9f301268ab426ebd0a790537561 100755 (executable)
--- a/src/CAF/CAF_Tools.h
+++ b/src/CAF/CAF_Tools.h
@@ -26,13 +26,24 @@
 
 #include <SUIT_Tools.h>
 
+#include <qcolor.h>
+
+#include <Quantity_Color.hxx>
+
+#include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
 class CAF_EXPORT CAF_Tools : public SUIT_Tools
 {
 public:
+  static QString                    toQString( const TCollection_AsciiString& );
   static QString                    toQString( const TCollection_ExtendedString& );
+
   static TCollection_ExtendedString toExtString( const QString& );
+  static TCollection_AsciiString    toAsciiString( const QString& );
+
+  static Quantity_Color             color( const QColor& );
+  static QColor                     color( const Quantity_Color& );
 };
 
 #endif