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

Fix issue 53 Drawing templates

Browse Source
This commit is contained in:
WandererFan 2016-06-04 18:11:51 -04:00 committed by wmayer
parent f59173c728
commit 510569f05b
17 changed files with 2298 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mod/TechDraw/App/CMakeLists.txt
View File

@ -127,6 +127,15 @@ SOURCE_GROUP("Features" FILES ${Draw_SRCS})
SOURCE_GROUP("Geometry" FILES ${Geometry_SRCS})
SOURCE_GROUP("Python" FILES ${Python_SRCS})
SET(TechDraw_Templates
Templates/A0_Landscape_ISO7200TD.svg
Templates/A1_Landscape_ISO7200TD.svg
Templates/A2_Landscape_ISO7200TD.svg
Templates/A3_Landscape_ISO7200TD.svg
Templates/A4_LandscapeTD.svg
Templates/A4_Landscape_ISO7200TD.svg
Templates/A4_Portrait_ISO7200TD.svg
)
if(MSVC)
#add_definitions(-D_PreComp_)
@ -150,7 +159,7 @@ fc_target_copy_resource(TechDraw
fc_target_copy_resource(TechDraw
${CMAKE_SOURCE_DIR}/src/Mod/TechDraw
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw
${TechDrawTemplates})
${TechDraw_Templates})
SET_BIN_DIR(TechDraw TechDraw /Mod/TechDraw)
SET_PYTHON_PREFIX_SUFFIX(TechDraw)

10
src/Mod/TechDraw/App/DrawSVGTemplate.cpp
View File

@ -130,13 +130,9 @@ void DrawSVGTemplate::onChanged(const App::Property* prop)
execute();
// Update the parent page if exists
std::vector<App::DocumentObject*> parent = getInList();
for (std::vector<App::DocumentObject*>::iterator it = parent.begin(); it != parent.end(); ++it) {
if ((*it)->getTypeId().isDerivedFrom(DrawPage::getClassTypeId())) {
TechDraw::DrawPage *page = static_cast<TechDraw::DrawPage *>(*it);
page->touch();
}
}
TechDraw::DrawPage *page = getParentPage();
if (page)
page->touch();
}
TechDraw::DrawTemplate::onChanged(prop);

12
src/Mod/TechDraw/App/DrawTemplate.cpp
View File

