added eeschema rotate block patch from Pascal Baerten. Uncrustify files. fixed some issues.

Some minor issues (sheet and pin sheet rotate from menu) must be added

eeschema/block.cpp

@@ -21,6 +21,10 @@
 // Imported functions:
 void            MoveItemsInList( PICKED_ITEMS_LIST& aItemsList,
                                  const wxPoint      aMoveVector );
+void            RotateListOfItems( PICKED_ITEMS_LIST& aItemsList,
+                                   wxPoint&           Center );
+void            Mirror_X_ListOfItems( PICKED_ITEMS_LIST& aItemsList,
+                                      wxPoint&           aMirrorPoint );
 void            MirrorListOfItems( PICKED_ITEMS_LIST& aItemsList,
                                    wxPoint&           Center );
 void            DeleteItemsInList( WinEDA_DrawPanel*  panel,
@@ -124,6 +128,9 @@ void WinEDA_SchematicFrame::HandleBlockPlace( wxDC* DC )
         err = TRUE;
         break;
 
+    case BLOCK_ROTATE:
+    case BLOCK_MIRROR_X:
+    case BLOCK_MIRROR_Y:
     case BLOCK_DRAG:        /* Drag */
     case BLOCK_MOVE:        /* Move */
         if( DrawPanel->ManageCurseur )
@@ -163,16 +170,13 @@ void WinEDA_SchematicFrame::HandleBlockPlace( wxDC* DC )
     case BLOCK_ZOOM:        // Handled by HandleBlockEnd()
     case BLOCK_DELETE:
     case BLOCK_SAVE:
-    case BLOCK_ROTATE:
-    case BLOCK_MIRROR_X:
-    case BLOCK_MIRROR_Y:
     case BLOCK_FLIP:
     case BLOCK_ABORT:
     case BLOCK_SELECT_ITEMS_ONLY:
         break;
     }
 
-    OnModify( );
+    OnModify();
 
     /* clear struct.m_Flags  */
     SCH_ITEM* Struct;
@@ -240,6 +244,9 @@ int WinEDA_SchematicFrame::HandleBlockEnd( wxDC* DC )
         case BLOCK_DRAG:    /* Drag */
             BreakSegmentOnJunction( (SCH_SCREEN*) GetScreen() );
 
+        case BLOCK_ROTATE:
+        case BLOCK_MIRROR_X:
+        case BLOCK_MIRROR_Y:
         case BLOCK_MOVE:    /* Move */
         case BLOCK_COPY:    /* Copy */
             PickItemsInBlock( GetScreen()->m_BlockLocate, GetScreen() );
@@ -269,7 +276,7 @@ int WinEDA_SchematicFrame::HandleBlockEnd( wxDC* DC )
             {
                 ii = -1;
                 DeleteItemsInList( DrawPanel, block->m_ItemsSelection );
-                OnModify( );
+                OnModify();
             }
             block->ClearItemsList();
             TestDanglingEnds( GetScreen()->EEDrawList, DC );
@@ -298,10 +305,6 @@ int WinEDA_SchematicFrame::HandleBlockEnd( wxDC* DC )
         case BLOCK_FLIP: /* pcbnew only! */
             break;
 
-        case BLOCK_ROTATE:
-        case BLOCK_MIRROR_X:
-        case BLOCK_MIRROR_Y:
-            break;
 
         case BLOCK_ZOOM: /* Window Zoom */
             zoom_command = TRUE;
@@ -396,7 +399,7 @@ void WinEDA_SchematicFrame::HandleBlockEndByPopUp( int Command, wxDC* DC )
         {
             ii = -1;
             DeleteItemsInList( DrawPanel, block->m_ItemsSelection );
-            OnModify( );
+            OnModify();
         }
         TestDanglingEnds( GetScreen()->EEDrawList, DC );
         DrawPanel->Refresh();
@@ -425,15 +428,53 @@ void WinEDA_SchematicFrame::HandleBlockEndByPopUp( int Command, wxDC* DC )
 
 
     case BLOCK_ROTATE:
+        if( DrawPanel->ManageCurseur )
+            DrawPanel->ManageCurseur( DrawPanel, DC, FALSE );
+        if( block->GetCount() )
+        {
+            ii = 1;
+            /* Compute the rotation center and put it on grid */
+            wxPoint rotationPoint = block->Centre();
+            PutOnGrid( &rotationPoint );
+            SaveCopyInUndoList( block->m_ItemsSelection,
+                                UR_ROTATED,
+                                rotationPoint );
+            RotateListOfItems( block->m_ItemsSelection, rotationPoint );
+            OnModify();
+        }
+        TestDanglingEnds( GetScreen()->EEDrawList, DC );
+        DrawPanel->Refresh();
+        block->m_State   = STATE_BLOCK_MOVE;
+        block->m_Command = BLOCK_MOVE; //allows multiple rotate
         break;
 
     case BLOCK_MIRROR_X:
+        if( DrawPanel->ManageCurseur )
+            DrawPanel->ManageCurseur( DrawPanel, DC, FALSE );
+        if( block->GetCount() )
+        {
+            ii = 1;
+            /* Compute the mirror center and put it on grid */
+            wxPoint mirrorPoint = block->Centre();
+            PutOnGrid( &mirrorPoint );
+            SaveCopyInUndoList( block->m_ItemsSelection,
+                                UR_MIRRORED_X,
+                                mirrorPoint );
+            Mirror_X_ListOfItems( block->m_ItemsSelection, mirrorPoint );
+            OnModify();
+            block->m_State   = STATE_BLOCK_MOVE;
+            block->m_Command = BLOCK_MOVE; //allows multiple mirrors
+        }
+        TestDanglingEnds( GetScreen()->EEDrawList, DC );
+        DrawPanel->Refresh();
+        break;
+
     case BLOCK_MIRROR_Y:
         if( DrawPanel->ManageCurseur )
             DrawPanel->ManageCurseur( DrawPanel, DC, FALSE );
         if( block->GetCount() )
         {
-            ii = -1;
+            ii = 1;
             /* Compute the mirror center and put it on grid */
             wxPoint mirrorPoint = block->Centre();
             PutOnGrid( &mirrorPoint );
@@ -441,7 +482,9 @@ void WinEDA_SchematicFrame::HandleBlockEndByPopUp( int Command, wxDC* DC )
                                 UR_MIRRORED_Y,
                                 mirrorPoint );
             MirrorListOfItems( block->m_ItemsSelection, mirrorPoint );
-            OnModify( );
+            OnModify();
+            block->m_State   = STATE_BLOCK_MOVE;
+            block->m_Command = BLOCK_MOVE; //allows multiple mirrors
         }
         TestDanglingEnds( GetScreen()->EEDrawList, DC );
         DrawPanel->Refresh();
@@ -515,6 +558,7 @@ void SaveStructListForPaste( PICKED_ITEMS_LIST& aItemsList )
 
     /* save the new list: */
     ITEM_PICKER item;
+
     // In list the wrapper is owner of the shematic item, we can use the UR_DELETED
     // status for the picker because pickers with this status are owner of the picked item
     // (or TODO ?: create a new status like UR_DUPLICATE)
@@ -579,7 +623,7 @@ void WinEDA_SchematicFrame::PasteListOfItems( wxDC* DC )
         Struct = Struct->Next() )
         Struct->m_Flags = 0;
 
-    OnModify( );
+    OnModify();
 
     return;
 }
