haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Last (minor) fixes for the stable version

This commit is contained in:
jean-pierre charras 2013-03-13 20:06:46 +01:00
parent 8287775bac
commit 53e98dede8
4 changed files with 53 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/build_version.cpp
View File

@ -7,9 +7,9 @@
#ifndef KICAD_BUILD_VERSION #ifndef KICAD_BUILD_VERSION
#if defined KICAD_GOST #if defined KICAD_GOST
# define KICAD_BUILD_VERSION "(2013-mar-10 GOST)" # define KICAD_BUILD_VERSION "(2013-mar-13 GOST)"
#else #else
# define KICAD_BUILD_VERSION "(2013-mar-10)" # define KICAD_BUILD_VERSION "(2013-mar-13)"
#endif #endif
#endif #endif

4
packaging/windows/nsis/install.nsi
View File

@ -17,7 +17,7 @@
; General Product Description Definitions ; General Product Description Definitions
!define PRODUCT_NAME "KiCad" !define PRODUCT_NAME "KiCad"
!define PRODUCT_VERSION "2013.03.10" !define PRODUCT_VERSION "2013.03.13"
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/" !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/" !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define COMPANY_NAME "" !define COMPANY_NAME ""
@ -36,7 +36,7 @@ SetCompressor /final /solid lzma
CRCCheck force CRCCheck force
XPStyle on XPStyle on
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "${PRODUCT_NAME}_stable-${PRODUCT_VERSION}-BZR3993_Win_full_version.exe" OutFile "${PRODUCT_NAME}_stable-${PRODUCT_VERSION}-BZR4000_Win_full_version.exe"
InstallDir "$PROGRAMFILES\KiCad" InstallDir "$PROGRAMFILES\KiCad"
ShowInstDetails hide ShowInstDetails hide
ShowUnInstDetails hide ShowUnInstDetails hide

10
pcbnew/dialogs/dialog_print_for_modedit.cpp
View File

