From 6155cba0779bd50d221b169eb8cdf6fb25ceed36 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 16 Jan 2016 15:27:42 +0100 Subject: [PATCH 1/2] kicad_curl.cpp: fix a compil warning on Windows (regression) pcb_calculator: fix incorrect formulas shown in attenuators panel. Png files are no more used, and formulas are now html doc files. --- common/kicad_curl/kicad_curl.cpp | 5 +- pcb_calculator/CMakeLists.txt | 31 ++ pcb_calculator/attenuators.cpp | 23 +- .../attenuators/attenuator_classes.cpp | 34 +- .../attenuators/attenuator_classes.h | 2 +- .../attenuators/bridget_tee_formula.h | 33 ++ .../attenuators/bridget_tee_formula.html | 33 ++ pcb_calculator/attenuators/pi_formula.h | 44 +++ pcb_calculator/attenuators/pi_formula.html | 44 +++ pcb_calculator/attenuators/splitter_formula.h | 36 +++ .../attenuators/splitter_formula.html | 37 +++ pcb_calculator/attenuators/tee_formula.h | 47 +++ pcb_calculator/attenuators/tee_formula.html | 47 +++ .../bitmaps/bridged_tee_formula.xpm | 216 ------------- pcb_calculator/bitmaps/pi_formula.xpm | 301 ------------------ .../attenuator/bridged_tee_formula.png | Bin 3005 -> 0 bytes .../sources/attenuator/splitter_formula.png | Bin 1933 -> 0 bytes .../sources/attenuator/splitter_formula.xpm | 135 -------- pcb_calculator/bitmaps/splitter_formula.xpm | 135 -------- pcb_calculator/bitmaps/tee_formula.xpm | 271 ---------------- .../dialogs/dialog_regulator_data.fbp | 84 +---- .../dialogs/dialog_regulator_data_base.cpp | 9 +- .../dialogs/dialog_regulator_data_base.h | 7 +- .../dialogs/pcb_calculator_frame_base.cpp | 10 +- .../dialogs/pcb_calculator_frame_base.fbp | 20 +- .../dialogs/pcb_calculator_frame_base.h | 3 +- pcb_calculator/pcb_calculator.h | 1 - pcb_calculator/regulators_funct.cpp | 13 +- pcbnew/github/github_plugin.cpp | 1 + 29 files changed, 438 insertions(+), 1184 deletions(-) create mode 100644 pcb_calculator/attenuators/bridget_tee_formula.h create mode 100644 pcb_calculator/attenuators/bridget_tee_formula.html create mode 100644 pcb_calculator/attenuators/pi_formula.h create mode 100644 pcb_calculator/attenuators/pi_formula.html create mode 100644 pcb_calculator/attenuators/splitter_formula.h create mode 100644 pcb_calculator/attenuators/splitter_formula.html create mode 100644 pcb_calculator/attenuators/tee_formula.h create mode 100644 pcb_calculator/attenuators/tee_formula.html delete mode 100644 pcb_calculator/bitmaps/bridged_tee_formula.xpm delete mode 100644 pcb_calculator/bitmaps/pi_formula.xpm delete mode 100644 pcb_calculator/bitmaps/sources/attenuator/bridged_tee_formula.png delete mode 100644 pcb_calculator/bitmaps/sources/attenuator/splitter_formula.png delete mode 100644 pcb_calculator/bitmaps/sources/attenuator/splitter_formula.xpm delete mode 100644 pcb_calculator/bitmaps/splitter_formula.xpm delete mode 100644 pcb_calculator/bitmaps/tee_formula.xpm diff --git a/common/kicad_curl/kicad_curl.cpp b/common/kicad_curl/kicad_curl.cpp index 3201bf743f..fe899603ea 100644 --- a/common/kicad_curl/kicad_curl.cpp +++ b/common/kicad_curl/kicad_curl.cpp @@ -23,12 +23,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ +// kicad_curl.h must be included before xw headers, to avoid +// conflicts for some defines, at least on Windows +#include + #include #include #include #include -#include #include // MUTEX and MUTLOCK #include diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt index fcde2f7678..d82b137d95 100644 --- a/pcb_calculator/CMakeLists.txt +++ b/pcb_calculator/CMakeLists.txt @@ -162,4 +162,35 @@ add_custom_target( ${CMAKE_CURRENT_SOURCE_DIR}/pcb_calculator_datafile_keywords.cpp ) +# +# Conversion of .html doc source files to .h files included in cpp sources +# +# Function html_doc2h : converts a single *.html text file to a *.h header +function( html_doc2h inputFile ) + add_custom_command( + OUTPUT ${inputFile}.h + + COMMAND ${CMAKE_COMMAND} -DinputFile=${inputFile}.html -DoutputFile=${inputFile}.h + -P ${CMAKE_MODULE_PATH}/Html2C.cmake + DEPENDS ${inputFile}.html ${CMAKE_MODULE_PATH}/Html2C.cmake + COMMENT "creating ${inputFile}.h from ${inputFile}.html" + ) +endfunction() + + html_doc2h( ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/bridget_tee_formula ) + html_doc2h( ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/splitter_formula ) + html_doc2h( ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/pi_formula ) + html_doc2h( ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/tee_formula ) + +set( DOCS_LIST + ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/pi_formula.h + ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/tee_formula.h + ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/bridget_tee_formula.h + ${CMAKE_CURRENT_SOURCE_DIR}/attenuators/splitter_formula.h + ) + +set_source_files_properties( attenuators/attenuator_classes.cpp + PROPERTIES OBJECT_DEPENDS "${DOCS_LIST}" + ) + add_dependencies( pcb_calculator_kiface pcb_calculator_lexer_source_files ) diff --git a/pcb_calculator/attenuators.cpp b/pcb_calculator/attenuators.cpp index 4c0280e778..1fbb38766a 100644 --- a/pcb_calculator/attenuators.cpp +++ b/pcb_calculator/attenuators.cpp @@ -30,6 +30,7 @@ #include #include + extern double DoubleFromString( const wxString& TextValue ); // Called on a attenuator selection @@ -44,6 +45,7 @@ void PCB_CALCULATOR_FRAME::SetAttenuator( unsigned aIdx ) { if( aIdx >=m_attenuator_list.size() ) aIdx = m_attenuator_list.size() - 1; + m_currAttenuator = m_attenuator_list[aIdx]; TransfAttenuatorDataToPanel(); m_Attenuator_Messages->SetPage( wxEmptyString ); @@ -93,6 +95,11 @@ void PCB_CALCULATOR_FRAME::TransfAttenuatorDataToPanel() msg.Printf( wxT( "%g" ), m_currAttenuator->m_Zout ); m_ZoutValueCtrl->SetValue( msg ); + + if( m_currAttenuator->m_FormulaName ) + m_panelAttFormula->SetPage( *m_currAttenuator->m_FormulaName ); + else + m_panelAttFormula->SetPage( wxEmptyString ); } @@ -148,19 +155,3 @@ void PCB_CALCULATOR_FRAME::OnPaintAttenuatorPanel( wxPaintEvent& event ) event.Skip(); } - - -void PCB_CALCULATOR_FRAME::OnPaintAttFormulaPanel( wxPaintEvent& event ) -{ - wxPaintDC dc( m_panelAttFormula ); - - if( m_currAttenuator && m_currAttenuator->m_FormulaBitMap ) - { - wxSize size = m_panelAttFormula->GetSize(); - size.x -= m_currAttenuator->m_FormulaBitMap->GetWidth(); - size.y -= m_currAttenuator->m_FormulaBitMap->GetHeight(); - dc.DrawBitmap( *m_currAttenuator->m_FormulaBitMap, size.x / 2, size.y / 2 ); - } - - event.Skip(); -} diff --git a/pcb_calculator/attenuators/attenuator_classes.cpp b/pcb_calculator/attenuators/attenuator_classes.cpp index 058d0dd2f6..d7c15fd248 100644 --- a/pcb_calculator/attenuators/attenuator_classes.cpp +++ b/pcb_calculator/attenuators/attenuator_classes.cpp @@ -14,10 +14,25 @@ #include #include #include -#include -#include -#include -#include + + +// Html texts showing the formulas +wxString pi_formula( +#include +); + +wxString tee_formula( +#include +); + +wxString bridget_tee_formula( +#include +); + +wxString splitter_formula( +#include +); + #ifndef NULL #define NULL 0 @@ -36,7 +51,7 @@ ATTENUATOR::ATTENUATOR( ATTENUATORS_TYPE aTopology ) m_Attenuation_Enable = true; m_MinimumATT = 0.0; // dB m_SchBitMap = NULL; - m_FormulaBitMap = NULL; + m_FormulaName = NULL; // Initialize these variables mainly to avoid warnings from a static analyzer m_R1 = 0.0; @@ -49,7 +64,6 @@ ATTENUATOR::ATTENUATOR( ATTENUATORS_TYPE aTopology ) ATTENUATOR::~ATTENUATOR() { delete m_SchBitMap; - delete m_FormulaBitMap; } @@ -83,7 +97,7 @@ ATTENUATOR_PI::ATTENUATOR_PI() : ATTENUATOR( PI_TYPE ) { m_Name = wxT("att_pi"); m_SchBitMap = new wxBitmap( att_pi_xpm ); - m_FormulaBitMap = new wxBitmap( pi_formula_xpm ); + m_FormulaName = &pi_formula; } @@ -104,7 +118,7 @@ ATTENUATOR_TEE::ATTENUATOR_TEE() : ATTENUATOR( TEE_TYPE ) { m_Name = wxT("att_tee"); m_SchBitMap = new wxBitmap( att_tee_xpm ); - m_FormulaBitMap = new wxBitmap( tee_formula_xpm ); + m_FormulaName = &tee_formula; } @@ -127,7 +141,7 @@ ATTENUATOR_BRIDGE::ATTENUATOR_BRIDGE() : ATTENUATOR( BRIDGE_TYPE ) m_Zin_Enable = false; m_ResultCount = 2; m_SchBitMap = new wxBitmap( att_bridge_xpm ); - m_FormulaBitMap = new wxBitmap( bridged_tee_formula_xpm ); + m_FormulaName = &bridget_tee_formula; } @@ -153,7 +167,7 @@ ATTENUATOR_SPLITTER::ATTENUATOR_SPLITTER() : ATTENUATOR( SPLITTER_TYPE ) m_MinimumATT = 6.0; m_Zin_Enable = false; m_SchBitMap = new wxBitmap( att_splitter_xpm ); - m_FormulaBitMap = new wxBitmap( splitter_formula_xpm ); + m_FormulaName = &splitter_formula; } diff --git a/pcb_calculator/attenuators/attenuator_classes.h b/pcb_calculator/attenuators/attenuator_classes.h index a2014fa4a2..7e8e895403 100644 --- a/pcb_calculator/attenuators/attenuator_classes.h +++ b/pcb_calculator/attenuators/attenuator_classes.h @@ -40,7 +40,7 @@ public: double m_R2; // value of R2 double m_R3; // value of R3 (if any) wxBitmap* m_SchBitMap; // The schema of this attenuator - wxBitmap* m_FormulaBitMap; // The formula used to calcualte this attenuator + wxString* m_FormulaName; // The HTML text name of the formula used to calculate this attenuator protected: double Lmin, L, A; // internal variable for temporary use diff --git a/pcb_calculator/attenuators/bridget_tee_formula.h b/pcb_calculator/attenuators/bridget_tee_formula.h new file mode 100644 index 0000000000..4bd78fd9fd --- /dev/null +++ b/pcb_calculator/attenuators/bridget_tee_formula.h @@ -0,0 +1,33 @@ +// Do not edit this file, it is autogenerated by CMake from an HTML file +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"\n" +"

