Commit 6e80810b authored by charras's avatar charras
Browse files

change best zoom calculation in viewlib. Minor others changes and fixes.

parent 2611a547

common/string.cpp

+10 −14
Original line number Diff line number Diff line
@@ -13,11 +13,9 @@ 
int ReadDelimitedText( char* dest, char* source, int NbMaxChar )

/*********************************************************************/



/* lit et place dans dest la chaine de caractere trouvee dans source,

 *  delimitee par " .

 *  transfere NbMaxChar max

 *  retourne le nombre de codes lus dans source

 *  dest est termine par NULL

/* read a double-qute delimited text in source and put in in dest,

 *  read NbMaxChar bytes max

 *  return the byte count read in source

 */

{

    int ii, jj, flag = 0;
@@ -47,8 +45,8 @@ int ReadDelimitedText( char* dest, char* source, int NbMaxChar ) 
char* StrPurge( char* text )

/********************************/



/* Remove training space in text

 *  return a pointer on the first not space char in text

/* Remove training spaces in text

 *  return a pointer on the first non space char in text

 */

{

    char* ptspace;
@@ -113,7 +111,7 @@ char* DateAndTime( char* aBuffer ) 
wxString DateAndTime()

/*******************************/



/* return a wxString filled with the date and time

/* return the date and time in a wxString

 *  note: does the same thing than strftime()

 *  time is the local time.

 */
@@ -248,12 +246,10 @@ bool WildCompareString( const wxString& pattern, const wxString& string_to_tst, 
                        bool case_sensitive )

/***********************************************************************/



/* compare 2 noms de composants, selon regles usuelles

 *  ( Jokers * , ? , autoriss).

 *  la chaine de reference est "pattern"

 *  si case_sensitive == TRUE, comparaison exacte

 *  retourne TRUE si match

 *  retourne FALSE si differences

/* compare a string to a pattern

 *  ( usual chars * and ? allowed).

 *  if case_sensitive == true, comparison is case sensitive

 *  return true if match else false

 */

{

    const wxChar* cp = NULL, * mp = NULL;

cvpcb/readschematicnetlist.cpp

+4 −6
Original line number Diff line number Diff line
@@ -91,18 +91,17 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist() 
    wxString  schematic_timestamp;                          /* buffer for component time stamp */

    wxString  footprint_name;                               /* buffer for component footprint field */

    wxString  component_value;                              /* buffer for component values (470K, 22nF ...) */

    char*     ptchar;                                       /* pointeur de service */

    char*     ptchar;

    STORECMP* Cmp;



    modified = 0;

    Rjustify = 0;

    g_FlagEESchema = FALSE;



    /* Raz buffer et variable de gestion */

    /* Clear components buffer */

    if( g_BaseListeCmp )

        FreeMemoryComponants();



    /* Ouverture du fichier source */

    source = wxFopen( FFileName, wxT( "rt" ) );

    if( source == 0 )

    {
@@ -437,7 +436,7 @@ int CmpCompare( void* mod1, void* mod2 ) 
/****************************************/



/*

 * Function compare() for qsort() : alphabetic sorting, with numbering order

 * Compare function for qsort() : alphabetic sorting, with numbering order

 */

{

    int       ii;
@@ -446,7 +445,6 @@ int CmpCompare( void* mod1, void* mod2 ) 
    pt1 = *( (STORECMP**) mod1 );

    pt2 = *( (STORECMP**) mod2 );



    //FIXME:

    ii = StrNumICmp( (const wxChar*) pt1->m_Reference, (const wxChar*) pt2->m_Reference );

    ii = StrNumICmp( pt1->m_Reference.GetData(), pt2->m_Reference.GetData() );

    return ii;

}

eeschema/libframe.cpp

+1 −2
Original line number Diff line number Diff line
@@ -265,11 +265,10 @@ int WinEDA_LibeditFrame::BestZoom() 
    }



    size    = DrawPanel->GetClientSize();

    size.x -= 60;   // Pour marges haut et bas

    size -= wxSize(100,100);   // reserve 100 mils margin

    ii = abs( dx / size.x );

    jj = abs( dy / size.y );



    /* determination du zoom existant le plus proche */

    bestzoom = MAX( ii, jj ) + 1;



    if( CurrentLibEntry )

eeschema/viewlib_frame.cpp

+8 −8
Original line number Diff line number Diff line
@@ -194,10 +194,10 @@ int WinEDA_ViewlibFrame::BestZoom() 
    itemsize = BoundaryBox.GetSize();



    size  = DrawPanel->GetClientSize();

    size.x  -= 60;  // sub a margin

    ii       = itemsize.x / size.x;

    size -= wxSize( 100, 100 );  // reserve a 100 mils margin

    ii    = (double) itemsize.x / size.x;

    jj    = itemsize.y / size.y;

    bestzoom = MAX( ii, jj );

    bestzoom  = MAX( ii, jj ) + 1;



    GetScreen()->m_Curseur = BoundaryBox.Centre();
@@ -207,7 +207,7 @@ int WinEDA_ViewlibFrame::BestZoom() 


/******************************************/

void WinEDA_ViewlibFrame::ReCreateListLib()

/*******************************************/

/******************************************/

{

    const wxChar** ListNames, ** names;

    int            ii;

internat/fr/kicad.mo

+2 B (164 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file