suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mod/Drawing includes -> Mod/TechDraw

Browse Source
This commit is contained in:
WandererFan 2016-01-17 12:11:37 -05:00 committed by wmayer
parent f096a9d6ff
commit 7e49a1b986
4 changed files with 38 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
src/Mod/TechDraw/Gui/Command.cpp
View File

@ -49,19 +49,18 @@
#include <Gui/WaitCursor.h>
#include <Mod/Part/App/PartFeature.h>
#include <Mod/Drawing/App/DrawPage.h>
#include <Mod/Drawing/App/DrawViewPart.h>
#include <Mod/Drawing/App/DrawProjGroupItem.h>
#include <Mod/Drawing/App/DrawProjGroup.h>
#include <Mod/Drawing/App/DrawViewDimension.h>
#include <Mod/Drawing/App/DrawViewClip.h>
#include <Mod/Drawing/App/DrawViewAnnotation.h>
#include <Mod/Drawing/App/DrawViewSymbol.h>
#include <Mod/Drawing/Gui/QGVPage.h>
#include <Mod/TechDraw/App/DrawPage.h>
#include <Mod/TechDraw/App/DrawViewPart.h>
#include <Mod/TechDraw/App/DrawProjGroupItem.h>
#include <Mod/TechDraw/App/DrawProjGroup.h>
#include <Mod/TechDraw/App/DrawViewDimension.h>
#include <Mod/TechDraw/App/DrawViewClip.h>
#include <Mod/TechDraw/App/DrawViewAnnotation.h>
#include <Mod/TechDraw/App/DrawViewSymbol.h>
#include <Mod/TechDraw/Gui/QGVPage.h>
#include "MDIViewPage.h"
#include "TaskDialog.h"
#include "TaskProjGroup.h"
#include "ViewProviderPage.h"
@ -77,39 +76,6 @@ bool isDrawingPageActive(Gui::Document *doc)
return false;
}
//TODO: check if obsolete.
//===========================================================================
// CmdDrawingOpen
//===========================================================================
DEF_STD_CMD(CmdDrawingOpen);
CmdDrawingOpen::CmdDrawingOpen()
: Command("Drawing_Open")
{
sAppModule = "Drawing";
sGroup = QT_TR_NOOP("Drawing");
sMenuText = QT_TR_NOOP("Open SVG...");
sToolTipText = QT_TR_NOOP("Open a scalable vector graphic");
sWhatsThis = "Drawing_Open";
sStatusTip = sToolTipText;
sPixmap = "actions/document-new";
}
void CmdDrawingOpen::activated(int iMsg)
{
// Reading an image
QString filename = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QObject::tr("Choose an SVG file to open"), QString::null,
QString::fromLatin1("%1 (*.svg *.svgz)").arg(QObject::tr("Scalable Vector Graphic")));
if (!filename.isEmpty())
{
// load the file with the module
Command::doCommand(Command::Gui, "import Drawing, TechDrawGui");
Command::doCommand(Command::Gui, "TechDrawGui.open(unicode(\"%s\",\"utf-8\"))", (const char*)filename.toUtf8());
}
}
//===========================================================================
// Drawing_NewPageDef (default template)
//===========================================================================
@ -255,45 +221,6 @@ void CmdDrawingNewPage::activated(int iMsg)
}
}
//TODO: check if obsolete
//===========================================================================
// Drawing_NewA3Landscape
//===========================================================================
DEF_STD_CMD_A(CmdDrawingNewA3Landscape);
CmdDrawingNewA3Landscape::CmdDrawingNewA3Landscape()
: Command("Drawing_NewA3Landscape")
{
sAppModule = "Drawing";
sGroup = QT_TR_NOOP("Drawing");
sMenuText = QT_TR_NOOP("Insert new A3 landscape drawing");
sToolTipText = QT_TR_NOOP("Insert new A3 landscape drawing");
sWhatsThis = "Drawing_NewA3Landscape";
sStatusTip = sToolTipText;
sPixmap = "actions/techdraw-landscape-A3";
}
void CmdDrawingNewA3Landscape::activated(int iMsg)
{
std::string FeatName = getUniqueObjectName("Page");
openCommand("Create page");
doCommand(Doc,"App.activeDocument().addObject('TechDraw::DrawPage','%s')",FeatName.c_str());
doCommand(Doc,"App.activeDocument().%s.Template = 'A3_Landscape.svg'",FeatName.c_str());
// doCommand(Doc,"App.activeDocument().recompute()");
commitCommand();
}
bool CmdDrawingNewA3Landscape::isActive(void)
{
if (getActiveGuiDocument())
return true;
else
return false;
}
//===========================================================================
// Drawing_NewView
//===========================================================================
@ -512,43 +439,6 @@ bool CmdDrawingProjGroup::isActive(void)
}
//===========================================================================
// Drawing_OpenBrowserView
//===========================================================================
DEF_STD_CMD_A(CmdDrawingOpenBrowserView);
CmdDrawingOpenBrowserView::CmdDrawingOpenBrowserView()
: Command("Drawing_OpenBrowserView")
{
// seting the
sGroup = QT_TR_NOOP("Drawing");
sMenuText = QT_TR_NOOP("Open &browser view");
sToolTipText = QT_TR_NOOP("Opens the selected page in a browser view");
sWhatsThis = "Drawing_OpenBrowserView";
sStatusTip = QT_TR_NOOP("Opens the selected page in a browser view");
sPixmap = "actions/techdraw-openbrowser";
}
void CmdDrawingOpenBrowserView::activated(int iMsg)
{
unsigned int n = getSelection().countObjectsOfType(TechDraw::DrawPage::getClassTypeId());
if (n != 1) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select one Page object."));
return;
}
std::vector<Gui::SelectionSingleton::SelObj> Sel = getSelection().getSelection();
doCommand(Doc,"PageName = App.activeDocument().%s.PageResult",Sel[0].FeatName);
doCommand(Doc,"import WebGui");
doCommand(Doc,"WebGui.openBrowser(PageName)");
}
bool CmdDrawingOpenBrowserView::isActive(void)
{
return (getActiveGuiDocument() ? true : false);
}
//===========================================================================
// Drawing_Annotation
//===========================================================================
@ -895,88 +785,20 @@ bool CmdTechDrawExportPage::isActive(void)
return (getActiveGuiDocument() ? true : false);
}
//===========================================================================
// Drawing_ProjectShape
//===========================================================================
DEF_STD_CMD_A(CmdDrawingProjectShape);
CmdDrawingProjectShape::CmdDrawingProjectShape()
: Command("Drawing_ProjectShape")
{
// seting the
sGroup = QT_TR_NOOP("Drawing");
sMenuText = QT_TR_NOOP("Project shape...");
sToolTipText = QT_TR_NOOP("Project shape onto a user-defined plane");
sStatusTip = QT_TR_NOOP("Project shape onto a user-defined plane");
sWhatsThis = "Drawing_ProjectShape";
}
void CmdDrawingProjectShape::activated(int iMsg)
{
Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog();
if (!dlg) {
dlg = new TechDrawGui::TaskProjection();
dlg->setButtonPosition(Gui::TaskView::TaskDialog::South);
}
Gui::Control().showDialog(dlg);
}
bool CmdDrawingProjectShape::isActive(void)
{
int ct = Gui::Selection().countObjectsOfType(Part::Feature::getClassTypeId());
return (ct > 0 && !Gui::Control().activeDialog());
}
//===========================================================================
// Drawing_Draft_View
//===========================================================================
DEF_STD_CMD_A(CmdDrawingDraftView);
CmdDrawingDraftView::CmdDrawingDraftView()
: Command("Drawing_DraftView")
{
// seting the
sGroup = QT_TR_NOOP("Drawing");
sMenuText = QT_TR_NOOP("&Draft View");
sToolTipText = QT_TR_NOOP("Inserts a Draft view of the selected object(s) in the active drawing");
sWhatsThis = "Drawing_DraftView";
sStatusTip = QT_TR_NOOP("Inserts a Draft view of the selected object(s) in the active drawing");
sPixmap = "actions/techdraw-draft-view";
}
void CmdDrawingDraftView::activated(int iMsg)
{
addModule(Gui,"Draft");
doCommand(Gui,"Gui.runCommand(\"Draft_Drawing\")");
}
bool CmdDrawingDraftView::isActive(void)
{
return (getActiveGuiDocument() ? true : false);
}
void CreateDrawingCommands(void)
{
Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager();
// rcCmdMgr.addCommand(new CmdDrawingOpen());
rcCmdMgr.addCommand(new CmdDrawingNewPageDef());
rcCmdMgr.addCommand(new CmdDrawingNewPage());
rcCmdMgr.addCommand(new CmdDrawingNewA3Landscape());
rcCmdMgr.addCommand(new CmdDrawingNewView());
rcCmdMgr.addCommand(new CmdDrawingNewViewSection());
rcCmdMgr.addCommand(new CmdDrawingProjGroup());
// rcCmdMgr.addCommand(new CmdDrawingOpenBrowserView());
rcCmdMgr.addCommand(new CmdDrawingAnnotation());
rcCmdMgr.addCommand(new CmdDrawingClip());
rcCmdMgr.addCommand(new CmdDrawingClipPlus());
rcCmdMgr.addCommand(new CmdDrawingClipMinus());
rcCmdMgr.addCommand(new CmdDrawingSymbol());
rcCmdMgr.addCommand(new CmdTechDrawExportPage());
rcCmdMgr.addCommand(new CmdDrawingProjectShape());
rcCmdMgr.addCommand(new CmdDrawingDraftView());
}

