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
bc71a2c0
Commit
bc71a2c0
authored
Jan 07, 2014
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed TOOL_STATE.idle field, as it was redundant.
parent
7784365b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
294 deletions
+9
-294
tool_manager.cpp
common/tool/tool_manager.cpp
+9
-14
move_tool.cpp
pcbnew/tools/move_tool.cpp
+0
-204
move_tool.h
pcbnew/tools/move_tool.h
+0
-76
No files found.
common/tool/tool_manager.cpp
View file @
bc71a2c0
...
...
@@ -127,7 +127,6 @@ void TOOL_MANAGER::RegisterTool( TOOL_BASE* aTool )
TOOL_STATE
*
st
=
new
TOOL_STATE
;
st
->
theTool
=
aTool
;
st
->
idle
=
true
;
st
->
pendingWait
=
false
;
st
->
pendingContextMenu
=
false
;
st
->
cofunc
=
NULL
;
...
...
@@ -240,14 +239,10 @@ bool TOOL_MANAGER::runTool( TOOL_BASE* aTool )
return
false
;
}
TOOL_STATE
*
state
=
m_toolState
[
aTool
];
// If the tool is already active, do not invoke it again
if
(
state
->
idle
==
false
)
if
(
isActive
(
aTool
)
)
return
false
;
state
->
idle
=
false
;
aTool
->
Reset
(
TOOL_INTERACTIVE
::
RUN
);
// Add the tool on the front of the processing queue (it gets events first)
...
...
@@ -417,19 +412,18 @@ bool TOOL_MANAGER::dispatchActivation( TOOL_EVENT& aEvent )
void
TOOL_MANAGER
::
finishTool
(
TOOL_STATE
*
aState
)
{
// Find the tool to be deactivated
std
::
deque
<
TOOL_ID
>::
iterator
it
,
it_end
;
std
::
deque
<
TOOL_ID
>::
iterator
it
,
itEnd
;
for
(
it
=
m_activeTools
.
begin
(),
it_end
=
m_activeTools
.
end
();
it
!=
it_end
;
++
it
)
// Find the tool and deactivate it
for
(
it
=
m_activeTools
.
begin
(),
itEnd
=
m_activeTools
.
end
();
it
!=
itEnd
;
++
it
)
{
if
(
aState
==
m_toolIdIndex
[
*
it
]
)
{
m_activeTools
.
erase
(
it
);
break
;
}
}
if
(
it
!=
m_activeTools
.
end
()
)
m_activeTools
.
erase
(
it
);
aState
->
idle
=
true
;
delete
aState
->
cofunc
;
aState
->
cofunc
=
NULL
;
}
...
...
@@ -525,5 +519,6 @@ bool TOOL_MANAGER::isActive( TOOL_BASE* aTool )
if
(
!
isRegistered
(
aTool
)
)
return
false
;
return
!
m_toolState
[
aTool
]
->
idle
;
// Just check if the tool is on the active tools stack
return
std
::
find
(
m_activeTools
.
begin
(),
m_activeTools
.
end
(),
aTool
->
GetId
()
)
!=
m_activeTools
.
end
();
}
pcbnew/tools/move_tool.cpp
deleted
100644 → 0
View file @
7784365b
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2013 CERN
* @author Maciej Suminski <maciej.suminski@cern.ch>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <class_board.h>
#include <class_module.h>
#include <tool/tool_manager.h>
#include <view/view_controls.h>
#include <ratsnest_data.h>
#include <confirm.h>
#include <boost/foreach.hpp>
#include "common_actions.h"
#include "selection_tool.h"
#include "move_tool.h"
using
namespace
KIGFX
;
using
boost
::
optional
;
MOVE_TOOL
::
MOVE_TOOL
()
:
TOOL_INTERACTIVE
(
"pcbnew.InteractiveMove"
),
m_selectionTool
(
NULL
)
{
}
void
MOVE_TOOL
::
Reset
()
{
// The tool launches upon reception of action event ("pcbnew.InteractiveMove")
Go
(
&
MOVE_TOOL
::
Main
,
COMMON_ACTIONS
::
moveActivate
.
MakeEvent
()
);
}
bool
MOVE_TOOL
::
Init
()
{
// Find the selection tool, so they can cooperate
TOOL_BASE
*
selectionTool
=
m_toolMgr
->
FindTool
(
"pcbnew.InteractiveSelection"
);
if
(
selectionTool
)
{
m_selectionTool
=
static_cast
<
SELECTION_TOOL
*>
(
selectionTool
);
// Add context menu entries that are displayed when selection tool is active
m_selectionTool
->
AddMenuItem
(
COMMON_ACTIONS
::
moveActivate
);
m_selectionTool
->
AddMenuItem
(
COMMON_ACTIONS
::
rotate
);
m_selectionTool
->
AddMenuItem
(
COMMON_ACTIONS
::
flip
);
}
else
{
DisplayError
(
NULL
,
wxT
(
"pcbnew.InteractiveSelection tool is not available"
)
);
return
false
;
}
return
true
;
}
int
MOVE_TOOL
::
Main
(
TOOL_EVENT
&
aEvent
)
{
const
SELECTION_TOOL
::
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
if
(
selection
.
Empty
()
)
return
0
;
// there are no items to operate on
VECTOR2D
dragPosition
;
bool
dragging
=
false
;
bool
restore
=
false
;
// Should items' state be restored when finishing the tool?
VIEW_CONTROLS
*
controls
=
getViewControls
();
controls
->
ShowCursor
(
true
);
controls
->
SetSnapping
(
true
);
controls
->
SetAutoPan
(
true
);
// Main loop: keep receiving events
while
(
OPT_TOOL_EVENT
evt
=
Wait
()
)
{
if
(
evt
->
IsCancel
()
)
{
restore
=
true
;
// Cancelling the tool means that items have to be restored
break
;
// Finish
}
// Dispatch TOOL_ACTIONs
else
if
(
evt
->
Category
()
==
TC_COMMAND
)
{
VECTOR2D
cursorPos
=
getView
()
->
ToWorld
(
getViewControls
()
->
GetCursorPosition
()
);
if
(
evt
->
IsAction
(
&
COMMON_ACTIONS
::
rotate
)
)
// got rotation event?
{
m_state
.
Rotate
(
cursorPos
,
900.0
);
selection
.
group
->
ViewUpdate
(
VIEW_ITEM
::
GEOMETRY
);
updateRatsnest
(
true
);
}
else
if
(
evt
->
IsAction
(
&
COMMON_ACTIONS
::
flip
)
)
// got flip event?
{
m_state
.
Flip
(
cursorPos
);
selection
.
group
->
ViewUpdate
(
VIEW_ITEM
::
GEOMETRY
);
updateRatsnest
(
true
);
}
}
else
if
(
evt
->
IsMotion
()
||
evt
->
IsDrag
(
BUT_LEFT
)
)
{
if
(
dragging
)
{
// Drag items to the current cursor position
VECTOR2D
movement
=
(
evt
->
Position
()
-
dragPosition
);
m_state
.
Move
(
movement
);
updateRatsnest
(
true
);
}
else
{
// Prepare to drag
std
::
set
<
BOARD_ITEM
*>::
iterator
it
;
for
(
it
=
selection
.
items
.
begin
();
it
!=
selection
.
items
.
end
();
++
it
)
{
// Save the state of the selected items, in case it has to be restored
m_state
.
Save
(
*
it
);
}
dragging
=
true
;
}
selection
.
group
->
ViewUpdate
(
VIEW_ITEM
::
GEOMETRY
);
dragPosition
=
evt
->
Position
();
}
else
if
(
evt
->
IsMouseUp
(
BUT_LEFT
)
||
evt
->
IsClick
(
BUT_LEFT
)
)
break
;
// Finish
}
if
(
restore
)
{
// Modifications has to be rollbacked, so restore the previous state of items
selection
.
group
->
ItemsViewUpdate
(
VIEW_ITEM
::
APPEARANCE
);
m_state
.
RestoreAll
();
updateRatsnest
(
false
);
}
else
{
// Changes are applied, so update the items
selection
.
group
->
ItemsViewUpdate
(
m_state
.
GetUpdateFlag
()
);
m_state
.
Apply
();
}
RN_DATA
*
ratsnest
=
static_cast
<
BOARD
*>
(
m_toolMgr
->
GetModel
()
)
->
GetRatsnest
();
ratsnest
->
Recalculate
();
controls
->
ShowCursor
(
false
);
controls
->
SetSnapping
(
false
);
controls
->
SetAutoPan
(
false
);
return
0
;
}
void
MOVE_TOOL
::
updateRatsnest
(
bool
aRedraw
)
{
const
SELECTION_TOOL
::
SELECTION
&
selection
=
m_selectionTool
->
GetSelection
();
RN_DATA
*
ratsnest
=
static_cast
<
BOARD
*>
(
m_toolMgr
->
GetModel
()
)
->
GetRatsnest
();
ratsnest
->
ClearSimple
();
BOOST_FOREACH
(
BOARD_ITEM
*
item
,
selection
.
items
)
{
if
(
item
->
Type
()
==
PCB_PAD_T
||
item
->
Type
()
==
PCB_TRACE_T
||
item
->
Type
()
==
PCB_VIA_T
||
item
->
Type
()
==
PCB_ZONE_AREA_T
)
{
ratsnest
->
Update
(
static_cast
<
BOARD_CONNECTED_ITEM
*>
(
item
)
);
if
(
aRedraw
)
ratsnest
->
AddSimple
(
static_cast
<
BOARD_CONNECTED_ITEM
*>
(
item
)
);
}
else
if
(
item
->
Type
()
==
PCB_MODULE_T
)
{
ratsnest
->
Update
(
static_cast
<
MODULE
*>
(
item
)
);
if
(
aRedraw
)
ratsnest
->
AddSimple
(
static_cast
<
MODULE
*>
(
item
)
);
}
}
}
pcbnew/tools/move_tool.h
deleted
100644 → 0
View file @
7784365b
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2013 CERN
* @author Maciej Suminski <maciej.suminski@cern.ch>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __MOVE_TOOL_H
#define __MOVE_TOOL_H
#include <math/vector2d.h>
#include <tool/tool_interactive.h>
#include <view/view_group.h>
#include "item_state.h"
class
BOARD_ITEM
;
class
SELECTION_TOOL
;
namespace
KIGFX
{
class
VIEW_GROUP
;
}
/**
* Class MOVE_TOOL
*
* Our sample move tool. Allows to move, rotate and flip items selected by
* pcbnew.InteractiveSelection tool.
*/
class
MOVE_TOOL
:
public
TOOL_INTERACTIVE
{
public
:
MOVE_TOOL
();
/// @copydoc TOOL_INTERACTIVE::Reset()
void
Reset
();
/// @copydoc TOOL_INTERACTIVE::Init()
bool
Init
();
/**
* Function Main()
*
* Main loop in which events are handled.
*/
int
Main
(
TOOL_EVENT
&
aEvent
);
private
:
void
updateRatsnest
(
bool
aRedraw
);
/// Saves the state of items and allows to restore them
ITEM_STATE
m_state
;
/// Selection tool used for obtaining selected items
SELECTION_TOOL
*
m_selectionTool
;
};
#endif
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