Resources XML file created

diff --git a/msvc10_env.bat b/msvc10_env.bat
index 064ec4e307c8b8173957a2c7c97962a471e3e990..41f21666cf7153e110bd6cd26e77ee086758fe78 100644 (file)
--- a/msvc10_env.bat
+++ b/msvc10_env.bat
@@ -149,6 +149,8 @@ if "%GUI_ROOT_DIR%" == "" (
 @REM -------------------------
 
 
+@SET NewGeomResources=%ROOT_DIR%\install\resources
+
 rem -------- Visual Studio --------------------
 rem Detect Visual Studio (either commercial or Express edition)
 if "%VS100COMNTOOLS%" == "" (

diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt
index 4d4de17e1af317af0f4167b2e3de867e87acd215..2786db20b755a74ca2504cbcdb0480b34c3a7c77 100644 (file)
--- a/src/PartSet/CMakeLists.txt
+++ b/src/PartSet/CMakeLists.txt
@@ -77,6 +77,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/XGUI
                     ${CMAKE_SOURCE_DIR}/src/SketchPlugin
                     ${CMAKE_SOURCE_DIR}/src/GeomAPI
                     ${CAS_INCLUDE_DIRS}
+                                       ${SUIT_INCLUDE}
 )
 
 ADD_DEFINITIONS(-DPARTSET_EXPORTS ${CAS_DEFINITIONS})

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index 307dbff6be4db0c67ef89e0cf67385dbdbc54854..a5a31330139a65f38fd5fbf4b66b6fd33b3fd5d4 100644 (file)
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -16,7 +16,6 @@ SET(PROJECT_HEADERS
     XGUI_Viewer.h
        XGUI_RubberBand.h
        XGUI_Constants.h
-       XGUI_ViewBackground.h
        XGUI_DocumentDataModel.h
        XGUI_PartDataModel.h
        XGUI_ObjectsBrowser.h
@@ -51,7 +50,6 @@ SET(PROJECT_SOURCES
     XGUI_ViewPort.cpp
     XGUI_Viewer.cpp
        XGUI_RubberBand.cpp
-       XGUI_ViewBackground.cpp
        XGUI_DocumentDataModel.cpp
        XGUI_PartDataModel.cpp
        XGUI_ObjectsBrowser.cpp
@@ -70,6 +68,10 @@ SET(PROJECT_RESOURCES
     XGUI_pictures.qrc
 )
 
+SET(PREFERENCES_XML
+       NewGeom.xml
+)
+
 SET(TEXT_RESOURCES
        XGUI_msg_fr.ts
 )
@@ -82,6 +84,8 @@ SET(PROJECT_LIBRARIES
        ${CAS_KERNEL}
        ${PyConsole}
        ${PyInterp}
+       ${suit}
+       ${qtx}
        ModelAPI
        ModuleBase
 )
@@ -104,7 +108,7 @@ QT4_CREATE_TRANSLATION(QM_RESOURCES
 
 SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
 #SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES})
-SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES})
+SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES} ${PREFERENCES_XML})
 
 ADD_DEFINITIONS( -DXGUI_EXPORTS ${CAS_DEFINITIONS} )
 
@@ -125,6 +129,7 @@ ADD_LIBRARY(XGUI SHARED
        ${PROJECT_COMPILED_RESOURCES} 
        ${TEXT_RESOURCES}
        ${QM_RESOURCES}
+       ${PREFERENCES_XML}
 )
 
 ADD_DEPENDENCIES(XGUI ModelAPI)
@@ -134,3 +139,4 @@ TARGET_LINK_LIBRARIES(XGUI ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS XGUI DESTINATION bin)
 INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)
+INSTALL(FILES ${PREFERENCES_XML} DESTINATION resources)

diff --git a/src/XGUI/NewGeom.xml b/src/XGUI/NewGeom.xml
new file mode 100644 (file)
index 0000000..0f76d83
--- /dev/null
+++ b/src/XGUI/NewGeom.xml
@@ -0,0 +1,8 @@
+<!--
+-->
+<document>
+  <section name="Viewer" >
+    <!-- OCC viewer preferences -->
+    <parameter name="background" value="bt=2;fn=;tm=0;ts=false;c1=#cddbff;c2=#698fff;gt=1;gr=" />
+ </section>
+</document>