13
src/Mod/TechDraw/Gui/CommandCreateDims.cpp
View File

@ -45,15 +45,14 @@
# include <Mod/Part/App/PartFeature.h>
# include <Mod/Drawing/App/DrawViewPart.h>
# include <Mod/Drawing/App/DrawProjGroupItem.h>
# include <Mod/Drawing/App/DrawProjGroup.h>
# include <Mod/Drawing/App/DrawViewDimension.h>
# include <Mod/Drawing/App/DrawPage.h>
# include <Mod/Drawing/App/DrawUtil.h>
# include <Mod/TechDraw/App/DrawViewPart.h>
# include <Mod/TechDraw/App/DrawProjGroupItem.h>
# include <Mod/TechDraw/App/DrawProjGroup.h>
# include <Mod/TechDraw/App/DrawViewDimension.h>
# include <Mod/TechDraw/App/DrawPage.h>
# include <Mod/TechDraw/App/DrawUtil.h>
# include "MDIViewPage.h"
# include "TaskDialog.h"
# include "ViewProviderPage.h"
using namespace TechDrawGui;

6
src/Mod/TechDraw/Gui/CommandDecorate.cpp
View File

@ -45,9 +45,9 @@
# include <Mod/Part/App/PartFeature.h>
# include <Mod/Drawing/App/DrawViewPart.h>
# include <Mod/Drawing/App/DrawHatch.h>
# include <Mod/Drawing/App/DrawPage.h>
# include <Mod/TechDraw/App/DrawViewPart.h>
# include <Mod/TechDraw/App/DrawHatch.h>
# include <Mod/TechDraw/App/DrawPage.h>
# include "MDIViewPage.h"
# include "ViewProviderPage.h"