@ -1,10 +1,6 @@
/* File: dialog_print_for_modedit.cpp */ /* File: dialog_print_for_modedit.cpp */
// Set this to 1 if you want to test PostScript printing under MSW.
//#define wxTEST_POSTSCRIPT_IN_MSW 1
#include <fctsys.h> #include <fctsys.h>
#include <appl_wxstruct.h> #include <appl_wxstruct.h>
#include <class_drawpanel.h> #include <class_drawpanel.h>
@ -17,7 +13,7 @@
#include <dialog_print_for_modedit_base.h> #include <dialog_print_for_modedit_base.h>
#include <printout_controler.h> #include <printout_controler.h>
static double s_ScaleList[] = static double s_scaleList[] =
{ 0, 0.5, 0.7, 1.0, 1.4, 2.0, 3.0, 4.0, 8.0, 16.0 }; { 0, 0.5, 0.7, 1.0, 1.4, 2.0, 3.0, 4.0, 8.0, 16.0 };
@ -147,7 +143,7 @@ void DIALOG_PRINT_FOR_MODEDIT::OnPrintPreview( wxCommandEvent& event )
*/ */
{ {
s_Parameters.m_Print_Black_and_White = m_ModeColorOption->GetSelection(); s_Parameters.m_Print_Black_and_White = m_ModeColorOption->GetSelection();
s_Parameters.m_PrintScale = s_ScaleList[m_ScaleOption->GetSelection()]; s_Parameters.m_PrintScale = s_scaleList[m_ScaleOption->GetSelection()];
// Pass two printout objects: for preview, and possible printing. // Pass two printout objects: for preview, and possible printing.
wxString title = _( "Print Preview" ); wxString title = _( "Print Preview" );
@ -179,7 +175,7 @@ void DIALOG_PRINT_FOR_MODEDIT::OnPrintButtonClick( wxCommandEvent& event )
PCB_PLOT_PARAMS plot_opts = m_parent->GetPlotSettings(); PCB_PLOT_PARAMS plot_opts = m_parent->GetPlotSettings();
s_Parameters.m_Print_Black_and_White = m_ModeColorOption->GetSelection(); s_Parameters.m_Print_Black_and_White = m_ModeColorOption->GetSelection();
s_Parameters.m_PrintScale = s_ScaleList[m_ScaleOption->GetSelection()]; s_Parameters.m_PrintScale = s_scaleList[m_ScaleOption->GetSelection()];
plot_opts.SetFineScaleAdjustX( s_Parameters.m_XScaleAdjust ); plot_opts.SetFineScaleAdjustX( s_Parameters.m_XScaleAdjust );
plot_opts.SetFineScaleAdjustY( s_Parameters.m_YScaleAdjust ); plot_opts.SetFineScaleAdjustY( s_Parameters.m_YScaleAdjust );

73
pcbnew/print_board_functions.cpp
View File

@ -2,6 +2,28 @@
* @file print_board_functions.cpp * @file print_board_functions.cpp
* @brief Functions to print boards. * @brief Functions to print boards.
*/ */
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <fctsys.h> #include <fctsys.h>
#include <class_drawpanel.h> #include <class_drawpanel.h>
@ -53,12 +75,10 @@ void FOOTPRINT_EDIT_FRAME::PrintPage( wxDC* aDC,
m_DisplayPadNum = DisplayOpt.DisplayPadNum = false; m_DisplayPadNum = DisplayOpt.DisplayPadNum = false;
bool nctmp = GetBoard()->IsElementVisible(NO_CONNECTS_VISIBLE); bool nctmp = GetBoard()->IsElementVisible(NO_CONNECTS_VISIBLE);
GetBoard()->SetElementVisibility(NO_CONNECTS_VISIBLE, false); GetBoard()->SetElementVisibility(NO_CONNECTS_VISIBLE, false);
bool anchorsTmp = GetBoard()->IsElementVisible( ANCHOR_VISIBLE );
GetBoard()->SetElementVisibility( ANCHOR_VISIBLE, false );
DisplayOpt.DisplayPadIsol = false; DisplayOpt.DisplayPadIsol = false;
DisplayOpt.DisplayModEdge = FILLED; DisplayOpt.DisplayModEdge = FILLED;
DisplayOpt.DisplayModText = FILLED; DisplayOpt.DisplayModText = FILLED;
m_DisplayPcbTrackFill = DisplayOpt.DisplayPcbTrackFill = FILLED; m_DisplayPcbTrackFill = DisplayOpt.DisplayPcbTrackFill = true;
DisplayOpt.ShowTrackClearanceMode = DO_NOT_SHOW_CLEARANCE; DisplayOpt.ShowTrackClearanceMode = DO_NOT_SHOW_CLEARANCE;
DisplayOpt.DisplayDrawItems = FILLED; DisplayOpt.DisplayDrawItems = FILLED;
DisplayOpt.DisplayZonesMode = 0; DisplayOpt.DisplayZonesMode = 0;
@ -98,7 +118,6 @@ void FOOTPRINT_EDIT_FRAME::PrintPage( wxDC* aDC,
m_DisplayViaFill = DisplayOpt.DisplayViaFill; m_DisplayViaFill = DisplayOpt.DisplayViaFill;
m_DisplayPadNum = DisplayOpt.DisplayPadNum; m_DisplayPadNum = DisplayOpt.DisplayPadNum;
GetBoard()->SetElementVisibility( NO_CONNECTS_VISIBLE, nctmp ); GetBoard()->SetElementVisibility( NO_CONNECTS_VISIBLE, nctmp );
GetBoard()->SetElementVisibility(ANCHOR_VISIBLE, anchorsTmp);
} }
@ -182,10 +201,12 @@ void PCB_EDIT_FRAME::PrintPage( wxDC* aDC,
m_DisplayPadNum = DisplayOpt.DisplayPadNum = false; m_DisplayPadNum = DisplayOpt.DisplayPadNum = false;
bool nctmp = GetBoard()->IsElementVisible( NO_CONNECTS_VISIBLE ); bool nctmp = GetBoard()->IsElementVisible( NO_CONNECTS_VISIBLE );
GetBoard()->SetElementVisibility( NO_CONNECTS_VISIBLE, false ); GetBoard()->SetElementVisibility( NO_CONNECTS_VISIBLE, false );
DisplayOpt.DisplayPadIsol = false; bool anchorsTmp = GetBoard()->IsElementVisible( ANCHOR_VISIBLE );
GetBoard()->SetElementVisibility( ANCHOR_VISIBLE, false );
DisplayOpt.DisplayPadIsol = false;
m_DisplayModEdge = DisplayOpt.DisplayModEdge = FILLED; m_DisplayModEdge = DisplayOpt.DisplayModEdge = FILLED;
m_DisplayModText = DisplayOpt.DisplayModText = FILLED; m_DisplayModText = DisplayOpt.DisplayModText = FILLED;
m_DisplayPcbTrackFill = DisplayOpt.DisplayPcbTrackFill = FILLED; m_DisplayPcbTrackFill = DisplayOpt.DisplayPcbTrackFill = true;
DisplayOpt.ShowTrackClearanceMode = DO_NOT_SHOW_CLEARANCE; DisplayOpt.ShowTrackClearanceMode = DO_NOT_SHOW_CLEARANCE;
DisplayOpt.DisplayDrawItems = FILLED; DisplayOpt.DisplayDrawItems = FILLED;
DisplayOpt.DisplayZonesMode = 0; DisplayOpt.DisplayZonesMode = 0;
@ -224,38 +245,35 @@ void PCB_EDIT_FRAME::PrintPage( wxDC* aDC,
} }
// Print tracks // Print tracks
TRACK * pt_trace = Pcb->m_Track; for( TRACK * track = Pcb->m_Track; track; track = track->Next() )
for( ; pt_trace != NULL; pt_trace = pt_trace->Next() )
{ {
if( ( aPrintMaskLayer & pt_trace->ReturnMaskLayer() ) == 0 ) if( ( aPrintMaskLayer & track->ReturnMaskLayer() ) == 0 )
continue; continue;
if( pt_trace->Type() == PCB_VIA_T ) // VIA encountered. if( track->Type() == PCB_VIA_T ) // VIA encountered.
{ {
int radius = pt_trace->GetWidth() >> 1; int radius = track->GetWidth() >> 1;
EDA_COLOR_T color = g_ColorsSettings.GetItemColor( VIAS_VISIBLE + pt_trace->GetShape() ); EDA_COLOR_T color = g_ColorsSettings.GetItemColor( VIAS_VISIBLE + track->GetShape() );
GRSetDrawMode( aDC, drawmode ); GRSetDrawMode( aDC, drawmode );
GRFilledCircle( m_canvas->GetClipBox(), aDC, GRFilledCircle( m_canvas->GetClipBox(), aDC,
pt_trace->GetStart().x, track->GetStart().x,
pt_trace->GetStart().y, track->GetStart().y,
radius, radius,
0, color, color ); 0, color, color );
} }
else else
{ {
pt_trace->Draw( m_canvas, aDC, drawmode ); track->Draw( m_canvas, aDC, drawmode );
} }
} }
// Outdated: only for compatibility to old boards // Outdated: only for compatibility to old boards
pt_trace = Pcb->m_Zone; for( TRACK * track = Pcb->m_Zone; track != NULL; track = track->Next() )
for( ; pt_trace != NULL; pt_trace = pt_trace->Next() )
{ {
if( ( aPrintMaskLayer & pt_trace->ReturnMaskLayer() ) == 0 ) if( ( aPrintMaskLayer & track->ReturnMaskLayer() ) == 0 )
continue; continue;
pt_trace->Draw( m_canvas, aDC, drawmode ); track->Draw( m_canvas, aDC, drawmode );
} }
// Draw filled areas (i.e. zones) // Draw filled areas (i.e. zones)
@ -286,28 +304,28 @@ void PCB_EDIT_FRAME::PrintPage( wxDC* aDC,
* vias */ * vias */
if( drillShapeOpt != PRINT_PARAMETERS::NO_DRILL_SHAPE ) if( drillShapeOpt != PRINT_PARAMETERS::NO_DRILL_SHAPE )
{ {
pt_trace = Pcb->m_Track; TRACK * track = Pcb->m_Track;
EDA_COLOR_T color = g_DrawBgColor; EDA_COLOR_T color = g_DrawBgColor;
bool blackpenstate = GetGRForceBlackPenState(); bool blackpenstate = GetGRForceBlackPenState();
GRForceBlackPen( false ); GRForceBlackPen( false );
GRSetDrawMode( aDC, GR_COPY ); GRSetDrawMode( aDC, GR_COPY );
for( ; pt_trace != NULL; pt_trace = pt_trace->Next() ) for( ; track != NULL; track = track->Next() )
{ {
if( ( aPrintMaskLayer & pt_trace->ReturnMaskLayer() ) == 0 ) if( ( aPrintMaskLayer & track->ReturnMaskLayer() ) == 0 )
continue; continue;
if( pt_trace->Type() == PCB_VIA_T ) // VIA encountered. if( track->Type() == PCB_VIA_T ) // VIA encountered.
{ {
int diameter; int diameter;
if( drillShapeOpt == PRINT_PARAMETERS::SMALL_DRILL_SHAPE ) if( drillShapeOpt == PRINT_PARAMETERS::SMALL_DRILL_SHAPE )
diameter = std::min( SMALL_DRILL, pt_trace->GetDrillValue() ); diameter = std::min( SMALL_DRILL, track->GetDrillValue() );
else else
diameter = pt_trace->GetDrillValue(); diameter = track->GetDrillValue();
GRFilledCircle( m_canvas->GetClipBox(), aDC, GRFilledCircle( m_canvas->GetClipBox(), aDC,
pt_trace->GetStart().x, pt_trace->GetStart().y, track->GetStart().x, track->GetStart().y,
diameter/2, diameter/2,
0, color, color ); 0, color, color );
} }
@ -327,6 +345,7 @@ void PCB_EDIT_FRAME::PrintPage( wxDC* aDC,
m_DisplayModEdge = DisplayOpt.DisplayModEdge; m_DisplayModEdge = DisplayOpt.DisplayModEdge;
m_DisplayModText = DisplayOpt.DisplayModText; m_DisplayModText = DisplayOpt.DisplayModText;
GetBoard()->SetElementVisibility(NO_CONNECTS_VISIBLE, nctmp); GetBoard()->SetElementVisibility(NO_CONNECTS_VISIBLE, nctmp);
GetBoard()->SetElementVisibility(ANCHOR_VISIBLE, anchorsTmp);
} }