Added an interface for highlighting. (c5ca075e) · Commits · Elphel / kicad-source-mirror

common/view/view_item.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,12 +33,12 @@ void VIEW_ITEM::ViewSetVisible( bool aIsVisible )
		{
		bool update = false;

		if( m_viewVisible != aIsVisible )
		if( m_visible != aIsVisible )
		{
		update = true;
		}

		m_viewVisible = aIsVisible;
		m_visible = aIsVisible;

		// update only if the visibility has really changed
		if( update )

include/painter.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -232,8 +232,9 @@ protected:
		* combination using stored color settings.
		* @param aLayer is the layer number that is being drawn.
		* @param aNetCode is a number of the net that is being drawn.
		* @param aHighlighted says if the item is marked as highlighted.
		*/
		virtual const COLOR4D& getLayerColor( int aLayer, int aNetCode ) const = 0;
		virtual const COLOR4D& getLayerColor( int aLayer, int aNetCode, bool aHighlighted ) const = 0;

		/// Instance of graphic abstraction layer that gives an interface to call
		/// commands used to draw (eg. DrawLine, DrawCircle, etc.)

include/view/view_item.h

+24 −3

Original line number	Diff line number	Diff line
		@@ -160,7 +160,8 @@ public:
		ALL = 0xff
		};

		VIEW_ITEM() : m_view( NULL ), m_viewVisible( true ), m_groups( NULL ), m_groupsSize( 0 ) {}
		VIEW_ITEM() : m_view( NULL ), m_visible( true ), m_highlighted( false ),
		m_groups( NULL ), m_groupsSize( 0 ) {}

		/**
		* Destructor. For dynamic views, removes the item from the view.
		@@ -234,7 +235,26 @@ public:
		*/
		bool ViewIsVisible() const
		{
		return m_viewVisible;
		return m_visible;
		}

		/**
		* Function ViewSetHighlighted()
		* Sets the item highlight.
		*
		* @param aIsHighlighted: whether the item is highlighted (on all layers), or not.
		*/
		void ViewSetHighlighted( bool aIsHighlighted = true );

		/**
		* Function ViewIsHighlighted()
		* Returns if the item is highlighted (or not).
		*
		* @return when true, the item should be displayed as highlighted.
		*/
		bool ViewIsHighlighted() const
		{
		return m_highlighted;
		}

		/**
		@@ -287,7 +307,8 @@ protected:
		}

		VIEW* m_view; ///* Current dynamic view the item is assigned to.
		bool m_viewVisible; ///* Are we visible in the current dynamic VIEW.
		bool m_visible; ///* Are we visible in the current dynamic VIEW.
		bool m_highlighted; ///* Should item be drawn as highlighted

		private:
		///* Helper for storing cached items group ids

pcbnew/pcb_painter.cpp

+46 −43

Original line number	Diff line number	Diff line
		@@ -152,58 +152,55 @@ const COLOR4D& PCB_PAINTER::GetColor( const VIEW_ITEM* aItem, int aLayer )
		if( item )
		netCode = item->GetNet();

		return getLayerColor( aLayer, netCode );
		return getLayerColor( aLayer, netCode, aItem->ViewIsHighlighted() );
		}


		const COLOR4D& PCB_PAINTER::getLayerColor( int aLayer, int aNetCode ) const
		const COLOR4D& PCB_PAINTER::getLayerColor( int aLayer, int aNetCode, bool aHighlighted ) const
		{
		// Return grayish color for non-highlightezd layers in the high contrast mode
		if( m_pcbSettings->m_hiContrastEnabled && m_pcbSettings->m_activeLayers.count( aLayer ) == 0 )
		{
		return m_pcbSettings->m_hiContrastColor;
		}
		else if( m_pcbSettings->m_highlightEnabled )

		// For item layers (vias, texts, and so on)
		if( aLayer >= NB_LAYERS )
		return getItemColor( aLayer - NB_LAYERS, aNetCode, aHighlighted );

		// Highlight per item basis
		if( aHighlighted )
		return m_pcbSettings->m_layerColorsHi[aLayer];

		// Single net highlight mode
		if( m_pcbSettings->m_highlightEnabled )
		{
		if( aNetCode == m_pcbSettings->m_highlightNetcode )
		{
		return m_pcbSettings->m_layerColorsHi[aLayer];
		}
		else
		{
		return m_pcbSettings->m_layerColorsDark[aLayer];
		}
		}
		else
		{
		// For item layers (vias, texts, and so on)
		if( aLayer >= NB_LAYERS )
		return getItemColor( aLayer - NB_LAYERS, aNetCode );

		// No special modificators enabled
		return m_pcbSettings->m_layerColors[aLayer];
		}
		}


		const COLOR4D& PCB_PAINTER::getItemColor( int aItemType, int aNetCode ) const
		const COLOR4D& PCB_PAINTER::getItemColor( int aItemType, int aNetCode, bool aHighlighted ) const
		{
		// if(aNetCode == m_settings->m_hiContrastEnabled)
		// return m_settings->m_itemColorsHi[ aItemType ];
		// Highlight per item basis
		if( aHighlighted )
		return m_pcbSettings->m_itemColorsHi[aItemType];

		if( m_pcbSettings->m_highlightEnabled )
		{
		if( aNetCode == m_pcbSettings->m_highlightNetcode )
		{
		return m_pcbSettings->m_itemColorsHi[aItemType];
		}
		else
		{
		return m_pcbSettings->m_itemColorsDark[aItemType];
		}
		}
		else
		{

		// No special modificators enabled
		return m_pcbSettings->m_itemColors[aItemType];
		}
		}


		bool PCB_PAINTER::Draw( const VIEW_ITEM* aItem, int aLayer )
		@@ -286,7 +283,8 @@ void PCB_PAINTER::draw( const TRACK* aTrack, int aLayer )
		double textSize = std::min( static_cast<double>( width ), length / netName.length() );

		// Set a proper color for the label
		color = getLayerColor( aTrack->GetLayer(), aTrack->GetNet() );
		color = getLayerColor( aTrack->GetLayer(), aTrack->GetNet(),
		aTrack->ViewIsHighlighted() );
		if( color.GetBrightness() > 0.5 )
		m_gal->SetStrokeColor( color.Darkened( 0.8 ) );
		else
		@@ -305,7 +303,7 @@ void PCB_PAINTER::draw( const TRACK* aTrack, int aLayer )
		else if( IsCopperLayer( aLayer ))
		{
		// Draw a regular track
		color = getLayerColor( aLayer, netNumber );
		color = getLayerColor( aLayer, netNumber, aTrack->ViewIsHighlighted() );
		m_gal->SetStrokeColor( color );
		m_gal->SetIsStroke( true );

		@@ -344,7 +342,7 @@ void PCB_PAINTER::draw( const SEGVIA* aVia, int aLayer )
		else
		return;

		color = getLayerColor( aLayer, aVia->GetNet() );
		color = getLayerColor( aLayer, aVia->GetNet(), aVia->ViewIsHighlighted() );

		if( m_pcbSettings->m_sketchModeSelect[VIAS_VISIBLE] )
		{
		@@ -418,7 +416,9 @@ void PCB_PAINTER::draw( const D_PAD* aPad, int aLayer )
		m_gal->SetMirrored( false );

		// Set a proper color for the label
		color = getLayerColor( aPad->GetParent()->GetLayer(), aPad->GetNet() );
		color = getLayerColor( aPad->GetParent()->GetLayer(), aPad->GetNet(),
		aPad->ViewIsHighlighted() );

		if( color.GetBrightness() > 0.5 )
		m_gal->SetStrokeColor( color.Darkened( 0.8 ) );
		else
		@@ -448,7 +448,7 @@ void PCB_PAINTER::draw( const D_PAD* aPad, int aLayer )
		return;
		}

		color = getLayerColor( aLayer, aPad->GetNet() );
		color = getLayerColor( aLayer, aPad->GetNet(), aPad->ViewIsHighlighted() );
		if( m_pcbSettings->m_sketchModeSelect[PADS_VISIBLE] )
		{
		// Outline mode
		@@ -467,7 +467,7 @@ void PCB_PAINTER::draw( const D_PAD* aPad, int aLayer )

		m_gal->Save();
		m_gal->Translate( VECTOR2D( aPad->GetPosition() ) );
		m_gal->Rotate( -aPad->GetOrientation() * M_PI / 1800.0 ); // orientation is in tenths of degree
		m_gal->Rotate( -aPad->GetOrientation() * M_PI / 1800.0 );

		// Choose drawing settings depending on if we are drawing a pad itself or a hole
		if( aLayer == ITEM_GAL_LAYER( PADS_HOLES_VISIBLE ) )
		@@ -551,7 +551,8 @@ void PCB_PAINTER::draw( const D_PAD* aPad, int aLayer )

		void PCB_PAINTER::draw( const DRAWSEGMENT* aSegment )
		{
		COLOR4D strokeColor = getLayerColor( aSegment->GetLayer(), 0 );
		COLOR4D strokeColor = getLayerColor( aSegment->GetLayer(), 0,
		aSegment->ViewIsHighlighted() );
		std::deque<VECTOR2D> pointsList;

		m_gal->SetIsFill( false );
		@@ -604,7 +605,7 @@ void PCB_PAINTER::draw( const TEXTE_PCB* aText )
		if( aText->GetText().Length() == 0 )
		return;

		COLOR4D strokeColor = getLayerColor( aText->GetLayer(), 0 );
		COLOR4D strokeColor = getLayerColor( aText->GetLayer(), 0, aText->ViewIsHighlighted() );
		VECTOR2D position( aText->GetTextPosition().x, aText->GetTextPosition().y );
		double orientation = aText->GetOrientation() * M_PI / 1800.0;

		@@ -620,7 +621,7 @@ void PCB_PAINTER::draw( const TEXTE_MODULE* aText, int aLayer )
		if( aText->GetLength() == 0 )
		return;

		COLOR4D strokeColor = getLayerColor( aLayer, 0 );
		COLOR4D strokeColor = getLayerColor( aLayer, 0, aText->ViewIsHighlighted() );
		VECTOR2D position( aText->GetTextPosition().x, aText->GetTextPosition().y);
		double orientation = aText->GetDrawRotation() * M_PI / 1800.0;

		@@ -631,9 +632,10 @@ void PCB_PAINTER::draw( const TEXTE_MODULE* aText, int aLayer )
		}


		void PCB_PAINTER::draw( const ZONE_CONTAINER* aContainer )
		void PCB_PAINTER::draw( const ZONE_CONTAINER* aZone )
		{
		COLOR4D color = getLayerColor( aContainer->GetLayer(), aContainer->GetNet() );
		COLOR4D color = getLayerColor( aZone->GetLayer(), aZone->GetNet(),
		aZone->ViewIsHighlighted() );
		std::deque<VECTOR2D> corners;
		PCB_RENDER_SETTINGS::DisplayZonesMode displayMode = m_pcbSettings->m_displayZoneMode;

		@@ -643,7 +645,7 @@ void PCB_PAINTER::draw( const ZONE_CONTAINER* aContainer )
		m_gal->SetIsStroke( true );
		m_gal->SetLineWidth( m_pcbSettings->m_outlineWidth );

		const CPolyLine* outline = aContainer->Outline();
		const CPolyLine* outline = aZone->Outline();
		for( int i = 0; i < outline->GetCornersCount(); ++i )
		{
		corners.push_back( VECTOR2D( outline->GetPos( i ) ) );
		@@ -656,13 +658,13 @@ void PCB_PAINTER::draw( const ZONE_CONTAINER* aContainer )
		// Draw the filling
		if( displayMode != PCB_RENDER_SETTINGS::DZ_HIDE_FILLED )
		{
		const std::vector<CPolyPt> polyPoints = aContainer->GetFilledPolysList().GetList();
		const std::vector<CPolyPt> polyPoints = aZone->GetFilledPolysList().GetList();
		if( polyPoints.size() == 0 ) // Nothing to draw
		return;

		// Set up drawing options
		m_gal->SetFillColor( color );
		m_gal->SetLineWidth( aContainer->GetThermalReliefCopperBridge() / 2.0 );
		m_gal->SetLineWidth( aZone->GetThermalReliefCopperBridge() / 2.0 );

		if( displayMode == PCB_RENDER_SETTINGS::DZ_SHOW_FILLED )
		{
		@@ -702,7 +704,8 @@ void PCB_PAINTER::draw( const ZONE_CONTAINER* aContainer )

		void PCB_PAINTER::draw( const DIMENSION* aDimension )
		{
		COLOR4D strokeColor = getLayerColor( aDimension->GetLayer(), 0 );
		COLOR4D strokeColor = getLayerColor( aDimension->GetLayer(), 0,
		aDimension->ViewIsHighlighted() );

		m_gal->SetStrokeColor( strokeColor );
		m_gal->SetIsFill( false );
		@@ -725,7 +728,7 @@ void PCB_PAINTER::draw( const DIMENSION* aDimension )

		void PCB_PAINTER::draw( const PCB_TARGET* aTarget )
		{
		COLOR4D strokeColor = getLayerColor( aTarget->GetLayer(), 0 );
		COLOR4D strokeColor = getLayerColor( aTarget->GetLayer(), 0, aTarget->ViewIsHighlighted() );
		VECTOR2D position( aTarget->GetPosition() );
		double size, radius;

pcbnew/pcb_painter.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ protected:
		PCB_RENDER_SETTINGS* m_pcbSettings;

		/// @copydoc PAINTER::getLayerColor()
		const COLOR4D& getLayerColor( int aLayer, int aNetCode ) const;
		const COLOR4D& getLayerColor( int aLayer, int aNetCode, bool aHighlighted ) const;

		/**
		* Function getItemColor
		@@ -148,7 +148,7 @@ protected:
		* @param aItemType Layer number of the item to be drawn.
		* @param aNetCode Net number of the item to be drawn.
		*/
		const COLOR4D& getItemColor( int aItemType, int aNetCode ) const;
		const COLOR4D& getItemColor( int aItemType, int aNetCode, bool aHighlighted ) const;

		// Drawing functions for various types of PCB-specific items
		void draw( const TRACK*, int );

Admin message