From 9c44d67f3b3162d7abf9ce5eb689975229348eed Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <hillbrand@ucdavis.edu>
Date: Fri, 2 Mar 2018 11:10:22 -0800
Subject: [PATCH] Eeschema: Simplify transformation representation

Fixes: lp:1752745
* https://bugs.launchpad.net/kicad/+bug/1752745
---
 eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp | 4 ++--
 eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp | 4 ++--
 eeschema/sch_component.cpp                                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp
index 7bcca8dbf0..a8e36e5513 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp
@@ -53,9 +53,9 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
 	
 	optionsSizer->Add( orientationRadioBox, 0, wxEXPAND|wxALL, 5 );
 	
-	wxString mirrorRadioBoxChoices[] = { _("Default"), _("Mirror horizontally"), _("Mirror vertically") };
+	wxString mirrorRadioBoxChoices[] = { _("Default"), _("Mirror around X axis"), _("Mirror around Y axis") };
 	int mirrorRadioBoxNChoices = sizeof( mirrorRadioBoxChoices ) / sizeof( wxString );
-	mirrorRadioBox = new wxRadioBox( optionsSizer->GetStaticBox(), wxID_ANY, _("Position:"), wxDefaultPosition, wxDefaultSize, mirrorRadioBoxNChoices, mirrorRadioBoxChoices, 1, wxRA_SPECIFY_COLS );
+	mirrorRadioBox = new wxRadioBox( optionsSizer->GetStaticBox(), wxID_ANY, _("Aspect:"), wxDefaultPosition, wxDefaultSize, mirrorRadioBoxNChoices, mirrorRadioBoxChoices, 1, wxRA_SPECIFY_COLS );
 	mirrorRadioBox->SetSelection( 2 );
 	mirrorRadioBox->SetToolTip( _("Pick the graphical transformation to be used when displaying the symbol") );
 	
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp
index 41e6f2c6c7..0c44732a95 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp
@@ -571,7 +571,7 @@
                                         <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
-                                        <property name="choices">&quot;Default&quot; &quot;Mirror horizontally&quot; &quot;Mirror vertically&quot;</property>
+                                        <property name="choices">&quot;Default&quot; &quot;Mirror around X axis&quot; &quot;Mirror around Y axis&quot;</property>
                                         <property name="close_button">1</property>
                                         <property name="context_help"></property>
                                         <property name="context_menu">1</property>
@@ -586,7 +586,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Position:</property>
+                                        <property name="label">Aspect:</property>
                                         <property name="majorDimension">1</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp
index b95b2430aa..1cfad2431a 100644
--- a/eeschema/sch_component.cpp
+++ b/eeschema/sch_component.cpp
@@ -1291,7 +1291,7 @@ int SCH_COMPONENT::GetOrientation()
         CMP_ORIENT_0,                  CMP_ORIENT_90,                  CMP_ORIENT_180,
         CMP_ORIENT_270,
         CMP_MIRROR_X + CMP_ORIENT_0,   CMP_MIRROR_X + CMP_ORIENT_90,
-        CMP_MIRROR_X + CMP_ORIENT_180, CMP_MIRROR_X + CMP_ORIENT_270,
+        CMP_MIRROR_Y, CMP_MIRROR_X + CMP_ORIENT_270,
         CMP_MIRROR_Y + CMP_ORIENT_0,   CMP_MIRROR_Y + CMP_ORIENT_90,
         CMP_MIRROR_Y + CMP_ORIENT_180, CMP_MIRROR_Y + CMP_ORIENT_270
     };