Zin\n" +"desired input impedance in Ω

\n" +"

Zout\n" +"desired output impedance Z in = Z out

\n" +"

a\n" +"attenuation in dB

\n" +"

L\n" +"= 10a/20 (the loss)

\n" +"


\n" +"

\n" +"

Bridged\n" +"tee attenuator

\n" +"

R1\n" +"= Zin * (L &minus 1)

\n" +"

R2\n" +"= Zin/(L &minus 1)

\n" +"\n" +"\n" diff --git a/pcb_calculator/attenuators/bridget_tee_formula.html b/pcb_calculator/attenuators/bridget_tee_formula.html new file mode 100644 index 0000000000..87c8ddf9b3 --- /dev/null +++ b/pcb_calculator/attenuators/bridget_tee_formula.html @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + +

Zin +desired input impedance in Ω

+

Zout +desired output impedance Z in = Z out

+

a +attenuation in dB

+

L += 10a/20 (the loss)

+


+ +

+

Bridged +tee attenuator

+

R1 += Zin * (L − 1)

+

R2 += Zin/(L − 1)

+ + \ No newline at end of file diff --git a/pcb_calculator/attenuators/pi_formula.h b/pcb_calculator/attenuators/pi_formula.h new file mode 100644 index 0000000000..ebf988632b --- /dev/null +++ b/pcb_calculator/attenuators/pi_formula.h @@ -0,0 +1,44 @@ +// Do not edit this file, it is autogenerated by CMake from an HTML file +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"\n" +"

\n" +"Zin\n" +" desired input impedance in Ω

\n" +"

\n" +"Zout\n" +" desired output impedance in Ω

\n" +"

\n" +"a\n" +" attenuation in dB

\n" +"

\n" +"L\n" +"= 10a/10 (the loss)

\n" +"

\n" +"A\n" +"= (L + 1)/(L &minus 1)

\n" +"

\n" +"
\n" +"

\n" +"

Pi\n" +"attenuator

\n" +"

R2\n" +"= (L &minus 1)/2 * &radic ((Zin * Zout)/L)

\n" +"

R1\n" +"= 1/( A/Zin &minus 1/R2)

\n" +"

R3\n" +"= 1/ (A/Zout &minus 1/R2)

\n" +"\n" +"\n" diff --git a/pcb_calculator/attenuators/pi_formula.html b/pcb_calculator/attenuators/pi_formula.html new file mode 100644 index 0000000000..d54e80f5d5 --- /dev/null +++ b/pcb_calculator/attenuators/pi_formula.html @@ -0,0 +1,44 @@ + + + + + + + + + + + +

+Zin + desired input impedance in Ω

+

+Zout + desired output impedance in Ω

+

+a + attenuation in dB

+

+L += 10a/10 (the loss)

+

+A += (L + 1)/(L − 1)

+

+
+ +

+

Pi +attenuator

+

R2 += (L − 1)/2 * √ ((Zin * Zout)/L)

+

R1 += 1/( A/Zin − 1/R2)

+

R3 += 1/ (A/Zout − 1/R2)

+ + \ No newline at end of file diff --git a/pcb_calculator/attenuators/splitter_formula.h b/pcb_calculator/attenuators/splitter_formula.h new file mode 100644 index 0000000000..8dd5b0e979 --- /dev/null +++ b/pcb_calculator/attenuators/splitter_formula.h @@ -0,0 +1,36 @@ +// Do not edit this file, it is autogenerated by CMake from an HTML file +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"\n" +"

Zin\n" +"desired input impedance in Ω

\n" +"

Zout\n" +"desired output impedance in Ω

\n" +"

Zin\n" +"= Zout

\n" +"


\n" +"

\n" +"

Attenuation\n" +"is 6dB

\n" +"


\n" +"

\n" +"

Splitted\n" +"attenuator

\n" +"

R1\n" +"= R2 = R3 = Zout/3

\n" +"\n" +"\n" diff --git a/pcb_calculator/attenuators/splitter_formula.html b/pcb_calculator/attenuators/splitter_formula.html new file mode 100644 index 0000000000..e151169353 --- /dev/null +++ b/pcb_calculator/attenuators/splitter_formula.html @@ -0,0 +1,37 @@ + + + + + + + + + + + + + +

Zin +desired input impedance in Ω

+

Zout +desired output impedance in Ω

+

Zin += Zout

+


+ +

+

Attenuation +is 6dB

+


+ +

+

Splitted +attenuator

+

R1 += R2 = R3 = Zout/3

+ + \ No newline at end of file diff --git a/pcb_calculator/attenuators/tee_formula.h b/pcb_calculator/attenuators/tee_formula.h new file mode 100644 index 0000000000..53ac61c726 --- /dev/null +++ b/pcb_calculator/attenuators/tee_formula.h @@ -0,0 +1,47 @@ +// Do not edit this file, it is autogenerated by CMake from an HTML file +"\n" +"\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"\n" +"\n" +"

\n" +"Zin\n" +"desired input impedance in Ω

\n" +"

\n" +"Zout\n" +"desired output impedance in Ω

\n" +"

\n" +"a\n" +"attenuation in dB

\n" +"

\n" +"L\n" +"= 10 a/10 (the loss)

\n" +"

\n" +"A\n" +"= (L + 1)/(L &minus 1)

\n" +"

\n" +"
\n" +"

\n" +"

Tee\n" +"attenuator

\n" +"

\n" +"R2\n" +"= 2*&radic (L * Zin * Zout )/(L &minus 1)

\n" +"

\n" +"R1\n" +"= Zin * A &minus R2

\n" +"

\n" +"R3\n" +"= Zout * A &minus R2

\n" +"\n" +"\n" diff --git a/pcb_calculator/attenuators/tee_formula.html b/pcb_calculator/attenuators/tee_formula.html new file mode 100644 index 0000000000..ce6126b3b1 --- /dev/null +++ b/pcb_calculator/attenuators/tee_formula.html @@ -0,0 +1,47 @@ + + + + + + + + + + + +

+Zin +desired input impedance in Ω

+

+Zout +desired output impedance in Ω

+

+a +attenuation in dB

+

+L += 10 a/10 (the loss)

+

+A += (L + 1)/(L − 1)

+

+
+ +

+

Tee +attenuator

+

+R2 += 2*√ (L * Zin * Zout )/(L − 1)

+

+R1 += Zin * A − R2

+

+R3 += Zout * A − R2

