Slightly refactor the base framework; introduce finder of base faces in AAG.

sslyadnev · sslyadnev · commit 36f2babd3022 · 2020-05-27T16:33:23.000+03:00
diff --git a/Log_ActiveScript.txt b/Log_ActiveScript.txt
@@ -15,4 +15,4 @@
 
 > load-brep /home/ssv/work/temp/feature5.brep; fit; set-as-var f
 > load-step /home/ssv/work/step-inspector/data/tests-main/11kfaces.stp; fit
-> find-isomorphisms f -noconvex
+> find-isomorphisms f -noconvex -nobase
diff --git a/src/asiAlgo/features/asiAlgo_AAG.cpp b/src/asiAlgo/features/asiAlgo_AAG.cpp
@@ -676,6 +676,31 @@ bool asiAlgo_AAG::SetNodeAttribute(const int                          node,
 
 //-----------------------------------------------------------------------------
 
+bool asiAlgo_AAG::FindBaseOnly(TColStd_PackedMapOfInteger& resultFaceIds) const
+{
+  for ( asiAlgo_AdjacencyMx::t_mx::Iterator it( m_neighborsStack.top().mx );
+        it.More(); it.Next() )
+  {
+    const int fid = it.Key();
+
+    // Get face to check the number of wires.
+    const TopoDS_Face& face = this->GetFace(fid);
+
+    // Get the number of wires.
+    TopTools_IndexedMapOfShape wires;
+    TopExp::MapShapes(face, TopAbs_WIRE, wires);
+    //
+    const int numWires = wires.Extent();
+
+    if ( numWires > 1 )
+      resultFaceIds.Add(fid);
+  }
+
+  return resultFaceIds.Extent() > 0;
+}
+
+//-----------------------------------------------------------------------------
+
 bool asiAlgo_AAG::FindConvexOnly(TColStd_PackedMapOfInteger& resultFaceIds) const
 {
   TColStd_PackedMapOfInteger traversed;
diff --git a/src/asiAlgo/features/asiAlgo_AAG.h b/src/asiAlgo/features/asiAlgo_AAG.h
@@ -116,14 +116,14 @@ class asiAlgo_AAG : public Standard_Transient
   //! for adjacency relation.
   struct t_arc
   {
-    int F1; //!< First face.
-    int F2; //!< Second face.
+    t_topoId F1; //!< First face.
+    t_topoId F2; //!< Second face.
 
     //! ctor default.
     t_arc() : F1(0), F2(0) {}
 
     //! ctor with parameters.
-    t_arc(const int _F1, const int _F2) : F1(_F1), F2(_F2) {}
+    t_arc(const t_topoId _F1, const t_topoId _F2) : F1(_F1), F2(_F2) {}
 
     //! \return hash code for the arc.
     static int HashCode(const t_arc& arc, const int upper)
@@ -280,7 +280,7 @@ class asiAlgo_AAG : public Standard_Transient
   typedef NCollection_DataMap<t_arc, Handle(asiAlgo_FeatureAttr), t_arc> t_arc_attributes;
 
   //! Node attributes.
-  typedef NCollection_DataMap<int, t_attr_set> t_node_attributes;
+  typedef NCollection_DataMap<t_topoId, t_attr_set> t_node_attributes;
 
   //---------------------------------------------------------------------------
 
@@ -398,7 +398,7 @@ class asiAlgo_AAG : public Standard_Transient
   //!
   //! \sa PopSubgraph() method to pop the created sub-graph from the stack.
   asiAlgo_EXPORT void
-    PushSubgraphX(const int face2Exclude);
+    PushSubgraphX(const t_topoId face2Exclude);
 
   //! \brief Pops the top sub-graph from the internal stack.
   //!
@@ -435,7 +435,7 @@ class asiAlgo_AAG : public Standard_Transient
   //! \param[in] face_idx face index.
   //! \return true/false.
   asiAlgo_EXPORT bool
-    HasFace(const int face_idx) const;
+    HasFace(const t_topoId face_idx) const;
 
   //! Returns true if the passed face is in graph.
   //! \param[in] face face to check.
@@ -447,12 +447,12 @@ class asiAlgo_AAG : public Standard_Transient
   //! \param[in] face_idx face index.
   //! \return topological face.
   asiAlgo_EXPORT const TopoDS_Face&
-    GetFace(const int face_idx) const;
+    GetFace(const t_topoId face_idx) const;
 
   //! Returns face ID.
   //! \param[in] face face of interest.
   //! \return face ID.
-  asiAlgo_EXPORT int
+  asiAlgo_EXPORT t_topoId
     GetFaceId(const TopoDS_Shape& face) const;
 
   //! Checks whether the given face has any neighbors recorded in the AAG.
@@ -461,29 +461,29 @@ class asiAlgo_AAG : public Standard_Transient
   //! \param[in] face_idx face index.
   //! \return true in case if at least one neighbor presents, false -- otherwise.
   asiAlgo_EXPORT bool
-    HasNeighbors(const int face_idx) const;
+    HasNeighbors(const t_topoId face_idx) const;
 
   //! Returns neighbors for the face having the given internal index.
   //! \param[in] face_idx face index.
   //! \return indices of the neighbor faces.
   asiAlgo_EXPORT const TColStd_PackedMapOfInteger&
-    GetNeighbors(const int face_idx) const;
+    GetNeighbors(const t_topoId face_idx) const;
 
   //! Returns only those neighbor faces which share the given edge with the
   //! passed face of interest.
   //! \param[in] face_idx ID of the face of interest.
   //! \param[in] edge     common edge.
   //! \return indices of the neighbor faces sharing the given edge.
   asiAlgo_EXPORT TColStd_PackedMapOfInteger
-    GetNeighborsThru(const int face_idx, const TopoDS_Edge& edge);
+    GetNeighborsThru(const t_topoId face_idx, const TopoDS_Edge& edge);
 
   //! Returns neighbor faces for the given face of interest with additional
   //! filter on edges realizing the neighborhood.
   //! \param[in] face_idx index of the face of interest.
   //! \param[in] edge_ids indices of edges of interest.
   //! \return indices of the neighbor faces.
   asiAlgo_EXPORT TColStd_PackedMapOfInteger
-    GetNeighborsThru(const int                         face_idx,
+    GetNeighborsThru(const t_topoId                    face_idx,
                      const TColStd_PackedMapOfInteger& edge_ids);
 
   //! Returns only those neighbor faces which do not share the given edges with
@@ -492,7 +492,7 @@ class asiAlgo_AAG : public Standard_Transient
   //! \param[in] xEdges   edge where neighborhood is restricted.
   //! \return indices of the neighbor faces not sharing the given edges.
   asiAlgo_EXPORT TColStd_PackedMapOfInteger
-    GetNeighborsThruX(const int face_idx, const TColStd_PackedMapOfInteger& xEdges);
+    GetNeighborsThruX(const t_topoId face_idx, const TColStd_PackedMapOfInteger& xEdges);
 
   //! Returns full collection of neighbor faces.
   //! \return neighborhood data.
@@ -625,7 +625,7 @@ class asiAlgo_AAG : public Standard_Transient
   //! \param[in] node ID of the graph node to check.
   //! \return true/false.
   asiAlgo_EXPORT bool
-    HasNodeAttributes(const int node) const;
+    HasNodeAttributes(const t_topoId node) const;
 
   //! Accessor for the entire collection of nodal attributes.
   //! \return attributes associated with all graph node.
@@ -636,14 +636,14 @@ class asiAlgo_AAG : public Standard_Transient
   //! \param[in] node ID of the graph node of interest.
   //! \return attributes associated with the given graph node.
   asiAlgo_EXPORT const t_attr_set&
-    GetNodeAttributes(const int node) const;
+    GetNodeAttributes(const t_topoId node) const;
 
   //! Returns attribute associated with the given graph node.
   //! \param[in] node    ID of the graph node of interest.
   //! \param[in] attr_id ID of the attribute to access.
   //! \return attribute associated with the given node.
   asiAlgo_EXPORT Handle(asiAlgo_FeatureAttr)
-    GetNodeAttribute(const int            node,
+    GetNodeAttribute(const t_topoId       node,
                      const Standard_GUID& attr_id) const;
 
   //! Removes attribute with the passed GUID from the given graph node.
@@ -652,7 +652,7 @@ class asiAlgo_AAG : public Standard_Transient
   //! \return true if the attribute was removed, false -- otherwise (e.g., if
   //!         such attribute does not exist).
   asiAlgo_EXPORT bool
-    RemoveNodeAttribute(const int            node,
+    RemoveNodeAttribute(const t_topoId       node,
                         const Standard_GUID& attr_id);
 
   //! Removes all attributes assigned to nodes.
@@ -669,9 +669,15 @@ class asiAlgo_AAG : public Standard_Transient
   //! \param[in] node ID of the graph node of interest.
   //! \param[in] attr attribute to set.
   asiAlgo_EXPORT bool
-    SetNodeAttribute(const int                          node,
+    SetNodeAttribute(const t_topoId                     node,
                      const Handle(asiAlgo_FeatureAttr)& attr);
 
+  //! Finds base faces, i.e., the faces having inner loops.
+  //! \param[out] resultFaceIds IDs of the found faces (if any).
+  //! \return true if anything has been found, false -- otherwise.
+  asiAlgo_EXPORT bool
+    FindBaseOnly(TColStd_PackedMapOfInteger& resultFaceIds) const;
+
   //! Searches for the faces having ALL neighbors attributed with convex links.
   //! \param[out] resultFaceIds IDs of the found faces (if any).
   //! \return true if anything has been found, false -- otherwise.
@@ -737,7 +743,7 @@ class asiAlgo_AAG : public Standard_Transient
   //! \param[in] fid face ID in question.
   //! \return attribute.
   template<typename t_attr_type>
-  Handle(t_attr_type) ATTR_NODE(const int fid) const
+  Handle(t_attr_type) ATTR_NODE(const t_topoId fid) const
   {
     return Handle(t_attr_type)::DownCast( this->GetNodeAttribute( fid, t_attr_type::GUID() ) );
   }
@@ -809,7 +815,7 @@ class asiAlgo_AAG : public Standard_Transient
   //! \param[in,out] out        target output stream.
   //! \param[in]     whitespace num of spaces to prefix each row.
   asiAlgo_EXPORT void
-    dumpNodeJSON(const int         node,
+    dumpNodeJSON(const t_topoId    node,
                  const bool        isFirst,
                  Standard_OStream& out,
                  const int         whitespace = 0) const;
diff --git a/src/asiUI/utils/asiUI_BatchFacilities.h b/src/asiUI/utils/asiUI_BatchFacilities.h
@@ -68,7 +68,8 @@ class asiUI_BatchFacilities : public Standard_Transient
 public:
 
   //! \return single instance of facilities.
-  static Handle(asiUI_BatchFacilities) Instance();
+  asiUI_EXPORT static Handle(asiUI_BatchFacilities)
+    Instance();
 
 protected:
 
diff --git a/src/asiUI/viewers/asiUI_ViewerPartListener.cpp b/src/asiUI/viewers/asiUI_ViewerPartListener.cpp
@@ -42,6 +42,7 @@
 #include <asiAlgo_Utils.h>
 
 // asiEngine includes
+#include <asiEngine_IV.h>
 #include <asiEngine_Part.h>
 
 // asiVisu includes
@@ -78,13 +79,15 @@ asiUI_ViewerPartListener::asiUI_ViewerPartListener(asiUI_ViewerPart*
                                                    ActAPI_ProgressEntry           progress,
                                                    ActAPI_PlotterEntry            plotter)
 //
-: asiUI_Viewer3dListener (wViewerPart, model, progress, plotter),
-  m_wViewerDomain        (wViewerDomain),
-  m_wViewerHost          (wViewerHost),
-  m_pSaveBREPAction      (nullptr),
-  m_pShowNormsAction     (nullptr),
-  m_pInvertFacesAction   (nullptr),
-  m_pShowOriContour      (nullptr)
+: asiUI_Viewer3dListener  (wViewerPart, model, progress, plotter),
+  m_wViewerDomain         (wViewerDomain),
+  m_wViewerHost           (wViewerHost),
+  m_pSaveBREPAction       (nullptr),
+  m_pShowNormsAction      (nullptr),
+  m_pInvertFacesAction    (nullptr),
+  m_pShowOriContourAction (nullptr),
+  m_pCopyAsStringAction   (nullptr),
+  m_pSetAsVariableAction  (nullptr)
 {}
 
 //-----------------------------------------------------------------------------
@@ -286,19 +289,20 @@ void asiUI_ViewerPartListener::populateMenu(QMenu& menu)
       if ( m_pViewer->PrsMgr()->IsPresentable( STANDARD_TYPE(asiData_FaceNormsNode) ) )
         m_pShowNormsAction = menu.addAction("Show face normals");
       if ( m_pViewer->PrsMgr()->IsPresentable( STANDARD_TYPE(asiData_FaceContourNode) ) )
-        m_pShowOriContour = menu.addAction("Show face oriented contour");
+        m_pShowOriContourAction = menu.addAction("Show face oriented contour");
       //
       m_pInvertFacesAction = menu.addAction("Invert faces");
     }
 
     menu.addSeparator();
     //
-    m_pSaveBREPAction = menu.addAction("Save to BREP...");
+    m_pSaveBREPAction      = menu.addAction("Save to BREP...");
+    m_pSetAsVariableAction = menu.addAction("Set as variable");
 
     // Add items which work for single-element selection.
     if ( faceIndices.Extent() == 1 || edgeIndices.Extent() == 1 )
     {
-      m_pCopyAsString = menu.addAction("Copy as JSON");
+      m_pCopyAsStringAction = menu.addAction("Copy as JSON");
     }
   }
 }
@@ -355,7 +359,7 @@ void asiUI_ViewerPartListener::executeAction(QAction* pAction)
   //---------------------------------------------------------------------------
   // ACTION: copy as string
   //---------------------------------------------------------------------------
-  else if ( pAction == m_pCopyAsString )
+  else if ( pAction == m_pCopyAsStringAction )
   {
     // Get highlighted sub-shapes.
     TopTools_IndexedMapOfShape selected;
@@ -421,7 +425,7 @@ void asiUI_ViewerPartListener::executeAction(QAction* pAction)
   //---------------------------------------------------------------------------
   // ACTION: show oriented contour
   //---------------------------------------------------------------------------
-  else if ( pAction == m_pShowOriContour )
+  else if ( pAction == m_pShowOriContourAction )
   {
     TIMER_NEW
     TIMER_GO
@@ -475,4 +479,34 @@ void asiUI_ViewerPartListener::executeAction(QAction* pAction)
     m_pViewer->PrsMgr()->Actualize(part_n);
     m_pViewer->PrsMgr()->Actualize( m_model->GetPartNode()->GetNormsRepresentation() );
   }
+
+  //---------------------------------------------------------------------------
+  // ACTION: set as variable
+  //---------------------------------------------------------------------------
+  if ( pAction == m_pSetAsVariableAction )
+  {
+    // Get highlighted sub-shapes
+    TopTools_IndexedMapOfShape selected;
+    asiEngine_Part( m_model, m_pViewer->PrsMgr() ).GetHighlightedSubShapes(selected);
+
+    // Prepare a shape to set as a variable
+    TopoDS_Shape shape2Var;
+    //
+    if ( selected.Extent() == 1 )
+      shape2Var = selected(1);
+    else
+    {
+      // Put selected shapes to a compound
+      TopoDS_Compound comp;
+      BRep_Builder().MakeCompound(comp);
+      //
+      for ( int k = 1; k <= selected.Extent(); ++k )
+        BRep_Builder().Add( comp, selected(k) );
+      //
+      shape2Var = comp;
+    }
+
+    // Add variable via the imperative plotter
+    m_plotter.DRAW_SHAPE(shape2Var, Color_Yellow, "var");
+  }
 }
diff --git a/src/asiUI/viewers/asiUI_ViewerPartListener.h b/src/asiUI/viewers/asiUI_ViewerPartListener.h
@@ -90,8 +90,9 @@ protected slots:
   QAction* m_pSaveBREPAction;
   QAction* m_pShowNormsAction;
   QAction* m_pInvertFacesAction;
-  QAction* m_pShowOriContour;
-  QAction* m_pCopyAsString;
+  QAction* m_pShowOriContourAction;
+  QAction* m_pCopyAsStringAction;
+  QAction* m_pSetAsVariableAction;
 
 };
 
diff --git a/src/cmdEngine/cmdEngine_Inspection.cpp b/src/cmdEngine/cmdEngine_Inspection.cpp
@@ -3239,6 +3239,20 @@ int ENGINE_FindIsomorphisms(const Handle(asiTcl_Interp)& interp,
     TColStd_PackedMapOfInteger convexOnlyFaces;
     G->FindConvexOnly(convexOnlyFaces);
     G->PushSubgraphX(convexOnlyFaces);
+
+    interp->GetProgress().SendLogMessage( LogInfo(Normal) << "Num. of convex faces to exclude: %1."
+                                                          << convexOnlyFaces.Extent() );
+    isReduced = true;
+  }
+  //
+  if ( interp->HasKeyword(argc, argv, "nobase") )
+  {
+    TColStd_PackedMapOfInteger baseOnlyFaces;
+    G->FindBaseOnly(baseOnlyFaces);
+    G->PushSubgraphX(baseOnlyFaces);
+
+    interp->GetProgress().SendLogMessage( LogInfo(Normal) << "Num. of base faces to exclude: %1."
+                                                          << baseOnlyFaces.Extent() );
     isReduced = true;
   }
 
diff --git a/src/exe/ui/exe_CommonFacilities.h b/src/exe/ui/exe_CommonFacilities.h
@@ -55,8 +55,6 @@ class exe_CommonFacilities : public asiUI_CommonFacilities
 public:
 
   Handle(asiUI_IStatusBar) StatusBar; //!< Status bar of the main window.
-  Handle(asiUI_Logger)     Logger;    //!< Logger.
-  Handle(asiTcl_Interp)    Interp;     //!< Tcl interpreter.
 
   //! Visualization facilities.
   struct t_prs
diff --git a/src/exe/ui/exe_MainWindow.cpp b/src/exe/ui/exe_MainWindow.cpp
@@ -403,9 +403,9 @@ void exe_MainWindow::createDockWindows()
 
   // Initialize and connect progress listener.
   cf->Logger           = new asiUI_Logger(Widgets.wLogger);
-  cf->ProgressListener = new asiUI_ProgressListener(statusBar,
-                                                    cf->Progress.Access(),
-                                                    cf->Logger);
+  cf->ProgressListener = new asiUI_ProgressListener( statusBar,
+                                                     cf->Progress.Access(),
+                                                     Handle(asiUI_Logger)::DownCast(cf->Logger) );
   cf->ProgressListener->Connect();
 
   /* ==================================
