Basic working multipart View

src/Mod/TechDraw/App/AppTechDraw.cpp

@@ -34,6 +34,7 @@
 #include "DrawViewDraft.h"
 #include "DrawViewArch.h"
 #include "DrawViewSpreadsheet.h"
+#include "DrawViewMulti.h"
 
 namespace TechDraw {
 extern PyObject* initModule();
@@ -68,6 +69,7 @@ PyMODINIT_FUNC initTechDraw()
     TechDraw::DrawViewSpreadsheet ::init();
 
     TechDraw::DrawViewSection     ::init();
+    TechDraw::DrawViewMulti       ::init();
     TechDraw::DrawViewDimension   ::init();
     TechDraw::DrawProjGroup       ::init();
     TechDraw::DrawProjGroupItem   ::init();
@@ -83,6 +85,7 @@ PyMODINIT_FUNC initTechDraw()
    // Python Types
     TechDraw::DrawViewPython      ::init();
     TechDraw::DrawViewPartPython  ::init();
+    TechDraw::DrawViewMultiPython  ::init();
     TechDraw::DrawTemplatePython  ::init();
     TechDraw::DrawViewSymbolPython::init();
 }

src/Mod/TechDraw/App/CMakeLists.txt

@@ -79,7 +79,8 @@ SET(Draw_SRCS
     DrawViewDraft.h
     DrawViewArch.cpp
     DrawViewArch.h
-)
+    DrawViewMulti.cpp
+    DrawViewMulti.h)
 
 SET(TechDraw_SRCS
     AppTechDraw.cpp

src/Mod/TechDraw/App/DrawViewMulti.cpp

@@ -0,0 +1,177 @@
+/***************************************************************************
+ *   Copyright (c) WandererFan            (wandererfan@gmail.com) 2016     *
+ *                                                                         *
+ *   This file is part of the FreeCAD CAx development system.              *
+ *                                                                         *
+ *   This library is free software; you can redistribute it and/or         *
+ *   modify it under the terms of the GNU Library General Public           *
+ *   License as published by the Free Software Foundation; either          *
+ *   version 2 of the License, or (at your option) any later version.      *
+ *                                                                         *
+ *   This library  is distributed in the hope that it will be useful,      *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Library General Public License for more details.                  *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with this library; see the file COPYING.LIB. If not,    *
+ *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
+ *   Suite 330, Boston, MA  02111-1307, USA                                *
+ *                                                                         *
+ ***************************************************************************/
+
+
+#include "PreCompiled.h"
+
+#ifndef _PreComp_
+# include <sstream>
+
+#include <Bnd_Box.hxx>
+#include <BRepBndLib.hxx>
+#include <BRepBuilderAPI_Copy.hxx>
+#include <BRepBuilderAPI_MakeFace.hxx>
+# include <BRep_Builder.hxx>
+#include <gp_Ax2.hxx>
+#include <gp_Pnt.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopoDS_Compound.hxx>
+#include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
+
+#endif
+
+#include <chrono>
+
+# include <QFile>
+# include <QFileInfo>
+
+#include <App/Application.h>
+#include <App/Material.h>
+#include <Base/BoundBox.h>
+#include <Base/Exception.h>
+#include <Base/Console.h>
+#include <Base/Parameter.h>
+
+#include <Mod/Part/App/PartFeature.h>
+
+#include "Geometry.h"
+#include "GeometryObject.h"
+#include "DrawViewMulti.h"
+
+using namespace TechDraw;
+using namespace std;
+
+
+//===========================================================================
+// DrawViewMulti
+//===========================================================================
+
+PROPERTY_SOURCE(TechDraw::DrawViewMulti, TechDraw::DrawViewPart)
+
+DrawViewMulti::DrawViewMulti()
+{
+    static const char *group = "Projection";
+
+    //properties that affect Geometry
+    ADD_PROPERTY_TYPE(Sources ,(0),group,App::Prop_None,"3D Shapes to view");
+
+    //Source is replaced by Sources in Multi
+    Source.setStatus(App::Property::ReadOnly,true);
+}
+
+DrawViewMulti::~DrawViewMulti()
+{
+}
+
+short DrawViewMulti::mustExecute() const
+{
+    short result = 0;
+    if (!isRestoring()) {
+        result  = (Sources.isTouched());
+    }
+    if (result) {
+        return result;
+    }
+    return TechDraw::DrawViewPart::mustExecute();
+}
+
+void DrawViewMulti::onChanged(const App::Property* prop)
+{
+    if (!isRestoring()) {
+        //Base::Console().Message("TRACE - DVM::onChanged(%s) - %s\n",prop->getName(),Label.getValue());
+        if (prop == &Sources) {
+            const std::vector<App::DocumentObject*>& links = Sources.getValues();
+            if (!links.empty()) {
+                Source.setValue(links.front());
+            }
+        }
+    }
+
+    DrawViewPart::onChanged(prop);
+}
+
+App::DocumentObjectExecReturn *DrawViewMulti::execute(void)
+{
+    const std::vector<App::DocumentObject*>& links = Sources.getValues();
+    if (links.empty())  {
+        Base::Console().Log("INFO - DVM::execute - No Sources - creation?\n");
+        return DrawViewPart::execute();
+    }
+
+    //Base::Console().Message("TRACE - DVM::execute() - %s/%s\n",getNameInDocument(),Label.getValue());
+
+    (void) DrawView::execute();          //make sure Scale is up to date
+
+    BRep_Builder builder;
+    TopoDS_Compound comp;
+    builder.MakeCompound(comp);
+    for (auto& l:links) {
+        const Part::TopoShape &partTopo = static_cast<Part::Feature*>(l)->Shape.getShape();
+        BRepBuilderAPI_Copy BuilderCopy(partTopo.getShape());
+        TopoDS_Shape shape = BuilderCopy.Shape();
+        builder.Add(comp, shape);
+    }
+    m_compound = comp;
+
+    geometryObject->setTolerance(Tolerance.getValue());
+    geometryObject->setScale(Scale.getValue());
+
+    gp_Pnt inputCenter;
+    try {
+        inputCenter = TechDrawGeometry::findCentroid(comp,
+                                                     Direction.getValue());
+        TopoDS_Shape mirroredShape = TechDrawGeometry::mirrorShape(comp,
+                                                    inputCenter,
+                                                    Scale.getValue());
+        buildGeometryObject(mirroredShape,inputCenter);
+
+#if MOD_TECHDRAW_HANDLE_FACES
+        extractFaces();
+#endif //#if MOD_TECHDRAW_HANDLE_FACES
+    }
+    catch (Standard_Failure) {
+        Handle_Standard_Failure e1 = Standard_Failure::Caught();
+        Base::Console().Log("LOG - DVM::execute - projection failed for %s - %s **\n",getNameInDocument(),e1->GetMessageString());
+        return new App::DocumentObjectExecReturn(e1->GetMessageString());
+    }
+
+    return App::DocumentObject::StdReturn;
+}
+
+// Python Drawing feature ---------------------------------------------------------
+
+namespace App {
+/// @cond DOXERR
+PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewMultiPython, TechDraw::DrawViewMulti)
+template<> const char* TechDraw::DrawViewMultiPython::getViewProviderName(void) const {
+    return "TechDrawGui::ViewProviderViewProviderViewPart";
+}
+/// @endcond
+
+// explicit template instantiation
+template class TechDrawExport FeaturePythonT<TechDraw::DrawViewMulti>;
+}

