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
902d0e3f
Commit
902d0e3f
authored
Feb 14, 2015
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tools are processing const TOOL_EVENT& (Tool Framework).
parent
69553d6f
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
175 additions
and
181 deletions
+175
-181
tool_manager.cpp
common/tool/tool_manager.cpp
+7
-7
tool_base.h
include/tool/tool_base.h
+1
-1
tool_interactive.h
include/tool/tool_interactive.h
+2
-2
tool_manager.h
include/tool/tool_manager.h
+5
-5
router_tool.cpp
pcbnew/router/router_tool.cpp
+1
-1
router_tool.h
pcbnew/router/router_tool.h
+1
-1
drawing_tool.cpp
pcbnew/tools/drawing_tool.cpp
+11
-11
drawing_tool.h
pcbnew/tools/drawing_tool.h
+11
-11
edit_tool.cpp
pcbnew/tools/edit_tool.cpp
+5
-5
edit_tool.h
pcbnew/tools/edit_tool.h
+5
-5
module_tools.cpp
pcbnew/tools/module_tools.cpp
+6
-6
module_tools.h
pcbnew/tools/module_tools.h
+6
-6
pcb_editor_control.cpp
pcbnew/tools/pcb_editor_control.cpp
+8
-8
pcb_editor_control.h
pcbnew/tools/pcb_editor_control.h
+8
-8
pcbnew_control.cpp
pcbnew/tools/pcbnew_control.cpp
+26
-26
pcbnew_control.h
pcbnew/tools/pcbnew_control.h
+26
-26
placement_tool.cpp
pcbnew/tools/placement_tool.cpp
+6
-6
placement_tool.h
pcbnew/tools/placement_tool.h
+6
-6
point_editor.cpp
pcbnew/tools/point_editor.cpp
+3
-3
point_editor.h
pcbnew/tools/point_editor.h
+1
-1
selection_tool.cpp
pcbnew/tools/selection_tool.cpp
+20
-26
selection_tool.h
pcbnew/tools/selection_tool.h
+10
-10
No files found.
common/tool/tool_manager.cpp
View file @
902d0e3f
...
@@ -101,7 +101,7 @@ struct TOOL_MANAGER::TOOL_STATE
...
@@ -101,7 +101,7 @@ struct TOOL_MANAGER::TOOL_STATE
CONTEXT_MENU_TRIGGER
contextMenuTrigger
;
CONTEXT_MENU_TRIGGER
contextMenuTrigger
;
/// Tool execution context
/// Tool execution context
COROUTINE
<
int
,
TOOL_EVENT
&>*
cofunc
;
COROUTINE
<
int
,
const
TOOL_EVENT
&>*
cofunc
;
/// The event that triggered the execution/wakeup of the tool after Wait() call
/// The event that triggered the execution/wakeup of the tool after Wait() call
TOOL_EVENT
wakeupEvent
;
TOOL_EVENT
wakeupEvent
;
...
@@ -464,7 +464,7 @@ optional<TOOL_EVENT> TOOL_MANAGER::ScheduleWait( TOOL_BASE* aTool,
...
@@ -464,7 +464,7 @@ optional<TOOL_EVENT> TOOL_MANAGER::ScheduleWait( TOOL_BASE* aTool,
}
}
void
TOOL_MANAGER
::
dispatchInternal
(
TOOL_EVENT
&
aEvent
)
void
TOOL_MANAGER
::
dispatchInternal
(
const
TOOL_EVENT
&
aEvent
)
{
{
// iterate over all registered tools
// iterate over all registered tools
BOOST_FOREACH
(
TOOL_ID
toolId
,
m_activeTools
)
BOOST_FOREACH
(
TOOL_ID
toolId
,
m_activeTools
)
...
@@ -512,7 +512,7 @@ void TOOL_MANAGER::dispatchInternal( TOOL_EVENT& aEvent )
...
@@ -512,7 +512,7 @@ void TOOL_MANAGER::dispatchInternal( TOOL_EVENT& aEvent )
// as the state changes, the transition table has to be set up again
// as the state changes, the transition table has to be set up again
st
->
transitions
.
clear
();
st
->
transitions
.
clear
();
st
->
cofunc
=
new
COROUTINE
<
int
,
TOOL_EVENT
&>
(
tr
.
second
);
st
->
cofunc
=
new
COROUTINE
<
int
,
const
TOOL_EVENT
&>
(
tr
.
second
);
// got match? Run the handler.
// got match? Run the handler.
st
->
cofunc
->
Call
(
aEvent
);
st
->
cofunc
->
Call
(
aEvent
);
...
@@ -529,7 +529,7 @@ void TOOL_MANAGER::dispatchInternal( TOOL_EVENT& aEvent )
...
@@ -529,7 +529,7 @@ void TOOL_MANAGER::dispatchInternal( TOOL_EVENT& aEvent )
}
}
bool
TOOL_MANAGER
::
dispatchStandardEvents
(
TOOL_EVENT
&
aEvent
)
bool
TOOL_MANAGER
::
dispatchStandardEvents
(
const
TOOL_EVENT
&
aEvent
)
{
{
if
(
aEvent
.
Action
()
==
TA_KEY_PRESSED
)
if
(
aEvent
.
Action
()
==
TA_KEY_PRESSED
)
{
{
...
@@ -542,7 +542,7 @@ bool TOOL_MANAGER::dispatchStandardEvents( TOOL_EVENT& aEvent )
...
@@ -542,7 +542,7 @@ bool TOOL_MANAGER::dispatchStandardEvents( TOOL_EVENT& aEvent )
}
}
bool
TOOL_MANAGER
::
dispatchActivation
(
TOOL_EVENT
&
aEvent
)
bool
TOOL_MANAGER
::
dispatchActivation
(
const
TOOL_EVENT
&
aEvent
)
{
{
if
(
aEvent
.
IsActivate
()
)
if
(
aEvent
.
IsActivate
()
)
{
{
...
@@ -559,7 +559,7 @@ bool TOOL_MANAGER::dispatchActivation( TOOL_EVENT& aEvent )
...
@@ -559,7 +559,7 @@ bool TOOL_MANAGER::dispatchActivation( TOOL_EVENT& aEvent )
}
}
void
TOOL_MANAGER
::
dispatchContextMenu
(
TOOL_EVENT
&
aEvent
)
void
TOOL_MANAGER
::
dispatchContextMenu
(
const
TOOL_EVENT
&
aEvent
)
{
{
BOOST_FOREACH
(
TOOL_ID
toolId
,
m_activeTools
)
BOOST_FOREACH
(
TOOL_ID
toolId
,
m_activeTools
)
{
{
...
@@ -614,7 +614,7 @@ void TOOL_MANAGER::finishTool( TOOL_STATE* aState )
...
@@ -614,7 +614,7 @@ void TOOL_MANAGER::finishTool( TOOL_STATE* aState )
}
}
bool
TOOL_MANAGER
::
ProcessEvent
(
TOOL_EVENT
&
aEvent
)
bool
TOOL_MANAGER
::
ProcessEvent
(
const
TOOL_EVENT
&
aEvent
)
{
{
// Early dispatch of events destined for the TOOL_MANAGER
// Early dispatch of events destined for the TOOL_MANAGER
if
(
!
dispatchStandardEvents
(
aEvent
)
)
if
(
!
dispatchStandardEvents
(
aEvent
)
)
...
...
include/tool/tool_base.h
View file @
902d0e3f
...
@@ -51,7 +51,7 @@ enum TOOL_TYPE
...
@@ -51,7 +51,7 @@ enum TOOL_TYPE
/// Unique identifier for tools
/// Unique identifier for tools
typedef
int
TOOL_ID
;
typedef
int
TOOL_ID
;
typedef
DELEGATE
<
int
,
TOOL_EVENT
&>
TOOL_STATE_FUNC
;
typedef
DELEGATE
<
int
,
const
TOOL_EVENT
&>
TOOL_STATE_FUNC
;
/**
/**
* Class TOOL_BASE
* Class TOOL_BASE
...
...
include/tool/tool_interactive.h
View file @
902d0e3f
...
@@ -70,7 +70,7 @@ public:
...
@@ -70,7 +70,7 @@ public:
* No conditions means any event.
* No conditions means any event.
*/
*/
template
<
class
T
>
template
<
class
T
>
void
Go
(
int
(
T
::*
aStateFunc
)(
TOOL_EVENT
&
),
void
Go
(
int
(
T
::*
aStateFunc
)(
const
TOOL_EVENT
&
),
const
TOOL_EVENT_LIST
&
aConditions
=
TOOL_EVENT
(
TC_ANY
,
TA_ANY
)
);
const
TOOL_EVENT_LIST
&
aConditions
=
TOOL_EVENT
(
TC_ANY
,
TA_ANY
)
);
/**
/**
...
@@ -110,7 +110,7 @@ private:
...
@@ -110,7 +110,7 @@ private:
// hide TOOL_MANAGER implementation
// hide TOOL_MANAGER implementation
template
<
class
T
>
template
<
class
T
>
void
TOOL_INTERACTIVE
::
Go
(
int
(
T
::*
aStateFunc
)(
TOOL_EVENT
&
),
void
TOOL_INTERACTIVE
::
Go
(
int
(
T
::*
aStateFunc
)(
const
TOOL_EVENT
&
),
const
TOOL_EVENT_LIST
&
aConditions
)
const
TOOL_EVENT_LIST
&
aConditions
)
{
{
TOOL_STATE_FUNC
sptr
(
static_cast
<
T
*>
(
this
),
aStateFunc
);
TOOL_STATE_FUNC
sptr
(
static_cast
<
T
*>
(
this
),
aStateFunc
);
...
...
include/tool/tool_manager.h
View file @
902d0e3f
...
@@ -169,7 +169,7 @@ public:
...
@@ -169,7 +169,7 @@ public:
* Propagates an event to tools that requested events of matching type(s).
* Propagates an event to tools that requested events of matching type(s).
* @param aEvent is the event to be processed.
* @param aEvent is the event to be processed.
*/
*/
bool
ProcessEvent
(
TOOL_EVENT
&
aEvent
);
bool
ProcessEvent
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Puts an event to the event queue to be processed at the end of event processing cycle.
* Puts an event to the event queue to be processed at the end of event processing cycle.
...
@@ -309,7 +309,7 @@ private:
...
@@ -309,7 +309,7 @@ private:
* Function dispatchInternal
* Function dispatchInternal
* Passes an event at first to the active tools, then to all others.
* Passes an event at first to the active tools, then to all others.
*/
*/
void
dispatchInternal
(
TOOL_EVENT
&
aEvent
);
void
dispatchInternal
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function dispatchStandardEvents()
* Function dispatchStandardEvents()
...
@@ -317,7 +317,7 @@ private:
...
@@ -317,7 +317,7 @@ private:
* @param aEvent is the event to be processed.
* @param aEvent is the event to be processed.
* @return False if the event was processed and should not go any further.
* @return False if the event was processed and should not go any further.
*/
*/
bool
dispatchStandardEvents
(
TOOL_EVENT
&
aEvent
);
bool
dispatchStandardEvents
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function dispatchActivation()
* Function dispatchActivation()
...
@@ -325,13 +325,13 @@ private:
...
@@ -325,13 +325,13 @@ private:
* @param aEvent is an event to be tested.
* @param aEvent is an event to be tested.
* @return True if a tool was invoked, false otherwise.
* @return True if a tool was invoked, false otherwise.
*/
*/
bool
dispatchActivation
(
TOOL_EVENT
&
aEvent
);
bool
dispatchActivation
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function dispatchContextMenu()
* Function dispatchContextMenu()
* Handles context menu related events.
* Handles context menu related events.
*/
*/
void
dispatchContextMenu
(
TOOL_EVENT
&
aEvent
);
void
dispatchContextMenu
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function invokeTool()
* Function invokeTool()
...
...
pcbnew/router/router_tool.cpp
View file @
902d0e3f
...
@@ -725,7 +725,7 @@ void ROUTER_TOOL::performRouting()
...
@@ -725,7 +725,7 @@ void ROUTER_TOOL::performRouting()
}
}
int
ROUTER_TOOL
::
Main
(
TOOL_EVENT
&
aEvent
)
int
ROUTER_TOOL
::
Main
(
const
TOOL_EVENT
&
aEvent
)
{
{
VIEW_CONTROLS
*
ctls
=
getViewControls
();
VIEW_CONTROLS
*
ctls
=
getViewControls
();
PCB_EDIT_FRAME
*
frame
=
getEditFrame
<
PCB_EDIT_FRAME
>
();
PCB_EDIT_FRAME
*
frame
=
getEditFrame
<
PCB_EDIT_FRAME
>
();
...
...
pcbnew/router/router_tool.h
View file @
902d0e3f
...
@@ -41,7 +41,7 @@ public:
...
@@ -41,7 +41,7 @@ public:
~
ROUTER_TOOL
();
~
ROUTER_TOOL
();
void
Reset
(
RESET_REASON
aReason
);
void
Reset
(
RESET_REASON
aReason
);
int
Main
(
TOOL_EVENT
&
aEvent
);
int
Main
(
const
TOOL_EVENT
&
aEvent
);
private
:
private
:
PNS_ITEM
*
pickSingleItem
(
const
VECTOR2I
&
aWhere
,
int
aNet
=
-
1
,
int
aLayer
=
-
1
);
PNS_ITEM
*
pickSingleItem
(
const
VECTOR2I
&
aWhere
,
int
aNet
=
-
1
,
int
aLayer
=
-
1
);
...
...
pcbnew/tools/drawing_tool.cpp
View file @
902d0e3f
...
@@ -74,7 +74,7 @@ void DRAWING_TOOL::Reset( RESET_REASON aReason )
...
@@ -74,7 +74,7 @@ void DRAWING_TOOL::Reset( RESET_REASON aReason )
}
}
int
DRAWING_TOOL
::
DrawLine
(
TOOL_EVENT
&
aEvent
)
int
DRAWING_TOOL
::
DrawLine
(
const
TOOL_EVENT
&
aEvent
)
{
{
boost
::
optional
<
VECTOR2D
>
startingPoint
;
boost
::
optional
<
VECTOR2D
>
startingPoint
;
...
@@ -135,7 +135,7 @@ int DRAWING_TOOL::DrawLine( TOOL_EVENT& aEvent )
...
@@ -135,7 +135,7 @@ int DRAWING_TOOL::DrawLine( TOOL_EVENT& aEvent )
}
}
int
DRAWING_TOOL
::
DrawCircle
(
TOOL_EVENT
&
aEvent
)
int
DRAWING_TOOL
::
DrawCircle
(
const
TOOL_EVENT
&
aEvent
)
{
{
if
(
m_editModules
)
if
(
m_editModules
)
{
{
...
@@ -184,7 +184,7 @@ int DRAWING_TOOL::DrawCircle( TOOL_EVENT& aEvent )
...
@@ -184,7 +184,7 @@ int DRAWING_TOOL::DrawCircle( TOOL_EVENT& aEvent )
}
}
int
DRAWING_TOOL
::
DrawArc
(
TOOL_EVENT
&
aEvent
)
int
DRAWING_TOOL
::
DrawArc
(
const
TOOL_EVENT
&
aEvent
)
{
{
if
(
m_editModules
)
if
(
m_editModules
)
{
{
...
@@ -233,7 +233,7 @@ int DRAWING_TOOL::DrawArc( TOOL_EVENT& aEvent )
...
@@ -233,7 +233,7 @@ int DRAWING_TOOL::DrawArc( TOOL_EVENT& aEvent )
}
}
int
DRAWING_TOOL
::
PlaceText
(
TOOL_EVENT
&
aEvent
)
int
DRAWING_TOOL
::
PlaceText
(
const
TOOL_EVENT
&
aEvent
)
{
{
if
(
m_editModules
)
if
(
m_editModules
)
return
placeTextModule
();
return
placeTextModule
();
...
@@ -242,7 +242,7 @@ int DRAWING_TOOL::PlaceText( TOOL_EVENT& aEvent )
...
@@ -242,7 +242,7 @@ int DRAWING_TOOL::PlaceText( TOOL_EVENT& aEvent )
}
}
int
DRAWING_TOOL
::
DrawDimension
(
TOOL_EVENT
&
aEvent
)
int
DRAWING_TOOL
::
DrawDimension
(
const
TOOL_EVENT
&
aEvent
)
{
{
DIMENSION
*
dimension
=
NULL
;
DIMENSION
*
dimension
=
NULL
;
int
width
,
maxThickness
;
int
width
,
maxThickness
;
...
@@ -421,7 +421,7 @@ int DRAWING_TOOL::DrawDimension( TOOL_EVENT& aEvent )
...
@@ -421,7 +421,7 @@ int DRAWING_TOOL::DrawDimension( TOOL_EVENT& aEvent )
}
}
int
DRAWING_TOOL
::
DrawZone
(
TOOL_EVENT
&
aEvent
)
int
DRAWING_TOOL
::
DrawZone
(
const
TOOL_EVENT
&
aEvent
)
{
{
m_frame
->
SetToolID
(
ID_PCB_ZONES_BUTT
,
wxCURSOR_PENCIL
,
_
(
"Add zones"
)
);
m_frame
->
SetToolID
(
ID_PCB_ZONES_BUTT
,
wxCURSOR_PENCIL
,
_
(
"Add zones"
)
);
...
@@ -429,7 +429,7 @@ int DRAWING_TOOL::DrawZone( TOOL_EVENT& aEvent )
...
@@ -429,7 +429,7 @@ int DRAWING_TOOL::DrawZone( TOOL_EVENT& aEvent )
}
}
int
DRAWING_TOOL
::
DrawKeepout
(
TOOL_EVENT
&
aEvent
)
int
DRAWING_TOOL
::
DrawKeepout
(
const
TOOL_EVENT
&
aEvent
)
{
{
m_frame
->
SetToolID
(
ID_PCB_KEEPOUT_AREA_BUTT
,
wxCURSOR_PENCIL
,
_
(
"Add keepout"
)
);
m_frame
->
SetToolID
(
ID_PCB_KEEPOUT_AREA_BUTT
,
wxCURSOR_PENCIL
,
_
(
"Add keepout"
)
);
...
@@ -437,7 +437,7 @@ int DRAWING_TOOL::DrawKeepout( TOOL_EVENT& aEvent )
...
@@ -437,7 +437,7 @@ int DRAWING_TOOL::DrawKeepout( TOOL_EVENT& aEvent )
}
}
int
DRAWING_TOOL
::
PlaceTarget
(
TOOL_EVENT
&
aEvent
)
int
DRAWING_TOOL
::
PlaceTarget
(
const
TOOL_EVENT
&
aEvent
)
{
{
PCB_TARGET
*
target
=
new
PCB_TARGET
(
m_board
);
PCB_TARGET
*
target
=
new
PCB_TARGET
(
m_board
);
...
@@ -525,7 +525,7 @@ int DRAWING_TOOL::PlaceTarget( TOOL_EVENT& aEvent )
...
@@ -525,7 +525,7 @@ int DRAWING_TOOL::PlaceTarget( TOOL_EVENT& aEvent )
}
}
int
DRAWING_TOOL
::
PlaceModule
(
TOOL_EVENT
&
aEvent
)
int
DRAWING_TOOL
::
PlaceModule
(
const
TOOL_EVENT
&
aEvent
)
{
{
MODULE
*
module
=
NULL
;
MODULE
*
module
=
NULL
;
...
@@ -635,7 +635,7 @@ int DRAWING_TOOL::PlaceModule( TOOL_EVENT& aEvent )
...
@@ -635,7 +635,7 @@ int DRAWING_TOOL::PlaceModule( TOOL_EVENT& aEvent )
}
}
int
DRAWING_TOOL
::
PlaceDXF
(
TOOL_EVENT
&
aEvent
)
int
DRAWING_TOOL
::
PlaceDXF
(
const
TOOL_EVENT
&
aEvent
)
{
{
DIALOG_DXF_IMPORT
dlg
(
m_frame
);
DIALOG_DXF_IMPORT
dlg
(
m_frame
);
int
dlgResult
=
dlg
.
ShowModal
();
int
dlgResult
=
dlg
.
ShowModal
();
...
@@ -825,7 +825,7 @@ int DRAWING_TOOL::PlaceDXF( TOOL_EVENT& aEvent )
...
@@ -825,7 +825,7 @@ int DRAWING_TOOL::PlaceDXF( TOOL_EVENT& aEvent )
}
}
int
DRAWING_TOOL
::
SetAnchor
(
TOOL_EVENT
&
aEvent
)
int
DRAWING_TOOL
::
SetAnchor
(
const
TOOL_EVENT
&
aEvent
)
{
{
assert
(
m_editModules
);
assert
(
m_editModules
);
...
...
pcbnew/tools/drawing_tool.h
View file @
902d0e3f
...
@@ -58,7 +58,7 @@ public:
...
@@ -58,7 +58,7 @@ public:
* to click at least two times to determine the origin and the end for a line. If there are
* to click at least two times to determine the origin and the end for a line. If there are
* more clicks, the line is drawn as a continous polyline.
* more clicks, the line is drawn as a continous polyline.
*/
*/
int
DrawLine
(
TOOL_EVENT
&
aEvent
);
int
DrawLine
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function DrawCircle()
* Function DrawCircle()
...
@@ -66,7 +66,7 @@ public:
...
@@ -66,7 +66,7 @@ public:
* to first click on a point that is going to be used as the center of the circle. The second
* to first click on a point that is going to be used as the center of the circle. The second
* click determines the circle radius.
* click determines the circle radius.
*/
*/
int
DrawCircle
(
TOOL_EVENT
&
aEvent
);
int
DrawCircle
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function DrawArc()
* Function DrawArc()
...
@@ -74,14 +74,14 @@ public:
...
@@ -74,14 +74,14 @@ public:
* to first click on a point that is going to be used as the center of the arc. The second
* to first click on a point that is going to be used as the center of the arc. The second
* click determines the origin and radius, the third one - the angle.
* click determines the origin and radius, the third one - the angle.
*/
*/
int
DrawArc
(
TOOL_EVENT
&
aEvent
);
int
DrawArc
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function PlaceText()
* Function PlaceText()
* Displays a dialog that allows to input text and its settings and then lets the user decide
* Displays a dialog that allows to input text and its settings and then lets the user decide
* where to place the text in editor.
* where to place the text in editor.
*/
*/
int
PlaceText
(
TOOL_EVENT
&
aEvent
);
int
PlaceText
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function DrawDimension()
* Function DrawDimension()
...
@@ -89,7 +89,7 @@ public:
...
@@ -89,7 +89,7 @@ public:
* to first click on a point that is going to be used as the origin of the dimension.
* to first click on a point that is going to be used as the origin of the dimension.
* The second click determines the end and the third click modifies its height.
* The second click determines the end and the third click modifies its height.
*/
*/
int
DrawDimension
(
TOOL_EVENT
&
aEvent
);
int
DrawDimension
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function DrawZone()
* Function DrawZone()
...
@@ -98,7 +98,7 @@ public:
...
@@ -98,7 +98,7 @@ public:
* as a boundary polygon of the zone. Double click or clicking on the origin of the boundary
* as a boundary polygon of the zone. Double click or clicking on the origin of the boundary
* polyline finishes the drawing.
* polyline finishes the drawing.
*/
*/
int
DrawZone
(
TOOL_EVENT
&
aEvent
);
int
DrawZone
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function DrawKeepout()
* Function DrawKeepout()
...
@@ -107,31 +107,31 @@ public:
...
@@ -107,31 +107,31 @@ public:
* be used as a boundary polygon of the area. Double click or clicking on the origin of the
* be used as a boundary polygon of the area. Double click or clicking on the origin of the
* boundary polyline finishes the drawing.
* boundary polyline finishes the drawing.
*/
*/
int
DrawKeepout
(
TOOL_EVENT
&
aEvent
);
int
DrawKeepout
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function PlaceTarget()
* Function PlaceTarget()
* Allows user to place a layer alignment target.
* Allows user to place a layer alignment target.
*/
*/
int
PlaceTarget
(
TOOL_EVENT
&
aEvent
);
int
PlaceTarget
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function PlaceModule()
* Function PlaceModule()
* Displays a dialog to select a module to be added and allows the user to set its position.
* Displays a dialog to select a module to be added and allows the user to set its position.
*/
*/
int
PlaceModule
(
TOOL_EVENT
&
aEvent
);
int
PlaceModule
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function PlaceDXF()
* Function PlaceDXF()
* Places a drawing imported from a DXF file in module editor.
* Places a drawing imported from a DXF file in module editor.
*/
*/
int
PlaceDXF
(
TOOL_EVENT
&
aEvent
);
int
PlaceDXF
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function SetAnchor()
* Function SetAnchor()
* Places the footprint anchor (only in module editor).
* Places the footprint anchor (only in module editor).
*/
*/
int
SetAnchor
(
TOOL_EVENT
&
aEvent
);
int
SetAnchor
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function EditModules()
* Function EditModules()
...
...
pcbnew/tools/edit_tool.cpp
View file @
902d0e3f
...
@@ -81,7 +81,7 @@ bool EDIT_TOOL::Init()
...
@@ -81,7 +81,7 @@ bool EDIT_TOOL::Init()
}
}
int
EDIT_TOOL
::
Main
(
TOOL_EVENT
&
aEvent
)
int
EDIT_TOOL
::
Main
(
const
TOOL_EVENT
&
aEvent
)
{
{
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
...
@@ -238,7 +238,7 @@ int EDIT_TOOL::Main( TOOL_EVENT& aEvent )
...
@@ -238,7 +238,7 @@ int EDIT_TOOL::Main( TOOL_EVENT& aEvent )
}
}
int
EDIT_TOOL
::
Properties
(
TOOL_EVENT
&
aEvent
)
int
EDIT_TOOL
::
Properties
(
const
TOOL_EVENT
&
aEvent
)
{
{
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
PCB_BASE_EDIT_FRAME
*
editFrame
=
getEditFrame
<
PCB_BASE_EDIT_FRAME
>
();
PCB_BASE_EDIT_FRAME
*
editFrame
=
getEditFrame
<
PCB_BASE_EDIT_FRAME
>
();
...
@@ -307,7 +307,7 @@ int EDIT_TOOL::Properties( TOOL_EVENT& aEvent )
...
@@ -307,7 +307,7 @@ int EDIT_TOOL::Properties( TOOL_EVENT& aEvent )
}
}
int
EDIT_TOOL
::
Rotate
(
TOOL_EVENT
&
aEvent
)
int
EDIT_TOOL
::
Rotate
(
const
TOOL_EVENT
&
aEvent
)
{
{
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
PCB_BASE_EDIT_FRAME
*
editFrame
=
getEditFrame
<
PCB_BASE_EDIT_FRAME
>
();
PCB_BASE_EDIT_FRAME
*
editFrame
=
getEditFrame
<
PCB_BASE_EDIT_FRAME
>
();
...
@@ -361,7 +361,7 @@ int EDIT_TOOL::Rotate( TOOL_EVENT& aEvent )
...
@@ -361,7 +361,7 @@ int EDIT_TOOL::Rotate( TOOL_EVENT& aEvent )
}
}
int
EDIT_TOOL
::
Flip
(
TOOL_EVENT
&
aEvent
)
int
EDIT_TOOL
::
Flip
(
const
TOOL_EVENT
&
aEvent
)
{
{
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
PCB_BASE_FRAME
*
editFrame
=
getEditFrame
<
PCB_BASE_FRAME
>
();
PCB_BASE_FRAME
*
editFrame
=
getEditFrame
<
PCB_BASE_FRAME
>
();
...
@@ -415,7 +415,7 @@ int EDIT_TOOL::Flip( TOOL_EVENT& aEvent )
...
@@ -415,7 +415,7 @@ int EDIT_TOOL::Flip( TOOL_EVENT& aEvent )
}
}
int
EDIT_TOOL
::
Remove
(
TOOL_EVENT
&
aEvent
)
int
EDIT_TOOL
::
Remove
(
const
TOOL_EVENT
&
aEvent
)
{
{
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
...
...
pcbnew/tools/edit_tool.h
View file @
902d0e3f
...
@@ -61,35 +61,35 @@ public:
...
@@ -61,35 +61,35 @@ public:
* Main loop in which events are handled.
* Main loop in which events are handled.
* @param aEvent is the handled event.
* @param aEvent is the handled event.
*/
*/
int
Main
(
TOOL_EVENT
&
aEvent
);
int
Main
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function Edit()
* Function Edit()
*
*
* Displays properties window for the selected object.
* Displays properties window for the selected object.
*/
*/
int
Properties
(
TOOL_EVENT
&
aEvent
);
int
Properties
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function Rotate()
* Function Rotate()
*
*
* Rotates currently selected items.
* Rotates currently selected items.
*/
*/
int
Rotate
(
TOOL_EVENT
&
aEvent
);
int
Rotate
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function Flip()
* Function Flip()
*
*
* Rotates currently selected items. The rotation point is the current cursor position.
* Rotates currently selected items. The rotation point is the current cursor position.
*/
*/
int
Flip
(
TOOL_EVENT
&
aEvent
);
int
Flip
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function Remove()
* Function Remove()
*
*
* Deletes currently selected items. The rotation point is the current cursor position.
* Deletes currently selected items. The rotation point is the current cursor position.
*/
*/
int
Remove
(
TOOL_EVENT
&
aEvent
);
int
Remove
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function EditModules()
* Function EditModules()
...
...
pcbnew/tools/module_tools.cpp
View file @
902d0e3f
...
@@ -119,7 +119,7 @@ static wxString getNextPadName( MODULE* aModule )
...
@@ -119,7 +119,7 @@ static wxString getNextPadName( MODULE* aModule )
}
}
int
MODULE_TOOLS
::
PlacePad
(
TOOL_EVENT
&
aEvent
)
int
MODULE_TOOLS
::
PlacePad
(
const
TOOL_EVENT
&
aEvent
)
{
{
m_frame
->
SetToolID
(
ID_MODEDIT_PAD_TOOL
,
wxCURSOR_PENCIL
,
_
(
"Add pads"
)
);
m_frame
->
SetToolID
(
ID_MODEDIT_PAD_TOOL
,
wxCURSOR_PENCIL
,
_
(
"Add pads"
)
);
...
@@ -222,7 +222,7 @@ int MODULE_TOOLS::PlacePad( TOOL_EVENT& aEvent )
...
@@ -222,7 +222,7 @@ int MODULE_TOOLS::PlacePad( TOOL_EVENT& aEvent )
}
}
int
MODULE_TOOLS
::
EnumeratePads
(
TOOL_EVENT
&
aEvent
)
int
MODULE_TOOLS
::
EnumeratePads
(
const
TOOL_EVENT
&
aEvent
)
{
{
std
::
list
<
D_PAD
*>
pads
;
std
::
list
<
D_PAD
*>
pads
;
std
::
set
<
D_PAD
*>
allPads
;
std
::
set
<
D_PAD
*>
allPads
;
...
@@ -329,7 +329,7 @@ int MODULE_TOOLS::EnumeratePads( TOOL_EVENT& aEvent )
...
@@ -329,7 +329,7 @@ int MODULE_TOOLS::EnumeratePads( TOOL_EVENT& aEvent )
}
}
int
MODULE_TOOLS
::
CopyItems
(
TOOL_EVENT
&
aEvent
)
int
MODULE_TOOLS
::
CopyItems
(
const
TOOL_EVENT
&
aEvent
)
{
{
const
SELECTION
&
selection
=
m_toolMgr
->
GetTool
<
SELECTION_TOOL
>
()
->
GetSelection
();
const
SELECTION
&
selection
=
m_toolMgr
->
GetTool
<
SELECTION_TOOL
>
()
->
GetSelection
();
...
@@ -401,7 +401,7 @@ int MODULE_TOOLS::CopyItems( TOOL_EVENT& aEvent )
...
@@ -401,7 +401,7 @@ int MODULE_TOOLS::CopyItems( TOOL_EVENT& aEvent )
}
}
int
MODULE_TOOLS
::
PasteItems
(
TOOL_EVENT
&
aEvent
)
int
MODULE_TOOLS
::
PasteItems
(
const
TOOL_EVENT
&
aEvent
)
{
{
// Parse clipboard
// Parse clipboard
PCB_IO
io
(
CTL_FOR_CLIPBOARD
);
PCB_IO
io
(
CTL_FOR_CLIPBOARD
);
...
@@ -533,7 +533,7 @@ int MODULE_TOOLS::PasteItems( TOOL_EVENT& aEvent )
...
@@ -533,7 +533,7 @@ int MODULE_TOOLS::PasteItems( TOOL_EVENT& aEvent )
}
}
int
MODULE_TOOLS
::
ModuleTextOutlines
(
TOOL_EVENT
&
aEvent
)
int
MODULE_TOOLS
::
ModuleTextOutlines
(
const
TOOL_EVENT
&
aEvent
)
{
{
KIGFX
::
PCB_PAINTER
*
painter
=
KIGFX
::
PCB_PAINTER
*
painter
=
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
...
@@ -570,7 +570,7 @@ int MODULE_TOOLS::ModuleTextOutlines( TOOL_EVENT& aEvent )
...
@@ -570,7 +570,7 @@ int MODULE_TOOLS::ModuleTextOutlines( TOOL_EVENT& aEvent )
}
}
int
MODULE_TOOLS
::
ModuleEdgeOutlines
(
TOOL_EVENT
&
aEvent
)
int
MODULE_TOOLS
::
ModuleEdgeOutlines
(
const
TOOL_EVENT
&
aEvent
)
{
{
KIGFX
::
PCB_PAINTER
*
painter
=
KIGFX
::
PCB_PAINTER
*
painter
=
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
...
...
pcbnew/tools/module_tools.h
View file @
902d0e3f
...
@@ -55,41 +55,41 @@ public:
...
@@ -55,41 +55,41 @@ public:
* Function PlacePad()
* Function PlacePad()
* Places a pad in module editor.
* Places a pad in module editor.
*/
*/
int
PlacePad
(
TOOL_EVENT
&
aEvent
);
int
PlacePad
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function EnumeratePads()
* Function EnumeratePads()
* Tool for quick pad enumeration.
* Tool for quick pad enumeration.
*/
*/
int
EnumeratePads
(
TOOL_EVENT
&
aEvent
);
int
EnumeratePads
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function CopyItems()
* Function CopyItems()
*
*
* Copies selected items to the clipboard. Works only in "edit modules" mode.
* Copies selected items to the clipboard. Works only in "edit modules" mode.
*/
*/
int
CopyItems
(
TOOL_EVENT
&
aEvent
);
int
CopyItems
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function PastePad()
* Function PastePad()
*
*
* Pastes items from the clipboard. Works only in "edit modules" mode.
* Pastes items from the clipboard. Works only in "edit modules" mode.
*/
*/
int
PasteItems
(
TOOL_EVENT
&
aEvent
);
int
PasteItems
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function ModuleTextOutlines()
* Function ModuleTextOutlines()
*
*
* Toggles display mode for module texts (outline/filled).
* Toggles display mode for module texts (outline/filled).
*/
*/
int
ModuleTextOutlines
(
TOOL_EVENT
&
aEvent
);
int
ModuleTextOutlines
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function ModuleEdgeOutlines()
* Function ModuleEdgeOutlines()
*
*
* Toggles display mode for module edges (outline/filled).
* Toggles display mode for module edges (outline/filled).
*/
*/
int
ModuleEdgeOutlines
(
TOOL_EVENT
&
aEvent
);
int
ModuleEdgeOutlines
(
const
TOOL_EVENT
&
aEvent
);
private
:
private
:
///> Sets up handlers for various events.
///> Sets up handlers for various events.
...
...
pcbnew/tools/pcb_editor_control.cpp
View file @
902d0e3f
...
@@ -75,7 +75,7 @@ bool PCB_EDITOR_CONTROL::Init()
...
@@ -75,7 +75,7 @@ bool PCB_EDITOR_CONTROL::Init()
// Track & via size control
// Track & via size control
int
PCB_EDITOR_CONTROL
::
TrackWidthInc
(
TOOL_EVENT
&
aEvent
)
int
PCB_EDITOR_CONTROL
::
TrackWidthInc
(
const
TOOL_EVENT
&
aEvent
)
{
{
BOARD
*
board
=
getModel
<
BOARD
>
();
BOARD
*
board
=
getModel
<
BOARD
>
();
int
widthIndex
=
board
->
GetDesignSettings
().
GetTrackWidthIndex
()
+
1
;
int
widthIndex
=
board
->
GetDesignSettings
().
GetTrackWidthIndex
()
+
1
;
...
@@ -96,7 +96,7 @@ int PCB_EDITOR_CONTROL::TrackWidthInc( TOOL_EVENT& aEvent )
...
@@ -96,7 +96,7 @@ int PCB_EDITOR_CONTROL::TrackWidthInc( TOOL_EVENT& aEvent )
}
}
int
PCB_EDITOR_CONTROL
::
TrackWidthDec
(
TOOL_EVENT
&
aEvent
)
int
PCB_EDITOR_CONTROL
::
TrackWidthDec
(
const
TOOL_EVENT
&
aEvent
)
{
{
BOARD
*
board
=
getModel
<
BOARD
>
();
BOARD
*
board
=
getModel
<
BOARD
>
();
int
widthIndex
=
board
->
GetDesignSettings
().
GetTrackWidthIndex
()
-
1
;
int
widthIndex
=
board
->
GetDesignSettings
().
GetTrackWidthIndex
()
-
1
;
...
@@ -117,7 +117,7 @@ int PCB_EDITOR_CONTROL::TrackWidthDec( TOOL_EVENT& aEvent )
...
@@ -117,7 +117,7 @@ int PCB_EDITOR_CONTROL::TrackWidthDec( TOOL_EVENT& aEvent )
}
}
int
PCB_EDITOR_CONTROL
::
ViaSizeInc
(
TOOL_EVENT
&
aEvent
)
int
PCB_EDITOR_CONTROL
::
ViaSizeInc
(
const
TOOL_EVENT
&
aEvent
)
{
{
BOARD
*
board
=
getModel
<
BOARD
>
();
BOARD
*
board
=
getModel
<
BOARD
>
();
int
sizeIndex
=
board
->
GetDesignSettings
().
GetViaSizeIndex
()
+
1
;
int
sizeIndex
=
board
->
GetDesignSettings
().
GetViaSizeIndex
()
+
1
;
...
@@ -138,7 +138,7 @@ int PCB_EDITOR_CONTROL::ViaSizeInc( TOOL_EVENT& aEvent )
...
@@ -138,7 +138,7 @@ int PCB_EDITOR_CONTROL::ViaSizeInc( TOOL_EVENT& aEvent )
}
}
int
PCB_EDITOR_CONTROL
::
ViaSizeDec
(
TOOL_EVENT
&
aEvent
)
int
PCB_EDITOR_CONTROL
::
ViaSizeDec
(
const
TOOL_EVENT
&
aEvent
)
{
{
BOARD
*
board
=
getModel
<
BOARD
>
();
BOARD
*
board
=
getModel
<
BOARD
>
();
int
sizeIndex
=
board
->
GetDesignSettings
().
GetViaSizeIndex
()
-
1
;
int
sizeIndex
=
board
->
GetDesignSettings
().
GetViaSizeIndex
()
-
1
;
...
@@ -160,7 +160,7 @@ int PCB_EDITOR_CONTROL::ViaSizeDec( TOOL_EVENT& aEvent )
...
@@ -160,7 +160,7 @@ int PCB_EDITOR_CONTROL::ViaSizeDec( TOOL_EVENT& aEvent )
// Zone actions
// Zone actions
int
PCB_EDITOR_CONTROL
::
ZoneFill
(
TOOL_EVENT
&
aEvent
)
int
PCB_EDITOR_CONTROL
::
ZoneFill
(
const
TOOL_EVENT
&
aEvent
)
{
{
SELECTION_TOOL
*
selTool
=
m_toolMgr
->
GetTool
<
SELECTION_TOOL
>
();
SELECTION_TOOL
*
selTool
=
m_toolMgr
->
GetTool
<
SELECTION_TOOL
>
();
const
SELECTION
&
selection
=
selTool
->
GetSelection
();
const
SELECTION
&
selection
=
selTool
->
GetSelection
();
...
@@ -181,7 +181,7 @@ int PCB_EDITOR_CONTROL::ZoneFill( TOOL_EVENT& aEvent )
...
@@ -181,7 +181,7 @@ int PCB_EDITOR_CONTROL::ZoneFill( TOOL_EVENT& aEvent )
}
}
int
PCB_EDITOR_CONTROL
::
ZoneFillAll
(
TOOL_EVENT
&
aEvent
)
int
PCB_EDITOR_CONTROL
::
ZoneFillAll
(
const
TOOL_EVENT
&
aEvent
)
{
{
BOARD
*
board
=
getModel
<
BOARD
>
();
BOARD
*
board
=
getModel
<
BOARD
>
();
...
@@ -199,7 +199,7 @@ int PCB_EDITOR_CONTROL::ZoneFillAll( TOOL_EVENT& aEvent )
...
@@ -199,7 +199,7 @@ int PCB_EDITOR_CONTROL::ZoneFillAll( TOOL_EVENT& aEvent )
}
}
int
PCB_EDITOR_CONTROL
::
ZoneUnfill
(
TOOL_EVENT
&
aEvent
)
int
PCB_EDITOR_CONTROL
::
ZoneUnfill
(
const
TOOL_EVENT
&
aEvent
)
{
{
SELECTION_TOOL
*
selTool
=
m_toolMgr
->
GetTool
<
SELECTION_TOOL
>
();
SELECTION_TOOL
*
selTool
=
m_toolMgr
->
GetTool
<
SELECTION_TOOL
>
();
const
SELECTION
&
selection
=
selTool
->
GetSelection
();
const
SELECTION
&
selection
=
selTool
->
GetSelection
();
...
@@ -220,7 +220,7 @@ int PCB_EDITOR_CONTROL::ZoneUnfill( TOOL_EVENT& aEvent )
...
@@ -220,7 +220,7 @@ int PCB_EDITOR_CONTROL::ZoneUnfill( TOOL_EVENT& aEvent )
}
}
int
PCB_EDITOR_CONTROL
::
ZoneUnfillAll
(
TOOL_EVENT
&
aEvent
)
int
PCB_EDITOR_CONTROL
::
ZoneUnfillAll
(
const
TOOL_EVENT
&
aEvent
)
{
{
BOARD
*
board
=
getModel
<
BOARD
>
();
BOARD
*
board
=
getModel
<
BOARD
>
();
...
...
pcbnew/tools/pcb_editor_control.h
View file @
902d0e3f
...
@@ -46,16 +46,16 @@ public:
...
@@ -46,16 +46,16 @@ public:
bool
Init
();
bool
Init
();
// Track & via size control
// Track & via size control
int
TrackWidthInc
(
TOOL_EVENT
&
aEvent
);
int
TrackWidthInc
(
const
TOOL_EVENT
&
aEvent
);
int
TrackWidthDec
(
TOOL_EVENT
&
aEvent
);
int
TrackWidthDec
(
const
TOOL_EVENT
&
aEvent
);
int
ViaSizeInc
(
TOOL_EVENT
&
aEvent
);
int
ViaSizeInc
(
const
TOOL_EVENT
&
aEvent
);
int
ViaSizeDec
(
TOOL_EVENT
&
aEvent
);
int
ViaSizeDec
(
const
TOOL_EVENT
&
aEvent
);
// Zone actions
// Zone actions
int
ZoneFill
(
TOOL_EVENT
&
aEvent
);
int
ZoneFill
(
const
TOOL_EVENT
&
aEvent
);
int
ZoneFillAll
(
TOOL_EVENT
&
aEvent
);
int
ZoneFillAll
(
const
TOOL_EVENT
&
aEvent
);
int
ZoneUnfill
(
TOOL_EVENT
&
aEvent
);
int
ZoneUnfill
(
const
TOOL_EVENT
&
aEvent
);
int
ZoneUnfillAll
(
TOOL_EVENT
&
aEvent
);
int
ZoneUnfillAll
(
const
TOOL_EVENT
&
aEvent
);
private
:
private
:
///> Sets up handlers for various events.
///> Sets up handlers for various events.
...
...
pcbnew/tools/pcbnew_control.cpp
View file @
902d0e3f
...
@@ -60,7 +60,7 @@ bool PCBNEW_CONTROL::Init()
...
@@ -60,7 +60,7 @@ bool PCBNEW_CONTROL::Init()
}
}
int
PCBNEW_CONTROL
::
ZoomInOut
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
ZoomInOut
(
const
TOOL_EVENT
&
aEvent
)
{
{
KIGFX
::
VIEW
*
view
=
m_frame
->
GetGalCanvas
()
->
GetView
();
KIGFX
::
VIEW
*
view
=
m_frame
->
GetGalCanvas
()
->
GetView
();
double
zoomScale
=
1.0
;
double
zoomScale
=
1.0
;
...
@@ -77,7 +77,7 @@ int PCBNEW_CONTROL::ZoomInOut( TOOL_EVENT& aEvent )
...
@@ -77,7 +77,7 @@ int PCBNEW_CONTROL::ZoomInOut( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
ZoomInOutCenter
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
ZoomInOutCenter
(
const
TOOL_EVENT
&
aEvent
)
{
{
KIGFX
::
VIEW
*
view
=
m_frame
->
GetGalCanvas
()
->
GetView
();
KIGFX
::
VIEW
*
view
=
m_frame
->
GetGalCanvas
()
->
GetView
();
double
zoomScale
=
1.0
;
double
zoomScale
=
1.0
;
...
@@ -94,7 +94,7 @@ int PCBNEW_CONTROL::ZoomInOutCenter( TOOL_EVENT& aEvent )
...
@@ -94,7 +94,7 @@ int PCBNEW_CONTROL::ZoomInOutCenter( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
ZoomCenter
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
ZoomCenter
(
const
TOOL_EVENT
&
aEvent
)
{
{
KIGFX
::
VIEW
*
view
=
m_frame
->
GetGalCanvas
()
->
GetView
();
KIGFX
::
VIEW
*
view
=
m_frame
->
GetGalCanvas
()
->
GetView
();
view
->
SetCenter
(
getViewControls
()
->
GetCursorPosition
()
);
view
->
SetCenter
(
getViewControls
()
->
GetCursorPosition
()
);
...
@@ -104,7 +104,7 @@ int PCBNEW_CONTROL::ZoomCenter( TOOL_EVENT& aEvent )
...
@@ -104,7 +104,7 @@ int PCBNEW_CONTROL::ZoomCenter( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
ZoomFitScreen
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
ZoomFitScreen
(
const
TOOL_EVENT
&
aEvent
)
{
{
KIGFX
::
VIEW
*
view
=
m_frame
->
GetGalCanvas
()
->
GetView
();
KIGFX
::
VIEW
*
view
=
m_frame
->
GetGalCanvas
()
->
GetView
();
KIGFX
::
GAL
*
gal
=
m_frame
->
GetGalCanvas
()
->
GetGAL
();
KIGFX
::
GAL
*
gal
=
m_frame
->
GetGalCanvas
()
->
GetGAL
();
...
@@ -140,7 +140,7 @@ int PCBNEW_CONTROL::ZoomFitScreen( TOOL_EVENT& aEvent )
...
@@ -140,7 +140,7 @@ int PCBNEW_CONTROL::ZoomFitScreen( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
TrackDisplayMode
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
TrackDisplayMode
(
const
TOOL_EVENT
&
aEvent
)
{
{
KIGFX
::
PCB_PAINTER
*
painter
=
KIGFX
::
PCB_PAINTER
*
painter
=
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
...
@@ -165,7 +165,7 @@ int PCBNEW_CONTROL::TrackDisplayMode( TOOL_EVENT& aEvent )
...
@@ -165,7 +165,7 @@ int PCBNEW_CONTROL::TrackDisplayMode( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
PadDisplayMode
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
PadDisplayMode
(
const
TOOL_EVENT
&
aEvent
)
{
{
KIGFX
::
PCB_PAINTER
*
painter
=
KIGFX
::
PCB_PAINTER
*
painter
=
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
...
@@ -190,7 +190,7 @@ int PCBNEW_CONTROL::PadDisplayMode( TOOL_EVENT& aEvent )
...
@@ -190,7 +190,7 @@ int PCBNEW_CONTROL::PadDisplayMode( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
ViaDisplayMode
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
ViaDisplayMode
(
const
TOOL_EVENT
&
aEvent
)
{
{
KIGFX
::
PCB_PAINTER
*
painter
=
KIGFX
::
PCB_PAINTER
*
painter
=
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
...
@@ -215,7 +215,7 @@ int PCBNEW_CONTROL::ViaDisplayMode( TOOL_EVENT& aEvent )
...
@@ -215,7 +215,7 @@ int PCBNEW_CONTROL::ViaDisplayMode( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
ZoneDisplayMode
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
ZoneDisplayMode
(
const
TOOL_EVENT
&
aEvent
)
{
{
KIGFX
::
PCB_PAINTER
*
painter
=
KIGFX
::
PCB_PAINTER
*
painter
=
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
...
@@ -246,7 +246,7 @@ int PCBNEW_CONTROL::ZoneDisplayMode( TOOL_EVENT& aEvent )
...
@@ -246,7 +246,7 @@ int PCBNEW_CONTROL::ZoneDisplayMode( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
HighContrastMode
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
HighContrastMode
(
const
TOOL_EVENT
&
aEvent
)
{
{
KIGFX
::
PCB_PAINTER
*
painter
=
KIGFX
::
PCB_PAINTER
*
painter
=
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
...
@@ -264,7 +264,7 @@ int PCBNEW_CONTROL::HighContrastMode( TOOL_EVENT& aEvent )
...
@@ -264,7 +264,7 @@ int PCBNEW_CONTROL::HighContrastMode( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
HighContrastInc
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
HighContrastInc
(
const
TOOL_EVENT
&
aEvent
)
{
{
std
::
cout
<<
__PRETTY_FUNCTION__
<<
std
::
endl
;
std
::
cout
<<
__PRETTY_FUNCTION__
<<
std
::
endl
;
setTransitions
();
setTransitions
();
...
@@ -273,7 +273,7 @@ int PCBNEW_CONTROL::HighContrastInc( TOOL_EVENT& aEvent )
...
@@ -273,7 +273,7 @@ int PCBNEW_CONTROL::HighContrastInc( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
HighContrastDec
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
HighContrastDec
(
const
TOOL_EVENT
&
aEvent
)
{
{
std
::
cout
<<
__PRETTY_FUNCTION__
<<
std
::
endl
;
std
::
cout
<<
__PRETTY_FUNCTION__
<<
std
::
endl
;
setTransitions
();
setTransitions
();
...
@@ -283,7 +283,7 @@ int PCBNEW_CONTROL::HighContrastDec( TOOL_EVENT& aEvent )
...
@@ -283,7 +283,7 @@ int PCBNEW_CONTROL::HighContrastDec( TOOL_EVENT& aEvent )
// Layer control
// Layer control
int
PCBNEW_CONTROL
::
LayerSwitch
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
LayerSwitch
(
const
TOOL_EVENT
&
aEvent
)
{
{
if
(
aEvent
.
IsAction
(
&
COMMON_ACTIONS
::
layerTop
)
)
if
(
aEvent
.
IsAction
(
&
COMMON_ACTIONS
::
layerTop
)
)
m_frame
->
SwitchLayer
(
NULL
,
F_Cu
);
m_frame
->
SwitchLayer
(
NULL
,
F_Cu
);
...
@@ -308,7 +308,7 @@ int PCBNEW_CONTROL::LayerSwitch( TOOL_EVENT& aEvent )
...
@@ -308,7 +308,7 @@ int PCBNEW_CONTROL::LayerSwitch( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
LayerNext
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
LayerNext
(
const
TOOL_EVENT
&
aEvent
)
{
{
PCB_BASE_FRAME
*
editFrame
=
m_frame
;
PCB_BASE_FRAME
*
editFrame
=
m_frame
;
LAYER_NUM
layer
=
editFrame
->
GetActiveLayer
();
LAYER_NUM
layer
=
editFrame
->
GetActiveLayer
();
...
@@ -336,7 +336,7 @@ int PCBNEW_CONTROL::LayerNext( TOOL_EVENT& aEvent )
...
@@ -336,7 +336,7 @@ int PCBNEW_CONTROL::LayerNext( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
LayerPrev
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
LayerPrev
(
const
TOOL_EVENT
&
aEvent
)
{
{
PCB_BASE_FRAME
*
editFrame
=
m_frame
;
PCB_BASE_FRAME
*
editFrame
=
m_frame
;
LAYER_NUM
layer
=
editFrame
->
GetActiveLayer
();
LAYER_NUM
layer
=
editFrame
->
GetActiveLayer
();
...
@@ -364,7 +364,7 @@ int PCBNEW_CONTROL::LayerPrev( TOOL_EVENT& aEvent )
...
@@ -364,7 +364,7 @@ int PCBNEW_CONTROL::LayerPrev( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
LayerAlphaInc
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
LayerAlphaInc
(
const
TOOL_EVENT
&
aEvent
)
{
{
KIGFX
::
PCB_PAINTER
*
painter
=
KIGFX
::
PCB_PAINTER
*
painter
=
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
...
@@ -387,7 +387,7 @@ int PCBNEW_CONTROL::LayerAlphaInc( TOOL_EVENT& aEvent )
...
@@ -387,7 +387,7 @@ int PCBNEW_CONTROL::LayerAlphaInc( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
LayerAlphaDec
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
LayerAlphaDec
(
const
TOOL_EVENT
&
aEvent
)
{
{
KIGFX
::
PCB_PAINTER
*
painter
=
KIGFX
::
PCB_PAINTER
*
painter
=
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
static_cast
<
KIGFX
::
PCB_PAINTER
*>
(
m_frame
->
GetGalCanvas
()
->
GetView
()
->
GetPainter
()
);
...
@@ -411,7 +411,7 @@ int PCBNEW_CONTROL::LayerAlphaDec( TOOL_EVENT& aEvent )
...
@@ -411,7 +411,7 @@ int PCBNEW_CONTROL::LayerAlphaDec( TOOL_EVENT& aEvent )
// Grid control
// Grid control
int
PCBNEW_CONTROL
::
GridFast1
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
GridFast1
(
const
TOOL_EVENT
&
aEvent
)
{
{
m_frame
->
SetFastGrid1
();
m_frame
->
SetFastGrid1
();
setTransitions
();
setTransitions
();
...
@@ -420,7 +420,7 @@ int PCBNEW_CONTROL::GridFast1( TOOL_EVENT& aEvent )
...
@@ -420,7 +420,7 @@ int PCBNEW_CONTROL::GridFast1( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
GridFast2
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
GridFast2
(
const
TOOL_EVENT
&
aEvent
)
{
{
m_frame
->
SetFastGrid2
();
m_frame
->
SetFastGrid2
();
setTransitions
();
setTransitions
();
...
@@ -429,7 +429,7 @@ int PCBNEW_CONTROL::GridFast2( TOOL_EVENT& aEvent )
...
@@ -429,7 +429,7 @@ int PCBNEW_CONTROL::GridFast2( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
GridNext
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
GridNext
(
const
TOOL_EVENT
&
aEvent
)
{
{
m_frame
->
SetNextGrid
();
m_frame
->
SetNextGrid
();
setTransitions
();
setTransitions
();
...
@@ -438,7 +438,7 @@ int PCBNEW_CONTROL::GridNext( TOOL_EVENT& aEvent )
...
@@ -438,7 +438,7 @@ int PCBNEW_CONTROL::GridNext( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
GridPrev
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
GridPrev
(
const
TOOL_EVENT
&
aEvent
)
{
{
m_frame
->
SetPrevGrid
();
m_frame
->
SetPrevGrid
();
setTransitions
();
setTransitions
();
...
@@ -447,7 +447,7 @@ int PCBNEW_CONTROL::GridPrev( TOOL_EVENT& aEvent )
...
@@ -447,7 +447,7 @@ int PCBNEW_CONTROL::GridPrev( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
GridSetOrigin
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
GridSetOrigin
(
const
TOOL_EVENT
&
aEvent
)
{
{
Activate
();
Activate
();
m_frame
->
SetToolID
(
ID_PCB_PLACE_GRID_COORD_BUTT
,
wxCURSOR_PENCIL
,
m_frame
->
SetToolID
(
ID_PCB_PLACE_GRID_COORD_BUTT
,
wxCURSOR_PENCIL
,
...
@@ -481,7 +481,7 @@ int PCBNEW_CONTROL::GridSetOrigin( TOOL_EVENT& aEvent )
...
@@ -481,7 +481,7 @@ int PCBNEW_CONTROL::GridSetOrigin( TOOL_EVENT& aEvent )
// Miscellaneous
// Miscellaneous
int
PCBNEW_CONTROL
::
ResetCoords
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
ResetCoords
(
const
TOOL_EVENT
&
aEvent
)
{
{
VECTOR2I
cursorPos
=
getViewControls
()
->
GetCursorPosition
();
VECTOR2I
cursorPos
=
getViewControls
()
->
GetCursorPosition
();
...
@@ -493,7 +493,7 @@ int PCBNEW_CONTROL::ResetCoords( TOOL_EVENT& aEvent )
...
@@ -493,7 +493,7 @@ int PCBNEW_CONTROL::ResetCoords( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
SwitchCursor
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
SwitchCursor
(
const
TOOL_EVENT
&
aEvent
)
{
{
const
unsigned
int
BIG_CURSOR
=
4000
;
const
unsigned
int
BIG_CURSOR
=
4000
;
const
unsigned
int
SMALL_CURSOR
=
80
;
const
unsigned
int
SMALL_CURSOR
=
80
;
...
@@ -511,7 +511,7 @@ int PCBNEW_CONTROL::SwitchCursor( TOOL_EVENT& aEvent )
...
@@ -511,7 +511,7 @@ int PCBNEW_CONTROL::SwitchCursor( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
SwitchUnits
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
SwitchUnits
(
const
TOOL_EVENT
&
aEvent
)
{
{
// TODO should not it be refactored to pcb_frame member function?
// TODO should not it be refactored to pcb_frame member function?
wxCommandEvent
evt
(
wxEVT_COMMAND_MENU_SELECTED
);
wxCommandEvent
evt
(
wxEVT_COMMAND_MENU_SELECTED
);
...
@@ -528,7 +528,7 @@ int PCBNEW_CONTROL::SwitchUnits( TOOL_EVENT& aEvent )
...
@@ -528,7 +528,7 @@ int PCBNEW_CONTROL::SwitchUnits( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
ShowHelp
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
ShowHelp
(
const
TOOL_EVENT
&
aEvent
)
{
{
// TODO
// TODO
DisplayInfoMessage
(
m_frame
,
_
(
"Not implemented yet."
)
);
DisplayInfoMessage
(
m_frame
,
_
(
"Not implemented yet."
)
);
...
@@ -538,7 +538,7 @@ int PCBNEW_CONTROL::ShowHelp( TOOL_EVENT& aEvent )
...
@@ -538,7 +538,7 @@ int PCBNEW_CONTROL::ShowHelp( TOOL_EVENT& aEvent )
}
}
int
PCBNEW_CONTROL
::
ToBeDone
(
TOOL_EVENT
&
aEvent
)
int
PCBNEW_CONTROL
::
ToBeDone
(
const
TOOL_EVENT
&
aEvent
)
{
{
DisplayInfoMessage
(
m_frame
,
_
(
"Not implemented yet."
)
);
DisplayInfoMessage
(
m_frame
,
_
(
"Not implemented yet."
)
);
setTransitions
();
setTransitions
();
...
...
pcbnew/tools/pcbnew_control.h
View file @
902d0e3f
...
@@ -47,40 +47,40 @@ public:
...
@@ -47,40 +47,40 @@ public:
bool
Init
();
bool
Init
();
// View controls
// View controls
int
ZoomInOut
(
TOOL_EVENT
&
aEvent
);
int
ZoomInOut
(
const
TOOL_EVENT
&
aEvent
);
int
ZoomInOutCenter
(
TOOL_EVENT
&
aEvent
);
int
ZoomInOutCenter
(
const
TOOL_EVENT
&
aEvent
);
int
ZoomCenter
(
TOOL_EVENT
&
aEvent
);
int
ZoomCenter
(
const
TOOL_EVENT
&
aEvent
);
int
ZoomFitScreen
(
TOOL_EVENT
&
aEvent
);
int
ZoomFitScreen
(
const
TOOL_EVENT
&
aEvent
);
// Display modes
// Display modes
int
TrackDisplayMode
(
TOOL_EVENT
&
aEvent
);
int
TrackDisplayMode
(
const
TOOL_EVENT
&
aEvent
);
int
PadDisplayMode
(
TOOL_EVENT
&
aEvent
);
int
PadDisplayMode
(
const
TOOL_EVENT
&
aEvent
);
int
ViaDisplayMode
(
TOOL_EVENT
&
aEvent
);
int
ViaDisplayMode
(
const
TOOL_EVENT
&
aEvent
);
int
ZoneDisplayMode
(
TOOL_EVENT
&
aEvent
);
int
ZoneDisplayMode
(
const
TOOL_EVENT
&
aEvent
);
int
HighContrastMode
(
TOOL_EVENT
&
aEvent
);
int
HighContrastMode
(
const
TOOL_EVENT
&
aEvent
);
int
HighContrastInc
(
TOOL_EVENT
&
aEvent
);
int
HighContrastInc
(
const
TOOL_EVENT
&
aEvent
);
int
HighContrastDec
(
TOOL_EVENT
&
aEvent
);
int
HighContrastDec
(
const
TOOL_EVENT
&
aEvent
);
// Layer control
// Layer control
int
LayerSwitch
(
TOOL_EVENT
&
aEvent
);
int
LayerSwitch
(
const
TOOL_EVENT
&
aEvent
);
int
LayerNext
(
TOOL_EVENT
&
aEvent
);
int
LayerNext
(
const
TOOL_EVENT
&
aEvent
);
int
LayerPrev
(
TOOL_EVENT
&
aEvent
);
int
LayerPrev
(
const
TOOL_EVENT
&
aEvent
);
int
LayerAlphaInc
(
TOOL_EVENT
&
aEvent
);
int
LayerAlphaInc
(
const
TOOL_EVENT
&
aEvent
);
int
LayerAlphaDec
(
TOOL_EVENT
&
aEvent
);
int
LayerAlphaDec
(
const
TOOL_EVENT
&
aEvent
);
// Grid control
// Grid control
int
GridFast1
(
TOOL_EVENT
&
aEvent
);
int
GridFast1
(
const
TOOL_EVENT
&
aEvent
);
int
GridFast2
(
TOOL_EVENT
&
aEvent
);
int
GridFast2
(
const
TOOL_EVENT
&
aEvent
);
int
GridNext
(
TOOL_EVENT
&
aEvent
);
int
GridNext
(
const
TOOL_EVENT
&
aEvent
);
int
GridPrev
(
TOOL_EVENT
&
aEvent
);
int
GridPrev
(
const
TOOL_EVENT
&
aEvent
);
int
GridSetOrigin
(
TOOL_EVENT
&
aEvent
);
int
GridSetOrigin
(
const
TOOL_EVENT
&
aEvent
);
// Miscellaneous
// Miscellaneous
int
ResetCoords
(
TOOL_EVENT
&
aEvent
);
int
ResetCoords
(
const
TOOL_EVENT
&
aEvent
);
int
SwitchCursor
(
TOOL_EVENT
&
aEvent
);
int
SwitchCursor
(
const
TOOL_EVENT
&
aEvent
);
int
SwitchUnits
(
TOOL_EVENT
&
aEvent
);
int
SwitchUnits
(
const
TOOL_EVENT
&
aEvent
);
int
ShowHelp
(
TOOL_EVENT
&
aEvent
);
int
ShowHelp
(
const
TOOL_EVENT
&
aEvent
);
int
ToBeDone
(
TOOL_EVENT
&
aEvent
);
int
ToBeDone
(
const
TOOL_EVENT
&
aEvent
);
private
:
private
:
///> Sets up handlers for various events.
///> Sets up handlers for various events.
...
...
pcbnew/tools/placement_tool.cpp
View file @
902d0e3f
...
@@ -72,7 +72,7 @@ bool PLACEMENT_TOOL::Init()
...
@@ -72,7 +72,7 @@ bool PLACEMENT_TOOL::Init()
}
}
int
PLACEMENT_TOOL
::
AlignTop
(
TOOL_EVENT
&
aEvent
)
int
PLACEMENT_TOOL
::
AlignTop
(
const
TOOL_EVENT
&
aEvent
)
{
{
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
...
@@ -115,7 +115,7 @@ int PLACEMENT_TOOL::AlignTop( TOOL_EVENT& aEvent )
...
@@ -115,7 +115,7 @@ int PLACEMENT_TOOL::AlignTop( TOOL_EVENT& aEvent )
}
}
int
PLACEMENT_TOOL
::
AlignBottom
(
TOOL_EVENT
&
aEvent
)
int
PLACEMENT_TOOL
::
AlignBottom
(
const
TOOL_EVENT
&
aEvent
)
{
{
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
...
@@ -158,7 +158,7 @@ int PLACEMENT_TOOL::AlignBottom( TOOL_EVENT& aEvent )
...
@@ -158,7 +158,7 @@ int PLACEMENT_TOOL::AlignBottom( TOOL_EVENT& aEvent )
}
}
int
PLACEMENT_TOOL
::
AlignLeft
(
TOOL_EVENT
&
aEvent
)
int
PLACEMENT_TOOL
::
AlignLeft
(
const
TOOL_EVENT
&
aEvent
)
{
{
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
...
@@ -201,7 +201,7 @@ int PLACEMENT_TOOL::AlignLeft( TOOL_EVENT& aEvent )
...
@@ -201,7 +201,7 @@ int PLACEMENT_TOOL::AlignLeft( TOOL_EVENT& aEvent )
}
}
int
PLACEMENT_TOOL
::
AlignRight
(
TOOL_EVENT
&
aEvent
)
int
PLACEMENT_TOOL
::
AlignRight
(
const
TOOL_EVENT
&
aEvent
)
{
{
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
...
@@ -256,7 +256,7 @@ static bool compareY( const BOARD_ITEM* aA, const BOARD_ITEM* aB )
...
@@ -256,7 +256,7 @@ static bool compareY( const BOARD_ITEM* aA, const BOARD_ITEM* aB )
}
}
int
PLACEMENT_TOOL
::
DistributeHorizontally
(
TOOL_EVENT
&
aEvent
)
int
PLACEMENT_TOOL
::
DistributeHorizontally
(
const
TOOL_EVENT
&
aEvent
)
{
{
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
...
@@ -305,7 +305,7 @@ int PLACEMENT_TOOL::DistributeHorizontally( TOOL_EVENT& aEvent )
...
@@ -305,7 +305,7 @@ int PLACEMENT_TOOL::DistributeHorizontally( TOOL_EVENT& aEvent )
}
}
int
PLACEMENT_TOOL
::
DistributeVertically
(
TOOL_EVENT
&
aEvent
)
int
PLACEMENT_TOOL
::
DistributeVertically
(
const
TOOL_EVENT
&
aEvent
)
{
{
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
...
...
pcbnew/tools/placement_tool.h
View file @
902d0e3f
...
@@ -46,22 +46,22 @@ public:
...
@@ -46,22 +46,22 @@ public:
bool
Init
();
bool
Init
();
/// TODO
/// TODO
int
AlignTop
(
TOOL_EVENT
&
aEvent
);
int
AlignTop
(
const
TOOL_EVENT
&
aEvent
);
/// TODO
/// TODO
int
AlignBottom
(
TOOL_EVENT
&
aEvent
);
int
AlignBottom
(
const
TOOL_EVENT
&
aEvent
);
/// TODO
/// TODO
int
AlignLeft
(
TOOL_EVENT
&
aEvent
);
int
AlignLeft
(
const
TOOL_EVENT
&
aEvent
);
/// TODO
/// TODO
int
AlignRight
(
TOOL_EVENT
&
aEvent
);
int
AlignRight
(
const
TOOL_EVENT
&
aEvent
);
/// TODO
/// TODO
int
DistributeHorizontally
(
TOOL_EVENT
&
aEvent
);
int
DistributeHorizontally
(
const
TOOL_EVENT
&
aEvent
);
/// TODO
/// TODO
int
DistributeVertically
(
TOOL_EVENT
&
aEvent
);
int
DistributeVertically
(
const
TOOL_EVENT
&
aEvent
);
private
:
private
:
/// TODO
/// TODO
...
...
pcbnew/tools/point_editor.cpp
View file @
902d0e3f
...
@@ -219,7 +219,7 @@ bool POINT_EDITOR::Init()
...
@@ -219,7 +219,7 @@ bool POINT_EDITOR::Init()
}
}
int
POINT_EDITOR
::
OnSelectionChange
(
TOOL_EVENT
&
aEvent
)
int
POINT_EDITOR
::
OnSelectionChange
(
const
TOOL_EVENT
&
aEvent
)
{
{
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
const
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
...
@@ -797,8 +797,8 @@ void POINT_EDITOR::breakOutline( const VECTOR2I& aBreakPoint )
...
@@ -797,8 +797,8 @@ void POINT_EDITOR::breakOutline( const VECTOR2I& aBreakPoint )
void
POINT_EDITOR
::
setTransitions
()
void
POINT_EDITOR
::
setTransitions
()
{
{
Go
(
&
POINT_EDITOR
::
OnSelectionChange
,
m_selectionTool
->
SelectedEvent
);
Go
(
&
POINT_EDITOR
::
OnSelectionChange
,
SELECTION_TOOL
::
SelectedEvent
);
Go
(
&
POINT_EDITOR
::
OnSelectionChange
,
m_selectionTool
->
UnselectedEvent
);
Go
(
&
POINT_EDITOR
::
OnSelectionChange
,
SELECTION_TOOL
::
UnselectedEvent
);
}
}
...
...
pcbnew/tools/point_editor.h
View file @
902d0e3f
...
@@ -53,7 +53,7 @@ public:
...
@@ -53,7 +53,7 @@ public:
*
*
* Change selection event handler.
* Change selection event handler.
*/
*/
int
OnSelectionChange
(
TOOL_EVENT
&
aEvent
);
int
OnSelectionChange
(
const
TOOL_EVENT
&
aEvent
);
private
:
private
:
///> Selection tool used for obtaining selected items
///> Selection tool used for obtaining selected items
...
...
pcbnew/tools/selection_tool.cpp
View file @
902d0e3f
...
@@ -51,9 +51,6 @@
...
@@ -51,9 +51,6 @@
SELECTION_TOOL
::
SELECTION_TOOL
()
:
SELECTION_TOOL
::
SELECTION_TOOL
()
:
TOOL_INTERACTIVE
(
"pcbnew.InteractiveSelection"
),
TOOL_INTERACTIVE
(
"pcbnew.InteractiveSelection"
),
SelectedEvent
(
TC_MESSAGE
,
TA_ACTION
,
"pcbnew.InteractiveSelection.selected"
),
UnselectedEvent
(
TC_MESSAGE
,
TA_ACTION
,
"pcbnew.InteractiveSelection.unselected"
),
ClearedEvent
(
TC_MESSAGE
,
TA_ACTION
,
"pcbnew.InteractiveSelection.cleared"
),
m_frame
(
NULL
),
m_additive
(
false
),
m_multiple
(
false
),
m_frame
(
NULL
),
m_additive
(
false
),
m_multiple
(
false
),
m_editModules
(
false
),
m_locked
(
true
)
m_editModules
(
false
),
m_locked
(
true
)
{
{
...
@@ -90,7 +87,7 @@ void SELECTION_TOOL::Reset( RESET_REASON aReason )
...
@@ -90,7 +87,7 @@ void SELECTION_TOOL::Reset( RESET_REASON aReason )
}
}
int
SELECTION_TOOL
::
Main
(
TOOL_EVENT
&
aEvent
)
int
SELECTION_TOOL
::
Main
(
const
TOOL_EVENT
&
aEvent
)
{
{
// Main loop: keep receiving events
// Main loop: keep receiving events
while
(
OPT_TOOL_EVENT
evt
=
Wait
()
)
while
(
OPT_TOOL_EVENT
evt
=
Wait
()
)
...
@@ -234,8 +231,7 @@ void SELECTION_TOOL::toggleSelection( BOARD_ITEM* aItem )
...
@@ -234,8 +231,7 @@ void SELECTION_TOOL::toggleSelection( BOARD_ITEM* aItem )
unselect
(
aItem
);
unselect
(
aItem
);
// Inform other potentially interested tools
// Inform other potentially interested tools
TOOL_EVENT
unselectEvent
(
UnselectedEvent
);
m_toolMgr
->
ProcessEvent
(
UnselectedEvent
);
m_toolMgr
->
ProcessEvent
(
unselectEvent
);
}
}
else
else
{
{
...
@@ -248,8 +244,7 @@ void SELECTION_TOOL::toggleSelection( BOARD_ITEM* aItem )
...
@@ -248,8 +244,7 @@ void SELECTION_TOOL::toggleSelection( BOARD_ITEM* aItem )
select
(
aItem
);
select
(
aItem
);
// Inform other potentially interested tools
// Inform other potentially interested tools
TOOL_EVENT
selectEvent
(
SelectedEvent
);
m_toolMgr
->
ProcessEvent
(
SelectedEvent
);
m_toolMgr
->
ProcessEvent
(
selectEvent
);
}
}
}
}
}
}
...
@@ -384,8 +379,7 @@ bool SELECTION_TOOL::selectMultiple()
...
@@ -384,8 +379,7 @@ bool SELECTION_TOOL::selectMultiple()
if
(
!
m_selection
.
Empty
()
)
if
(
!
m_selection
.
Empty
()
)
{
{
// Inform other potentially interested tools
// Inform other potentially interested tools
TOOL_EVENT
selectEvent
(
SelectedEvent
);
m_toolMgr
->
ProcessEvent
(
SelectedEvent
);
m_toolMgr
->
ProcessEvent
(
selectEvent
);
}
}
break
;
// Stop waiting for events
break
;
// Stop waiting for events
...
@@ -456,7 +450,7 @@ bool SELECTION_TOOL::CheckLock()
...
@@ -456,7 +450,7 @@ bool SELECTION_TOOL::CheckLock()
}
}
int
SELECTION_TOOL
::
CursorSelection
(
TOOL_EVENT
&
aEvent
)
int
SELECTION_TOOL
::
CursorSelection
(
const
TOOL_EVENT
&
aEvent
)
{
{
selectCursor
(
getView
()
->
ToWorld
(
getViewControls
()
->
GetMousePosition
()
)
);
selectCursor
(
getView
()
->
ToWorld
(
getViewControls
()
->
GetMousePosition
()
)
);
setTransitions
();
setTransitions
();
...
@@ -465,7 +459,7 @@ int SELECTION_TOOL::CursorSelection( TOOL_EVENT& aEvent )
...
@@ -465,7 +459,7 @@ int SELECTION_TOOL::CursorSelection( TOOL_EVENT& aEvent )
}
}
int
SELECTION_TOOL
::
ClearSelection
(
TOOL_EVENT
&
aEvent
)
int
SELECTION_TOOL
::
ClearSelection
(
const
TOOL_EVENT
&
aEvent
)
{
{
clearSelection
();
clearSelection
();
setTransitions
();
setTransitions
();
...
@@ -473,7 +467,7 @@ int SELECTION_TOOL::ClearSelection( TOOL_EVENT& aEvent )
...
@@ -473,7 +467,7 @@ int SELECTION_TOOL::ClearSelection( TOOL_EVENT& aEvent )
return
0
;
return
0
;
}
}
int
SELECTION_TOOL
::
SelectItem
(
TOOL_EVENT
&
aEvent
)
int
SELECTION_TOOL
::
SelectItem
(
const
TOOL_EVENT
&
aEvent
)
{
{
// Check if there is an item to be selected
// Check if there is an item to be selected
BOARD_ITEM
*
item
=
static_cast
<
BOARD_ITEM
*>
(
aEvent
.
Parameter
()
);
BOARD_ITEM
*
item
=
static_cast
<
BOARD_ITEM
*>
(
aEvent
.
Parameter
()
);
...
@@ -483,8 +477,7 @@ int SELECTION_TOOL::SelectItem( TOOL_EVENT& aEvent )
...
@@ -483,8 +477,7 @@ int SELECTION_TOOL::SelectItem( TOOL_EVENT& aEvent )
select
(
item
);
select
(
item
);
// Inform other potentially interested tools
// Inform other potentially interested tools
TOOL_EVENT
select
(
SelectedEvent
);
m_toolMgr
->
ProcessEvent
(
SelectedEvent
);
m_toolMgr
->
ProcessEvent
(
select
);
}
}
setTransitions
();
setTransitions
();
...
@@ -492,7 +485,7 @@ int SELECTION_TOOL::SelectItem( TOOL_EVENT& aEvent )
...
@@ -492,7 +485,7 @@ int SELECTION_TOOL::SelectItem( TOOL_EVENT& aEvent )
return
0
;
return
0
;
}
}
int
SELECTION_TOOL
::
UnselectItem
(
TOOL_EVENT
&
aEvent
)
int
SELECTION_TOOL
::
UnselectItem
(
const
TOOL_EVENT
&
aEvent
)
{
{
// Check if there is an item to be selected
// Check if there is an item to be selected
BOARD_ITEM
*
item
=
static_cast
<
BOARD_ITEM
*>
(
aEvent
.
Parameter
()
);
BOARD_ITEM
*
item
=
static_cast
<
BOARD_ITEM
*>
(
aEvent
.
Parameter
()
);
...
@@ -502,8 +495,7 @@ int SELECTION_TOOL::UnselectItem( TOOL_EVENT& aEvent )
...
@@ -502,8 +495,7 @@ int SELECTION_TOOL::UnselectItem( TOOL_EVENT& aEvent )
unselect
(
item
);
unselect
(
item
);
// Inform other potentially interested tools
// Inform other potentially interested tools
TOOL_EVENT
unselect
(
UnselectedEvent
);
m_toolMgr
->
ProcessEvent
(
UnselectedEvent
);
m_toolMgr
->
ProcessEvent
(
unselect
);
}
}
setTransitions
();
setTransitions
();
...
@@ -521,15 +513,14 @@ void SELECTION_TOOL::findCallback( BOARD_ITEM* aItem )
...
@@ -521,15 +513,14 @@ void SELECTION_TOOL::findCallback( BOARD_ITEM* aItem )
select
(
aItem
);
select
(
aItem
);
// Inform other potentially interested tools
// Inform other potentially interested tools
TOOL_EVENT
selectEvent
(
SelectedEvent
);
m_toolMgr
->
ProcessEvent
(
SelectedEvent
);
m_toolMgr
->
ProcessEvent
(
selectEvent
);
}
}
m_frame
->
GetGalCanvas
()
->
ForceRefresh
();
m_frame
->
GetGalCanvas
()
->
ForceRefresh
();
}
}
int
SELECTION_TOOL
::
find
(
TOOL_EVENT
&
aEvent
)
int
SELECTION_TOOL
::
find
(
const
TOOL_EVENT
&
aEvent
)
{
{
DIALOG_FIND
dlg
(
m_frame
);
DIALOG_FIND
dlg
(
m_frame
);
dlg
.
EnableWarp
(
false
);
dlg
.
EnableWarp
(
false
);
...
@@ -541,7 +532,7 @@ int SELECTION_TOOL::find( TOOL_EVENT& aEvent )
...
@@ -541,7 +532,7 @@ int SELECTION_TOOL::find( TOOL_EVENT& aEvent )
}
}
int
SELECTION_TOOL
::
findMove
(
TOOL_EVENT
&
aEvent
)
int
SELECTION_TOOL
::
findMove
(
const
TOOL_EVENT
&
aEvent
)
{
{
MODULE
*
module
=
m_frame
->
GetModuleByName
();
MODULE
*
module
=
m_frame
->
GetModuleByName
();
...
@@ -579,8 +570,7 @@ void SELECTION_TOOL::clearSelection()
...
@@ -579,8 +570,7 @@ void SELECTION_TOOL::clearSelection()
m_locked
=
true
;
m_locked
=
true
;
// Inform other potentially interested tools
// Inform other potentially interested tools
TOOL_EVENT
clearEvent
(
ClearedEvent
);
m_toolMgr
->
ProcessEvent
(
ClearedEvent
);
m_toolMgr
->
ProcessEvent
(
clearEvent
);
}
}
...
@@ -811,8 +801,7 @@ void SELECTION_TOOL::unselect( BOARD_ITEM* aItem )
...
@@ -811,8 +801,7 @@ void SELECTION_TOOL::unselect( BOARD_ITEM* aItem )
}
}
// Inform other potentially interested tools
// Inform other potentially interested tools
TOOL_EVENT
unselected
(
UnselectedEvent
);
m_toolMgr
->
ProcessEvent
(
UnselectedEvent
);
m_toolMgr
->
ProcessEvent
(
unselected
);
}
}
...
@@ -939,3 +928,8 @@ void SELECTION::clear()
...
@@ -939,3 +928,8 @@ void SELECTION::clear()
items
.
ClearItemsList
();
items
.
ClearItemsList
();
group
->
Clear
();
group
->
Clear
();
}
}
const
TOOL_EVENT
SELECTION_TOOL
::
SelectedEvent
(
TC_MESSAGE
,
TA_ACTION
,
"pcbnew.InteractiveSelection.selected"
);
const
TOOL_EVENT
SELECTION_TOOL
::
UnselectedEvent
(
TC_MESSAGE
,
TA_ACTION
,
"pcbnew.InteractiveSelection.unselected"
);
const
TOOL_EVENT
SELECTION_TOOL
::
ClearedEvent
(
TC_MESSAGE
,
TA_ACTION
,
"pcbnew.InteractiveSelection.cleared"
);
pcbnew/tools/selection_tool.h
View file @
902d0e3f
...
@@ -103,7 +103,7 @@ public:
...
@@ -103,7 +103,7 @@ public:
*
*
* The main loop.
* The main loop.
*/
*/
int
Main
(
TOOL_EVENT
&
aEvent
);
int
Main
(
const
TOOL_EVENT
&
aEvent
);
/**
/**
* Function GetSelection()
* Function GetSelection()
...
@@ -152,25 +152,25 @@ public:
...
@@ -152,25 +152,25 @@ public:
bool
CheckLock
();
bool
CheckLock
();
///> Select a single item under cursor event handler.
///> Select a single item under cursor event handler.
int
CursorSelection
(
TOOL_EVENT
&
aEvent
);
int
CursorSelection
(
const
TOOL_EVENT
&
aEvent
);
///> Clear current selection event handler.
///> Clear current selection event handler.
int
ClearSelection
(
TOOL_EVENT
&
aEvent
);
int
ClearSelection
(
const
TOOL_EVENT
&
aEvent
);
///> Item selection event handler.
///> Item selection event handler.
int
SelectItem
(
TOOL_EVENT
&
aEvent
);
int
SelectItem
(
const
TOOL_EVENT
&
aEvent
);
///> Item unselection event handler.
///> Item unselection event handler.
int
UnselectItem
(
TOOL_EVENT
&
aEvent
);
int
UnselectItem
(
const
TOOL_EVENT
&
aEvent
);
///> Event sent after an item is selected.
///> Event sent after an item is selected.
const
TOOL_EVENT
SelectedEvent
;
static
const
TOOL_EVENT
SelectedEvent
;
///> Event sent after an item is unselected.
///> Event sent after an item is unselected.
const
TOOL_EVENT
UnselectedEvent
;
static
const
TOOL_EVENT
UnselectedEvent
;
///> Event sent after selection is cleared.
///> Event sent after selection is cleared.
const
TOOL_EVENT
ClearedEvent
;
static
const
TOOL_EVENT
ClearedEvent
;
private
:
private
:
/**
/**
...
@@ -197,10 +197,10 @@ private:
...
@@ -197,10 +197,10 @@ private:
void
findCallback
(
BOARD_ITEM
*
aItem
);
void
findCallback
(
BOARD_ITEM
*
aItem
);
///> Find an item.
///> Find an item.
int
find
(
TOOL_EVENT
&
aEvent
);
int
find
(
const
TOOL_EVENT
&
aEvent
);
///> Find an item and start moving.
///> Find an item and start moving.
int
findMove
(
TOOL_EVENT
&
aEvent
);
int
findMove
(
const
TOOL_EVENT
&
aEvent
);
///> Sets up handlers for various events.
///> Sets up handlers for various events.
void
setTransitions
();
void
setTransitions
();
...
...
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