Commit 384fc572 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Cosmetic enhancements. Eeschema: in libedit the Value Field is n more editable... 

Cosmetic enhancements. Eeschema: in libedit the Value Field is n more editable in the field editor dialog (due to recent changes in library code)
parent bc214703

bitmap2component/bitmap2cmp_gui_base.cpp

+25 −20
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Apr 16 2008)

// C++ code generated with wxFormBuilder (version Sep  8 2010)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -29,54 +29,55 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS 
	m_notebook1->AddPage( m_GreyscalePicturePanel, _("Greyscale Picture"), false );

	m_BNPicturePanel = new wxScrolledWindow( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );

	m_BNPicturePanel->SetScrollRate( 5, 5 );

	m_notebook1->AddPage( m_BNPicturePanel, _("Binary Picture"), false );

	m_notebook1->AddPage( m_BNPicturePanel, _("Black&&White Picture"), false );

	

	bMainSizer->Add( m_notebook1, 1, wxEXPAND, 5 );

	

	m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );

	wxBoxSizer* brightSizer;

	brightSizer = new wxBoxSizer( wxVERTICAL );

	

	wxStaticBoxSizer* sbSizerInfo;

	sbSizerInfo = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Bitmap info:") ), wxVERTICAL );

	sbSizerInfo = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Bitmap Info:") ), wxVERTICAL );

	

	wxFlexGridSizer* fgSizerInfo;

	fgSizerInfo = new wxFlexGridSizer( 3, 3, 0, 0 );

	fgSizerInfo->SetFlexibleDirection( wxBOTH );

	fgSizerInfo->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

	

	m_staticTextSizeX = new wxStaticText( this, wxID_ANY, _("Size X:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextSizeX = new wxStaticText( m_panelRight, wxID_ANY, _("Size X:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextSizeX->Wrap( -1 );

	fgSizerInfo->Add( m_staticTextSizeX, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	m_SizeXValue = new wxStaticText( this, wxID_ANY, _("0000"), wxDefaultPosition, wxDefaultSize, 0 );

	m_SizeXValue = new wxStaticText( m_panelRight, wxID_ANY, _("0000"), wxDefaultPosition, wxDefaultSize, 0 );

	m_SizeXValue->Wrap( -1 );

	fgSizerInfo->Add( m_SizeXValue, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	m_SizeXunits = new wxStaticText( this, wxID_ANY, _("pixels"), wxDefaultPosition, wxDefaultSize, 0 );

	m_SizeXunits = new wxStaticText( m_panelRight, wxID_ANY, _("pixels"), wxDefaultPosition, wxDefaultSize, 0 );

	m_SizeXunits->Wrap( -1 );

	fgSizerInfo->Add( m_SizeXunits, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	m_staticTextSizeY = new wxStaticText( this, wxID_ANY, _("Size Y:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextSizeY = new wxStaticText( m_panelRight, wxID_ANY, _("Size Y:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextSizeY->Wrap( -1 );

	fgSizerInfo->Add( m_staticTextSizeY, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	m_SizeYValue = new wxStaticText( this, wxID_ANY, _("0000"), wxDefaultPosition, wxDefaultSize, 0 );

	m_SizeYValue = new wxStaticText( m_panelRight, wxID_ANY, _("0000"), wxDefaultPosition, wxDefaultSize, 0 );

	m_SizeYValue->Wrap( -1 );

	fgSizerInfo->Add( m_SizeYValue, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	m_SizeYunits = new wxStaticText( this, wxID_ANY, _("pixels"), wxDefaultPosition, wxDefaultSize, 0 );

	m_SizeYunits = new wxStaticText( m_panelRight, wxID_ANY, _("pixels"), wxDefaultPosition, wxDefaultSize, 0 );

	m_SizeYunits->Wrap( -1 );

	fgSizerInfo->Add( m_SizeYunits, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	m_staticTextBPP = new wxStaticText( this, wxID_ANY, _("BPP:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextBPP = new wxStaticText( m_panelRight, wxID_ANY, _("BPP:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextBPP->Wrap( -1 );

	fgSizerInfo->Add( m_staticTextBPP, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	m_BPPValue = new wxStaticText( this, wxID_ANY, _("0000"), wxDefaultPosition, wxDefaultSize, 0 );

	m_BPPValue = new wxStaticText( m_panelRight, wxID_ANY, _("0000"), wxDefaultPosition, wxDefaultSize, 0 );

	m_BPPValue->Wrap( -1 );

	fgSizerInfo->Add( m_BPPValue, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	m_BPPunits = new wxStaticText( this, wxID_ANY, _("bits"), wxDefaultPosition, wxDefaultSize, 0 );

	m_BPPunits = new wxStaticText( m_panelRight, wxID_ANY, _("bits"), wxDefaultPosition, wxDefaultSize, 0 );

	m_BPPunits->Wrap( -1 );

	fgSizerInfo->Add( m_BPPunits, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
@@ -84,35 +85,38 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS 
	

	brightSizer->Add( sbSizerInfo, 0, wxEXPAND|wxALL, 5 );

	

	m_buttonLoad = new wxButton( this, wxID_ANY, _("Load Bitmap"), wxDefaultPosition, wxDefaultSize, 0 );

	m_buttonLoad = new wxButton( m_panelRight, wxID_ANY, _("Load Bitmap"), wxDefaultPosition, wxDefaultSize, 0 );

	brightSizer->Add( m_buttonLoad, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );

	

	m_buttonExportEeschema = new wxButton( this, wxID_ANY, _("Export to eeschema"), wxDefaultPosition, wxDefaultSize, 0 );

	m_buttonExportEeschema = new wxButton( m_panelRight, wxID_ANY, _("Export to Eeschema"), wxDefaultPosition, wxDefaultSize, 0 );

	m_buttonExportEeschema->SetToolTip( _("Create a library file for Eeschema\nThis library contains only one component: logo") );

	

	brightSizer->Add( m_buttonExportEeschema, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );

	

	m_buttonExportPcbnew = new wxButton( this, wxID_ANY, _("Export to Pcbnew"), wxDefaultPosition, wxDefaultSize, 0 );

	m_buttonExportPcbnew = new wxButton( m_panelRight, wxID_ANY, _("Export to Pcbnew"), wxDefaultPosition, wxDefaultSize, 0 );

	m_buttonExportPcbnew->SetToolTip( _("Create a footprint file for PcbNew\nThis footprint contains only one footprint: logo") );

	

	brightSizer->Add( m_buttonExportPcbnew, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );

	

	wxString m_rbOptionsChoices[] = { _("Normal"), _("Negative") };

	int m_rbOptionsNChoices = sizeof( m_rbOptionsChoices ) / sizeof( wxString );

	m_rbOptions = new wxRadioBox( this, wxID_ANY, _("Options"), wxDefaultPosition, wxDefaultSize, m_rbOptionsNChoices, m_rbOptionsChoices, 1, wxRA_SPECIFY_COLS );

	m_rbOptions = new wxRadioBox( m_panelRight, wxID_ANY, _("Options"), wxDefaultPosition, wxDefaultSize, m_rbOptionsNChoices, m_rbOptionsChoices, 1, wxRA_SPECIFY_COLS );

	m_rbOptions->SetSelection( 0 );

	brightSizer->Add( m_rbOptions, 0, wxALL|wxEXPAND, 5 );

	

	m_ThresholdText = new wxStaticText( this, wxID_ANY, _("Threshold Value:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_ThresholdText = new wxStaticText( m_panelRight, wxID_ANY, _("Threshold Value:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_ThresholdText->Wrap( -1 );

	brightSizer->Add( m_ThresholdText, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	m_sliderThreshold = new wxSlider( this, wxID_ANY, 25, 0, 50, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_TOP );

	m_sliderThreshold->SetToolTip( _("Adjust the level to convert the greysvale picture to the binary picture.") );

	m_sliderThreshold = new wxSlider( m_panelRight, wxID_ANY, 25, 0, 50, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_TOP );

	m_sliderThreshold->SetToolTip( _("Adjust the level to convert the greyscale picture to a black and white picture.") );

	

	brightSizer->Add( m_sliderThreshold, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	bMainSizer->Add( brightSizer, 0, wxEXPAND, 5 );

	m_panelRight->SetSizer( brightSizer );

	m_panelRight->Layout();

	brightSizer->Fit( m_panelRight );

	bMainSizer->Add( m_panelRight, 0, wxEXPAND, 0 );

	

	this->SetSizer( bMainSizer );

	this->Layout();
@@ -140,4 +144,5 @@ BM2CMP_FRAME_BASE::~BM2CMP_FRAME_BASE() 
	m_buttonExportPcbnew->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BM2CMP_FRAME_BASE::OnExportPcbnew ), NULL, this );

	m_rbOptions->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( BM2CMP_FRAME_BASE::OnOptionsSelection ), NULL, this );

	m_sliderThreshold->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( BM2CMP_FRAME_BASE::OnThresholdChange ), NULL, this );

	

}

bitmap2component/bitmap2cmp_gui_base.fbp

+969 −812

File changed.

Preview size limit exceeded, changes collapsed.

bitmap2component/bitmap2cmp_gui_base.h

+11 −8
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Apr 16 2008)

// C++ code generated with wxFormBuilder (version Sep  8 2010)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -26,6 +26,7 @@ 
#include <wx/button.h>

#include <wx/radiobox.h>

#include <wx/slider.h>

#include <wx/panel.h>

#include <wx/statusbr.h>

#include <wx/frame.h>
@@ -44,6 +45,7 @@ class BM2CMP_FRAME_BASE : public wxFrame 
		wxScrolledWindow* m_InitialPicturePanel;

		wxScrolledWindow* m_GreyscalePicturePanel;

		wxScrolledWindow* m_BNPicturePanel;

		wxPanel* m_panelRight;

		wxStaticText* m_staticTextSizeX;

		wxStaticText* m_SizeXValue;

		wxStaticText* m_SizeXunits;
@@ -71,7 +73,8 @@ class BM2CMP_FRAME_BASE : public wxFrame 
		

	

	public:

		BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Bitmap to Component Converter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,419 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );

		

		BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Bitmap to Component Converter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,419 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );

		~BM2CMP_FRAME_BASE();

	

};

eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp

+14 −0
Original line number Diff line number Diff line
@@ -222,6 +222,11 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::OnOKButtonClick( wxCommandEvent& event 
    if( !copyPanelToSelectedField() )

        return;



    /* Note: this code is now (2010-dec-04) not used, because the value field is no more editable

     * because changing the value is equivalent to create a new component or alias.

     * This is now handled in libedit main frame, and no more in this dialog

     * but this code is not removed, just in case

     */

    /* If a new name entered in the VALUE field, that it not an existing alias name

     * or root alias of the component */

    wxString newvalue = m_FieldsBuf[VALUE].m_Text;
@@ -235,6 +240,7 @@ An alias %s already exists!\nCannot update this component" ), 
        DisplayError( this, msg );

        return;

    }

    /* End unused code */



    /* save old cmp in undo list */

    m_Parent->SaveCopyInUndoList( m_LibEntry, IS_CHANGED );
@@ -624,9 +630,17 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::copySelectedFieldToPanel() 
    // Field names have become more important than field ids, so we cannot

    // mangle the names in the buffer but we can do so in the panel.

    if( field.m_FieldId == VALUE )

    {   // This field is the lib name and the default value when loading this component in schematic

        // The value is now not editable here (in this dialog) because changing it is equivalent to create

        // a new component or alias. This is handles in libedir, not in this dialog.

        fieldNameTextCtrl->SetValue( field.m_Name + wxT( " / " ) + _( "Chip Name" ) );

        fieldValueTextCtrl->Enable( false );

    }

    else

    {

        fieldValueTextCtrl->Enable( true );

        fieldNameTextCtrl->SetValue( field.m_Name );

    }



    // if fieldNdx == REFERENCE, VALUE, FOOTPRINT, or DATASHEET, then disable field name editing

    fieldNameTextCtrl->Enable(  fieldNdx >= MANDATORY_FIELDS );

eeschema/dialogs/dialog_lib_edit_draw_item.fbp

+441 −441

File changed.

Preview size limit exceeded, changes collapsed.