Renamed MOVE_TOOL to EDIT_TOOL. (07a5774a) · Commits · Elphel / kicad-source-mirror

pcbnew/CMakeLists.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -241,7 +241,7 @@ set( PCBNEW_CLASS_SRCS
	tools/selection_tool.cpp		tools/selection_tool.cpp
	tools/selection_area.cpp		tools/selection_area.cpp
	tools/bright_box.cpp		tools/bright_box.cpp
	tools/move_tool.cpp		tools/edit_tool.cpp
	tools/pcb_tools.cpp		tools/pcb_tools.cpp
	tools/common_actions.cpp		tools/common_actions.cpp
	)		)

pcbnew/tools/common_actions.cpp

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -30,19 +30,19 @@ TOOL_ACTION COMMON_ACTIONS::selectionActivate( "pcbnew.InteractiveSelection",
	AS_GLOBAL, 'S',		AS_GLOBAL, 'S',
	"Selection tool", "Allows to select items" );		"Selection tool", "Allows to select items" );

	// Move tool actions		// Edit tool actions
	TOOL_ACTION COMMON_ACTIONS::moveActivate( "pcbnew.InteractiveMove",		TOOL_ACTION COMMON_ACTIONS::editActivate( "pcbnew.InteractiveEdit",
	AS_GLOBAL, 'M',		AS_GLOBAL, 'M',
	"Move", "Moves the selected item(s)" );		"Move", "Moves the selected item(s)" );

	TOOL_ACTION COMMON_ACTIONS::rotate( "pcbnew.InteractiveMove.rotate",		TOOL_ACTION COMMON_ACTIONS::rotate( "pcbnew.InteractiveEdit.rotate",
	AS_CONTEXT, 'R',		AS_CONTEXT, 'R',
	"Rotate", "Rotates selected item(s)" );		"Rotate", "Rotates selected item(s)" );

	TOOL_ACTION COMMON_ACTIONS::flip( "pcbnew.InteractiveMove.flip",		TOOL_ACTION COMMON_ACTIONS::flip( "pcbnew.InteractiveEdit.flip",
	AS_CONTEXT, 'F',		AS_CONTEXT, 'F',
	"Flip", "Flips selected item(s)" );		"Flip", "Flips selected item(s)" );

	TOOL_ACTION COMMON_ACTIONS::properties( "pcbnew.InteractiveMove.properties",		TOOL_ACTION COMMON_ACTIONS::properties( "pcbnew.InteractiveEdit.properties",
	AS_GLOBAL, 'E',		AS_GLOBAL, 'E',
	"Properties...", "Displays properties window" );		"Properties...", "Displays properties window" );

