Commit 161068b1 authored by stambaughw's avatar stambaughw

Minor bug and compiler warning fixes.

* Applied sheet reference plotting patch from Lorenzo.
* Fixed bug in Pcbnew plot dialog, ignore user scaling when controls are disabled.
parent fd0e99bb
...@@ -236,7 +236,8 @@ void WinEDA_DrawFrame::PlotWorkSheet( int format_plot, BASE_SCREEN* screen ) ...@@ -236,7 +236,8 @@ void WinEDA_DrawFrame::PlotWorkSheet( int format_plot, BASE_SCREEN* screen )
gypas = ( yg - ref.y) / ipas; gypas = ( yg - ref.y) / ipas;
for( ii = ref.y + gypas, jj = 0; ipas > 0; ii += gypas, jj++, ipas-- ) for( ii = ref.y + gypas, jj = 0; ipas > 0; ii += gypas, jj++, ipas-- )
{ {
msg.Empty(); msg << jj; msg.Empty();
msg.Append('A' + jj);
if( ii < yg - PAS_REF / 2 ) if( ii < yg - PAS_REF / 2 )
{ {
pos.x = ref.x * conv_unit; pos.y = ii * conv_unit; pos.x = ref.x * conv_unit; pos.y = ii * conv_unit;
......
/**********************************************************/ /**********************************************************/
/* wxwineda.cpp - fonctions des classes du type WinEDAxxxx */ /* wxwineda.cpp - fonctions des classes du type WinEDAxxxx */
/**********************************************************/ /**********************************************************/
...@@ -410,8 +410,10 @@ void WinEDA_ValueCtrl::Enable( bool enbl ) ...@@ -410,8 +410,10 @@ void WinEDA_ValueCtrl::Enable( bool enbl )
/***************************************************************/ /***************************************************************/
/* Classe pour afficher et editer une valeur en double flottant*/ /* Classe pour afficher et editer une valeur en double flottant*/
/***************************************************************/ /***************************************************************/
WinEDA_DFloatValueCtrl::WinEDA_DFloatValueCtrl( wxWindow* parent, const wxString& title, WinEDA_DFloatValueCtrl::WinEDA_DFloatValueCtrl( wxWindow* parent,
double value, wxBoxSizer* BoxSizer ) const wxString& title,
double value,
wxBoxSizer* BoxSizer )
{ {
wxString buffer; wxString buffer;
wxString label = title; wxString label = title;
......
...@@ -47,7 +47,8 @@ MODULE* WinEDA_DisplayFrame::Get_Module( const wxString& CmpName ) ...@@ -47,7 +47,8 @@ MODULE* WinEDA_DisplayFrame::Get_Module( const wxString& CmpName )
if( !tmp ) if( !tmp )
{ {
msg.Printf( _( "PCB foot print library file <%s> could not be found in the default search paths." ), msg.Printf( _( "PCB foot print library file <%s> could not be \
found in the default search paths." ),
fn.GetFullName().c_str() ); fn.GetFullName().c_str() );
wxMessageBox( msg, titleLibLoadError, wxOK | wxICON_ERROR, this ); wxMessageBox( msg, titleLibLoadError, wxOK | wxICON_ERROR, this );
continue; continue;
......
...@@ -173,9 +173,9 @@ static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* aFile, ...@@ -173,9 +173,9 @@ static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* aFile,
double b = atan2( track->m_End.y-cy, track->m_End.x-cx ); double b = atan2( track->m_End.y-cy, track->m_End.x-cx );
drawitem->m_Shape = S_ARC; drawitem->m_Shape = S_ARC;
drawitem->m_Angle = fmod( (a-b)/M_PI*1800.0+3600.0, 3600.0 ); drawitem->m_Angle = (int)fmod( (a-b)/M_PI*1800.0+3600.0, 3600.0 );
drawitem->m_Start.x = cx; drawitem->m_Start.x = (int)cx;
drawitem->m_Start.y = cy; drawitem->m_Start.y = (int)cy;
} }
pcb->Add( drawitem ); pcb->Add( drawitem );
......
...@@ -327,7 +327,8 @@ void WinEDA_PcbFrame::DrawInfoPlace( wxDC* DC ) ...@@ -327,7 +327,8 @@ void WinEDA_PcbFrame::DrawInfoPlace( wxDC* DC )
*/ */
{ {
int color, ii, jj; int color, ii, jj;
int ox, oy, top_state, bottom_state; int ox, oy;
BoardCell top_state, bottom_state;
GRSetDrawMode( DC, GR_COPY ); GRSetDrawMode( DC, GR_COPY );
for( ii = 0; ii < Nrows; ii++ ) for( ii = 0; ii < Nrows; ii++ )
......
/* Bits caracterisant une cellule */ /* Bits caracterisant une cellule */
#define HOLE 0x00000001L /* a conducting hole, ou obstacle */ #define HOLE (char)0x01 /* a conducting hole, ou obstacle */
#define CELL_is_MODULE 2 /* autoplacement: occupe par un module */ #define CELL_is_MODULE (char)0x02 /* autoplacement: occupe par un module */
#define CELL_is_EDGE 0x20 /* zone et autoplacement: cellule limitant un contour (Board, Zone) */ #define CELL_is_EDGE (char)0x20 /* zone et autoplacement: cellule limitant un contour (Board, Zone) */
#define CELL_is_FRIEND 0x40 /* zone et autoplacement: cellule faisant partie du net */ #define CELL_is_FRIEND (char)0x40 /* zone et autoplacement: cellule faisant partie du net */
#define CELL_is_ZONE 0x80 /* zone et autoplacement: cellule disponible */ #define CELL_is_ZONE (char)0x80 /* zone et autoplacement: cellule disponible */
/* Bits Masques de presence d'obstacles pour autoroutage */ /* Bits Masques de presence d'obstacles pour autoroutage */
#define OCCUPE 1 /* autoroutage : obstacle pour pistes et vias */ #define OCCUPE 1 /* autoroutage : obstacle pour pistes et vias */
...@@ -72,4 +72,3 @@ ...@@ -72,4 +72,3 @@
#define FROM_WEST 7 #define FROM_WEST 7
#define FROM_NORTHWEST 8 #define FROM_NORTHWEST 8
#define FROM_OTHERSIDE 9 #define FROM_OTHERSIDE 9
This diff is collapsed.
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