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
286c62d8
Commit
286c62d8
authored
Jan 16, 2012
by
Dick Hollenbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix order of cvpcb link libraries, make some PAGE_INFO functions inline
parent
b76d05f5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
22 deletions
+4
-22
class_page_info.cpp
common/class_page_info.cpp
+0
-18
CMakeLists.txt
cvpcb/CMakeLists.txt
+1
-1
common.h
include/common.h
+3
-3
No files found.
common/class_page_info.cpp
View file @
286c62d8
...
...
@@ -197,26 +197,8 @@ void PAGE_INFO::SetWidthMils( int aWidthInMils )
}
int
PAGE_INFO
::
GetWidthMils
()
const
{
return
m_size
.
x
;
}
void
PAGE_INFO
::
SetHeightMils
(
int
aHeightInMils
)
{
m_size
.
y
=
clampHeight
(
aHeightInMils
);
}
int
PAGE_INFO
::
GetHeightMils
()
const
{
return
m_size
.
y
;
}
const
wxSize
&
PAGE_INFO
::
GetSizeMils
()
const
{
return
m_size
;
}
cvpcb/CMakeLists.txt
View file @
286c62d8
...
...
@@ -85,7 +85,7 @@ endif(APPLE)
###
# Link executable target cvpcb with correct libraries
###
target_link_libraries
(
cvpcb 3d-viewer
common pcb
common polygon bitmaps kbool
target_link_libraries
(
cvpcb 3d-viewer
pcbcommon
common polygon bitmaps kbool
${
OPENGL_LIBRARIES
}
${
wxWidgets_LIBRARIES
}
${
GDI_PLUS_LIBRARIES
}
...
...
include/common.h
View file @
286c62d8
...
...
@@ -177,12 +177,12 @@ public:
bool
IsPortrait
()
const
{
return
m_portrait
;
}
void
SetWidthMils
(
int
aWidthInMils
);
int
GetWidthMils
()
const
;
int
GetWidthMils
()
const
{
return
m_size
.
x
;
}
void
SetHeightMils
(
int
aHeightInMils
);
int
GetHeightMils
()
const
;
int
GetHeightMils
()
const
{
return
m_size
.
y
;
}
const
wxSize
&
GetSizeMils
()
const
;
const
wxSize
&
GetSizeMils
()
const
{
return
m_size
;
}
// Accessors returning "Internal Units (IU)". IUs are mils in EESCHEMA,
// and either deci-mils or nanometers in PCBNew.
...
...
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