haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VIEW_CONTROLS::GetMousePosition() returns the mouse position in world coordinates.

This commit is contained in:
Maciej Suminski 2017-06-12 15:27:10 +02:00
parent ad48cd435d
commit dcc803ecb1
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/tool/tool_dispatcher.cpp
View File

@ -264,8 +264,7 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
wxMouseEvent* me = static_cast<wxMouseEvent*>( &aEvent ); wxMouseEvent* me = static_cast<wxMouseEvent*>( &aEvent );
int mods = decodeModifiers( me ); int mods = decodeModifiers( me );
VECTOR2D screenPos = m_toolMgr->GetViewControls()->GetMousePosition(); VECTOR2D pos = m_toolMgr->GetViewControls()->GetMousePosition();
VECTOR2D pos = getView()->ToWorld( screenPos );
if( pos != m_lastMousePos ) if( pos != m_lastMousePos )
{ {

11
common/view/wx_view_controls.cpp
View File

@ -352,12 +352,13 @@ void WX_VIEW_CONTROLS::SetGrabMouse( bool aEnabled )
} }
VECTOR2I WX_VIEW_CONTROLS::GetMousePosition() const VECTOR2D WX_VIEW_CONTROLS::GetMousePosition( bool aWorldCoordinates ) const
{ {
wxPoint msp = wxGetMousePosition(); wxPoint msp = wxGetMousePosition();
wxPoint winp = m_parentPanel->GetScreenPosition(); wxPoint winp = m_parentPanel->GetScreenPosition();
VECTOR2D screenPos( msp.x - winp.x, msp.y - winp.y );
return VECTOR2I( msp.x - winp.x, msp.y - winp.y ); return aWorldCoordinates ? m_view->ToWorld( screenPos ) : screenPos;
} }
@ -372,9 +373,9 @@ VECTOR2D WX_VIEW_CONTROLS::GetCursorPosition() const
VECTOR2D mousePosition = GetMousePosition(); VECTOR2D mousePosition = GetMousePosition();
if( m_settings.m_snappingEnabled ) if( m_settings.m_snappingEnabled )
return m_view->GetGAL()->GetGridPoint( m_view->ToWorld( mousePosition ) ); return m_view->GetGAL()->GetGridPoint( mousePosition );
else else
return m_view->ToWorld( mousePosition ); return mousePosition;
} }
} }
@ -413,7 +414,7 @@ void WX_VIEW_CONTROLS::CenterOnCursor() const
const VECTOR2I& screenSize = m_view->GetGAL()->GetScreenPixelSize(); const VECTOR2I& screenSize = m_view->GetGAL()->GetScreenPixelSize();
VECTOR2I screenCenter( screenSize / 2 ); VECTOR2I screenCenter( screenSize / 2 );
if( GetMousePosition() != screenCenter ) if( GetMousePosition( false ) != screenCenter )
{ {
m_view->SetCenter( GetCursorPosition() ); m_view->SetCenter( GetCursorPosition() );
m_parentPanel->WarpPointer( KiROUND( screenSize.x / 2 ), KiROUND( screenSize.y / 2 ) ); m_parentPanel->WarpPointer( KiROUND( screenSize.x / 2 ), KiROUND( screenSize.y / 2 ) );

10
include/view/view_controls.h
View File

@ -156,18 +156,20 @@ public:
/** /**
* Function GetMousePosition() * Function GetMousePosition()
* Returns the current mouse pointer position in screen coordinates. Note, that it may be * Returns the current mouse pointer position. Note, that it may be
* different from the cursor position if snapping is enabled (@see GetCursorPosition()). * different from the cursor position if snapping is enabled (@see GetCursorPosition()).
* *
* @return The current mouse pointer position in the screen coordinates. * @param aWorldCoordinates if true, the result is given in world coordinates, otherwise
* it is given in screen coordinates.
* @return The current mouse pointer position in either world or screen coordinates.
*/ */
virtual VECTOR2I GetMousePosition() const = 0; virtual VECTOR2D GetMousePosition( bool aWorldCoordinates = true ) const = 0;
/** /**
* Function GetCursorPosition() * Function GetCursorPosition()
* Returns the current cursor position in world coordinates. Note, that it may be * Returns the current cursor position in world coordinates. Note, that it may be
* different from the mouse pointer position if snapping is enabled or cursor position * different from the mouse pointer position if snapping is enabled or cursor position
* is forced to specific point. * is forced to a specific point.
* *
* @return The current cursor position in world coordinates. * @return The current cursor position in world coordinates.
*/ */

2
include/view/wx_view_controls.h
View File

@ -78,7 +78,7 @@ public:
*/ */
/// @copydoc VIEW_CONTROLS::GetMousePosition() /// @copydoc VIEW_CONTROLS::GetMousePosition()
VECTOR2I GetMousePosition() const override; VECTOR2D GetMousePosition( bool aWorldCoordinates = true ) const override;
/// @copydoc VIEW_CONTROLS::GetCursorPosition() /// @copydoc VIEW_CONTROLS::GetCursorPosition()
VECTOR2D GetCursorPosition() const override; VECTOR2D GetCursorPosition() const override;

3
pcbnew/router/pns_tool_base.cpp
View File

@ -238,8 +238,7 @@ void TOOL_BASE::updateStartItem( TOOL_EVENT& aEvent )
void TOOL_BASE::updateEndItem( const TOOL_EVENT& aEvent ) void TOOL_BASE::updateEndItem( const TOOL_EVENT& aEvent )
{ {
VECTOR2I mp = m_ctls->GetMousePosition(); VECTOR2I p = m_ctls->GetMousePosition();
VECTOR2I p = getView()->ToWorld( mp );
int layer; int layer;
bool snapEnabled = !aEvent.Modifier( MD_SHIFT ); bool snapEnabled = !aEvent.Modifier( MD_SHIFT );

2
pcbnew/tools/pcb_editor_control.cpp
View File

@ -1032,7 +1032,7 @@ int PCB_EDITOR_CONTROL::HighlightNet( const TOOL_EVENT& aEvent )
else else
{ {
// No net code specified, pick the net code belonging to the item under the cursor // No net code specified, pick the net code belonging to the item under the cursor
highlightNet( m_toolMgr, getView()->ToWorld( getViewControls()->GetMousePosition() ) ); highlightNet( m_toolMgr, getViewControls()->GetMousePosition() );
} }
return 0; return 0;