Pl_Editor: add some hot keys. Fix some rounding issues. (28cd9963) · Commits · Elphel / kicad-source-mirror

common/page_layout/class_worksheet_dataitem.cpp

+8 −11

Original line number	Original line	Diff line number	Diff line
	@@ -293,6 +293,8 @@ bool WORKSHEET_DATAITEM::IsInsidePage( int ii ) const
	{		{
	DPOINT pos = GetStartPos( ii );		DPOINT pos = GetStartPos( ii );

			for( int kk = 0; kk < 1; kk++ )
			{
	if( m_RB_Corner.x < pos.x \|\| m_LT_Corner.x > pos.x )		if( m_RB_Corner.x < pos.x \|\| m_LT_Corner.x > pos.x )
	return false;		return false;

	@@ -300,12 +302,7 @@ bool WORKSHEET_DATAITEM::IsInsidePage( int ii ) const
	return false;		return false;

	pos = GetEndPos( ii );		pos = GetEndPos( ii );
			}
	if( m_RB_Corner.x < pos.x \|\| m_LT_Corner.x > pos.x )
	return false;

	if( m_RB_Corner.y < pos.y \|\| m_LT_Corner.y > pos.y )
	return false;

	return true;		return true;
	}		}

common/page_layout/page_layout_default_description.cpp

+3 −41

Original line number	Original line	Diff line number	Diff line
	@@ -27,48 +27,10 @@
	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
	*/		*/

	/* keyword used in page layout description are (see page_layout_reader.keywords)		/* keyword used in page layout description are listed
	* page_layout		* in page_layout_reader.keywords file
	* setup
	* linewidth
	* textlinewidth
	* textsize
	* comment
	* option
	* page1only
	* notonpage1
	* line
	* rect
	* polygon
	* tbtext
	* ltcorner
	* lbcorner
	* rbcorner
	* rtcorner
	* name
	* pos
	* start
	* end
	* pts
	* xy
	* maxlen
	* maxheight
	* font
	* bold
	* italic
	* size
	* justify
	* left
	* center
	* right
	* top
	* bottom
	* rotate
	* repeat
	* incrx
	* incry
	* incrlabel
	*/		*/

	/*		/*
	* Items use coordinates.		* Items use coordinates.
	* A coordinate is defined relative to a page corner		* A coordinate is defined relative to a page corner

common/page_layout/title_block_shapes.cpp

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -108,15 +108,15 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList(

	// Left top corner position		// Left top corner position
	DPOINT lt_corner;		DPOINT lt_corner;
	lt_corner.x = m_LTmargin.x;		lt_corner.x = pglayout.GetLeftMargin();
	lt_corner.y = m_LTmargin.y;		lt_corner.y = pglayout.GetTopMargin();
	WORKSHEET_DATAITEM::m_LT_Corner = lt_corner * milsTomm;		WORKSHEET_DATAITEM::m_LT_Corner = lt_corner;

	// Right bottom corner position		// Right bottom corner position
	DPOINT rb_corner;		DPOINT rb_corner;
	rb_corner.x = m_pageSize.x - m_RBmargin.x;		rb_corner.x = (m_pageSize.x*milsTomm) - pglayout.GetRightMargin();
	rb_corner.y = m_pageSize.y - m_RBmargin.y;		rb_corner.y = (m_pageSize.y*milsTomm) - pglayout.GetBottomMargin();
	WORKSHEET_DATAITEM::m_RB_Corner = rb_corner * milsTomm;		WORKSHEET_DATAITEM::m_RB_Corner = rb_corner;

	WS_DRAW_ITEM_TEXT* gtext;		WS_DRAW_ITEM_TEXT* gtext;
	int pensize;		int pensize;

include/class_worksheet_dataitem.h

+22 −6

Original line number	Original line	Diff line number	Diff line
	/**		/**
	* @file class_worksheet_data_item.h		* @file class_worksheet_dataitem.h
	* @brief description of graphic items and texts to build a title block		* @brief description of graphic items and texts to build a title block
	*/		*/

	@@ -143,6 +143,12 @@ public:
	void SetFlags( int aMask ) { m_flags \|= aMask; }		void SetFlags( int aMask ) { m_flags \|= aMask; }
	void ClearFlags( int aMask ) { m_flags &= ~aMask; }		void ClearFlags( int aMask ) { m_flags &= ~aMask; }

			/**
			* @return true if the item has a end point (segment; rect)
			* of false (text, polugon)
			*/
			virtual bool HasEndPoint() { return true; }

	/**		/**
	* @return 0 if the item has no specific option for page 1		* @return 0 if the item has no specific option for page 1
	* 1 if the item is only on page 1		* 1 if the item is only on page 1
	@@ -276,6 +282,11 @@ public:
	return KiROUND( m_LineWidth * m_WSunits2Iu );		return KiROUND( m_LineWidth * m_WSunits2Iu );
	}		}

			/**
			* @return false (no end point)
			*/
			virtual bool HasEndPoint() { return false; };

	/**		/**
	* add a corner in corner list		* add a corner in corner list
	* @param aCorner: the item to append		* @param aCorner: the item to append
	@@ -360,6 +371,11 @@ public:
	public:		public:
	WORKSHEET_DATAITEM_TEXT( const wxChar* aTextBase );		WORKSHEET_DATAITEM_TEXT( const wxChar* aTextBase );

			/**
			* @return false (no end point)
			*/
			virtual bool HasEndPoint() { return false; };

	virtual int GetPenSizeUi()		virtual int GetPenSizeUi()
	{		{
	if( m_LineWidth )		if( m_LineWidth )

pagelayout_editor/dialogs/properties_frame_base.cpp

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -599,6 +599,9 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
	m_buttonGeneralOptsOK->SetDefault();		m_buttonGeneralOptsOK->SetDefault();
	bSizerGeneralOpts->Add( m_buttonGeneralOptsOK, 0, wxALL\|wxEXPAND, 5 );		bSizerGeneralOpts->Add( m_buttonGeneralOptsOK, 0, wxALL\|wxEXPAND, 5 );

			m_buttonDefault = new wxButton( m_swGeneralOpts, wxID_ANY, _("Set to Default"), wxDefaultPosition, wxDefaultSize, 0 );
			bSizerGeneralOpts->Add( m_buttonDefault, 0, wxALL\|wxEXPAND, 5 );


	m_swGeneralOpts->SetSizer( bSizerGeneralOpts );		m_swGeneralOpts->SetSizer( bSizerGeneralOpts );
	m_swGeneralOpts->Layout();		m_swGeneralOpts->Layout();
	@@ -614,6 +617,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
	// Connect Events		// Connect Events
	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this );		m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this );
	m_buttonGeneralOptsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this );		m_buttonGeneralOptsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this );
			m_buttonDefault->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnSetDefaultValues ), NULL, this );
	}		}

	PANEL_PROPERTIES_BASE::~PANEL_PROPERTIES_BASE()		PANEL_PROPERTIES_BASE::~PANEL_PROPERTIES_BASE()
	@@ -621,5 +625,6 @@ PANEL_PROPERTIES_BASE::~PANEL_PROPERTIES_BASE()
	// Disconnect Events		// Disconnect Events
	m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this );		m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this );
	m_buttonGeneralOptsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this );		m_buttonGeneralOptsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this );
			m_buttonDefault->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnSetDefaultValues ), NULL, this );

	}		}

Admin message