@@ -618,7 +662,7 @@ static void CollectStructsToDrag( SCH_SCREEN* screen )
     /* Remove the displacement of segment and undo the selection. */
     for( unsigned ii = 0; ii < pickedlist->GetCount(); ii++ )
     {
-        Struct = (SCH_ITEM*) (SCH_ITEM*) pickedlist->GetPickedItem( ii );
+        Struct = (SCH_ITEM*)(SCH_ITEM*) pickedlist->GetPickedItem( ii );
         if( Struct->Type() == DRAW_SEGMENT_STRUCT_TYPE )
         {
             SegmStruct = (SCH_LINE*) Struct;
@@ -639,7 +683,7 @@ static void CollectStructsToDrag( SCH_SCREEN* screen )
 
     for( unsigned ii = 0; ii < pickedlist->GetCount(); ii++ )
     {
-        Struct = (SCH_ITEM*) (SCH_ITEM*) pickedlist->GetPickedItem( ii );
+        Struct = (SCH_ITEM*)(SCH_ITEM*) pickedlist->GetPickedItem( ii );
         if( ( Struct->Type() == TYPE_SCH_LABEL )
            || ( Struct->Type() == TYPE_SCH_GLOBALLABEL )
            || ( Struct->Type() == TYPE_SCH_HIERLABEL ) )
@@ -677,8 +721,7 @@ static void CollectStructsToDrag( SCH_SCREEN* screen )
             SCH_SHEET* sheet = (SCH_SHEET*) Struct;
 
             // Add all pins sheets of a selected hierarchical sheet to the list
-            BOOST_FOREACH( SCH_SHEET_PIN label, sheet->GetSheetPins() )
-            {
+            BOOST_FOREACH( SCH_SHEET_PIN label, sheet->GetSheetPins() ) {
                 AddPickedItem( screen, label.m_Pos );
             }
         }

eeschema/class_drawsheet.cpp

@@ -16,6 +16,7 @@
 #include "class_drawpanel.h"
 #include "drawtxt.h"
 #include "confirm.h"
+#include "trigo.h"
 
 #include "program.h"
 #include "general.h"
@@ -204,6 +205,16 @@ bool SCH_SHEET::HasLabel( const wxString& aName )
     return false;
 }
 
+bool SCH_SHEET::IsVerticalOrientation()
+{ 
+    BOOST_FOREACH( SCH_SHEET_PIN label, m_labels )
+    {
+        if( label.GetEdge()>1 ) 
+        return true;
+    }
+    return false;   
+}
+
 
 bool SCH_SHEET::HasUndefinedLabels()
 {
@@ -316,18 +327,7 @@ SCH_SHEET_PIN* SCH_SHEET::GetLabel( const wxPoint& aPosition )
 
     BOOST_FOREACH( SCH_SHEET_PIN& label, m_labels )
     {
-        size = ( label.GetLength() + 1 ) * label.m_Size.x;
-        if( label.m_Edge )
-            size = -size;
-        minx = label.m_Pos.x;
-        maxx = label.m_Pos.x + size;
-        if( maxx < minx )
-            EXCHG( maxx, minx );
-        dy = label.m_Size.x / 2;
-
-        if( ( ABS( aPosition.y - label.m_Pos.y ) <= dy )
-            && ( aPosition.x <= maxx ) && ( aPosition.x >= minx ) )
-            return &label;
+        if (label.HitTest(aPosition)) return &label;
     }
 
     return NULL;
@@ -358,6 +358,8 @@ void SCH_SHEET::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
     int      txtcolor;
     wxString Text;
     int      color;
+    int      name_orientation;
+    wxPoint  pos_sheetname,pos_filename;
     wxPoint  pos = m_Pos + aOffset;
     int      LineWidth = g_DrawDefaultLineThickness;
 
@@ -369,7 +371,18 @@ void SCH_SHEET::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
 
     GRRect( &aPanel->m_ClipBox, aDC, pos.x, pos.y,
             pos.x + m_Size.x, pos.y + m_Size.y, LineWidth, color );
-
+    if (IsVerticalOrientation()) 
+    {
+        pos_sheetname=wxPoint( pos.x-8, pos.y+m_Size.y );
+        pos_filename=wxPoint( pos.x+m_Size.x+4, pos.y+m_Size.y );
+        name_orientation=TEXT_ORIENT_VERT;
+    }
+    else
+    {
+        pos_sheetname=wxPoint( pos.x, pos.y - 8 );
+        pos_filename=wxPoint( pos.x, pos.y + m_Size.y + 4 );
+        name_orientation=TEXT_ORIENT_HORIZ;
+    }
     /* Draw text : SheetName */
     if( aColor > 0 )
         txtcolor = aColor;
@@ -377,8 +390,8 @@ void SCH_SHEET::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
         txtcolor = ReturnLayerColor( LAYER_SHEETNAME );
 
     Text = wxT( "Sheet: " ) + m_SheetName;
-    DrawGraphicText( aPanel, aDC, wxPoint( pos.x, pos.y - 8 ),
-                     (EDA_Colors) txtcolor, Text, TEXT_ORIENT_HORIZ,
+    DrawGraphicText( aPanel, aDC, pos_sheetname,
+                     (EDA_Colors) txtcolor, Text, name_orientation,
                      wxSize( m_SheetNameSize, m_SheetNameSize ),
                      GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_BOTTOM, LineWidth,
                      false, false, false );
@@ -389,8 +402,8 @@ void SCH_SHEET::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
     else
         txtcolor = ReturnLayerColor( LAYER_SHEETFILENAME );
     Text = wxT( "File: " ) + m_FileName;
-    DrawGraphicText( aPanel, aDC, wxPoint( pos.x, pos.y + m_Size.y + 4 ),
-                     (EDA_Colors) txtcolor, Text, TEXT_ORIENT_HORIZ,
+    DrawGraphicText( aPanel, aDC, pos_filename,
+                     (EDA_Colors) txtcolor, Text, name_orientation,
                      wxSize( m_FileNameSize, m_FileNameSize ),
                      GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_TOP, LineWidth,
                      false, false, false );
@@ -741,6 +754,34 @@ void SCH_SHEET::DisplayInfo( WinEDA_DrawFrame* frame )
 }
 
 
+void SCH_SHEET::Rotate(wxPoint rotationPoint)
+{
+    RotatePoint(&m_Pos,rotationPoint,900);
+    RotatePoint(&m_Size.x,&m_Size.y,900);
+    if (m_Size.x<0) {
+        m_Pos.x+=m_Size.x;
+        NEGATE(m_Size.x);
+    }
+    if (m_Size.y<0) {
+        m_Pos.y+=m_Size.y;
+        NEGATE(m_Size.y);
+    }
+    BOOST_FOREACH( SCH_SHEET_PIN& sheetPin, m_labels )
+    {
+        sheetPin.Rotate( rotationPoint );
+    }
+}
+void SCH_SHEET::Mirror_X( int aXaxis_position )
+{
+    m_Pos.y -= aXaxis_position;
+    NEGATE( m_Pos.y );
+    m_Pos.y += aXaxis_position;
+    m_Pos.y -= m_Size.y;
+    BOOST_FOREACH( SCH_SHEET_PIN& sheetPin, m_labels )
+    {
+        sheetPin.Mirror_X( aXaxis_position );
+    }
+}
 /** virtual function Mirror_Y
  * mirror item relative to an Y axis
  * @param aYaxis_position = the y axis position
@@ -770,8 +811,7 @@ void SCH_SHEET::Resize( const wxSize& aSize )
     /* Move the sheet labels according to the new sheet size. */
     BOOST_FOREACH( SCH_SHEET_PIN& label, m_labels )
     {
-        if( label.m_Edge )
-            label.m_Pos.x = m_Pos.x + m_Size.x;
+        label.ConstraintOnEdge(label.m_Pos);
     }
 }
 
@@ -817,3 +857,4 @@ void SCH_SHEET::Show( int nestLevel, std::ostream& os )
 }
 
 #endif
+

eeschema/class_drawsheet.h

@@ -8,7 +8,7 @@
 #include "base_struct.h"
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/foreach.hpp>
-
+#include "class_text-label.h"
 
 extern SCH_SHEET* g_RootSheet;
 
@@ -22,17 +22,29 @@ extern SCH_SHEET* g_RootSheet;
  * connected to a wire, bus, or label.  In the schematic page represented by
  * the sheet, it corresponds to a hierarchical label.
  */
-class SCH_SHEET_PIN : public SCH_ITEM, public EDA_TextStruct
+
+//class SCH_SHEET_PIN : public SCH_ITEM, public EDA_TextStruct
+class SCH_SHEET_PIN : public SCH_HIERLABEL
 {
 private:
     int m_Number;       ///< Label number use for saving sheet label to file.
                         ///< Sheet label numbering begins at 2.
                         ///< 0 is reserved for the sheet name.
                         ///< 1 is reserve for the sheet file name.
+    int m_Edge;                     /* For pin labels only: sheet edge (0 to 3) of the pin
+                                     * m_Edge define on which edge the pin is positionned:
+                                     *        0: pin on left side
+                                     *        1: pin on right side
+                                     *        2: pin on top side
+                                     *        3: pin on bottom side
+                                     *  for compatibility reasons, this does not follow same values as text
+                                     *  orientation.
+                                     */
 
 public:
-    int  m_Edge, m_Shape;
-    bool m_IsDangling;  // TRUE non connected
+
+    //int m_Shape;
+    //bool m_IsDangling;  // TRUE non connected
 
 public:
     SCH_SHEET_PIN( SCH_SHEET* parent,
@@ -46,15 +58,18 @@ public:
         return wxT( "SCH_SHEET_PIN" );
     }
 
-    bool operator==( const SCH_SHEET_PIN* aPin ) const;
+
+    bool operator  ==( const SCH_SHEET_PIN* aPin ) const;
 
     SCH_SHEET_PIN* GenCopy();
 
     SCH_SHEET_PIN* Next()
     {
-        return ( SCH_SHEET_PIN*) Pnext;
+        return (SCH_SHEET_PIN*) Pnext;
     }
 
+    void SwapData( SCH_SHEET_PIN* copyitem );
+
     /**
      * Get the sheet label number.
      *
@@ -68,6 +83,9 @@ public:
      * @param aNumber - New sheet number label.
      */
     void        SetNumber( int aNumber );
+    void        SetEdge( int aEdge );
+    int         GetEdge();
+    void        ConstraintOnEdge( wxPoint Pos );
 
     /**
      * Get the parent sheet object of this sheet pin.
@@ -79,18 +97,9 @@ public:
 
     void        Place( WinEDA_SchematicFrame* frame, wxDC* DC );
 
-    void Draw( WinEDA_DrawPanel* panel,
-               wxDC*             DC,
-               const wxPoint&    offset,
-               int               draw_mode,
-               int               Color = -1 );
-
-    /**
-     * Plot this sheet pin object to aPlotter.
-     *
-     * @param aPlotter - The plotter object to plot to.
+/*the functions Draw, CreateGraphicShape and Plot are no removed as
+ *  as this shape is already handled as HIERLABEL ...
  */
-    void Plot( PLOTTER* aPlotter );
 
     /**
      * Function Save
@@ -118,8 +127,6 @@ public:
      * @param aCorner_list = list to fill with polygon corners coordinates
      * @param Pos = Position of the shape
      */
-    void        CreateGraphicShape( std::vector <wxPoint>& aCorner_list,
-                                    const wxPoint&         Pos );
 
     // Geometric transforms (used in block operations):
 
@@ -137,13 +144,11 @@ public:
      * mirror item relative to an Y axis
      * @param aYaxis_position = the y axis position
      */
-    virtual void Mirror_Y( int aYaxis_position )
-    {
-        m_Edge   = m_Edge ? 0 : 1;
-        m_Pos.x -= aYaxis_position;
-        NEGATE(  m_Pos.x );
-        m_Pos.x += aYaxis_position;
-    }
+
+    virtual void Mirror_Y( int aYaxis_position );
+    virtual void Rotate( wxPoint rotationPoint );
+    virtual void Mirror_X( int aXaxis_position );
+
 
     /**
      * Compare schematic sheet entry (pin?) name against search string.
@@ -155,7 +160,7 @@ public:
 };
 
 
-typedef boost::ptr_vector< SCH_SHEET_PIN > SCH_SHEET_PIN_LIST;
+typedef boost::ptr_vector<SCH_SHEET_PIN> SCH_SHEET_PIN_LIST;
 
 
 /* class SCH_SHEET
@@ -215,6 +220,11 @@ public:
     SCH_SHEET*     GenCopy();
     void           DisplayInfo( WinEDA_DrawFrame* frame );
 
+    /* there is no member for orientation in sch_sheet, to preserve file
+     * format, we detect orientation based on pin edges
+     */
+    bool           IsVerticalOrientation();
+
     /**
      * Add aLabel to this sheet.
      *
@@ -389,8 +399,7 @@ public:
     virtual void Move( const wxPoint& aMoveVector )
     {
         m_Pos += aMoveVector;
-        BOOST_FOREACH( SCH_SHEET_PIN& label, m_labels )
-        {
+        BOOST_FOREACH( SCH_SHEET_PIN & label, m_labels ) {
             label.Move( aMoveVector );
         }
     }
@@ -401,6 +410,8 @@ public:
      * @param aYaxis_position = the y axis position
      */
     virtual void Mirror_Y( int aYaxis_position );
+    virtual void Mirror_X( int aXaxis_position );
+    virtual void Rotate( wxPoint rotationPoint );
 
     /**
      * Compare schematic sheet file and sheet name against search string.

eeschema/class_marker_sch.cpp

@@ -8,6 +8,7 @@
 #include "common.h"
 #include "program.h"
 #include "general.h"
+#include "trigo.h"
 
 #include "class_marker_sch.h"
 #include "erc.h"
@@ -147,3 +148,25 @@ void SCH_MARKER::DisplayInfo( WinEDA_DrawFrame* aFrame )
     aFrame->AppendMsgPanel( _( "Electronics rule check error" ),
                             GetReporter().GetErrorText(), DARKRED );
 }
+
+
+void SCH_MARKER::Rotate( wxPoint rotationPoint )
+{
+    RotatePoint( &m_Pos, rotationPoint, 900 );
+}
+
+
+void SCH_MARKER::Mirror_X( int aXaxis_position )
+{
+    m_Pos.y -= aXaxis_position;
+    m_Pos.y  = -m_Pos.y;
+    m_Pos.y += aXaxis_position;
+}
+
+
+void SCH_MARKER::Mirror_Y( int aYaxis_position )
+{
+    m_Pos.x -= aYaxis_position;
+    m_Pos.x  = -m_Pos.x;
+    m_Pos.x += aYaxis_position;
+}

eeschema/class_marker_sch.h

@@ -9,9 +9,10 @@
 #include "class_marker_base.h"
 
 /* Marker are mainly used to show an ERC error
-*/
+ */
 
-enum TypeMarker {      /* Markers type */
+enum TypeMarker {
+    /* Markers type */
     MARK_UNSPEC,
     MARK_ERC,
     MARK_PCB,
@@ -24,10 +25,10 @@ enum TypeMarker {      /* Markers type */
 extern const wxChar* NameMarqueurType[];
 
 
-class SCH_MARKER : public SCH_ITEM , public MARKER_BASE
+class SCH_MARKER : public SCH_ITEM, public MARKER_BASE
 {
 public:
-    SCH_MARKER( );
+    SCH_MARKER();
     SCH_MARKER( const wxPoint& aPos, const wxString& aText );
     ~SCH_MARKER();
     virtual wxString GetClass() const
@@ -57,7 +58,7 @@ public:
      * for a marker, has no meaning, but it is necessary to satisfy the
      * SCH_ITEM class requirements
      */
-    virtual int GetPenSize( ) { return 0; };
+    virtual int GetPenSize() { return 0; };
 
     /** Function HitTest
      * @return true if the point aPosRef is within item area
@@ -68,6 +69,7 @@ public:
         return HitTestMarker( aPosRef );
     }
 
+
     /**
      * Function GetBoundingBox
      * returns the orthogonal, bounding box of this object for display purposes.
@@ -79,25 +81,24 @@ public:
 
 
     // Geometric transforms (used in block operations):
+
     /** virtual function Move
      * move item to a new position.
      * @param aMoveVector = the displacement vector
      */
-    virtual void Move(const wxPoint& aMoveVector)
+    virtual void Move( const wxPoint& aMoveVector )
     {
         m_Pos += aMoveVector;
     }
 
+
     /** virtual function Mirror_Y
      * mirror item relative to an Y axis
      * @param aYaxis_position = the y axis position
      */
-    virtual void Mirror_Y(int aYaxis_position)
-    {
-        m_Pos.x -= aYaxis_position;
-        m_Pos.x = - m_Pos.x;
-        m_Pos.x += aYaxis_position;
-    }
+    virtual void Mirror_Y( int aYaxis_position );
+    virtual void Rotate( wxPoint rotationPoint );
+    virtual void Mirror_X( int aXaxis_position );
 
     /**
      * Compare DRC marker main and auxiliary text against search string.
@@ -116,6 +117,7 @@ public:
 
 #if defined(DEBUG)
     void         Show( int nestLevel, std::ostream& os );
+
 #endif
 };
 

eeschema/class_sch_cmp_field.cpp

@@ -17,6 +17,7 @@
 #include "gr_basic.h"
 #include "drawtxt.h"
 #include "macros.h"
+#include "trigo.h"
 
 #include "program.h"
 #include "general.h"
@@ -153,13 +154,16 @@ void SCH_FIELD::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
      * the bounding box calculations.
      */
 #if 0
+
     // Draw boundary box:
     int x1 = BoundaryBox.GetX();
     int y1 = BoundaryBox.GetY();
     int x2 = BoundaryBox.GetRight();
     int y2 = BoundaryBox.GetBottom();
     GRRect( &panel->m_ClipBox, DC, x1, y1, x2, y2, BROWN );
+
     // Draw the text anchor point
+
     /* Calculate the text position, according to the component
      * orientation/mirror */
     textpos  = m_Pos - parentComponent->m_Pos;
@@ -169,7 +173,7 @@ void SCH_FIELD::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
     y1 = textpos.y;
     int len = 10;
     GRLine( &panel->m_ClipBox, DC, x1 - len, y1, x1 + len, y1, 0, BLUE );
-    GRLine( &panel->m_ClipBox, DC, x1, y1 - len, x1, y1 +len, 0, BLUE );
+    GRLine( &panel->m_ClipBox, DC, x1, y1 - len, x1, y1 + len, 0, BLUE );
 #endif
 }
 
@@ -396,12 +400,12 @@ void SCH_FIELD::Place( WinEDA_SchematicFrame* frame, wxDC* DC )
     Draw( frame->DrawPanel, DC, wxPoint( 0, 0 ), GR_DEFAULT_DRAWMODE );
     m_Flags = 0;
     frame->GetScreen()->SetCurItem( NULL );
-    frame->OnModify( );
+    frame->OnModify();
     frame->SetCurrentField( NULL );
 }
 
 
-bool SCH_FIELD::Matches( wxFindReplaceData& aSearchData, void * aAuxData )
+bool SCH_FIELD::Matches( wxFindReplaceData& aSearchData, void* aAuxData )
 {
     if( aAuxData && m_FieldId == REFERENCE )
     {
@@ -420,3 +424,9 @@ bool SCH_FIELD::Matches( wxFindReplaceData& aSearchData, void * aAuxData )
 
     return SCH_ITEM::Matches( m_Text, aSearchData );
 }
+
+
+void SCH_FIELD::Rotate( wxPoint rotationPoint )
+{
+    RotatePoint( &m_Pos, rotationPoint, 900 );
+}

eeschema/class_sch_cmp_field.h

@@ -47,6 +47,7 @@ public:
         return wxT( "SCH_FIELD" );
     }
 
+
     void     Place( WinEDA_SchematicFrame* frame, wxDC* DC );
 
     EDA_Rect GetBoundaryBox() const;
@@ -58,9 +59,11 @@ public:
     bool     IsVoid()
     {
         size_t len = m_Text.Len();
+
         return len == 0 || ( len == 1 && m_Text[0] == wxChar( '~' ) );
     }
 
+
     void SwapData( SCH_FIELD* copyitem );
 
     /** Function ImportValues
@@ -73,7 +76,7 @@ public:
     /** Function GetPenSize
      * @return the size of the "pen" that be used to draw or plot this item
      */
-    int GetPenSize( );
+    int  GetPenSize();
 
     /** Function IsVisible
      * @return true is this field is visible, false if flagged invisible
@@ -83,6 +86,7 @@ public:
         return (m_Attributs & TEXT_NO_VISIBLE) == 0 ? true : false;
     }
 
+
     /**
      * Function Draw
      */
@@ -102,20 +106,33 @@ public:
     bool Save( FILE* aFile ) const;
 
     // Geometric transforms (used in block operations):
+
     /** virtual function Move
      * move item to a new position.
      * @param aMoveVector = the displacement vector
      */
-    virtual void Move(const wxPoint& aMoveVector)
+    virtual void Move( const wxPoint& aMoveVector )
     {
         m_Pos += aMoveVector;
     }
 
+
+    virtual void Rotate( wxPoint rotationPoint );
+
+    virtual void Mirror_X( int aXaxis_position )
+    {
+        /* Do Nothing: fields are never mirrored alone.
+         * they are moved when the parent component is mirrored
+         * this function is only needed by the virtual pure function of the
+         * master class */
+    }
+
+
     /** virtual function Mirror_Y
      * mirror item relative to an Y axis
      * @param aYaxis_position = the y axis position
      */
-    virtual void Mirror_Y(int aYaxis_position)
+    virtual void Mirror_Y( int aYaxis_position )
     {
         /* Do Nothing: fields are never mirrored alone.
          * they are moved when the parent component is mirrored
@@ -123,6 +140,7 @@ public:
          * master class */
     }
 
+
     /**
      * Compare schematic field text against search string.
      *
@@ -133,7 +151,7 @@ public:
      *              this is only one of all references (one per sheet path)
      * @return True if this field text matches the search criteria.
      */
-    virtual bool Matches( wxFindReplaceData& aSearchData, void * aAuxData );
+    virtual bool Matches( wxFindReplaceData& aSearchData, void* aAuxData );
 };
 
 

eeschema/class_sch_component.h

@@ -25,6 +25,7 @@ struct Error
     {
     }
 
+
     Error( const wxString& aMsg ) :
         errorText( aMsg )
     {
@@ -152,6 +153,7 @@ public:
         return new SCH_COMPONENT( *this );
     }
 
+
     void       SetOrientation( int aOrientation );
 
     /** function GetOrientation()
@@ -184,7 +186,7 @@ public:
      * the time stamp is also modified in paths
      * @param aNewTimeStamp = new time stamp
      */
-    void            SetTimeStamp( long aNewTimeStamp);
+    void       SetTimeStamp( long aNewTimeStamp );
 
     /**
      * Function GetBoundaryBox
@@ -242,6 +244,7 @@ public:
         m_Fields = aFields;     // vector copying, length is changed possibly
     }
 
+
     //-----</Fields>----------------------------------------------------------
 
     /**
@@ -267,6 +270,7 @@ public:
         Draw( panel, DC, offset, draw_mode, Color, true );
     }
 
+
     void Draw( WinEDA_DrawPanel* panel,
                wxDC*             DC,
                const wxPoint&    offset,
@@ -315,9 +319,10 @@ public:
      * for a component, has no meaning, but it is necessary to satisfy the
      * SCH_ITEM class requirements.
      */
-    virtual int GetPenSize( ) { return 0; }
+    virtual int GetPenSize() { return 0; }
 
     // Geometric transforms (used in block operations):
+
     /** virtual function Move
      * move item to a new position.
      * @param aMoveVector = the displacement vector
@@ -329,11 +334,15 @@ public:
             GetField( ii )->Move( aMoveVector );
     }
 
+
     /** virtual function Mirror_Y
      * mirror item relative to an Y axis
      * @param aYaxis_position = the y axis position
      */
-    virtual void Mirror_Y(int aYaxis_position);
+    virtual void Mirror_Y( int aYaxis_position );
+    virtual void Mirror_X( int aXaxis_position );
+    virtual void Rotate( wxPoint rotationPoint );
+
 
     /**
      * Compare schematic component reference and value fields against search string.
@@ -344,9 +353,9 @@ public:
      *          This param is used in this case
      * @return True if this component reference or value field matches the search criteria.
      */
-    virtual bool Matches( wxFindReplaceData& aSearchData, void * aAuxData );
+    virtual bool Matches( wxFindReplaceData& aSearchData, void* aAuxData );
 
-    #if defined (DEBUG)
+    #if defined(DEBUG)
 
     /**
      * Function Show

eeschema/class_schematic_items.cpp

@@ -5,7 +5,7 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "class_drawpanel.h"
-
+#include "trigo.h"
 #include "common.h"
 #include "program.h"
 #include "general.h"
@@ -97,8 +97,9 @@ bool SCH_BUS_ENTRY::Save( FILE* aFile ) const
 EDA_Rect SCH_BUS_ENTRY::GetBoundingBox()
 {
     EDA_Rect box;
-    box.SetOrigin(m_Pos);
-    box.SetEnd(m_End());
+
+    box.SetOrigin( m_Pos );
+    box.SetEnd( m_End() );
 
     box.Normalize();
     int width = ( m_Width == 0 ) ? g_DrawDefaultLineThickness : m_Width;
@@ -141,6 +142,31 @@ void SCH_BUS_ENTRY::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
 }
 
 
+void SCH_BUS_ENTRY::Mirror_X( int aXaxis_position )
+{
+    m_Pos.y -= aXaxis_position;
+    NEGATE(  m_Pos.y );
+    m_Pos.y += aXaxis_position;
+    NEGATE(  m_Size.y );
+}
+
+
+void SCH_BUS_ENTRY::Mirror_Y( int aYaxis_position )
+{
+    m_Pos.x -= aYaxis_position;
+    NEGATE(  m_Pos.x );
+    m_Pos.x += aYaxis_position;
+    NEGATE(  m_Size.x );
+}
+
+
+void SCH_BUS_ENTRY::Rotate( wxPoint rotationPoint )
+{
+    RotatePoint( &m_Pos, rotationPoint, 900 );
+    RotatePoint( &m_Size.x, &m_Size.y, 900 );
+}
+
+
 /**********************/
 /* class SCH_JUNCTION */
 /**********************/
@@ -156,7 +182,6 @@ SCH_JUNCTION::SCH_JUNCTION( const wxPoint& pos ) :
 }
 
 
-
 SCH_JUNCTION* SCH_JUNCTION::GenCopy()
 {
     SCH_JUNCTION* newitem = new SCH_JUNCTION( m_Pos );
@@ -191,6 +216,7 @@ bool SCH_JUNCTION::Save( FILE* aFile ) const
 EDA_Rect SCH_JUNCTION::GetBoundingBox()
 {
     EDA_Rect rect;
+
     rect.SetOrigin( m_Pos );
     rect.Inflate( ( GetPenSize() + m_Size.x ) / 2 );
 
@@ -236,11 +262,33 @@ void SCH_JUNCTION::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
     GRSetDrawMode( DC, DrawMode );
 
     GRFilledCircle( &panel->m_ClipBox, DC, m_Pos.x + offset.x,
-                    m_Pos.y + offset.y, (m_Size.x/2), 0, color,
+                    m_Pos.y + offset.y, (m_Size.x / 2), 0, color,
                     color );
 }
 
 
+void SCH_JUNCTION::Mirror_X( int aXaxis_position )
+{
+    m_Pos.y -= aXaxis_position;
+    NEGATE(  m_Pos.y );
+    m_Pos.y += aXaxis_position;
+}
+
+
+void SCH_JUNCTION::Mirror_Y( int aYaxis_position )
+{
+    m_Pos.x -= aYaxis_position;
+    NEGATE(  m_Pos.x );
+    m_Pos.x += aYaxis_position;
+}
+
+
+void SCH_JUNCTION::Rotate( wxPoint rotationPoint )
+{
+    RotatePoint( &m_Pos, rotationPoint, 900 );
+}
+
+
 #if defined(DEBUG)
 void SCH_JUNCTION::Show( int nestLevel, std::ostream& os )
 {
@@ -284,6 +332,7 @@ EDA_Rect SCH_NO_CONNECT::GetBoundingBox()
 {
     int      delta = ( GetPenSize() + m_Size.x ) / 2;
     EDA_Rect box;
+
     box.SetOrigin( m_Pos );
     box.Inflate( delta );
 
@@ -360,6 +409,28 @@ void SCH_NO_CONNECT::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
 }
 
 
+void SCH_NO_CONNECT::Mirror_X( int aXaxis_position )
+{
+    m_Pos.y -= aXaxis_position;
+    NEGATE(  m_Pos.y );
+    m_Pos.y += aXaxis_position;
+}
+
+
+void SCH_NO_CONNECT::Mirror_Y( int aYaxis_position )
+{
+    m_Pos.x -= aYaxis_position;
+    NEGATE(  m_Pos.x );
+    m_Pos.x += aYaxis_position;
+}
+
+
+void SCH_NO_CONNECT::Rotate( wxPoint rotationPoint )
+{
+    RotatePoint( &m_Pos, rotationPoint, 900 );
+}
+
+
 /******************/
 /* Class SCH_LINE */
 /******************/
@@ -431,6 +502,7 @@ void SCH_LINE::Show( int nestLevel, std::ostream& os )
                                  << GetClass().Lower().mb_str() << ">\n";
 }
 
+
 #endif
 
 
@@ -530,6 +602,35 @@ void SCH_LINE::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
 }
 
 
+void SCH_LINE::Mirror_X( int aXaxis_position )
+{
+    m_Start.y -= aXaxis_position;
+    NEGATE(  m_Start.y );
+    m_Start.y += aXaxis_position;
+    m_End.y   -= aXaxis_position;
+    NEGATE(  m_End.y );
+    m_End.y += aXaxis_position;
+}
+
+
+void SCH_LINE::Mirror_Y( int aYaxis_position )
+{
+    m_Start.x -= aYaxis_position;
+    NEGATE(  m_Start.x );
+    m_Start.x += aYaxis_position;
+    m_End.x   -= aYaxis_position;
+    NEGATE(  m_End.x );
+    m_End.x += aYaxis_position;
+}
+
+
+void SCH_LINE::Rotate( wxPoint rotationPoint )
+{
+    RotatePoint( &m_Start, rotationPoint, 900 );
+    RotatePoint( &m_End, rotationPoint, 900 );
+}
+
+
 /***********************/
 /* Class SCH_POLYLINE */
 /***********************/
@@ -648,3 +749,34 @@ void SCH_POLYLINE::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
                       m_PolyPoints[i].y + offset.y, width, color );
     }
 }
