Enable back CAF package.

diff --git a/src/CAF/CAF_Application.cxx b/src/CAF/CAF_Application.cxx
index 477dca391ea2bd257067c9cdd2309852c244d18a..ef3e2fec0f12d40cd65d76c722a9e5ac40eed2a6 100755 (executable)
--- a/src/CAF/CAF_Application.cxx
+++ b/src/CAF/CAF_Application.cxx
@@ -36,7 +36,7 @@
 #include <QStringList>
 
 #include <Resource_Manager.hxx>
-#include <TColStd_SequenceOfExtendedString.hxx>
+#include <TColStd_SequenceOfAsciiString.hxx>
 
 /*!
   \brief Create new instance of CAF_Application.
@@ -106,13 +106,16 @@ Handle( TDocStd_Application ) CAF_Application::stdApp() const
 
   \return file filters for open/save document dialog box
 */
-QString CAF_Application::getFileFilter() const
+QString CAF_Application::getFileFilter( bool open ) const
 {
   if ( stdApp().IsNull() )
     return QString();
 
-  TColStd_SequenceOfExtendedString formats;
-  stdApp()->Formats( formats );
+  TColStd_SequenceOfAsciiString formats;
+  if ( open )
+    stdApp()->ReadingFormats( formats );
+  else
+    stdApp()->WritingFormats( formats );
 
   QStringList allWC;
   QMap<QString, QStringList> wildCards;

diff --git a/src/CAF/CAF_Application.h b/src/CAF/CAF_Application.h
index 5ee1b60be0f01b32e52086343b756feae495a862..1ec1aa90e4d842c979077dd6d6577b123e86ab54 100755 (executable)
--- a/src/CAF/CAF_Application.h
+++ b/src/CAF/CAF_Application.h
@@ -48,7 +48,7 @@ public:
 
   Handle(TDocStd_Application) stdApp() const;
 
-  virtual QString             getFileFilter() const;
+  virtual QString             getFileFilter( bool ) const;
 
 public slots:  
   virtual void                onHelpAbout();

diff --git a/src/CAF/CAF_Study.cxx b/src/CAF/CAF_Study.cxx
index 15f6185ee63414402ff7caec02748c71877ea981..f4f4cf957be6cb5960581e41bf45a828a33acdcb 100755 (executable)
--- a/src/CAF/CAF_Study.cxx
+++ b/src/CAF/CAF_Study.cxx
@@ -33,7 +33,7 @@
 
 #include <TDF_Delta.hxx>
 #include <TDF_ListIteratorOfDeltaList.hxx>
-
+#include <TColStd_SequenceOfAsciiString.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx>
 
@@ -106,8 +106,10 @@ bool CAF_Study::createDocument( const QString& doc )
   {
     try {
       OCC_CATCH_SIGNALS;
-      TColStd_SequenceOfExtendedString formats;
-      app->stdApp()->Formats( formats );
+      TColStd_SequenceOfAsciiString formats;
+      app->stdApp()->WritingFormats( formats );
+      if ( formats.IsEmpty() )
+        app->stdApp()->ReadingFormats( formats );
       if ( !formats.IsEmpty() )
         app->stdApp()->NewDocument( formats.First(), myStdDoc );
     }

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f4b1b7fed130e67ebe5aae262c256c816fc0635e..907798d2e1ba60eb7f2789784c024ab4ca75cd28 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,10 +32,7 @@ ADD_SUBDIRECTORY(ObjBrowser)
 ADD_SUBDIRECTORY(SUIT)
 ADD_SUBDIRECTORY(SUITApp)
 ADD_SUBDIRECTORY(STD)
-# CAF package (not compilable while TDocStd_Application::Formats is removed)
-IF(CAS_VERSION_STR VERSION_LESS "7.0.1")
-  ADD_SUBDIRECTORY(CAF)
-ENDIF()
+ADD_SUBDIRECTORY(CAF)
 ADD_SUBDIRECTORY(CAM)
 ADD_SUBDIRECTORY(LogWindow)
 ADD_SUBDIRECTORY(Prs)

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 4b336bd65e263940649e12f4d2683a1dd76ae25a..1824defd3442e2fba42f0a73abaf3e4ae173342c 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -1836,12 +1836,10 @@ void LightApp_Application::studyCreated( SUIT_Study* s )
 }
 
 /*!Gets file filter.
- *\retval QString "(*.bin)"
+ *\retval QString "(*.hdf)"
  */
-QString LightApp_Application::getFileFilter() const
+QString LightApp_Application::getFileFilter( bool /*open*/) const
 {
-  //return "(*.bin)";
-  // HDF persistence
   return "(*.hdf)";
 }
 

diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h
index 92654622873d8cb04626f4c85317dbe4d863fd89..5f98a8794e378ca63ffad2add20e228cf3c9c1d4 100644 (file)
--- a/src/LightApp/LightApp_Application.h
+++ b/src/LightApp/LightApp_Application.h
@@ -118,7 +118,7 @@ public:
 
   LightApp_Preferences*               preferences() const;
 
-  virtual QString                     getFileFilter() const;
+  virtual QString                     getFileFilter( bool ) const;
 
   virtual QString                     getFileName( bool open, const QString& initial, const QString& filters,
                                                    const QString& caption, QWidget* parent );

diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx
index ff308b7d78cb620f6f5186a717cef3b1fe4d3fc2..d252e149199e4b51c1f7d1fcbe4bab3f99aed980 100755 (executable)
--- a/src/STD/STD_Application.cxx
+++ b/src/STD/STD_Application.cxx
@@ -314,7 +314,7 @@ bool STD_Application::onNewDoc( const QString& name )
 void STD_Application::onOpenDoc()
 {
   // It is preferrable to use OS-specific file dialog box here !!!
-  QString aName = getFileName( true, QString(), getFileFilter(), QString(), 0 );
+  QString aName = getFileName( true, QString(), getFileFilter( true ), QString(), 0 );
   if ( aName.isNull() )
     return;
 
@@ -611,7 +611,7 @@ bool STD_Application::onSaveAsDoc()
   bool isOk = false;
   while ( !isOk )
   {
-    QString aName = getFileName( false, study->studyName(), getFileFilter(), QString(), 0 );
+    QString aName = getFileName( false, study->studyName(), getFileFilter( false ), QString(), 0 );
     if ( aName.isNull() )
       return false;
 
@@ -884,6 +884,12 @@ void STD_Application::onConnectPopupRequest( SUIT_PopupClient* client, QContextM
   delete popup;
 }
 
+/*!\retval QString - return file extension(s).*/
+QString STD_Application::getFileFilter( bool /*open*/ ) const
+{
+  return QString();
+}
+
 /*!\retval QString - return file name from dialog.*/
 QString STD_Application::getFileName( bool open, const QString& initial, const QString& filters,
                                       const QString& caption, QWidget* parent )

diff --git a/src/STD/STD_Application.h b/src/STD/STD_Application.h
index 06ad40df96b1b01ed08ecb1276d3b2b5907242db..c709c95cdba23b748a499eb0a262c1fa2f349633 100755 (executable)
--- a/src/STD/STD_Application.h
+++ b/src/STD/STD_Application.h
@@ -60,7 +60,7 @@ public:
          UserID
   };
 
- public:
+public:
   STD_Application();
   virtual ~STD_Application();
 
@@ -88,9 +88,9 @@ public:
   void                  viewManagers( const QString&, ViewManagerList& ) const;
   virtual int           viewManagerId (const SUIT_ViewManager* ) const;
 
-  virtual QString       getFileFilter() const { return QString(); }
+  virtual QString       getFileFilter( bool open ) const;
   virtual QString       getFileName( bool open, const QString& initial, const QString& filters,
-                                                             const QString& caption, QWidget* parent );
+                                    const QString& caption, QWidget* parent );
   QString               getDirectory( const QString& initial, const QString& caption, QWidget* parent );
 
   virtual void          start();

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index e16d11d53ecb608ba01690486babb94ca3d60b3d..12a733584f9f9a98abad23a815311544ccee5f4e 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -969,14 +969,6 @@ void SalomeApp_Application::onDockWindowVisibilityChanged( bool theIsVisible )
     objectBrowserColumnsVisibility();
 }
 
-/*!Gets file filter.
- *\retval QString "(*.hdf)"
- */
-QString SalomeApp_Application::getFileFilter() const
-{
-  return "(*.hdf)";
-}
-
 /*!Create window.*/
 QWidget* SalomeApp_Application::createWindow( const int flag )
 {

diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h
index c2b62929da0c4e3ab85403d91621293f2b44ed3a..ae6775ea7962fb721b733ceb93e062aa98736f70 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.h
+++ b/src/SalomeApp/SalomeApp_Application.h
@@ -87,8 +87,6 @@ public:
 
   virtual void                        updateObjectBrowser( const bool = true );
 
-  virtual QString                     getFileFilter() const;
-
   virtual void                        start();
 
   virtual void                        contextMenuPopup( const QString&, QMenu*, QString& );