From: vsv <vsv@opencascade.com>
Date: Mon, 25 Nov 2019 10:01:42 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/EDF_2019'
X-Git-Tag: V9_5_0a1~166
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=584f97832c77adf0c9df154b2f3eb1835bd3ce9e;p=modules%2Fshaper.git

Merge remote-tracking branch 'origin/EDF_2019'

# Conflicts:
#	src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_2.py
#	src/PartSet/PartSet_WidgetSketchLabel.h
#	src/XGUI/XGUI_Workshop.cpp
---

584f97832c77adf0c9df154b2f3eb1835bd3ce9e
diff --cc src/PartSet/PartSet_WidgetSketchLabel.h
index 0e19d7470,9144f9ef4..51ad42aba
--- a/src/PartSet/PartSet_WidgetSketchLabel.h
+++ b/src/PartSet/PartSet_WidgetSketchLabel.h
@@@ -41,7 -42,7 +42,8 @@@ class XGUI_Workshop
  class QCheckBox;
  class QStackedWidget;
  class QLineEdit;
 +class QPushButton;
+ class QDialog;
  
  /**
  * \ingroup Modules
diff --cc src/XGUI/XGUI_Displayer.cpp
index c96dd3e7c,b9ff21eef..68549f2b2
--- a/src/XGUI/XGUI_Displayer.cpp
+++ b/src/XGUI/XGUI_Displayer.cpp
@@@ -121,8 -123,9 +121,8 @@@ QString qIntListInfo(const QIntList& th
  //**************************************************************
  XGUI_Displayer::XGUI_Displayer(XGUI_Workshop* theWorkshop)
  : myWorkshop(theWorkshop), myNeedUpdate(false),
-   myViewerBlockedRecursiveCount(0), myIsFirstAISContextUse(true)
+   myViewerBlockedRecursiveCount(0), myContextId(0)
  {
 -  myCustomPrs = std::shared_ptr<GeomAPI_ICustomPrs>(new XGUI_CustomPrs(theWorkshop));
  }
  
  //**************************************************************
diff --cc src/XGUI/XGUI_Workshop.cpp
index 28b7699ec,b00a040be..2dd70bb5a
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@@ -273,6 -279,25 +278,9 @@@ XGUI_Workshop::XGUI_Workshop(XGUI_Salom
    connect(myEventsListener, SIGNAL(errorOccurred(std::shared_ptr<Events_InfoMessage>)),
            myErrorDlg, SLOT(addError(std::shared_ptr<Events_InfoMessage>)));
  
 -  //Config_PropManager::registerProp("Visualization", "object_default_color", "Object color",
 -  //                                 Config_Prop::Color, "225,225,225");
 -
 -  Config_PropManager::registerProp("Visualization", "result_body_color", "Result 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());
 -  Config_PropManager::registerProp("Visualization", "result_part_color", "Part color",
 -                                   Config_Prop::Color, ModelAPI_ResultPart::DEFAULT_COLOR());
 -  Config_PropManager::registerProp("Visualization", "result_field_color", "Field color",
 -                                   Config_Prop::Color, ModelAPI_ResultField::DEFAULT_COLOR());
 -
+   Config_PropManager::registerProp("Visualization", "selection_color", "Selection color",
+     Config_Prop::Color, "255,255,255");
+ 
    if (ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "face-selection", true))
      myViewerSelMode.append(TopAbs_FACE);
    if (ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "edge-selection", true))