Commit f0ff744e authored by Maciej Suminski's avatar Maciej Suminski

Initial version of the Placement Tool.

parent e3c4f425
...@@ -265,6 +265,7 @@ set( PCBNEW_CLASS_SRCS ...@@ -265,6 +265,7 @@ set( PCBNEW_CLASS_SRCS
tools/pcbnew_control.cpp tools/pcbnew_control.cpp
tools/pcb_editor_control.cpp tools/pcb_editor_control.cpp
tools/pcb_tools.cpp tools/pcb_tools.cpp
tools/placement_tool.cpp
tools/common_actions.cpp tools/common_actions.cpp
) )
......
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
#include "tools/drawing_tool.h" #include "tools/drawing_tool.h"
#include "tools/point_editor.h" #include "tools/point_editor.h"
#include "tools/pcbnew_control.h" #include "tools/pcbnew_control.h"
#include "tools/placement_tool.h"
#include "tools/common_actions.h" #include "tools/common_actions.h"
...@@ -278,6 +279,7 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) : ...@@ -278,6 +279,7 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_toolManager->RegisterTool( new DRAWING_TOOL ); m_toolManager->RegisterTool( new DRAWING_TOOL );
m_toolManager->RegisterTool( new POINT_EDITOR ); m_toolManager->RegisterTool( new POINT_EDITOR );
m_toolManager->RegisterTool( new PCBNEW_CONTROL ); m_toolManager->RegisterTool( new PCBNEW_CONTROL );
m_toolManager->RegisterTool( new PLACEMENT_TOOL );
m_toolManager->GetTool<SELECTION_TOOL>()->EditModules( true ); m_toolManager->GetTool<SELECTION_TOOL>()->EditModules( true );
m_toolManager->GetTool<EDIT_TOOL>()->EditModules( true ); m_toolManager->GetTool<EDIT_TOOL>()->EditModules( true );
......
...@@ -285,6 +285,38 @@ TOOL_ACTION COMMON_ACTIONS::pointEditorUpdate( "pcbnew.PointEditor.update", ...@@ -285,6 +285,38 @@ TOOL_ACTION COMMON_ACTIONS::pointEditorUpdate( "pcbnew.PointEditor.update",
AS_GLOBAL, 0, "", "" ); // No description, it is not supposed to be shown anywhere AS_GLOBAL, 0, "", "" ); // No description, it is not supposed to be shown anywhere
// Placement tool
TOOL_ACTION COMMON_ACTIONS::alignTop( "pcbnew.Place.alignTop",
AS_GLOBAL, 0,
"Align items to the top",
"Aligns selected items to the top edge" );
TOOL_ACTION COMMON_ACTIONS::alignBottom( "pcbnew.Place.alignBottom",
AS_GLOBAL, 0,
"Align items to the bottom",
"Aligns selected items to the bottom edge" );
TOOL_ACTION COMMON_ACTIONS::alignLeft( "pcbnew.Place.alignLeft",
AS_GLOBAL, 0,
"Align items to the left",
"Aligns selected items to the top left" );
TOOL_ACTION COMMON_ACTIONS::alignRight( "pcbnew.Place.alignRight",
AS_GLOBAL, 0,
"Align items to the right",
"Aligns selected items to the right edge" );
TOOL_ACTION COMMON_ACTIONS::distributeHorizontally( "pcbnew.Place.distributeHorizontally",
AS_GLOBAL, 0,
"Distribute horizontally",
"Distributes selected items along the horizontal axis" );
TOOL_ACTION COMMON_ACTIONS::distributeVertically( "pcbnew.Place.distributeVertically",
AS_GLOBAL, 0,
"Distribure vertically",
"Distributes selected items along the vertical axis" );
boost::optional<TOOL_EVENT> COMMON_ACTIONS::TranslateLegacyId( int aId ) boost::optional<TOOL_EVENT> COMMON_ACTIONS::TranslateLegacyId( int aId )
{ {
switch( aId ) switch( aId )
......
...@@ -110,6 +110,25 @@ public: ...@@ -110,6 +110,25 @@ public:
/// Update edit points /// Update edit points
static TOOL_ACTION pointEditorUpdate; static TOOL_ACTION pointEditorUpdate;
// Placement tool
/// Align items to the top edge of selection bounding box
static TOOL_ACTION alignTop;
/// Align items to the bottom edge of selection bounding box
static TOOL_ACTION alignBottom;
/// Align items to the left edge of selection bounding box
static TOOL_ACTION alignLeft;
/// Align items to the right edge of selection bounding box
static TOOL_ACTION alignRight;
/// Distributes items evenly along the horizontal axis
static TOOL_ACTION distributeHorizontally;
/// Distributes items evenly along the vertical axis
static TOOL_ACTION distributeVertically;
// View controls // View controls
static TOOL_ACTION zoomIn; static TOOL_ACTION zoomIn;
static TOOL_ACTION zoomOut; static TOOL_ACTION zoomOut;
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include "point_editor.h" #include "point_editor.h"
#include "pcbnew_control.h" #include "pcbnew_control.h"
#include "pcb_editor_control.h" #include "pcb_editor_control.h"
#include "placement_tool.h"
#include "common_actions.h" #include "common_actions.h"
#include <router/router_tool.h> #include <router/router_tool.h>
...@@ -55,6 +56,7 @@ void PCB_EDIT_FRAME::setupTools() ...@@ -55,6 +56,7 @@ void PCB_EDIT_FRAME::setupTools()
m_toolManager->RegisterTool( new POINT_EDITOR ); m_toolManager->RegisterTool( new POINT_EDITOR );
m_toolManager->RegisterTool( new PCBNEW_CONTROL ); m_toolManager->RegisterTool( new PCBNEW_CONTROL );
m_toolManager->RegisterTool( new PCB_EDITOR_CONTROL ); m_toolManager->RegisterTool( new PCB_EDITOR_CONTROL );
m_toolManager->RegisterTool( new PLACEMENT_TOOL );
m_toolManager->ResetTools( TOOL_BASE::RUN ); m_toolManager->ResetTools( TOOL_BASE::RUN );
// Run the selection tool, it is supposed to be always active // Run the selection tool, it is supposed to be always active
......
This diff is collapsed.
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2014 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 PLACEMENT_TOOL_H_
#define PLACEMENT_TOOL_H_
#include <tool/tool_interactive.h>
class SELECTION_TOOL;
/**
* TODO description
*/
class PLACEMENT_TOOL : public TOOL_INTERACTIVE
{
public:
PLACEMENT_TOOL();
virtual ~PLACEMENT_TOOL();
/// @copydoc TOOL_INTERACTIVE::Reset()
void Reset( RESET_REASON aReason ) {};
/// @copydoc TOOL_INTERACTIVE::Init()
bool Init();
/// TODO
int AlignTop( TOOL_EVENT& aEvent );
/// TODO
int AlignBottom( TOOL_EVENT& aEvent );
/// TODO
int AlignLeft( TOOL_EVENT& aEvent );
/// TODO
int AlignRight( TOOL_EVENT& aEvent );
/// TODO
int DistributeHorizontally( TOOL_EVENT& aEvent );
/// TODO
int DistributeVertically( TOOL_EVENT& aEvent );
private:
/// TODO
void setTransitions();
SELECTION_TOOL* m_selectionTool;
};
#endif /* PLACEMENT_TOOL_H_ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment