0029750: Samples - function arrows are not updated by moving a node i…

…n FuncDemo qt sample The visual links between functions are recovered. The demo is synchronized with a corresponding demo from Qt (qt486-vc10-32\examples\graphicsview\elasticnodes). It may be successfully compiled by any further versions of Qt including 5.10.1 Also, because Open CASCADE (and OCAF in particular) is improved for usage in multi-threading mode, usage of mutexes is added in this sample (for access to the sharing TNaming_UsedShapes attribute, for example).
celentes · Dec 25, 2020 · 894133a · 894133a
1 parent 4104614
commit 894133a
Show file tree

Hide file tree

Showing 21 changed files with 389 additions and 82 deletions.
diff --git a/samples/qt/FuncDemo/custom.bat b/samples/qt/FuncDemo/custom.bat
@@ -1,3 +1,3 @@
 @echo off
 rem Define QTDIR variable
-set QTDIR=
+set QTDIR=%PRODUCTS_PATH%/qt486-vc10-32
diff --git a/samples/qt/FuncDemo/src/BaseDriver.cpp b/samples/qt/FuncDemo/src/BaseDriver.cpp
@@ -36,7 +36,6 @@ void BaseDriver::Arguments(TDF_LabelList& args) const
     }
 }
 
-
 // Returns the results of the function
 void BaseDriver::Results(TDF_LabelList& res) const
 {
@@ -50,6 +49,12 @@ void BaseDriver::Results(TDF_LabelList& res) const
     }
 }
 
+// Sets a mutex for execution of the driver.
+void BaseDriver::SetMutex(Standard_Mutex* pmutex)
+{
+    myMutex = pmutex;
+}
+
 // Execution.
 Standard_Integer BaseDriver::Execute(Handle(TFunction_Logbook)& ) const
 {

diff --git a/samples/qt/FuncDemo/src/BaseDriver.h b/samples/qt/FuncDemo/src/BaseDriver.h
@@ -5,14 +5,11 @@
 #if !defined(_BASEDRIVER_H_)
 #define _BASEDRIVER_H_
 
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
 #include <Standard_DefineHandle.hxx> 
 #include <TFunction_Driver.hxx>
 #include <TFunction_Logbook.hxx>
 #include <TDF_LabelList.hxx>
+#include <Standard_Mutex.hxx>
 
 DEFINE_STANDARD_HANDLE(BaseDriver, TFunction_Driver)
 
@@ -30,10 +27,16 @@ class BaseDriver : public TFunction_Driver
 	// Returns the results of the function
 	virtual void Results(TDF_LabelList& res) const;
 
+    // Sets a mutex for execution of the driver.
+    void SetMutex(Standard_Mutex* pmutex);
+
 	// Execution.
 	virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const;
 
 	DEFINE_STANDARD_RTTIEXT(BaseDriver, TFunction_Driver)
+
+protected:
+    Standard_Mutex* myMutex;
 };
 
 #endif // !defined(_BASEDRIVER_H_)
diff --git a/samples/qt/FuncDemo/src/CircleDriver.h b/samples/qt/FuncDemo/src/CircleDriver.h
@@ -5,10 +5,6 @@
 #if !defined(_CIRCLEDRIVER_H_)
 #define _CIRCLEDRIVER_H_
 
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
 #include "BaseDriver.h"
 
 #include <Standard_DefineHandle.hxx> 

diff --git a/samples/qt/FuncDemo/src/ConeDriver.h b/samples/qt/FuncDemo/src/ConeDriver.h
@@ -5,10 +5,6 @@
 #if !defined(_CONEDRIVER_H_)
 #define _CONEDRIVER_H_
 
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
 #include "BaseDriver.h"
 
 #include <Standard_DefineHandle.hxx> 

diff --git a/samples/qt/FuncDemo/src/CylinderDriver.h b/samples/qt/FuncDemo/src/CylinderDriver.h
@@ -5,10 +5,6 @@
 #if !defined(_CYLINDERDRIVER_H_)
 #define _CYLINDERDRIVER_H_
 
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
 #include "BaseDriver.h"
 
 #include <Standard_DefineHandle.hxx> 

