refs #193: OCC viwer problems when move line

A fix to avoid black-colored window.
A fix from the SALOME 7.5.

diff --git a/src/XGUI/XGUI_RubberBand.cpp b/src/XGUI/XGUI_RubberBand.cpp
index 1ed0d5f320cf419ca0258aecee3079c9096de4a8..390368256f94b36da8686400c094818381e47c3c 100644 (file)
--- a/src/XGUI/XGUI_RubberBand.cpp
+++ b/src/XGUI/XGUI_RubberBand.cpp
@@ -137,7 +137,8 @@ void XGUI_AbstractRubberBand::updateMask()
   if (isClosed())\r
     r += createRegion(myPoints.last(), myPoints.first());\r
 \r
-  setMask(r);\r
+  if (!r.isEmpty())\r
+    setMask(r);\r
 }\r
 \r
 //**********************************************************\r

diff --git a/src/XGUI/XGUI_ViewWindow.cpp b/src/XGUI/XGUI_ViewWindow.cpp
index 78c7f7195ea3ca5d32be07a4a06af7b2f62554cd..b07d4676aa76480f9cc2b6e374390ad85db1d3d4 100644 (file)
--- a/src/XGUI/XGUI_ViewWindow.cpp
+++ b/src/XGUI/XGUI_ViewWindow.cpp
@@ -873,16 +873,6 @@ void XGUI_ViewWindow::vpMouseMoveEvent(QMouseEvent* theEvent)
  */
 void XGUI_ViewWindow::drawRect()
 {
-  // there is a fix for a black-colored window 
-  // the rubber band is valid if the values delta is less than 1
-  // TODO: move this fix to the RectRubberBand according to SALOME 7.5
-  double aDeltaX = fabs((float)(myStartX-myCurrX));
-  double aDeltaY = fabs((float)(myStartY-myCurrY));
-  if (aDeltaX <= 1 || aDeltaY == 1) {
-    endDrawRect();
-    return;
-  }
-
   if (!myRectBand) {
     myRectBand = new XGUI_RectRubberBand(myViewPort);
   }