Commit 70707523 authored by charras's avatar charras
Browse files

show axis in module editor and gerbview

parent 5b3c5861

common/makefile.gtk

+8 −4
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ CC = gcc 




include ../libs.linux

include ../libs.linux





all: common.a

all: common.a pcbcommon.a





deps:

deps:

	$(CXX) $(CPPFLAGS) -E -MMD -MG *.cpp >/dev/null

	$(CXX) $(CPPFLAGS) -E -MMD -MG *.cpp >/dev/null
@@ -16,13 +16,17 @@ include makefile.include 
CPPFLAGS += $(EXTRACPPFLAGS) -I./ -I../include

CPPFLAGS += $(EXTRACPPFLAGS) -I./ -I../include

EDACPPFLAGS = $(CPPFLAGS)

EDACPPFLAGS = $(CPPFLAGS)





common.a: $(COMMON_OBJECTS) makefile.gtk makefile.include

	rm -f $@

	ar -rv $@ $(COMMON_OBJECTS)

	ranlib $@





common.a: $(OBJECTS) makefile.gtk makefile.include

pcbcommon.a: $(COMMON_PCB_OBJECTS) makefile.gtk makefile.include

	rm -f $@

	rm -f $@

	ar -rv $@ $(OBJECTS)

	ar -rv $@ $(COMMON_PCB_OBJECTS)

	ranlib $@

	ranlib $@





install:common.a

install:common.a pcb_common.a





clean:

clean:

	rm -f *.o *~ core *.bak *.obj *.d

	rm -f *.o *~ core *.bak *.obj *.d

common/makefile.macosx

+8 −3
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 




include ../libs.macosx

include ../libs.macosx





TARGET = common.a

TARGET = common.a pcbcommon.a





all: $(TARGET)

all: $(TARGET)
@@ -15,9 +15,14 @@ include makefile.include 
CPPFLAGS += $(EXTRACPPFLAGS)

CPPFLAGS += $(EXTRACPPFLAGS)

EDACPPFLAGS = $(CPPFLAGS)

EDACPPFLAGS = $(CPPFLAGS)





$(TARGET): $(OBJECTS) makefile.macosx makefile.include

common.a: $(COMMON_OBJECTS) makefile.macosx makefile.include

	rm -f $@

	rm -f $@

	ar -rv $@ $(OBJECTS)

	ar -rv $@ $(COMMON_OBJECTS)

	ranlib $@



pcbcommon.a: $(COMMON_PCB_OBJECTS) makefile.macosx makefile.include

	rm -f $@

	ar -rv $@ $(COMMON_PCB_OBJECTS)

	ranlib $@

	ranlib $@





clean:

clean:

gerbview/gerberframe.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -134,7 +134,7 @@ WinEDA_GerberFrame::WinEDA_GerberFrame( wxWindow* father, 
{

{

    m_FrameName = wxT( "GerberFrame" );

    m_FrameName = wxT( "GerberFrame" );





    //m_AboutTitle     = g_GerbviewAboutTitle;

    m_Draw_Axis      = true;   // true to show X and Y axis on screen

    m_Draw_Sheet_Ref = FALSE;   // TRUE pour avoir le cartouche dessin�

    m_Draw_Sheet_Ref = FALSE;   // TRUE pour avoir le cartouche dessin�

    m_Ident = GERBER_FRAME;

    m_Ident = GERBER_FRAME;

    if( DrawPanel )

    if( DrawPanel )

gerbview/makefile.include

+2 −0
Original line number Original line Diff line number Diff line 
#makefile to fast compilation of GerbView.



EXTRALIBS = ../common/common.a ../common/pcbcommon.a ../bitmaps/libbitmaps.a\

EXTRALIBS = ../common/common.a ../common/pcbcommon.a ../bitmaps/libbitmaps.a\

		../polygon/lib_polygon.a ../polygon/kbool/src/libkbool.a

		../polygon/lib_polygon.a ../polygon/kbool/src/libkbool.a

pcbnew/basepcbframe.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -52,12 +52,12 @@ WinEDA_BasePcbFrame::WinEDA_BasePcbFrame( wxWindow* father, 
    m_InternalUnits       = PCB_INTERNAL_UNIT;  // Internal unit = 1/10000 inch

    m_InternalUnits       = PCB_INTERNAL_UNIT;  // Internal unit = 1/10000 inch

    m_Pcb                 = NULL;

    m_Pcb                 = NULL;





    m_DisplayPadFill      = TRUE;   // How to draw pads

    m_DisplayPadFill      = true;   // How to draw pads

    m_DisplayPadNum       = TRUE;   // show pads number

    m_DisplayPadNum       = true;   // show pads number





    m_DisplayModEdge      = FILLED; // How to show module drawings

    m_DisplayModEdge      = FILLED; // How to show module drawings

    m_DisplayModText      = FILLED; // How to show module texts

    m_DisplayModText      = FILLED; // How to show module texts

    m_DisplayPcbTrackFill = TRUE;   /* FALSE = sketch , TRUE = filled */

    m_DisplayPcbTrackFill = true;   /* FALSE = sketch , true = filled */

    m_Draw3DFrame         = NULL;   // Display Window in 3D mode (OpenGL)

    m_Draw3DFrame         = NULL;   // Display Window in 3D mode (OpenGL)

    m_ModuleEditFrame     = NULL;   // Frame for footprint edition

    m_ModuleEditFrame     = NULL;   // Frame for footprint edition
@@ -131,7 +131,7 @@ void WinEDA_BasePcbFrame::CursorGoto( const wxPoint& aPos ) 
    if( !DrawPanel->IsPointOnDisplay( aPos ) )

    if( !DrawPanel->IsPointOnDisplay( aPos ) )

    {

    {

        screen->m_Curseur = aPos;

        screen->m_Curseur = aPos;

        Recadre_Trace( TRUE );

        Recadre_Trace( true );

    }

    }

    else

    else

    {

    {