**Fixed a crash in Pcbnew that happens sometimes when opening the design rules dialog editor. (facbe280) · Commits · Elphel / kicad-source-mirror

3d-viewer/3d_frame.cpp

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@ double DataScale3D; // 3D conversion units.


	BEGIN_EVENT_TABLE( WinEDA3D_DrawFrame, wxFrame )		BEGIN_EVENT_TABLE( WinEDA3D_DrawFrame, wxFrame )
			EVT_ACTIVATE( WinEDA3D_DrawFrame::OnActivate )
	EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA3D_DrawFrame::Process_Zoom )		EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA3D_DrawFrame::Process_Zoom )
	EVT_TOOL_RANGE( ID_START_COMMAND_3D, ID_END_COMMAND_3D,		EVT_TOOL_RANGE( ID_START_COMMAND_3D, ID_END_COMMAND_3D,
	WinEDA3D_DrawFrame::Process_Special_Functions )		WinEDA3D_DrawFrame::Process_Special_Functions )
	@@ -351,6 +352,18 @@ void WinEDA3D_DrawFrame::NewDisplay()
	}		}


			void WinEDA3D_DrawFrame::OnActivate( wxActivateEvent& event )
			{
			// Reload data if 3D frame shows a footprint,
			// because it can be changed since last frame activation
			if( m_Parent->m_Ident == MODULE_EDITOR_FRAME )
			{
			// NewDisplay();
			}
			event.Skip(); // required under wxMAC
			}


	/* called to set the background color of the 3D scene		/* called to set the background color of the 3D scene
	*/		*/
	void WinEDA3D_DrawFrame::Set3DBgColor()		void WinEDA3D_DrawFrame::Set3DBgColor()

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -219,6 +219,7 @@ public:
	void RedrawActiveWindow( wxDC* DC, bool EraseBg );		void RedrawActiveWindow( wxDC* DC, bool EraseBg );
	void Process_Special_Functions( wxCommandEvent& event );		void Process_Special_Functions( wxCommandEvent& event );
	void Process_Zoom( wxCommandEvent& event );		void Process_Zoom( wxCommandEvent& event );
			void OnActivate( wxActivateEvent& event );

	void NewDisplay();		void NewDisplay();
	void Set3DBgColor();		void Set3DBgColor();

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4,6 +4,14 @@ KiCad ChangeLog 2010
	Please add newer entries at the top, list the date and your name with		Please add newer entries at the top, list the date and your name with
	email address.		email address.

			2010-apr-29, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
			================================================================================
			++Pcbnew:
			Fixed a crash that happens sometimes when opening the design rule dialog.
			(due to the sorting function by netclass then by netname)
			The sorting by netclass then by netname is now working well.


	2010-apr-23, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>		2010-apr-23, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
	================================================================================		================================================================================
	++Pcbnew:		++Pcbnew:

+0 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

+1739 −1595

File changed.

Preview size limit exceeded, changes collapsed.