haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Formatting.

This commit is contained in:
Jeff Young 2020-11-29 10:49:02 +00:00
parent 3c25abbf2f
commit f57cd91cb3
3 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/page_layout/ws_data_item.h
View File

@ -326,12 +326,6 @@ public:
virtual int GetPenSizeUi() override;
/**
* move item to a new position
* @param aPosition = the new position of item
*/
void MoveTo( DPOINT aPosition );
/**
* Try to build text wihich is an increment of m_TextBase
* has meaning only if m_TextBase is a basic text (one char)
@ -364,14 +358,15 @@ public:
class BITMAP_BASE;
class WS_DATA_ITEM_BITMAP : public WS_DATA_ITEM
{
public:
BITMAP_BASE* m_ImageBitmap;
public:
WS_DATA_ITEM_BITMAP(BITMAP_BASE* aImage)
: WS_DATA_ITEM( WS_BITMAP )
WS_DATA_ITEM_BITMAP( BITMAP_BASE* aImage ) :
WS_DATA_ITEM( WS_BITMAP )
{
m_ImageBitmap = aImage;
}

15
pagelayout_editor/dialogs/dialogs_for_printing.cpp
View File

@ -76,8 +76,8 @@ class PLEDITOR_PREVIEW_FRAME : public wxPreviewFrame
public:
PLEDITOR_PREVIEW_FRAME( wxPrintPreview* aPreview, PL_EDITOR_FRAME* aParent,
const wxString& aTitle, const wxPoint& aPos = wxDefaultPosition,
const wxSize& aSize = wxDefaultSize ) :
const wxString& aTitle, const wxPoint& aPos = wxDefaultPosition,
const wxSize& aSize = wxDefaultSize ) :
wxPreviewFrame( aPreview, aParent, aTitle, aPos, aSize )
{
m_parent = aParent;
@ -198,12 +198,11 @@ void PLEDITOR_PRINTOUT::PrintPage( int aPageNum )
for( WS_DATA_ITEM* dataItem : model.GetItems() )
{
if( dataItem->GetType() != WS_DATA_ITEM::WS_BITMAP )
continue;
WS_DATA_ITEM_BITMAP* itemBM = static_cast<WS_DATA_ITEM_BITMAP*>( dataItem );
itemBM->m_ImageBitmap->SetPixelSizeIu( IU_PER_MILS * 1000 /
itemBM->m_ImageBitmap->GetPPI() );
if( dataItem->GetType() == WS_DATA_ITEM::WS_BITMAP )
{
BITMAP_BASE* bitmap = static_cast<WS_DATA_ITEM_BITMAP*>( dataItem )->m_ImageBitmap;
bitmap->SetPixelSizeIu( IU_PER_MILS * 1000 / bitmap->GetPPI() );
}
}
m_parent->PrintWorkSheet( &renderSettings, screen, IU_PER_MILS, wxEmptyString );

29
pagelayout_editor/pl_editor_frame.cpp
View File

@ -33,7 +33,6 @@
#include <widgets/paged_dialog.h>
#include <panel_gal_display_options.h>
#include <panel_hotkeys_editor.h>
#include <view/view.h>
#include <confirm.h>
#include <kiplatform/app.h>
#include <painter.h>
@ -47,7 +46,6 @@
#include <tool/picker_tool.h>
#include <tool/zoom_tool.h>
#include <widgets/infobar.h>
#include <widgets/msgpanel.h>
#include <settings/settings_manager.h>
#include "dialogs/panel_pl_editor_color_settings.h"
@ -103,7 +101,8 @@ PL_EDITOR_FRAME::PL_EDITOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
// Create GAL canvas
auto* drawPanel = new PL_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_frameSize,
GetGalDisplayOptions(), EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE );
GetGalDisplayOptions(),
EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE );
SetCanvas( drawPanel );
LoadSettings( config() );
@ -340,7 +339,8 @@ void PL_EDITOR_FRAME::OnExit( wxCommandEvent& aEvent )
bool PL_EDITOR_FRAME::canCloseWindow( wxCloseEvent& aEvent )
{
// Shutdown blocks must be determined and vetoed as early as possible
if( KIPLATFORM::APP::SupportsShutdownBlockReason() && aEvent.GetId() == wxEVT_QUERY_END_SESSION
if( KIPLATFORM::APP::SupportsShutdownBlockReason()
&& aEvent.GetId() == wxEVT_QUERY_END_SESSION
&& IsContentModified() )
{
return false;
@ -352,7 +352,10 @@ bool PL_EDITOR_FRAME::canCloseWindow( wxCloseEvent& aEvent )
wxString msg = _( "Save changes to \"%s\" before closing?" );
if( !HandleUnsavedChanges( this, wxString::Format( msg, filename.GetFullName() ),
[&]() -> bool { return saveCurrentPageLayout(); } ) )
[&]() -> bool
{
return saveCurrentPageLayout();
} ) )
{
return false;
}
@ -763,7 +766,7 @@ void PL_EDITOR_FRAME::UpdateStatusBar()
// Display corner reference for coord origin
line.Printf( _("coord origin: %s"),
m_originSelectBox->GetString( m_originSelectChoice ).GetData() );
m_originSelectBox->GetString( m_originSelectChoice ).GetData() );
SetStatusText( line, 5 );
// Display units
@ -778,12 +781,11 @@ void PL_EDITOR_FRAME::PrintPage( RENDER_SETTINGS* aSettings )
for( WS_DATA_ITEM* dataItem : model.GetItems() )
{
// Ensure the scaling factor (used only in printing) of bitmaps is up to date
if( dataItem->GetType() != WS_DATA_ITEM::WS_BITMAP )
continue;
WS_DATA_ITEM_BITMAP* itemBM = static_cast<WS_DATA_ITEM_BITMAP*>( dataItem );
itemBM->m_ImageBitmap->SetPixelSizeIu( IU_PER_MILS * 1000
/ itemBM->m_ImageBitmap->GetPPI() );
if( dataItem->GetType() == WS_DATA_ITEM::WS_BITMAP )
{
BITMAP_BASE* bitmap = static_cast<WS_DATA_ITEM_BITMAP*>( dataItem )->m_ImageBitmap;
bitmap->SetPixelSizeIu( IU_PER_MILS * 1000 / bitmap->GetPPI() );
}
}
PrintWorkSheet( aSettings, GetScreen(), IU_PER_MILS, wxEmptyString );
@ -847,7 +849,8 @@ WS_DATA_ITEM* PL_EDITOR_FRAME::AddPageLayoutItem( int aType )
case WS_DATA_ITEM::WS_BITMAP:
{
wxFileDialog fileDlg( this, _( "Choose Image" ), wxEmptyString, wxEmptyString,
_( "Image Files" ) + wxS( " " ) + wxImage::GetImageExtWildcard(), wxFD_OPEN );
_( "Image Files" ) + wxS( " " ) + wxImage::GetImageExtWildcard(),
wxFD_OPEN );
if( fileDlg.ShowModal() != wxID_OK )
return NULL;