Issue #637: Create visualization properties at Workshop constructor

diff --git a/src/Model/Model_ResultBody.h b/src/Model/Model_ResultBody.h
index 75f9863f1896faf434f4193ca954380f6b84cbaf..1bb3f6870aba1633150bc361e5816d4c705a5f46 100644 (file)
--- a/src/Model/Model_ResultBody.h
+++ b/src/Model/Model_ResultBody.h
@@ -29,13 +29,6 @@ class Model_ResultBody : public ModelAPI_ResultBody
   /// label; index in vector corresponds to the label tag
   std::vector<TNaming_Builder*> myBuilders;
 public:
-  /// default color for a result body
-  inline static const std::string& DEFAULT_COLOR()
-  {
-    static const std::string RESULT_BODY_COLOR("150,150,180");
-    return RESULT_BODY_COLOR;
-  }
-
   /// Request for initialization of data model of the result: adding all attributes
   virtual void initAttributes();
 

diff --git a/src/Model/Model_ResultConstruction.h b/src/Model/Model_ResultConstruction.h
index ac07a4a6225f89995983c561fcd11e20e4180c51..42fff591b6c08b02eada5fd85f20d06bd3c1bbe9 100644 (file)
--- a/src/Model/Model_ResultConstruction.h
+++ b/src/Model/Model_ResultConstruction.h
@@ -27,13 +27,6 @@ class Model_ResultConstruction : public ModelAPI_ResultConstruction
   bool myIsInHistory;
   bool myIsInfinite;
  public:
-  /// default color for a result construction
-  inline static const std::string& DEFAULT_COLOR()
-  {
-    static const std::string RESULT_CONSTRUCTION_COLOR("120,120,120");
-    return RESULT_CONSTRUCTION_COLOR;
-  }
-
   /// Request for initialization of data model of the result: adding all attributes
   virtual void initAttributes();
 

diff --git a/src/Model/Model_ResultGroup.h b/src/Model/Model_ResultGroup.h
index be220052fb987e89b2da637c0ed06c1289a91417..3de093e745bf9c79d1c36283942ab8d1484ae90b 100644 (file)
--- a/src/Model/Model_ResultGroup.h
+++ b/src/Model/Model_ResultGroup.h
@@ -20,12 +20,6 @@ class Model_ResultGroup : public ModelAPI_ResultGroup
 {
   std::shared_ptr<ModelAPI_Data> myOwnerData;  ///< data of owner of this result
 public:
-  /// default color for a result body
-  inline static const std::string& DEFAULT_COLOR()
-  {
-    static const std::string RESULT_GROUP_COLOR("150,150,180");
-    return RESULT_GROUP_COLOR;
-  }
   /// Request for initialization of data model of the result: adding all attributes
   virtual void initAttributes();
 

diff --git a/src/ModelAPI/ModelAPI_ResultBody.h b/src/ModelAPI/ModelAPI_ResultBody.h
index fb5751938d5ecaace295369f6d812979e749beb5..05aeab91c11d215496399b3b091cdc4558faadf6 100644 (file)
--- a/src/ModelAPI/ModelAPI_ResultBody.h
+++ b/src/ModelAPI/ModelAPI_ResultBody.h
@@ -36,6 +36,13 @@ public:
     return MY_GROUP;
   }
 
+  /// default color for a result body
+  inline static const std::string& DEFAULT_COLOR()
+  {
+    static const std::string RESULT_BODY_COLOR("150,150,180");
+    return RESULT_BODY_COLOR;
+  }
+
   /// Stores the shape (called by the execution method).
   virtual void store(const std::shared_ptr<GeomAPI_Shape>& theShape) = 0;
 

diff --git a/src/ModelAPI/ModelAPI_ResultConstruction.h b/src/ModelAPI/ModelAPI_ResultConstruction.h
index f24fb0d909a1ad387282367cf0b6c8b3c3df1d13..41d74975c1960e82ce44ad175510b70ed73d3db0 100644 (file)
--- a/src/ModelAPI/ModelAPI_ResultConstruction.h
+++ b/src/ModelAPI/ModelAPI_ResultConstruction.h
@@ -33,6 +33,13 @@ class ModelAPI_ResultConstruction : public ModelAPI_Result
     return MY_GROUP;
   }
 
+  /// default color for a result construction
+  inline static const std::string& DEFAULT_COLOR()
+  {
+    static const std::string RESULT_CONSTRUCTION_COLOR("120,120,120");
+    return RESULT_CONSTRUCTION_COLOR;
+  }
+
   /// Sets the result
   virtual void setShape(std::shared_ptr<GeomAPI_Shape> theShape) = 0;
 