diff --git a/samples/qt/FuncDemo/src/FThread.cpp b/samples/qt/FuncDemo/src/FThread.cpp
@@ -1,5 +1,6 @@
 #include "FThread.h"
 #include "graphwidget.h"
+#include "BaseDriver.h"
 
 #include <TFunction_Function.hxx>
 #include <TFunction_IFunction.hxx>
@@ -39,6 +40,11 @@ void FThread::setThreadIndex(const int theIndex)
     this->thread_index = theIndex;
 }
 
+void FThread::setMutex(Standard_Mutex* pmutex)
+{
+    this->pmutex = pmutex;
+}
+
 // Returns any free (not executed yet) function
 TDF_Label FThread::getFreeFunction()
 {
@@ -94,12 +100,16 @@ void FThread::run()
         const bool must = D->MustExecute(log);
         if (must)
         {
-            // Usage of mutex for execution of Open CASCADE code is the most stupid thing!!!
-            // But it makes the execution more reliable...
+            // Usage of mutex for execution of Open CASCADE code.
+            // It makes the execution more reliable...
+            if (!Handle(BaseDriver)::DownCast(D).IsNull())
+                Handle(BaseDriver)::DownCast(D)->SetMutex(pmutex);
+
+            // Execute the driver.
             const int ret = D->Execute(log);
             if (ret == 0)
             {
-                // Successfully executed!
+                // Successfuly executed!
                 itr.SetStatus(L, TFunction_ES_Succeeded);
 
                 TDF_LabelList res;

diff --git a/samples/qt/FuncDemo/src/FThread.h b/samples/qt/FuncDemo/src/FThread.h
@@ -8,6 +8,7 @@
 #include <TFunction_Logbook.hxx>
 #include <TFunction_Iterator.hxx>
 #include <TFunction_Driver.hxx>
+#include <Standard_Mutex.hxx>
 
 class GraphWidget; // shows graphically execution of functions
 
@@ -25,6 +26,7 @@ class FThread : public QThread
     void setLogbook(const Handle(TFunction_Logbook)& );         // to set logbook with modifications
     void setGraph(GraphWidget* );                 // to change color of a graph circle
     void setThreadIndex(const int );              // to set the index of the thread
+    void setMutex(Standard_Mutex* );
 
 protected:
 
@@ -35,6 +37,7 @@ class FThread : public QThread
 
     TFunction_Iterator itr;
     Handle(TFunction_Logbook) log;
+    Standard_Mutex*    pmutex;
     int                thread_index;
 
     GraphWidget*       graph;

diff --git a/samples/qt/FuncDemo/src/PointDriver.cpp b/samples/qt/FuncDemo/src/PointDriver.cpp
@@ -47,9 +47,15 @@ Standard_Integer PointDriver::Execute(Handle(TFunction_Logbook)& log) const
     // Make the result
     TopoDS_Vertex V = BRepBuilderAPI_MakeVertex(gp_Pnt(x, y, z));
 
+    if (myMutex)
+        myMutex->Lock();
+
     // Set the result
     TNaming_Builder B(Label());
     B.Generated(V);
 
+    if (myMutex)
+        myMutex->Unlock();
+
     return BaseDriver::Execute(log);
 }
diff --git a/samples/qt/FuncDemo/src/PointDriver.h b/samples/qt/FuncDemo/src/PointDriver.h
@@ -5,10 +5,6 @@
 #if !defined(_PointDRIVER_H_)
 #define _PointDRIVER_H_
 
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
 #include "BaseDriver.h"
 
 #include <Standard_DefineHandle.hxx> 

diff --git a/samples/qt/FuncDemo/src/PrismDriver.h b/samples/qt/FuncDemo/src/PrismDriver.h
@@ -5,10 +5,6 @@
 #if !defined(_PRISMDRIVER_H_)
 #define _PRISMDRIVER_H_
 
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
 #include "BaseDriver.h"
 
 #include <Standard_DefineHandle.hxx> 

diff --git a/samples/qt/FuncDemo/src/ShapeSaverDriver.cpp b/samples/qt/FuncDemo/src/ShapeSaverDriver.cpp
@@ -56,10 +56,14 @@ Standard_Integer ShapeSaverDriver::Execute(Handle(TFunction_Logbook)& log) const
         }
     }
 