+
+
+void SCH_POLYLINE::Mirror_X( int aXaxis_position )
+{
+    for( unsigned ii = 0; ii < GetCornerCount(); ii++ )
+    {
+        m_PolyPoints[ii].y -= aXaxis_position;
+        NEGATE(  m_PolyPoints[ii].y );
+        m_PolyPoints[ii].y = aXaxis_position;
+    }
+}
+
+
+void SCH_POLYLINE::Mirror_Y( int aYaxis_position )
+{
+    for( unsigned ii = 0; ii < GetCornerCount(); ii++ )
+    {
+        m_PolyPoints[ii].x -= aYaxis_position;
+        NEGATE(  m_PolyPoints[ii].x );
+        m_PolyPoints[ii].x = aYaxis_position;
+    }
+}
+
+
+void SCH_POLYLINE::Rotate( wxPoint rotationPoint )
+{
+    for( unsigned ii = 0; ii < GetCornerCount(); ii++ )
+    {
+        RotatePoint( &m_PolyPoints[ii], rotationPoint, 900 );
+    }
+}

eeschema/class_schematic_items.h

@@ -71,14 +71,15 @@ public:
     /** Function GetPenSize
      * @return the size of the "pen" that be used to draw or plot this item
      */
-    virtual int GetPenSize( );
+    virtual int  GetPenSize();
 
     // Geometric transforms (used in block operations):
