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
70707523
Commit
70707523
authored
Apr 07, 2009
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
show axis in module editor and gerbview
parent
5b3c5861
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
18 deletions
+30
-18
makefile.gtk
common/makefile.gtk
+8
-4
makefile.macosx
common/makefile.macosx
+8
-3
gerberframe.cpp
gerbview/gerberframe.cpp
+1
-1
makefile.include
gerbview/makefile.include
+2
-0
basepcbframe.cpp
pcbnew/basepcbframe.cpp
+4
-4
moduleframe.cpp
pcbnew/moduleframe.cpp
+7
-6
No files found.
common/makefile.gtk
View file @
70707523
...
@@ -4,7 +4,7 @@ CC = gcc
...
@@ -4,7 +4,7 @@ CC = gcc
include
../libs.linux
include
../libs.linux
all
:
common.a
all
:
common.a
pcbcommon.a
deps
:
deps
:
$(CXX)
$(CPPFLAGS)
-E
-MMD
-MG
*
.cpp
>
/dev/null
$(CXX)
$(CPPFLAGS)
-E
-MMD
-MG
*
.cpp
>
/dev/null
...
@@ -16,13 +16,17 @@ include makefile.include
...
@@ -16,13 +16,17 @@ include makefile.include
CPPFLAGS
+=
$(EXTRACPPFLAGS)
-I
./
-I
../include
CPPFLAGS
+=
$(EXTRACPPFLAGS)
-I
./
-I
../include
EDACPPFLAGS
=
$(CPPFLAGS)
EDACPPFLAGS
=
$(CPPFLAGS)
common.a
:
$(COMMON_OBJECTS) makefile.gtk makefile.include
rm
-f
$@
ar
-rv
$@
$(COMMON_OBJECTS)
ranlib
$@
common.a
:
$(
OBJECTS) makefile.gtk makefile.include
pcbcommon.a
:
$(COMMON_PCB_
OBJECTS) makefile.gtk makefile.include
rm
-f
$@
rm
-f
$@
ar
-rv
$@
$(OBJECTS)
ar
-rv
$@
$(
COMMON_PCB_
OBJECTS)
ranlib
$@
ranlib
$@
install
:
common.a
install
:
common.a
pcb_common.a
clean
:
clean
:
rm
-f
*
.o
*
~ core
*
.bak
*
.obj
*
.d
rm
-f
*
.o
*
~ core
*
.bak
*
.obj
*
.d
...
...
common/makefile.macosx
View file @
70707523
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
include
../libs.macosx
include
../libs.macosx
TARGET
=
common.a
TARGET
=
common.a
pcbcommon.a
all
:
$(TARGET)
all
:
$(TARGET)
...
@@ -15,9 +15,14 @@ include makefile.include
...
@@ -15,9 +15,14 @@ include makefile.include
CPPFLAGS
+=
$(EXTRACPPFLAGS)
CPPFLAGS
+=
$(EXTRACPPFLAGS)
EDACPPFLAGS
=
$(CPPFLAGS)
EDACPPFLAGS
=
$(CPPFLAGS)
$(TARGET)
:
$(
OBJECTS) makefile.macosx makefile.include
common.a
:
$(COMMON_
OBJECTS) makefile.macosx makefile.include
rm
-f
$@
rm
-f
$@
ar
-rv
$@
$(OBJECTS)
ar
-rv
$@
$(COMMON_OBJECTS)
ranlib
$@
pcbcommon.a
:
$(COMMON_PCB_OBJECTS) makefile.macosx makefile.include
rm
-f
$@
ar
-rv
$@
$(COMMON_PCB_OBJECTS)
ranlib
$@
ranlib
$@
clean
:
clean
:
...
...
gerbview/gerberframe.cpp
View file @
70707523
...
@@ -134,7 +134,7 @@ WinEDA_GerberFrame::WinEDA_GerberFrame( wxWindow* father,
...
@@ -134,7 +134,7 @@ WinEDA_GerberFrame::WinEDA_GerberFrame( wxWindow* father,
{
{
m_FrameName
=
wxT
(
"GerberFrame"
);
m_FrameName
=
wxT
(
"GerberFrame"
);
//m_AboutTitle = g_GerbviewAboutTitle;
m_Draw_Axis
=
true
;
// true to show X and Y axis on screen
m_Draw_Sheet_Ref
=
FALSE
;
// TRUE pour avoir le cartouche dessin�
m_Draw_Sheet_Ref
=
FALSE
;
// TRUE pour avoir le cartouche dessin�
m_Ident
=
GERBER_FRAME
;
m_Ident
=
GERBER_FRAME
;
if
(
DrawPanel
)
if
(
DrawPanel
)
...
...
gerbview/makefile.include
View file @
70707523
#makefile to fast compilation of GerbView.
EXTRALIBS
=
../common/common.a ../common/pcbcommon.a ../bitmaps/libbitmaps.a
\
EXTRALIBS
=
../common/common.a ../common/pcbcommon.a ../bitmaps/libbitmaps.a
\
../polygon/lib_polygon.a ../polygon/kbool/src/libkbool.a
../polygon/lib_polygon.a ../polygon/kbool/src/libkbool.a
...
...
pcbnew/basepcbframe.cpp
View file @
70707523
...
@@ -52,12 +52,12 @@ WinEDA_BasePcbFrame::WinEDA_BasePcbFrame( wxWindow* father,
...
@@ -52,12 +52,12 @@ WinEDA_BasePcbFrame::WinEDA_BasePcbFrame( wxWindow* father,
m_InternalUnits
=
PCB_INTERNAL_UNIT
;
// Internal unit = 1/10000 inch
m_InternalUnits
=
PCB_INTERNAL_UNIT
;
// Internal unit = 1/10000 inch
m_Pcb
=
NULL
;
m_Pcb
=
NULL
;
m_DisplayPadFill
=
TRUE
;
// How to draw pads
m_DisplayPadFill
=
true
;
// How to draw pads
m_DisplayPadNum
=
TRUE
;
// show pads number
m_DisplayPadNum
=
true
;
// show pads number
m_DisplayModEdge
=
FILLED
;
// How to show module drawings
m_DisplayModEdge
=
FILLED
;
// How to show module drawings
m_DisplayModText
=
FILLED
;
// How to show module texts
m_DisplayModText
=
FILLED
;
// How to show module texts
m_DisplayPcbTrackFill
=
TRUE
;
/* FALSE = sketch , TRUE
= filled */
m_DisplayPcbTrackFill
=
true
;
/* FALSE = sketch , true
= filled */
m_Draw3DFrame
=
NULL
;
// Display Window in 3D mode (OpenGL)
m_Draw3DFrame
=
NULL
;
// Display Window in 3D mode (OpenGL)
m_ModuleEditFrame
=
NULL
;
// Frame for footprint edition
m_ModuleEditFrame
=
NULL
;
// Frame for footprint edition
...
@@ -131,7 +131,7 @@ void WinEDA_BasePcbFrame::CursorGoto( const wxPoint& aPos )
...
@@ -131,7 +131,7 @@ void WinEDA_BasePcbFrame::CursorGoto( const wxPoint& aPos )
if
(
!
DrawPanel
->
IsPointOnDisplay
(
aPos
)
)
if
(
!
DrawPanel
->
IsPointOnDisplay
(
aPos
)
)
{
{
screen
->
m_Curseur
=
aPos
;
screen
->
m_Curseur
=
aPos
;
Recadre_Trace
(
TRUE
);
Recadre_Trace
(
true
);
}
}
else
else
{
{
...
...
pcbnew/moduleframe.cpp
View file @
70707523
...
@@ -160,7 +160,8 @@ WinEDA_ModuleEditFrame::WinEDA_ModuleEditFrame( wxWindow* father,
...
@@ -160,7 +160,8 @@ WinEDA_ModuleEditFrame::WinEDA_ModuleEditFrame( wxWindow* father,
wxConfig
*
config
=
wxGetApp
().
m_EDA_Config
;
wxConfig
*
config
=
wxGetApp
().
m_EDA_Config
;
m_FrameName
=
wxT
(
"ModEditFrame"
);
m_FrameName
=
wxT
(
"ModEditFrame"
);
m_Draw_Sheet_Ref
=
FALSE
;
// TRUE pour avoir le cartouche dessin�
m_Draw_Sheet_Ref
=
false
;
// true to show the frame references
m_Draw_Axis
=
true
;
// true to show X and Y axis on screen
// Give an icon
// Give an icon
SetIcon
(
wxICON
(
icon_modedit
)
);
SetIcon
(
wxICON
(
icon_modedit
)
);
...
@@ -251,13 +252,13 @@ void WinEDA_ModuleEditFrame::SetToolbars()
...
@@ -251,13 +252,13 @@ void WinEDA_ModuleEditFrame::SetToolbars()
return
;
return
;
if
(
m_CurrentLib
==
wxEmptyString
)
if
(
m_CurrentLib
==
wxEmptyString
)
islib
=
FALSE
;
islib
=
false
;
m_HToolBar
->
EnableTool
(
ID_MODEDIT_SAVE_LIBMODULE
,
islib
);
m_HToolBar
->
EnableTool
(
ID_MODEDIT_SAVE_LIBMODULE
,
islib
);
m_HToolBar
->
EnableTool
(
ID_LIBEDIT_DELETE_PART
,
islib
);
m_HToolBar
->
EnableTool
(
ID_LIBEDIT_DELETE_PART
,
islib
);
if
(
GetBoard
()
->
m_Modules
==
NULL
)
if
(
GetBoard
()
->
m_Modules
==
NULL
)
active
=
FALSE
;
active
=
false
;
else
else
active
=
TRUE
;
active
=
TRUE
;
...
@@ -307,7 +308,7 @@ void WinEDA_ModuleEditFrame::SetToolbars()
...
@@ -307,7 +308,7 @@ void WinEDA_ModuleEditFrame::SetToolbars()
}
}
else
else
{
{
m_HToolBar
->
EnableTool
(
ID_MODEDIT_LOAD_MODULE_FROM_BOARD
,
FALSE
);
m_HToolBar
->
EnableTool
(
ID_MODEDIT_LOAD_MODULE_FROM_BOARD
,
false
);
}
}
...
@@ -325,9 +326,9 @@ void WinEDA_ModuleEditFrame::SetToolbars()
...
@@ -325,9 +326,9 @@ void WinEDA_ModuleEditFrame::SetToolbars()
if
(
m_OptionsToolBar
)
if
(
m_OptionsToolBar
)
{
{
m_OptionsToolBar
->
ToggleTool
(
ID_TB_OPTIONS_SELECT_UNIT_MM
,
m_OptionsToolBar
->
ToggleTool
(
ID_TB_OPTIONS_SELECT_UNIT_MM
,
g_UnitMetric
==
MILLIMETRE
?
TRUE
:
FALSE
);
g_UnitMetric
==
MILLIMETRE
?
TRUE
:
false
);
m_OptionsToolBar
->
ToggleTool
(
ID_TB_OPTIONS_SELECT_UNIT_INCH
,
m_OptionsToolBar
->
ToggleTool
(
ID_TB_OPTIONS_SELECT_UNIT_INCH
,
g_UnitMetric
==
INCHES
?
TRUE
:
FALSE
);
g_UnitMetric
==
INCHES
?
TRUE
:
false
);
m_OptionsToolBar
->
ToggleTool
(
ID_TB_OPTIONS_SHOW_POLAR_COORD
,
m_OptionsToolBar
->
ToggleTool
(
ID_TB_OPTIONS_SHOW_POLAR_COORD
,
DisplayOpt
.
DisplayPolarCood
);
DisplayOpt
.
DisplayPolarCood
);
...
...
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