diff --git a/src/ModelAPI/ModelAPI_ResultGroup.h b/src/ModelAPI/ModelAPI_ResultGroup.h
index 365445f4d6d3c30edb6ff214f4104a55345d870a..8e2ac8adabcc20489a236b1f5a894ca347eefee6 100644 (file)
--- a/src/ModelAPI/ModelAPI_ResultGroup.h
+++ b/src/ModelAPI/ModelAPI_ResultGroup.h
@@ -32,6 +32,13 @@ public:
     return MY_GROUP;
   }
 
+  /// default color for a result body
+  inline static const std::string& DEFAULT_COLOR()
+  {
+    static const std::string RESULT_GROUP_COLOR("150,150,180");
+    return RESULT_GROUP_COLOR;
+  }
+
 };
 
 //! Pointer on feature object

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index bab934f7938c53edc5e7a7202d8cc0afe9107853..8e0f82a4a5ea195f88e12e8c2f2e7c5724369e43 100644 (file)
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -121,7 +121,6 @@ INCLUDE_DIRECTORIES(
     ${CAS_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/src/Config
     ${CMAKE_SOURCE_DIR}/src/Events
-    ${CMAKE_SOURCE_DIR}/src/Model
     ${CMAKE_SOURCE_DIR}/src/ModelAPI
     ${CMAKE_SOURCE_DIR}/src/GeomDataAPI
     ${CMAKE_SOURCE_DIR}/src/GeomAPI

diff --git a/src/ModuleBase/ModuleBase_Preferences.cpp b/src/ModuleBase/ModuleBase_Preferences.cpp
index c4a8fa2ef6367f87c75f330e2c9710d67dd52fdd..616e659e06c6a9c69bc0fbdb8ff39ea3470c54b0 100644 (file)
--- a/src/ModuleBase/ModuleBase_Preferences.cpp
+++ b/src/ModuleBase/ModuleBase_Preferences.cpp
@@ -7,10 +7,6 @@
 #include "ModuleBase_Preferences.h"
 //#include "ModuleBase_Constants.h"
 
-#include <Model_ResultBody.h>
-#include <Model_ResultGroup.h>
-#include <Model_ResultConstruction.h>
-
 #include <Config_PropManager.h>
 
 #include <SUIT_ResourceMgr.h>
@@ -260,16 +256,6 @@ void ModuleBase_PreferencesDlg::createViewerPage(int thePageId)
   myPreferences->setItemProperty("texture_stretch_enabled", true, bgId);
   myPreferences->setItemProperty("custom_enabled", false, bgId);
   myPreferences->setItemProperty("image_formats", aImgFiles, bgId);
-
-  //Config_PropManager::registerProp("Visualization", "object_default_color", "Object color",
-  //                                 Config_Prop::Color, "225,225,225");
-
-  Config_PropManager::registerProp("Visualization", "result_body_color", "Body color",
-                                   Config_Prop::Color, Model_ResultBody::DEFAULT_COLOR());
-  Config_PropManager::registerProp("Visualization", "result_group_color", "Group color",
-                                   Config_Prop::Color, Model_ResultGroup::DEFAULT_COLOR());
-  Config_PropManager::registerProp("Visualization", "result_construction_color", "Construction color",
-                                   Config_Prop::Color, Model_ResultConstruction::DEFAULT_COLOR());
 }
 
 void ModuleBase_PreferencesDlg::createMenuPage(int thePageId)

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index bbcef0e89cf857a8122008490661e4f6fae4eca7..49abca2021ac9a28a8f05b4aa3d9572b0a71e31b 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -153,6 +153,16 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
   if (myMainWindow)
     connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit()));
   connect(this, SIGNAL(errorOccurred(const QString&)), myErrorDlg, SLOT(addError(const QString&)));
+
+  //Config_PropManager::registerProp("Visualization", "object_default_color", "Object color",
+  //                                 Config_Prop::Color, "225,225,225");
+
+  Config_PropManager::registerProp("Visualization", "result_body_color", "Body color",
+                                   Config_Prop::Color, ModelAPI_ResultBody::DEFAULT_COLOR());
+  Config_PropManager::registerProp("Visualization", "result_group_color", "Group color",
+                                   Config_Prop::Color, ModelAPI_ResultGroup::DEFAULT_COLOR());
+  Config_PropManager::registerProp("Visualization", "result_construction_color", "Construction color",
+                                   Config_Prop::Color, ModelAPI_ResultConstruction::DEFAULT_COLOR());
 }
 
 //******************************************************