+
     /** virtual function Move
      * move item to a new position.
      * @param aMoveVector = the displacement vector
      */
-    virtual void Move(const wxPoint& aMoveVector)
+    virtual void Move( const wxPoint& aMoveVector )
     {
         if( (m_Flags & STARTPOINT) == 0 )
             m_Start += aMoveVector;
@@ -86,22 +87,18 @@ public:
             m_End += aMoveVector;
     }
 
+
     /** virtual function Mirror_Y
      * mirror item relative to an Y axis
      * @param aYaxis_position = the y axis position
      */
-    virtual void Mirror_Y(int aYaxis_position)
-    {
-        m_Start.x -= aYaxis_position;
-        NEGATE(  m_Start.x );
-        m_Start.x += aYaxis_position;
-        m_End.x -= aYaxis_position;
-        NEGATE(  m_End.x );
-        m_End.x += aYaxis_position;
-    }
+    virtual void Mirror_X( int aXaxis_position );
+    virtual void Mirror_Y( int aYaxis_position );
+    virtual void Rotate( wxPoint rotationPoint );
 
 #if defined(DEBUG)
     void         Show( int nestLevel, std::ostream& os );
+
 #endif
 };
 
@@ -126,7 +123,7 @@ public:
     /** Function GetPenSize
      * @return the size of the "pen" that be used to draw or plot this item
      */
-    virtual int GetPenSize( );
+    virtual int     GetPenSize();
 
     virtual void    Draw( WinEDA_DrawPanel* panel, wxDC* DC,
                           const wxPoint& offset, int draw_mode,
@@ -158,25 +155,24 @@ public:
     EDA_Rect        GetBoundingBox();
 
     // Geometric transforms (used in block operations):
+
     /** virtual function Move
      * move item to a new position.
      * @param aMoveVector = the displacement vector
      */
-    virtual void Move(const wxPoint& aMoveVector)
+    virtual void Move( const wxPoint& aMoveVector )
     {
         m_Pos += aMoveVector;
     }
 
+
     /** virtual function Mirror_Y
      * mirror item relative to an Y axis
      * @param aYaxis_position = the y axis position
      */
-    virtual void Mirror_Y(int aYaxis_position)
-    {
-        m_Pos.x -= aYaxis_position;
-        NEGATE(  m_Pos.x );
-        m_Pos.x += aYaxis_position;
-    }
+    virtual void Mirror_Y( int aYaxis_position );
+    virtual void Mirror_X( int aXaxis_position );
+    virtual void Rotate( wxPoint rotationPoint );
 };
 
 
@@ -230,29 +226,27 @@ public:
     /** Function GetPenSize
      * @return the size of the "pen" that be used to draw or plot this item
      */
-    virtual int GetPenSize( );
+    virtual int    GetPenSize();
 
     // Geometric transforms (used in block operations):
+
     /** virtual function Move
      * move item to a new position.
      * @param aMoveVector = the displacement vector
      */
-    virtual void Move(const wxPoint& aMoveVector)
+    virtual void Move( const wxPoint& aMoveVector )
     {
         m_Pos += aMoveVector;
     }
 
+
     /** virtual function Mirror_Y
      * mirror item relative to an Y axis
      * @param aYaxis_position = the y axis position
      */
-    virtual void Mirror_Y(int aYaxis_position)
-    {
-        m_Pos.x -= aYaxis_position;
-        NEGATE(  m_Pos.x );
-        m_Pos.x += aYaxis_position;
-        NEGATE(  m_Size.x );
-    }
+    virtual void Mirror_Y( int aYaxis_position );
+    virtual void Mirror_X( int aXaxis_position );
+    virtual void Rotate( wxPoint rotationPoint );
 };
 
 class SCH_POLYLINE : public SCH_ITEM
@@ -293,6 +287,7 @@ public:
         m_PolyPoints.push_back( point );
     }
 
+
     /** Function GetCornerCount
      * @return the number of corners
      */
@@ -302,31 +297,28 @@ public:
     /** Function GetPenSize
      * @return the size of the "pen" that be used to draw or plot this item
      */
-    virtual int GetPenSize( );
+    virtual int GetPenSize();
 
     // Geometric transforms (used in block operations):
+
     /** virtual function Move
      * move item to a new position.
      * @param aMoveVector = the displacement vector
      */
-    virtual void Move(const wxPoint& aMoveVector)
+    virtual void Move( const wxPoint& aMoveVector )
     {
         for( unsigned ii = 0; ii < GetCornerCount(); ii++ )
             m_PolyPoints[ii] += aMoveVector;
     }
+
+
     /** virtual function Mirror_Y
      * mirror item relative to an Y axis
      * @param aYaxis_position = the y axis position
      */
-    virtual void Mirror_Y(int aYaxis_position)
-    {
-        for( unsigned ii = 0; ii < GetCornerCount(); ii++ )
-        {
-            m_PolyPoints[ii].x -= aYaxis_position;
-            NEGATE(  m_PolyPoints[ii].x );
-            m_PolyPoints[ii].x = aYaxis_position;
-        }
-    }
+    virtual void Mirror_Y( int aYaxis_position );
+    virtual void Mirror_X( int aXaxis_position );
+    virtual void Rotate( wxPoint rotationPoint );
 };
 
 
@@ -367,10 +359,11 @@ public:
     /** Function GetPenSize
      * @return the size of the "pen" that be used to draw or plot this item
      */
-    virtual int GetPenSize( );
+    virtual int   GetPenSize();
 
     virtual void  Draw( WinEDA_DrawPanel* panel, wxDC* DC,
                         const wxPoint& offset, int draw_mode, int Color = -1 );
+
     /**
      * Function Save
      * writes the data structures for this object out to a FILE in "*.sch"
@@ -381,28 +374,28 @@ public:
     bool          Save( FILE* aFile ) const;
 
     // Geometric transforms (used in block operations):
+
     /** virtual function Move
      * move item to a new position.
      * @param aMoveVector = the displacement vector
      */
-    virtual void Move(const wxPoint& aMoveVector)
+    virtual void Move( const wxPoint& aMoveVector )
     {
         m_Pos += aMoveVector;
     }
 
+
     /** virtual function Mirror_Y
      * mirror item relative to an Y axis
      * @param aYaxis_position = the y axis position
      */
-    virtual void Mirror_Y(int aYaxis_position)
-    {
-        m_Pos.x -= aYaxis_position;
-        NEGATE(  m_Pos.x );
-        m_Pos.x += aYaxis_position;
-    }
+    virtual void Mirror_Y( int aYaxis_position );
+    virtual void Mirror_X( int aXaxis_position );
+    virtual void Rotate( wxPoint rotationPoint );
 
 #if defined(DEBUG)
     void         Show( int nestLevel, std::ostream& os );
+
 #endif
 };
 

eeschema/class_text-label.cpp

@@ -218,10 +218,18 @@ void SCH_TEXT::Mirror_Y( int aYaxis_position )
         dx = LenSize( m_Text ) / 2;
         break;
 
+    case 1: /* Vert Orientation UP */
+        dx = -m_Size.x / 2;
+        break;
+
     case 2:        /* invert horizontal text*/
         dx = -LenSize( m_Text ) / 2;
         break;
 
+    case 3: /*  Vert Orientation BOTTOM */
+        dx = m_Size.x / 2;
+        break;
+
     default:
         dx = 0;
         break;
@@ -236,6 +244,84 @@ void SCH_TEXT::Mirror_Y( int aYaxis_position )
 }
 
 
