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
80901c69
Commit
80901c69
authored
Aug 08, 2013
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reformatting.
parent
12e10fd4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
17 deletions
+15
-17
tool_dispatcher.cpp
common/tool/tool_dispatcher.cpp
+0
-1
tool_interactive.cpp
common/tool/tool_interactive.cpp
+1
-1
delegate.h
include/tool/delegate.h
+8
-9
view.h
include/view/view.h
+2
-2
selection_tool.cpp
pcbnew/tools/selection_tool.cpp
+4
-4
No files found.
common/tool/tool_dispatcher.cpp
View file @
80901c69
...
...
@@ -229,7 +229,6 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent &aEvent )
m_toolMgr
->
ProcessEvent
(
*
evt
);
aEvent
.
Skip
();
}
...
...
common/tool/tool_interactive.cpp
View file @
80901c69
...
...
@@ -44,7 +44,7 @@ TOOL_INTERACTIVE::~TOOL_INTERACTIVE()
}
OPT_TOOL_EVENT
TOOL_INTERACTIVE
::
Wait
(
const
TOOL_EVENT_LIST
&
aEventList
)
OPT_TOOL_EVENT
TOOL_INTERACTIVE
::
Wait
(
const
TOOL_EVENT_LIST
&
aEventList
)
{
return
m_toolMgr
->
ScheduleWait
(
this
,
aEventList
);
}
...
...
include/tool/delegate.h
View file @
80901c69
...
...
@@ -46,14 +46,14 @@ template<class ReturnType, class Arg>
template
<
class
T
>
DELEGATE
(
T
*
object
,
ReturnType
(
T
::*
ptr
)(
Arg
)
)
{
m_ptr
=
reinterpret_cast
<
MemberPointer
>
(
ptr
);
m_object
=
reinterpret_cast
<
void
*>
(
object
);
m_ptr
=
reinterpret_cast
<
MemberPointer
>
(
ptr
);
m_object
=
reinterpret_cast
<
void
*>
(
object
);
};
ReturnType
operator
()(
Arg
a
)
const
{
DELEGATE
<
ReturnType
,
Arg
>
*
casted
=
reinterpret_cast
<
DELEGATE
<
ReturnType
,
Arg
>
*
>
(
m_object
);
DELEGATE
<
ReturnType
,
Arg
>
*
casted
=
reinterpret_cast
<
DELEGATE
<
ReturnType
,
Arg
>
*>
(
m_object
);
return
(
casted
->*
m_ptr
)(
a
);
}
...
...
@@ -69,8 +69,7 @@ private:
template
<
class
ReturnType
>
class
DELEGATE0
{
public
:
typedef
ReturnType
(
DELEGATE0
<
ReturnType
>::*
MemberPointer
)(
);
typedef
ReturnType
(
DELEGATE0
<
ReturnType
>::*
MemberPointer
)();
typedef
ReturnType
_ReturnType
;
DELEGATE0
()
...
...
@@ -80,15 +79,15 @@ template<class ReturnType>
template
<
class
T
>
DELEGATE0
(
T
*
object
,
ReturnType
(
T
::*
ptr
)(
)
)
{
m_ptr
=
reinterpret_cast
<
MemberPointer
>
(
ptr
);
m_object
=
reinterpret_cast
<
void
*>
(
object
);
m_ptr
=
reinterpret_cast
<
MemberPointer
>
(
ptr
);
m_object
=
reinterpret_cast
<
void
*>
(
object
);
};
ReturnType
operator
()(
)
const
{
DELEGATE0
<
ReturnType
>
*
casted
=
reinterpret_cast
<
DELEGATE0
<
ReturnType
>
*
>
(
m_object
);
return
(
casted
->*
m_ptr
)();
DELEGATE0
<
ReturnType
>
*
casted
=
reinterpret_cast
<
DELEGATE0
<
ReturnType
>*>
(
m_object
);
return
(
casted
->*
m_ptr
)();
}
private
:
...
...
include/view/view.h
View file @
80901c69
...
...
@@ -102,7 +102,7 @@ public:
* @param aRequiredId is the id of the required layer.
* @param aRequired tells if the required layer should be added or removed from the list.
*/
void
SetRequired
(
int
aLayerId
,
int
aRequiredId
,
bool
aRequired
=
true
);
void
SetRequired
(
int
aLayerId
,
int
aRequiredId
,
bool
aRequired
=
true
);
/**
* Function CopySettings()
...
...
@@ -378,7 +378,7 @@ public:
*/
bool
IsDirty
()
const
;
static
const
int
VIEW_MAX_LAYERS
=
128
;
///* maximum number of layers that may be shown
static
const
int
VIEW_MAX_LAYERS
=
128
;
///* maximum number of layers that may be shown
private
:
struct
VIEW_LAYER
...
...
pcbnew/tools/selection_tool.cpp
View file @
80901c69
...
...
@@ -119,8 +119,8 @@ void SELECTION_TOOL::selectSingle( const VECTOR2I& aWhere, bool aAdditive )
GENERAL_COLLECTORS_GUIDE
guide
=
getEditFrame
<
PCB_EDIT_FRAME
>
()
->
GetCollectorsGuide
();
GENERAL_COLLECTOR
collector
;
collector
.
Collect
(
pcb
,
GENERAL_COLLECTOR
::
AllBoardItems
,
wxPoint
(
aWhere
.
x
,
aWhere
.
y
),
guide
);
collector
.
Collect
(
pcb
,
GENERAL_COLLECTOR
::
AllBoardItems
,
wxPoint
(
aWhere
.
x
,
aWhere
.
y
),
guide
);
switch
(
collector
.
GetCount
()
)
{
...
...
@@ -186,7 +186,7 @@ void SELECTION_TOOL::handleHighlight( const VECTOR2D& aP )
void
SELECTION_TOOL
::
selectMultiple
()
{
OPT_TOOL_EVENT
evt
;
VIEW
*
v
=
getView
();
VIEW
*
v
=
getView
();
v
->
Add
(
m_selArea
);
...
...
@@ -217,7 +217,7 @@ void SELECTION_TOOL::selectMultiple()
BOARD_ITEM
*
SELECTION_TOOL
::
disambiguationMenu
(
GENERAL_COLLECTOR
*
aCollector
)
{
OPT_TOOL_EVENT
evt
;
BOARD_ITEM
*
current
=
NULL
;
BOARD_ITEM
*
current
=
NULL
;
m_menu
.
reset
(
new
CONTEXT_MENU
()
);
m_menu
->
SetTitle
(
_
(
"Clarify selection"
)
);
...
...
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