src/Mod/TechDraw/App/DrawViewMulti.h

@@ -0,0 +1,85 @@
+/***************************************************************************
+ *   Copyright (c) Jürgen Riegel          (juergen.riegel@web.de) 2007     *
+ *   Copyright (c) Luke Parry             (l.parry@warwick.ac.uk) 2013     *
+ *   Copyright (c) WandererFan            (wandererfan@gmail.com) 2016     *
+ *   This file is part of the FreeCAD CAx development system.              *
+ *                                                                         *
+ *   This library is free software; you can redistribute it and/or         *
+ *   modify it under the terms of the GNU Library General Public           *
+ *   License as published by the Free Software Foundation; either          *
+ *   version 2 of the License, or (at your option) any later version.      *
+ *                                                                         *
+ *   This library  is distributed in the hope that it will be useful,      *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Library General Public License for more details.                  *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with this library; see the file COPYING.LIB. If not,    *
+ *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
+ *   Suite 330, Boston, MA  02111-1307, USA                                *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef _DrawViewMulti_h_
+#define _DrawViewMulti_h_
+
+#include <App/DocumentObject.h>
+#include <App/PropertyLinks.h>
+#include <App/PropertyFile.h>
+#include <App/FeaturePython.h>
+#include <App/Material.h>
+
+#include <TopoDS_Compound.hxx>
+
+#include "DrawViewPart.h"
+
+class gp_Pln;
+class TopoDS_Face;
+
+namespace TechDrawGeometry
+{
+//class Face;
+}
+
+namespace TechDraw
+{
+
+
+/** Base class of all View Features in the drawing module
+ */
+class TechDrawExport DrawViewMulti : public DrawViewPart
+{
+    PROPERTY_HEADER(Part::DrawViewMulti);
+
+public:
+    /// Constructor
+    DrawViewMulti(void);
+    virtual ~DrawViewMulti();
+
+    App::PropertyLinkList Sources;
+
+    virtual short mustExecute() const;
+    /** @name methods overide Feature */
+    //@{
+    /// recalculate the Feature
+    virtual App::DocumentObjectExecReturn *execute(void);
+    virtual void onChanged(const App::Property* prop);
+    //@}
+
+    /// returns the type name of the ViewProvider
+    virtual const char* getViewProviderName(void) const {
+        return "TechDrawGui::ViewProviderViewPart";
+    }
+
+protected:
+    TopoDS_Compound m_compound;
+
+//    void getParameters(void);
+};
+
+typedef App::FeaturePythonT<DrawViewMulti> DrawViewMultiPython;
+
+} //namespace TechDraw
+
+#endif