@ -131,6 +131,18 @@ void DrawTemplate::getBlockDimensions(double &x, double &y, double &width, doubl
throw Base::Exception("implement in virtual function");
}
DrawPage* DrawTemplate::getParentPage() const
{
TechDraw::DrawPage* page = nullptr;
std::vector<App::DocumentObject*> parent = getInList();
for (std::vector<App::DocumentObject*>::iterator it = parent.begin(); it != parent.end(); ++it) {
if ((*it)->getTypeId().isDerivedFrom(DrawPage::getClassTypeId())) {
page = static_cast<TechDraw::DrawPage *>(*it);
}
}
return page;
}
// Python Template feature ---------------------------------------------------------
namespace App {

3
src/Mod/TechDraw/App/DrawTemplate.h
View File

@ -38,6 +38,8 @@ namespace TechDrawGeometry
namespace TechDraw
{
class DrawPage;
class TechDrawExport DrawTemplate : public App::DocumentObject
{
PROPERTY_HEADER(TechDraw::DrawTemplate);
@ -62,6 +64,7 @@ public:
virtual double getHeight() const;
virtual void getBlockDimensions(double &x, double &y, double &width, double &height) const;
virtual DrawPage* getParentPage() const;
/** @name methods overide Feature */
//@{

27
src/Mod/TechDraw/App/DrawViewSection.cpp
View File

@ -149,12 +149,15 @@ App::DocumentObjectExecReturn *DrawViewSection::execute(void)
Base::Vector3d plnPnt(tmp1.x, tmp1.y, tmp1.z);
Base::Vector3d plnNorm(tmp2.x, tmp2.y, tmp2.z);
if(!bb.IsCutPlane(plnPnt, plnNorm)) {
return new App::DocumentObjectExecReturn("Section Plane doesn't intersect part");
// if(!bb.IsCutPlane(plnPnt, plnNorm)) { //this test doesn't work if plane is coincident with bb!
if(!isReallyInBox(plnPnt, bb)) {
Base::Console().Warning("DVS: Section Plane doesn't intersect part in %s\n",getNameInDocument());
Base::Console().Warning("DVS: Using center of bounding box.\n");
plnPnt = bb.GetCenter();
SectionOrigin.setValue(plnPnt);
//return new App::DocumentObjectExecReturn("Section Plane doesn't intersect part");
}
//bb.Enlarge(1.0); // Enlarge the bounding box to prevent any clipping
// Gather the points
std::vector<Base::Vector3d> pnts;
@ -244,8 +247,8 @@ App::DocumentObjectExecReturn *DrawViewSection::execute(void)
}
catch (Standard_Failure) {
Handle_Standard_Failure e1 = Standard_Failure::Caught();
Base::Console().Log("DrawViewSection::execute - building Section shape failed: %s\n",e1->GetMessageString());
return new App::DocumentObjectExecReturn(e1->GetMessageString());
return new App::DocumentObjectExecReturn(std::string("DVS building Section shape failed: ") +
std::string(e1->GetMessageString()));
}
touch();
@ -384,6 +387,18 @@ TopoDS_Face DrawViewSection::projectFace(const TopoDS_Shape &face,
return projectedFace;
}
//this should really be in BoundBox.h
bool DrawViewSection::isReallyInBox (const Base::Vector3d v, const Base::BoundBox3d bb) const
{
if (v.x <= bb.MinX || v.x >= bb.MaxX)
return false;
if (v.y <= bb.MinY || v.y >= bb.MaxY)
return false;
if (v.z <= bb.MinZ || v.z >= bb.MaxZ)
return false;
return true;
}
// Python Drawing feature ---------------------------------------------------------

2
src/Mod/TechDraw/App/DrawViewSection.h
View File

@ -56,7 +56,7 @@ public:
App::PropertyBool ShowCutSurface;
short mustExecute() const;
bool isReallyInBox (const Base::Vector3d v, const Base::BoundBox3d bb) const;
/** @name methods overide Feature */
//@{
/// recalculate the Feature

3
src/Mod/TechDraw/CMakeLists.txt
View File

@ -19,7 +19,6 @@ INSTALL(
Templates
DESTINATION
${CMAKE_INSTALL_DATADIR}/Mod/TechDraw
FILES_MATCHING
FILES_MATCHING
PATTERN "*.svg*"
PATTERN "*.dxf*"
)

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

@ -149,8 +149,8 @@ void CmdTechDrawNewPageDef::activated(int iMsg)
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw");
std::string defaultDir = App::Application::getResourceDir() + "Mod/Drawing/Templates";
std::string defaultFileName = defaultDir + "A4_Landscape.svg";
std::string defaultDir = App::Application::getResourceDir() + "Mod/TechDraw/Templates/";
std::string defaultFileName = defaultDir + "A4_LandscapeTD.svg";
QString templateFileName = QString::fromStdString(hGrp->GetASCII("TemplateFile",defaultFileName.c_str()));
if (templateFileName.isEmpty()) {
templateFileName = QString::fromStdString(defaultFileName);

1
src/Mod/TechDraw/Gui/DlgTemplateField.cpp
View File

@ -30,6 +30,7 @@ using namespace TechDrawGui;
DlgTemplateField::DlgTemplateField( QWidget* parent )
{
setupUi(this);
leInput->setFocus();
}
DlgTemplateField::~DlgTemplateField()

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

@ -80,7 +80,7 @@ std::vector<std::string> ViewProviderTemplate::getDisplayModes(void) const
void ViewProviderTemplate::updateData(const App::Property* prop)
{
Base::Console().Log("ViewProviderTemplate::updateData(%s)",prop->getName());
//Base::Console().Log("ViewProviderTemplate::updateData(%s)/n",prop->getName());
}
TechDraw::DrawTemplate* ViewProviderTemplate::getTemplate() const

95
src/Mod/TechDraw/Templates/A0_Landscape_ISO7200TD.svg Normal file
View File

@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns="http://www.w3.org/2000/svg" version="1.1"
xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace"
width="1189mm"
height="841mm"
viewBox="0 0 1189 841">
<!-- Working space 20 10 1179 831 -->
<!-- Title block 999 771 1179 831 -->
<g>
<rect
id="drawing-border"
style="fill:none;stroke:#000000;stroke-width:0.7;stroke-linecap:miter;stroke-miterlimit:4"
width="1159"
height="821"
x="20"
y="10" />
<!-- width-30, height-20 -->
<g
transform="translate(979,544)">
<!-- A4 Portrait based for other formats width-210, height-297 -->
<!-- page rect translation
w h rw rh tx ty
A4-P 210 297 180 277 0 0
A3-L 420 297 390 277 210 0
A2-L 594 420 564 400 384 123
A1-L 841 594 811 574 631 297
A0-L 1189 841 1159 821 979 544
-->
<g
id="titleblock-structure"
style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:miter;stroke-miterlimit:4">
<rect width="180" height="60" x="20" y="227" />
<path d="m 20,239 h 180" />
<path d="m 80,227 v 12" />
<path d="m 140,239 v 48" />
<path d="m 160,239 v 12" />
<path d="m 180,239 v 12" />
<path d="m 140,251 h 60" />
<path d="m 140,275 h 60" />
<path d="m 180,275 v 12" />
</g>
<g
id="titleblock-text-non-editable"
style="font-size:3px;text-anchor:start;fill:#000000;font-family:osifont"
xml:space="preserve">
<text x="21" y="230">Created by:</text>
<text x="81" y="230">Title:</text>
<text x="21" y="242">Supplementary information:</text>
<text x="141" y="242">Size:</text>
<text x="161" y="242">Sheet:</text>
<text x="181" y="242">Scale:</text>
<text x="141" y="254">Part number:</text>
<text x="141" y="266">Drawing number:</text>
<text x="141" y="278">Date:</text>
<text x="181" y="278">Revision:</text>
</g>
<!-- Set display:none to hide FreeCAD Logo -->
<g
style="display:inline"
id="freecad-logo"
transform="translate(128.5,276)"
fill-rule="evenodd"
stroke="#000"
stroke-width="0.35"
fill="none">
<path d="m0.1524 0.15254v8.8549h1.9744v-3.4652h1.396v-1.3661h-1.396v-1.4745h3.4391v-2.5441l-5.4135-0.005z"/>
<path d="m7.7927 3.4504-0.50715-0.176-0.48387-1.2366-0.76115 0.04-0.34718 1.2787-0.4859 0.23269-1.2119-0.53015-0.51188 0.56882 0.65892 1.1485-0.18006 0.50567-1.2366 0.48387 0.044064 0.76263 1.2787 0.34718 0.23269 0.4859-0.53421 1.2104 0.56882 0.51188 1.1485-0.65891 0.50973 0.18155 0.4798 1.2351 0.7667-0.04258 0.34311-1.2802 0.4859-0.23269 1.2145 0.5357 0.51188-0.56882-0.65891-1.1485 0.17748-0.51122 1.2351-0.4798-0.03851-0.76521-1.2802-0.34311-0.23269-0.4859 0.53163-1.216-0.56881-0.51184zm-0.5715 1.2244 0.23576 0.13679 0.20426 0.18519 0.16353 0.22101 0.11763 0.24572 0.06916 0.26489 0.01146 0.27146-0.03921 0.27139-0.08948 0.25764-0.14234 0.23834-0.17964 0.20167-0.22101 0.16353-0.24572 0.11763-0.26489 0.06916-0.27295 0.01553-0.2719-0.04-0.2576-0.089-0.2383-0.143-0.2002-0.183-0.165-0.217-0.1177-0.246-0.0676-0.269-0.0156-0.273 0.039206-0.2714 0.089484-0.25764 0.14085-0.23427 0.18113-0.20574 0.22101-0.16352 0.24572-0.11763 0.26895-0.06768 0.27147-0.01146 0.27139 0.03921 0.25764 0.08948z"/>
</g>
</g>
</g>
<g
id="titleblock-text-editable"
style="font-size:5px;text-anchor:start;fill:#000000;font-family:osifont"
xml:space="preserve">
<text freecad:editable="AUTHOR_NAME" x="1000" y="780"><tspan>AUTHOR NAME</tspan></text>
<text freecad:editable="DRAWING_TITLE" x="1060" y="780"><tspan>DRAWING TITLE</tspan></text>
<text freecad:editable="SI-1" x="1000" y="792"><tspan></tspan></text>
<text freecad:editable="SI-2" x="1000" y="799"><tspan></tspan></text>
<text freecad:editable="FreeCAD_DRAWING" x="1000" y="806"><tspan>FreeCAD DRAWING</tspan></text>
<text freecad:editable="SI-4" x="1000" y="813"><tspan></tspan></text>
<text freecad:editable="SI-5" x="1000" y="820"><tspan></tspan></text>
<text freecad:editable="SI-6" x="1000" y="827"><tspan></tspan></text>
<text freecad:editable="FC-SI" x="1122" y="792"><tspan>A0</tspan></text>
<text freecad:editable="FC-SH" x="1142" y="792"><tspan>X / Y</tspan></text>
<text freecad:editable="FC-SC" x="1162" y="792"><tspan>SCALE</tspan></text>
<text freecad:editable="PN" x="1120" y="806"><tspan>PN</tspan></text>
<text freecad:editable="DN" x="1120" y="816"><tspan>DN</tspan></text>
<text freecad:editable="FC-DATE" x="1120" y="828"><tspan>DD/MM/YYYY</tspan></text>
<text freecad:editable="FC-REV" x="1160" y="828"><tspan>REV A</tspan></text>
</g>
<!-- DrawingContent -->
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

95
src/Mod/TechDraw/Templates/A1_Landscape_ISO7200TD.svg Normal file
View File

@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns="http://www.w3.org/2000/svg" version="1.1"
xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace"
width="841mm"
height="594mm"
viewBox="0 0 841 594">
<!-- Working space 20 10 831 584 -->
<!-- Title block 651 524 831 584 -->
<g>
<rect
id="drawing-border"
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:miter;stroke-miterlimit:4"
width="811"
height="574"
x="20"
y="10" />
<!-- width-30, height-20 -->
<g
transform="translate(631,297)">
<!-- A4 Portrait based for other formats width-210, height-297 -->
<!-- page rect translation
w h rw rh tx ty
A4-P 210 297 180 277 0 0
A3-L 420 297 390 277 210 0
A2-L 594 420 564 400 384 123
A1-L 841 594 811 574 631 297
A0-L 1189 841 1159 821 979 544
-->
<g
id="titleblock-structure"
style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:miter;stroke-miterlimit:4">
<rect width="180" height="60" x="20" y="227" />
<path d="m 20,239 h 180" />
<path d="m 80,227 v 12" />
<path d="m 140,239 v 48" />
<path d="m 160,239 v 12" />
<path d="m 180,239 v 12" />
<path d="m 140,251 h 60" />
<path d="m 140,275 h 60" />
<path d="m 180,275 v 12" />
</g>
<g
id="titleblock-text-non-editable"
style="font-size:3px;text-anchor:start;fill:#000000;font-family:osifont"
xml:space="preserve">
<text x="21" y="230">Created by:</text>
<text x="81" y="230">Title:</text>
<text x="21" y="242">Supplementary information:</text>
<text x="141" y="242">Size:</text>
<text x="161" y="242">Sheet:</text>
<text x="181" y="242">Scale:</text>
<text x="141" y="254">Part number:</text>
<text x="141" y="266">Drawing number:</text>
<text x="141" y="278">Date:</text>
<text x="181" y="278">Revision:</text>
</g>
<!-- Set display:none to hide FreeCAD Logo -->
<g
style="display:inline"
id="freecad-logo"
transform="translate(128.5,276)"
fill-rule="evenodd"
stroke="#000"
stroke-width="0.35"
fill="none">
<path d="m0.1524 0.15254v8.8549h1.9744v-3.4652h1.396v-1.3661h-1.396v-1.4745h3.4391v-2.5441l-5.4135-0.005z"/>
<path d="m7.7927 3.4504-0.50715-0.176-0.48387-1.2366-0.76115 0.04-0.34718 1.2787-0.4859 0.23269-1.2119-0.53015-0.51188 0.56882 0.65892 1.1485-0.18006 0.50567-1.2366 0.48387 0.044064 0.76263 1.2787 0.34718 0.23269 0.4859-0.53421 1.2104 0.56882 0.51188 1.1485-0.65891 0.50973 0.18155 0.4798 1.2351 0.7667-0.04258 0.34311-1.2802 0.4859-0.23269 1.2145 0.5357 0.51188-0.56882-0.65891-1.1485 0.17748-0.51122 1.2351-0.4798-0.03851-0.76521-1.2802-0.34311-0.23269-0.4859 0.53163-1.216-0.56881-0.51184zm-0.5715 1.2244 0.23576 0.13679 0.20426 0.18519 0.16353 0.22101 0.11763 0.24572 0.06916 0.26489 0.01146 0.27146-0.03921 0.27139-0.08948 0.25764-0.14234 0.23834-0.17964 0.20167-0.22101 0.16353-0.24572 0.11763-0.26489 0.06916-0.27295 0.01553-0.2719-0.04-0.2576-0.089-0.2383-0.143-0.2002-0.183-0.165-0.217-0.1177-0.246-0.0676-0.269-0.0156-0.273 0.039206-0.2714 0.089484-0.25764 0.14085-0.23427 0.18113-0.20574 0.22101-0.16352 0.24572-0.11763 0.26895-0.06768 0.27147-0.01146 0.27139 0.03921 0.25764 0.08948z"/>
</g>
</g>
</g>
<g
id="titleblock-text-editable"
style="font-size:5px;text-anchor:start;fill:#000000;font-family:osifont"
xml:space="preserve">
<text freecad:editable="AUTHOR_NAME" x="652" y="533"><tspan>AUTHOR NAME</tspan></text>
<text freecad:editable="DRAWING_TITLE" x="712" y="533"><tspan>DRAWING TITLE</tspan></text>
<text freecad:editable="SI-1" x="652" y="545"><tspan></tspan></text>
<text freecad:editable="SI-2" x="652" y="551"><tspan></tspan></text>
<text freecad:editable="FreeCAD_DRAWING" x="652" y="557"><tspan>FreeCAD DRAWING</tspan></text>
<text freecad:editable="SI-4" x="652" y="563"><tspan></tspan></text>
<text freecad:editable="SI-5" x="652" y="569"><tspan></tspan></text>
<text freecad:editable="SI-6" x="652" y="575"><tspan></tspan></text>
<text freecad:editable="FC-SI" x="774" y="545"><tspan>A1</tspan></text>
<text freecad:editable="FC-SH" x="794" y="545"><tspan>X / Y</tspan></text>
<text freecad:editable="FC-SC" x="814" y="545"><tspan>SCALE</tspan></text>
<text freecad:editable="PN" x="774" y="557"><tspan>PN</tspan></text>
<text freecad:editable="DN" x="774" y="569"><tspan>DN</tspan></text>
<text freecad:editable="FC-DATE" x="774" y="583"><tspan>DD/MM/YYYY</tspan></text>
<text freecad:editable="FC-REV" x="814" y="583"><tspan>REV A</tspan></text>
</g>
<!-- DrawingContent -->
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

95
src/Mod/TechDraw/Templates/A2_Landscape_ISO7200TD.svg Normal file
View File

@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns="http://www.w3.org/2000/svg" version="1.1"
xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace"
width="594mm"
height="420mm"
viewBox="0 0 594 420">
<!-- Working space 20 10 584 410 -->
<!-- Title block 404 350 584 410 -->
<g>
<rect
id="drawing-border"
style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:miter;stroke-miterlimit:4"
width="564"
height="400"
x="20"
y="10" />
<!-- width-30, height-20 -->
<g
transform="translate(384,123)">
<!-- A4 Portrait based for other formats width-210, height-297 -->
<!-- page rect translation
w h rw rh tx ty
A4-P 210 297 180 277 0 0
A3-L 420 297 390 277 210 0
A2-L 594 420 564 400 384 123
A1-L 841 594 811 574 631 297
A0-L 1189 841 1159 821 979 544
-->
<g
id="titleblock-structure"
style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:miter;stroke-miterlimit:4">
<rect width="180" height="60" x="20" y="227" />
<path d="m 20,239 h 180" />
<path d="m 80,227 v 12" />
<path d="m 140,239 v 48" />
<path d="m 160,239 v 12" />
<path d="m 180,239 v 12" />
<path d="m 140,251 h 60" />
<path d="m 140,275 h 60" />
<path d="m 180,275 v 12" />
</g>
<g
id="titleblock-text-non-editable"
style="font-size:3px;text-anchor:start;fill:#000000;font-family:osifont"
xml:space="preserve">
<text x="21" y="230">Created by:</text>
<text x="81" y="230">Title:</text>
<text x="21" y="242">Supplementary information:</text>
<text x="141" y="242">Size:</text>
<text x="161" y="242">Sheet:</text>
<text x="181" y="242">Scale:</text>
<text x="141" y="254">Part number:</text>
<text x="141" y="266">Drawing number:</text>
<text x="141" y="278">Date:</text>
<text x="181" y="278">Revision:</text>
</g>
<!-- Set display:none to hide FreeCAD Logo -->
<g
style="display:inline"
id="freecad-logo"
transform="translate(128.5,276)"
fill-rule="evenodd"
stroke="#000"
stroke-width="0.35"
fill="none">
<path d="m0.1524 0.15254v8.8549h1.9744v-3.4652h1.396v-1.3661h-1.396v-1.4745h3.4391v-2.5441l-5.4135-0.005z"/>
<path d="m7.7927 3.4504-0.50715-0.176-0.48387-1.2366-0.76115 0.04-0.34718 1.2787-0.4859 0.23269-1.2119-0.53015-0.51188 0.56882 0.65892 1.1485-0.18006 0.50567-1.2366 0.48387 0.044064 0.76263 1.2787 0.34718 0.23269 0.4859-0.53421 1.2104 0.56882 0.51188 1.1485-0.65891 0.50973 0.18155 0.4798 1.2351 0.7667-0.04258 0.34311-1.2802 0.4859-0.23269 1.2145 0.5357 0.51188-0.56882-0.65891-1.1485 0.17748-0.51122 1.2351-0.4798-0.03851-0.76521-1.2802-0.34311-0.23269-0.4859 0.53163-1.216-0.56881-0.51184zm-0.5715 1.2244 0.23576 0.13679 0.20426 0.18519 0.16353 0.22101 0.11763 0.24572 0.06916 0.26489 0.01146 0.27146-0.03921 0.27139-0.08948 0.25764-0.14234 0.23834-0.17964 0.20167-0.22101 0.16353-0.24572 0.11763-0.26489 0.06916-0.27295 0.01553-0.2719-0.04-0.2576-0.089-0.2383-0.143-0.2002-0.183-0.165-0.217-0.1177-0.246-0.0676-0.269-0.0156-0.273 0.039206-0.2714 0.089484-0.25764 0.14085-0.23427 0.18113-0.20574 0.22101-0.16352 0.24572-0.11763 0.26895-0.06768 0.27147-0.01146 0.27139 0.03921 0.25764 0.08948z"/>
</g>
</g>
</g>
transform="translate(384,123)">
<g
id="titleblock-text-editable"
style="font-size:5px;text-anchor:start;fill:#000000;font-family:osifont"
xml:space="preserve">
<text freecad:editable="AUTHOR_NAME" x="405" y="359"><tspan>AUTHOR NAME</tspan></text>
<text freecad:editable="DRAWING_TITLE" x="465" y="359"><tspan>DRAWING TITLE</tspan></text>
<text freecad:editable="SI-1" x="405" y="371"><tspan></tspan></text>
<text freecad:editable="SI-2" x="405" y="378"><tspan></tspan></text>
<text freecad:editable="FreeCAD_DRAWING" x="405" y="384"><tspan>FreeCAD DRAWING</tspan></text>
<text freecad:editable="SI-4" x="405" y="390"><tspan></tspan></text>
<text freecad:editable="SI-5" x="405" y="396"><tspan></tspan></text>
<text freecad:editable="SI-6" x="405" y="402"><tspan></tspan></text>
<text freecad:editable="FC-SI" x="530" y="371"><tspan>A2</tspan></text>
<text freecad:editable="FC-SH" x="548" y="371"><tspan>X / Y</tspan></text>
<text freecad:editable="FC-SC" x="568" y="371"><tspan>SCALE</tspan></text>
<text freecad:editable="PN" x="525" y="383"><tspan>PN</tspan></text>
<text freecad:editable="DN" x="525" y="395"><tspan>DN</tspan></text>
<text freecad:editable="FC-DATE" x="525" y="407"><tspan>DD/MM/YYYY</tspan></text>
<text freecad:editable="FC-REV" x="567" y="407"><tspan>REV A</tspan></text>
</g>
<!-- DrawingContent -->
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

95
src/Mod/TechDraw/Templates/A3_Landscape_ISO7200TD.svg Normal file
View File

@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns="http://www.w3.org/2000/svg" version="1.1"
xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace"
width="420mm"
height="297mm"
viewBox="0 0 420 297">
<!-- Working space 20 10 410 287 -->
<!-- Title block 230 227 410 287 -->
<g>
<rect
id="drawing-border"
style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:miter;stroke-miterlimit:4"
width="390"
height="277"
x="20"
y="10" />
<!-- width-30, height-20 -->
<g
transform="translate(210,0)">
<!-- A4 Portrait based for other formats width-210, height-297 -->
<!-- page rect translation
w h rw rh tx ty
A4-P 210 297 180 277 0 0
A3-L 420 297 390 277 210 0
A2-L 594 420 564 400 384 123
A1-L 841 594 811 574 631 297
A0-L 1189 841 1159 821 979 544
-->
<g
id="titleblock-structure"
style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:miter;stroke-miterlimit:4">
<rect width="180" height="60" x="20" y="227" />
<path d="m 20,239 h 180" />
<path d="m 80,227 v 12" />
<path d="m 140,239 v 48" />
<path d="m 160,239 v 12" />
<path d="m 180,239 v 12" />
<path d="m 140,251 h 60" />
<path d="m 140,275 h 60" />
<path d="m 180,275 v 12" />
</g>
<g
id="titleblock-text-non-editable"
style="font-size:3px;text-anchor:start;fill:#000000;font-family:osifont"
xml:space="preserve">
<text x="21" y="230">Created by:</text>
<text x="81" y="230">Title:</text>
<text x="21" y="242">Supplementary information:</text>
<text x="141" y="242">Size:</text>
<text x="161" y="242">Sheet:</text>
<text x="181" y="242">Scale:</text>
<text x="141" y="254">Part number:</text>
<text x="141" y="266">Drawing number:</text>
<text x="141" y="278">Date:</text>
<text x="181" y="278">Revision:</text>
</g>
<!-- Set display:none to hide FreeCAD Logo -->
<g
style="display:inline"
id="freecad-logo"
transform="translate(128.5,276)"
fill-rule="evenodd"
stroke="#000"
stroke-width="0.35"
fill="none">
<path d="m0.1524 0.15254v8.8549h1.9744v-3.4652h1.396v-1.3661h-1.396v-1.4745h3.4391v-2.5441l-5.4135-0.005z"/>
<path d="m7.7927 3.4504-0.50715-0.176-0.48387-1.2366-0.76115 0.04-0.34718 1.2787-0.4859 0.23269-1.2119-0.53015-0.51188 0.56882 0.65892 1.1485-0.18006 0.50567-1.2366 0.48387 0.044064 0.76263 1.2787 0.34718 0.23269 0.4859-0.53421 1.2104 0.56882 0.51188 1.1485-0.65891 0.50973 0.18155 0.4798 1.2351 0.7667-0.04258 0.34311-1.2802 0.4859-0.23269 1.2145 0.5357 0.51188-0.56882-0.65891-1.1485 0.17748-0.51122 1.2351-0.4798-0.03851-0.76521-1.2802-0.34311-0.23269-0.4859 0.53163-1.216-0.56881-0.51184zm-0.5715 1.2244 0.23576 0.13679 0.20426 0.18519 0.16353 0.22101 0.11763 0.24572 0.06916 0.26489 0.01146 0.27146-0.03921 0.27139-0.08948 0.25764-0.14234 0.23834-0.17964 0.20167-0.22101 0.16353-0.24572 0.11763-0.26489 0.06916-0.27295 0.01553-0.2719-0.04-0.2576-0.089-0.2383-0.143-0.2002-0.183-0.165-0.217-0.1177-0.246-0.0676-0.269-0.0156-0.273 0.039206-0.2714 0.089484-0.25764 0.14085-0.23427 0.18113-0.20574 0.22101-0.16352 0.24572-0.11763 0.26895-0.06768 0.27147-0.01146 0.27139 0.03921 0.25764 0.08948z"/>
</g>
</g>
</g>
<!-- freecad:editable fields must use absolute coords. No transform clause allowed. -->
<g
id="titleblock-text-editable"
style="font-size:5px;text-anchor:start;fill:#000000;font-family:osifont"
xml:space="preserve">
<text freecad:editable="AUTHOR_NAME" x="231" y="236"><tspan>AUTHOR NAME</tspan></text>
<text freecad:editable="DRAWING_TITLE" x="291" y="236"><tspan>DRAWING TITLE</tspan></text>
<text freecad:editable="SI-1" x="231" y="248"><tspan></tspan></text>
<text freecad:editable="SI-2" x="231" y="255"><tspan></tspan></text>
<text freecad:editable="FreeCAD_DRAWING" x="231" y="262"><tspan>FreeCAD DRAWING</tspan></text>
<text freecad:editable="SI-4" x="231" y="269"><tspan></tspan></text>
<text freecad:editable="SI-5" x="231" y="276"><tspan></tspan></text>
<text freecad:editable="SI-6" x="231" y="283"><tspan></tspan></text>
<text freecad:editable="FC-SI" x="351" y="248"><tspan>A3</tspan></text>
<text freecad:editable="FC-SH" x="371" y="248"><tspan>X / Y</tspan></text>
<text freecad:editable="FC-SC" x="391" y="248"><tspan>SCALE</tspan></text>
<text freecad:editable="PN" x="351" y="260"><tspan>PN</tspan></text>
<text freecad:editable="DN" x="351" y="272"><tspan>DN</tspan></text>
<text freecad:editable="FC-DATE" x="351" y="284"><tspan>DD/MM/YYYY</tspan></text>
<text freecad:editable="FC-REV" x="391" y="284"><tspan>REV A</tspan></text>
</g>
<!-- DrawingContent -->
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

1679
src/Mod/TechDraw/Templates/A4_LandscapeTD.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 75 KiB

90
src/Mod/TechDraw/Templates/A4_Landscape_ISO7200TD.svg Normal file
View File

@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns="http://www.w3.org/2000/svg" version="1.1"
xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace"
width="297mm"
height="210mm"
viewBox="0 0 297 210">
<!-- Working space 10 10 287 200 -->
<!-- Title block 107 162 287 200 -->
<g>
<rect
id="drawing-border"
style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:miter;stroke-miterlimit:4"
width="277"
height="190"
x="10"
y="10" />
<!-- width-20, height-20 -->
<g
transform="translate(87,-65)">
<!-- A4 Portrait based for other formats width-210, height-297 -->
<!-- page rect translation
w h rw rh tx ty
A4-P 210 297 180 277 0 0
A3-L 420 297 390 277 210 0
A2-L 594 420 564 400 384 123
A1-L 841 594 811 574 631 297
A0-L 1189 841 1159 821 979 544
-->
<g
id="titleblock-structure"
style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:miter;stroke-miterlimit:4">
<rect width="180" height="38" x="20" y="227" />
<path d="m 20,238 h 180" />
<path d="m 80,227 v 11" />
<path d="m 140,227 v 38" />
<path d="m 160,227 v 11" />
<path d="m 180,227 v 11" />
<path d="m 140,254 h 60" />
<path d="m 180,254 v 11" />
</g>
<g
id="titleblock-text-non-editable"
style="font-size:3px;text-anchor:start;fill:#000000;font-family:osifont"
xml:space="preserve">
<text x="21" y="230.5">Created by:</text>
<text x="81" y="230.5">Title:</text>
<text x="21" y="241.5">Supplementary information:</text>
<text x="141" y="230.5">Size:</text>
<text x="161" y="230.5">Sheet:</text>
<text x="181" y="230.5">Scale:</text>
<text x="141" y="241.5">Part number:</text>
<text x="141" y="249.5">Drawing no.:</text>
<text x="141" y="257.5">Date:</text>
<text x="181" y="257.5">Revision:</text>
</g>
<!-- Set display:none to hide FreeCAD Logo -->
<g
style="display:inline"
id="freecad-logo"
transform="translate(128.5,254)"
fill-rule="evenodd"
stroke="#000"
stroke-width="0.35"
fill="none">
<path d="m0.1524 0.15254v8.8549h1.9744v-3.4652h1.396v-1.3661h-1.396v-1.4745h3.4391v-2.5441l-5.4135-0.005z"/>
<path d="m7.7927 3.4504-0.50715-0.176-0.48387-1.2366-0.76115 0.04-0.34718 1.2787-0.4859 0.23269-1.2119-0.53015-0.51188 0.56882 0.65892 1.1485-0.18006 0.50567-1.2366 0.48387 0.044064 0.76263 1.2787 0.34718 0.23269 0.4859-0.53421 1.2104 0.56882 0.51188 1.1485-0.65891 0.50973 0.18155 0.4798 1.2351 0.7667-0.04258 0.34311-1.2802 0.4859-0.23269 1.2145 0.5357 0.51188-0.56882-0.65891-1.1485 0.17748-0.51122 1.2351-0.4798-0.03851-0.76521-1.2802-0.34311-0.23269-0.4859 0.53163-1.216-0.56881-0.51184zm-0.5715 1.2244 0.23576 0.13679 0.20426 0.18519 0.16353 0.22101 0.11763 0.24572 0.06916 0.26489 0.01146 0.27146-0.03921 0.27139-0.08948 0.25764-0.14234 0.23834-0.17964 0.20167-0.22101 0.16353-0.24572 0.11763-0.26489 0.06916-0.27295 0.01553-0.2719-0.04-0.2576-0.089-0.2383-0.143-0.2002-0.183-0.165-0.217-0.1177-0.246-0.0676-0.269-0.0156-0.273 0.039206-0.2714 0.089484-0.25764 0.14085-0.23427 0.18113-0.20574 0.22101-0.16352 0.24572-0.11763 0.26895-0.06768 0.27147-0.01146 0.27139 0.03921 0.25764 0.08948z"/>
</g>
</g>
</g>
<g
id="titleblock-text-editable"
style="font-size:5px;text-anchor:start;fill:#000000;font-family:osifont"
xml:space="preserve">
<text freecad:editable="AUTHOR_NAME" x="108" y="171"><tspan>AUTHOR NAME</tspan></text>
<text freecad:editable="DRAWING_TITLE" x="168" y="171"><tspan>DRAWING TITLE</tspan></text>
<text freecad:editable="SI-1" x="108" y="182"><tspan></tspan></text>
<text freecad:editable="FreeCAD_DRAWING" x="108" y="189"><tspan>FreeCAD DRAWING</tspan></text>
<text freecad:editable="SI-3" x="108" y="196"><tspan></tspan></text>
<text freecad:editable="FC-SI" x="233" y="171"><tspan>A4</tspan></text>
<text freecad:editable="FC-SH" x="251" y="171"><tspan>X / Y</tspan></text>
<text freecad:editable="FC-SC" x="271" y="171"><tspan>SCALE</tspan></text>
<text freecad:editable="PN" x="231" y="181"><tspan>PN</tspan></text>
<text freecad:editable="DN" x="231" y="189"><tspan>DN</tspan></text>
<text freecad:editable="FC-DATE" x="231" y="197"><tspan>DD/MM/YYYY</tspan></text>
<text freecad:editable="FC-REV" x="269" y="197"><tspan>REV A</tspan></text>
</g>
<!-- DrawingContent -->
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

94
src/Mod/TechDraw/Templates/A4_Portrait_ISO7200TD.svg Normal file
View File

@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns="http://www.w3.org/2000/svg" version="1.1"
xmlns:freecad="http://www.freecadweb.org/wiki/index.php?title=Svg_Namespace"
width="210mm"
height="297mm"
viewBox="0 0 210 297">
<!-- Working space 20 10 200 287 -->
<!-- Title block 20 227 200 287 -->
<g>
<rect
id="drawing-border"
style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:miter;stroke-miterlimit:4"
width="180"
height="277"
x="20"
y="10" />
<!-- width-30, height-20 -->
<g
transform="translate(0,0)">
<!-- A4 Portrait based for other formats width-210, height-297 -->
<!-- page rect translation
w h rw rh tx ty
A4-P 210 297 180 277 0 0
A3-L 420 297 390 277 210 0
A2-L 594 420 564 400 384 123
A1-L 841 594 811 574 631 297
A0-L 1189 841 1159 821 979 544
-->
<g
id="titleblock-structure"
style="fill:none;stroke:#000000;stroke-width:0.35;stroke-linecap:miter;stroke-miterlimit:4">
<rect width="180" height="60" x="20" y="227" />
<path d="m 20,239 h 180" />
<path d="m 80,227 v 12" />
<path d="m 140,239 v 48" />
<path d="m 160,239 v 12" />
<path d="m 180,239 v 12" />
<path d="m 140,251 h 60" />
<path d="m 140,275 h 60" />
<path d="m 180,275 v 12" />
</g>
<g
id="titleblock-text-non-editable"
style="font-size:3px;text-anchor:start;fill:#000000;font-family:osifont"
xml:space="preserve">
<text x="21" y="230">Created by:</text>
<text x="81" y="230">Title:</text>
<text x="21" y="242">Supplementary information:</text>
<text x="141" y="242">Size:</text>
<text x="161" y="242">Sheet:</text>
<text x="181" y="242">Scale:</text>
<text x="141" y="254">Part number:</text>
<text x="141" y="266">Drawing number:</text>
<text x="141" y="278">Date:</text>
<text x="181" y="278">Revision:</text>
</g>
<g
id="titleblock-text-editable"
style="font-size:5px;text-anchor:start;fill:#000000;font-family:osifont"
xml:space="preserve">
<text freecad:editable="AUTHOR_NAME" x="21" y="236"><tspan>AUTHOR NAME</tspan></text>
<text freecad:editable="DRAWING_TITLE" x="81" y="236"><tspan>DRAWING TITLE</tspan></text>
<text freecad:editable="SI-1" x="21" y="248"><tspan></tspan></text>
<text freecad:editable="SI-2" x="21" y="255"><tspan></tspan></text>
<text freecad:editable="FreeCAD_DRAWING" x="21" y="262"><tspan>FreeCAD DRAWING</tspan></text>
<text freecad:editable="SI-4" x="21" y="269"><tspan></tspan></text>
<text freecad:editable="SI-5" x="21" y="276"><tspan></tspan></text>
<text freecad:editable="SI-6" x="21" y="283"><tspan></tspan></text>
<text freecad:editable="FC-SI" x="141" y="248"><tspan>A4</tspan></text>
<text freecad:editable="FC-SH" x="161" y="248"><tspan>X / Y</tspan></text>
<text freecad:editable="FC-SC" x="181" y="248"><tspan>SCALE</tspan></text>
<text freecad:editable="PN" x="141" y="260"><tspan>PN</tspan></text>
<text freecad:editable="DN" x="141" y="272"><tspan>DN</tspan></text>
<text freecad:editable="FC-DATE" x="141" y="284"><tspan>DD/MM/YYYY</tspan></text>
<text freecad:editable="FC-REV" x="181" y="284"><tspan>REV A</tspan></text>
</g>
<!-- Set display:none to hide FreeCAD Logo -->
<g
style="display:inline"
id="freecad-logo"
transform="translate(128.5,276)"
fill-rule="evenodd"
stroke="#000"
stroke-width="0.35"
fill="none">
<path d="m0.1524 0.15254v8.8549h1.9744v-3.4652h1.396v-1.3661h-1.396v-1.4745h3.4391v-2.5441l-5.4135-0.005z"/>
<path d="m7.7927 3.4504-0.50715-0.176-0.48387-1.2366-0.76115 0.04-0.34718 1.2787-0.4859 0.23269-1.2119-0.53015-0.51188 0.56882 0.65892 1.1485-0.18006 0.50567-1.2366 0.48387 0.044064 0.76263 1.2787 0.34718 0.23269 0.4859-0.53421 1.2104 0.56882 0.51188 1.1485-0.65891 0.50973 0.18155 0.4798 1.2351 0.7667-0.04258 0.34311-1.2802 0.4859-0.23269 1.2145 0.5357 0.51188-0.56882-0.65891-1.1485 0.17748-0.51122 1.2351-0.4798-0.03851-0.76521-1.2802-0.34311-0.23269-0.4859 0.53163-1.216-0.56881-0.51184zm-0.5715 1.2244 0.23576 0.13679 0.20426 0.18519 0.16353 0.22101 0.11763 0.24572 0.06916 0.26489 0.01146 0.27146-0.03921 0.27139-0.08948 0.25764-0.14234 0.23834-0.17964 0.20167-0.22101 0.16353-0.24572 0.11763-0.26489 0.06916-0.27295 0.01553-0.2719-0.04-0.2576-0.089-0.2383-0.143-0.2002-0.183-0.165-0.217-0.1177-0.246-0.0676-0.269-0.0156-0.273 0.039206-0.2714 0.089484-0.25764 0.14085-0.23427 0.18113-0.20574 0.22101-0.16352 0.24572-0.11763 0.26895-0.06768 0.27147-0.01146 0.27139 0.03921 0.25764 0.08948z"/>
</g>
</g>
</g>
<!-- DrawingContent -->
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB