Eeschema: code cleanup

eeschema/CMakeLists.txt

@@ -14,6 +14,7 @@ set(EESCHEMA_SRCS
     build_BOM.cpp
     busentry.cpp
     bus-wire-junction.cpp
+    class_BodyItem_Text.cpp
     class_drawsheet.cpp
     class_drawsheetpath.cpp
     class_hierarchical_PIN_sheet.cpp

eeschema/class_libentry_fields.cpp

@@ -254,27 +254,53 @@ void LibDrawField::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
  */
 bool LibDrawField::HitTest( const wxPoint& refPos )
 {
-    // Reference designator text has one additional character (displays U?)
+    return HitTest( refPos, 0, DefaultTransformMatrix );
+}
+
+ /** Function HitTest
+ * @return true if the point aPosRef is near this object
+ * @param aPosRef = a wxPoint to test
+ * @param aThreshold =  unused here (TextHitTest calculates its threshold )
+ * @param aTransMat = the transform matrix
+ */
+bool LibDrawField::HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] )
+{
+    int extraCharCount = 0;
+    // Reference designator text has one or 2 additional character (displays U? or U?A)
     if( m_FieldId == REFERENCE )
+    {
+        extraCharCount++;
         m_Text.Append('?');
-    // if using TextHitTest() remember this function uses top to bottom y axis convention
-    // and for lib items we are using bottom to top convention
-    // so for non center Y justification we use a trick.
-    GRTextVertJustifyType vJustify = m_VJustify;
-    if ( m_VJustify == GR_TEXT_VJUSTIFY_TOP )
-        m_VJustify = GR_TEXT_VJUSTIFY_BOTTOM;
-    else if  ( m_VJustify == GR_TEXT_VJUSTIFY_BOTTOM )
-        m_VJustify = GR_TEXT_VJUSTIFY_TOP;
+        EDA_LibComponentStruct* parent = (EDA_LibComponentStruct*)m_Parent;
+        if ( parent && ( parent->m_UnitCount > 1 ) )
+        {
+            m_Text.Append('A');
+            extraCharCount++;
+        }
+    }
 
-    bool hit = TextHitTest(refPos);
-    m_VJustify = vJustify;
+    wxPoint physicalpos = TransformCoordinate( aTransMat, m_Pos );
+    wxPoint tmp = m_Pos;
+    m_Pos = physicalpos;
+    /* The text orientation may need to be flipped if the
+     *  transformation matrix causes xy axes to be flipped.
+     * this simple algo works only for schematic matrix (rot 90 or/and mirror)
+    */
+    int t1 = ( aTransMat[0][0] != 0 ) ^ ( m_Orient != 0 );
+    int orient = t1 ? TEXT_ORIENT_HORIZ : TEXT_ORIENT_VERT;
+    EXCHG( m_Orient, orient );
 
-    if( m_FieldId == REFERENCE )
+    bool hit = TextHitTest(aPosRef);
+
+    EXCHG( m_Orient, orient );
+    m_Pos = tmp;
+
+    while( extraCharCount-- )
         m_Text.RemoveLast( );
+
     return hit;
 }
 
-
 // Creation et Duplication d'un field
 LibDrawField* LibDrawField::GenCopy()
 {

eeschema/class_libentry_fields.h

@@ -74,6 +74,14 @@ public:
      */
     bool HitTest( const wxPoint& refPos );
 
+     /** Function HitTest
+     * @return true if the point aPosRef is near this object
+     * @param aPosRef = a wxPoint to test
+     * @param aThreshold = max distance to this object (usually the half thickness of a line)
+     * @param aTransMat = the transform matrix
+     */
+    virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] );
+
     void operator=( const LibDrawField& field )
     {
         m_FieldId = field.m_FieldId;

eeschema/class_pin.cpp

@@ -5,6 +5,7 @@
 #include "fctsys.h"
 #include "appl_wxstruct.h"
 #include "gr_basic.h"
+#include "trigo.h"
 #include "common.h"
 #include "class_drawpanel.h"
 #include "drawtxt.h"
@@ -14,6 +15,20 @@
 #include "plot_common.h"
 #include "protos.h"
 
+const wxChar* MsgPinElectricType[] =
+{
+    wxT( "input" ),
+    wxT( "output" ),
+    wxT( "BiDi" ),
+    wxT( "3state" ),
+    wxT( "passive" ),
+    wxT( "unspc" ),
+    wxT( "power_in" ),
+    wxT( "power_out" ),
+    wxT( "openCol" ),
+    wxT( "openEm" ),
+    wxT( "?????" )
+};
 
 LibDrawPin::LibDrawPin() : LibEDA_BaseStruct( COMPONENT_PIN_DRAW_TYPE )
 {
@@ -27,8 +42,42 @@ LibDrawPin::LibDrawPin() : LibEDA_BaseStruct( COMPONENT_PIN_DRAW_TYPE )
     m_PinNameSize = 50;                 /* Default size for pin name and num */
     m_Width    = 0;
     m_typeName = _( "Pin" );
+    m_PinNumShapeOpt     = 0;
+    m_PinNameShapeOpt    = 0;
+    m_PinNumPositionOpt  = 0;
+    m_PinNamePositionOpt = 0;
+}
+
 
-//	m_PinNumWidth = m_PinNameWidth = 0;	// Unused
+/**
+ * Function HitTest
+ * tests if the given wxPoint is within the bounds of this object.
+ * @param aRefPos A wxPoint to test
+ * @return bool - true if a hit, else false
+ */
+bool LibDrawPin::HitTest( const wxPoint& aRefPos )
+{
+    int mindist = m_Width ? m_Width / 2 : g_DrawDefaultLineThickness / 2;
+
+    // Have a minimal tolerance for hit test
+    if( mindist < 3 )
+        mindist = 3;        // = 3 mils
+
+    return HitTest( aRefPos, mindist, DefaultTransformMatrix );
+}
+
+/** Function HitTest
+ * @return true if the point aPosRef is near a pin
+ * @param aRefPos = a wxPoint to test
+ * @param aThreshold = max distance to a segment
+ * @param aTransMat = the transform matrix
+ */
+bool LibDrawPin::HitTest( wxPoint aRefPos, int aThreshold, const int aTransMat[2][2] )
+{
+    wxPoint pinPos = TransformCoordinate( aTransMat, m_Pos );
+    wxPoint pinEnd = TransformCoordinate( aTransMat, ReturnPinEndPoint() );
+
+    return TestSegmentHit( aRefPos, pinPos, pinEnd, aThreshold );
 }
 
 
@@ -461,6 +510,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
     wxSize     PinNumSize( m_PinNumSize, m_PinNumSize );
 
     int        nameLineWidth = g_DrawDefaultLineThickness;
+
     nameLineWidth = Clamp_Text_PenSize( nameLineWidth, m_PinNameSize, false );
     int        numLineWidth = g_DrawDefaultLineThickness;
     numLineWidth = Clamp_Text_PenSize( numLineWidth, m_PinNumSize, false );
@@ -561,7 +611,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
                                      TEXT_ORIENT_VERT, PinNumSize,
                                      GR_TEXT_HJUSTIFY_CENTER,
                                      GR_TEXT_VJUSTIFY_BOTTOM, numLineWidth,
-                                     false, false);
+                                     false, false );
             }
             else        /* PIN_UP */
             {
@@ -582,7 +632,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
                                      TEXT_ORIENT_VERT, PinNumSize,
                                      GR_TEXT_HJUSTIFY_CENTER,
                                      GR_TEXT_VJUSTIFY_BOTTOM, numLineWidth,
-                                     false, false);
+                                     false, false );
             }
         }
     }
@@ -611,7 +661,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
                                  TEXT_ORIENT_HORIZ, PinNumSize,
                                  GR_TEXT_HJUSTIFY_CENTER,
                                  GR_TEXT_VJUSTIFY_TOP, numLineWidth,
-                                 false, false);
+                                 false, false );
             }
         }
         else     /* Its a vertical line. */
@@ -643,6 +693,7 @@ void LibDrawPin::DrawPinTexts( WinEDA_DrawPanel* panel,
     }
 }
 
+
 /*****************************************************************************
 * Plot pin number and pin text info, given the pin line coordinates.	  *
 * Same as DrawPinTexts((), but output is the plotter
@@ -965,6 +1016,10 @@ LibDrawPin* LibDrawPin::GenCopy()
     newpin->m_PinNum             = m_PinNum;
     newpin->m_PinNumSize         = m_PinNumSize;
     newpin->m_PinNameSize        = m_PinNameSize;
+    newpin->m_PinNumShapeOpt     = m_PinNumShapeOpt;
+    newpin->m_PinNameShapeOpt    = m_PinNameShapeOpt;
+    newpin->m_PinNumPositionOpt  = m_PinNumPositionOpt;
+    newpin->m_PinNamePositionOpt = m_PinNamePositionOpt;
     newpin->m_Unit               = m_Unit;
     newpin->m_Convert            = m_Convert;
     newpin->m_Flags              = m_Flags;

eeschema/classes_body_items.h

@@ -161,6 +161,29 @@ public:
     virtual bool Save( FILE* aFile ) const = 0;
     virtual bool Load( char* line, wxString& errorMsg ) = 0;
 
+
+    /**
+     * Function HitTest
+     * tests if the given wxPoint is within the bounds of this object.
+     * @param refPos A wxPoint to test
+     * @return bool - true if a hit, else false
+     */
+    virtual bool    HitTest( const wxPoint& refPos )
+    {
+        return false;   // derived classes should override this function
+    }
+
+    /** Function HitTest (overlayed)
+     * @return true if the point aPosRef is near this object
+     * @param aPosRef = a wxPoint to test
+     * @param aThreshold = max distance to this object (usually the half thickness of a line)
+     * @param aTransMat = the transform matrix
+     */
+    virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] ) = 0;
+
+   /** Function GetBoundingBox
+     * @return the boundary box for this, in library coordinates
+     */
     virtual EDA_Rect GetBoundingBox()
     {
         return EDA_BaseStruct::GetBoundingBox();
@@ -188,8 +211,12 @@ public:
     int      m_PinNumSize;
     int      m_PinNameSize; /* Pin num and Pin name sizes */
 
-//	int m_PinNumWidth, m_PinNameWidth;	/* (Currently Unused) Pin num and Pin name text width */
-    wxPoint  m_Pos;         /* Position or centre (Arc and Circle) or start
+	// (Currently Unused) Pin num and Pin name text opt: italic/normal/bold, 0 = default:
+    char m_PinNumShapeOpt, m_PinNameShapeOpt;
+	// (Currently Unused) Pin num and Pin name text opt position, 0 = default:
+    char m_PinNumPositionOpt, m_PinNamePositionOpt;
+
+wxPoint  m_Pos;         /* Position or centre (Arc and Circle) or start
                              * point (segments) */
     int      m_Width;       /* Line width */
 
@@ -217,6 +244,22 @@ public:
     virtual bool Load( char* line, wxString& errorMsg );
 
 
+    /**
+     * Function HitTest
+     * tests if the given wxPoint is within the bounds of this object.
+     * @param aRefPos A wxPoint to test
+     * @return bool - true if a hit, else false
+     */
+    virtual bool HitTest( const wxPoint& aRefPos );
+
+    /** Function HitTest
+     * @return true if the point aPosRef is near this object
+     * @param aPosRef = a wxPoint to test
+     * @param aThreshold = max distance to this object (usually the half thickness of a line)
+     * @param aTransMat = the transform matrix
+     */
+    virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] );
+
     LibDrawPin*  GenCopy();
     virtual void DisplayInfo( WinEDA_DrawFrame* frame );
     virtual EDA_Rect GetBoundingBox();
@@ -289,6 +332,13 @@ public:
      */
     virtual bool HitTest( const wxPoint& aRefPos );
 
+     /** Function HitTest
+     * @return true if the point aPosRef is near this object
+     * @param aPosRef = a wxPoint to test
+     * @param aThreshold = max distance to this object (usually the half thickness of a line)
+     * @param aTransMat = the transform matrix
+     */
+    virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] );
 
     LibDrawArc*  GenCopy();
 
@@ -339,6 +389,14 @@ public:
      */
     virtual bool HitTest( const wxPoint& aRefPos );
 
+     /** Function HitTest
+     * @return true if the point aPosRef is near this object
+     * @param aPosRef = a wxPoint to test
+     * @param aThreshold = max distance to this object (usually the half thickness of a line)
+     * @param aTransMat = the transform matrix
+     */
+    virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] );
+
     LibDrawCircle* GenCopy();
 
     void Draw( WinEDA_DrawPanel * aPanel, wxDC * aDC, const wxPoint &aOffset,
@@ -385,6 +443,14 @@ public:
      */
     virtual bool    HitTest( const wxPoint& refPos );
 
+     /** Function HitTest
+     * @return true if the point aPosRef is near a segment
+     * @param aPosRef = a wxPoint to test, in eeschema coordinates
+     * @param aThreshold = max distance to a segment
+     * @param aTransMat = the transform matrix
+     */
+    virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] );
+
     /**
      * Function HitTest (overlayed)
      * tests if the given EDA_Rect intersect this object.
@@ -436,6 +502,22 @@ public:
     virtual bool Save( FILE* aFile ) const;
     virtual bool Load( char* line, wxString& errorMsg );
 
+    /**
+     * Function HitTest
+     * tests if the given wxPoint is within the bounds of this object.
+     * @param aRefPos A wxPoint to test
+     * @return bool - true if a hit, else false
+     */
+    virtual bool HitTest( const wxPoint& aRefPos );
+
+    /** Function HitTest
+     * @return true if the point aPosRef is near this object
+     * @param aPosRef = a wxPoint to test
+     * @param aThreshold = max distance to this object (usually the half thickness of a line)
+     * @param aTransMat = the transform matrix
+     */
+    virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] );
+
     LibDrawSquare* GenCopy();
 
     void Draw( WinEDA_DrawPanel * aPanel, wxDC * aDC, const wxPoint &aOffset,
@@ -476,6 +558,22 @@ public:
     virtual bool Save( FILE* aFile ) const;
     virtual bool Load( char* line, wxString& errorMsg );
 
+     /**
+     * Function HitTest
+     * tests if the given wxPoint is within the bounds of this object.
+     * @param aRefPos A wxPoint to test
+     * @return bool - true if a hit, else false
+     */
+    virtual bool HitTest( const wxPoint& aRefPos );
+
+    /** Function HitTest
+     * @return true if the point aPosRef is near this object
+     * @param aPosRef = a wxPoint to test
+     * @param aThreshold = max distance to this object (usually the half thickness of a line)
+     * @param aTransMat = the transform matrix
+     */
+    virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] );
+
     LibDrawSegment* GenCopy();
 
     void Draw( WinEDA_DrawPanel * aPanel, wxDC * aDC, const wxPoint &aOffset,
@@ -523,13 +621,21 @@ public:
      */
     unsigned GetCornerCount() const { return m_PolyPoints.size(); }
 
+     /**
+     * Function HitTest
+     * tests if the given wxPoint is within the bounds of this object.
+     * @param aRefPos A wxPoint to test
+     * @return bool - true if a hit, else false
+     */
+    virtual bool HitTest( const wxPoint& aRefPos );
+
     /** Function HitTest
      * @return true if the point aPosRef is near a segment
      * @param aPosRef = a wxPoint to test
      * @param aThreshold = max distance to a segment
      * @param aTransMat = the transform matrix
      */
-    bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] );
+    virtual bool HitTest( wxPoint aPosRef, int aThreshold, const int aTransMat[2][2] );
 
     /** Function GetBoundingBox
      * @return the boundary box for this, in library coordinates

eeschema/cleanup.cpp

@@ -5,6 +5,7 @@
 #include "fctsys.h"
 #include "appl_wxstruct.h"
 #include "common.h"
+#include "trigo.h"
 #include "confirm.h"
 #include "class_drawpickedstruct.h"
 #include "program.h"
@@ -16,8 +17,7 @@
 
 
 /* Routines locales */
-static int TstAlignSegment( EDA_DrawLineStruct* RefSegm,
-                            EDA_DrawLineStruct* TstSegm );
+static int TstAlignSegment( EDA_DrawLineStruct* RefSegm, EDA_DrawLineStruct* TstSegm );
 
 /* Variable locales */
 
@@ -37,7 +37,7 @@ bool SCH_SCREEN::SchematicCleanUp( wxDC* DC )
 
     WinEDA_SchematicFrame* frame;
 
-    frame = (WinEDA_SchematicFrame*)wxGetApp().GetTopWindow();
+    frame = (WinEDA_SchematicFrame*) wxGetApp().GetTopWindow();
 
     DrawList = EEDrawList;
     for( ; DrawList != NULL; DrawList = DrawList->Next() )
@@ -144,7 +144,6 @@ DrawPickedStruct* BreakSegment( SCH_SCREEN* screen,
 {
     EDA_BaseStruct* DrawList;
     EDA_DrawLineStruct* segment, * NewSegment;
-    int ox, oy, fx, fy;
     DrawPickedStruct* List = NULL;
 
     DrawList = screen->EEDrawList;
@@ -154,17 +153,13 @@ DrawPickedStruct* BreakSegment( SCH_SCREEN* screen,
         {
         case DRAW_SEGMENT_STRUCT_TYPE:
             segment = (EDA_DrawLineStruct*) DrawList;
-            ox = segment->m_Start.x; oy = segment->m_Start.y;
-            fx = segment->m_End.x; fy = segment->m_End.y;
-            if( distance( fx - ox, fy - oy, breakpoint.x - ox, breakpoint.y -
-                          oy, 0 ) == 0 )
+
+            if( !TestSegmentHit( breakpoint, segment->m_Start, segment->m_End, 0 ) )
                 break;
 
             /* Segment connecte: doit etre coupe en 2 si px,py n'est
              *  pas une extremite */
-            if( (ox == breakpoint.x) && (oy == breakpoint.y ) )
-                break;
-            if( (fx == breakpoint.x) && (fy == breakpoint.y ) )
+            if( (segment->m_Start == breakpoint) || (segment->m_End == breakpoint ) )
                 break;
             /* Ici il faut couper le segment en 2 */
             if( PutInUndoList )         // First: put copy of the old segment in undo list

eeschema/protos.h

@@ -139,12 +139,12 @@ SCH_ITEM * PickStruct(const wxPoint & refpos, BASE_SCREEN* screen, int SearchMas
 
 
     Return:
-        -Bloc searc:
+        -Bloc search:
             pointeur sur liste de pointeurs de structures si Plusieurs
                     structures selectionnees.
             pointeur sur la structure si 1 seule
 
-        Positon serach:
+        Positon search:
             pointeur sur la structure.
         Si pas de structures selectionnees: retourne NULL */
 
@@ -160,20 +160,6 @@ LibDrawPin * LocateAnyPin(SCH_ITEM *DrawList, const wxPoint & RefPos,
 Hierarchical_PIN_Sheet_Struct * LocateAnyPinSheet(const wxPoint & RefPos,
                     SCH_ITEM *DrawList);
 
-int distance(int dx, int dy, int spot_cX, int spot_cY, int seuil);
-    /* Calcul de la distance du point spot_cx,spot_cy a un segment de droite,
-        d'origine 0,0 et d'extremite dx, dy;
-        retourne:
-             0 si distance > seuil
-             1 si distance <= seuil
-         Variables utilisees ( sont ramenees au repere centre sur l'origine du segment)
-             dx, dy = coord de l'extremite segment.
-             spot_cX,spot_cY = coord du curseur souris
-         la recherche se fait selon 4 cas:
-             segment horizontal
-             segment vertical
-             segment quelconque */
-
 
 /***************/
 /* EEREDRAW.CPP */

include/common.h

@@ -271,13 +271,8 @@ void        InitKiCadAbout( wxAboutDialogInfo& info);
 wxString    GetBuildVersion(); /* Return the build date */
 wxString    GetAboutBuildVersion(); /* Return custom build date for about dialog */
 
-void        Affiche_1_Parametre( WinEDA_DrawFrame* frame,
-                                 int               pos_X,
-                                 const wxString&   texte_H,
-                                 const wxString&   texte_L,
-                                 int               color );
-
-/*
+/**
+ * function Affiche_1_Parametre
  *  Routine d'affichage d'un parametre.
  *  pos_X = cadrage horizontal
  *      si pos_X < 0 : la position horizontale est la derniere
@@ -288,6 +283,11 @@ void        Affiche_1_Parametre( WinEDA_DrawFrame* frame,
  *      si "", par d'affichage sur cette ligne
  *  color = couleur d'affichage
  */
+void        Affiche_1_Parametre( WinEDA_DrawFrame* frame,
+                                 int               pos_X,
+                                 const wxString&   texte_H,
+                                 const wxString&   texte_L,
+                                 int               color );
 
 void        AfficheDoc( WinEDA_DrawFrame* frame, const wxString& Doc,
                         const wxString& KeyW );

include/trigo.h

@@ -14,15 +14,27 @@ void RotatePoint( wxPoint* point, int angle );
 void RotatePoint( wxPoint *point, const wxPoint & centre, int angle );
 void RotatePoint( double *pX, double *pY, int angle );
 void RotatePoint( double *pX, double *pY, double cx, double cy, int angle );
-int ArcTangente( int dy, int dx );
-/* Retourne l'arc tangente en 0.1 degres du vecteur de coord dx, dy
+
+/** function ArcTangente
+Retourne l'arc tangente en 0.1 degres du vecteur de coord dx, dy
    entre -1800 et 1800
    Analogue a atan2 ( mais plus rapide pour les caculs si
    l'angle est souvent 0, -1800, ou +- 900  */
+int ArcTangente( int dy, int dx );
 
 bool DistanceTest( int seuil, int dx, int dy, int spot_cX, int spot_cY );
 
 
+/** Function TestSegmentHit
+ * test for hit on line segment
+ * i.e. cursor within a given distance from segment
+ * @param aRefPoint = cursor (point to test) coords
+ * @param aStart is the first end-point of the line segment
+ * @param aEnd is the second end-point of the line segment
+ * @param aDist = maximum distance for hit
+*/
+bool TestSegmentHit( wxPoint aRefPoint, wxPoint aStart, wxPoint aEnd, int aDist );
+
 /*******************/
 /* Macro NEW_COORD */
 /*******************/