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

minor changes

This commit is contained in:
charras 2009-02-21 12:14:33 +00:00
parent 3df3f6a09f
commit b8e27b5085
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cvpcb/makefile.gtk
View File

@ -1,12 +1,11 @@
# File: makefile # File: makefile
FINAL = 1 FINAL = 1
include ../libs.linux include ../libs.linux
TARGET = cvpcb TARGET = cvpcb
all: $(TARGET)
include makefile.include include makefile.include
-include *.d -include *.d
@ -14,8 +13,6 @@ include makefile.include
CPPFLAGS += $(EXTRACPPFLAGS) CPPFLAGS += $(EXTRACPPFLAGS)
EDACPPFLAGS = $(CPPFLAGS) EDACPPFLAGS = $(CPPFLAGS)
all: $(TARGET)
deps: deps:
$(CXX) $(CPPFLAGS) -E -MMD -MG *.cpp >/dev/null $(CXX) $(CPPFLAGS) -E -MMD -MG *.cpp >/dev/null

24
eeschema/eeredraw.cpp
View File

@ -218,7 +218,7 @@ void EDA_DrawLineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
const wxPoint& offset, int DrawMode, int Color ) const wxPoint& offset, int DrawMode, int Color )
{ {
int color; int color;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = m_Width;
if( Color >= 0 ) if( Color >= 0 )
color = Color; color = Color;
@ -227,9 +227,11 @@ void EDA_DrawLineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
GRSetDrawMode( DC, DrawMode ); GRSetDrawMode( DC, DrawMode );
// FIXME: Not compatable with new zoom. // Busses are draw with thick lines
if( (m_Layer == LAYER_BUS) && panel->GetScreen()->Scale( width ) <= 1 ) if( m_Layer == LAYER_BUS )
width *= 3; width = MAX( m_Width, MIN_BUSLINES_THICKNESS );
width = MAX( width, g_DrawMinimunLineWidth );
if( m_Layer == LAYER_NOTES ) if( m_Layer == LAYER_NOTES )
GRDashedLine( &panel->m_ClipBox, DC, m_Start.x + offset.x, GRDashedLine( &panel->m_ClipBox, DC, m_Start.x + offset.x,
@ -303,7 +305,7 @@ void DrawBusEntryStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint&
{ {
int color; int color;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = m_Width;
if( Color >= 0 ) if( Color >= 0 )
color = Color; color = Color;
@ -312,7 +314,9 @@ void DrawBusEntryStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint&
GRSetDrawMode( DC, DrawMode ); GRSetDrawMode( DC, DrawMode );
if( m_Layer == LAYER_BUS ) if( m_Layer == LAYER_BUS )
width *= 3; width = MAX( m_Width, MIN_BUSLINES_THICKNESS );
width = MAX( width, g_DrawMinimunLineWidth );
GRLine( &panel->m_ClipBox, DC, m_Pos.x + offset.x, m_Pos.y + offset.y, GRLine( &panel->m_ClipBox, DC, m_Pos.x + offset.x, m_Pos.y + offset.y,
m_End().x + offset.x, m_End().y + offset.y, width, color ); m_End().x + offset.x, m_End().y + offset.y, width, color );
@ -327,7 +331,7 @@ void DrawPolylineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint&
int DrawMode, int Color ) int DrawMode, int Color )
{ {
int color; int color;
int width = MAX( m_Width, g_DrawMinimunLineWidth ); int width = m_Width;
if( Color >= 0 ) if( Color >= 0 )
color = Color; color = Color;
@ -337,9 +341,9 @@ void DrawPolylineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint&
GRSetDrawMode( DC, DrawMode ); GRSetDrawMode( DC, DrawMode );
if( m_Layer == LAYER_BUS ) if( m_Layer == LAYER_BUS )
{ width = MAX( m_Width, MIN_BUSLINES_THICKNESS );
width *= 3;
} width = MAX( width, g_DrawMinimunLineWidth );
GRMoveTo( m_PolyPoints[0].x, m_PolyPoints[0].y ); GRMoveTo( m_PolyPoints[0].x, m_PolyPoints[0].y );
if( m_Layer == LAYER_NOTES ) if( m_Layer == LAYER_NOTES )

2
eeschema/program.h
View File

@ -25,6 +25,8 @@
#define TEXT_NO_VISIBLE 1 #define TEXT_NO_VISIBLE 1
#define MIN_BUSLINES_THICKNESS 12 // min bus lines and entries thickness
/* Rotation, mirror of graphic items in components bodies are handled by a transform matrix /* Rotation, mirror of graphic items in components bodies are handled by a transform matrix
* The default matix is useful to draw lib entries with a defualt matix ( no rotation, no mirrot * The default matix is useful to draw lib entries with a defualt matix ( no rotation, no mirrot
* but Y axis is bottom to top, and Y draw axis is to to bottom * but Y axis is bottom to top, and Y draw axis is to to bottom

2
nsis_win_installer/install.nsi
View File

@ -109,7 +109,7 @@ Section $(TITLE_SEC01) SEC01
SectionIn RO SectionIn RO
SetOverwrite try SetOverwrite try
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
File /nonfatal "..\author.txt" File /nonfatal "..\AUTHORS.txt"
File /nonfatal "..\copyright.txt" File /nonfatal "..\copyright.txt"
File /nonfatal "..\gpl.txt" File /nonfatal "..\gpl.txt"
File /nonfatal "..\licendoc.txt" File /nonfatal "..\licendoc.txt"