kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

more /Drawing/TechDraw/ edits. VP name conflicts

Browse Source
This commit is contained in:
WandererFan
2016-01-18 09:02:56 -05:00
committed by wmayer
parent 008a19d89f
commit a46fd856d4
58 changed files with 349 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,15 +33,15 @@
#include "DrawViewClip.h"
#include "DrawHatch.h"
extern struct PyMethodDef Drawing_methods[];
extern struct PyMethodDef TechDraw_methods[];
PyDoc_STRVAR(module_drawing_doc,
"This module is the Drawing module.");
PyDoc_STRVAR(module_techdraw_doc,
"This module is the TechDraw module.");
/* Python entry */
extern "C" {
void TechDrawExport initDrawing()
void TechDrawExport initTechDraw()
{
// load dependent module
try {
@@ -53,8 +53,8 @@ void TechDrawExport initDrawing()
PyErr_SetString(PyExc_ImportError, e.what());
return;
}
Py_InitModule3("Drawing", Drawing_methods, module_drawing_doc); /* mod name, table ptr */
Base::Console().Log("Loading Drawing module... done\n");
Py_InitModule3("TechDraw", TechDraw_methods, module_techdraw_doc); /* mod name, table ptr */
Base::Console().Log("Loading TechDraw module... done\n");
// NOTE: To finish the initialization of our own type objects we must

2
src/Mod/TechDraw/App/AppTechDrawPy.cpp
View File

@@ -57,7 +57,7 @@ tdPlaceholder(PyObject *self, PyObject *args)
}
/* registration table */
struct PyMethodDef Drawing_methods[] = {
struct PyMethodDef TechDraw_methods[] = {
{"tdPlaceholder" ,tdPlaceholder ,METH_VARARGS,
"[n/a] = tdPlaceholder(n/a) -- Temporary hack."},
{NULL, NULL} /* end of table marker */

4
src/Mod/TechDraw/App/DrawHatch.h
View File

@@ -20,8 +20,8 @@
* *
***************************************************************************/
#ifndef _Drawing_DrawHatch_h_
#define _Drawing_DrawHatch_h_
#ifndef _TechDraw_DrawHatch_h_
#define _TechDraw_DrawHatch_h_
# include <App/DocumentObject.h>
# include <App/FeaturePython.h>

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

@@ -60,7 +60,7 @@ public:
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
return "TechDrawGui::ViewProviderDrawingPage";
return "TechDrawGui::ViewProviderPage";
}
PyObject *getPyObject(void);

2
src/Mod/TechDraw/App/DrawPagePy.xml
View File

@@ -11,7 +11,7 @@
FatherNamespace="App">
<Documentation>
<Author Licence="LGPL" Name="WandererFan" EMail="wandererfan@gmail.com" />
<UserDocu>Feature for creating and manipulating Drawing Pages</UserDocu>
<UserDocu>Feature for creating and manipulating Technical Drawing Pages</UserDocu>
</Documentation>
<Methode Name="addView">
<Documentation>

2
src/Mod/TechDraw/App/DrawParametricTemplatePy.xml
View File

@@ -11,7 +11,7 @@
FatherNamespace="TechDraw">
<Documentation>
<Author Licence="LGPL" Name="Luke Parry" EMail="l.parry@warwick.ac.uk" />
<UserDocu>Feature for creating and manipulating Drawing Templates</UserDocu>
<UserDocu>Feature for creating and manipulating Technical Drawing Templates</UserDocu>
</Documentation>
<Methode Name="drawLine">
<Documentation>

2
src/Mod/TechDraw/App/DrawSVGTemplatePy.xml
View File

@@ -11,7 +11,7 @@
FatherNamespace="TechDraw">
<Documentation>
<Author Licence="LGPL" Name="Luke Parry" EMail="l.parry@warwick.ac.uk" />
<UserDocu>Feature for creating and manipulating Drawing SVG Templates</UserDocu>
<UserDocu>Feature for creating and manipulating Technical Drawing SVG Templates</UserDocu>
</Documentation>
</PythonExport>
</GenerateModel>

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

@@ -38,9 +38,7 @@ namespace TechDrawGeometry
namespace TechDraw
{
/** Base class of all View Features in the drawing module
*/
class TechDrawExport DrawTemplate: public App::DocumentObject
class TechDrawExport DrawTemplate : public App::DocumentObject
{
PROPERTY_HEADER(TechDraw::DrawTemplate);

2
src/Mod/TechDraw/App/DrawTemplatePy.xml
View File

@@ -11,7 +11,7 @@
FatherNamespace="App">
<Documentation>
<Author Licence="LGPL" Name="Luke Parry" EMail="l.parry@warwick.ac.uk" />
<UserDocu>Feature for creating and manipulating Drawing Templates</UserDocu>
<UserDocu>Feature for creating and manipulating Technical Drawing Templates</UserDocu>
</Documentation>
</PythonExport>
</GenerateModel>

2
src/Mod/TechDraw/App/DrawUtil.cpp
View File

@@ -44,7 +44,7 @@
namespace DrawUtil {
//==============================================================================
// convenient utility functions for Drawing Module
// convenient utility functions for TechDraw Module
//==============================================================================
extern "C" {
int TechDrawExport getIndexFromName(std::string geomName)

2
src/Mod/TechDraw/App/DrawView.cpp
View File

@@ -176,7 +176,7 @@ namespace App {
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewPython, TechDraw::DrawView)
template<> const char* TechDraw::DrawViewPython::getViewProviderName(void) const {
return "TechDrawGui::ViewProviderView";
return "TechDrawGui::ViewProviderDrawingView";
}
/// @endcond

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

@@ -63,7 +63,7 @@ public:
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
return "TechDrawGui::ViewProviderView";
return "TechDrawGui::ViewProviderDrawingView";
}
DrawPage* findParentPage() const;

2
src/Mod/TechDraw/App/DrawViewClip.cpp
View File

@@ -164,7 +164,7 @@ namespace App {
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewClipPython, TechDraw::DrawViewClip)
template<> const char* TechDraw::DrawViewClipPython::getViewProviderName(void) const {
return "TechDrawGui::ViewProviderDrawingClip";
return "TechDrawGui::ViewProviderDrawClip";
}
/// @endcond

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

@@ -64,7 +64,7 @@ public:
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
return "TechDrawGui::ViewProviderDrawingClip";
return "TechDrawGui::ViewProviderDrawClip";
}
std::vector<std::string> getChildViewNames();

4
src/Mod/TechDraw/App/DrawViewDimension.h
View File

@@ -20,8 +20,8 @@
* *
***************************************************************************/
#ifndef _Drawing_DrawViewDimension_h_
#define _Drawing_DrawViewDimension_h_
#ifndef _TechDraw_DrawViewDimension_h_
#define _TechDraw_DrawViewDimension_h_
# include <App/DocumentObject.h>
# include <App/FeaturePython.h>

2
src/Mod/TechDraw/App/DrawViewPart.cpp
View File

@@ -462,7 +462,7 @@ namespace App {
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewPartPython, TechDraw::DrawViewPart)
template<> const char* TechDraw::DrawViewPartPython::getViewProviderName(void) const {
return "TechDrawGui::ViewProviderView";
return "TechDrawGui::ViewProviderViewPart";
}
/// @endcond

2
src/Mod/TechDraw/App/DrawViewPartPy.xml
View File

@@ -11,7 +11,7 @@
FatherNamespace="TechDraw">
<Documentation>
<Author Licence="LGPL" Name="WandererFan" EMail="wandererfan@gmail.com" />
<UserDocu>Feature for creating and manipulating Drawing Part Views</UserDocu>
<UserDocu>Feature for creating and manipulating Technical Drawing Part Views</UserDocu>
</Documentation>
<CustomAttributes />
</PythonExport>

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

@@ -273,7 +273,7 @@ namespace App {
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(TechDraw::DrawViewSectionPython, TechDraw::DrawViewSection)
template<> const char* TechDraw::DrawViewSectionPython::getViewProviderName(void) const {
return "TechDrawGui::ViewProviderView";
return "TechDrawGui::ViewProviderDrawingView";
}
/// @endcond

20
src/Mod/TechDraw/App/Makefile.am
View File

@@ -1,7 +1,7 @@
lib_LTLIBRARIES=libDrawing.la Drawing.la
libDrawing_la_SOURCES=\
libTechDraw_la_SOURCES=\
AppDrawingPy.cpp \
TechDrawExport.cpp \
TechDrawExport.h \
@@ -26,12 +26,12 @@ libDrawing_la_SOURCES=\
# the library search path.
libDrawing_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Mod/Part/App \
libTechDraw_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Mod/Part/App \
-L$(OCC_LIB) $(all_libraries) \
-version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
libDrawing_la_CPPFLAGS = -DTechDrawExport=
libTechDraw_la_CPPFLAGS = -DTechDrawExport=
libDrawing_la_LIBADD = \
libTechDraw_la_LIBADD = \
@BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \
-l@PYTHON_LIB@ \
-lxerces-c \
@@ -61,18 +61,18 @@ libDrawing_la_LIBADD = \
#--------------------------------------------------------------------------------------
# Loader of libDrawing
Drawing_la_SOURCES=\
TechDraw_la_SOURCES=\
AppDrawing.cpp
# the library search path.
Drawing_la_LDFLAGS = $(libDrawing_la_LDFLAGS) -module -avoid-version
Drawing_la_CPPFLAGS = $(libDrawing_la_CPPFLAGS)
TechDraw_la_LDFLAGS = $(libTechDraw_la_LDFLAGS) -module -avoid-version
TechDraw_la_CPPFLAGS = $(libTechDraw_la_CPPFLAGS)
Drawing_la_LIBADD = \
$(libDrawing_la_LIBADD) \
TechDraw_la_LIBADD = \
$(libTechDraw_la_LIBADD) \
-lDrawing
Drawing_la_DEPENDENCIES = libDrawing.la
TechDraw_la_DEPENDENCIES = libDrawing.la
#--------------------------------------------------------------------------------------