Commit bc9d5217 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Eeschema: fix bug in load_one_schematic_file.cpp: error about files version,... 

Eeschema: fix bug in load_one_schematic_file.cpp: error about files version, that create errors for hierarchical labels.
Pcbnew: cleaning code in block.cpp, and modifye previous way to calculate block size in block command, because old way creates unexpected behavior in block rotate and block flip.
Pcbnew: Fix a bug in plot silkscreen layers.
Cvpcb: Fix compilation issue under MACOX
parent 25df2772

cvpcb/cvpcb.cpp

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "protos.h"

#include "cvstruct.h"

#include "colors_selection.h"

#include "cvpcb_id.h"



#include "build_version.h"

eeschema/load_one_schematic_file.cpp

+11 −7
Original line number Diff line number Diff line
@@ -71,10 +71,14 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F 
        return FALSE;

    }



    // get the file version here. TODO: Support version numbers > 9

    char version = line[9 + sizeof(SCHEMATIC_HEAD_STRING)];

    int  ver     = version - '0';

    if( ver > EESCHEMA_VERSION )

    // get the file version here.

    char *strversion = line + 9 + sizeof(SCHEMATIC_HEAD_STRING);

    // Skip blanks

    while( *strversion && *strversion < '0' )

        strversion++;

    int  version = atoi(strversion);



    if( version > EESCHEMA_VERSION )

    {

        MsgDiag = FullFileName + _( " was created by a more recent \

version of EESchema and may not load correctly. Please consider updating!" );
@@ -83,7 +87,7 @@ version of EESchema and may not load correctly. Please consider updating!" ); 


#if 0

    // Compile it if the new version is unreadable by previous eeschema versions

    else if( ver < EESCHEMA_VERSION )

    else if( version < EESCHEMA_VERSION )

    {

        MsgDiag = FullFileName + _( " was created by an older version of \

EESchema. It will be stored in the new file format when you save this file \
@@ -159,9 +163,9 @@ again." ); 
            }

            else if( Name1[0] == 'L' )

                item = new SCH_LABEL();

            else if( Name1[0] == 'G' && ver > '1' )

            else if( Name1[0] == 'G' && version > 1 )

                item = new SCH_GLOBALLABEL();

            else if( (Name1[0] == 'H') || (Name1[0] == 'G' && ver == '1') )

            else if( (Name1[0] == 'H') || (Name1[0] == 'G' && version == 1) )

                item = new SCH_HIERLABEL();

            else

                item = new SCH_TEXT();

pcbnew/CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ add_definitions(-DPCBNEW) 
# Includes

###

include_directories(${CMAKE_CURRENT_SOURCE_DIR}

                    ${CMAKE_CURRENT_SOURCE_DIR}/dialogs

                    ${Boost_INCLUDE_DIR}

                    ../3d-viewer

                    ../common
@@ -41,6 +42,7 @@ set(PCBNEW_SRCS 
    cross-probing.cpp

    debug_kbool_key_file_fct.cpp

    deltrack.cpp

    dialogs/dialog_block_options_base.cpp

    dialog_copper_zones.cpp

    dialog_copper_zones_base.cpp

    dialog_design_rules.cpp

pcbnew/block.cpp

+204 −283

File changed.

Preview size limit exceeded, changes collapsed.

pcbnew/dialogs/dialog_block_options_base.cpp

0 → 100644
+91 −0

File added.

Preview size limit exceeded, changes collapsed.