show axis in module editor and gerbview
This commit is contained in:
parent
5b3c5861bd
commit
70707523dd
|
@ -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
|
||||||
common.a: $(OBJECTS) makefile.gtk makefile.include
|
|
||||||
rm -f $@
|
rm -f $@
|
||||||
ar -rv $@ $(OBJECTS)
|
ar -rv $@ $(COMMON_OBJECTS)
|
||||||
ranlib $@
|
ranlib $@
|
||||||
|
|
||||||
install:common.a
|
pcbcommon.a: $(COMMON_PCB_OBJECTS) makefile.gtk makefile.include
|
||||||
|
rm -f $@
|
||||||
|
ar -rv $@ $(COMMON_PCB_OBJECTS)
|
||||||
|
ranlib $@
|
||||||
|
|
||||||
|
install:common.a pcb_common.a
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o *~ core *.bak *.obj *.d
|
rm -f *.o *~ core *.bak *.obj *.d
|
||||||
|
|
|
@ -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:
|
||||||
|
|
|
@ -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<69>
|
m_Draw_Sheet_Ref = FALSE; // TRUE pour avoir le cartouche dessin<69>
|
||||||
m_Ident = GERBER_FRAME;
|
m_Ident = GERBER_FRAME;
|
||||||
if( DrawPanel )
|
if( DrawPanel )
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
#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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
{
|
{
|
||||||
|
|
|
@ -160,7 +160,8 @@ WinEDA_ModuleEditFrame::WinEDA_ModuleEditFrame( wxWindow* father,
|
||||||
wxConfig* config = wxGetApp().m_EDA_Config;
|
wxConfig* config = wxGetApp().m_EDA_Config;
|
||||||
|
|
||||||
m_FrameName = wxT( "ModEditFrame" );
|
m_FrameName = wxT( "ModEditFrame" );
|
||||||
m_Draw_Sheet_Ref = FALSE; // TRUE pour avoir le cartouche dessin<69>
|
m_Draw_Sheet_Ref = false; // true to show the frame references
|
||||||
|
m_Draw_Axis = true; // true to show X and Y axis on screen
|
||||||
|
|
||||||
// Give an icon
|
// Give an icon
|
||||||
SetIcon( wxICON( icon_modedit ) );
|
SetIcon( wxICON( icon_modedit ) );
|
||||||
|
@ -251,13 +252,13 @@ void WinEDA_ModuleEditFrame::SetToolbars()
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if( m_CurrentLib == wxEmptyString )
|
if( m_CurrentLib == wxEmptyString )
|
||||||
islib = FALSE;
|
islib = false;
|
||||||
|
|
||||||
m_HToolBar->EnableTool( ID_MODEDIT_SAVE_LIBMODULE, islib );
|
m_HToolBar->EnableTool( ID_MODEDIT_SAVE_LIBMODULE, islib );
|
||||||
m_HToolBar->EnableTool( ID_LIBEDIT_DELETE_PART, islib );
|
m_HToolBar->EnableTool( ID_LIBEDIT_DELETE_PART, islib );
|
||||||
|
|
||||||
if( GetBoard()->m_Modules == NULL )
|
if( GetBoard()->m_Modules == NULL )
|
||||||
active = FALSE;
|
active = false;
|
||||||
else
|
else
|
||||||
active = TRUE;
|
active = TRUE;
|
||||||
|
|
||||||
|
@ -307,7 +308,7 @@ void WinEDA_ModuleEditFrame::SetToolbars()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_HToolBar->EnableTool( ID_MODEDIT_LOAD_MODULE_FROM_BOARD, FALSE );
|
m_HToolBar->EnableTool( ID_MODEDIT_LOAD_MODULE_FROM_BOARD, false );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -325,9 +326,9 @@ void WinEDA_ModuleEditFrame::SetToolbars()
|
||||||
if( m_OptionsToolBar )
|
if( m_OptionsToolBar )
|
||||||
{
|
{
|
||||||
m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SELECT_UNIT_MM,
|
m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SELECT_UNIT_MM,
|
||||||
g_UnitMetric == MILLIMETRE ? TRUE : FALSE );
|
g_UnitMetric == MILLIMETRE ? TRUE : false );
|
||||||
m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SELECT_UNIT_INCH,
|
m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SELECT_UNIT_INCH,
|
||||||
g_UnitMetric == INCHES ? TRUE : FALSE );
|
g_UnitMetric == INCHES ? TRUE : false );
|
||||||
|
|
||||||
m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_POLAR_COORD,
|
m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_POLAR_COORD,
|
||||||
DisplayOpt.DisplayPolarCood );
|
DisplayOpt.DisplayPolarCood );
|
||||||
|
|
Loading…
Reference in New Issue