PCB_EDIT_FRAME::SetActiveLayer() & GetActiveLayer() made public. (87c9423f) · Commits · Elphel / kicad-source-mirror

include/wxPcbStruct.h

+17 −17

Original line number	Original line	Diff line number	Diff line
	@@ -134,22 +134,6 @@ protected:
	void createPopUpBlockMenu( wxMenu* menu );		void createPopUpBlockMenu( wxMenu* menu );
	void createPopUpMenuForMarkers( MARKER_PCB* aMarker, wxMenu* aPopMenu );		void createPopUpMenuForMarkers( MARKER_PCB* aMarker, wxMenu* aPopMenu );

	/**
	* Function setActiveLayer
	* will change the currently active layer to \a aLayer and also
	* update the PCB_LAYER_WIDGET.
	*/
	void setActiveLayer( LAYER_NUM aLayer, bool doLayerWidgetUpdate = true );

	/**
	* Function getActiveLayer
	* returns the active layer
	*/
	LAYER_NUM getActiveLayer()
	{
	return ( (PCB_SCREEN*) GetScreen() )->m_Active_Layer;
	}

	/**		/**
	* Function setHighContrastLayer		* Function setHighContrastLayer
	* takes care of display settings for the given layer to be displayed in high contrast mode.		* takes care of display settings for the given layer to be displayed in high contrast mode.
	@@ -159,7 +143,7 @@ protected:
	/**		/**
	* Function syncLayerWidgetLayer		* Function syncLayerWidgetLayer
	* updates the currently layer "selection" within the PCB_LAYER_WIDGET.		* updates the currently layer "selection" within the PCB_LAYER_WIDGET.
	* The currently selected layer is defined by the return value of getActiveLayer().		* The currently selected layer is defined by the return value of GetActiveLayer().
	* <p>		* <p>
	* This function cannot be inline without including layer_widget.h in		* This function cannot be inline without including layer_widget.h in
	* here and we do not want to do that.		* here and we do not want to do that.
	@@ -577,6 +561,22 @@ public:
	*/		*/
	void SetTopLayer( LAYER_NUM aLayer );		void SetTopLayer( LAYER_NUM aLayer );

			/**
			* Function SetActiveLayer
			* will change the currently active layer to \a aLayer and also
			* update the PCB_LAYER_WIDGET.
			*/
			void SetActiveLayer( LAYER_NUM aLayer, bool doLayerWidgetUpdate = true );

			/**
			* Function GetActiveLayer
			* returns the active layer
			*/
			LAYER_NUM GetActiveLayer()
			{
			return ( (PCB_SCREEN*) GetScreen() )->m_Active_Layer;
			}

	/**		/**
	* Function IsElementVisible		* Function IsElementVisible
	* tests whether a given element category is visible. Keep this as an		* tests whether a given element category is visible. Keep this as an

pcbnew/class_pcb_layer_widget.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -183,7 +183,7 @@ void PCB_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )
	if( IsCopperLayer( layer ) )		if( IsCopperLayer( layer ) )
	{		{
	bool loc_visible = visible;		bool loc_visible = visible;
	if( force_active_layer_visible && (layer == myframe->getActiveLayer() ) )		if( force_active_layer_visible && (layer == myframe->GetActiveLayer() ) )
	loc_visible = true;		loc_visible = true;

	cb->SetValue( loc_visible );		cb->SetValue( loc_visible );
	@@ -354,7 +354,7 @@ bool PCB_LAYER_WIDGET::OnLayerSelect( LAYER_NUM aLayer )
	{		{
	// the layer change from the PCB_LAYER_WIDGET can be denied by returning		// the layer change from the PCB_LAYER_WIDGET can be denied by returning
	// false from this function.		// false from this function.
	myframe->setActiveLayer( aLayer, false );		myframe->SetActiveLayer( aLayer, false );

	if( m_alwaysShowActiveCopperLayer )		if( m_alwaysShowActiveCopperLayer )
	OnLayerSelected();		OnLayerSelected();

pcbnew/deltrack.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,7 @@ TRACK* PCB_EDIT_FRAME::Delete_Segment( wxDC* DC, TRACK* aTrack )
	{		{
	if( g_CurrentTrackList.GetCount() > 0 )		if( g_CurrentTrackList.GetCount() > 0 )
	{		{
	LAYER_NUM previous_layer = getActiveLayer();		LAYER_NUM previous_layer = GetActiveLayer();

	DBG( g_CurrentTrackList.VerifyListIntegrity(); )		DBG( g_CurrentTrackList.VerifyListIntegrity(); )

	@@ -86,7 +86,7 @@ TRACK* PCB_EDIT_FRAME::Delete_Segment( wxDC* DC, TRACK* aTrack )

	// Correct active layer which could change if a via		// Correct active layer which could change if a via
	// has been erased		// has been erased
	setActiveLayer( previous_layer );		SetActiveLayer( previous_layer );

	UpdateStatusBar();		UpdateStatusBar();

pcbnew/dialogs/dialog_general_options.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -228,7 +228,7 @@ void PCB_EDIT_FRAME::OnSelectOptionToolbar( wxCommandEvent& event )
	// Apply new display options to the GAL canvas (this is faster than recaching)		// Apply new display options to the GAL canvas (this is faster than recaching)
	settings->LoadDisplayOptions( DisplayOpt );		settings->LoadDisplayOptions( DisplayOpt );

	setHighContrastLayer( getActiveLayer() );		setHighContrastLayer( GetActiveLayer() );
	m_canvas->Refresh();		m_canvas->Refresh();

	break;		break;

pcbnew/dialogs/dialog_global_deletion.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,7 @@ DIALOG_GLOBAL_DELETION::DIALOG_GLOBAL_DELETION( PCB_EDIT_FRAME* parent )
	void PCB_EDIT_FRAME::InstallPcbGlobalDeleteFrame( const wxPoint& pos )		void PCB_EDIT_FRAME::InstallPcbGlobalDeleteFrame( const wxPoint& pos )
	{		{
	DIALOG_GLOBAL_DELETION dlg( this );		DIALOG_GLOBAL_DELETION dlg( this );
	dlg.SetCurrentLayer( getActiveLayer() );		dlg.SetCurrentLayer( GetActiveLayer() );

	dlg.ShowModal();		dlg.ShowModal();
	}		}