pcbnew: (611a5155) · Commits · Elphel / kicad-source-mirror

include/pcbstruct.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,10 @@ enum TRACE_CLEARANCE_DISPLAY_MODE_T {
	* clearance area at end of current new		* clearance area at end of current new
	* segment (guide to place a new via		* segment (guide to place a new via
	*/		*/
			SHOW_CLEARANCE_NEW_AND_EDITED_TRACKS_AND_VIA_AREAS,
			/* Show clearance for new, moving and
			* dragging tracks and vias
			*/
	SHOW_CLEARANCE_ALWAYS /* Show Always clearance areas		SHOW_CLEARANCE_ALWAYS /* Show Always clearance areas
	* for track and vias		* for track and vias
	*/		*/

pcbnew/class_track.cpp

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -30,9 +30,13 @@
	static bool ShowClearance( const TRACK* aTrack )		static bool ShowClearance( const TRACK* aTrack )
	{		{
	// maybe return true for tracks and vias, not for zone segments		// maybe return true for tracks and vias, not for zone segments
	return DisplayOpt.ShowTrackClearanceMode == SHOW_CLEARANCE_ALWAYS		return aTrack->GetLayer() <= LAST_COPPER_LAYER
	&& aTrack->GetLayer() <= LAST_COPPER_LAYER		&& ( aTrack->Type() == TYPE_TRACK \|\| aTrack->Type() == TYPE_VIA )
	&& ( aTrack->Type() == TYPE_TRACK \|\| aTrack->Type() == TYPE_VIA );		&& ( ( DisplayOpt.ShowTrackClearanceMode == SHOW_CLEARANCE_NEW_AND_EDITED_TRACKS_AND_VIA_AREAS
			&& ( aTrack->m_Flags & IS_DRAGGED \|\| aTrack->m_Flags & IS_MOVED \|\| aTrack->m_Flags & IS_NEW ) )
			\|\| ( DisplayOpt.ShowTrackClearanceMode == SHOW_CLEARANCE_ALWAYS )
			);

	}		}

pcbnew/dialogs/dialog_display_options.cpp

+12 −4

Original line number	Original line	Diff line number	Diff line
	@@ -56,13 +56,17 @@ void DIALOG_DISPLAY_OPTIONS::init()
	m_OptDisplayTracksClearance->SetSelection( 1 );		m_OptDisplayTracksClearance->SetSelection( 1 );
	break;		break;

			case SHOW_CLEARANCE_NEW_AND_EDITED_TRACKS_AND_VIA_AREAS:
			m_OptDisplayTracksClearance->SetSelection( 3 );
			break;

	default:		default:
	case SHOW_CLEARANCE_NEW_TRACKS_AND_VIA_AREAS:		case SHOW_CLEARANCE_NEW_TRACKS_AND_VIA_AREAS:
	m_OptDisplayTracksClearance->SetSelection( 2 );		m_OptDisplayTracksClearance->SetSelection( 2 );
	break;		break;

	case SHOW_CLEARANCE_ALWAYS:		case SHOW_CLEARANCE_ALWAYS:
	m_OptDisplayTracksClearance->SetSelection(3);		m_OptDisplayTracksClearance->SetSelection( 4 );
	break;		break;
	}		}

	@@ -127,6 +131,10 @@ void DIALOG_DISPLAY_OPTIONS::OnOkClick(wxCommandEvent& event)
	break;		break;

	case 3:		case 3:
			DisplayOpt.ShowTrackClearanceMode = SHOW_CLEARANCE_NEW_AND_EDITED_TRACKS_AND_VIA_AREAS;
			break;

			case 4:
	DisplayOpt.ShowTrackClearanceMode = SHOW_CLEARANCE_ALWAYS;		DisplayOpt.ShowTrackClearanceMode = SHOW_CLEARANCE_ALWAYS;
	break;		break;
	}		}

pcbnew/dialogs/dialog_display_options_base.cpp

+156 −156

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Nov 17 2010)		// C++ code generated with wxFormBuilder (version Sep 6 2011)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -54,10 +54,10 @@ DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWi

	sbMiddleLeftSizer->Add( m_ShowNetNamesOption, 0, wxALL, 5 );		sbMiddleLeftSizer->Add( m_ShowNetNamesOption, 0, wxALL, 5 );

	wxString m_OptDisplayTracksClearanceChoices[] = { _("Never"), _("New track"), _("New track with via area"), _("Always") };		wxString m_OptDisplayTracksClearanceChoices[] = { _("Never"), _("New track"), _("New track with via area"), _("New and edited tracks with via area"), _("Always") };
	int m_OptDisplayTracksClearanceNChoices = sizeof( m_OptDisplayTracksClearanceChoices ) / sizeof( wxString );		int m_OptDisplayTracksClearanceNChoices = sizeof( m_OptDisplayTracksClearanceChoices ) / sizeof( wxString );
	m_OptDisplayTracksClearance = new wxRadioBox( this, ID_SHOW_CLEARANCE, _("Show Tracks Clearance:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksClearanceNChoices, m_OptDisplayTracksClearanceChoices, 1, wxRA_SPECIFY_COLS );		m_OptDisplayTracksClearance = new wxRadioBox( this, ID_SHOW_CLEARANCE, _("Show Tracks Clearance:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksClearanceNChoices, m_OptDisplayTracksClearanceChoices, 1, wxRA_SPECIFY_COLS );
	m_OptDisplayTracksClearance->SetSelection( 0 );		m_OptDisplayTracksClearance->SetSelection( 3 );
	m_OptDisplayTracksClearance->SetToolTip( _("Show( or not) tracks clearance area.\nIf New track is selected, track clearance area is shown only when creating the track.") );		m_OptDisplayTracksClearance->SetToolTip( _("Show( or not) tracks clearance area.\nIf New track is selected, track clearance area is shown only when creating the track.") );

	sbMiddleLeftSizer->Add( m_OptDisplayTracksClearance, 0, wxALL\|wxEXPAND, 5 );		sbMiddleLeftSizer->Add( m_OptDisplayTracksClearance, 0, wxALL\|wxEXPAND, 5 );

pcbnew/dialogs/dialog_display_options_base.fbp

+1067 −1516

File changed.

Preview size limit exceeded, changes collapsed.