src/Mod/TechDraw/Gui/Command.cpp

@@ -63,6 +63,7 @@
 #include <Mod/TechDraw/App/DrawViewAnnotation.h>
 #include <Mod/TechDraw/App/DrawViewSymbol.h>
 #include <Mod/TechDraw/App/DrawViewDraft.h>
+#include <Mod/TechDraw/App/DrawViewMulti.h>
 #include <Mod/TechDraw/Gui/QGVPage.h>
 
 #include "DrawGuiUtil.h"
@@ -442,6 +443,58 @@ bool CmdTechDrawProjGroup::isActive(void)
     return (havePage  && !taskInProgress);
 }
 
+//===========================================================================
+// TechDraw_NewMulti
+//===========================================================================
+
+DEF_STD_CMD_A(CmdTechDrawNewMulti);
+
+CmdTechDrawNewMulti::CmdTechDrawNewMulti()
+  : Command("TechDraw_NewMulti")
+{
+    sAppModule      = "TechDraw";
+    sGroup          = QT_TR_NOOP("TechDraw");
+    sMenuText       = QT_TR_NOOP("Insert multi-part view in drawing");
+    sToolTipText    = QT_TR_NOOP("Insert a new View of a multiple Parts in the active drawing");
+    sWhatsThis      = "TechDraw_NewMulti";
+    sStatusTip      = sToolTipText;
+    sPixmap         = "actions/techdraw-multiview";
+}
+
+void CmdTechDrawNewMulti::activated(int iMsg)
+{
+    Q_UNUSED(iMsg);
+    TechDraw::DrawPage* page = DrawGuiUtil::findPage(this);
+    if (!page) {
+        return;
+    }
+
+    const std::vector<App::DocumentObject*>& shapes = getSelection().getObjectsOfType(Part::Feature::getClassTypeId());
+    if (shapes.empty()) {
+        QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
+            QObject::tr("Select at least 1 Part object."));
+        return;
+    }
+
+    std::string PageName = page->getNameInDocument();
+
+    Gui::WaitCursor wc;
+
+    openCommand("Create view");
+    std::string FeatName = getUniqueObjectName("MultiView");
+    doCommand(Doc,"App.activeDocument().addObject('TechDraw::DrawViewMulti','%s')",FeatName.c_str());
+    App::DocumentObject *docObj = getDocument()->getObject(FeatName.c_str());
+    auto multiView( static_cast<TechDraw::DrawViewMulti *>(docObj) );
+    multiView->Sources.setValues(shapes);
+    doCommand(Doc,"App.activeDocument().%s.addView(App.activeDocument().%s)",PageName.c_str(),FeatName.c_str());
+    updateActive();
+    commitCommand();
+}
+
+bool CmdTechDrawNewMulti::isActive(void)
+{
+    return DrawGuiUtil::needPage(this);
+}
 
 //===========================================================================
 // TechDraw_Annotation
@@ -826,7 +879,7 @@ void CmdTechDrawArchView::activated(int iMsg)
             QObject::tr("The selected object is not an Arch Section Plane."));
         return;
     }
-    
+
     std::string PageName = page->getNameInDocument();
 
     std::string FeatName = getUniqueObjectName("ArchView");
@@ -957,6 +1010,7 @@ void CreateTechDrawCommands(void)
     rcCmdMgr.addCommand(new CmdTechDrawNewPage());
     rcCmdMgr.addCommand(new CmdTechDrawNewView());
     rcCmdMgr.addCommand(new CmdTechDrawNewViewSection());
+    rcCmdMgr.addCommand(new CmdTechDrawNewMulti());
     rcCmdMgr.addCommand(new CmdTechDrawProjGroup());
     rcCmdMgr.addCommand(new CmdTechDrawAnnotation());
     rcCmdMgr.addCommand(new CmdTechDrawClip());

src/Mod/TechDraw/Gui/Resources/TechDraw.qrc

@@ -9,6 +9,7 @@
         <file>icons/TechDraw_Tree_Spreadsheet.svg</file>
         <file>icons/TechDraw_Tree_Symbol.svg</file>
         <file>icons/TechDraw_Tree_View.svg</file>
+        <file>icons/TechDraw_Tree_Multi.svg</file>
         <file>icons/TechDraw_Pages.svg</file>
         <file>icons/TechDraw_ProjBottom.svg</file>
         <file>icons/TechDraw_ProjFront.svg</file>
@@ -32,6 +33,7 @@
         <file>icons/actions/techdraw-new-default.svg</file>
         <file>icons/actions/techdraw-new-pick.svg</file>
         <file>icons/actions/techdraw-view.svg</file>
+        <file>icons/actions/techdraw-multiview.svg</file>
         <file>icons/actions/techdraw-annotation.svg</file>
         <file>icons/actions/techdraw-clip.svg</file>
         <file>icons/actions/techdraw-clipplus.svg</file>