Pin table dlg: improvements.

bitmaps_png/cpp_26/pin_table.cpp

@@ -8,29 +8,22 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
- 0xce, 0x00, 0x00, 0x01, 0x53, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x96, 0x31, 0x4b, 0xc3,
- 0x40, 0x14, 0xc7, 0xff, 0x54, 0x04, 0x33, 0x69, 0x05, 0xa5, 0x83, 0x83, 0xb8, 0x09, 0x99, 0xeb,
- 0x54, 0x1a, 0x45, 0x0a, 0x82, 0xa3, 0x7e, 0x86, 0x8a, 0x4b, 0x71, 0x71, 0x11, 0xaa, 0xe2, 0xa0,
- 0x43, 0x70, 0x71, 0x74, 0xe9, 0x28, 0x7e, 0x0a, 0xf1, 0x13, 0xc4, 0xcf, 0xe0, 0xe8, 0x66, 0x45,
- 0xa1, 0xb4, 0x3d, 0xef, 0x1f, 0xee, 0xe0, 0x88, 0x25, 0xbe, 0x23, 0x35, 0x3a, 0x18, 0xf8, 0x25,
- 0x8f, 0x24, 0xe4, 0x97, 0x7b, 0xf7, 0xde, 0x25, 0x50, 0x4a, 0xa1, 0x0c, 0xbe, 0x9c, 0xb8, 0x07,
- 0x66, 0x2e, 0x80, 0x75, 0xc2, 0x78, 0xea, 0xa2, 0x6b, 0x20, 0x38, 0x03, 0x62, 0x4d, 0x5f, 0xa3,
- 0x0c, 0x8c, 0x63, 0x5e, 0x9b, 0x8a, 0xc8, 0x48, 0x12, 0x47, 0x90, 0x25, 0x29, 0x2a, 0x4b, 0x77,
- 0x66, 0x24, 0xe9, 0x43, 0x6f, 0xeb, 0x75, 0x95, 0xf4, 0x7a, 0x29, 0x8c, 0x1d, 0x59, 0x5c, 0x48,
- 0xc4, 0x79, 0xb0, 0xe9, 0xe2, 0x83, 0x47, 0x83, 0x81, 0xb2, 0x1b, 0x63, 0x47, 0xf6, 0x76, 0x0e,
- 0x6c, 0xe9, 0x63, 0xe4, 0xc9, 0x4a, 0x2a, 0xe2, 0xa4, 0xdb, 0xb7, 0xe6, 0x28, 0xb2, 0x1b, 0xcf,
- 0xe5, 0xa4, 0x54, 0xc2, 0x8b, 0x66, 0xb9, 0x0c, 0xd1, 0xeb, 0x15, 0x30, 0x2f, 0x4e, 0xdd, 0x89,
- 0x66, 0x0d, 0x18, 0xad, 0x7a, 0xb0, 0x03, 0x74, 0x2e, 0x81, 0xaa, 0x57, 0x31, 0x1c, 0x02, 0x77,
- 0x00, 0x9a, 0x02, 0x3a, 0x9a, 0xa1, 0xa1, 0xe9, 0x55, 0xde, 0xc7, 0x41, 0xd0, 0xdf, 0x6e, 0x34,
- 0x1e, 0xa3, 0x28, 0x7a, 0xf8, 0x0e, 0x23, 0x9b, 0x2c, 0x72, 0x1b, 0xb6, 0x0b, 0xbc, 0x5b, 0x01,
- 0xe3, 0x76, 0xad, 0xf6, 0x2c, 0x95, 0x88, 0x44, 0x96, 0x39, 0x60, 0x73, 0x49, 0xdf, 0x44, 0x18,
- 0x4b, 0x05, 0x7f, 0x4f, 0x54, 0x4a, 0xea, 0x4a, 0x2b, 0x06, 0x49, 0x79, 0x73, 0x64, 0x85, 0x44,
- 0xd2, 0x86, 0x3d, 0xad, 0x54, 0x86, 0xfb, 0x61, 0xf8, 0xb4, 0x17, 0x86, 0x49, 0x1e, 0x6c, 0x52,
- 0xb7, 0x61, 0xff, 0xd7, 0x3a, 0x56, 0xe0, 0xc7, 0x2e, 0x70, 0xc4, 0x74, 0xe4, 0xb1, 0x01, 0xdc,
- 0x14, 0x5a, 0xeb, 0x5a, 0xc0, 0xd8, 0x99, 0x64, 0x29, 0x7e, 0xe5, 0x7d, 0xa0, 0x25, 0xb3, 0xfe,
- 0x92, 0xfc, 0x86, 0xe5, 0x97, 0xd4, 0x6d, 0x58, 0xae, 0xda, 0x8b, 0x40, 0x4b, 0xb8, 0x72, 0x67,
- 0x59, 0xf8, 0xbd, 0xdf, 0xad, 0x9f, 0xe6, 0x13, 0xee, 0x33, 0xf3, 0x74, 0xce, 0xbb, 0x6e, 0x19,
- 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+ 0xce, 0x00, 0x00, 0x00, 0xe7, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xd5, 0x56, 0x51, 0x0a, 0xc2,
+ 0x30, 0x0c, 0xcd, 0xef, 0xce, 0x33, 0xbc, 0xd6, 0xce, 0x50, 0x65, 0x1e, 0x61, 0xf8, 0xe7, 0x97,
+ 0x5f, 0x3b, 0x8a, 0x97, 0xf0, 0xd7, 0x9f, 0x81, 0x28, 0x08, 0x05, 0xb1, 0xf6, 0x95, 0x0e, 0xca,
+ 0x64, 0x90, 0x34, 0x75, 0x6a, 0xe1, 0xb1, 0x34, 0x23, 0x7d, 0x7b, 0x59, 0x12, 0x4a, 0xce, 0x39,
+ 0x5a, 0x02, 0xf4, 0x15, 0xa2, 0x0d, 0xd1, 0xca, 0x10, 0xf5, 0x1e, 0xa7, 0x88, 0x1e, 0xbe, 0xa2,
+ 0x44, 0xfe, 0xd0, 0x66, 0x4d, 0xf4, 0xf0, 0x4f, 0x97, 0x22, 0xfa, 0x9a, 0x22, 0x44, 0xf8, 0x6a,
+ 0x1c, 0xb8, 0xad, 0xaa, 0xe7, 0xb1, 0xeb, 0xdc, 0x7d, 0x18, 0x02, 0x60, 0xc3, 0x87, 0x77, 0x5a,
+ 0x65, 0xa3, 0x1a, 0xa4, 0x2b, 0x1c, 0x3c, 0x5d, 0xf0, 0x45, 0x75, 0x7d, 0x09, 0x22, 0xfc, 0x8f,
+ 0xa0, 0x62, 0xba, 0xe0, 0x8b, 0x44, 0x57, 0x8f, 0x4b, 0x06, 0xf6, 0x52, 0xa2, 0x5b, 0x26, 0xd1,
+ 0x6e, 0xf9, 0xd4, 0x2d, 0x56, 0x0c, 0xdc, 0xf2, 0x6e, 0xdb, 0xf6, 0x6c, 0x8c, 0x71, 0x12, 0x20,
+ 0x46, 0xdc, 0xb0, 0x08, 0xb4, 0xd6, 0x8a, 0x80, 0x18, 0xf1, 0x08, 0x1a, 0x89, 0x0e, 0x3e, 0x0c,
+ 0x48, 0xed, 0xb9, 0xbd, 0x8a, 0x48, 0xad, 0x88, 0x9b, 0xba, 0xba, 0xae, 0x03, 0x52, 0x7b, 0x6e,
+ 0xff, 0x46, 0xc4, 0x29, 0x06, 0xb5, 0x22, 0x6e, 0x79, 0xab, 0x15, 0x71, 0x1b, 0x56, 0xad, 0x88,
+ 0x3d, 0xeb, 0x0a, 0x28, 0xe2, 0xcd, 0xba, 0x02, 0x8a, 0x44, 0xa9, 0xcb, 0x56, 0x24, 0x2d, 0x06,
+ 0x55, 0x1f, 0xfd, 0xd4, 0xac, 0xfb, 0xbf, 0xeb, 0xd6, 0x27, 0xf1, 0x02, 0x5a, 0xe5, 0x2b, 0x21,
+ 0xff, 0x90, 0x10, 0x58, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE pin_table_xpm[1] = {{ png, sizeof( png ), "pin_table_xpm" }};