pcbnew/tools/common_actions.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,7 @@ class COMMON_ACTIONS
	{		{
	public:		public:
	/// Activation of the move tool		/// Activation of the move tool
	static TOOL_ACTION moveActivate;		static TOOL_ACTION editActivate;

	/// Activation of the selection tool		/// Activation of the selection tool
	static TOOL_ACTION selectionActivate;		static TOOL_ACTION selectionActivate;

pcbnew/tools/move_tool.cpp

deleted100644 → 0

+0 −239

Original line number	Original line	Diff line number	Diff line
	/*
	* 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 <wxPcbStruct.h>
	#include <tool/tool_manager.h>
	#include <view/view_controls.h>
	#include <confirm.h>

	#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 )
	{
	}


	bool MOVE_TOOL::Init()
	{
	// Find the selection tool, so they can cooperate
	TOOL_BASE* selectionTool = m_toolMgr->FindTool( "pcbnew.InteractiveSelection" );

	m_selectionTool = static_cast<SELECTION_TOOL*>( selectionTool );
	if( !selectionTool )
	{
	DisplayError( NULL, wxT( "pcbnew.InteractiveSelection tool is not available" ) );
	return false;
	}

	// 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 );
	m_selectionTool->AddMenuItem( COMMON_ACTIONS::properties );

	setTransitions();

	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;
	m_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 )
	{
	if( evt->IsAction( &COMMON_ACTIONS::rotate ) )
	Rotate( aEvent );
	else if( evt->IsAction( &COMMON_ACTIONS::flip ) )
	Flip( aEvent );
	}

	else if( evt->IsMotion() \|\| evt->IsDrag( BUT_LEFT ) )
	{
	if( m_dragging )
	{
	// Drag items to the current cursor position
	VECTOR2D movement = ( evt->Position() - dragPosition );
	m_state.Move( movement );
	}
	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 );
	}

	m_dragging = true;
	}

	selection.group->ViewUpdate( VIEW_ITEM::GEOMETRY );
	dragPosition = evt->Position();
	}

	else if( evt->IsMouseUp( BUT_LEFT ) \|\| evt->IsClick( BUT_LEFT ) )
	break; // Finish
	}

	m_dragging = false;

	if( restore )
	{
	// Modifications has to be rollbacked, so restore the previous state of items
	selection.group->ItemsViewUpdate( VIEW_ITEM::APPEARANCE );
	m_state.RestoreAll();
	}
	else
	{
	// Changes are applied, so update the items
	selection.group->ItemsViewUpdate( m_state.GetUpdateFlag() );
	m_state.Apply();
	}

	controls->ShowCursor( false );
	controls->SetSnapping( false );
	controls->SetAutoPan( false );

	setTransitions();

	return 0;
	}


	int MOVE_TOOL::Properties( TOOL_EVENT& aEvent )
	{
	const SELECTION_TOOL::SELECTION& selection = m_selectionTool->GetSelection();

	// Properties are displayed when there is only one item selected
	if( selection.items.size() == 1 )
	{
	// Display properties dialog
	PCB_EDIT_FRAME* editFrame = static_cast<PCB_EDIT_FRAME*>( m_toolMgr->GetEditFrame() );
	BOARD_ITEM* item = *selection.items.begin();
	editFrame->OnEditItemRequest( NULL, item );

	item->ViewUpdate( KIGFX::VIEW_ITEM::GEOMETRY );
	}

	setTransitions();

	return 0;
	}


	int MOVE_TOOL::Rotate( TOOL_EVENT& aEvent )
	{
	const SELECTION_TOOL::SELECTION& selection = m_selectionTool->GetSelection();
	VECTOR2D cursorPos = getView()->ToWorld( getViewControls()->GetCursorPosition() );

	if( m_dragging )
	{
	m_state.Rotate( cursorPos, 900.0 );
	selection.group->ViewUpdate( VIEW_ITEM::GEOMETRY );
	}
	else
	{
	std::set<BOARD_ITEM*>::iterator it;

	for( it = selection.items.begin(); it != selection.items.end(); ++it )
	{
	(*it)->Rotate( wxPoint( cursorPos.x, cursorPos.y ), 900.0 );
	(*it)->ViewUpdate( KIGFX::VIEW_ITEM::GEOMETRY );
	}

	setTransitions();
	}

	return 0;
	}


	int MOVE_TOOL::Flip( TOOL_EVENT& aEvent )
	{
	const SELECTION_TOOL::SELECTION& selection = m_selectionTool->GetSelection();
	VECTOR2D cursorPos = getView()->ToWorld( getViewControls()->GetCursorPosition() );

	if( m_dragging )
	{
	m_state.Flip( cursorPos );
	selection.group->ViewUpdate( VIEW_ITEM::GEOMETRY );
	}
	else
	{
	std::set<BOARD_ITEM*>::iterator it;

	for( it = selection.items.begin(); it != selection.items.end(); ++it )
	{
	(*it)->Flip( wxPoint( cursorPos.x, cursorPos.y ) );
	(*it)->ViewUpdate( KIGFX::VIEW_ITEM::LAYERS );
	}

	setTransitions();
	}

	return 0;
	}


	void MOVE_TOOL::setTransitions()
	{
	Go( &MOVE_TOOL::Main, COMMON_ACTIONS::moveActivate.MakeEvent() );
	Go( &MOVE_TOOL::Rotate, COMMON_ACTIONS::rotate.MakeEvent() );
	Go( &MOVE_TOOL::Flip, COMMON_ACTIONS::flip.MakeEvent() );
	Go( &MOVE_TOOL::Properties, COMMON_ACTIONS::properties.MakeEvent() );
	}

pcbnew/tools/move_tool.h

deleted100644 → 0

+0 −102

Original line number	Original line	Diff line number	Diff line
	/*
	* 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.
	* @param aEvent is the handled event.
	*/
	int Main( TOOL_EVENT& aEvent );

	/**
	* Function Edit()
	*
	* Displays properties window for the selected object.
	*/
	int Properties( TOOL_EVENT& aEvent );

	/**
	* Function Rotate()
	*
	* Rotates currently selected items.
	*/
	int Rotate( TOOL_EVENT& aEvent );

	/**
	* Function Flip()
	*
	* Rotates currently selected items. The rotation point is the current cursor position.
	*/
	int Flip( TOOL_EVENT& aEvent );

	private:
	///> 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;

	///> Flag determining if anything is being dragged right now
	bool m_dragging;

	///> Sets up handlers for various events
	void setTransitions();
	};

	#endif

Admin message