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

Code formatting

This commit is contained in:
Maciej Suminski 2018-11-20 15:30:18 +01:00
parent d405be95b8
commit 630baa3724
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
eeschema/sch_view.cpp
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2013-2017 CERN * Copyright (C) 2013-2018 CERN
* @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch> * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
* @author Maciej Suminski <maciej.suminski@cern.ch> * @author Maciej Suminski <maciej.suminski@cern.ch>
* *
@ -66,7 +66,7 @@ SCH_VIEW::~SCH_VIEW()
} }
void SCH_VIEW::ResizeSheetWorkingArea( SCH_SCREEN *aScreen ) void SCH_VIEW::ResizeSheetWorkingArea( SCH_SCREEN* aScreen )
{ {
const PAGE_INFO& page_info = aScreen->GetPageSettings(); const PAGE_INFO& page_info = aScreen->GetPageSettings();
// A full size = 3 * page size allows a wide margin around the worksheet. // A full size = 3 * page size allows a wide margin around the worksheet.
@ -96,8 +96,8 @@ void SCH_VIEW::DisplaySheet( SCH_SCREEN *aScreen )
ResizeSheetWorkingArea( aScreen ); ResizeSheetWorkingArea( aScreen );
m_selectionArea.reset( new KIGFX::PREVIEW::SELECTION_AREA( ) ); m_selectionArea.reset( new KIGFX::PREVIEW::SELECTION_AREA() );
m_preview.reset( new KIGFX::VIEW_GROUP () ); m_preview.reset( new KIGFX::VIEW_GROUP() );
Add( m_worksheet.get() ); Add( m_worksheet.get() );
Add( m_selectionArea.get() ); Add( m_selectionArea.get() );
@ -105,24 +105,24 @@ void SCH_VIEW::DisplaySheet( SCH_SCREEN *aScreen )
} }
void SCH_VIEW::DisplaySheet( SCH_SHEET *aSheet ) void SCH_VIEW::DisplaySheet( SCH_SHEET* aSheet )
{ {
DisplaySheet( aSheet->GetScreen() ); DisplaySheet( aSheet->GetScreen() );
} }
void SCH_VIEW::DisplayComponent( LIB_PART *aPart ) void SCH_VIEW::DisplayComponent( LIB_PART* aPart )
{ {
Clear(); Clear();
if( !aPart ) if( !aPart )
return; return;
for ( auto &item : aPart->GetDrawItems() ) for( auto& item : aPart->GetDrawItems() )
Add( &item ); Add( &item );
m_selectionArea.reset( new KIGFX::PREVIEW::SELECTION_AREA( ) ); m_selectionArea.reset( new KIGFX::PREVIEW::SELECTION_AREA() );
m_preview.reset( new KIGFX::VIEW_GROUP () ); m_preview.reset( new KIGFX::VIEW_GROUP() );
Add( m_selectionArea.get() ); Add( m_selectionArea.get() );
Add( m_preview.get() ); Add( m_preview.get() );
} }
@ -140,12 +140,12 @@ void SCH_VIEW::ClearPreview()
} }
void SCH_VIEW::AddToPreview( EDA_ITEM *aItem, bool takeOwnership ) void SCH_VIEW::AddToPreview( EDA_ITEM* aItem, bool aTakeOwnership )
{ {
Hide( aItem, false ); Hide( aItem, false );
m_preview->Add( aItem ); m_preview->Add( aItem );
if( takeOwnership ) if( aTakeOwnership )
m_ownedItems.push_back( aItem ); m_ownedItems.push_back( aItem );
SetVisible( m_preview.get(), true ); SetVisible( m_preview.get(), true );
@ -154,7 +154,7 @@ void SCH_VIEW::AddToPreview( EDA_ITEM *aItem, bool takeOwnership )
} }
void SCH_VIEW::ShowSelectionArea( bool aShow ) void SCH_VIEW::ShowSelectionArea( bool aShow )
{ {
if( aShow ) if( aShow )
{ {
@ -168,7 +168,7 @@ void SCH_VIEW::ShowSelectionArea( bool aShow )
} }
void SCH_VIEW::ShowPreview( bool aShow ) void SCH_VIEW::ShowPreview( bool aShow )
{ {
SetVisible( m_preview.get(), aShow ); SetVisible( m_preview.get(), aShow );
} }
@ -177,15 +177,14 @@ void SCH_VIEW::ShowPreview( bool aShow )
void SCH_VIEW::ClearHiddenFlags() void SCH_VIEW::ClearHiddenFlags()
{ {
for( auto item : *m_allItems ) for( auto item : *m_allItems )
Hide ( item, false ); Hide( item, false );
} }
void SCH_VIEW::HideWorksheet() void SCH_VIEW::HideWorksheet()
{ {
// SetVisible( m_worksheet.get(), false ); // SetVisible( m_worksheet.get(), false );
} }
}; }; // namespace KIGFX

8
eeschema/sch_view.h
View File

@ -74,9 +74,9 @@ public:
SCH_VIEW( bool aIsDynamic, SCH_BASE_FRAME* aFrame ); SCH_VIEW( bool aIsDynamic, SCH_BASE_FRAME* aFrame );
~SCH_VIEW(); ~SCH_VIEW();
void DisplaySheet( SCH_SHEET *aSheet ); void DisplaySheet( SCH_SHEET* aSheet );
void DisplaySheet( SCH_SCREEN *aScreen ); void DisplaySheet( SCH_SCREEN* aScreen );
void DisplayComponent( LIB_PART *aPart ); void DisplayComponent( LIB_PART* aPart );
// Call it to set new draw area limits (max working and draw area size) // Call it to set new draw area limits (max working and draw area size)
void ResizeSheetWorkingArea( SCH_SCREEN *aScreen ); void ResizeSheetWorkingArea( SCH_SCREEN *aScreen );
@ -86,7 +86,7 @@ public:
KIGFX::VIEW_GROUP* GetPreview() const { return m_preview.get(); } KIGFX::VIEW_GROUP* GetPreview() const { return m_preview.get(); }
void ClearPreview(); void ClearPreview();
void AddToPreview( EDA_ITEM *aItem, bool takeOwnership = true ); void AddToPreview( EDA_ITEM* aItem, bool aTakeOwnership = true );
void ShowSelectionArea( bool aShow = true ); void ShowSelectionArea( bool aShow = true );
void ShowPreview( bool aShow = true ); void ShowPreview( bool aShow = true );