+/** virtual function Mirror_X
+ * mirror item relative to an X axis
+ * @param aXaxis_position = the x axis position
+ */
+void SCH_TEXT::Mirror_X( int aXaxis_position )
+{
+    // Text is NOT really mirrored; it is moved to a suitable position
+    // which is the closest position for a true mirrored text
+    // The center position is mirrored and the text is moved for half
+    // horizontal len
+    int py = m_Pos.y;
+    int dy;
+
+    switch( GetSchematicTextOrientation() )
+    {
+    case 0:             /* horizontal text */
+        dy = -m_Size.y / 2;
+        break;
+
+    case 1: /* Vert Orientation UP */
+        dy = -LenSize( m_Text ) / 2;
+        break;
+
+    case 2:                 /* invert horizontal text*/
+        dy = m_Size.y / 2;  // how to calculate text height?
+        break;
+
+    case 3: /*  Vert Orientation BOTTOM */
+        dy = LenSize( m_Text ) / 2;
+        break;
+
+    default:
+        dy = 0;
+        break;
+    }
+
+    py += dy;
+    py -= aXaxis_position;
+    NEGATE( py );
+    py += aXaxis_position;
+    py -= dy;
+    m_Pos.y = py;
+}
+
+
+void SCH_TEXT::Rotate( wxPoint rotationPoint )
+{
+    int dy;
+
+    RotatePoint( &m_Pos, rotationPoint, 900 );
+    SetSchematicTextOrientation( (GetSchematicTextOrientation() + 1) % 4 );
+    switch( GetSchematicTextOrientation() )
+    {
+    case 0:             /* horizontal text */
+        dy = m_Size.y;
+        break;
+
+    case 1: /* Vert Orientation UP */
+        dy = 0;
+        break;
+
+    case 2:        /* invert horizontal text*/
+        dy = m_Size.y;
+        break;
+
+    case 3: /*  Vert Orientation BOTTOM */
+        dy = 0;
+        break;
+
+    default:
+        dy = 0;
+        break;
+    }
+
+    m_Pos.y += dy;
+}
+
+
 /** function GetSchematicTextOffset (virtual)
  * @return the offset between the SCH_TEXT position and the text itself
  * position
@@ -302,6 +388,32 @@ void SCH_HIERLABEL::Mirror_Y( int aYaxis_position )
 }
 
 
+void SCH_HIERLABEL::Mirror_X( int aXaxis_position )
+{
+    switch( GetSchematicTextOrientation() )
+    {
+    case 1:             /* vertical text */
+        SetSchematicTextOrientation( 3 );
+        break;
+
+    case 3:        /* invert vertical text*/
+        SetSchematicTextOrientation( 1 );
+        break;
+    }
+
+    m_Pos.y -= aXaxis_position;
+    NEGATE( m_Pos.y );
+    m_Pos.y += aXaxis_position;
+}
+
+
+void SCH_HIERLABEL::Rotate( wxPoint rotationPoint )
+{
+    RotatePoint( &m_Pos, rotationPoint, 900 );
+    SetSchematicTextOrientation( (GetSchematicTextOrientation() + 3) % 4 );
+}
+
+
 /** virtual function Mirror_Y
  * mirror item relative to an Y axis
  * @param aYaxis_position = the y axis position
@@ -330,6 +442,32 @@ void SCH_GLOBALLABEL::Mirror_Y( int aYaxis_position )
 }
 
 
+void SCH_GLOBALLABEL::Mirror_X( int aXaxis_position )
+{
+    switch( GetSchematicTextOrientation() )
+    {
+    case 1:             /* vertical text */
+        SetSchematicTextOrientation( 3 );
+        break;
+
+    case 3:        /* invert vertical text*/
+        SetSchematicTextOrientation( 1 );
+        break;
+    }
+
+    m_Pos.y -= aXaxis_position;
+    NEGATE( m_Pos.y );
+    m_Pos.y += aXaxis_position;
+}
+
+
+void SCH_GLOBALLABEL::Rotate( wxPoint rotationPoint )
+{
+    RotatePoint( &m_Pos, rotationPoint, 900 );
+    SetSchematicTextOrientation( (GetSchematicTextOrientation() + 3) % 4 );
+}
+
+
 /** function GetSchematicTextOffset (virtual)
  * @return the offset between the SCH_TEXT position and the text itself
  * position
@@ -717,6 +855,32 @@ SCH_LABEL::SCH_LABEL( const wxPoint& pos, const wxString& text ) :
 }
 
 
+/** virtual function Mirror_X
+ * mirror item relative to an X axis
+ * @param aXaxis_position = the x axis position
+ */
+void SCH_LABEL::Mirror_X( int aXaxis_position )
+{
+    // Text is NOT really mirrored; it is moved to a suitable position
+    // which is the closest position for a true mirrored text
+    // The center position is mirrored and the text is moved for half
+    // horizontal len
+    int py = m_Pos.y;
+
+    py -= aXaxis_position;
+    NEGATE( py );
+    py += aXaxis_position;
+    m_Pos.y = py;
+}
+
+
+void SCH_LABEL::Rotate( wxPoint rotationPoint )
+{
+    RotatePoint( &m_Pos, rotationPoint, 900 );
+    SetSchematicTextOrientation( (GetSchematicTextOrientation() + 1) % 4 );
+}
+
+
 /**
  * Function Save
  * writes the data structures for this object out to a FILE in "*.brd" format.
@@ -795,8 +959,8 @@ bool SCH_GLOBALLABEL::HitTest( const wxPoint& aPosRef )
 
 
 /*****************************************************************************/
-SCH_HIERLABEL::SCH_HIERLABEL( const wxPoint& pos, const wxString& text ) :
-    SCH_TEXT( pos, text, TYPE_SCH_HIERLABEL )
+SCH_HIERLABEL::SCH_HIERLABEL( const wxPoint& pos, const wxString& text, KICAD_T aType ) :
+    SCH_TEXT( pos, text, aType )
 {
 /*****************************************************************************/
     m_Layer = LAYER_HIERLABEL;

eeschema/class_text-label.h

@@ -49,7 +49,6 @@ protected:
                                      * Saving file
                                      */
 
-
 public:
     SCH_TEXT( const wxPoint& pos = wxPoint( 0, 0 ),
               const wxString& text = wxEmptyString,
@@ -143,7 +142,10 @@ public:
      * mirror item relative to an Y axis
      * @param aYaxis_position = the y axis position
      */
+    virtual void Rotate( wxPoint rotationPoint );
     virtual void Mirror_Y( int aYaxis_position );
+    virtual void Mirror_X( int aXaxis_position );
+
 
     /**
      * Compare schematic text entry against search string.
@@ -152,7 +154,7 @@ public:
      * @param aAuxData - a pointer on auxiliary data, if needed. Can be null
      * @return True if this schematic text item matches the search criteria.
      */
-    virtual bool Matches( wxFindReplaceData& aSearchData, void * aAuxData );
+    virtual bool Matches( wxFindReplaceData& aSearchData, void* aAuxData );
 
 #if defined(DEBUG)
     void         Show( int nestLevel, std::ostream& os );
@@ -201,6 +203,8 @@ public:
      * wire)
      */
     virtual wxPoint GetSchematicTextOffset();
+    virtual void    Mirror_X( int aXaxis_position );
+    virtual void    Rotate( wxPoint rotationPoint );
 
     /**
      * Function GetBoundingBox
@@ -300,6 +304,8 @@ public:
      * @param aYaxis_position = the y axis position
      */
     virtual void    Mirror_Y( int aYaxis_position );
+    virtual void    Mirror_X( int aXaxis_position );
+    virtual void    Rotate( wxPoint rotationPoint );
 };
 
 
@@ -307,7 +313,7 @@ class SCH_HIERLABEL : public SCH_TEXT
 {
 public:
     SCH_HIERLABEL( const wxPoint& pos = wxPoint( 0, 0 ),
-                   const wxString& text = wxEmptyString );
+                   const wxString& text = wxEmptyString, KICAD_T aType = TYPE_SCH_HIERLABEL );
     ~SCH_HIERLABEL() { }
     virtual void Draw( WinEDA_DrawPanel* panel,
                        wxDC*             DC,
@@ -381,6 +387,8 @@ public:
      * @param aYaxis_position = the y axis position
      */
     virtual void    Mirror_Y( int aYaxis_position );
+    virtual void    Mirror_X( int aXaxis_position );
+    virtual void    Rotate( wxPoint rotationPoint );
 };
 
 #endif /* CLASS_TEXT_LABEL_H */

eeschema/dangling_ends.cpp

@@ -61,11 +61,11 @@ bool SegmentIntersect( wxPoint aSegStart, wxPoint aSegEnd, wxPoint aTestPoint )
     wxPoint vectPoint = aTestPoint - aSegStart; // Vector from S1 to P
 
     // Use long long here to avoid overflow in calculations
-    if( (long long)vectSeg.x * vectPoint.y - (long long)vectSeg.y * vectPoint.x )
+    if( (long long) vectSeg.x * vectPoint.y - (long long) vectSeg.y * vectPoint.x )
         return false;        /* Cross product non-zero, vectors not parallel */
 
-    if( ((long long)vectSeg.x * vectPoint.x + (long long)vectSeg.y * vectPoint.y) <
-        ((long long)vectPoint.x * vectPoint.x + (long long)vectPoint.y * vectPoint.y) )
+    if( ( (long long) vectSeg.x * vectPoint.x + (long long) vectSeg.y * vectPoint.y ) <
+       ( (long long) vectPoint.x * vectPoint.x + (long long) vectPoint.y * vectPoint.y ) )
         return false;          /* Point not on segment */
 
     return true;
@@ -100,6 +100,14 @@ void WinEDA_SchematicFrame::TestDanglingEnds( SCH_ITEM* DrawList, wxDC* DC )
             TestLabelForDangling( (SCH_LABEL*) item, this, DC );
             break;
 
+        case DRAW_SHEET_STRUCT_TYPE:
+
+            // Read the hierarchical pins list and teast for dangling pins:
+            BOOST_FOREACH( SCH_SHEET_PIN & sheetPin, ( (SCH_SHEET*) item )->GetSheetPins() ) {
+                TestLabelForDangling( &sheetPin, this, DC );
+            }
+            break;
+
         case DRAW_SEGMENT_STRUCT_TYPE:
             #undef STRUCT
             #define STRUCT ( (SCH_LINE*) item )
@@ -118,7 +126,7 @@ void WinEDA_SchematicFrame::TestDanglingEnds( SCH_ITEM* DrawList, wxDC* DC )
             break;
 
         default:
-            ;
+            break;
         }
     }
 }

eeschema/hotkeys.cpp

@@ -435,7 +435,11 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey,
         break;
 
     case HK_ROTATE:       // Component or other schematic item rotation