diff --git a/src/XGUI/XGUI_ViewPort.cpp b/src/XGUI/XGUI_ViewPort.cpp
index 6ec2c0c65f51c35f6c852dd8e76721ca28ba4bb2..609db462fa7eb2248208512245eaeb10d3fc1344 100644 (file)
--- a/src/XGUI/XGUI_ViewPort.cpp
+++ b/src/XGUI/XGUI_ViewPort.cpp
@@ -492,7 +492,7 @@ void XGUI_ViewPort::zoom(int x0, int y0, int x, int y)
 /*!
  Sets the background data
  */
-void XGUI_ViewPort::setBackground(const XGUI_ViewBackground& bgData)
+void XGUI_ViewPort::setBackground(const Qtx::BackgroundData& bgData)
 {
   if (bgData.isValid()) {
     myBackground = bgData;

diff --git a/src/XGUI/XGUI_ViewPort.h b/src/XGUI/XGUI_ViewPort.h
index a0f9be0db84e93569d12157641528f1e399f725e..2988e8fed69494726b90a7480fe725a7e605656d 100644 (file)
--- a/src/XGUI/XGUI_ViewPort.h
+++ b/src/XGUI/XGUI_ViewPort.h
@@ -2,7 +2,8 @@
 #define XGUI_ViewPort_H
 
 #include "XGUI.h"
-#include "XGUI_ViewBackground.h"
+
+#include <Qtx.h>
 
 #include <QWidget>
 #include <V3d_Viewer.hxx>
@@ -52,17 +53,17 @@ public:
     return myIsAdvancedZoomingEnabled;
   }
 
-  XGUI_ViewBackground background() const
+  Qtx::BackgroundData background() const
   {
     return myBackground;
   }
 
-  void setBackground(const XGUI_ViewBackground& bgData);
+  void setBackground(const Qtx::BackgroundData& bgData);
 
   void syncronizeWith( const XGUI_ViewPort* ref );
 
 signals:
-  void vpChangeBackground(const XGUI_ViewBackground&);
+  void vpChangeBackground(const Qtx::BackgroundData&);
   void vpClosed();
   void vpMapped();
   void vpTransformed();
@@ -94,7 +95,7 @@ private:
 
   double myScale;
 
-  XGUI_ViewBackground myBackground;
+  Qtx::BackgroundData myBackground;
   int myBgImgHeight;
   int myBgImgWidth;
 };

diff --git a/src/XGUI/XGUI_ViewWindow.cpp b/src/XGUI/XGUI_ViewWindow.cpp
index 7c0bc5d9ac14c8c9e225178db90b52ae4344bf63..c62a266524ab56dbe29c05f6a2c27b16d874c0b6 100644 (file)
--- a/src/XGUI/XGUI_ViewWindow.cpp
+++ b/src/XGUI/XGUI_ViewWindow.cpp
@@ -1004,12 +1004,12 @@ void XGUI_ViewWindow::resetState()
   setTransformRequested(NOTHING);
 }
 
-XGUI_ViewBackground XGUI_ViewWindow::background() const
+Qtx::BackgroundData XGUI_ViewWindow::background() const
 {
-  return myViewPort ? myViewPort->background() : XGUI_ViewBackground();
+  return myViewPort ? myViewPort->background() : Qtx::BackgroundData();
 }
 
