Commit 18f22a2b authored by charras's avatar charras

cleanup up and update files before stable release

parent d60e906a
......@@ -90,8 +90,7 @@ void Pcb3D_GLCanvas::Redraw( bool finish )
/**********************************************/
GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
/**********************************************/
/* Creation de la liste des elements a afficher
/* Create the draw list items
*/
{
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_BoardScale;
/* calcul de l'altitude de chaque couche */
/* calculate z position for each layer */
for( ii = 0; ii < 32; ii++ )
{
if( ii < g_Parm_3D_Visu.m_Layers )
......@@ -456,32 +455,19 @@ void EDGE_MODULE::Draw3D( Pcb3D_GLCanvas* glcanvas )
{
case S_SEGMENT:
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;
case S_CIRCLE:
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;
case S_ARC:
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;
default:
s.Printf(wxT("Error: Shape nr %d not implemented!\n"), m_Shape);
printf( CONV_TO_UTF8( s ) );
break;
}
}
......@@ -938,9 +924,10 @@ int angle;
glEnd();
}
/********************************************************/
/*******************************************************************/
static void Draw3D_CircleSegment(double startx, double starty,
double endx, double endy,double width, double zpos)
/*******************************************************************/
{
int ii, slice = 36;
double x, y, hole, rayon;
......
......@@ -240,6 +240,7 @@ void WinEDA3D_DrawFrame::Process_Special_Functions( wxCommandEvent& event )
{
case ID_RELOAD3D_BOARD:
NewDisplay();
return;
break;
case ID_ROTATE3D_X_POS:
......@@ -299,7 +300,7 @@ void WinEDA3D_DrawFrame::Process_Special_Functions( wxCommandEvent& event )
}
m_Canvas->DisplayStatus();
m_Canvas->Refresh( FALSE );
m_Canvas->Refresh( true );
}
......@@ -310,7 +311,7 @@ void WinEDA3D_DrawFrame::NewDisplay()
m_Canvas->ClearLists();
m_Canvas->InitGL();
m_Canvas->DisplayStatus();
m_Canvas->Refresh( FALSE );
m_Canvas->Refresh( true );
}
......
......@@ -78,8 +78,11 @@ include(${wxWidgets_USE_FILE})
include(MinGWResourceCompiler)
# Automagically create version header file.
# does not work with mingw for me (jpc)
if(UNIX)
include(CreateSVNVersionHeader)
create_svn_version_header()
endif(UNIX)
# Include paths.
include_directories(
......
......@@ -67,7 +67,7 @@ void WinEDA_CvpcbFrame::CreateScreenCmp()
}
else if( !IsNew )
{
DrawFrame->ReDrawPanel();
DrawFrame->Refresh();
if( DrawFrame->m_Draw3DFrame )
DrawFrame->m_Draw3DFrame->NewDisplay();
}
......
......@@ -9,7 +9,7 @@ COMMON_GLOBL wxString g_BuildVersion
# include "config.h"
(wxT(KICAD_SVN_VERSION))
# else
(wxT("(20080622-r1138)"))
(wxT("(20080715"))
# endif
#endif
;
......
......@@ -17,7 +17,7 @@
; General Product Description Definitions
!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 SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define COMPANY_NAME ""
......
release version:
01 feb 2008
15 juil 2008
files (.zip,.tgz):
kicad-2007-02-01
kicad-2007-07-15
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