Pcbnew: Commit block move patch from Marco Mattila

eeschema/load_one_schematic_file.cpp

@@ -30,7 +30,7 @@ static void LoadLayers( LINE_READER* aLine );
 bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& FullFileName )
 {
     char            Name1[256];
-    bool            itemLoaded;
+    bool            itemLoaded = false;
     SCH_ITEM*       Phead;
     SCH_ITEM*       Pnext;
     SCH_ITEM*       item;

eeschema/onrightclick.cpp

@@ -238,7 +238,8 @@ void AddMenusForComponentField( wxMenu* PopMenu, SCH_FIELD* Field )
 
     msg = AddHotkeyName( _( "Rotate Field" ), s_Schematic_Hokeys_Descr, HK_ROTATE );
     ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_FIELD, msg, rotate_field_xpm );
-    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_FIELD, _( "Edit Field" ), edit_text_xpm );
+    msg = AddHotkeyName( _( "Edit Field" ), s_Schematic_Hokeys_Descr, HK_EDIT );
+    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_FIELD, msg, edit_text_xpm );
 }
 
 

include/block_commande.h

@@ -110,6 +110,15 @@ public:
     {
         return m_ItemsSelection.GetCount();
     }
+
+    /** Function SetLastCursorPosition
+     * sets m_BlockLastCursorPosition
+     * @param aPosition = new position
+     **/
+    void SetLastCursorPosition( wxPoint aPosition )
+    {
+        m_BlockLastCursorPosition = aPosition;
+    }
 };
 
 

pcbnew/class_dimension.cpp

@@ -532,8 +532,8 @@ void DIMENSION::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
 {
     int ox, oy, typeaff, width, gcolor;
 
-    ox = offset.x;
-    oy = offset.y;
+    ox = -offset.x;
+    oy = -offset.y;
 
     m_Text->Draw( panel, DC, mode_color, offset );
 

pcbnew/class_drawsegment.cpp

@@ -229,7 +229,7 @@ wxPoint DRAWSEGMENT::GetEnd() const
 
 
 void DRAWSEGMENT::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
-                        int draw_mode, const wxPoint& notUsed )
+                        int draw_mode, const wxPoint& aOffset )
 {
     int ux0, uy0, dx, dy;
     int l_piste;
@@ -246,12 +246,12 @@ void DRAWSEGMENT::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
     l_piste = m_Width >> 1;  /* half trace width */
 
     // Line start point or Circle and Arc center
-    ux0 = m_Start.x;
-    uy0 = m_Start.y;
+    ux0 = m_Start.x + aOffset.x;
+    uy0 = m_Start.y + aOffset.y;
 
     // Line end point or circle and arc start point
-    dx = m_End.x;
-    dy = m_End.y;
+    dx = m_End.x + aOffset.x;
+    dy = m_End.y + aOffset.y;
 
     mode = DisplayOpt.DisplayDrawItems;
     if( m_Flags & FORCE_SKETCH )

pcbnew/class_drawsegment.h

@@ -65,7 +65,7 @@ public:
 
 
     void         Draw( WinEDA_DrawPanel* panel, wxDC* DC,
-                       int aDrawMode, const wxPoint& offset = ZeroOffset );
+                       int aDrawMode, const wxPoint& aOffset = ZeroOffset );
 
     /**
      * Function DisplayInfo

pcbnew/class_track.h

@@ -144,7 +144,7 @@ public:
 
 
     /* Display on screen: */
-    void    Draw( WinEDA_DrawPanel* panel, wxDC* DC, int aDrawMode, const wxPoint& offset = ZeroOffset );
+    void    Draw( WinEDA_DrawPanel* panel, wxDC* DC, int aDrawMode, const wxPoint& aOffset = ZeroOffset );
 
     /* divers */
     int Shape() const { return m_Shape & 0xFF; }
@@ -341,7 +341,7 @@ public:
     }
 
 
-    void    Draw( WinEDA_DrawPanel* panel, wxDC* DC, int aDrawMode, const wxPoint& offset = ZeroOffset );
+    void    Draw( WinEDA_DrawPanel* panel, wxDC* DC, int aDrawMode, const wxPoint& aOffset = ZeroOffset );
 
 
     /**