-void XGUI_ViewWindow::setBackground(const XGUI_ViewBackground& theBackground)
+void XGUI_ViewWindow::setBackground(const Qtx::BackgroundData& theBackground)
 {
   if (myViewPort) 
        myViewPort->setBackground( theBackground );

diff --git a/src/XGUI/XGUI_ViewWindow.h b/src/XGUI/XGUI_ViewWindow.h
index 65c2ae273cc87b9c50a25f7636d97de8515aff75..016c261d969f0402b77113db4edd06379d2d2ca8 100644 (file)
--- a/src/XGUI/XGUI_ViewWindow.h
+++ b/src/XGUI/XGUI_ViewWindow.h
@@ -3,7 +3,8 @@
 
 #include "XGUI.h"
 #include "XGUI_Constants.h"
-#include "XGUI_ViewBackground.h"
+
+#include <Qtx.h>
 
 #include <QFrame>
 #include <QIcon>
@@ -76,10 +77,10 @@ public:
   bool transformEnabled(const OperationType) const;
 
   //! Returns View background object
-  XGUI_ViewBackground background() const;
+  Qtx::BackgroundData background() const;
 
   //! Sets View background object
-  void setBackground(const XGUI_ViewBackground& theBackground);
+  void setBackground(const Qtx::BackgroundData& theBackground);
 
   //! Returns true if the current view window can be closed
   bool closable() const { return myClosable; }

diff --git a/src/XGUI/XGUI_Viewer.cpp b/src/XGUI/XGUI_Viewer.cpp
index 549b3e449c495895978eb5bc9c694f21d10fc1a6..c0048f2fad54430451e33e24e6f1c95d0862f5c8 100644 (file)
--- a/src/XGUI/XGUI_Viewer.cpp
+++ b/src/XGUI/XGUI_Viewer.cpp
@@ -2,6 +2,9 @@
 #include "XGUI_MainWindow.h"
 #include "XGUI_ViewWindow.h"
 #include "XGUI_ViewPort.h"
+#include "XGUI_Workshop.h"
+
+#include <SUIT_ResourceMgr.h>
 
 #include <QMdiArea>
 #include <QMdiSubWindow>
@@ -181,8 +184,8 @@ QMdiSubWindow* XGUI_Viewer::createView(V3d_TypeOfView theType)
   if (myViews.size() == 0) 
     setTrihedronShown(true);
 
-  view->setBackground(XGUI_ViewBackground(XGUI::VerticalGradient, Qt::white, QColor(Qt::blue).lighter()));
-  //view->setBackground(XGUI_ViewBackground(Qt::black));
+  Qtx::BackgroundData aBk = XGUI_Workshop::resourceMgr()->backgroundValue("Viewer", "background");
+  view->setBackground(aBk);
   view->updateEnabledDrawMode();
 
   QMdiArea* aMDI = myMainWindow->mdiArea();

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index adc15c34041928ca0a51df06e817624db601c9bf..a18688e229ec8ecf090e2a8f4aab979cc9952291 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -50,6 +50,8 @@
 #include <Config_PointerMessage.h>
 #include <Config_ModuleReader.h>
 
+#include <SUIT_ResourceMgr.h>
+
 #include <QApplication>
 #include <QFileDialog>
 #include <QMessageBox>
@@ -69,6 +71,7 @@
 #include <dlfcn.h>
 #endif
 
+SUIT_ResourceMgr* XGUI_Workshop::myResourceMgr = 0;
 
 QMap<QString, QString> XGUI_Workshop::myIcons;
 
@@ -89,6 +92,10 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
   myObjectBrowser(0),
   myDisplayer(0)
 {
+  if (!myResourceMgr) {
+    myResourceMgr = new SUIT_ResourceMgr("NewGeom");
+    myResourceMgr->setCurrentFormat("xml");
+  }
   myMainWindow = mySalomeConnector? 0 : new XGUI_MainWindow();
 
   myDisplayer = new XGUI_Displayer(this);

diff --git a/src/XGUI/XGUI_Workshop.h b/src/XGUI/XGUI_Workshop.h
index b857becb3abad33b6d6a375aedc1dbb7f9aac295..c83583cc0f8094bbcf973eaeb5d381776d156a41 100644 (file)
--- a/src/XGUI/XGUI_Workshop.h
+++ b/src/XGUI/XGUI_Workshop.h
@@ -43,6 +43,8 @@ class ModelAPI_ObjectUpdatedMessage;
 class ModelAPI_ObjectDeletedMessage;
 class QAction;
 
+class SUIT_ResourceMgr;
+
 /**\class XGUI_Workshop
  * \ingroup GUI
  * \brief Class which defines a configuration of the application (Workshop) and launches it.
@@ -111,6 +113,8 @@ public:
   //! Returns icon name according to feature Id
   static QString featureIcon(const std::string& theId);
 
+  static SUIT_ResourceMgr* resourceMgr() { return myResourceMgr; }
+
   //! Activates or deactivates a part
   //! If PartPtr is Null pointer then PartSet will be activated
   void activatePart(ResultPartPtr theFeature);
@@ -213,6 +217,8 @@ private:
   QString myCurrentDir;
   static QMap<QString, QString> myIcons;
 
+  static SUIT_ResourceMgr* myResourceMgr;
+
 };
 
 #endif