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

Exclude hatches from SVG export.

Browse Source 
QtSvg does not support clipping which is required for hatches.
This commit is contained in:
WandererFan 2016-07-16 13:16:59 -04:00
parent bff60f36a7
commit 094a63356f
7 changed files with 63 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -744,7 +744,7 @@ void MDIViewPage::print(QPrinter* printer)
static_cast<void> (blockConnection(true)); // avoid to be notified by itself
Gui::Selection().clearSelection();
m_view->toggleEdit(false);
m_view->toggleMarkers(false);
m_view->scene()->update();
Gui::Selection().clearSelection();
@ -752,7 +752,7 @@ void MDIViewPage::print(QPrinter* printer)
m_view->scene()->render(&p, rect);
// Reset
m_view->toggleEdit(true);
m_view->toggleMarkers(true);
}
@ -812,7 +812,7 @@ QPrinter::PageSize MDIViewPage::getPageSize(int w, int h) const
void MDIViewPage::setFrameState(bool state)
{
m_frameState = state;
m_view->toggleEdit(state);
m_view->toggleMarkers(state);
m_view->scene()->update();
}

11
src/Mod/TechDraw/Gui/QGIFace.cpp
View File

@ -175,6 +175,17 @@ void QGIFace::setHatchColor(std::string c)
m_svgCol = c;
}
//QtSvg does not handle clipping, so we must be able to turn the hatching on/off
void QGIFace::toggleSvg(bool b)
{
if (b) {
m_rect->show();
} else {
m_rect->hide();
}
update();
}
QRectF QGIFace::boundingRect() const
{
return shape().controlPointRect();

1
src/Mod/TechDraw/Gui/QGIFace.h
View File

@ -65,6 +65,7 @@ public:
void setPath(const QPainterPath & path);
void buildHatch(void);
void setHatchColor(std::string c);
void toggleSvg(bool b);
protected:
bool load(QByteArray *svgBytes);

1
src/Mod/TechDraw/Gui/QGITemplate.h
View File

@ -57,6 +57,7 @@ public:
inline qreal getY() { return y() * -1; }
virtual void updateView(bool update = false);
std::vector<TemplateTextField *> getTestFields(void) { return textFields; };
virtual void draw() = 0;

2
src/Mod/TechDraw/Gui/QGIView.cpp
View File

@ -79,8 +79,8 @@ QGIView::QGIView()
m_colCurrent = getNormalColor();
m_pen.setColor(m_colCurrent);
//Border/Label styling
m_font.setPointSize(5.0); //scene units (mm), not points
m_decorPen.setStyle(Qt::DashLine);
m_decorPen.setWidth(0); // 0 => 1px "cosmetic pen"

79
src/Mod/TechDraw/Gui/QGVPage.cpp
View File

@ -28,7 +28,6 @@
# include <QFileInfo>
# include <QFileDialog>
# include <QGLWidget>
//# include <QGraphicsScene>
# include <QGraphicsEffect>
# include <QMouseEvent>
# include <QPainter>
@ -61,7 +60,9 @@
#include "QGIDrawingTemplate.h"
#include "QGITemplate.h"
#include "QGISVGTemplate.h"
#include "TemplateTextField.h"
#include "QGIViewCollection.h"
#include "QGIViewDimension.h"
#include "QGIProjGroup.h"
@ -71,6 +72,7 @@
#include "QGIViewSymbol.h"
#include "QGIViewClip.h"
#include "QGIViewSpreadsheet.h"
#include "QGIFace.h"
#include "ZVALUE.h"
#include "ViewProviderPage.h"
@ -101,9 +103,9 @@ QGVPage::QGVPage(ViewProviderPage *vp, QGraphicsScene& s, QWidget *parent)
setCursor(QCursor(Qt::ArrowCursor));
setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
m_backgroundItem = new QGraphicsRectItem();
m_backgroundItem->setCacheMode(QGraphicsItem::NoCache);
m_backgroundItem->setZValue(ZVALUE::BACKGROUND);
//m_backgroundItem = new QGraphicsRectItem();
//m_backgroundItem->setCacheMode(QGraphicsItem::NoCache);
//m_backgroundItem->setZValue(ZVALUE::BACKGROUND);
// scene()->addItem(m_backgroundItem); // TODO IF SEGFAULTS WITH DRAW ENABLE THIS (REDRAWS ARE SLOWER :s)
bkgBrush = new QBrush(QColor::fromRgb(70,70,70));
@ -113,7 +115,7 @@ QGVPage::QGVPage(ViewProviderPage *vp, QGraphicsScene& s, QWidget *parent)
QGVPage::~QGVPage()
{
delete bkgBrush;
delete m_backgroundItem;
//delete m_backgroundItem;
}
void QGVPage::drawBackground(QPainter *p, const QRectF &)
@ -465,10 +467,10 @@ void QGVPage::setHighQualityAntialiasing(bool highQualityAntialiasing)
void QGVPage::setViewBackground(bool enable)
{
if (!m_backgroundItem)
return;
// if (!m_backgroundItem)
// return;
m_backgroundItem->setVisible(enable);
// m_backgroundItem->setVisible(enable);
}
void QGVPage::setViewOutline(bool enable)
@ -479,46 +481,49 @@ void QGVPage::setViewOutline(bool enable)
m_outlineItem->setVisible(enable);
}
void QGVPage::toggleEdit(bool enable)
void QGVPage::toggleMarkers(bool enable)
{
// TODO: needs fiddling to handle items that don't inherit QGIViewPart: Annotation, Symbol, Templates, Edges, Faces, Vertices,...
QList<QGraphicsItem*> list = scene()->items();
for (QList<QGraphicsItem*>::iterator it = list.begin(); it != list.end(); ++it) {
QGIView *itemView = dynamic_cast<QGIView *>(*it);
if(itemView) {
QGIViewPart *viewPart = dynamic_cast<QGIViewPart *>(*it);
itemView->setSelected(false);
itemView->toggleBorder(enable);
QGIViewPart *viewPart = dynamic_cast<QGIViewPart *>(*it);
if(viewPart) {
viewPart->toggleCache(enable);
viewPart->toggleCosmeticLines(enable);
viewPart->toggleVertices(enable);
viewPart->toggleBorder(enable);
setViewBackground(enable);
} else {
itemView->toggleBorder(enable);
}
//itemView->updateView(true);
}
int textItemType = QGraphicsItem::UserType + 160;
QGraphicsItem*item = dynamic_cast<QGraphicsItem*>(*it);
if(item) {
//item->setCacheMode((enable) ? QGraphicsItem::DeviceCoordinateCache : QGraphicsItem::NoCache);
item->setCacheMode((enable) ? QGraphicsItem::NoCache : QGraphicsItem::NoCache);
item->update();
if (item->type() == textItemType) { //TODO: move this into SVGTemplate or TemplateTextField
QGISVGTemplate* itemTemplate = dynamic_cast<QGISVGTemplate*> (*it);
if (itemTemplate) {
std::vector<TemplateTextField *> textFields = itemTemplate->getTestFields();
for (auto& t:textFields) {
if (enable) {
item->show();
t->show();
} else {
item->hide();
t->hide();
}
}
}
}
}
void QGVPage::toggleHatch(bool enable)
{
QList<QGraphicsItem*> sceneItems = scene()->items();
for (auto& qgi:sceneItems) {
QGIViewPart* qgiPart = dynamic_cast<QGIViewPart *>(qgi);
if(qgiPart) {
QList<QGraphicsItem*> partChildren = qgiPart->childItems();
int faceItemType = QGraphicsItem::UserType + 104;
for (auto& c:partChildren) {
if (c->type() == faceItemType) {
QGIFace* f = dynamic_cast<QGIFace*>(c);
f->toggleSvg(enable);
}
}
}
}
scene()->update();
update();
viewport()->repaint();
}
void QGVPage::saveSvg(QString filename)
@ -545,7 +550,7 @@ void QGVPage::saveSvg(QString filename)
// postprocess generated file to mult all font-size attrib by 2.835 to get pts?
// duplicate all textItems and only show the appropriate one for screen/print vs export?
// TODO: Was svgGen.setResolution(25.4000508); // mm/inch?? docs say this is DPI
// TODO: Was svgGen.setResolution(25.4000508); // mm/inch?? docs say this is DPI //really "user space units/inch"?
svgGen.setResolution(25); // mm/inch?? docs say this is DPI
//svgGen.setResolution(600); // resulting page is ~12.5x9mm
@ -555,8 +560,10 @@ void QGVPage::saveSvg(QString filename)
Gui::Selection().clearSelection();
toggleEdit(false); //fiddle cache, cosmetic lines, vertices, etc
toggleMarkers(false); //fiddle cache, vertices, frames, etc
toggleHatch(false);
scene()->update();
viewport()->repaint();
Gui::Selection().clearSelection();
QPainter p;
@ -565,8 +572,10 @@ void QGVPage::saveSvg(QString filename)
scene()->render(&p);
p.end();
toggleEdit(true);
toggleMarkers(true);
toggleHatch(true);
scene()->update();
viewport()->repaint();
}

3
src/Mod/TechDraw/Gui/QGVPage.h
View File

@ -85,7 +85,8 @@ public:
TechDraw::DrawPage * getDrawPage();
void toggleEdit(bool enable);
void toggleMarkers(bool enable);
void toggleHatch(bool enable);
/// Renders the page to SVG with filename.
void saveSvg(QString filename);