Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
2134e7de
Commit
2134e7de
authored
Aug 05, 2013
by
Camille Delbegue
Committed by
Maciej Suminski
Aug 05, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove a Clang warning and add a missing dependency to boost in cmake file.
parent
d15f0e91
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
2 deletions
+11
-2
CMakeLists.txt
CMakeLists.txt
+1
-0
stroke_font.cpp
common/gal/stroke_font.cpp
+4
-0
stroke_font.h
include/gal/stroke_font.h
+1
-1
pcb_painter.cpp
pcbnew/pcb_painter.cpp
+4
-0
pcb_painter.h
pcbnew/pcb_painter.h
+1
-1
No files found.
CMakeLists.txt
View file @
2134e7de
...
@@ -403,6 +403,7 @@ add_subdirectory(tools)
...
@@ -403,6 +403,7 @@ add_subdirectory(tools)
add_dependencies
(
pcbnew boost
)
add_dependencies
(
pcbnew boost
)
add_dependencies
(
eeschema boost
)
add_dependencies
(
eeschema boost
)
add_dependencies
(
cvpcb boost
)
add_dependencies
(
cvpcb boost
)
add_dependencies
(
gal boost
)
add_dependencies
(
common boost
)
add_dependencies
(
common boost
)
add_dependencies
(
pcbcommon boost
)
add_dependencies
(
pcbcommon boost
)
add_dependencies
(
3d-viewer boost
)
add_dependencies
(
3d-viewer boost
)
...
...
common/gal/stroke_font.cpp
View file @
2134e7de
...
@@ -29,6 +29,10 @@
...
@@ -29,6 +29,10 @@
using
namespace
KiGfx
;
using
namespace
KiGfx
;
const
double
STROKE_FONT
::
LINE_HEIGHT_RATIO
=
1.6
;
STROKE_FONT
::
STROKE_FONT
(
GAL
*
aGal
)
:
STROKE_FONT
::
STROKE_FONT
(
GAL
*
aGal
)
:
m_gal
(
aGal
),
m_gal
(
aGal
),
m_bold
(
false
),
m_bold
(
false
),
...
...
include/gal/stroke_font.h
View file @
2134e7de
...
@@ -182,7 +182,7 @@ private:
...
@@ -182,7 +182,7 @@ private:
*/
*/
VECTOR2D
computeTextSize
(
const
std
::
string
&
aText
)
const
;
VECTOR2D
computeTextSize
(
const
std
::
string
&
aText
)
const
;
static
const
double
LINE_HEIGHT_RATIO
=
1
.
6
;
static
const
double
LINE_HEIGHT_RATIO
;
};
};
}
// namespace KiGfx
}
// namespace KiGfx
...
...
pcbnew/pcb_painter.cpp
View file @
2134e7de
...
@@ -43,6 +43,10 @@
...
@@ -43,6 +43,10 @@
using
namespace
KiGfx
;
using
namespace
KiGfx
;
const
double
PCB_RENDER_SETTINGS
::
MAX_FONT_SIZE
=
100000000
;
PCB_RENDER_SETTINGS
::
PCB_RENDER_SETTINGS
()
PCB_RENDER_SETTINGS
::
PCB_RENDER_SETTINGS
()
{
{
// By default everything should be displayed as filled
// By default everything should be displayed as filled
...
...
pcbnew/pcb_painter.h
View file @
2134e7de
...
@@ -106,7 +106,7 @@ protected:
...
@@ -106,7 +106,7 @@ protected:
bool
m_netNamesOnPads
;
bool
m_netNamesOnPads
;
bool
m_netNamesOnTracks
;
bool
m_netNamesOnTracks
;
static
const
double
MAX_FONT_SIZE
=
100000000
;
static
const
double
MAX_FONT_SIZE
;
DisplayZonesMode
m_displayZoneMode
;
DisplayZonesMode
m_displayZoneMode
;
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment