Update of MFC samples for problem "Mouse selection issue is repeatable on all your...

diff --git a/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp b/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp
index 71d886f2a0b80ced1e9cba3bfb8c2294017b8cb0..b4c658cfd8e54dc8333f527e47d0f53df77c44e1 100755 (executable)
--- a/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp
@@ -680,8 +680,8 @@ void CViewer3dView::OnMouseMove(UINT nFlags, CPoint point)
                     GetDocument()->ShiftDragEvent(myXmax,myYmax,0,myView);
            else
              GetDocument()->DragEvent(myXmax,myYmax,0,myView);
-                  DrawRectangle(myXmin,myYmin,myXmax,myYmax,Standard_True);
-          break;
+           DrawRectangle(myXmin,myYmin,myXmax,myYmax,Standard_True);
+           break;
          case CurAction3d_DynamicZooming :
               myView->Zoom(myXmax,myYmax,point.x,point.y); 
               // save the current mouse coordinate in min \n";
@@ -856,9 +856,11 @@ void CViewer3dView::DrawRectangle(const Standard_Integer  MinX    ,
 
     if ( m_IsVisible && !Draw) // move or up  : erase at the old position 
     {
-     clientDC.MoveTo(StoredMinX,StoredMinY); clientDC.LineTo(StoredMinX,StoredMaxY); 
+     clientDC.MoveTo(StoredMinX,StoredMinY); 
+     clientDC.LineTo(StoredMinX,StoredMaxY); 
      clientDC.LineTo(StoredMaxX,StoredMaxY); 
-        clientDC.LineTo(StoredMaxX,StoredMinY); clientDC.LineTo(StoredMinX,StoredMinY);
+          clientDC.LineTo(StoredMaxX,StoredMinY); 
+     clientDC.LineTo(StoredMinX,StoredMinY);
      m_IsVisible = false;
     }
 
@@ -869,13 +871,16 @@ void CViewer3dView::DrawRectangle(const Standard_Integer  MinX    ,
 
     if (Draw) // move : draw
     {
-     clientDC.MoveTo(StoredMinX,StoredMinY); clientDC.LineTo(StoredMinX,StoredMaxY); 
+     clientDC.MoveTo(StoredMinX,StoredMinY); 
+     clientDC.LineTo(StoredMinX,StoredMaxY); 
      clientDC.LineTo(StoredMaxX,StoredMaxY); 
-        clientDC.LineTo(StoredMaxX,StoredMinY); clientDC.LineTo(StoredMinX,StoredMinY);
+          clientDC.LineTo(StoredMaxX,StoredMinY); 
+     clientDC.LineTo(StoredMinX,StoredMinY);
      m_IsVisible = true;
    }
 
-    if (m_Pen) clientDC.SelectObject(aOldPen);
+    if (m_Pen) 
+      clientDC.SelectObject(aOldPen);
 }
 
 void CViewer3dView::OnModifyChangeBackground() 

diff --git a/samples/mfc/standard/09_Animation/src/AnimationDoc.cpp b/samples/mfc/standard/09_Animation/src/AnimationDoc.cpp
index 7d29171c496b6096099bac03b90af6f9c2c3a28b..3c527c413ab227d7393259dc4516ce40d9ae70cf 100755 (executable)
--- a/samples/mfc/standard/09_Animation/src/AnimationDoc.cpp
+++ b/samples/mfc/standard/09_Animation/src/AnimationDoc.cpp
@@ -198,7 +198,7 @@ void CAnimationDoc::DragEvent(const Standard_Integer  x        ,
       theButtonDownY=y;
     }
 
-       if (TheState == 0)
+       if (TheState == 1)
          myAISContext->Select(theButtonDownX,theButtonDownY,x,y,aView);  
 }
 

diff --git a/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp b/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp
index 92389980aaa77377bcba5aa3a5e2df0b5e318182..711fd28fd0d10026637b40b8247ce80d8c3e6c5c 100755 (executable)
--- a/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp
+++ b/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp
@@ -82,9 +82,10 @@ void OCC_3dBaseDoc::DragEvent(const Standard_Integer  x        ,
       theButtonDownX=x;
       theButtonDownY=y;
     }
-
-       if (TheState == 0)
-         myAISContext->Select(theButtonDownX,theButtonDownY,x,y,aView);  
+       if (TheState == 1)
+  {
+     myAISContext->Select(theButtonDownX,theButtonDownY,x,y,aView);
+  }
 }
 
 //-----------------------------------------------------------------------------------------
@@ -94,7 +95,7 @@ void OCC_3dBaseDoc::InputEvent(const Standard_Integer  x     ,
                                                   const Standard_Integer  y     ,
                                    const Handle(V3d_View)& aView ) 
 {
-    myAISContext->Select(); 
+   myAISContext->Select(); 
 }
 
 //-----------------------------------------------------------------------------------------