From 64235713496a88808c2f056b3ed28c6d7bc1bc85 Mon Sep 17 00:00:00 2001
From: John Beard <john.j.beard@gmail.com>
Date: Sat, 18 Jan 2025 23:41:50 +0800
Subject: [PATCH] Account for origin transforms in WX_PT_ENTRY_DIALOG
Fixes: https://gitlab.com/kicad/code/kicad/-/issues/19673
---
common/dialogs/dialog_unit_entry.cpp | 4 ++++
pcbnew/tools/pcb_point_editor.cpp | 5 ++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/common/dialogs/dialog_unit_entry.cpp b/common/dialogs/dialog_unit_entry.cpp
index 4a7401f2b7..0bb4fbfaa8 100644
--- a/common/dialogs/dialog_unit_entry.cpp
+++ b/common/dialogs/dialog_unit_entry.cpp
@@ -57,6 +57,10 @@ WX_PT_ENTRY_DIALOG::WX_PT_ENTRY_DIALOG( EDA_DRAW_FRAME* aParent, const wxString&
{
m_labelX->SetLabel( aLabelX );
m_labelY->SetLabel( aLabelY );
+
+ m_unit_binder_x.SetCoordType( ORIGIN_TRANSFORMS::ABS_X_COORD );
+ m_unit_binder_y.SetCoordType( ORIGIN_TRANSFORMS::ABS_Y_COORD );
+
m_unit_binder_x.SetValue( aDefaultValue.x );
m_unit_binder_y.SetValue( aDefaultValue.y );
diff --git a/pcbnew/tools/pcb_point_editor.cpp b/pcbnew/tools/pcb_point_editor.cpp
index 5bc9250cb6..17f80f6feb 100644
--- a/pcbnew/tools/pcb_point_editor.cpp
+++ b/pcbnew/tools/pcb_point_editor.cpp
@@ -2442,7 +2442,7 @@ int PCB_POINT_EDITOR::movePoint( const TOOL_EVENT& aEvent )
BOARD_COMMIT commit( editFrame );
commit.Stage( m_editPoints->GetParent(), CHT_MODIFY );
- VECTOR2I pt = editFrame->GetOriginTransforms().ToDisplayAbs( m_editedPoint->GetPosition() );
+ VECTOR2I pt = m_editedPoint->GetPosition();
wxString title;
wxString msg;
@@ -2461,8 +2461,7 @@ int PCB_POINT_EDITOR::movePoint( const TOOL_EVENT& aEvent )
if( dlg.ShowModal() == wxID_OK )
{
- pt = editFrame->GetOriginTransforms().FromDisplayAbs( dlg.GetValue() );
- m_editedPoint->SetPosition( pt );
+ m_editedPoint->SetPosition( dlg.GetValue() );
updateItem( commit );
commit.Push( msg );
}