-
+        if ( screen->m_BlockLocate.m_State != STATE_NO_BLOCK)//allows bloc operation on hotkey
+        {
+            HandleBlockEndByPopUp(BLOCK_ROTATE, DC );
+            break;
+        } 
         if( DrawStruct == NULL )
         {
             // Find the schematic object to rotate under the cursor
@@ -465,6 +469,9 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey,
 
             switch( DrawStruct->Type() )
             {
+            case DRAW_SHEET_STRUCT_TYPE: //TODO allow sheet rotate on hotkey
+                //wxPostEvent( this, eventRotateSheet );
+                break;
             case TYPE_SCH_COMPONENT:
                 wxPostEvent( this, eventRotateComponent );
                 break;
@@ -487,6 +494,11 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey,
         break;
 
     case HK_MIRROR_Y_COMPONENT:     // Mirror Y (Component)
+        if ( screen->m_BlockLocate.m_State != STATE_NO_BLOCK)
+        {
+            HandleBlockEndByPopUp(BLOCK_MIRROR_Y, DC );
+            break;
+        } 
         if( DrawStruct == NULL )
             DrawStruct = LocateSmallestComponent( (SCH_SCREEN*) GetScreen() );
         if( DrawStruct )
@@ -501,6 +513,11 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey,
         break;
 
     case HK_MIRROR_X_COMPONENT:     // Mirror X (Component)
+        if ( screen->m_BlockLocate.m_State != STATE_NO_BLOCK) //allows bloc operation on hotkey
+		{
+            HandleBlockEndByPopUp(BLOCK_MIRROR_X, DC );
+            break;
+		} 
         if( DrawStruct == NULL )
             DrawStruct = LocateSmallestComponent( GetScreen() );
         if( DrawStruct )

eeschema/onrightclick.cpp

@@ -19,7 +19,6 @@
 using namespace std;
 
 
-
 static void AddMenusForBlock( wxMenu* PopMenu, WinEDA_SchematicFrame* frame );
 static void AddMenusForWire( wxMenu* PopMenu, SCH_LINE* Wire, WinEDA_SchematicFrame* frame );
 static void AddMenusForBus( wxMenu* PopMenu, SCH_LINE* Bus, WinEDA_SchematicFrame* frame );
@@ -223,7 +222,8 @@ void AddMenusForComponentField( wxMenu* PopMenu, SCH_FIELD* Field )
 {
     wxString msg;
 
-    if( !Field->m_Flags ){
+    if( !Field->m_Flags )
+    {
         msg = AddHotkeyName( _( "Move Field" ), s_Schematic_Hokeys_Descr,
                              HK_MOVE_COMPONENT_OR_ITEM );
         ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_ITEM_REQUEST, msg, move_text_xpm );
@@ -630,6 +630,7 @@ void AddMenusForPinSheet( wxMenu* PopMenu, SCH_SHEET_PIN* PinSheet )
 void AddMenusForBlock( wxMenu* PopMenu, WinEDA_SchematicFrame* frame )
 {
     wxString msg;
+
     ADD_MENUITEM( PopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel Block" ), cancel_xpm );
 
     PopMenu->AppendSeparator();
@@ -650,6 +651,9 @@ void AddMenusForBlock( wxMenu* PopMenu, WinEDA_SchematicFrame* frame )
         ADD_MENUITEM( PopMenu, ID_POPUP_DRAG_BLOCK, msg, move_xpm );
         ADD_MENUITEM( PopMenu, ID_POPUP_DELETE_BLOCK, _( "Delete Block" ), delete_xpm );
         ADD_MENUITEM( PopMenu, ID_POPUP_MIRROR_Y_BLOCK, _( "Mirror Block ||" ), mirror_H_xpm );
+        ADD_MENUITEM( PopMenu, ID_POPUP_MIRROR_X_BLOCK, _( "Mirror Block --" ), mirror_V_xpm );
+        ADD_MENUITEM( PopMenu, ID_POPUP_ROTATE_BLOCK, _( "Rotate Block ccw" ), rotate_pos_xpm );
+
 #if 0
   #ifdef __WINDOWS__
         ADD_MENUITEM( menu_other_block_commands, ID_GEN_COPY_BLOCK_TO_CLIPBOARD,

eeschema/operations_on_items_lists.cpp

 /***************************************************
  *  operations_on_item_lists.cpp
- * functions used in block commands, on lists of schematic items:
- * move, mirror, delete and copy
- ****************************************************/
+ * functions used in block commands, or undo/redo,
+ * to move, mirror, delete, copy ... lists of schematic items
+ */
 
 #include "fctsys.h"
 #include "appl_wxstruct.h"
@@ -14,9 +14,17 @@
 #include "class_marker_sch.h"
 #include "protos.h"
 
+void RotateListOfItems( PICKED_ITEMS_LIST& aItemsList, wxPoint& rotationPoint )
+{
+    for( unsigned ii = 0; ii < aItemsList.GetCount(); ii++ )
+    {
+        SCH_ITEM* item = (SCH_ITEM*) aItemsList.GetPickedItem( ii );
+        item->Rotate( rotationPoint );      // Place it in its new position.
+        item->m_Flags = 0;
+    }
+}
+
 
-void MoveItemsInList( PICKED_ITEMS_LIST& aItemsList, const wxPoint aMoveVector );
-void MirrorListOfItems( PICKED_ITEMS_LIST& aItemsList, wxPoint& aMirrorPoint );
 void DeleteItemsInList( WinEDA_DrawPanel*  panel,
                         PICKED_ITEMS_LIST& aItemsList );
 void DuplicateItemsInList( SCH_SCREEN* screen, PICKED_ITEMS_LIST& aItemsList,
@@ -34,6 +42,17 @@ void MirrorListOfItems( PICKED_ITEMS_LIST& aItemsList, wxPoint& aMirrorPoint )
 }
 
 
+void Mirror_X_ListOfItems( PICKED_ITEMS_LIST& aItemsList, wxPoint& aMirrorPoint )
+{
+    for( unsigned ii = 0; ii < aItemsList.GetCount(); ii++ )
+    {
+        SCH_ITEM* item = (SCH_ITEM*) aItemsList.GetPickedItem( ii );
+        item->Mirror_X( aMirrorPoint.y );      // Place it in its new position.
+        item->m_Flags = 0;
+    }
+}
+
+
 /** Function MoveItemsInList
  *  Move a list of items to a given move vector
  * @param aItemsList = list of picked items
@@ -68,7 +87,8 @@ void DeleteItemsInList( WinEDA_DrawPanel* panel, PICKED_ITEMS_LIST& aItemsList )
         if( item->Type() == DRAW_HIERARCHICAL_PIN_SHEET_STRUCT_TYPE )
         {
             /* this item is depending on a sheet, and is not in global list */
-            wxMessageBox( wxT( "DeleteItemsInList() err: unexpected \
+            wxMessageBox( wxT(
+                             "DeleteItemsInList() err: unexpected \
 DRAW_HIERARCHICAL_PIN_SHEET_STRUCT_TYPE"                                                                     ) );
         }
         else
@@ -102,7 +122,7 @@ void DeleteStruct( WinEDA_DrawPanel* panel, wxDC* DC, SCH_ITEM* DrawStruct )
         /* This structure is attached to a node, and is not accessible by
          * the global list directly. */
         frame->SaveCopyInUndoList(
-            (SCH_ITEM*) ( (SCH_SHEET_PIN*) DrawStruct )-> GetParent(),
+            (SCH_ITEM*)( (SCH_SHEET_PIN*) DrawStruct )->GetParent(),
             UR_CHANGED );
         frame->DeleteSheetLabel( DC ? true : false,
                                  (SCH_SHEET_PIN*) DrawStruct );
@@ -248,9 +268,10 @@ SCH_ITEM* DuplicateStruct( SCH_ITEM* aDrawStruct, bool aClone )
 
     case DRAW_SHEET_STRUCT_TYPE:
         NewDrawStruct = ( (SCH_SHEET*) aDrawStruct )->GenCopy();
-        if ( aClone )
+        if( aClone )
         {
-            ((SCH_SHEET*)NewDrawStruct)->m_SheetName = ((SCH_SHEET*)aDrawStruct)->m_SheetName;
+            ( (SCH_SHEET*) NewDrawStruct )->m_SheetName =
+                ( (SCH_SHEET*) aDrawStruct )->m_SheetName;
         }
         break;
 
@@ -264,7 +285,7 @@ SCH_ITEM* DuplicateStruct( SCH_ITEM* aDrawStruct, bool aClone )
     break;
     }
 
-    if ( aClone )
+    if( aClone )
         NewDrawStruct->m_TimeStamp = aDrawStruct->m_TimeStamp;
 
     NewDrawStruct->m_Image = aDrawStruct;

eeschema/plot.cpp

@@ -242,6 +242,7 @@ static void PlotTextStruct( PLOTTER* plotter, SCH_TEXT* aSchText )
 
     switch( aSchText->Type() )
     {
+    case DRAW_HIERARCHICAL_PIN_SHEET_STRUCT_TYPE:
     case TYPE_SCH_GLOBALLABEL:
     case TYPE_SCH_HIERLABEL:
     case TYPE_SCH_LABEL:
@@ -293,7 +294,8 @@ static void PlotTextStruct( PLOTTER* plotter, SCH_TEXT* aSchText )
                                                              aSchText->m_Pos );
         plotter->poly( Poly.size(), &Poly[0].x, NO_FILL );
     }
-    if( aSchText->Type() == TYPE_SCH_HIERLABEL )
+    if( ( aSchText->Type() == TYPE_SCH_HIERLABEL )
+       || ( aSchText->Type() == DRAW_HIERARCHICAL_PIN_SHEET_STRUCT_TYPE) )
     {
         ( (SCH_HIERLABEL*) aSchText )->CreateGraphicShape( Poly,
                                                            aSchText->m_Pos );
@@ -307,6 +309,8 @@ static void PlotSheetStruct( PLOTTER* plotter, SCH_SHEET* Struct )
     EDA_Colors txtcolor = UNSPECIFIED_COLOR;
     wxSize     size;
     wxString   Text;
+    int        name_orientation;
+    wxPoint    pos_sheetname, pos_filename;
     wxPoint    pos;
 
     plotter->set_color( ReturnLayerColor( Struct->m_Layer ) );
@@ -326,18 +330,32 @@ static void PlotSheetStruct( PLOTTER* plotter, SCH_SHEET* Struct )
     plotter->line_to( pos );
     plotter->finish_to( Struct->m_Pos );
 
+    if( Struct->IsVerticalOrientation() )
+    {
+        pos_sheetname    = wxPoint( Struct->m_Pos.x - 8, Struct->m_Pos.y + Struct->m_Size.y );
+        pos_filename     = wxPoint( Struct->m_Pos.x + Struct->m_Size.x + 4,
+                                    Struct->m_Pos.y + Struct->m_Size.y );
+        name_orientation = TEXT_ORIENT_VERT;
+    }
+    else
+    {
+        pos_sheetname    = wxPoint( Struct->m_Pos.x, Struct->m_Pos.y - 4 );
+        pos_filename     = wxPoint( Struct->m_Pos.x, Struct->m_Pos.y + Struct->m_Size.y + 4 );
+        name_orientation = TEXT_ORIENT_HORIZ;
+    }
     /* Draw texts: SheetName */
     Text = Struct->m_SheetName;
     size = wxSize( Struct->m_SheetNameSize, Struct->m_SheetNameSize );
-    pos  = Struct->m_Pos; pos.y -= 4;
+
+    //pos  = Struct->m_Pos; pos.y -= 4;
     thickness = g_DrawDefaultLineThickness;
     thickness = Clamp_Text_PenSize( thickness, size, false );
 
     plotter->set_color( ReturnLayerColor( LAYER_SHEETNAME ) );
 
     bool italic = false;
-    plotter->text( pos, txtcolor,
-                   Text, TEXT_ORIENT_HORIZ, size,
+    plotter->text( pos_sheetname, txtcolor,
+                   Text, name_orientation, size,
                    GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_BOTTOM,
                    thickness, italic, false );
 
@@ -349,17 +367,17 @@ static void PlotSheetStruct( PLOTTER* plotter, SCH_SHEET* Struct )
 
     plotter->set_color( ReturnLayerColor( LAYER_SHEETFILENAME ) );
 
-    plotter->text( wxPoint( Struct->m_Pos.x, Struct->m_Pos.y + Struct->m_Size.y + 4 ),
-                   txtcolor, Text, TEXT_ORIENT_HORIZ, size,
+    plotter->text( pos_filename, txtcolor,
+                   Text, name_orientation, size,
                    GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_TOP,
                    thickness, italic, false );
 
     plotter->set_color( ReturnLayerColor( Struct->m_Layer ) );
 
     /* Draw texts : SheetLabel */
-    BOOST_FOREACH( SCH_SHEET_PIN& pin_sheet, Struct->GetSheetPins() )
-    {
-        pin_sheet.Plot( plotter );
+    BOOST_FOREACH( SCH_SHEET_PIN & pin_sheet, Struct->GetSheetPins() ) {
+        //pin_sheet.Plot( plotter );
+        PlotTextStruct( plotter, &pin_sheet );
     }
 }
 

eeschema/read_from_file_schematic_items_descriptions.cpp

@@ -323,7 +323,7 @@ error line %d, aborted\n" ),
             if( size == 0 )
                 size = DEFAULT_SIZE_TEXT;
             SheetLabelStruct->m_Size.x = SheetLabelStruct->m_Size.y = size;
-
+            SheetLabelStruct->m_Pos.x=x; //to readjust x of first label if vertical
             switch( Char1[0] )
             {
             case 'I':
@@ -347,9 +347,22 @@ error line %d, aborted\n" ),
                 break;
             }
 
-            if( Char2[0] == 'R' )
-                SheetLabelStruct->m_Edge = 1;
-
+            switch( Char2[0] ) 
+            {
+            case 'R' : /* pin on right side */
+                SheetLabelStruct->SetEdge(1);
+                break;
+            case 'T' : /* pin on top side */
+                SheetLabelStruct->SetEdge(2);
+                break;
+            case 'B' : /* pin on bottom side */
+                SheetLabelStruct->SetEdge(3);
+                break;
+            case 'L' : /* pin on left side */
+            default  :
+                SheetLabelStruct->SetEdge(0);
+                break;
+            }
             SheetStruct->AddLabel( SheetLabelStruct );
         }
     }

eeschema/schedit.cpp

@@ -124,7 +124,7 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
                                                 m_PanelDefaultCursor ) );
 
         // Stop the current command (if any) but keep the current tool
-        DrawPanel->UnManageCursor( );
+        DrawPanel->UnManageCursor();
 
         /* Should not be executed, except bug. */
         if( screen->m_BlockLocate.m_Command != BLOCK_IDLE )
@@ -137,11 +137,13 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
 
     case ID_POPUP_SCH_DELETE_CMP:
     case ID_POPUP_SCH_DELETE:
+
         // Stop the current command (if any) but keep the current tool
-        DrawPanel->UnManageCursor( );
+        DrawPanel->UnManageCursor();
         break;
 
     default:
+
         // Stop the current command and deselect the current tool
         DrawPanel->m_PanelCursor = DrawPanel->m_PanelDefaultCursor =
                                        wxCURSOR_ARROW;
@@ -374,12 +376,12 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
         break;
 
     case ID_POPUP_IMPORT_GLABEL:
-        if ( screen->GetCurItem() && screen->GetCurItem()->Type() == DRAW_SHEET_STRUCT_TYPE )
-            GetScreen()->SetCurItem( Import_PinSheet( (SCH_SHEET*)screen->GetCurItem(), &dc ) );
+        if( screen->GetCurItem() && screen->GetCurItem()->Type() == DRAW_SHEET_STRUCT_TYPE )
+            GetScreen()->SetCurItem( Import_PinSheet( (SCH_SHEET*) screen->GetCurItem(), &dc ) );
         break;
 
     case ID_POPUP_SCH_CLEANUP_SHEET:
-        if ( screen->GetCurItem() && screen->GetCurItem()->Type() == DRAW_SHEET_STRUCT_TYPE )
+        if( screen->GetCurItem() && screen->GetCurItem()->Type() == DRAW_SHEET_STRUCT_TYPE )
         {
             SCH_SHEET* sheet = (SCH_SHEET*) screen->GetCurItem();
 
@@ -407,11 +409,12 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
 
     case ID_POPUP_SCH_MOVE_PINSHEET:
         DrawPanel->MouseToCursorSchema();
-        StartMove_PinSheet( (SCH_SHEET_PIN*)screen->GetCurItem(), &dc );
+        StartMove_PinSheet( (SCH_SHEET_PIN*) screen->GetCurItem(), &dc );
         break;
 
     case ID_POPUP_SCH_DRAG_CMP_REQUEST:
     case ID_POPUP_SCH_MOVE_CMP_REQUEST:
+
         // Ensure the struct is a component (could be a struct of a
         // component, like Field, text..) or a hierachical sheet
         // or a label
@@ -423,6 +426,7 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
             screen->SetCurItem( LocateSmallestComponent( screen ) );
         if( screen->GetCurItem() == NULL )
             break;
+
     // fall through
     case ID_POPUP_SCH_MOVE_ITEM_REQUEST:
         DrawPanel->MouseToCursorSchema();
@@ -435,8 +439,9 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
                 if( !HandleBlockBegin( &dc, BLOCK_DRAG,
                                        screen->m_Curseur ) )
                     break;
+
                 // Give a non null size to the search block:
-                screen->m_BlockLocate.Inflate(1);
+                screen->m_BlockLocate.Inflate( 1 );
                 HandleBlockEnd( &dc );
             }
         }
@@ -446,6 +451,7 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
 
     case ID_POPUP_SCH_DRAG_WIRE_REQUEST:
         DrawPanel->MouseToCursorSchema();
+
         // The easiest way to handle a drag component is to simulate a
         // block drag command
         if( screen->m_BlockLocate.m_State == STATE_NO_BLOCK )
@@ -453,6 +459,7 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
             if( !HandleBlockBegin( &dc, BLOCK_DRAG,
                                    screen->m_Curseur ) )
                 break;
+
             // Ensure the block selection contains the segment, or one end of
             // the segment.  The initial rect is only one point (w = h = 0)
             // The rect must contains one or 2 ends.
@@ -461,12 +468,12 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
             // whole segment.  This works fine only for H and V segments and
             // only if they do not cross a component
             // TODO: a better way to drag only wires
-            SCH_LINE* segm = (SCH_LINE*)screen->GetCurItem();
-            if( !screen->m_BlockLocate.Inside(segm->m_Start) &&
-                !screen->m_BlockLocate.Inside(segm->m_End) )
+            SCH_LINE* segm = (SCH_LINE*) screen->GetCurItem();
+            if( !screen->m_BlockLocate.Inside( segm->m_Start )
+               && !screen->m_BlockLocate.Inside( segm->m_End ) )
             {
-                screen->m_BlockLocate.SetOrigin(segm->m_Start);
-                screen->m_BlockLocate.SetEnd(segm->m_End);
+                screen->m_BlockLocate.SetOrigin( segm->m_Start );
+                screen->m_BlockLocate.SetEnd( segm->m_End );
             }
             HandleBlockEnd( &dc );
         }
@@ -686,6 +693,10 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
         break;
 
     case ID_POPUP_MIRROR_X_BLOCK:
+        DrawPanel->MouseToCursorSchema();
+        HandleBlockEndByPopUp( BLOCK_MIRROR_X, &dc );
+        break;
+
     case ID_POPUP_MIRROR_Y_BLOCK:
         DrawPanel->MouseToCursorSchema();
         HandleBlockEndByPopUp( BLOCK_MIRROR_Y, &dc );
@@ -717,7 +728,7 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
                            LAYER_LOCLABEL : LAYER_GLOBLABEL ) );
         if( screen->GetCurItem() )
         {
-            ((SCH_ITEM*)screen->GetCurItem())->Place( this, &dc );
+            ( (SCH_ITEM*) screen->GetCurItem() )->Place( this, &dc );
             TestDanglingEnds( screen->EEDrawList, &dc );
             screen->SetCurItem( NULL );
         }
