0031102: Visualization, AIS_ViewController - AIS_DragAction_Stop is never emitted on mouse unclick

AIS_ViewController::UpdateMousePosition() now sets myMouseStopDragOnUnclick flag
to emit AIS_DragAction_Stop on mouse unclick.

src/AIS/AIS_ViewController.cxx

@@ -69,6 +69,7 @@ AIS_ViewController::AIS_ViewController()
   myMousePressed        (Aspect_VKeyMouse_NONE),
   myMouseModifiers      (Aspect_VKeyFlags_NONE),
   myMouseSingleButton   (-1),
+  myMouseStopDragOnUnclick (false),
   //
   myTouchToleranceScale      (1.0f),
   myTouchRotationThresholdPx (6.0f),
@@ -611,6 +612,7 @@ bool AIS_ViewController::UpdateMouseButtons (const Graphic3d_Vec2i& thePoint,
     {
       myMouseClickTimer.Stop();
       myMouseClickCounter = 0;
+      myMouseStopDragOnUnclick = false;
       myUI.Dragging.ToStop = true;
       toUpdateView = true;
     }
@@ -619,6 +621,12 @@ bool AIS_ViewController::UpdateMouseButtons (const Graphic3d_Vec2i& thePoint,
   else if (theButtons == Aspect_VKeyMouse_NONE)
   {
     myMouseSingleButton = -1;
+    if (myMouseStopDragOnUnclick)
+    {
+      myMouseStopDragOnUnclick = false;
+      myUI.Dragging.ToStop = true;
+      toUpdateView = true;
+    }
   }
   else if (myMouseSingleButton == -1)
   {
@@ -769,6 +777,7 @@ bool AIS_ViewController::UpdateMousePosition (const Graphic3d_Vec2i& thePoint,
       myMouseClickTimer.Stop();
       myMouseClickCounter = 0;
       myMouseSingleButton = -1;
+      myMouseStopDragOnUnclick = true;
     }
   }
 

src/AIS/AIS_ViewController.hxx

@@ -647,6 +647,7 @@ protected: //! @name mouse input variables
   Aspect_VKeyMouse    myMousePressed;             //!< active mouse buttons
   Aspect_VKeyFlags    myMouseModifiers;           //!< active key modifiers passed with last mouse event
   Standard_Integer    myMouseSingleButton;        //!< index of mouse button pressed alone (>0)
+  Standard_Boolean    myMouseStopDragOnUnclick;   //!< queue stop dragging even with at next mouse unclick
 
 protected: //! @name multi-touch input variables
 

src/RWStl/RWStl.cxx

@@ -97,25 +97,9 @@ namespace
       return aPoly;
     }
 
-    //! Add new solid
-    virtual void AddSolid() Standard_OVERRIDE
-    {
-      Handle(Poly_Triangulation) aCurrentTri = GetTriangulation();
-      myTriangulationList.Append(aCurrentTri);
-      myNodes.Clear();
-      myTriangles.Clear();
-    }
-
-    NCollection_Sequence<Handle(Poly_Triangulation)> GetTriangulationList()
-    {
-      return myTriangulationList;
-    }
-
-
   private:
     NCollection_Vector<gp_XYZ> myNodes;
     NCollection_Vector<Poly_Triangle> myTriangles;
-    NCollection_Sequence<Handle(Poly_Triangulation)> myTriangulationList;
   };
 
 }
@@ -134,17 +118,6 @@ Handle(Poly_Triangulation) RWStl::ReadFile (const Standard_CString theFile,
   return aReader.GetTriangulation();
 }
 
-//=============================================================================
-//function : ReadFile
-//purpose  :
-//=============================================================================
-void RWStl::ReadFile(const Standard_CString theFile, NCollection_Sequence<Handle(Poly_Triangulation)>& theTriangList)
-{
-  Reader aReader;
-  aReader.Read(theFile, Handle(Message_ProgressIndicator)(), true);
-  theTriangList = aReader.GetTriangulationList();
-}
-
 //=============================================================================
 //function : ReadFile
 //purpose  :

src/RWStl/RWStl.hxx

@@ -50,8 +50,6 @@ public:
   Standard_EXPORT static Handle(Poly_Triangulation) ReadFile (const Standard_CString theFile,
                                                               const Handle(Message_ProgressIndicator)& aProgInd = Handle(Message_ProgressIndicator)());
 
-  Standard_EXPORT static void ReadFile(const Standard_CString theFile, NCollection_Sequence<Handle(Poly_Triangulation)>& theTriangList);
-
   //! Read triangulation from a binary STL file
   //! In case of error, returns Null handle.
   Standard_EXPORT static Handle(Poly_Triangulation) ReadBinary (const OSD_Path& thePath,

src/RWStl/RWStl_Reader.cxx

@@ -126,8 +126,7 @@ namespace
 //==============================================================================
 
 Standard_Boolean RWStl_Reader::Read (const char* theFile,
-                                     const Handle(Message_ProgressIndicator)& theProgress,
-                                     bool IsMultiSolid)
+                                     const Handle(Message_ProgressIndicator)& theProgress)
 {
   std::filebuf aBuf;
   OSD_OpenStream (aBuf, theFile, std::ios::in | std::ios::binary);
@@ -166,8 +165,6 @@ Standard_Boolean RWStl_Reader::Read (const char* theFile,
       }
     }
     aStream >> std::ws; // skip any white spaces
-    if (IsMultiSolid)
-      AddSolid();
   }
   return ! aStream.fail();
 }

src/RWStl/RWStl_Reader.hxx

@@ -39,8 +39,7 @@ public:
   //! Format is recognized automatically by analysis of the file header.
   //! Returns true if success, false on error or user break.
   Standard_EXPORT Standard_Boolean Read (const char* theFile,
-                                         const Handle(Message_ProgressIndicator)& theProgress,
-                                         bool IsMultiSolid = false);
+                                         const Handle(Message_ProgressIndicator)& theProgress);
 
   //! Guess whether the stream is an Ascii STL file, by analysis of the first bytes (~200).
   //! The function attempts to put back the read symbols to the stream which thus must support ungetc().
@@ -75,8 +74,6 @@ public:
   //! Should create new triangle built on specified nodes in the target model.
   virtual void AddTriangle (Standard_Integer theN1, Standard_Integer theN2, Standard_Integer theN3) = 0;
 
-  virtual void AddSolid() = 0;
-
 };
 
 #endif

src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx

@@ -411,22 +411,6 @@ static Standard_Integer ReadObj (Draw_Interpretor& theDI,
     {
       aFilePath = theArgVec[anArgIter];
     }
-    else if (theArgc == 4 && strcmp("multi", theArgv[3]) == 0)
-    {
-      NCollection_Sequence<Handle(Poly_Triangulation)> theTriangList;
-      RWStl::ReadFile(theArgv[2], theTriangList);
-      BRep_Builder aB;
-      TopoDS_Compound aCmp;
-      aB.MakeCompound(aCmp);
-      for (int i = 1; i <= theTriangList.Length(); i++)
-      { 
-        TopoDS_Face aFace;
-        aB.MakeFace(aFace);
-        aB.UpdateFace(aFace, theTriangList(i));
-        aB.Add(aCmp, aFace);
-      }
-      DBRep::Set(theArgv[1], aCmp);
-    }
     else
     {
       std::cout << "Syntax error at '" << theArgVec[anArgIter] << "'\n";