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

Minor repairs per jriegel/jmaustpc (fixes from wandererfan)

Browse Source
This commit is contained in:
wmayer
2013-03-30 13:42:30 +01:00
parent 41da5e95e3
commit c70a39c961
7 changed files with 67 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Part/App/AppPartPy.cpp
View File

@@ -1589,7 +1589,7 @@ struct PyMethodDef Part_methods[] = {
"makeLoft(list of wires) -- Create a loft shape."},
{"makeWireString" ,makeWireString ,METH_VARARGS,
"makeWireString(fontdir,fontfile,string,height,[track]) -- Make list of wires in the form of a string's characters."},
"makeWireString(string,fontdir,fontfile,height,[track]) -- Make list of wires in the form of a string's characters."},
{"cast_to_shape" ,cast_to_shape,METH_VARARGS,
"cast_to_shape(shape) -- Cast to the actual shape type"},

29
src/Mod/Part/App/FT2FC.cpp
View File

@@ -1,8 +1,33 @@
//$$INSERT legal.txt
/***************************************************************************
* Copyright (c) wandererfan <wandererfan (at) gmail.com> 2013 *
* *
* 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 *
* *
***************************************************************************/
/***************************************************************************
* FreeType License (FTL) credit: *
* Portions of this software are copyright (c) <1996-2011> The FreeType *
* Project (www.freetype.org). All rights reserved. *
***************************************************************************/
#ifdef FCUseFreeType
#include "PreCompiled.h"
#include <iostream>

28
src/Mod/Part/App/FT2FC.h
View File

@@ -1,3 +1,31 @@
/***************************************************************************
* Copyright (c) wandererfan <wandererfan (at) gmail.com> 2013 *
* *
* 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 *
* *
***************************************************************************/
/***************************************************************************
* FreeType License (FTL) credit: *
* Portions of this software are copyright (c) <1996-2011> The FreeType *
* Project (www.freetype.org). All rights reserved. *
***************************************************************************/
// Public header for FT2FC.cpp
#ifndef FT2FC_H
#define FT2FC_H

1
src/Mod/Test/CMakeLists.txt
View File

@@ -11,6 +11,7 @@ SET(Test_SRCS
Workbench.py
unittestgui.py
InitGui.py
testmakeWireString.py
)
SOURCE_GROUP("" FILES ${Test_SRCS})

4
src/Mod/Test/testmakeWireString.py
View File

@@ -26,8 +26,8 @@ String = 'FreeCAD' # ASCII
#FontPath = '/usr/share/fonts/truetype/msttcorefonts/'
#FontName = 'Times_New_Roman_Italic.ttf'
FontPath = '/usr/share/fonts/truetype/msttcorefonts/'
#FontName = 'Arial.ttf'
FontName = 'NOTArial.ttf' # font file not found error
FontName = 'Arial.ttf'
#FontName = 'NOTArial.ttf' # font file not found error
#FontPath = '/usr/share/fonts/truetype/msttcorefonts/'
#FontName = 'ariali.ttf' #symlink to ttf
#FontPath = '/usr/share/fonts/truetype/'