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

cleanup up and update files before stable release

This commit is contained in:
charras 2008-07-15 10:11:44 +00:00
parent d60e906a55
commit 18f22a2b75
7 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
3d-viewer/3d_draw.cpp
View File

@ -90,8 +90,7 @@ void Pcb3D_GLCanvas::Redraw( bool finish )
/**********************************************/ /**********************************************/
GLuint Pcb3D_GLCanvas::CreateDrawGL_List() GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
/**********************************************/ /**********************************************/
/* Create the draw list items
/* Creation de la liste des elements a afficher
*/ */
{ {
GLuint gllist = glGenLists( 1 ); GLuint gllist = glGenLists( 1 );
@ -114,7 +113,7 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
g_Parm_3D_Visu.m_Epoxy_Width = epoxy_width / 2.54 * 1000 g_Parm_3D_Visu.m_Epoxy_Width = epoxy_width / 2.54 * 1000
* g_Parm_3D_Visu.m_BoardScale; * g_Parm_3D_Visu.m_BoardScale;
/* calcul de l'altitude de chaque couche */ /* calculate z position for each layer */
for( ii = 0; ii < 32; ii++ ) for( ii = 0; ii < 32; ii++ )
{ {
if( ii < g_Parm_3D_Visu.m_Layers ) if( ii < g_Parm_3D_Visu.m_Layers )
@ -456,32 +455,19 @@ void EDGE_MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas )
{ {
case S_SEGMENT: case S_SEGMENT:
Draw3D_FilledSegment( x, -y, fx, -fy, w, zpos ); Draw3D_FilledSegment( x, -y, fx, -fy, w, zpos );
#if 0
s.Printf("Draw FilledSegment: %g, %g, %g, %g, %g, %g\n",x,-y,fx,-fy,w,zpos);
printf( CONV_TO_UTF8( s ) );
#endif
break; break;
case S_CIRCLE: case S_CIRCLE:
Draw3D_CircleSegment( x, -y, fx, -fy, w, zpos); Draw3D_CircleSegment( x, -y, fx, -fy, w, zpos);
#if 0
s.Printf("Draw Circle: %g, %g, %g, %g, %g, %g\n",x,-y,fx,-fy,w,zpos);
printf( CONV_TO_UTF8( s ) );
#endif
break; break;
case S_ARC: case S_ARC:
Draw3D_ArcSegment( x, -y, fx, -fy, w, zpos); Draw3D_ArcSegment( x, -y, fx, -fy, w, zpos);
#if 0
s.Printf("Draw Arc: %g, %g, %g, %g, %g, %g\n",x,-y,fx,-fy,w,zpos);
printf( CONV_TO_UTF8( s ) );
#endif
break; break;
default: default:
s.Printf(wxT("Error: Shape nr %d not implemented!\n"), m_Shape); s.Printf(wxT("Error: Shape nr %d not implemented!\n"), m_Shape);
printf( CONV_TO_UTF8( s ) ); printf( CONV_TO_UTF8( s ) );
break; break;
} }
} }
@ -924,7 +910,7 @@ int angle;
angle = static_cast<int>(atan2( startx - endx, starty - endy) * 1800 / M_PI) + 900; angle = static_cast<int>(atan2( startx - endx, starty - endy) * 1800 / M_PI) + 900;
rayon = hypot(startx - endx, starty - endy) + ( width / 2); rayon = hypot(startx - endx, starty - endy) + ( width / 2);
hole = rayon - width; hole = rayon - width;
glBegin(GL_QUAD_STRIP); glBegin(GL_QUAD_STRIP);
for ( ii = 0; ii <= slice / 4; ii++ ) for ( ii = 0; ii <= slice / 4; ii++ )
{ {
@ -938,16 +924,17 @@ int angle;
glEnd(); glEnd();
} }
/********************************************************/ /*******************************************************************/
static void Draw3D_CircleSegment(double startx, double starty, static void Draw3D_CircleSegment(double startx, double starty,
double endx, double endy,double width, double zpos) double endx, double endy,double width, double zpos)
/*******************************************************************/
{ {
int ii, slice = 36; int ii, slice = 36;
double x, y, hole, rayon; double x, y, hole, rayon;
rayon = hypot(startx - endx, starty - endy) + ( width / 2); rayon = hypot(startx - endx, starty - endy) + ( width / 2);
hole = rayon - width; hole = rayon - width;
glBegin(GL_QUAD_STRIP); glBegin(GL_QUAD_STRIP);
for ( ii = 0; ii <= slice; ii++ ) for ( ii = 0; ii <= slice; ii++ )
{ {

5
3d-viewer/3d_frame.cpp
View File

@ -240,6 +240,7 @@ void WinEDA3D_DrawFrame::Process_Special_Functions( wxCommandEvent& event )
{ {
case ID_RELOAD3D_BOARD: case ID_RELOAD3D_BOARD:
NewDisplay(); NewDisplay();
return;
break; break;
case ID_ROTATE3D_X_POS: case ID_ROTATE3D_X_POS:
@ -299,7 +300,7 @@ void WinEDA3D_DrawFrame::Process_Special_Functions( wxCommandEvent& event )
} }
m_Canvas->DisplayStatus(); m_Canvas->DisplayStatus();
m_Canvas->Refresh( FALSE ); m_Canvas->Refresh( true );
} }
@ -310,7 +311,7 @@ void WinEDA3D_DrawFrame::NewDisplay()
m_Canvas->ClearLists(); m_Canvas->ClearLists();
m_Canvas->InitGL(); m_Canvas->InitGL();
m_Canvas->DisplayStatus(); m_Canvas->DisplayStatus();
m_Canvas->Refresh( FALSE ); m_Canvas->Refresh( true );
} }

3
CMakeLists.txt
View File

@ -78,8 +78,11 @@ include(${wxWidgets_USE_FILE})
include(MinGWResourceCompiler) include(MinGWResourceCompiler)
# Automagically create version header file. # Automagically create version header file.
# does not work with mingw for me (jpc)
if(UNIX)
include(CreateSVNVersionHeader) include(CreateSVNVersionHeader)
create_svn_version_header() create_svn_version_header()
endif(UNIX)
# Include paths. # Include paths.
include_directories( include_directories(

2
cvpcb/setvisu.cpp
View File

@ -67,7 +67,7 @@ void WinEDA_CvpcbFrame::CreateScreenCmp()
} }
else if( !IsNew ) else if( !IsNew )
{ {
DrawFrame->ReDrawPanel(); DrawFrame->Refresh();
if( DrawFrame->m_Draw3DFrame ) if( DrawFrame->m_Draw3DFrame )
DrawFrame->m_Draw3DFrame->NewDisplay(); DrawFrame->m_Draw3DFrame->NewDisplay();
} }

2
include/build_version.h
View File

@ -9,7 +9,7 @@ COMMON_GLOBL wxString g_BuildVersion
# include "config.h" # include "config.h"
(wxT(KICAD_SVN_VERSION)) (wxT(KICAD_SVN_VERSION))
# else # else
(wxT("(20080622-r1138)")) (wxT("(20080715"))
# endif # endif
#endif #endif
; ;

2
nsis_win_installer/install.nsi
View File

@ -17,7 +17,7 @@
; General Product Description Definitions ; General Product Description Definitions
!define PRODUCT_NAME "KiCad" !define PRODUCT_NAME "KiCad"
!define PRODUCT_VERSION "2008.06.22" !define PRODUCT_VERSION "2008.07.15"
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/" !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/" !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define COMPANY_NAME "" !define COMPANY_NAME ""

4
version.txt
View File

@ -1,4 +1,4 @@
release version: release version:
01 feb 2008 15 juil 2008
files (.zip,.tgz): files (.zip,.tgz):
kicad-2007-02-01 kicad-2007-07-15