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
da6f4024
Commit
da6f4024
authored
May 29, 2013
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issue created by the template selector change, on Linux.
parent
43afa81a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
dialog_template_selector.cpp
kicad/dialogs/dialog_template_selector.cpp
+2
-1
edit_pcb_text.cpp
pcbnew/edit_pcb_text.cpp
+4
-4
No files found.
kicad/dialogs/dialog_template_selector.cpp
View file @
da6f4024
...
@@ -132,7 +132,8 @@ void DIALOG_TEMPLATE_SELECTOR::onNotebookResize(wxSizeEvent& event)
...
@@ -132,7 +132,8 @@ void DIALOG_TEMPLATE_SELECTOR::onNotebookResize(wxSizeEvent& event)
void
DIALOG_TEMPLATE_SELECTOR
::
OnPageChange
(
wxNotebookEvent
&
event
)
void
DIALOG_TEMPLATE_SELECTOR
::
OnPageChange
(
wxNotebookEvent
&
event
)
{
{
int
page
=
m_notebook
->
GetSelection
();
int
page
=
m_notebook
->
GetSelection
();
if
(
page
!=
wxNOT_FOUND
)
if
(
page
!=
wxNOT_FOUND
&&
(
unsigned
)
page
<
m_panels
.
size
()
)
m_textCtrlTemplatePath
->
SetValue
(
m_panels
[
page
]
->
GetPath
()
);
m_textCtrlTemplatePath
->
SetValue
(
m_panels
[
page
]
->
GetPath
()
);
}
}
...
...
pcbnew/edit_pcb_text.cpp
View file @
da6f4024
...
@@ -208,7 +208,7 @@ TEXTE_PCB* PCB_EDIT_FRAME::CreateTextePcb( wxDC* aDC, TEXTE_PCB* aText )
...
@@ -208,7 +208,7 @@ TEXTE_PCB* PCB_EDIT_FRAME::CreateTextePcb( wxDC* aDC, TEXTE_PCB* aText )
// Set the mirrored option for layers on the BACK side of the board
// Set the mirrored option for layers on the BACK side of the board
if
(
layer
==
LAYER_N_BACK
||
layer
==
SILKSCREEN_N_BACK
||
if
(
layer
==
LAYER_N_BACK
||
layer
==
SILKSCREEN_N_BACK
||
layer
==
SOLDERPASTE_N_BACK
||
layer
==
SOLDERMASK_N_
FRONT
||
layer
==
SOLDERPASTE_N_BACK
||
layer
==
SOLDERMASK_N_
BACK
||
layer
==
ADHESIVE_N_BACK
layer
==
ADHESIVE_N_BACK
)
)
textePcb
->
SetMirrored
(
true
);
textePcb
->
SetMirrored
(
true
);
...
@@ -241,12 +241,12 @@ void PCB_EDIT_FRAME::Rotate_Texte_Pcb( TEXTE_PCB* TextePcb, wxDC* DC )
...
@@ -241,12 +241,12 @@ void PCB_EDIT_FRAME::Rotate_Texte_Pcb( TEXTE_PCB* TextePcb, wxDC* DC )
if
(
TextePcb
==
NULL
)
if
(
TextePcb
==
NULL
)
return
;
return
;
/
* Erase previous text. */
/
/ Erase previous text:
TextePcb
->
Draw
(
m_canvas
,
DC
,
GR_XOR
);
TextePcb
->
Draw
(
m_canvas
,
DC
,
GR_XOR
);
TextePcb
->
SetOrientation
(
TextePcb
->
GetOrientation
()
+
angle
);
TextePcb
->
SetOrientation
(
TextePcb
->
GetOrientation
()
+
angle
);
/
* Redraw text in new position. */
/
/ Redraw text in new position:
TextePcb
->
Draw
(
m_canvas
,
DC
,
GR_XOR
);
TextePcb
->
Draw
(
m_canvas
,
DC
,
GR_XOR
);
SetMsgPanel
(
TextePcb
);
SetMsgPanel
(
TextePcb
);
...
@@ -276,7 +276,7 @@ void PCB_EDIT_FRAME::FlipTextePcb( TEXTE_PCB* aTextePcb, wxDC* aDC )
...
@@ -276,7 +276,7 @@ void PCB_EDIT_FRAME::FlipTextePcb( TEXTE_PCB* aTextePcb, wxDC* aDC )
if
(
aTextePcb
->
GetFlags
()
==
0
)
// i.e. not edited, or moved
if
(
aTextePcb
->
GetFlags
()
==
0
)
// i.e. not edited, or moved
SaveCopyInUndoList
(
aTextePcb
,
UR_FLIPPED
,
aTextePcb
->
GetTextPosition
()
);
SaveCopyInUndoList
(
aTextePcb
,
UR_FLIPPED
,
aTextePcb
->
GetTextPosition
()
);
else
// set
flag edit, to show it was a complex
command
else
// set
edit flag, for the current
command
aTextePcb
->
SetFlags
(
IN_EDIT
);
aTextePcb
->
SetFlags
(
IN_EDIT
);
OnModify
();
OnModify
();
...
...
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