40
src/Mod/TechDraw/Gui/MDIViewPage.cpp
View File

@ -77,18 +77,18 @@
#include <Gui/MainWindow.h>
#include <Gui/Selection.h>
#include <Mod/Drawing/App/DrawPage.h>
#include <Mod/Drawing/App/DrawView.h>
#include <Mod/Drawing/App/DrawViewCollection.h>
#include <Mod/Drawing/App/DrawProjGroup.h>
#include <Mod/Drawing/App/DrawViewPart.h>
#include <Mod/Drawing/App/DrawViewSection.h>
#include <Mod/Drawing/App/DrawViewDimension.h>
#include <Mod/Drawing/App/DrawTemplate.h>
#include <Mod/Drawing/App/DrawViewAnnotation.h>
#include <Mod/Drawing/App/DrawViewSymbol.h>
#include <Mod/Drawing/App/DrawViewClip.h>
#include <Mod/Drawing/App/DrawHatch.h>
#include <Mod/TechDraw/App/DrawPage.h>
#include <Mod/TechDraw/App/DrawView.h>
#include <Mod/TechDraw/App/DrawViewCollection.h>
#include <Mod/TechDraw/App/DrawProjGroup.h>
#include <Mod/TechDraw/App/DrawViewPart.h>
#include <Mod/TechDraw/App/DrawViewSection.h>
#include <Mod/TechDraw/App/DrawViewDimension.h>
#include <Mod/TechDraw/App/DrawTemplate.h>
#include <Mod/TechDraw/App/DrawViewAnnotation.h>
#include <Mod/TechDraw/App/DrawViewSymbol.h>
#include <Mod/TechDraw/App/DrawViewClip.h>
#include <Mod/TechDraw/App/DrawHatch.h>
#include "QGIDrawingTemplate.h"
#include "QGIView.h"
@ -208,7 +208,7 @@ void MDIViewPage::setDimensionGroups(void)
{
const std::vector<QGIView *> &allItems = m_view->getViews();
std::vector<QGIView *>::const_iterator itInspect;
int dimItemType = QGI::UserType + 106;
int dimItemType = QGraphicsItem::UserType + 106;
for (itInspect = allItems.begin(); itInspect != allItems.end(); itInspect++) {
if (((*itInspect)->type() == dimItemType) && (!(*itInspect)->group())) {
@ -356,7 +356,7 @@ void MDIViewPage::preSelectionChanged(const QPoint &pos)
if(edge) {
// Find the parent view that this edges is contained within
QGI *parent = edge->parentItem();
QGraphicsItem*parent = edge->parentItem();
if(!parent)
return;
@ -379,7 +379,7 @@ void MDIViewPage::preSelectionChanged(const QPoint &pos)
} else if(vert) {
// Find the parent view that this edges is contained within
//WF: sb Vertex??
QGI *parent = vert->parentItem();
QGraphicsItem*parent = vert->parentItem();
if(!parent)
return;
@ -452,12 +452,12 @@ void MDIViewPage::selectionChanged()
if(isSlectionBlocked)
return;
QList<QGI *> selection = m_view->scene()->selectedItems();
QList<QGraphicsItem*> selection = m_view->scene()->selectedItems();
bool block = blockConnection(true); // avoid to be notified by itself
Gui::Selection().clearSelection();
for (QList<QGI *>::iterator it = selection.begin(); it != selection.end(); ++it) {
for (QList<QGraphicsItem*>::iterator it = selection.begin(); it != selection.end(); ++it) {
// All selectable items must be of QGIView type
QGIView *itemView = dynamic_cast<QGIView *>(*it);
@ -466,7 +466,7 @@ void MDIViewPage::selectionChanged()
if(edge) {
// Find the parent view that this edges is contained within
QGI *parent = edge->parentItem();
QGraphicsItem*parent = edge->parentItem();
if(!parent)
return;
@ -489,7 +489,7 @@ void MDIViewPage::selectionChanged()
if(vert) {
// Find the parent view that this edges is contained within
//WF: sb Vertex
QGI *parent = vert->parentItem();
QGraphicsItem*parent = vert->parentItem();
if(!parent)
return;
@ -512,7 +512,7 @@ void MDIViewPage::selectionChanged()
if(dimLabel) {
// Find the parent view (dimLabel->dim->view)
QGI *dimParent = dimLabel->parentItem();
QGraphicsItem*dimParent = dimLabel->parentItem();
if(!dimParent)
return;