@@ -726,7 +737,7 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
     case ID_POPUP_SCH_GETINFO_MARKER:
         if( screen->GetCurItem()
             && screen->GetCurItem()->Type() == TYPE_SCH_MARKER )
-            ((SCH_MARKER*)screen->GetCurItem())->DisplayMarkerInfo( this );
+            ( (SCH_MARKER*) screen->GetCurItem() )->DisplayMarkerInfo( this );
         break;
 
     default:        // Log error:

eeschema/schematic_undo_redo.cpp

@@ -157,8 +157,7 @@ void SwapData( EDA_BaseStruct* aItem, EDA_BaseStruct* aImage )
         #undef DEST
         #define SOURCE ( (SCH_SHEET_PIN*) aItem )
         #define DEST   ( (SCH_SHEET_PIN*) aImage )
-        EXCHG( SOURCE->m_Edge, DEST->m_Edge );
-        EXCHG( SOURCE->m_Shape, DEST->m_Shape );
+        DEST->SwapData( SOURCE );
         break;
 
     case DRAW_NOCONNECT_STRUCT_TYPE:
@@ -174,13 +173,12 @@ void SwapData( EDA_BaseStruct* aItem, EDA_BaseStruct* aImage )
 
     // not directly used in schematic:
     default:
-        wxMessageBox(wxT( "SwapData() error: unexpected type" ) );
+        wxMessageBox( wxT( "SwapData() error: unexpected type" ) );
         break;
     }
 }
 
 
-
 /** function SaveCopyInUndoList
  * Create a copy of the current schematic item, and put it in the undo list.
  *
@@ -233,7 +231,7 @@ void WinEDA_SchematicFrame::SaveCopyInUndoList( SCH_ITEM*      aItem,
     case UR_CHANGED:            /* Create a copy of item */
         CopyOfItem = DuplicateStruct( aItem, true );
         itemWrapper.m_Link = CopyOfItem;
-        if ( CopyOfItem )
+        if( CopyOfItem )
             commandToUndo->PushItem( itemWrapper );
         break;
 