eeschema/dialogs/dialog_lib_edit_pin_table.cpp

@@ -47,10 +47,11 @@ public:
 
     enum
     {
-        NONE        = -1,
-        PIN_NUMBER  = 0,
-        PIN_NAME    = 1,
-        PIN_TYPE    = 2
+        NONE            = -1,
+        PIN_NUMBER      = 0,
+        PIN_NAME        = 1,
+        PIN_TYPE        = 2,
+        PIN_POSITION    = 3
     };
 
 private:
@@ -160,10 +161,18 @@ DIALOG_LIB_EDIT_PIN_TABLE::DIALOG_LIB_EDIT_PIN_TABLE( wxWindow* parent,
             100,
             wxAlignment( wxALIGN_LEFT | wxALIGN_TOP ),
             wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewTextRenderer* rend3 = new wxDataViewTextRenderer( wxT( "string" ), wxDATAVIEW_CELL_INERT );
+    wxDataViewColumn* col3 = new wxDataViewColumn( _( "Position" ),
+            rend3,
+            DataViewModel::PIN_POSITION,
+            100,
+            wxAlignment( wxALIGN_LEFT | wxALIGN_TOP ),
+            wxDATAVIEW_COL_RESIZABLE );
     m_Pins->AppendColumn( col0 );
     m_Pins->SetExpanderColumn( col0 );
     m_Pins->AppendColumn( col1 );
     m_Pins->AppendColumn( col2 );
+    m_Pins->AppendColumn( col3 );
 
     GetSizer()->SetSizeHints(this);
     Centre();
@@ -198,7 +207,7 @@ DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::DataViewModel( LIB_PART& aPart ) :
 
 unsigned int DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::GetColumnCount() const
 {
-    return 3;
+    return 4;
 }
 
 
@@ -417,6 +426,7 @@ void DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::SetGroupingColumn( int aCol )
 
     m_GroupingColumn = aCol;
 
+    Cleared();
     CalculateGrouping();
     Refresh();
 }
@@ -455,8 +465,6 @@ void DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::Refresh()
 #ifdef REASSOCIATE_HACK
     m_Widget->AssociateModel( this );
 #else
-    Cleared();
-
     std::queue<wxDataViewItem> todo;
     todo.push( wxDataViewItem() );
 
@@ -559,5 +567,14 @@ void DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::Pin::GetValue( wxVariant& aValue,
     case PIN_TYPE:
         aValue = m_Backing->GetTypeString();
         break;
+
+    case PIN_POSITION:
+        {
+            wxPoint position = m_Backing->GetPosition();
+            wxString value;
+            value << "(" << position.x << "," << position.y << ")";
+            aValue = value;
+        }
+        break;
     }
 }