Skip to content

K
kicad-source-mirror
Commit 485c92d4 authored by charras's avatar charras
Browse files
Options

Modified recent change on svn change: "PCB edge always printed when PCB edge... 

Modified recent change on svn change: "PCB edge always printed when PCB edge layer not selected" was incorrect for eeschema and gerbview
solved bug 2070228
parent b10990f2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1705 additions and 1417 deletions
bitmaps/CMakeLists.txt
View file @ 485c92d4
......@@ -20,7 +20,7 @@ foreach(LOOP_VAR ${BITMAP_SRCS})
set(CPP_BITMAP "${XPM_CPP_PATH}/${BASENAME}.cpp")
add_custom_command(
OUTPUT ${CPP_BITMAP}
COMMAND cmake -E copy '${PATH}/${BASENAME}.xpm' '${CPP_BITMAP}'
COMMAND cmake -E copy "${PATH}/${BASENAME}.xpm" "${CPP_BITMAP}"
DEPENDS ${BASENAME}.xpm)
list(APPEND CPP_BITMAPS ${CPP_BITMAP})
set_source_files_properties(${CPP_BITMAP} PROPERTIES COMPILE_FLAGS -DXPMMAIN)
......
demos/interf_u/interf_u.cmp
View file @ 485c92d4
Cmp-Mod V01 Created by Cvpcb (20080313-r890) date = 22/3/2008-09:05:19
Cmp-Mod V01 Created by Cvpcb (20080731.r1175 date = 1/8/2008-07:52:43
BeginCmp
TimeStamp = 322D3011;
TimeStamp = /322D3011;
Reference = BUS1;
ValeurCmp = BUSPC;
IdModule = BUS_PC;
EndCmp
BeginCmp
TimeStamp = 32307DE2;
TimeStamp = /32307DE2;
Reference = C1;
ValeurCmp = 47uF;
IdModule = CP6;
EndCmp
BeginCmp
TimeStamp = 32307ECF;
TimeStamp = /32307ECF;
Reference = C2;
ValeurCmp = 47pF;
IdModule = C1;
EndCmp
BeginCmp
TimeStamp = 32307ED4;
TimeStamp = /32307ED4;
Reference = C3;
ValeurCmp = 47pF;
IdModule = C1;
EndCmp
BeginCmp
TimeStamp = 32307DCF;
TimeStamp = /32307DCF;
Reference = C4;
ValeurCmp = 47uF;
IdModule = CP6;
EndCmp
BeginCmp
TimeStamp = 32307DCA;
TimeStamp = /32307DCA;
Reference = C5;
ValeurCmp = 47uF;
IdModule = CP6;
EndCmp
BeginCmp
TimeStamp = 32307DC0;
TimeStamp = /32307DC0;
Reference = C6;
ValeurCmp = 47uF;
IdModule = CP6;
EndCmp
BeginCmp
TimeStamp = 322D32AC;
TimeStamp = /322D32AC;
Reference = D1;
ValeurCmp = LED;
IdModule = LEDV;
EndCmp
BeginCmp
TimeStamp = 322D32BE;
TimeStamp = /322D32BE;
Reference = D2;
ValeurCmp = LED;
IdModule = LEDV;
EndCmp
BeginCmp
TimeStamp = 32568D1E;
TimeStamp = /32568D1E;
Reference = JP1;
ValeurCmp = CONN_8X2;
IdModule = pin_array_8x2;
EndCmp
BeginCmp
TimeStamp = 3256759C;
TimeStamp = /3256759C;
Reference = P1;
ValeurCmp = DB25FEMELLE;
IdModule = DB25FC;
EndCmp
BeginCmp
TimeStamp = 32307EA1;
TimeStamp = /32307EA1;
Reference = R1;
ValeurCmp = 100K;
IdModule = R3;
EndCmp
BeginCmp
TimeStamp = 32307EAA;
TimeStamp = /32307EAA;
Reference = R2;
ValeurCmp = 1K;
IdModule = R3;
EndCmp
BeginCmp
TimeStamp = 324002E6;
TimeStamp = /324002E6;
Reference = R3;
ValeurCmp = 10K;
IdModule = R3;
EndCmp
BeginCmp
TimeStamp = 322D3295;
TimeStamp = /322D3295;
Reference = R4;
ValeurCmp = 330;
IdModule = R3;
EndCmp
BeginCmp
TimeStamp = 322D32A0;
TimeStamp = /322D32A0;
Reference = R5;
ValeurCmp = 330;
IdModule = R3;
EndCmp
BeginCmp
TimeStamp = 325679C1;
TimeStamp = /325679C1;
Reference = RR1;
ValeurCmp = 9x1K;
IdModule = r_pack9;
EndCmp
BeginCmp
TimeStamp = 322D31F4;
TimeStamp = /322D31F4;
Reference = U1;
ValeurCmp = 74LS245;
IdModule = 20dip300;
EndCmp
BeginCmp
TimeStamp = 322D35B4;
TimeStamp = /322D35B4;
Reference = U2;
ValeurCmp = 74LS688;
IdModule = 20dip300;
EndCmp
BeginCmp
TimeStamp = 322D31CA;
TimeStamp = /322D31CA;
Reference = U3;
ValeurCmp = 74LS541;
IdModule = 20dip300;
EndCmp
BeginCmp
TimeStamp = 3240023F;
TimeStamp = /3240023F;
Reference = U5;
ValeurCmp = 628128;
IdModule = 32dip600;
EndCmp
BeginCmp
TimeStamp = 322D321C;
TimeStamp = /322D321C;
Reference = U8;
ValeurCmp = EP600;
IdModule = 24dip300;
EndCmp
BeginCmp
TimeStamp = 322D32FA;
TimeStamp = /322D32FA;
Reference = U9;
ValeurCmp = 4003APG120;
IdModule = PGA120;
EndCmp
BeginCmp
TimeStamp = 32307EC0;
TimeStamp = /32307EC0;
Reference = X1;
ValeurCmp = 8MHz;
IdModule = HC-18UH;
......
demos/interf_u/interf_u.net
View file @ 485c92d4
This diff is collapsed.
demos/video/video.net
View file @ 485c92d4
This diff is collapsed.
internat/fr/kicad.mo
View file @ 485c92d4
No preview for this file type
internat/fr/kicad.po
View file @ 485c92d4
This diff is collapsed.
share/dialog_print.cpp
View file @ 485c92d4
This diff is collapsed.
share/dialog_print.h
View file @ 485c92d4
......@@ -36,6 +36,7 @@ class wxBoxSizer;
////@begin control identifiers
#define ID_DIALOG 10000
#define ID_EXCLUDE_EDGES_PCB 10005
#define ID_SET_PRINT_SCALE 10004
#define ID_TEXTCTRL 10009
#define ID_TEXTCTRL1 10010
......@@ -47,7 +48,6 @@ class wxBoxSizer;
#define ID_PRINT_SETUP 10001
#define ID_PRINT_PREVIEW 10002
#define ID_PRINT_EXECUTE 10003
#define ID_EXCLUDE_EDGES_PCB 10012
#define SYMBOL_WINEDA_PRINTFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
#define SYMBOL_WINEDA_PRINTFRAME_TITLE _("Print")
#define SYMBOL_WINEDA_PRINTFRAME_IDNAME ID_DIALOG
......@@ -130,20 +130,26 @@ public:
////@begin WinEDA_PrintFrame member variables
wxBoxSizer* m_FullDialogBowSizer;
wxBoxSizer* m_LeftBoxSizer;
wxBoxSizer* m_LayersSelectionsBoxSizer;
wxBoxSizer* m_CopperLayersBoxSizer;
wxBoxSizer* m_TechLayersBoxSizer;
wxCheckBox* m_Exclude_Edges_Pcb;
wxBoxSizer* m_ScaleBoxSizer;
wxRadioBox* m_ScaleOption;
wxStaticText* m_FineAdjustXscaleTitle;
wxTextCtrl* m_FineAdjustXscaleOpt;
wxStaticText* m_FineAdjustYscaleTitle;
wxTextCtrl* m_FineAdjustYscaleOpt;
wxStaticBox* m_OptionsBoxSizer;
wxBoxSizer* m_DialogPenWidthSizer;
wxCheckBox* m_Print_Sheet_Ref;
wxCheckBox* m_Print_Mirror;
wxRadioBox* m_ColorOption;
wxRadioBox* m_PagesOptionPcb;
wxRadioBox* m_PagesOptionEeschema;
wxBoxSizer* m_ButtonsBoxSizer;
wxButton* m_CloseButton;
////@end WinEDA_PrintFrame member variables
......
share/dialog_print.pjd
View file @ 485c92d4
This diff is collapsed.
share/wxprint.cpp
View file @ 485c92d4
......@@ -59,7 +59,7 @@
#define OPTKEY_LAYERBASE wxT( "PrintLayer_%d" )
#define OPTKEY_PRINT_X_FINESCALE_ADJ wxT( "PrintXFineScaleAdj" )
#define OPTKEY_PRINT_Y_FINESCALE_ADJ wxT( "PrintYFineScaleAdj" )
#define OPTKEY_PRINT_SCALE wxT( "PrintScale" )
#define OPTKEY_PRINT_SCALE wxT( "PrintScale" )
#endif
#define DEFAULT_ORIENTATION_PAPER wxLANDSCAPE // other option is wxPORTRAIT
......@@ -92,7 +92,6 @@ static bool s_PrintMirror;
static bool s_Print_Sheet_Ref = TRUE;
/****************************************************************/
/* frame de Preparation de l'impression (options, selections... */
/****************************************************************/
......@@ -201,21 +200,27 @@ void WinEDA_PrintFrame::SetOthersDatas()
{
m_BoxSelecLayer[ii] = new wxCheckBox( this, -1,
#if defined (PCBNEW)
( (WinEDA_PcbFrame*) m_Parent )->m_Pcb->GetLayerName( ii ) );
( (WinEDA_PcbFrame*) m_Parent )->m_Pcb->GetLayerName(
ii ) );
#else
ReturnLayerName( ii ) );
ReturnLayerName( ii ) );
#endif
if( mask & s_SelectedLayers )
m_BoxSelecLayer[ii]->SetValue( TRUE );
if( ii < 16 )
m_CopperLayersBoxSizer->Add( m_BoxSelecLayer[ii],
wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE );
wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE );
else
m_TechLayersBoxSizer->Add( m_BoxSelecLayer[ii],
wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE );
wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE );
}
// Option for excluding contents of "Edges Pcb" layer
#ifndef GERBVIEW
m_Exclude_Edges_Pcb->Show( true );
#endif
// Read the scale adjust option
if( config )
{
......@@ -343,7 +348,7 @@ wxString WinEDA_PrintFrame::BuildPrintTitle()
wxString name, ext;
wxFileName::SplitPath( m_Parent->GetBaseScreen()->m_FileName,
(wxString*) NULL, &name, &ext );
(wxString*) NULL, &name, &ext );
name += wxT( "-" ) + ext;
return name;
}
......@@ -434,7 +439,7 @@ void WinEDA_PrintFrame::OnPrintPreview( wxCommandEvent& event )
wxString title = BuildPrintTitle();
wxPrintPreview* preview =
new wxPrintPreview( new EDA_Printout( this, m_Parent, title, print_ref ),
new EDA_Printout( this, m_Parent, title, print_ref ), g_PrintData );
new EDA_Printout( this, m_Parent, title, print_ref ), g_PrintData );
if( preview == NULL )
{
......@@ -455,7 +460,7 @@ void WinEDA_PrintFrame::OnPrintPreview( wxCommandEvent& event )
WSize.y += 6;
wxPreviewFrame* frame = new wxPreviewFrame( preview, this,
title, WPos, WSize );
title, WPos, WSize );
frame->Initialize();
frame->Show( TRUE );
......@@ -715,7 +720,7 @@ void EDA_Printout::DrawPage()
#ifdef PCBNEW
double accurate_Xscale, accurate_Yscale;
dc->SetUserScale( DrawZoom / scale * m_PrintFrame->m_XScaleAdjust,
DrawZoom / scale * m_PrintFrame->m_YScaleAdjust );
DrawZoom / scale * m_PrintFrame->m_YScaleAdjust );
// Compute Accurate scale 1
{
......@@ -820,7 +825,11 @@ void EDA_Printout::DrawPage()
panel->m_ClipBox.SetOrigin( wxPoint( -0x7FFFFF, -0x7FFFFF ) );
}
if ( !m_PrintFrame->m_Exclude_Edges_Pcb->GetValue() ) s_PrintMaskLayer |= EDGE_LAYER;
#ifndef GERBVIEW
if( !m_PrintFrame->m_Exclude_Edges_Pcb->GetValue() )
s_PrintMaskLayer |= EDGE_LAYER;
#endif
panel->PrintPage( dc, 0, s_PrintMaskLayer );
#else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment