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
fdc61126
Commit
fdc61126
authored
Oct 10, 2007
by
dickelbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mires fixes
parent
a93fd711
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
29 additions
and
10 deletions
+29
-10
change_log.txt
change_log.txt
+12
-0
tool_gerber.cpp
gerbview/tool_gerber.cpp
+1
-1
class_board_item.cpp
pcbnew/class_board_item.cpp
+4
-1
collectors.cpp
pcbnew/collectors.cpp
+4
-0
collectors.h
pcbnew/collectors.h
+1
-1
edit.cpp
pcbnew/edit.cpp
+1
-1
mirepcb.cpp
pcbnew/mirepcb.cpp
+2
-2
onrightclick.cpp
pcbnew/onrightclick.cpp
+3
-3
tool_pcb.cpp
pcbnew/tool_pcb.cpp
+1
-1
No files found.
change_log.txt
View file @
fdc61126
...
@@ -4,6 +4,18 @@ Started 2007-June-11
...
@@ -4,6 +4,18 @@ Started 2007-June-11
Please add newer entries at the top, list the date and your name with
Please add newer entries at the top, list the date and your name with
email address.
email address.
2007-Oct-10 UPDATE Dick Hollenbeck <dick@softplc.com>
================================================================================
+ pcbnew
* prevent OnRightClick() from calling PcbGeneralLocateAndDisplay() when creating
a new track.
* bug fix: popup menu was not handling Mires, because the collector was not
being asked to find them.
+ all
Changed English UI text "Mire" to "Target" according to this post:
http://tech.groups.yahoo.com/group/kicad-users/message/1380
2007-Oct-9 UPDATE Dick Hollenbeck <dick@softplc.com>
2007-Oct-9 UPDATE Dick Hollenbeck <dick@softplc.com>
================================================================================
================================================================================
+ pcbnew
+ pcbnew
...
...
gerbview/tool_gerber.cpp
View file @
fdc61126
...
@@ -373,7 +373,7 @@ void WinEDA_GerberFrame::ReCreateVToolbar( void )
...
@@ -373,7 +373,7 @@ void WinEDA_GerberFrame::ReCreateVToolbar( void )
BITMAP( junction_xpm ),
BITMAP( junction_xpm ),
wxNullBitmap, TRUE,
wxNullBitmap, TRUE,
-1, -1, (wxObject*) NULL,
-1, -1, (wxObject*) NULL,
_( "Add
Mires
" ) );
_( "Add
layer alignment target
" ) );
m_VToolBar->AddSeparator();
m_VToolBar->AddSeparator();
m_VToolBar->AddTool( ID_TEXT_COMMENT_BUTT,
m_VToolBar->AddTool( ID_TEXT_COMMENT_BUTT,
...
...
pcbnew/class_board_item.cpp
View file @
fdc61126
...
@@ -187,7 +187,10 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
...
@@ -187,7 +187,10 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
break
;
break
;
case
TYPEMIRE
:
case
TYPEMIRE
:
text
<<
_
(
"Mire"
);
// @todo: extend text, Mire is not an english word!
text
<<
_
(
"Target"
)
//<< wxT( " on " ) << ReturnPcbLayerName( item->GetLayer() ).Trim()
// could use if problem with decimal point and user units was fixed:
// << wxT( " " ) << wxT( "size" ) << wxT( " " ) << ((MIREPCB*)item)->m_Size
;
break
;
break
;
case
TYPEEDGEZONE
:
case
TYPEEDGEZONE
:
...
...
pcbnew/collectors.cpp
View file @
fdc61126
...
@@ -40,6 +40,7 @@ const KICAD_T GENERAL_COLLECTOR::AllBoardItems[] = {
...
@@ -40,6 +40,7 @@ const KICAD_T GENERAL_COLLECTOR::AllBoardItems[] = {
TYPEDRAWSEGMENT
,
TYPEDRAWSEGMENT
,
TYPEMARQUEUR
,
TYPEMARQUEUR
,
TYPECOTATION
,
TYPECOTATION
,
TYPEMIRE
,
TYPEVIA
,
TYPEVIA
,
TYPETRACK
,
TYPETRACK
,
TYPEPAD
,
TYPEPAD
,
...
@@ -50,6 +51,7 @@ const KICAD_T GENERAL_COLLECTOR::AllBoardItems[] = {
...
@@ -50,6 +51,7 @@ const KICAD_T GENERAL_COLLECTOR::AllBoardItems[] = {
};
};
/*
const KICAD_T GENERAL_COLLECTOR::PrimaryItems[] = {
const KICAD_T GENERAL_COLLECTOR::PrimaryItems[] = {
TYPETEXTE,
TYPETEXTE,
TYPEDRAWSEGMENT,
TYPEDRAWSEGMENT,
...
@@ -60,6 +62,7 @@ const KICAD_T GENERAL_COLLECTOR::PrimaryItems[] = {
...
@@ -60,6 +62,7 @@ const KICAD_T GENERAL_COLLECTOR::PrimaryItems[] = {
TYPEMODULE,
TYPEMODULE,
EOT
EOT
};
};
*/
const
KICAD_T
GENERAL_COLLECTOR
::
AllButZones
[]
=
{
const
KICAD_T
GENERAL_COLLECTOR
::
AllButZones
[]
=
{
...
@@ -67,6 +70,7 @@ const KICAD_T GENERAL_COLLECTOR::AllButZones[] = {
...
@@ -67,6 +70,7 @@ const KICAD_T GENERAL_COLLECTOR::AllButZones[] = {
TYPEDRAWSEGMENT
,
TYPEDRAWSEGMENT
,
TYPEMARQUEUR
,
TYPEMARQUEUR
,
TYPECOTATION
,
TYPECOTATION
,
TYPEMIRE
,
TYPEVIA
,
TYPEVIA
,
TYPETRACK
,
TYPETRACK
,
TYPEPAD
,
TYPEPAD
,
...
...
pcbnew/collectors.h
View file @
fdc61126
...
@@ -211,8 +211,8 @@ public:
...
@@ -211,8 +211,8 @@ public:
/**
/**
* A scan list for all primary board items, omitting items which are subordinate to
* A scan list for all primary board items, omitting items which are subordinate to
* a MODULE, such as D_PAD and TEXTEMODULE.
* a MODULE, such as D_PAD and TEXTEMODULE.
*/
static const KICAD_T PrimaryItems[];
static const KICAD_T PrimaryItems[];
*/
/**
/**
...
...
pcbnew/edit.cpp
View file @
fdc61126
...
@@ -262,7 +262,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
...
@@ -262,7 +262,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
break
;
break
;
case
ID_PCB_MIRE_BUTT
:
case
ID_PCB_MIRE_BUTT
:
SetToolID
(
id
,
wxCURSOR_PENCIL
,
_
(
"Add
Mire
"
)
);
SetToolID
(
id
,
wxCURSOR_PENCIL
,
_
(
"Add
Layer Alignment Target
"
)
);
break
;
break
;
case
ID_PCB_PLACE_OFFSET_COORD_BUTT
:
case
ID_PCB_PLACE_OFFSET_COORD_BUTT
:
...
...
pcbnew/mirepcb.cpp
View file @
fdc61126
...
@@ -79,7 +79,7 @@ void WinEDA_PcbFrame::InstallMireOptionsFrame( MIREPCB* MirePcb,
...
@@ -79,7 +79,7 @@ void WinEDA_PcbFrame::InstallMireOptionsFrame( MIREPCB* MirePcb,
WinEDA_MirePropertiesFrame
::
WinEDA_MirePropertiesFrame
(
WinEDA_PcbFrame
*
parent
,
WinEDA_MirePropertiesFrame
::
WinEDA_MirePropertiesFrame
(
WinEDA_PcbFrame
*
parent
,
MIREPCB
*
Mire
,
wxDC
*
DC
,
MIREPCB
*
Mire
,
wxDC
*
DC
,
const
wxPoint
&
framepos
)
:
const
wxPoint
&
framepos
)
:
wxDialog
(
parent
,
-
1
,
_
(
"
Mire p
roperties"
),
framepos
,
wxSize
(
270
,
210
),
wxDialog
(
parent
,
-
1
,
_
(
"
Target P
roperties"
),
framepos
,
wxSize
(
270
,
210
),
DIALOG_STYLE
)
DIALOG_STYLE
)
{
{
wxString
number
;
wxString
number
;
...
@@ -121,7 +121,7 @@ WinEDA_MirePropertiesFrame::WinEDA_MirePropertiesFrame( WinEDA_PcbFrame* parent,
...
@@ -121,7 +121,7 @@ WinEDA_MirePropertiesFrame::WinEDA_MirePropertiesFrame( WinEDA_PcbFrame* parent,
// Shape
// Shape
wxString
shape_list
[
2
]
=
{
_
(
"shape +"
),
_
(
"shape X"
)
};
wxString
shape_list
[
2
]
=
{
_
(
"shape +"
),
_
(
"shape X"
)
};
m_MireShape
=
new
wxRadioBox
(
this
,
ID_LISTBOX_SHAPE_MIRE
,
m_MireShape
=
new
wxRadioBox
(
this
,
ID_LISTBOX_SHAPE_MIRE
,
_
(
"
Mire
Shape:"
),
_
(
"
Target
Shape:"
),
wxDefaultPosition
,
wxSize
(
-
1
,
-
1
),
wxDefaultPosition
,
wxSize
(
-
1
,
-
1
),
2
,
shape_list
,
1
);
2
,
shape_list
,
1
);
m_MireShape
->
SetSelection
(
m_MirePcb
->
m_Shape
?
1
:
0
);
m_MireShape
->
SetSelection
(
m_MirePcb
->
m_Shape
?
1
:
0
);
...
...
pcbnew/onrightclick.cpp
View file @
fdc61126
...
@@ -327,12 +327,12 @@ bool WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
...
@@ -327,12 +327,12 @@ bool WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
if
(
!
flags
)
if
(
!
flags
)
{
{
ADD_MENUITEM
(
aPopMenu
,
ID_POPUP_PCB_MOVE_MIRE_REQUEST
,
ADD_MENUITEM
(
aPopMenu
,
ID_POPUP_PCB_MOVE_MIRE_REQUEST
,
_
(
"Move
Mire
"
),
move_xpm
);
_
(
"Move
Target
"
),
move_xpm
);
}
}
ADD_MENUITEM
(
aPopMenu
,
ID_POPUP_PCB_EDIT_MIRE
,
ADD_MENUITEM
(
aPopMenu
,
ID_POPUP_PCB_EDIT_MIRE
,
_
(
"Edit
Mire
"
),
edit_xpm
);
_
(
"Edit
Target
"
),
edit_xpm
);
ADD_MENUITEM
(
aPopMenu
,
ID_POPUP_PCB_DELETE_MIRE
,
ADD_MENUITEM
(
aPopMenu
,
ID_POPUP_PCB_DELETE_MIRE
,
_
(
"Delete
Mire
"
),
delete_xpm
);
_
(
"Delete
Target
"
),
delete_xpm
);
break
;
break
;
case
TYPEEDGEMODULE
:
case
TYPEEDGEMODULE
:
...
...
pcbnew/tool_pcb.cpp
View file @
fdc61126
...
@@ -452,7 +452,7 @@ void WinEDA_PcbFrame::ReCreateVToolbar()
...
@@ -452,7 +452,7 @@ void WinEDA_PcbFrame::ReCreateVToolbar()
m_VToolBar
->
AddTool
(
ID_PCB_MIRE_BUTT
,
wxEmptyString
,
m_VToolBar
->
AddTool
(
ID_PCB_MIRE_BUTT
,
wxEmptyString
,
BITMAP
(
add_mires_xpm
),
BITMAP
(
add_mires_xpm
),
_
(
"Add
Mires
"
),
wxITEM_CHECK
);
_
(
"Add
layer alignment target
"
),
wxITEM_CHECK
);
m_VToolBar
->
AddSeparator
();
m_VToolBar
->
AddSeparator
();
m_VToolBar
->
AddTool
(
ID_PCB_DELETE_ITEM_BUTT
,
wxEmptyString
,
m_VToolBar
->
AddTool
(
ID_PCB_DELETE_ITEM_BUTT
,
wxEmptyString
,
...
...
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