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
e013f3e8
Commit
e013f3e8
authored
Oct 01, 2013
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Comments, refactoring
parent
d2618caa
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
10 deletions
+9
-10
worksheet_item.h
include/worksheet_item.h
+0
-1
wxBasePcbFrame.h
include/wxBasePcbFrame.h
+2
-0
basepcbframe.cpp
pcbnew/basepcbframe.cpp
+0
-2
move_tool.cpp
pcbnew/tools/move_tool.cpp
+6
-6
move_tool.h
pcbnew/tools/move_tool.h
+1
-1
No files found.
include/worksheet_item.h
View file @
e013f3e8
...
@@ -49,7 +49,6 @@ class WORKSHEET_ITEM : public EDA_ITEM
...
@@ -49,7 +49,6 @@ class WORKSHEET_ITEM : public EDA_ITEM
public
:
public
:
WORKSHEET_ITEM
(
const
std
::
string
&
aFileName
,
const
std
::
string
&
aSheetName
,
WORKSHEET_ITEM
(
const
std
::
string
&
aFileName
,
const
std
::
string
&
aSheetName
,
const
PAGE_INFO
*
aPageInfo
,
const
TITLE_BLOCK
*
aTitleBlock
);
const
PAGE_INFO
*
aPageInfo
,
const
TITLE_BLOCK
*
aTitleBlock
);
~
WORKSHEET_ITEM
()
{}
/**
/**
* Function SetFileName()
* Function SetFileName()
...
...
include/wxBasePcbFrame.h
View file @
e013f3e8
...
@@ -115,6 +115,8 @@ protected:
...
@@ -115,6 +115,8 @@ protected:
MODULE
*
loadFootprint
(
const
FPID
&
aFootprintId
)
MODULE
*
loadFootprint
(
const
FPID
&
aFootprintId
)
throw
(
IO_ERROR
,
PARSE_ERROR
);
throw
(
IO_ERROR
,
PARSE_ERROR
);
///> Rendering order of layers on GAL-based canvas (lower index in the array
///> means that layer is displayed closer to the user, ie. on the top).
static
const
LAYER_NUM
GAL_LAYER_ORDER
[];
static
const
LAYER_NUM
GAL_LAYER_ORDER
[];
public
:
public
:
...
...
pcbnew/basepcbframe.cpp
View file @
e013f3e8
...
@@ -70,8 +70,6 @@ static const wxString DisplayModuleTextEntry( wxT( "DiModTx" ) );
...
@@ -70,8 +70,6 @@ static const wxString DisplayModuleTextEntry( wxT( "DiModTx" ) );
static
const
wxString
FastGrid1Entry
(
wxT
(
"FastGrid1"
)
);
static
const
wxString
FastGrid1Entry
(
wxT
(
"FastGrid1"
)
);
static
const
wxString
FastGrid2Entry
(
wxT
(
"FastGrid2"
)
);
static
const
wxString
FastGrid2Entry
(
wxT
(
"FastGrid2"
)
);
/// Rendering order of layers on GAL-based canvas (lower index in the array
/// means that layer is displayed closer to the user, ie. on the top).
const
LAYER_NUM
PCB_BASE_FRAME
::
GAL_LAYER_ORDER
[]
=
const
LAYER_NUM
PCB_BASE_FRAME
::
GAL_LAYER_ORDER
[]
=
{
{
ITEM_GAL_LAYER
(
GP_OVERLAY
),
ITEM_GAL_LAYER
(
SELECTION
),
ITEM_GAL_LAYER
(
GP_OVERLAY
),
ITEM_GAL_LAYER
(
SELECTION
),
...
...
pcbnew/tools/move_tool.cpp
View file @
e013f3e8
...
@@ -139,7 +139,7 @@ int MOVE_TOOL::Main( TOOL_EVENT& aEvent )
...
@@ -139,7 +139,7 @@ int MOVE_TOOL::Main( TOOL_EVENT& aEvent )
m_state
.
Save
(
*
it
);
m_state
.
Save
(
*
it
);
// Gather all selected items into one VIEW_GROUP
// Gather all selected items into one VIEW_GROUP
v
iewGroup
Add
(
*
it
,
&
m_items
);
v
g
Add
(
*
it
,
&
m_items
);
}
}
// Hide the original items, they are temporarily shown in VIEW_GROUP on overlay
// Hide the original items, they are temporarily shown in VIEW_GROUP on overlay
...
@@ -183,7 +183,7 @@ int MOVE_TOOL::Main( TOOL_EVENT& aEvent )
...
@@ -183,7 +183,7 @@ int MOVE_TOOL::Main( TOOL_EVENT& aEvent )
}
}
void
MOVE_TOOL
::
v
iewGroup
Add
(
BOARD_ITEM
*
aItem
,
VIEW_GROUP
*
aGroup
)
void
MOVE_TOOL
::
v
g
Add
(
BOARD_ITEM
*
aItem
,
VIEW_GROUP
*
aGroup
)
{
{
// Modules are treated in a special way - when they are moved, we have to
// Modules are treated in a special way - when they are moved, we have to
// move all the parts that make the module, not the module itself
// move all the parts that make the module, not the module itself
...
@@ -193,14 +193,14 @@ void MOVE_TOOL::viewGroupAdd( BOARD_ITEM* aItem, VIEW_GROUP* aGroup )
...
@@ -193,14 +193,14 @@ void MOVE_TOOL::viewGroupAdd( BOARD_ITEM* aItem, VIEW_GROUP* aGroup )
// Add everything that belongs to the module (besides the module itself)
// Add everything that belongs to the module (besides the module itself)
for
(
D_PAD
*
pad
=
module
->
Pads
().
GetFirst
();
pad
;
pad
=
pad
->
Next
()
)
for
(
D_PAD
*
pad
=
module
->
Pads
().
GetFirst
();
pad
;
pad
=
pad
->
Next
()
)
viewGroupAdd
(
pad
,
&
m_items
);
aGroup
->
Add
(
pad
);
for
(
BOARD_ITEM
*
drawing
=
module
->
GraphicalItems
().
GetFirst
();
drawing
;
for
(
BOARD_ITEM
*
drawing
=
module
->
GraphicalItems
().
GetFirst
();
drawing
;
drawing
=
drawing
->
Next
()
)
drawing
=
drawing
->
Next
()
)
viewGroupAdd
(
drawing
,
&
m_items
);
aGroup
->
Add
(
drawing
);
viewGroupAdd
(
&
module
->
Reference
(),
&
m_items
);
aGroup
->
Add
(
&
module
->
Reference
()
);
viewGroupAdd
(
&
module
->
Value
(),
&
m_items
);
aGroup
->
Add
(
&
module
->
Value
()
);
}
}
// Add items to the VIEW_GROUP, so they will be displayed on the overlay
// Add items to the VIEW_GROUP, so they will be displayed on the overlay
...
...
pcbnew/tools/move_tool.h
View file @
e013f3e8
...
@@ -66,7 +66,7 @@ public:
...
@@ -66,7 +66,7 @@ public:
private
:
private
:
/// Adds an item to the VIEW_GROUP that holds all moved items and displays them on the overlay
/// Adds an item to the VIEW_GROUP that holds all moved items and displays them on the overlay
void
v
iewGroup
Add
(
BOARD_ITEM
*
aItem
,
KiGfx
::
VIEW_GROUP
*
aGroup
);
void
v
g
Add
(
BOARD_ITEM
*
aItem
,
KiGfx
::
VIEW_GROUP
*
aGroup
);
/// Changes visibility settings for items stored in a VIEW_GROUP
/// Changes visibility settings for items stored in a VIEW_GROUP
void
vgSetVisibility
(
KiGfx
::
VIEW_GROUP
*
aGroup
,
bool
aVisible
)
const
;
void
vgSetVisibility
(
KiGfx
::
VIEW_GROUP
*
aGroup
,
bool
aVisible
)
const
;
...
...
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