-    //BRepTools::Write(C, "result.brep");
+    if (myMutex)
+        myMutex->Lock();
 
     TNaming_Builder Bui(Label());
     Bui.Generated(C);
 
+    if (myMutex)
+        myMutex->Unlock();
+
     return BaseDriver::Execute(log);
 }
diff --git a/samples/qt/FuncDemo/src/ShapeSaverDriver.h b/samples/qt/FuncDemo/src/ShapeSaverDriver.h
@@ -5,10 +5,6 @@
 #if !defined(_SHAPESAVERDRIVER_H_)
 #define _SHAPESAVERDRIVER_H_
 
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
 #include "BaseDriver.h"
 
 #include <Standard_DefineHandle.hxx> 

diff --git a/samples/qt/FuncDemo/src/SimpleDriver.h b/samples/qt/FuncDemo/src/SimpleDriver.h
@@ -5,10 +5,6 @@
 #if !defined(_SIMPLEDRIVER_H_)
 #define _SIMPLEDRIVER_H_
 
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
 #include <Standard_DefineHandle.hxx> 
 #include <TFunction_Driver.hxx>
 #include <TFunction_Logbook.hxx>

diff --git a/samples/qt/FuncDemo/src/edge.cpp b/samples/qt/FuncDemo/src/edge.cpp
@@ -50,6 +50,7 @@
 static const double Pi = 3.14159265358979323846264338327950288419717;
 static double TwoPi = 2.0 * Pi;
 
+//! [0]
 Edge::Edge(Node *sourceNode, Node *destNode)
     : arrowSize(10)
 {
@@ -60,7 +61,9 @@ Edge::Edge(Node *sourceNode, Node *destNode)
     dest->addEdge(this);
     adjust();
 }
+//! [0]
 
+//! [1]
 Node *Edge::sourceNode() const
 {
     return source;
@@ -70,7 +73,9 @@ Node *Edge::destNode() const
 {
     return dest;
 }
+//! [1]
 
+//! [2]
 void Edge::adjust()
 {
     if (!source || !dest)
@@ -89,7 +94,9 @@ void Edge::adjust()
         sourcePoint = destPoint = line.p1();
     }
 }
+//! [2]
 
+//! [3]
 QRectF Edge::boundingRect() const
 {
     if (!source || !dest)
@@ -103,7 +110,9 @@ QRectF Edge::boundingRect() const
         .normalized()
         .adjusted(-extra, -extra, extra, extra);
 }
+//! [3]
 
+//! [4]
 void Edge::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
 {
     if (!source || !dest)
@@ -112,11 +121,15 @@ void Edge::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
     QLineF line(sourcePoint, destPoint);
     if (qFuzzyCompare(line.length(), qreal(0.)))
         return;
+//! [4]
 
+//! [5]
     // Draw the line itself
     painter->setPen(QPen(Qt::black, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
     painter->drawLine(line);
+//! [5]
 
+//! [6]
     // Draw the arrows
     double angle = ::acos(line.dx() / line.length());
     if (line.dy() >= 0)
@@ -135,3 +148,4 @@ void Edge::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
     painter->drawPolygon(QPolygonF() << line.p1() << sourceArrowP1 << sourceArrowP2);
     painter->drawPolygon(QPolygonF() << line.p2() << destArrowP1 << destArrowP2);
 }
+//! [6]
diff --git a/samples/qt/FuncDemo/src/edge.h b/samples/qt/FuncDemo/src/edge.h
@@ -47,13 +47,13 @@
 
 class Node;
 
+//! [0]
 class Edge : public QGraphicsItem
 {
 public:
     Edge(Node *sourceNode, Node *destNode);
 
     Node *sourceNode() const;
-
     Node *destNode() const;
 
     void adjust();
@@ -72,5 +72,6 @@ class Edge : public QGraphicsItem
     QPointF destPoint;
     qreal arrowSize;
 };
+//! [0]
 
 #endif