From f43fb948ab17aad0aef36a7e7b28480f52ec4f5f Mon Sep 17 00:00:00 2001 From: WandererFan Date: Wed, 7 Mar 2018 10:45:35 -0500 Subject: [PATCH] Fix #2624 Draft Patterns Not Installed --- src/Mod/TechDraw/App/CMakeLists.txt | 7 + src/Mod/TechDraw/App/DrawHatch.cpp | 2 +- src/Mod/TechDraw/CMakeLists.txt | 10 + src/Mod/TechDraw/Patterns/brick01.svg | 206 ++++++ src/Mod/TechDraw/Patterns/concrete.svg | 191 +++++ src/Mod/TechDraw/Patterns/cross.svg | 148 ++++ src/Mod/TechDraw/Patterns/diagonal1.svg | 412 +++++++++++ src/Mod/TechDraw/Patterns/diagonal2.svg | 412 +++++++++++ src/Mod/TechDraw/Patterns/earth.svg | 165 +++++ src/Mod/TechDraw/Patterns/hbone.svg | 367 ++++++++++ src/Mod/TechDraw/Patterns/line.svg | 95 +++ src/Mod/TechDraw/Patterns/plus.svg | 153 ++++ src/Mod/TechDraw/Patterns/simple.svg | 111 +++ src/Mod/TechDraw/Patterns/solid.svg | 103 +++ src/Mod/TechDraw/Patterns/square.svg | 118 +++ src/Mod/TechDraw/Patterns/steel.svg | 264 +++++++ src/Mod/TechDraw/Patterns/wood.svg | 926 ++++++++++++++++++++++++ src/Mod/TechDraw/Patterns/woodgrain.svg | 154 ++++ 18 files changed, 3843 insertions(+), 1 deletion(-) create mode 100644 src/Mod/TechDraw/Patterns/brick01.svg create mode 100644 src/Mod/TechDraw/Patterns/concrete.svg create mode 100644 src/Mod/TechDraw/Patterns/cross.svg create mode 100644 src/Mod/TechDraw/Patterns/diagonal1.svg create mode 100644 src/Mod/TechDraw/Patterns/diagonal2.svg create mode 100644 src/Mod/TechDraw/Patterns/earth.svg create mode 100644 src/Mod/TechDraw/Patterns/hbone.svg create mode 100644 src/Mod/TechDraw/Patterns/line.svg create mode 100644 src/Mod/TechDraw/Patterns/plus.svg create mode 100644 src/Mod/TechDraw/Patterns/simple.svg create mode 100644 src/Mod/TechDraw/Patterns/solid.svg create mode 100644 src/Mod/TechDraw/Patterns/square.svg create mode 100644 src/Mod/TechDraw/Patterns/steel.svg create mode 100644 src/Mod/TechDraw/Patterns/wood.svg create mode 100644 src/Mod/TechDraw/Patterns/woodgrain.svg diff --git a/src/Mod/TechDraw/App/CMakeLists.txt b/src/Mod/TechDraw/App/CMakeLists.txt index 14158a1718..ef4f49a0c9 100644 --- a/src/Mod/TechDraw/App/CMakeLists.txt +++ b/src/Mod/TechDraw/App/CMakeLists.txt @@ -209,6 +209,13 @@ fc_target_copy_resource(TechDraw ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw ${TechDraw_LineGroupFile}) +ADD_CUSTOM_COMMAND(TARGET TechDraw + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory + ${CMAKE_SOURCE_DIR}/src/Mod/TechDraw/Patterns + ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw/Patterns +) + SET_BIN_DIR(TechDraw TechDraw /Mod/TechDraw) SET_PYTHON_PREFIX_SUFFIX(TechDraw) diff --git a/src/Mod/TechDraw/App/DrawHatch.cpp b/src/Mod/TechDraw/App/DrawHatch.cpp index 57b9dcb37c..9e8a68db57 100644 --- a/src/Mod/TechDraw/App/DrawHatch.cpp +++ b/src/Mod/TechDraw/App/DrawHatch.cpp @@ -66,7 +66,7 @@ DrawHatch::DrawHatch(void) Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Files"); - std::string defaultDir = App::Application::getResourceDir() + "Mod/Drawing/patterns/"; + std::string defaultDir = App::Application::getResourceDir() + "Mod/TechDraw/Patterns/"; std::string defaultFileName = defaultDir + "simple.svg"; QString patternFileName = QString::fromStdString(hGrp->GetASCII("FileHatch",defaultFileName.c_str())); if (patternFileName.isEmpty()) { diff --git a/src/Mod/TechDraw/CMakeLists.txt b/src/Mod/TechDraw/CMakeLists.txt index 506781aa7b..66feb4fdee 100644 --- a/src/Mod/TechDraw/CMakeLists.txt +++ b/src/Mod/TechDraw/CMakeLists.txt @@ -42,6 +42,16 @@ INSTALL( PATTERN "*.csv*" ) +INSTALL( + DIRECTORY + Patterns + DESTINATION + ${CMAKE_INSTALL_DATADIR}/Mod/TechDraw + FILES_MATCHING + PATTERN "*.svg*" +) + + #unit test files SET(TDTest_SRCS TDTest/__init__.py diff --git a/src/Mod/TechDraw/Patterns/brick01.svg b/src/Mod/TechDraw/Patterns/brick01.svg new file mode 100644 index 0000000000..3ce8edcf72 --- /dev/null +++ b/src/Mod/TechDraw/Patterns/brick01.svg @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Pablo Gil + + + + + SVG + template + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Patterns/concrete.svg b/src/Mod/TechDraw/Patterns/concrete.svg new file mode 100644 index 0000000000..b919a036c8 --- /dev/null +++ b/src/Mod/TechDraw/Patterns/concrete.svg @@ -0,0 +1,191 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Patterns/cross.svg b/src/Mod/TechDraw/Patterns/cross.svg new file mode 100644 index 0000000000..e77cf8d73f --- /dev/null +++ b/src/Mod/TechDraw/Patterns/cross.svg @@ -0,0 +1,148 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Patterns/diagonal1.svg b/src/Mod/TechDraw/Patterns/diagonal1.svg new file mode 100644 index 0000000000..4950ead90b --- /dev/null +++ b/src/Mod/TechDraw/Patterns/diagonal1.svg @@ -0,0 +1,412 @@ + + + + + + + + + + image/svg+xml + + + + + Pablo Gil + + + + + SVG + template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Patterns/diagonal2.svg b/src/Mod/TechDraw/Patterns/diagonal2.svg new file mode 100644 index 0000000000..1a96fd7e7f --- /dev/null +++ b/src/Mod/TechDraw/Patterns/diagonal2.svg @@ -0,0 +1,412 @@ + + + + + + + + + + image/svg+xml + + + + + Pablo Gil + + + + + SVG + template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Patterns/earth.svg b/src/Mod/TechDraw/Patterns/earth.svg new file mode 100644 index 0000000000..8ede57ed0e --- /dev/null +++ b/src/Mod/TechDraw/Patterns/earth.svg @@ -0,0 +1,165 @@ + + + + + + + + + + + + image/svg+xml + + + + + Pablo Gil + + + + + SVG + template + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Patterns/hbone.svg b/src/Mod/TechDraw/Patterns/hbone.svg new file mode 100644 index 0000000000..7c904495d3 --- /dev/null +++ b/src/Mod/TechDraw/Patterns/hbone.svg @@ -0,0 +1,367 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Pablo Gil + + + + + SVG + template + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Patterns/line.svg b/src/Mod/TechDraw/Patterns/line.svg new file mode 100644 index 0000000000..ecc47cf3d0 --- /dev/null +++ b/src/Mod/TechDraw/Patterns/line.svg @@ -0,0 +1,95 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Patterns/plus.svg b/src/Mod/TechDraw/Patterns/plus.svg new file mode 100644 index 0000000000..2ea4c15a72 --- /dev/null +++ b/src/Mod/TechDraw/Patterns/plus.svg @@ -0,0 +1,153 @@ + + + + + + + + + + + + image/svg+xml + + + + + Pablo Gil + + + + + SVG + template + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Patterns/simple.svg b/src/Mod/TechDraw/Patterns/simple.svg new file mode 100644 index 0000000000..07b0da6af3 --- /dev/null +++ b/src/Mod/TechDraw/Patterns/simple.svg @@ -0,0 +1,111 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Patterns/solid.svg b/src/Mod/TechDraw/Patterns/solid.svg new file mode 100644 index 0000000000..b70303a0f8 --- /dev/null +++ b/src/Mod/TechDraw/Patterns/solid.svg @@ -0,0 +1,103 @@ + + + + + + + + + + image/svg+xml + + + + + Pablo Gil + + + + + SVG + template + + + + + + + + + diff --git a/src/Mod/TechDraw/Patterns/square.svg b/src/Mod/TechDraw/Patterns/square.svg new file mode 100644 index 0000000000..8cd2b7ff6a --- /dev/null +++ b/src/Mod/TechDraw/Patterns/square.svg @@ -0,0 +1,118 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Patterns/steel.svg b/src/Mod/TechDraw/Patterns/steel.svg new file mode 100644 index 0000000000..4da18b8778 --- /dev/null +++ b/src/Mod/TechDraw/Patterns/steel.svg @@ -0,0 +1,264 @@ + + + + + + + + + + + + image/svg+xml + + + + + Pablo Gil + + + + + SVG + template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Patterns/wood.svg b/src/Mod/TechDraw/Patterns/wood.svg new file mode 100644 index 0000000000..85e3b09518 --- /dev/null +++ b/src/Mod/TechDraw/Patterns/wood.svg @@ -0,0 +1,926 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/Patterns/woodgrain.svg b/src/Mod/TechDraw/Patterns/woodgrain.svg new file mode 100644 index 0000000000..6228d83c8e --- /dev/null +++ b/src/Mod/TechDraw/Patterns/woodgrain.svg @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + +