Browse Source
Graphical diff for schematic vs library symbols.
Graphical diff for schematic vs library symbols.
Fixes https://gitlab.com/kicad/code/kicad/issues/13736newinvert
Jeff Young
3 years ago
30 changed files with 440 additions and 149 deletions
-
4common/CMakeLists.txt
-
30common/dialogs/dialog_book_reporter.cpp
-
10common/dialogs/dialog_book_reporter_base.cpp
-
8common/dialogs/dialog_book_reporter_base.fbp
-
8common/dialogs/dialog_book_reporter_base.h
-
6common/eda_item.cpp
-
1eeschema/CMakeLists.txt
-
2eeschema/dialogs/dialog_choose_symbol.cpp
-
4eeschema/dialogs/dialog_rescue_each.cpp
-
6eeschema/lib_item.cpp
-
5eeschema/lib_item.h
-
10eeschema/lib_shape.cpp
-
15eeschema/lib_symbol.cpp
-
2eeschema/menubar.cpp
-
3eeschema/sch_painter.cpp
-
4eeschema/tools/ee_actions.cpp
-
2eeschema/tools/ee_actions.h
-
63eeschema/tools/ee_inspection_tool.cpp
-
14eeschema/tools/ee_inspection_tool.h
-
166eeschema/widgets/symbol_diff_widget.cpp
-
60eeschema/widgets/symbol_diff_widget.h
-
13eeschema/widgets/symbol_preview_widget.cpp
-
6eeschema/widgets/symbol_preview_widget.h
-
20include/dialogs/dialog_book_reporter.h
-
5include/eda_item.h
-
2pcbnew/menubar_pcb_editor.cpp
-
100pcbnew/tools/board_inspection_tool.cpp
-
16pcbnew/tools/board_inspection_tool.h
-
2pcbnew/tools/pcb_actions.cpp
-
2pcbnew/tools/pcb_actions.h
@ -0,0 +1,166 @@ |
|||
/*
|
|||
* This program source code file is part of KiCad, a free EDA CAD application. |
|||
* |
|||
* Copyright (C) 2023 KiCad Developers, see AUTHORS.txt for contributors. |
|||
* |
|||
* This program is free software: you can redistribute it and/or modify it |
|||
* under the terms of the GNU General Public License as published by the |
|||
* Free Software Foundation, either version 3 of the License, or (at your |
|||
* option) any later version. |
|||
* |
|||
* This program is distributed in the hope that it will be useful, but |
|||
* WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|||
* General Public License for more details. |
|||
* |
|||
* You should have received a copy of the GNU General Public License along |
|||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
#include <widgets/symbol_diff_widget.h>
|
|||
#include <sch_painter.h>
|
|||
#include <eeschema_settings.h>
|
|||
#include <settings/settings_manager.h>
|
|||
#include <sch_view.h>
|
|||
#include <wx/sizer.h>
|
|||
#include <wx/stattext.h>
|
|||
#include <wx/slider.h>
|
|||
|
|||
|
|||
SYMBOL_DIFF_WIDGET::SYMBOL_DIFF_WIDGET( wxWindow* aParent, |
|||
EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvasType ) : |
|||
SYMBOL_PREVIEW_WIDGET( aParent, nullptr, aCanvasType ), |
|||
m_libraryItem( nullptr ), |
|||
m_slider( nullptr ) |
|||
{ |
|||
wxBoxSizer* bottomSizer = new wxBoxSizer( wxHORIZONTAL ); |
|||
|
|||
wxStaticText* schLabel = new wxStaticText( this, wxID_ANY, _( "Schematic" ) ); |
|||
wxStaticText* libLabel = new wxStaticText( this, wxID_ANY, _( "Library" ) ); |
|||
m_slider = new wxSlider( this, wxID_ANY, 50, 0, 100 ); |
|||
|
|||
bottomSizer->Add( schLabel, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxALIGN_CENTRE_VERTICAL, 8 ); |
|||
bottomSizer->Add( m_slider, 1, wxLEFT | wxRIGHT | wxALIGN_BOTTOM, 30 ); |
|||
bottomSizer->Add( libLabel, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxALIGN_CENTRE_VERTICAL, 8 ); |
|||
|
|||
m_outerSizer->Add( bottomSizer, 0, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, 10 ); |
|||
|
|||
Layout(); |
|||
|
|||
m_slider->Bind( wxEVT_SCROLL_TOP, &SYMBOL_DIFF_WIDGET::onSlider, this ); |
|||
m_slider->Bind( wxEVT_SCROLL_BOTTOM, &SYMBOL_DIFF_WIDGET::onSlider, this ); |
|||
m_slider->Bind( wxEVT_SCROLL_LINEUP, &SYMBOL_DIFF_WIDGET::onSlider, this ); |
|||
m_slider->Bind( wxEVT_SCROLL_LINEDOWN, &SYMBOL_DIFF_WIDGET::onSlider, this ); |
|||
m_slider->Bind( wxEVT_SCROLL_PAGEUP, &SYMBOL_DIFF_WIDGET::onSlider, this ); |
|||
m_slider->Bind( wxEVT_SCROLL_PAGEDOWN, &SYMBOL_DIFF_WIDGET::onSlider, this ); |
|||
m_slider->Bind( wxEVT_SCROLL_THUMBTRACK, &SYMBOL_DIFF_WIDGET::onSlider, this ); |
|||
m_slider->Bind( wxEVT_SCROLL_THUMBRELEASE, &SYMBOL_DIFF_WIDGET::onSlider, this ); |
|||
m_slider->Bind( wxEVT_SCROLL_CHANGED, &SYMBOL_DIFF_WIDGET::onSlider, this ); |
|||
} |
|||
|
|||
|
|||
SYMBOL_DIFF_WIDGET::~SYMBOL_DIFF_WIDGET() |
|||
{ |
|||
delete m_libraryItem; |
|||
} |
|||
|
|||
|
|||
void SYMBOL_DIFF_WIDGET::DisplayDiff( LIB_SYMBOL* aSchSymbol, LIB_SYMBOL* aLibSymbol, int aUnit, |
|||
int aConvert ) |
|||
{ |
|||
KIGFX::VIEW* view = m_preview->GetView(); |
|||
|
|||
if( m_previewItem ) |
|||
{ |
|||
view->Remove( m_previewItem ); |
|||
delete m_previewItem; |
|||
m_previewItem = nullptr; |
|||
|
|||
wxASSERT( m_libraryItem ); |
|||
|
|||
view->Remove( m_libraryItem ); |
|||
delete m_libraryItem; |
|||
m_libraryItem = nullptr; |
|||
} |
|||
|
|||
if( aSchSymbol ) |
|||
{ |
|||
m_previewItem = aSchSymbol; |
|||
|
|||
// For symbols having a De Morgan body style, use the first style
|
|||
auto settings = |
|||
static_cast<KIGFX::SCH_RENDER_SETTINGS*>( view->GetPainter()->GetSettings() ); |
|||
|
|||
settings->m_ShowUnit = ( m_previewItem->IsMulti() && !aUnit ) ? 1 : aUnit; |
|||
settings->m_ShowConvert = ( m_previewItem->HasConversion() && !aConvert ) ? 1 : aConvert; |
|||
|
|||
view->Add( m_previewItem ); |
|||
|
|||
// Get the symbol size, in internal units
|
|||
m_itemBBox = m_previewItem->GetUnitBoundingBox( settings->m_ShowUnit, |
|||
settings->m_ShowConvert ); |
|||
|
|||
// Calculate the draw scale to fit the drawing area
|
|||
fitOnDrawArea(); |
|||
|
|||
wxASSERT( aLibSymbol ); |
|||
|
|||
m_libraryItem = aLibSymbol; |
|||
view->Add( m_libraryItem ); |
|||
} |
|||
|
|||
wxScrollEvent dummy; |
|||
onSlider( dummy ); |
|||
|
|||
m_preview->Show(); |
|||
Layout(); |
|||
} |
|||
|
|||
|
|||
void SYMBOL_DIFF_WIDGET::onSlider( wxScrollEvent& aEvent ) |
|||
{ |
|||
KIGFX::VIEW* view = m_preview->GetView(); |
|||
double pct = (double) m_slider->GetValue() / 100.0; |
|||
|
|||
if( m_previewItem ) |
|||
{ |
|||
double val; |
|||
|
|||
if( pct < 0.5 ) |
|||
val = 0.0; |
|||
else |
|||
val = ( pct - 0.5 ) * 2; |
|||
|
|||
m_previewItem->SetForceTransparency( val ); |
|||
view->Update( m_previewItem ); |
|||
|
|||
for( LIB_ITEM& child : m_previewItem->GetDrawItems() ) |
|||
{ |
|||
child.SetForceTransparency( val ); |
|||
view->Update( &child ); |
|||
} |
|||
} |
|||
|
|||
if( m_libraryItem ) |
|||
{ |
|||
double val; |
|||
|
|||
if( pct > 0.5 ) |
|||
val = 0.0; |
|||
else |
|||
val = 1.0 - ( pct * 2 ); |
|||
|
|||
m_libraryItem->SetForceTransparency( val ); |
|||
view->Update( m_libraryItem ); |
|||
|
|||
for( LIB_ITEM& child : m_libraryItem->GetDrawItems() ) |
|||
{ |
|||
child.SetForceTransparency( val ); |
|||
view->Update( &child ); |
|||
} |
|||
} |
|||
|
|||
m_preview->ForceRefresh(); |
|||
|
|||
aEvent.Skip(); |
|||
} |
|||
@ -0,0 +1,60 @@ |
|||
/* |
|||
* This program source code file is part of KiCad, a free EDA CAD application. |
|||
* |
|||
* Copyright (C) 2023 KiCad Developers, see AUTHORS.txt for contributors. |
|||
* |
|||
* This program is free software: you can redistribute it and/or modify it |
|||
* under the terms of the GNU General Public License as published by the |
|||
* Free Software Foundation, either version 3 of the License, or (at your |
|||
* option) any later version. |
|||
* |
|||
* This program is distributed in the hope that it will be useful, but |
|||
* WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|||
* General Public License for more details. |
|||
* |
|||
* You should have received a copy of the GNU General Public License along |
|||
* with this program. If not, see <http://www.gnu.org/licenses/>. |
|||
*/ |
|||
|
|||
#ifndef SYMBOL_DIFF_WIDGET_H |
|||
#define SYMBOL_DIFF_WIDGET_H |
|||
|
|||
#include <wx/panel.h> |
|||
#include <kiway.h> |
|||
#include <gal/gal_display_options.h> |
|||
#include <widgets/symbol_preview_widget.h> |
|||
|
|||
|
|||
class LIB_SYMBOL; |
|||
class wxSlider; |
|||
|
|||
|
|||
class SYMBOL_DIFF_WIDGET: public SYMBOL_PREVIEW_WIDGET |
|||
{ |
|||
public: |
|||
/** |
|||
* Construct a symbol diff widget. |
|||
* |
|||
* @param aParent - parent window |
|||
* @param aCanvasType = the type of canvas (GAL_TYPE_OPENGL or GAL_TYPE_CAIRO only) |
|||
*/ |
|||
SYMBOL_DIFF_WIDGET( wxWindow* aParent, EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvasType ); |
|||
|
|||
~SYMBOL_DIFF_WIDGET() override; |
|||
|
|||
/** |
|||
* Set the currently displayed symbol. |
|||
*/ |
|||
void DisplayDiff( LIB_SYMBOL* aSchSymbol, LIB_SYMBOL* aLibSymbol, int aUnit, int aConvert ); |
|||
|
|||
private: |
|||
void onSlider( wxScrollEvent& aEvent ); |
|||
|
|||
private: |
|||
LIB_SYMBOL* m_libraryItem; |
|||
wxSlider* m_slider; |
|||
}; |
|||
|
|||
|
|||
#endif // SYMBOL_DIFF_WIDGET_H |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue