cleanup up and update files before stable release (18f22a2b) · Commits · Elphel / kicad-source-mirror

3d-viewer/3d_draw.cpp

+6 −19

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}
	}		}
	@@ -938,9 +924,10 @@ 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;

3d-viewer/3d_frame.cpp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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 );
	}		}

CMakeLists.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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(

cvpcb/setvisu.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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();
	}		}

include/build_version.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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
	;		;

Admin message