Add View centerlines
This commit is contained in:
parent
0fa94ee0a9
commit
3901d2fe82
|
@ -110,6 +110,8 @@ DrawViewPart::DrawViewPart(void) : geometryObject(0)
|
||||||
ADD_PROPERTY_TYPE(HiddenWidth,(0.15),fgroup,App::Prop_None,"The thickness of hidden lines, if enabled");
|
ADD_PROPERTY_TYPE(HiddenWidth,(0.15),fgroup,App::Prop_None,"The thickness of hidden lines, if enabled");
|
||||||
ADD_PROPERTY_TYPE(ShowCenters ,(true),fgroup,App::Prop_None,"Center marks on/off");
|
ADD_PROPERTY_TYPE(ShowCenters ,(true),fgroup,App::Prop_None,"Center marks on/off");
|
||||||
ADD_PROPERTY_TYPE(CenterScale,(2.0),fgroup,App::Prop_None,"Center mark size adjustment, if enabled");
|
ADD_PROPERTY_TYPE(CenterScale,(2.0),fgroup,App::Prop_None,"Center mark size adjustment, if enabled");
|
||||||
|
ADD_PROPERTY_TYPE(HorizCenterLine ,(false),fgroup,App::Prop_None,"Show a horizontal centerline through view");
|
||||||
|
ADD_PROPERTY_TYPE(VertCenterLine ,(false),fgroup,App::Prop_None,"Show a vertical centerline through view");
|
||||||
|
|
||||||
ADD_PROPERTY_TYPE(ShowSectionLine ,(true) ,lgroup,App::Prop_None,"Show/hide section line if applicable");
|
ADD_PROPERTY_TYPE(ShowSectionLine ,(true) ,lgroup,App::Prop_None,"Show/hide section line if applicable");
|
||||||
ADD_PROPERTY_TYPE(HorizSectionLine ,(true) ,lgroup,App::Prop_None,"Section line is horizontal");
|
ADD_PROPERTY_TYPE(HorizSectionLine ,(true) ,lgroup,App::Prop_None,"Section line is horizontal");
|
||||||
|
@ -218,7 +220,9 @@ void DrawViewPart::onChanged(const App::Property* prop)
|
||||||
prop == &ShowSectionLine ||
|
prop == &ShowSectionLine ||
|
||||||
prop == &HorizSectionLine ||
|
prop == &HorizSectionLine ||
|
||||||
prop == &ArrowUpSection ||
|
prop == &ArrowUpSection ||
|
||||||
prop == &SymbolSection ) {
|
prop == &SymbolSection ||
|
||||||
|
prop == &HorizCenterLine ||
|
||||||
|
prop == &VertCenterLine) {
|
||||||
try {
|
try {
|
||||||
App::DocumentObjectExecReturn *ret = recompute();
|
App::DocumentObjectExecReturn *ret = recompute();
|
||||||
delete ret;
|
delete ret;
|
||||||
|
|
|
@ -74,6 +74,8 @@ public:
|
||||||
App::PropertyBool ShowCenters;
|
App::PropertyBool ShowCenters;
|
||||||
App::PropertyFloat CenterScale;
|
App::PropertyFloat CenterScale;
|
||||||
App::PropertyFloatConstraint Tolerance;
|
App::PropertyFloatConstraint Tolerance;
|
||||||
|
App::PropertyBool HorizCenterLine;
|
||||||
|
App::PropertyBool VertCenterLine;
|
||||||
|
|
||||||
App::PropertyBool ShowSectionLine;
|
App::PropertyBool ShowSectionLine;
|
||||||
App::PropertyBool HorizSectionLine; //true(horiz)/false(vert)
|
App::PropertyBool HorizSectionLine; //true(horiz)/false(vert)
|
||||||
|
|
|
@ -143,6 +143,8 @@ SET(TechDrawGuiView_SRCS
|
||||||
QGISectionLine.h
|
QGISectionLine.h
|
||||||
QGIDecoration.cpp
|
QGIDecoration.cpp
|
||||||
QGIDecoration.h
|
QGIDecoration.h
|
||||||
|
QGICenterLine.cpp
|
||||||
|
QGICenterLine.h
|
||||||
TemplateTextField.cpp
|
TemplateTextField.cpp
|
||||||
TemplateTextField.h
|
TemplateTextField.h
|
||||||
ZVALUE.h
|
ZVALUE.h
|
||||||
|
|
99
src/Mod/TechDraw/Gui/QGICenterLine.cpp
Normal file
99
src/Mod/TechDraw/Gui/QGICenterLine.cpp
Normal file
|
@ -0,0 +1,99 @@
|
||||||
|
/***************************************************************************
|
||||||
|
* Copyright (c) 2016 WandererFan <wandererfan@gmail.com> *
|
||||||
|
* *
|
||||||
|
* 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 <QPainter>
|
||||||
|
#include <QStyleOptionGraphicsItem>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <App/Application.h>
|
||||||
|
#include <App/Material.h>
|
||||||
|
#include <Base/Console.h>
|
||||||
|
#include <Base/Parameter.h>
|
||||||
|
|
||||||
|
#include "QGICenterLine.h"
|
||||||
|
|
||||||
|
using namespace TechDrawGui;
|
||||||
|
|
||||||
|
QGICenterLine::QGICenterLine()
|
||||||
|
{
|
||||||
|
m_line = new QGraphicsPathItem();
|
||||||
|
addToGroup(m_line);
|
||||||
|
setWidth(0.0);
|
||||||
|
setStyle(getCenterStyle());
|
||||||
|
setColor(getCenterColor());
|
||||||
|
}
|
||||||
|
|
||||||
|
void QGICenterLine::draw()
|
||||||
|
{
|
||||||
|
prepareGeometryChange();
|
||||||
|
makeLine();
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
|
||||||
|
void QGICenterLine::makeLine()
|
||||||
|
{
|
||||||
|
QPainterPath pp;
|
||||||
|
pp.moveTo(m_start);
|
||||||
|
pp.lineTo(m_end);
|
||||||
|
m_line->setPath(pp);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void QGICenterLine::setBounds(double x1,double y1,double x2,double y2)
|
||||||
|
{
|
||||||
|
m_start = QPointF(x1,y1);
|
||||||
|
m_end = QPointF(x2,y2);
|
||||||
|
}
|
||||||
|
|
||||||
|
QColor QGICenterLine::getCenterColor()
|
||||||
|
{
|
||||||
|
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
|
||||||
|
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors");
|
||||||
|
App::Color fcColor = App::Color((uint32_t) hGrp->GetUnsigned("CenterColor", 0x08080800));
|
||||||
|
return fcColor.asValue<QColor>();
|
||||||
|
}
|
||||||
|
|
||||||
|
Qt::PenStyle QGICenterLine::getCenterStyle()
|
||||||
|
{
|
||||||
|
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")->
|
||||||
|
GetGroup("Preferences")->GetGroup("Mod/TechDraw");
|
||||||
|
Qt::PenStyle centerStyle = static_cast<Qt::PenStyle> (hGrp->GetInt("CenterLine",3));
|
||||||
|
return centerStyle;
|
||||||
|
}
|
||||||
|
|
||||||
|
void QGICenterLine::paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget) {
|
||||||
|
QStyleOptionGraphicsItem myOption(*option);
|
||||||
|
myOption.state &= ~QStyle::State_Selected;
|
||||||
|
|
||||||
|
setTools();
|
||||||
|
QGIDecoration::paint (painter, &myOption, widget);
|
||||||
|
}
|
||||||
|
|
||||||
|
void QGICenterLine::setTools()
|
||||||
|
{
|
||||||
|
m_pen.setWidthF(m_width);
|
||||||
|
m_pen.setColor(m_colCurrent);
|
||||||
|
m_pen.setStyle(m_styleCurrent);
|
||||||
|
m_line->setPen(m_pen);
|
||||||
|
}
|
65
src/Mod/TechDraw/Gui/QGICenterLine.h
Normal file
65
src/Mod/TechDraw/Gui/QGICenterLine.h
Normal file
|
@ -0,0 +1,65 @@
|
||||||
|
/***************************************************************************
|
||||||
|
* Copyright (c) 2016 WandererFan <wandererfan@gmail.com> *
|
||||||
|
* *
|
||||||
|
* 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 TECHDRAWGUI_QGICENTERLINE_H
|
||||||
|
#define TECHDRAWGUI_QGICENTERLINE_H
|
||||||
|
|
||||||
|
#include <QPointF>
|
||||||
|
#include <QPainterPath>
|
||||||
|
#include <QColor>
|
||||||
|
|
||||||
|
#include <Base/Vector3D.h>
|
||||||
|
|
||||||
|
#include "QGIDecoration.h"
|
||||||
|
|
||||||
|
namespace TechDrawGui
|
||||||
|
{
|
||||||
|
|
||||||
|
class TechDrawGuiExport QGICenterLine : public QGIDecoration
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
explicit QGICenterLine();
|
||||||
|
~QGICenterLine() {}
|
||||||
|
|
||||||
|
enum {Type = QGraphicsItem::UserType + 174};
|
||||||
|
int type() const { return Type;}
|
||||||
|
|
||||||
|
virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 );
|
||||||
|
|
||||||
|
void setBounds(double x1,double y1,double x2,double y2);
|
||||||
|
virtual void draw();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
QColor getCenterColor();
|
||||||
|
Qt::PenStyle getCenterStyle();
|
||||||
|
void makeLine();
|
||||||
|
void setTools();
|
||||||
|
|
||||||
|
private:
|
||||||
|
QGraphicsPathItem* m_line; //primpath?
|
||||||
|
QPointF m_start;
|
||||||
|
QPointF m_end;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // TECHDRAWGUI_QGICENTERLINE_H
|
|
@ -33,6 +33,7 @@ QGIPrimPath: 170
|
||||||
QGICMark: 171
|
QGICMark: 171
|
||||||
QGISectionLine: 172
|
QGISectionLine: 172
|
||||||
QGIDecoration: 173
|
QGIDecoration: 173
|
||||||
|
QGICenterLine: 174
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -59,6 +59,7 @@
|
||||||
#include "QGIVertex.h"
|
#include "QGIVertex.h"
|
||||||
#include "QGICMark.h"
|
#include "QGICMark.h"
|
||||||
#include "QGISectionLine.h"
|
#include "QGISectionLine.h"
|
||||||
|
#include "QGICenterLine.h"
|
||||||
#include "QGCustomBorder.h"
|
#include "QGCustomBorder.h"
|
||||||
#include "QGCustomLabel.h"
|
#include "QGCustomLabel.h"
|
||||||
#include "QGIViewPart.h"
|
#include "QGIViewPart.h"
|
||||||
|
@ -381,6 +382,8 @@ void QGIViewPart::drawViewPart()
|
||||||
viewPart->getSectionRef() ) {
|
viewPart->getSectionRef() ) {
|
||||||
drawSectionLine(true);
|
drawSectionLine(true);
|
||||||
}
|
}
|
||||||
|
//draw center lines
|
||||||
|
drawCenterLines(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
QGIFace* QGIViewPart::drawFace(TechDrawGeometry::Face* f, int idx)
|
QGIFace* QGIViewPart::drawFace(TechDrawGeometry::Face* f, int idx)
|
||||||
|
@ -505,6 +508,50 @@ void QGIViewPart::drawSectionLine(bool b)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void QGIViewPart::drawCenterLines(bool b)
|
||||||
|
{
|
||||||
|
TechDraw::DrawViewPart *viewPart = dynamic_cast<TechDraw::DrawViewPart *>(getViewObject());
|
||||||
|
if (!viewPart) {
|
||||||
|
return;
|
||||||
|
|
||||||
|
}
|
||||||
|
if (b) {
|
||||||
|
//Base::Vector3d vertDir(0,1,0);
|
||||||
|
//Base::Vector3d horizDir(1,0,0);
|
||||||
|
bool horiz = viewPart->HorizCenterLine.getValue();
|
||||||
|
bool vert = viewPart->VertCenterLine.getValue();
|
||||||
|
|
||||||
|
//centroid of part is at (0,0)
|
||||||
|
QGICenterLine* centerLine;
|
||||||
|
double sectionSpan;
|
||||||
|
double sectionFudge = 10.0;
|
||||||
|
double xVal, yVal;
|
||||||
|
if (horiz) {
|
||||||
|
centerLine = new QGICenterLine();
|
||||||
|
addToGroup(centerLine);
|
||||||
|
centerLine->setPos(0.0,0.0);
|
||||||
|
sectionSpan = m_border->rect().width() + sectionFudge;
|
||||||
|
xVal = sectionSpan / 2.0;
|
||||||
|
yVal = 0.0;
|
||||||
|
centerLine->setBounds(-xVal,-yVal,xVal,yVal);
|
||||||
|
//centerLine->setWidth(viewPart->LineWidth.getValue());
|
||||||
|
centerLine->setZValue(ZVALUE::SECTIONLINE);
|
||||||
|
centerLine->draw();
|
||||||
|
}
|
||||||
|
if (vert) {
|
||||||
|
centerLine = new QGICenterLine();
|
||||||
|
addToGroup(centerLine);
|
||||||
|
centerLine->setPos(0.0,0.0);
|
||||||
|
sectionSpan = (m_border->rect().height() - m_label->boundingRect().height()) + sectionFudge;
|
||||||
|
xVal = 0.0;
|
||||||
|
yVal = sectionSpan / 2.0;
|
||||||
|
centerLine->setBounds(-xVal,-yVal,xVal,yVal);
|
||||||
|
//centerLine->setWidth(viewPart->LineWidth.getValue());
|
||||||
|
centerLine->setZValue(ZVALUE::SECTIONLINE);
|
||||||
|
centerLine->draw();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// As called by arc of ellipse case:
|
// As called by arc of ellipse case:
|
||||||
// pathArc(path, geom->major, geom->minor, geom->angle, geom->largeArc, geom->cw,
|
// pathArc(path, geom->major, geom->minor, geom->angle, geom->largeArc, geom->cw,
|
||||||
|
|
|
@ -58,6 +58,7 @@ public:
|
||||||
void tidy();
|
void tidy();
|
||||||
virtual QRectF boundingRect() const override;
|
virtual QRectF boundingRect() const override;
|
||||||
virtual void drawSectionLine(bool b);
|
virtual void drawSectionLine(bool b);
|
||||||
|
virtual void drawCenterLines(bool b);
|
||||||
bool showSection;
|
bool showSection;
|
||||||
|
|
||||||
virtual void draw() override;
|
virtual void draw() override;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user