@@ -276,7 +274,9 @@ void WinEDA_SchematicFrame::SaveCopyInUndoList( PICKED_ITEMS_LIST& aItemsList,
                                                 const wxPoint&     aTransformPoint )
 {
     PICKED_ITEMS_LIST* commandToUndo = new PICKED_ITEMS_LIST();
+
     commandToUndo->m_TransformPoint = aTransformPoint;
+
     // Copy picker list:
     commandToUndo->CopyList( aItemsList );
 
@@ -290,23 +290,26 @@ void WinEDA_SchematicFrame::SaveCopyInUndoList( PICKED_ITEMS_LIST& aItemsList,
         if( command == UR_UNSPECIFIED )
         {
             command = aTypeCommand;
-            commandToUndo->SetPickedItemStatus(command, ii );
+            commandToUndo->SetPickedItemStatus( command, ii );
         }
 
         switch( command )
         {
         case UR_CHANGED:        /* Create a copy of item */
+
             /* If needed, create a copy of item, and put in undo list
              * in the picker, as link
              * If this link is not null, the copy is already done
              */
-            if( commandToUndo->GetPickedItemLink(ii) == NULL )
+            if( commandToUndo->GetPickedItemLink( ii ) == NULL )
                 commandToUndo->SetPickedItemLink( DuplicateStruct( item, true ), ii );
-            wxASSERT( commandToUndo->GetPickedItemLink(ii) );
+            wxASSERT( commandToUndo->GetPickedItemLink( ii ) );
             break;
 
         case UR_MOVED:
         case UR_MIRRORED_Y:
+        case UR_MIRRORED_X:
+        case UR_ROTATED:
         case UR_NEW:
         case UR_DELETED:
             break;
@@ -351,11 +354,11 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( PICKED_ITEMS_LIST* aList,
     // Undo in the reverse order of list creation: (this can allow stacked
     // changes like the same item can be changes and deleted in the same
     // complex command
-    for( int ii = aList->GetCount()-1; ii >= 0 ; ii--  )
+    for( int ii = aList->GetCount() - 1; ii >= 0; ii--  )
     {
         ITEM_PICKER itemWrapper = aList->GetItemWrapper( ii );
         item = (SCH_ITEM*) itemWrapper.m_PickedItem;
-        if ( item )
+        if( item )
             item->m_Flags = 0;
         SCH_ITEM* image = (SCH_ITEM*) itemWrapper.m_Link;
         switch( itemWrapper.m_UndoRedoStatus )
@@ -376,9 +379,9 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( PICKED_ITEMS_LIST* aList,
             break;
 
         case UR_MOVED:
-            item->m_Flags = aList->GetPickerFlags(ii);
+            item->m_Flags = aList->GetPickerFlags( ii );
             item->Move( aRedoCommand ?
-                        aList->m_TransformPoint : - aList->m_TransformPoint );
+                        aList->m_TransformPoint : -aList->m_TransformPoint );
             item->m_Flags = 0;
             break;
 
@@ -389,6 +392,22 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( PICKED_ITEMS_LIST* aList,
         }
         break;
 
+        case UR_MIRRORED_X:
+        {
+            wxPoint mirrorPoint = aList->m_TransformPoint;
+            item->Mirror_X( mirrorPoint.y );
+        }
+        break;
+
+        case UR_ROTATED:
+        {
+            wxPoint RotationPoint = aList->m_TransformPoint;
+            item->Rotate( RotationPoint );
+            item->Rotate( RotationPoint );
+            item->Rotate( RotationPoint );
+        }
+        break;
+
         case UR_WIRE_IMAGE:
             /* Exchange the current wires and the old wires */
             alt_item = GetScreen()->ExtractWires( false );
@@ -423,7 +442,7 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( PICKED_ITEMS_LIST* aList,
  *  - Get the previous version of the schematic from undo list
  *  @return none
  */
-void WinEDA_SchematicFrame::GetSchematicFromUndoList(wxCommandEvent& event)
+void WinEDA_SchematicFrame::GetSchematicFromUndoList( wxCommandEvent& event )
 {
     if( GetScreen()->GetUndoCommandCount() <= 0 )
         return;
@@ -439,13 +458,13 @@ void WinEDA_SchematicFrame::GetSchematicFromUndoList(wxCommandEvent& event)
     GetScreen()->PushCommandToRedoList( List );
 
 //    m_drawItem = NULL;
-    OnModify( );
+    OnModify();
     SetSheetNumberAndCount();
     ReCreateHToolbar();
     SetToolbars();
 
     TestDanglingEnds( GetScreen()->EEDrawList, NULL );
-    DrawPanel->Refresh( );
+    DrawPanel->Refresh();
 }
 
 
@@ -455,7 +474,7 @@ void WinEDA_SchematicFrame::GetSchematicFromUndoList(wxCommandEvent& event)
  *  - Get the previous version from Redo list
  *  @return none
  */
-void WinEDA_SchematicFrame::GetSchematicFromRedoList(wxCommandEvent& event)
+void WinEDA_SchematicFrame::GetSchematicFromRedoList( wxCommandEvent& event )
 {
     if( GetScreen()->GetRedoCommandCount() == 0 )
         return;
@@ -472,13 +491,13 @@ void WinEDA_SchematicFrame::GetSchematicFromRedoList(wxCommandEvent& event)
     GetScreen()->PushCommandToUndoList( List );
 
 //    m_drawItem = NULL;
-    OnModify( );
+    OnModify();
     SetSheetNumberAndCount();
     ReCreateHToolbar();
     SetToolbars();
 
     TestDanglingEnds( GetScreen()->EEDrawList, NULL );
-    DrawPanel->Refresh( );
+    DrawPanel->Refresh();
 }
 
 

eeschema/sheetlab.cpp

@@ -20,7 +20,7 @@ static void Move_PinSheet( WinEDA_DrawPanel* panel, wxDC* DC, bool erase );
 static int     s_CurrentTypeLabel = NET_INPUT;
 static wxSize  NetSheetTextSize( DEFAULT_SIZE_TEXT, DEFAULT_SIZE_TEXT );
 static wxPoint s_InitialPosition;  // remember the initial value of the pin label when moving it
-
+static int     s_InitialEdge;
 
 /****************************************/
 /* class WinEDA_PinSheetPropertiesFrame */
@@ -50,8 +50,8 @@ private:
 };
 
 BEGIN_EVENT_TABLE( WinEDA_PinSheetPropertiesFrame, wxDialog )
-    EVT_BUTTON( wxID_OK, WinEDA_PinSheetPropertiesFrame::OnOkClick )
-    EVT_BUTTON( wxID_CANCEL, WinEDA_PinSheetPropertiesFrame::OnCancelClick )
+EVT_BUTTON( wxID_OK, WinEDA_PinSheetPropertiesFrame::OnOkClick )
+EVT_BUTTON( wxID_CANCEL, WinEDA_PinSheetPropertiesFrame::OnCancelClick )
 END_EVENT_TABLE()
 
 
@@ -126,6 +126,7 @@ void WinEDA_PinSheetPropertiesFrame::OnOkClick( wxCommandEvent& event )
     EndModal( wxID_OK );
 }
 
+
 /* Called when aborting a move pinsheet label
  * delete a new pin sheet label, or restire its old position
  */
@@ -145,13 +146,9 @@ static void ExitPinSheet( WinEDA_DrawPanel* Panel, wxDC* DC )
     {
         RedrawOneStruct( Panel, DC, SheetLabel, g_XorMode );
         SheetLabel->m_Pos = s_InitialPosition;
-        // Restore edge position:
-        SCH_SHEET* sheet = (SCH_SHEET*) SheetLabel->GetParent();
-        if( s_InitialPosition.x > ( sheet->m_Pos.x + (sheet->m_Size.x / 2) ) )
-            SheetLabel->m_Edge  = 1;
-        else
-            SheetLabel->m_Edge  = 0;
 
+        // Restore edge position:
+        SheetLabel->SetEdge( s_InitialEdge );
         RedrawOneStruct( Panel, DC, SheetLabel, GR_DEFAULT_DRAWMODE );
         SheetLabel->m_Flags = 0;
     }
@@ -165,6 +162,7 @@ static void ExitPinSheet( WinEDA_DrawPanel* Panel, wxDC* DC )
 void SCH_SHEET_PIN::Place( WinEDA_SchematicFrame* frame, wxDC* DC )
 {
     SCH_SHEET* Sheet = (SCH_SHEET*) GetParent();
+
     wxASSERT( Sheet != NULL && Sheet->Type() == DRAW_SHEET_STRUCT_TYPE );
     SAFE_DELETE( g_ItemToUndoCopy );
 
@@ -180,27 +178,12 @@ void SCH_SHEET_PIN::Place( WinEDA_SchematicFrame* frame, wxDC* DC )
     {
         wxPoint tmp = m_Pos;
         m_Pos = s_InitialPosition;
-        m_Edge  = 0;
-        if( m_Pos.x > ( Sheet->m_Pos.x + (Sheet->m_Size.x / 2) ) )
-            m_Edge  = 1;
+        SetEdge( s_InitialEdge );
         frame->SaveCopyInUndoList( Sheet, UR_CHANGED );
         m_Pos = tmp;
     }
 
-    m_Pos.x = Sheet->m_Pos.x;
-    m_Edge  = 0;
-
-    if( frame->GetScreen()->m_Curseur.x > ( Sheet->m_Pos.x + ( Sheet->m_Size.x / 2 ) ) )
-    {
-        m_Edge  = 1;
-        m_Pos.x = Sheet->m_Pos.x + Sheet->m_Size.x;
-    }
-
-    m_Pos.y = frame->GetScreen()->m_Curseur.y;
-    if( m_Pos.y < Sheet->m_Pos.y )
-        m_Pos.y = Sheet->m_Pos.y;
-    if( m_Pos.y > (Sheet->m_Pos.y + Sheet->m_Size.y) )
-        m_Pos.y = Sheet->m_Pos.y + Sheet->m_Size.y;
+    ConstraintOnEdge( frame->GetScreen()->m_Curseur );
 
     RedrawOneStruct( frame->DrawPanel, DC, Sheet, GR_DEFAULT_DRAWMODE );
     frame->DrawPanel->ManageCurseur = NULL;
@@ -215,6 +198,7 @@ void WinEDA_SchematicFrame::StartMove_PinSheet( SCH_SHEET_PIN* SheetLabel,
     s_CurrentTypeLabel   = SheetLabel->m_Shape;
     SheetLabel->m_Flags |= IS_MOVED;
     s_InitialPosition    = SheetLabel->m_Pos;
+    s_InitialEdge = SheetLabel->GetEdge();
 
     DrawPanel->ManageCurseur = Move_PinSheet;
     DrawPanel->ForceCloseManageCurseur = ExitPinSheet;
@@ -229,27 +213,10 @@ static void Move_PinSheet( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
     if( SheetLabel == NULL )
         return;
 
-    SCH_SHEET* Sheet = (SCH_SHEET*) SheetLabel->GetParent();
-
-    if( Sheet == NULL )
-        return;
     if( erase )
         RedrawOneStruct( panel, DC, SheetLabel, g_XorMode );
 
-    SheetLabel->m_Edge  = 0;
-    SheetLabel->m_Pos.x = Sheet->m_Pos.x;
-
-    if( panel->GetScreen()->m_Curseur.x > ( Sheet->m_Pos.x + (Sheet->m_Size.x / 2) ) )
-    {
-        SheetLabel->m_Edge  = 1;
-        SheetLabel->m_Pos.x = Sheet->m_Pos.x + Sheet->m_Size.x;
-    }
-
-    SheetLabel->m_Pos.y = panel->GetScreen()->m_Curseur.y;
-    if( SheetLabel->m_Pos.y < Sheet->m_Pos.y )
-        SheetLabel->m_Pos.y = Sheet->m_Pos.y;
-    if( SheetLabel->m_Pos.y > (Sheet->m_Pos.y + Sheet->m_Size.y) )
-        SheetLabel->m_Pos.y = Sheet->m_Pos.y + Sheet->m_Size.y;
+    SheetLabel->ConstraintOnEdge( panel->GetScreen()->m_Curseur );
 
     RedrawOneStruct( panel, DC, SheetLabel, g_XorMode );
 }
@@ -269,7 +236,7 @@ int WinEDA_SchematicFrame::Edit_PinSheet( SCH_SHEET_PIN* SheetLabel, wxDC* DC )
     int diag = frame->ShowModal();
     frame->Destroy();
 
-    if ( DC )
+    if( DC )
         RedrawOneStruct( DrawPanel, DC, SheetLabel, GR_DEFAULT_DRAWMODE );
 
     return diag;
@@ -302,7 +269,7 @@ SCH_SHEET_PIN* WinEDA_SchematicFrame::Create_PinSheet( SCH_SHEET* Sheet, wxDC* D
     DrawPanel->ForceCloseManageCurseur = ExitPinSheet;
     DrawPanel->ManageCurseur( DrawPanel, DC, TRUE );
 
-    OnModify( );
+    OnModify();
     return NewSheetLabel;
 }
 
@@ -342,7 +309,7 @@ SCH_SHEET_PIN* WinEDA_SchematicFrame::Import_PinSheet( SCH_SHEET* Sheet, wxDC* D
         return NULL;
     }
 
-    OnModify( );
+    OnModify();
     SAFE_DELETE( g_ItemToUndoCopy );
     SaveCopyInUndoList( Sheet, UR_CHANGED );
 

include/sch_item_struct.h

@@ -79,6 +79,9 @@ public:
      * @param aYaxis_position = the y axis position
      */
     virtual void Mirror_Y(int aYaxis_position) = 0;
+    virtual void Mirror_X(int aXaxis_position) = 0;
+    virtual void Rotate(wxPoint rotationPoint) = 0;
+
 
     /**
      * Function Save

kicad/commandframe.cpp

@@ -97,7 +97,7 @@ wxBitmapButton* RIGHT_KM_FRAME::AddBitmapButton( wxWindowID aId, const wxBitmap
 {
     wxPoint buttPos = m_ButtonLastPosition;
     wxSize buttSize;
-    int btn_margin = 8;
+    int btn_margin = 10;
     buttSize.x = aBitmap.GetWidth() + btn_margin;
     buttSize.y = aBitmap.GetHeight() + btn_margin;
     buttPos.y -= buttSize.y;