+ + \ No newline at end of file diff --git a/pcb_calculator/bitmaps/bridged_tee_formula.xpm b/pcb_calculator/bitmaps/bridged_tee_formula.xpm deleted file mode 100644 index 4d5b2da617..0000000000 --- a/pcb_calculator/bitmaps/bridged_tee_formula.xpm +++ /dev/null @@ -1,216 +0,0 @@ -/* XPM */ -static const char *bridged_tee_formula_xpm[] = { -/* columns rows colors chars-per-pixel */ -"255 193 17 1", -"X c Black", -"> c #D9D9D9", -"* c #E1E1E1", -"- c #F0F0F0", -" c #FFFFFF", -"o c #E9E9E9", -": c #BDBDBD", -"O c #4D4D4D", -"+ c #A7A7A7", -"# c #7C7C7C", -"& c #9A9A9A", -"@ c #C7C7C7", -". c #C0C0C0", -"= c #8C8C8C", -"; c #B2B2B2", -"% c #D0D0D0", -"$ c #686868", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" .............................................................. ", -" . . ", -" . X . ", -" . XX . ", -" . X X . ", -" . X X . ", -" . XXXX . ", -" . X X . ", -" . XXX XXX . ", -" . . ", -" . . ", -" . XXXXXXXXXXXX . ", -" . XX XX . ", -" . X X X X . ", -" . X X X . ", -" . X X X . ", -" . XXX X X XXX X X X . X X oO X X X XXXXXX ", -" . XX XXX XX X X X X X X . XX +X@ XX X X ", -" . X X X X X XXXX XX . X X #X$ X X X X X X ", -" . X X X X X . X X %@&X% X X X X X X ", -" . X *XXXXXXXXX= X X X . XXX XXX XXX X XXXX X XX #-*X= XXXXXXXXX XXX XXXXXXXX XXX X XX XX XX XXX XXXX X XX X XX X X XX XX X X X ", -" . X XXXX X X X . X X X XX X XX X o& #X* X X X X X X XXX X X X X X X XX X X XXX X XX XXX X X XX XXXXX ", -" . X X *XXXXXXXXX= X X X . X X X X X X X +% %X+ XX X X XXXXX X X X X XX X X X X X X X X X X X X X ", -" . X X X X X . X X X X X X X X OXXXXXX- XXXXXXXXX XX X X X X X X X X XX X X X X X X X X X X X X X X ", -" . X X X X X . X X X X X X X X @; ;X+ X X X X X X X X X X X X X X X X X X X X X X X X ", -" . XXXXX XXX XXX . XX XX X X X X X *O* -XX% X XX X X X X X X X X X XXX X XX X X X X X X X X X X X XXX X X ", -" . . X X XXX XX XXX XXX *XXX: *XXXX: XXX XX XX XX XXX XXX XXX XX X XXX XX XX XXX XX XXX XXX XXX XXX XXX XX X XXXXXXX ", -" . . ", -" . . ", -" .............................................................. ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" XXXXXXX& ## XXXXXXX& XXXXXXX& ", -" X$* oXO- ## X$* oXO- : X$* oXO- ", -" X> #X: X> #X: -O X> #X: ", -" : @X$ : @X$ #X : @X$ ", -" OX* XXX XXX%OX% XXXXXXXX OX* -+XX+- XXX XXX #XXXX XXXXXXXX OX* ", -" +X+ XX XX% XO +X+ OX%%XO XX XX XX +X+ ", -" *XO XX XX XX *XO XX XX XX XX XX *XO XX ", -" $X@ X XX XX XX XXXXXXXX $X@ X XX XX XX XX XX XXXXXXXX $X@ X XX X ", -" :X= %# XX XX XX :X= %# XX XX XX XX XX :X= %# XX X ", -" -OXo @O= XX XX XX -OXo @O= OX%%XO OX %XX XX>= -OXo @O= XX X ", -" &XXXXXXX= XXXX XXXX XXX &XXXXXXX= -+XX+- %OO:XXX %O$o &XXXXXXX= XX X ", -" XX X ", -" XX ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" XXXXXXXX+- ##XX XXXXXXX& :X: $ o= %$XO:-X ##XX =o ", -" -XX %XO XX X$* oXO- o#X+X#o X oO% ;X@ -+XX XX %O- ", -" XX XX XX X> #X: XX% %XX $XXX$ #= *X; &X XX == ", -" XX XX XX : @X$ XX XX -&&&- %X> &X* -X XX %X> ", -" XX %XO XX XXXXXXXX OX* XX XX O# #O &X- OX XX -X& ", -" XXXXXX+- XX +X+ XX XX $X XX XX X$ ", -" XX $X* XX *XO XX XX XX XX XXXX XX XX ", -" XX %X# XX XXXXXXXX $X@ X XX XX XX &Xo XX XXXXXXXX XX XX ", -" XX =X@ XX :X= %# XX% %XX $X *X: XX XX X$ ", -" -XX- *XOo -XX- -OXo @O= o#X+X#o &X- +X: -XO -XX- -X& ", -" XXXXXX =XXX XXXXXX &XXXXXXX= :X: >X% >#XX$; XXXXXX >X% ", -" == =# ", -" -O% %Oo ", -" o= =o ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" XXXXXXXX+- >$X& XXXXXXX& :X: -$ o= %$XO:-X ##XX =o ", -" -XX %XO -XXXX+ X$* oXO- o#X+X#o @; oO% ;X@ -+XX XX %O- ", -" XX XX ++ @XX X> #X: XX% %XX &> #= *X; &X XX == ", -" XX XX o XO : @X$ XX XX O %X> &X* -X XX %X> ", -" XX %XO X+ XXXXXXXX OX* XX XX *= &X- OX XX -X& ", -" XXXXXX+- *Xo +X+ XX XX :: $X XX XX X$ ", -" XX $X* +; *XO XX XX #o XX XX XXXX XX XX ", -" XX %X# *# XXXXXXXX $X@ X XX XX O XX &Xo XX XXXX XX XX ", -" XX =X@ -$- & :X= %# XX% %XX >& $X *X: XX XX X$ ", -" -XX- *XOo #XXXX@ -OXo @O= o#X+X#o +% &X- +X: -XO -XX- -X& ", -" XXXXXX =XXX&XXXXX- &XXXXXXX= :X: $- >X% >#XX$; XXXXXX >X% ", -" == =# ", -" -O% %Oo ", -" o= =o ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " -}; diff --git a/pcb_calculator/bitmaps/pi_formula.xpm b/pcb_calculator/bitmaps/pi_formula.xpm deleted file mode 100644 index 4c5bcda76a..0000000000 --- a/pcb_calculator/bitmaps/pi_formula.xpm +++ /dev/null @@ -1,301 +0,0 @@ -/* XPM */ -static const char *pi_formula_xpm[] = { -/* columns rows colors chars-per-pixel */ -"259 278 17 1", -"X c Black", -"> c #D9D9D9", -"* c #E1E1E1", -"= c #F0F0F0", -" c #FFFFFF", -"o c #E9E9E9", -": c #BDBDBD", -"O c #4D4D4D", -"+ c #A7A7A7", -"# c #7C7C7C", -"& c #9A9A9A", -"@ c #C7C7C7", -". c #C0C0C0", -"- c #8C8C8C", -"; c #B2B2B2", -"% c #D0D0D0", -"$ c #686868", -/* pixels */ -" ", -" ", -" ............................................................. ", -" . . ", -" . X . ", -" . XX . ", -" . X X . ", -" . X X . ", -" . XXX . ", -" . X X . ", -" . XXX XXX . ", -" . . ", -" . . ", -" . XXXXXXXXXXXX . ", -" . . ", -" . XX XX . ", -" . X X X X . ", -" . X X X . ", -" . XXXX X X XX X X X . X X oO X X X XXXXXX ", -" . XX XXX XXX X X X X X . XX +X@ XX X X ", -" . X X X X X X X X X . X X #X$ X X X X X X ", -" . X X X X X XXXX XX . X X %@&X% X X X X X X ", -" . X *XXXXXXXXX X X X . XXX XXX XXX X XXXX X XX #=*X- XXXXXXXXX XXX XXXXXXXX XXX X XX XX XX XXX XXXX X XX X XX X X XX XX X X X ", -" . X XXXX X X X . X X X XX X XX X o& #X* X X X X X X XXX X X X X X X XX X X XXX X XX XXX X X XX XXXXX ", -" . X X X X X . X X X X X X X +% %X+ XX X X XXXXX X X X X XX X X X X X X X X X X X X X ", -" . X X *XXXXXXXXX X X X . X X X X X X X X OXXXXXX= XXXXXXXXX XX X X X X X X X X XX X X X X X X X X X X X X X X ", -" . X X X X X . X X X X X X X X @; ;X+ X X X X X X X X X X X X X X X X X X X X X X X X ", -" . X X X X X . XX XX X X X X X *O* =XX% X XX X X X X X X X X X XXX X XX X X X X X X X X X X X XXX X X ", -" . XXXXXX XXX XX . X X XXX XX XXX XXX *XXX: *XXXX: XXX XX XX XX XXX XXX XXX XX X XXX XX XX XXX XX XXX XXX XXX XXX XXX XX X XXXXXXX ", -" . . ", -" . . ", -" . . ", -" ............................................................. ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" XXXXXXX X X X X X X X ", -" X X XX XX XX ", -" X X X X X X ", -" X X X X X ", -" X X X XX XXXXXXXXX XX X XXX XXX X X XX XXX XX X X X XX X XX XX XX XXXX X X XX XX X XX XXX XX X XXX X XX XXX XXX ", -" X XX XXX X X XX X X X X XX XXX X X X XX XX XXX X XXX X X X X XX XXX XX X XXX X X X X XX X X XXX X X X X X ", -" X X X X X X XXXXX X X X XXXXX X X X X X X X X X X X X X X X X XXXXX X X XX X X X XXXXX ", -" X X X X XXXXXXXXX X X X XX X X X X X X X X X X X X X X X X X X X X X X XX X X X X X ", -" X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X ", -" X X X X X X XXX X X X X X X X X X XXX X X X XX X X XXX X X X X X X XX X X X X XXX X XX X X X X X X ", -" XXXXXXXX XXX XXX XXX XX X XXX XXX XXX XXX XXX XX X XXX XXX XXX X XX XX X XX XXX XXX XXX XXX X XX XXX XX X XXX XX XXX XXX XXX XXX ", -" X X ", -" X X ", -" XXX XXX ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" XXXXXXX X X X X X ", -" X X XX XX XX ", -" X X X X X X X X ", -" X X X X X X X ", -" X XX XX XX XXXX XXXXXXXXX XX X XXX XXX X X XX XXX XX X XX XX XX XXXX X XX XX XX XXXX X X XX XX X XX XXX XX X XXX X XX XXX XXX ", -" X X X X X X X XX X X X X XX XXX X X X XX X X X X X XXX X X X X XX XXX XX X XXX X X X X XX X X XXX X X X X X ", -" X X X X X X X X XXXXX X X X XXXXX X X X X X X X X X X X X X X X X X X XXXXX X X XX X X X XXXXX ", -" X X X X X X XXXXXXXXX X X X XX X X X X X X X X X X X X X X X X X X X X X X X X XX X X X X X ", -" X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X ", -" X X X X X XXX X X X XXX X X X X X X X X X XXX X X X XXX X X XX X X XXX X X X X X X XX X X X X XXX X XX X X X X X X ", -" XXXXXXXX XX XX X XX XX X XXX XXX XXX XXX XXX XX X XX XX X XX X XX XX X XX XXX XXX XXX XXX X XX XXX XX X XXX XX XXX XXX XXX XXX ", -" X X ", -" X X ", -" XXX XXX ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ................................................................................................................................................................................................... ", -" . XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX . ", -" . ; XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX . ", -" . - . ", -" . ; . ", -" . & . ", -" . & . ", -" . X : XXXXXXX XXXXXXX . ", -" . XXX *: X X X X X . ", -" . X *% X X X X X . ", -" . X @* X -* X X . ", -" . X :* X XXX XX XX =; &*o; X XXX XX X XXX . ", -" . X : X X X X X =+#&;$% X XX X X X X X . ", -" . X - X X XX X %O$= X X X X X X . ", -" . X & X X XX X o$;;%#+ X X X X X X . ", -" . X o% %o + X X X X X > -* > X X X X X XX X . ", -" . X + + - X X X X X X X ;o X X X XX X XX XX X . ", -" . XXXXX XXX XXX o; XXXX X X ;= + XXXXXXX XX X XX XXXXXXX XXX XXX XX XXX . ", -" . X X X X :% XX XXX XXX %@ *: . ", -" . X X X -* X X X *& *: . ", -" . X X X -* $ X X X # -* %* . ", -" . X X X *XXXXXXXXX =; &*o; X X X X =; &*o; :* . ", -" . XXXX X =+#&;$% X X XXXX X X =+#&;$% > :o . ", -" . X X X XXXXXXXXXXX %O$= X X X *XXXXXXXXX X X %O$= O - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX . ", -" . X X X *XXXXXXXXX o$;;%#+ X X X X X o$;;%#+ :$o - . ", -" . X X X > -* > # X X X $ > -* > ::> - . ", -" . X X X X ;o -* X X X *- ;o %: - . ", -" . XXXX XX XXXXX @% XXXXXX XXX %: *+ - . ", -" . XXX =; ;o - *: XXXX X . ", -" . X X + + O *: XX XXX . ", -" . X X o> >o - %@ X X . ", -" . X ;*:* X X . ", -" . X @@:* X . ", -" . X *:- X XXXX . ", -" . X =-- X X . ", -" . X $$ X X . ", -" . X -- X X . ", -" . X X +- X X . ", -" . XXXXXX :& XXXXXX . ", -" . >: . ", -" . . ", -" ................................................................................................................................................................................................... ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ......................................................................................................................................................................... ", -" . . ", -" . . ", -" . X . ", -" . XXX . ", -" . X . ", -" . X . ", -" . X . ", -" . X . ", -" . X . ", -" . X . ", -" . X . ", -" . XXXXX XX X . ", -" . X X X X XXX . ", -" . X X X . ", -" . X X X . ", -" . X X X *XXXXXXXXX . ", -" . XXXX XX . ", -" . X X X . ", -" . X X X *XXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX . ", -" . X X X XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX . ", -" . X X X X . ", -" . XXXX XX XXX . ", -" . XXXX X X X . ", -" . XX XXX o XXX XXX . ", -" . X X - X X . ", -" . X X - X X . ", -" . X - X X . ", -" . X XXXX - X X . ", -" . X X o----O---- X X . ", -" . X X - X X . ", -" . X X - X X . ", -" . X X - X X . ", -" . XXXXXX - XXX XXX . ", -" . . ", -" . . ", -" . . ", -" . . ", -" . . ", -" . XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX *XXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX . ", -" . XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX . ", -" . o% %o . ", -" . + + . ", -" . XXXXXXX o; XXXX X X ;= XXXXX XXX . ", -" . X X :% XX XXX XXX %@ X X X X . ", -" . X X X -* X X X *& X X X . ", -" . X X -* $ X X X # X X X . ", -" . X XXX XX X XXX =; &*o; X X X X X X X . ", -" . X XX X X X X X =+#&;$% X X XXXX X X XXXX X . ", -" . X X X X X X %O$= X X X *XXXXXXXXX X X X X X . ", -" . X X X X X X o$;;%#+ X X X X X X X X . ", -" . X X X X X XX X > -* > # X X X $ X X X . ", -" . X X X XX X XX XX X ;o -* X X X *- X X X X . ", -" . XXXXXXX XXX XXX XX XXX @% XXXXXX XXX %: XXXX XX XXXXX . ", -" . =; ;o . ", -" . + + . ", -" . o> >o . ", -" ......................................................................................................................................................................... ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ............................................................................................................................................................... ", -" . . ", -" . . ", -" . X . ", -" . XXX . ", -" . X . ", -" . X . ", -" . X . ", -" . X . ", -" . X . ", -" . X . ", -" . X . ", -" . XXXXX XX X . ", -" . X X X XXX . ", -" . X X X . ", -" . X X X . ", -" . X X X *XXXXXXXXX . ", -" . XXXX X . ", -" . X X X . ", -" . X X X *XXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX . ", -" . X X X XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX . ", -" . X X X . ", -" . XXXX XX XXXX . ", -" . . ", -" . XXXX X X X . ", -" . XX XXX o XXX XXX . ", -" . X X - X X . ", -" . X X - X X . ", -" . X - X X . ", -" . X XXXX - X X . ", -" . X X o----O---- X X . ", -" . X X - X X . ", -" . X X - X X . ", -" . X X - X X . ", -" . XXXXXX - XXX XXX . ", -" . . ", -" . . ", -" . . ", -" . . ", -" . . ", -" . XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX *XXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX . ", -" . . ", -" . o% %o . ", -" . + + . ", -" . XXXXXXX o; XXXX X X ;= XXXXX XXX . ", -" . X X X :% XX XXX XXX %@ X X X X . ", -" . X X -* X X X *& X X X . ", -" . X -* $ X X X # X X X . ", -" . X XXX XX XX =; &*o; X X X X X X X . ", -" . X X X X X =+#&;$% X X XXXX X X XXXX X . ", -" . X X XX X %O$= X X X *XXXXXXXXX X X X X X . ", -" . X X XX X o$;;%#+ X X X X X X X X . ", -" . X X X X X > -* > # X X X $ X X X . ", -" . X X X X X X X ;o -* X X X *- X X X X . ", -" . XXXXXXX XX X XX @% XXXXXX XXX %: XXXX XX XXXXX . ", -" . =; ;o . ", -" . + + . ", -" . o> >o . ", -" ............................................................................................................................................................... ", -" ", -" ", -" ", -" " -}; diff --git a/pcb_calculator/bitmaps/sources/attenuator/bridged_tee_formula.png b/pcb_calculator/bitmaps/sources/attenuator/bridged_tee_formula.png deleted file mode 100644 index bdddbe40509f1325abb1fa3b8d7a4bf93a264c97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3005 zcmcImX)qgV8%;}VudPU|Mcw97A<|k)T3at|N$st*qNS>o#!k?pXp}4VeQQH0RkwCx zSG(9lNfot~RB~fU8gA~)_w$=?=FWWgoq678p7Y~*XWnz>%!x;sUFYK#=LP@(d?vpc zTCn;tt2#JOvhF1D-KziqPqc~QHLIZ9?L55C#E3-SsB`$9YDfA9wG%w@X?BR1ajxWq z$wbqQc6J_cUh=@WDF%$X*CCae9rZdfHO7z^4AL%jEw6VoJvtfj!qU8t`Cf`4c^tG@ zUE~K@3(bGJ7^tU1({TdE@&ZzRRwDD}r9wsu)-3pl{L z978|M=1`LPk~~mW02Pguwb5&r6+z(Ff?WstKmg6|CwRQqC#vo@^p|ArAtqqOuzc<4 zypm)t-&If3cjziFz0=VHX&HdhH{X?Hj`(bWv0p=M(Og$W2ddCRyXWAn2B08M(Ly!i zGB)(*0<7k27Y7*U1qgX4-MrDY`T2Q}nxamXXaR9vu);NFR!X?Mpk8D#`Ta(mVdAPE zgKi(J^5^3cCI8Q8JZXz&Tyi_M)HJc;5RBCM$|iKo?IN6F)B~k7`>Hl9Z9rF$*?Yu`Ya^Vl*^zAQ1jNYz4V&ASvp}Um75^EIzS5O-wm1= zeo#Avg~FNfQ`x@u8>#5YmF${4)=#i-g2yHCL^B+9XQ5e4#pzPcErp8c!$HBs{`pPt zLy1t?YQB}nt%AD6%I2+iy9u=>@I4O+xQ@NIx{cG}Co$2M(v_zXLarYh#((VWGm@lr zzs`>qz}+!SI!!6myB}^9zT-@@P*yK{9N;n+m+-2hB~8^_A$RdXCyz77@dkp@SYQHs zeWa1}goKYE(?b0EM@B}br)^3I0t$i!3HfP()KMuejz}!}o%kQQh7n`Xrx8;+c(ic| zVR1443Ntq^588`9`uVFZ&o-DZA*PQ`MVBgkDNcDvNJE=CyZq*S`d7^i<~#&I=~CVA5*8LXvEva5u{#7bU1df>5b#2t zN&fYdG`9aST4>Nhe`!NA2S~b_e;@F9)a_JQMG8WL2J4;M-lNg{fw8qj40PJ_qf=Yh zorSRtX^ugiifn=1Ab*j2m|Hl@wuKE85Gf`mHpSO!ck%8!8{&tzeEydB1CJM7vdGE> zZ(Hq4GmriQ7EXCWdk;VbCAmA@gS$aPN=bdl*1WT8H+50K*q1$>`{8ZXWX8)L{ZZ40 zxi?5ag0)R|IgZ{q5=OEe5Q*ocQMWOVFzaKkk%@gsg>=1N9&_o8CTL!^I;PP+-Wm{` z^DC~6F2dq|545S$w@MWcXkPG!^~QD;flXv}UYm7ZHtrlFPLZ!DWwRA}hqpB}xL~BD zq~cR{gFbJd4g#v4Mo`AKav8!8j4YWSn@D&E2t49w2spp6u&Pi(SpV|nYD2jQFuR&@ z0n4=yTTxl9KWOglt*)vXzjIG4=<3^RgsxGA1@D>J>w45*TkBefAQ)kqu8Tv;GWezbIWUjy-5M<)=qZ$lC@7>5X+}sRNrgmtaZDofp|~*EVkTnAJdPd-?&vm(A3h>g2SEN$EZ{) z7K@#)_o;??$hxeutv_r02k|0n`v!>*~7fg&&_`RJUJ-BW>6=}Z=g6Gb4+n2aA_KgR*)I?_V%VR z=QuOZJ7-z0g;hQS*kJMF5k&b1NY5ave-~N>d h`R|3(|FZdrU%#LE^qo5SIV+X}OpMG7tMpx-{RM{P;4T0F diff --git a/pcb_calculator/bitmaps/sources/attenuator/splitter_formula.png b/pcb_calculator/bitmaps/sources/attenuator/splitter_formula.png deleted file mode 100644 index a7ca12ac5edc07715ca6d65fd7a60c4356626093..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1933 zcmb`I`8OMg7RNIj)Y2*)yQ&Z!OU1rSQAQaFovJmW5@U-c9c`$swN^dSNNGmJ)-=^3 z5}~n;HkJw#L!_iF89db9DX9jrykK7bgLmFL?}vNu`Q9Jy=ZEh(-;2F=)$62!wgLbE zI0=P#_)F%hq;8#%lJo+H>Q(?iE)eSRLtuK1;EBuC?JK8;99l>uSwDkQxgK6P$2Xld z{c>b7B(YS_L{~pc;kAC9+n3Vo4Q|$|o|IAfLv=-3Okel$T;AU;>B}Xe(Txq)CG0uE zD3uxs7+>gXlm?KsN-yZkf)tCs8J3E4Yt7aCKS<%t&j4-9YVP9UWI>};H5V26e3Dsw z4QYV2snaut+K1M^LzBaU>ixU6rsEXz6s_@je>A~C?S`wldH1yXajvEk5wPlHR zkR-%C79;HgS{VWAu*l@W459hc`WWRi5Z2VO7S z9;+S_lX35i37D6GQy}PrS_<{^Ek{eX} z4Sl7&m=~nd9`Y6+EydV3`3(yO7D_?GnV0q|w$hcuzKt;FSi|1khl|S0G=25TId!p! zrmYZqaIw|f15}$(Y{&5N3cG=9jQNQT>b(0(h8f0*$H`pFszk3UbjehO$8*(69FbY` zW??F;8KjuX(x%u1@TO_A=c7rFOLVB&1D19l8i@iy36|`U*4uQPiSjdkt+9RePxNq3 zCik+ZUstp6L@m>ig(xiKxtJ0${LT>8N|MPs-jy{Okj&+EdptNlnDqV^Z2FMyqI)k@ z`d4y^tuppSLp-&rZCb&Xg0-u1<1a+qE*a^&vD#5M@PjR=W_w`aG{M+cb3yBrQkSUP zxqcbXK!7@+<6a5k+5kA1xK-4hQ{c-yyU;u^@Ja76r>i3n(yqgB_0tOgY9)SGR==Hu zpTA+>6aieT;l!MT-qXXrHq?{1Vn=5{-j^kVV{B`p(FneM=ER;@$%f@THUV=td=bv8 zPVg}zB}KzKL+LNPFvJtYCQjK9(_3S>KAyVrUai$m=*PoBTR zx>krp;`;jf+>%xm#OS)%bTdTuM~VRue8+@ApAw`>$g9E%p9{F)R#Tu>=H0t(ooT=) zm7Lzx?lg^_Kl!0jDKF92zY2xIWez!pm77UO2}p+F#*nu0@qW~khZ8ZS~$3(^4F z?R;W+YlxdG5VCvXqs&XL7cVBPC5G10T2VRm6BWqBDX@5&S(z6WQrOXHkv2gJsxDH$ zOj<+1KDM6Ikz_*sOj%=&o5k)#8)9eq={@I}+1?2s$ll-k`{@|Wvy-13g}fq~6{Uxn zGFm^MZQ)}#{Ouuf)aT3Q<^Y%dV_1-SZm2%ot@tmUe9E!hp lpOz-b4CY3E^WVv1IjR!S1~ocVD0#C0sOMFWX7``({Tsh5q%Z&g diff --git a/pcb_calculator/bitmaps/sources/attenuator/splitter_formula.xpm b/pcb_calculator/bitmaps/sources/attenuator/splitter_formula.xpm deleted file mode 100644 index 781fe92ec2..0000000000 --- a/pcb_calculator/bitmaps/sources/attenuator/splitter_formula.xpm +++ /dev/null @@ -1,135 +0,0 @@ -/* XPM */ -static const char *splitter_formula_xpm[] = { -/* columns rows colors chars-per-pixel */ -"230 112 17 1", -". c Black", -"& c #D9D9D9", -"+ c #E1E1E1", -"$ c #F0F0F0", -" c #FFFFFF", -"@ c #E9E9E9", -"% c #BDBDBD", -"# c #4D4D4D", -"- c #A7A7A7", -"o c #7C7C7C", -"X c #9A9A9A", -"* c #C7C7C7", -"> c #C0C0C0", -"; c #8C8C8C", -": c #B2B2B2", -"= c #D0D0D0", -"O c #686868", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" . . ... . ...... ", -" . . .. . . ", -" . . . . . . . . . ", -" . . . . . . . . . ", -" . . .... .... ... . .. .. .. ... .... . .. . .. ......... . .. .. . . . ", -" . . . . . . ... . . . . . . .. . . ... . .. . . .. ..... ", -" . . . . ..... . . . . .. . . . . . . . . . . . . ", -" ..... . . . . . . . .. . . . . . . . ......... . . . . . . ", -" . . . . . . . . . . . . . . . . . . . . . . . ", -" . . . . . . . . . . . ... . .. . . . . . . . . . . ... . . ", -" .... .... .. .. ... ... ... .. . ... .. .. ... .. ... ... .. .. . ....... ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" .......X oo .......X ... oo ... oo ... ", -" .O+ @.#$ oo .O+ @.#$ % .. oo .. oo .. ", -" .& o.% .& o.% $# .. .. .. ", -" % *.O % *.O o. .. .. .. ", -" #.+ ... ...=#.= ........ #.+ $-..-$ ... ... o.... ........ $-.%.. $-..- =#... ... ...@Oo $-..- $-.%.. ... ...=#- =.-$ ...%.-$ $-..- $-.%.. $;..-$ ...=#.= X.#: $-..- ", -" -.- .. ..= .# -.- #.==.# .. .. .. #.==.. #.==.# #. *. .. ..&=o #.==.# #.==.. .. ..==.#.-.# ..+=.# #.==.# #.==.. O.$=.# ..= .# X.+:# #.==.# ", -" +.# .. .. .. +.# .. .. .. .. .. .. .. .. .. O.;$ .. .. .. .. .. .. .. .. ..= .. .. .. .. .. .. .. @.. .. .. #. .. .. ", -" O.* . .. .. .. ........ O.* . .. .. .. .. .. ........ .. .. ...... @o.#@ .. .. ...... .. .. .. .. .. .. .. .. ...... .. .. -.-.. .. .. .. ...... ", -" %.; =o .. .. .. %.; =o .. .. .. .. .. .. .. #. -.# .. .. #. .. .. .. .. .. .. .. .. #. .. .. :.= .. .. .. #o #. ", -" $#.@ *#; .. .. .. $#.@ *#; #.==.# #. =.. ..&; #.=*.. :.% =X .* .# .. .. :.% =X #.=*.. .. .. .. .. ..*=.# :.% =X #.=*.. #.==.. .. .. -#&+X :.% =X ", -" X.......; .... .... ... X.......; $-..-$ =##%... =#O@ $-.=... :..- .&O#= ........ :..- $-.=... .... .... ... ... ..:.-$ :..- $-.=... $Xo&o.: .... ... ;.;@ :..- ", -" .. ", -" .. ", -" .... ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ", -" > > ", -" > $ > ", -" > ..... .. ..... ... ..... .. ....... O .... > ", -" > . . . . . . . . . . . . . . &o . . > ", -" > . . . . . . . . . . . -% . > ", -" > . . . . . . . . . . O@ . > ", -" > . . . +......... . . . +......... . . . +......... . ... .. .. @# . > ", -" > .... . .... . .... .. . . . . . *X ... > ", -" > . . . . . . . . . . . .. . ;= . > ", -" > . . . +......... . . . +......... . . . +......... . . .. . .$ . > ", -" > . . . . . . . . . . . . . . &o . > ", -" > . . . . . . . . . . . . . . . . . . :: . > ", -" > .... .. .... .... .. ..... .... .. ... ....... .. . .. O+ .... > ", -" > > ", -" > > ", -" > > ", -" >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " -}; diff --git a/pcb_calculator/bitmaps/splitter_formula.xpm b/pcb_calculator/bitmaps/splitter_formula.xpm deleted file mode 100644 index 781fe92ec2..0000000000 --- a/pcb_calculator/bitmaps/splitter_formula.xpm +++ /dev/null @@ -1,135 +0,0 @@ -/* XPM */ -static const char *splitter_formula_xpm[] = { -/* columns rows colors chars-per-pixel */ -"230 112 17 1", -". c Black", -"& c #D9D9D9", -"+ c #E1E1E1", -"$ c #F0F0F0", -" c #FFFFFF", -"@ c #E9E9E9", -"% c #BDBDBD", -"# c #4D4D4D", -"- c #A7A7A7", -"o c #7C7C7C", -"X c #9A9A9A", -"* c #C7C7C7", -"> c #C0C0C0", -"; c #8C8C8C", -": c #B2B2B2", -"= c #D0D0D0", -"O c #686868", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" . . ... . ...... ", -" . . .. . . ", -" . . . . . . . . . ", -" . . . . . . . . . ", -" . . .... .... ... . .. .. .. ... .... . .. . .. ......... . .. .. . . . ", -" . . . . . . ... . . . . . . .. . . ... . .. . . .. ..... ", -" . . . . ..... . . . . .. . . . . . . . . . . . . ", -" ..... . . . . . . . .. . . . . . . . ......... . . . . . . ", -" . . . . . . . . . . . . . . . . . . . . . . . ", -" . . . . . . . . . . . ... . .. . . . . . . . . . . ... . . ", -" .... .... .. .. ... ... ... .. . ... .. .. ... .. ... ... .. .. . ....... ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" .......X oo .......X ... oo ... oo ... ", -" .O+ @.#$ oo .O+ @.#$ % .. oo .. oo .. ", -" .& o.% .& o.% $# .. .. .. ", -" % *.O % *.O o. .. .. .. ", -" #.+ ... ...=#.= ........ #.+ $-..-$ ... ... o.... ........ $-.%.. $-..- =#... ... ...@Oo $-..- $-.%.. ... ...=#- =.-$ ...%.-$ $-..- $-.%.. $;..-$ ...=#.= X.#: $-..- ", -" -.- .. ..= .# -.- #.==.# .. .. .. #.==.. #.==.# #. *. .. ..&=o #.==.# #.==.. .. ..==.#.-.# ..+=.# #.==.# #.==.. O.$=.# ..= .# X.+:# #.==.# ", -" +.# .. .. .. +.# .. .. .. .. .. .. .. .. .. O.;$ .. .. .. .. .. .. .. .. ..= .. .. .. .. .. .. .. @.. .. .. #. .. .. ", -" O.* . .. .. .. ........ O.* . .. .. .. .. .. ........ .. .. ...... @o.#@ .. .. ...... .. .. .. .. .. .. .. .. ...... .. .. -.-.. .. .. .. ...... ", -" %.; =o .. .. .. %.; =o .. .. .. .. .. .. .. #. -.# .. .. #. .. .. .. .. .. .. .. .. #. .. .. :.= .. .. .. #o #. ", -" $#.@ *#; .. .. .. $#.@ *#; #.==.# #. =.. ..&; #.=*.. :.% =X .* .# .. .. :.% =X #.=*.. .. .. .. .. ..*=.# :.% =X #.=*.. #.==.. .. .. -#&+X :.% =X ", -" X.......; .... .... ... X.......; $-..-$ =##%... =#O@ $-.=... :..- .&O#= ........ :..- $-.=... .... .... ... ... ..:.-$ :..- $-.=... $Xo&o.: .... ... ;.;@ :..- ", -" .. ", -" .. ", -" .... ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ", -" > > ", -" > $ > ", -" > ..... .. ..... ... ..... .. ....... O .... > ", -" > . . . . . . . . . . . . . . &o . . > ", -" > . . . . . . . . . . . -% . > ", -" > . . . . . . . . . . O@ . > ", -" > . . . +......... . . . +......... . . . +......... . ... .. .. @# . > ", -" > .... . .... . .... .. . . . . . *X ... > ", -" > . . . . . . . . . . . .. . ;= . > ", -" > . . . +......... . . . +......... . . . +......... . . .. . .$ . > ", -" > . . . . . . . . . . . . . . &o . > ", -" > . . . . . . . . . . . . . . . . . . :: . > ", -" > .... .. .... .... .. ..... .... .. ... ....... .. . .. O+ .... > ", -" > > ", -" > > ", -" > > ", -" >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " -}; diff --git a/pcb_calculator/bitmaps/tee_formula.xpm b/pcb_calculator/bitmaps/tee_formula.xpm deleted file mode 100644 index 62e6f7a14e..0000000000 --- a/pcb_calculator/bitmaps/tee_formula.xpm +++ /dev/null @@ -1,271 +0,0 @@ -/* XPM */ -static const char *tee_formula_xpm[] = { -/* columns rows colors chars-per-pixel */ -"255 248 17 1", -"X c Black", -"> c #D9D9D9", -"* c #E1E1E1", -"= c #F0F0F0", -" c #FFFFFF", -"o c #E9E9E9", -": c #BDBDBD", -"O c #4D4D4D", -"+ c #A7A7A7", -"# c #7C7C7C", -"& c #9A9A9A", -"@ c #C7C7C7", -". c #C0C0C0", -"- c #8C8C8C", -"; c #B2B2B2", -"% c #D0D0D0", -"$ c #686868", -/* pixels */ -" ", -" ", -" .............................................................. ", -" . . ", -" . X . ", -" . XX . ", -" . X X . ", -" . X X . ", -" . XXX . ", -" . X X . ", -" . XXX XXX . ", -" . . ", -" . . ", -" . XXXXXXXXXXXX . ", -" . . ", -" . XX XX . ", -" . X X X X . ", -" . X X X . ", -" . XXXX X X XX X X X . X X oO X X X XXXXXX ", -" . XX XXX XXX X X X X X . XX +X@ XX X X ", -" . X X X X X X X X X . X X #X$ X X X X X X ", -" . X X X X X XXXX XX . X X %@&X% X X X X X X ", -" . X *XXXXXXXXX X X X . XXX XXX XXX X XXXX X XX #=*X- XXXXXXXXX XXX XXXXXXXX XXX X XX XX XX XXX XXXX X XX X XX X X XX XX X X X ", -" . X XXXX X X X . X X X XX X XX X o& #X* X X X X X X XXX X X X X X X XX X X XXX X XX XXX X X XX XXXXX ", -" . X X X X X . X X X X X X X +% %X+ XX X X XXXXX X X X X XX X X X X X X X X X X X X X ", -" . X X *XXXXXXXXX X X X . X X X X X X X X OXXXXXX= XXXXXXXXX XX X X X X X X X X XX X X X X X X X X X X X X X X ", -" . X X X X X . X X X X X X X X @; ;X+ X X X X X X X X X X X X X X X X X X X X X X X X ", -" . X X X X X . XX XX X X X X X *O* =XX% X XX X X X X X X X X X XXX X XX X X X X X X X X X X X XXX X X ", -" . XXXXXX XXX XX . X X XXX XX XXX XXX *XXX: *XXXX: XXX XX XX XX XXX XXX XXX XX X XXX XX XX XXX XX XXX XXX XXX XXX XXX XX X XXXXXXX ", -" . . ", -" . . ", -" . . ", -" .............................................................. ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" XXXXXXX X X X X X X X ", -" X X XX XX XX ", -" X X X X X X ", -" X X X X X ", -" X X X XX XXXXXXXXX XX X XXX XXX X X XX XXX XX X X X XX X XX XX XX XXXX X X XX XX X XX XXX XX X XXX X XX XXX XXX ", -" X XX XXX X X XX X X X X XX XXX X X X XX XX XXX X XXX X X X X XX XXX XX X XXX X X X X XX X X XXX X X X X X ", -" X X X X X X XXXXX X X X XXXXX X X X X X X X X X X X X X X X X XXXXX X X XX X X X XXXXX ", -" X X X X XXXXXXXXX X X X XX X X X X X X X X X X X X X X X X X X X X X X XX X X X X X ", -" X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X ", -" X X X X X X XXX X X X X X X X X X XXX X X X XX X X XXX X X X X X X XX X X X X XXX X XX X X X X X X ", -" XXXXXXXX XXX XXX XXX XX X XXX XXX XXXXXX XXX XX X XXX XXX XXX X XX XX X XX XXX XXX XXX XXX X XX XXX XX X XXX XXXXX XXX XXX XXX ", -" X X ", -" X X ", -" XXX XXX ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" XXXXXXX X X X X X ", -" X X XX XX XX ", -" X X X X X X X X ", -" X X X X X X X ", -" X XX XX XX XXXX XXXXXXXXX XX X XXX XXX X X XX XXX XX X XX XX XX XXXX X XX XX XX XXXX X X XX XX X XX XXX XX X XXX X XX XXX XXX ", -" X X X X X X X XX X X X X XX XXX X X X XX X X X X X XXX X X X X XX XXX XX X XXX X X X X XX X X XXX X X X X X ", -" X X X X X X X X XXXXX X X X XXXXX X X X X X X X X X X X X X X X X X X XXXXX X X XX X X X XXXXX ", -" X X X X X X XXXXXXXXX X X X XX X X X X X X X X X X X X X X X X X X X X X X X X XX X X X X X ", -" X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X ", -" X X X X X XXX X X X XXX X X X X X X X X X XXX X X X XXX X X XX X X XXX X X X X X X XX X X X X XXX X XX X X X X X X ", -" XXXXXXXX XX XX X XX XX X XXX XXX XXXXXX XXX XX X XX XX X XX X XX XX X XX XXX XXX XXX XXX X XX XXX XX X XXX XXXXX XXX XXX XXX ", -" X X ", -" X X ", -" XXX XXX ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ................................................................................................................................................................ ", -" . ; XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX . ", -" . ; . ", -" . ; . ", -" . *> . ", -" . XXX := XXXXXXX XXXXXXX XXXX X . ", -" . X X + X X X X X XX XXX . ", -" . X X + X X X X X X X . ", -" . X -* *@ X -* X X -* X X . ", -" . X =; &*o; > :o X XXX XX XX =; &*o; X XXX XX X XXX =; &*o; X . ", -" . X =+#&;$% @-o - X X X X X =+#&;$% X XX X X X X X =+#&;$% X XXXX . ", -" . X %O$= >+ - X X XX X %O$= X X X X X X %O$= X X . ", -" . X o$;;%#+ # o: X X XX X o$;;%#+ X X X X X X o$;;%#+ X X . ", -" . X > -* > ;>@> X X X X X > -* > X X X X X XX X > -* > X X . ", -" . XXXXX XXX X X ;o =&& X X X X X X X ;o X X X XX X XX X X X ;o X X . ", -" . X X X X XXXXXX #- XXXXXXX XX X XX XXXXXXX XXX XXX XX XXX XXXXXX . ", -" . X X X %+ . ", -" . X X X . ", -" . X X X *XXXXXXXXX . ", -" . XXXX X . ", -" . X X X XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX . ", -" . X X X *XXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX . ", -" . X X X . ", -" . X X X X o% %o . ", -" . XXXX XX XXXXX + + . ", -" . o; XXXX X X ;= . ", -" . :% XX XXX XXX %@ . ", -" . -* X X X *& . ", -" . $ X X X # . ", -" . X X X X . ", -" . X X XXXX X X . ", -" . X X X *XXXXXXXXX X X . ", -" . X X X X X . ", -" . # X X X $ . ", -" . -* X X X *- . ", -" . @% XXXXXX XXX %: . ", -" . =; ;o . ", -" . + + . ", -" . o> >o . ", -" ................................................................................................................................................................ ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ........................................................................................................................................................ ", -" . . ", -" . . ", -" . XXXX X X . ", -" . XX XXX o XXX . ", -" . X X - X . ", -" . X X - X . ", -" . X - X . ", -" . X XXXX - X . ", -" . X X o----O---- X . ", -" . X X - X . ", -" . X X - X . ", -" . XXXXX XX XXXXXXX X X - X XXXXX XXX . ", -" . X X X X X X XXXXXX - XXX X X X X . ", -" . X X X X X X X X X . ", -" . X X X X X -* X X X . ", -" . X X X *XXXXXXXXX X XXX XX X XXX =; &*o; X X X . ", -" . XXXX XX X XX X X X X X =+#&;$% XXXX X . ", -" . X X X X X X X X X %O$= *XXXXXXXXX X X X . ", -" . X X X *XXXXXXXXX X X X X X X o$;;%#+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X X X . ", -" . X X X X X X X X XX X > -* > XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X X X . ", -" . X X X X X X X XX X XX X X X ;o X X X X . ", -" . XXXX XX XXX XXXXXXX XXX XXX XX XXX XXXX XX XXXXX . ", -" . XXXX X X . ", -" . XX XXX XXX . ", -" . X X X . ", -" . X X X . ", -" . X X . ", -" . X XXXX X . ", -" . X X *XXXXXXXXX X . ", -" . X X X . ", -" . X X X . ", -" . X X X . ", -" . XXXXXX XXX . ", -" . . ", -" . . ", -" . . ", -" ........................................................................................................................................................ ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" .............................................................................................................................................. ", -" . . ", -" . . ", -" . XXXX X X . ", -" . XX XXX o XXX . ", -" . X X - X . ", -" . X X - X . ", -" . X - X . ", -" . X XXXX - X . ", -" . X X o----O---- X . ", -" . X X - X . ", -" . X X - X . ", -" . XXXXX XX XXXXXXX X X - X XXXXX XXX . ", -" . X X X X X X XXXXXX - XXX X X X X . ", -" . X X X X X X X X . ", -" . X X X X -* X X X . ", -" . X X X *XXXXXXXXX X XXX XX XX =; &*o; X X X . ", -" . XXXX X X X X X X =+#&;$% XXXX X . ", -" . X X X X X XX X %O$= *XXXXXXXXX X X X . ", -" . X X X *XXXXXXXXX X X XX X o$;;%#+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X X X . ", -" . X X X X X X X X > -* > XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X X X . ", -" . X X X X X X X X X X ;o X X X X . ", -" . XXXX XX XXXX XXXXXXX XX X XX XXXX XX XXXXX . ", -" . XXXX X X . ", -" . XX XXX XXX . ", -" . X X X . ", -" . X X X . ", -" . X X . ", -" . X XXXX X . ", -" . X X *XXXXXXXXX X . ", -" . X X X . ", -" . X X X . ", -" . X X X . ", -" . XXXXXX XXX . ", -" . . ", -" . . ", -" . . ", -" .............................................................................................................................................. ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" " -}; diff --git a/pcb_calculator/dialogs/dialog_regulator_data.fbp b/pcb_calculator/dialogs/dialog_regulator_data.fbp index 1b92c149b2..b3051a1ee0 100644 --- a/pcb_calculator/dialogs/dialog_regulator_data.fbp +++ b/pcb_calculator/dialogs/dialog_regulator_data.fbp @@ -1,6 +1,6 @@ - + C++ @@ -20,67 +20,35 @@ . 1 + 1 1 1 + UI 0 0 - 1 - 1 - 1 - 1 - 0 - - - - + wxAUI_MGR_DEFAULT - - 1 wxBOTH - 0 - 1 1 - 0 - Dock - 0 - Left 1 impl_virtual - 1 - 0 0 wxID_ANY - - 0 - - 0 - 1 DIALOG_EDITOR_DATA_BASE - 1 - - - 1 - Resizable - 1 - 310,210 + 292,200 wxDEFAULT_DIALOG_STYLE DIALOG_SHIM; dialog_shim.h Regulator Parameters - 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -195,10 +163,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -383,10 +347,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -561,10 +521,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -648,10 +604,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -833,10 +785,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1011,10 +959,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1046,6 +990,16 @@ + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + 5 wxEXPAND | wxALL @@ -1099,10 +1053,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1133,7 +1083,7 @@ 5 - wxEXPAND + wxEXPAND|wxALL 0 0 @@ -1148,7 +1098,7 @@ m_sdbSizerButtons protected - OnCancelClick + diff --git a/pcb_calculator/dialogs/dialog_regulator_data_base.cpp b/pcb_calculator/dialogs/dialog_regulator_data_base.cpp index f504f05e8a..6984ce9163 100644 --- a/pcb_calculator/dialogs/dialog_regulator_data_base.cpp +++ b/pcb_calculator/dialogs/dialog_regulator_data_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 17 2012) +// C++ code generated with wxFormBuilder (version Jan 1 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -71,6 +71,9 @@ DIALOG_EDITOR_DATA_BASE::DIALOG_EDITOR_DATA_BASE( wxWindow* parent, wxWindowID i bSizerMain->Add( fgSizerPrms, 0, wxEXPAND, 5 ); + + bSizerMain->Add( 0, 0, 1, wxEXPAND, 5 ); + m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizerMain->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); @@ -81,7 +84,7 @@ DIALOG_EDITOR_DATA_BASE::DIALOG_EDITOR_DATA_BASE( wxWindow* parent, wxWindowID i m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); - bSizerMain->Add( m_sdbSizerButtons, 0, wxEXPAND, 5 ); + bSizerMain->Add( m_sdbSizerButtons, 0, wxEXPAND|wxALL, 5 ); this->SetSizer( bSizerMain ); @@ -91,7 +94,6 @@ DIALOG_EDITOR_DATA_BASE::DIALOG_EDITOR_DATA_BASE( wxWindow* parent, wxWindowID i // Connect Events m_choiceRegType->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_EDITOR_DATA_BASE::OnRegTypeSelection ), NULL, this ); - m_sdbSizerButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDITOR_DATA_BASE::OnCancelClick ), NULL, this ); m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDITOR_DATA_BASE::OnOKClick ), NULL, this ); } @@ -99,7 +101,6 @@ DIALOG_EDITOR_DATA_BASE::~DIALOG_EDITOR_DATA_BASE() { // Disconnect Events m_choiceRegType->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_EDITOR_DATA_BASE::OnRegTypeSelection ), NULL, this ); - m_sdbSizerButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDITOR_DATA_BASE::OnCancelClick ), NULL, this ); m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDITOR_DATA_BASE::OnOKClick ), NULL, this ); } diff --git a/pcb_calculator/dialogs/dialog_regulator_data_base.h b/pcb_calculator/dialogs/dialog_regulator_data_base.h index c52b57e464..e3993d70ed 100644 --- a/pcb_calculator/dialogs/dialog_regulator_data_base.h +++ b/pcb_calculator/dialogs/dialog_regulator_data_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 17 2012) +// C++ code generated with wxFormBuilder (version Jan 1 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,6 +11,8 @@ #include #include #include +class DIALOG_SHIM; + #include "dialog_shim.h" #include #include @@ -53,13 +55,12 @@ class DIALOG_EDITOR_DATA_BASE : public DIALOG_SHIM // Virtual event handlers, overide them in your derived class virtual void OnRegTypeSelection( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnOKClick( wxCommandEvent& event ) { event.Skip(); } public: - DIALOG_EDITOR_DATA_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Regulator Parameters"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 310,210 ), long style = wxDEFAULT_DIALOG_STYLE ); + DIALOG_EDITOR_DATA_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Regulator Parameters"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 292,200 ), long style = wxDEFAULT_DIALOG_STYLE ); ~DIALOG_EDITOR_DATA_BASE(); }; diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp index 5682d2da30..fc7d81fce6 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp @@ -518,7 +518,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_panelTrackWidth->SetSizer( bSizerTrackWidth ); m_panelTrackWidth->Layout(); bSizerTrackWidth->Fit( m_panelTrackWidth ); - m_Notebook->AddPage( m_panelTrackWidth, _("Track Width"), true ); + m_Notebook->AddPage( m_panelTrackWidth, _("Track Width"), false ); m_panelElectricalSpacing = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerElectricalClearance; bSizerElectricalClearance = new wxBoxSizer( wxHORIZONTAL ); @@ -1161,9 +1161,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow wxStaticBoxSizer* sbRightSizerFormula; sbRightSizerFormula = new wxStaticBoxSizer( new wxStaticBox( sbSizerAtt->GetStaticBox(), wxID_ANY, _("Formula") ), wxVERTICAL ); - m_panelAttFormula = new wxPanel( sbRightSizerFormula->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSIMPLE_BORDER|wxTAB_TRAVERSAL ); - m_panelAttFormula->SetMinSize( wxSize( 200,-1 ) ); - + m_panelAttFormula = new wxHtmlWindow( sbRightSizerFormula->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); sbRightSizerFormula->Add( m_panelAttFormula, 1, wxALL|wxEXPAND, 5 ); @@ -1173,7 +1171,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_panelAttenuators->SetSizer( sbSizerAtt ); m_panelAttenuators->Layout(); sbSizerAtt->Fit( m_panelAttenuators ); - m_Notebook->AddPage( m_panelAttenuators, _("RF Attenuators"), false ); + m_Notebook->AddPage( m_panelAttenuators, _("RF Attenuators"), true ); m_panelColorCode = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerPanelColorCode; bSizerPanelColorCode = new wxBoxSizer( wxHORIZONTAL ); @@ -1349,7 +1347,6 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_AttenuatorsSelection->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnAttenuatorSelection ), NULL, this ); m_panelDisplayAttenuator->Connect( wxEVT_PAINT, wxPaintEventHandler( PCB_CALCULATOR_FRAME_BASE::OnPaintAttenuatorPanel ), NULL, this ); m_buttonAlcAtt->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnCalculateAttenuator ), NULL, this ); - m_panelAttFormula->Connect( wxEVT_PAINT, wxPaintEventHandler( PCB_CALCULATOR_FRAME_BASE::OnPaintAttFormulaPanel ), NULL, this ); m_rbToleranceSelection->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnToleranceSelection ), NULL, this ); m_BoardClassesUnitsSelector->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnBoardClassesUnitsSelection ), NULL, this ); } @@ -1390,7 +1387,6 @@ PCB_CALCULATOR_FRAME_BASE::~PCB_CALCULATOR_FRAME_BASE() m_AttenuatorsSelection->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnAttenuatorSelection ), NULL, this ); m_panelDisplayAttenuator->Disconnect( wxEVT_PAINT, wxPaintEventHandler( PCB_CALCULATOR_FRAME_BASE::OnPaintAttenuatorPanel ), NULL, this ); m_buttonAlcAtt->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnCalculateAttenuator ), NULL, this ); - m_panelAttFormula->Disconnect( wxEVT_PAINT, wxPaintEventHandler( PCB_CALCULATOR_FRAME_BASE::OnPaintAttFormulaPanel ), NULL, this ); m_rbToleranceSelection->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnToleranceSelection ), NULL, this ); m_BoardClassesUnitsSelector->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PCB_CALCULATOR_FRAME_BASE::OnBoardClassesUnitsSelection ), NULL, this ); diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp index 12ba002568..258bfdd361 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp @@ -3269,7 +3269,7 @@ Track Width - 1 + 0 1 1 @@ -15262,7 +15262,7 @@ RF Attenuators - 0 + 1 1 1 @@ -17506,11 +17506,11 @@ 1 none - + 5 wxALL|wxEXPAND 1 - + 1 1 1 @@ -17543,7 +17543,7 @@ 0 - 200,-1 + 1 m_panelAttFormula 1 @@ -17554,16 +17554,20 @@ Resizable 1 - -1,-1 + + wxHW_SCROLLBAR_AUTO 0 - wxSIMPLE_BORDER|wxTAB_TRAVERSAL + + + + @@ -17577,7 +17581,7 @@ - OnPaintAttFormulaPanel + diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.h b/pcb_calculator/dialogs/pcb_calculator_frame_base.h index 24dd80c26a..2fa282855e 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.h +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.h @@ -252,7 +252,7 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER wxStaticText* m_attR3Unit; wxStaticText* m_staticTextAttMsg; wxHtmlWindow* m_Attenuator_Messages; - wxPanel* m_panelAttFormula; + wxHtmlWindow* m_panelAttFormula; wxPanel* m_panelColorCode; wxRadioBox* m_rbToleranceSelection; wxStaticText* m_staticText31; @@ -298,7 +298,6 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER virtual void OnAttenuatorSelection( wxCommandEvent& event ) { event.Skip(); } virtual void OnPaintAttenuatorPanel( wxPaintEvent& event ) { event.Skip(); } virtual void OnCalculateAttenuator( wxCommandEvent& event ) { event.Skip(); } - virtual void OnPaintAttFormulaPanel( wxPaintEvent& event ) { event.Skip(); } virtual void OnToleranceSelection( wxCommandEvent& event ) { event.Skip(); } virtual void OnBoardClassesUnitsSelection( wxCommandEvent& event ) { event.Skip(); } diff --git a/pcb_calculator/pcb_calculator.h b/pcb_calculator/pcb_calculator.h index 05cc6348df..3c685cbd0a 100644 --- a/pcb_calculator/pcb_calculator.h +++ b/pcb_calculator/pcb_calculator.h @@ -84,7 +84,6 @@ private: // icons that show the current item on the specific panels void OnPaintTranslinePanel( wxPaintEvent& event ); void OnPaintAttenuatorPanel( wxPaintEvent& event ); - void OnPaintAttFormulaPanel( wxPaintEvent& event ); // Config read-write, virtual from EDA_BASE_FRAME void LoadSettings( wxConfigBase* aCfg ); diff --git a/pcb_calculator/regulators_funct.cpp b/pcb_calculator/regulators_funct.cpp index a0ee082275..0d957031d2 100644 --- a/pcb_calculator/regulators_funct.cpp +++ b/pcb_calculator/regulators_funct.cpp @@ -106,24 +106,25 @@ void DIALOG_EDITOR_DATA::OnOKClick( wxCommandEvent& event ) bool DIALOG_EDITOR_DATA::IsOK() { - bool ok = true; + bool success = true; + if( m_textCtrlName->GetValue().IsEmpty() ) - ok = false; + success = false; if( m_textCtrlVref->GetValue().IsEmpty() ) - ok = false; + success = false; else { double vref = DoubleFromString( m_textCtrlVref->GetValue() ); if( fabs(vref) < 0.01 ) - ok = false; + success = false; } if( m_choiceRegType->GetSelection() == 1 ) { if( m_RegulIadjValue->GetValue().IsEmpty() ) - ok = false; + success = false; } - return ok; + return success; } void DIALOG_EDITOR_DATA::CopyRegulatorDataToDialog( REGULATOR_DATA * aItem ) diff --git a/pcbnew/github/github_plugin.cpp b/pcbnew/github/github_plugin.cpp index eea64109c0..9fa4e628fe 100644 --- a/pcbnew/github/github_plugin.cpp +++ b/pcbnew/github/github_plugin.cpp @@ -542,6 +542,7 @@ void GITHUB_PLUGIN::remoteGetZip( const wxString& aRepoURL ) throw( IO_ERROR ) catch( const IO_ERROR& ioe ) { // https "GET" has faild, report this to API caller. + // Note: kcurl.Perform() does not return an error if the file to download is not found UTF8 fmt( _( "%s\nCannot get/download Zip archive: '%s'\nfor library path: '%s'.\nReason: '%s'" ) ); std::string msg = StrPrintf( fmt.c_str(), From 454dd64ac59310b97f4c5c34133b0dfa88f82485 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 16 Jan 2016 15:50:34 +0100 Subject: [PATCH 2/2] Remove autogenerated files --- .../attenuators/bridget_tee_formula.h | 33 ------------- pcb_calculator/attenuators/pi_formula.h | 44 ----------------- pcb_calculator/attenuators/splitter_formula.h | 36 -------------- pcb_calculator/attenuators/tee_formula.h | 47 ------------------- 4 files changed, 160 deletions(-) delete mode 100644 pcb_calculator/attenuators/bridget_tee_formula.h delete mode 100644 pcb_calculator/attenuators/pi_formula.h delete mode 100644 pcb_calculator/attenuators/splitter_formula.h delete mode 100644 pcb_calculator/attenuators/tee_formula.h diff --git a/pcb_calculator/attenuators/bridget_tee_formula.h b/pcb_calculator/attenuators/bridget_tee_formula.h deleted file mode 100644 index 4bd78fd9fd..0000000000 --- a/pcb_calculator/attenuators/bridget_tee_formula.h +++ /dev/null @@ -1,33 +0,0 @@ -// Do not edit this file, it is autogenerated by CMake from an HTML file -"\n" -"\n" -"\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -"\n" -"\n" -"

Zin\n" -"desired input impedance in Ω

\n" -"

Zout\n" -"desired output impedance Z in = Z out

\n" -"

a\n" -"attenuation in dB

\n" -"

L\n" -"= 10a/20 (the loss)

\n" -"


\n" -"

\n" -"

Bridged\n" -"tee attenuator

\n" -"

R1\n" -"= Zin * (L &minus 1)

\n" -"

R2\n" -"= Zin/(L &minus 1)

\n" -"\n" -"\n" diff --git a/pcb_calculator/attenuators/pi_formula.h b/pcb_calculator/attenuators/pi_formula.h deleted file mode 100644 index ebf988632b..0000000000 --- a/pcb_calculator/attenuators/pi_formula.h +++ /dev/null @@ -1,44 +0,0 @@ -// Do not edit this file, it is autogenerated by CMake from an HTML file -"\n" -"\n" -"\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -"\n" -"\n" -"

\n" -"Zin\n" -" desired input impedance in Ω

\n" -"

\n" -"Zout\n" -" desired output impedance in Ω

\n" -"

\n" -"a\n" -" attenuation in dB

\n" -"

\n" -"L\n" -"= 10a/10 (the loss)

\n" -"

\n" -"A\n" -"= (L + 1)/(L &minus 1)

\n" -"

\n" -"
\n" -"

\n" -"

Pi\n" -"attenuator

\n" -"

R2\n" -"= (L &minus 1)/2 * &radic ((Zin * Zout)/L)

\n" -"

R1\n" -"= 1/( A/Zin &minus 1/R2)

\n" -"

R3\n" -"= 1/ (A/Zout &minus 1/R2)

\n" -"\n" -"\n" diff --git a/pcb_calculator/attenuators/splitter_formula.h b/pcb_calculator/attenuators/splitter_formula.h deleted file mode 100644 index 8dd5b0e979..0000000000 --- a/pcb_calculator/attenuators/splitter_formula.h +++ /dev/null @@ -1,36 +0,0 @@ -// Do not edit this file, it is autogenerated by CMake from an HTML file -"\n" -"\n" -"\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -"\n" -"\n" -"

Zin\n" -"desired input impedance in Ω

\n" -"

Zout\n" -"desired output impedance in Ω

\n" -"

Zin\n" -"= Zout

\n" -"


\n" -"

\n" -"

Attenuation\n" -"is 6dB

\n" -"


\n" -"

\n" -"

Splitted\n" -"attenuator

\n" -"

R1\n" -"= R2 = R3 = Zout/3

\n" -"\n" -"\n" diff --git a/pcb_calculator/attenuators/tee_formula.h b/pcb_calculator/attenuators/tee_formula.h deleted file mode 100644 index 53ac61c726..0000000000 --- a/pcb_calculator/attenuators/tee_formula.h +++ /dev/null @@ -1,47 +0,0 @@ -// Do not edit this file, it is autogenerated by CMake from an HTML file -"\n" -"\n" -"\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -"\n" -"\n" -"

\n" -"Zin\n" -"desired input impedance in Ω

\n" -"

\n" -"Zout\n" -"desired output impedance in Ω

\n" -"

\n" -"a\n" -"attenuation in dB

\n" -"

\n" -"L\n" -"= 10 a/10 (the loss)

\n" -"

\n" -"A\n" -"= (L + 1)/(L &minus 1)

\n" -"

\n" -"
\n" -"

\n" -"

Tee\n" -"attenuator

\n" -"

\n" -"R2\n" -"= 2*&radic (L * Zin * Zout )/(L &minus 1)

\n" -"

\n" -"R1\n" -"= Zin * A &minus R2

\n" -"

\n" -"R3\n" -"= Zout * A &minus R2

\n" -"\n" -"\n"