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 <kicad_curl/kicad_curl.h>
+
#include <wx/log.h>
#include <wx/dynlib.h>
#include <macros.h>
#include <fctsys.h>
-#include <kicad_curl/kicad_curl.h>
#include <ki_mutex.h> // MUTEX and MUTLOCK
#include <richio.h>
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 <pcb_calculator.h>
#include <attenuator_classes.h>
+
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 <att_tee.xpm>
#include <att_bridge.xpm>
#include <att_splitter.xpm>
-#include <pi_formula.xpm>
-#include <tee_formula.xpm>
-#include <bridged_tee_formula.xpm>
-#include <splitter_formula.xpm>
+
+
+// Html texts showing the formulas
+wxString pi_formula(
+#include <pi_formula.h>
+);
+
+wxString tee_formula(
+#include <tee_formula.h>
+);
+
+wxString bridget_tee_formula(
+#include <bridget_tee_formula.h>
+);
+
+wxString splitter_formula(
+#include <splitter_formula.h>
+);
+
#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
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n"
+"<html>\n"
+"<head>\n"
+" <meta http-equiv=\"content-type\" content=\"text/html charset=windows-1252\"/>\n"
+" <title></title>\n"
+" <meta name=\"generator\" content=\"LibreOffice 5.0.3.2 (Windows)\"/>\n"
+" <meta name=\"created\" content=\"00:00:00\"/>\n"
+" <meta name=\"changed\" content=\"2016-01-16T13:33:30.802000000\"/>\n"
+" <meta name=\"created\" content=\"00:00:00\">\n"
+" <meta name=\"changed\" content=\"2016-01-16T10:18:56.932000000\">\n"
+" <meta name=\"created\" content=\"2016-01-16T10:09:46.840000000\">\n"
+" <meta name=\"changed\" content=\"2016-01-16T10:10:55.745000000\">\n"
+"</head>\n"
+"<body lang=\"fr-FR\" dir=\"ltr\">\n"
+"<p style=\"margin-bottom: 0cm\"><font face=\"Times New Roman, serif\"><font size=\"5\" style=\"font-size: 18pt\">Z<sub>in</sub>\n"
+"desired input impedance in <b>Ω</b></font></font></p>\n"
+"<p style=\"margin-bottom: 0cm\"><font face=\"Times New Roman, serif\"><font size=\"5\" style=\"font-size: 18pt\">Z<sub>out</sub>\n"
+"desired output impedance <b>Z in = Z out</b></font></font></p>\n"
+"<p style=\"margin-bottom: 0cm\"><font face=\"Times New Roman, serif\"><font size=\"5\" style=\"font-size: 18pt\"><i><b>a</b></i>\n"
+"attenuation in dB</font></font></p>\n"
+"<p style=\"margin-left: 1.25cm margin-bottom: 0cm\"><font face=\"Times New Roman, serif\"><font size=\"5\" style=\"font-size: 18pt\"><b>L\n"
+"= 10</b><sup><b>a/20</b></sup> (the loss)</font></font></p>\n"
+"<p style=\"margin-bottom: 0cm\"><br/>\n"
+"</p>\n"
+"<p style=\"margin-bottom: 0cm\"><font face=\"Times New Roman, serif\"><font size=\"5\" style=\"font-size: 18pt\"><b>Bridged\n"
+"tee attenuator</b></font></font></p>\n"
+"<p style=\"margin-left: 1.25cm margin-bottom: 0cm\"><font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 24pt\"><i><b>R1\n"
+"= Z<sub>in</sub> * (L &minus 1)</b></i></font></font></p>\n"
+"<p style=\"margin-left: 1.25cm margin-bottom: 0cm\"><font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 24pt\"><i><b>R2\n"
+"= Z<sub>in</sub>/(L &minus 1)</b></i></font></font></p>\n"
+"</body>\n"
+"</html>\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 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=windows-1252"/>
+ <title></title>
+ <meta name="generator" content="LibreOffice 5.0.3.2 (Windows)"/>
+ <meta name="created" content="00:00:00"/>
+ <meta name="changed" content="2016-01-16T13:33:30.802000000"/>
+ <meta name="created" content="00:00:00">
+ <meta name="changed" content="2016-01-16T10:18:56.932000000">
+ <meta name="created" content="2016-01-16T10:09:46.840000000">
+ <meta name="changed" content="2016-01-16T10:10:55.745000000">
+</head>
+<body lang="fr-FR" dir="ltr">
+<p style="margin-bottom: 0cm"><font face="Times New Roman, serif"><font size="5" style="font-size: 18pt">Z<sub>in</sub>
+desired input impedance in <b>Ω</b></font></font></p>
+<p style="margin-bottom: 0cm"><font face="Times New Roman, serif"><font size="5" style="font-size: 18pt">Z<sub>out</sub>
+desired output impedance <b>Z in = Z out</b></font></font></p>
+<p style="margin-bottom: 0cm"><font face="Times New Roman, serif"><font size="5" style="font-size: 18pt"><i><b>a</b></i>
+attenuation in dB</font></font></p>
+<p style="margin-left: 1.25cm; margin-bottom: 0cm"><font face="Times New Roman, serif"><font size="5" style="font-size: 18pt"><b>L
+= 10</b><sup><b>a/20</b></sup> (the loss)</font></font></p>
+<p style="margin-bottom: 0cm"><br/>
+
+</p>
+<p style="margin-bottom: 0cm"><font face="Times New Roman, serif"><font size="5" style="font-size: 18pt"><b>Bridged
+tee attenuator</b></font></font></p>
+<p style="margin-left: 1.25cm; margin-bottom: 0cm"><font face="Times New Roman, serif"><font size="6" style="font-size: 24pt"><i><b>R1
+= Z<sub>in</sub> * (L − 1)</b></i></font></font></p>
+<p style="margin-left: 1.25cm; margin-bottom: 0cm"><font face="Times New Roman, serif"><font size="6" style="font-size: 24pt"><i><b>R2
+= Z<sub>in</sub>/(L − 1)</b></i></font></font></p>
+</body>
+</html>
\ 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
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n"
+"<html>\n"
+"<head>\n"
+" <meta http-equiv=\"content-type\" content=\"text/html charset=windows-1252\"/>\n"
+" <title></title>\n"
+" <meta name=\"generator\" content=\"LibreOffice 5.0.3.2 (Windows)\"/>\n"
+" <meta name=\"created\" content=\"00:00:00\"/>\n"
+" <meta name=\"changed\" content=\"2016-01-16T13:32:32.474000000\"/>\n"
+" <style type=\"text/css\">\n"
+" @page { margin: 2cm }\n"
+" p { margin-bottom: 0.25cm line-height: 120% }\n"
+" a:link { so-language: zxx }\n"
+" </style>\n"
+"</head>\n"
+"<body lang=\"fr-FR\" dir=\"ltr\">\n"
+"<p style=\"margin-bottom: 0cm font-style: normal font-weight: normal line-height: 100%\">\n"
+"<font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 22pt\"><b>Z</b><sub><b>in</b></sub>\n"
+" desired input impedance in Ω</font></font></p>\n"
+"<p style=\"margin-bottom: 0cm font-style: normal font-weight: normal line-height: 100%\">\n"
+"<font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 22pt\"><b>Z</b><sub><b>out</b></sub><sub>\n"
+" </sub> desired output impedance in Ω</font></font></p>\n"
+"<p style=\"margin-bottom: 0cm font-style: normal font-weight: normal line-height: 100%\">\n"
+"<font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 22pt\">a\n"
+" attenuation in dB</font></font></p>\n"
+"<p style=\"margin-bottom: 0cm font-style: normal font-weight: normal line-height: 100%\">\n"
+"<font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 22pt\">L\n"
+"= 10<sup>a/10</sup> (the loss)</font></font></p>\n"
+"<p style=\"margin-bottom: 0cm font-style: normal font-weight: normal line-height: 100%\">\n"
+"<font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 22pt\">A\n"
+"= (L + 1)/(L &minus 1)</font></font></p>\n"
+"<p style=\"margin-bottom: 0cm font-style: normal font-weight: normal line-height: 100%\">\n"
+"<br/>\n"
+"</p>\n"
+"<p style=\"margin-bottom: 0cm font-style: normal line-height: 100%\"><font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 28pt\"><b>Pi\n"
+"attenuator</b></font></font></p>\n"
+"<p style=\"margin-bottom: 0cm line-height: 100%\"><font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 28pt\"><i><b>R2\n"
+"= (L &minus 1)/2 * &radic ((Z<sub>in</sub> * Z<sub>out</sub>)/L)</b></i></font></font></p>\n"
+"<p style=\"margin-bottom: 0cm line-height: 100%\"><font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 28pt\"><i><b>R1\n"
+"= 1/( A/Z<sub>in</sub> &minus 1/R2)</b></i></font></font></p>\n"
+"<p style=\"margin-bottom: 0cm line-height: 100%\"><font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 28pt\"><i><b>R3\n"
+"= 1/ (A/Z<sub>out</sub> &minus 1/R2)</b></i></font></font></p>\n"
+"</body>\n"
+"</html>\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 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=windows-1252"/>
+ <title></title>
+ <meta name="generator" content="LibreOffice 5.0.3.2 (Windows)"/>
+ <meta name="created" content="00:00:00"/>
+ <meta name="changed" content="2016-01-16T13:32:32.474000000"/>
+ <style type="text/css">
+ @page { margin: 2cm }
+ p { margin-bottom: 0.25cm; line-height: 120% }
+ a:link { so-language: zxx }
+ </style>
+</head>
+<body lang="fr-FR" dir="ltr">
+<p style="margin-bottom: 0cm; font-style: normal; font-weight: normal; line-height: 100%">
+<font face="Times New Roman, serif"><font size="6" style="font-size: 22pt"><b>Z</b><sub><b>in</b></sub>
+ desired input impedance in Ω</font></font></p>
+<p style="margin-bottom: 0cm; font-style: normal; font-weight: normal; line-height: 100%">
+<font face="Times New Roman, serif"><font size="6" style="font-size: 22pt"><b>Z</b><sub><b>out</b></sub><sub>
+ </sub> desired output impedance in Ω</font></font></p>
+<p style="margin-bottom: 0cm; font-style: normal; font-weight: normal; line-height: 100%">
+<font face="Times New Roman, serif"><font size="6" style="font-size: 22pt">a
+ attenuation in dB</font></font></p>
+<p style="margin-bottom: 0cm; font-style: normal; font-weight: normal; line-height: 100%">
+<font face="Times New Roman, serif"><font size="6" style="font-size: 22pt">L
+= 10<sup>a/10</sup> (the loss)</font></font></p>
+<p style="margin-bottom: 0cm; font-style: normal; font-weight: normal; line-height: 100%">
+<font face="Times New Roman, serif"><font size="6" style="font-size: 22pt">A
+= (L + 1)/(L − 1)</font></font></p>
+<p style="margin-bottom: 0cm; font-style: normal; font-weight: normal; line-height: 100%">
+<br/>
+
+</p>
+<p style="margin-bottom: 0cm; font-style: normal; line-height: 100%"><font face="Times New Roman, serif"><font size="6" style="font-size: 28pt"><b>Pi
+attenuator</b></font></font></p>
+<p style="margin-bottom: 0cm; line-height: 100%"><font face="Times New Roman, serif"><font size="6" style="font-size: 28pt"><i><b>R2
+= (L − 1)/2 * √ ((Z<sub>in</sub> * Z<sub>out</sub>)/L)</b></i></font></font></p>
+<p style="margin-bottom: 0cm; line-height: 100%"><font face="Times New Roman, serif"><font size="6" style="font-size: 28pt"><i><b>R1
+= 1/( A/Z<sub>in</sub> − 1/R2)</b></i></font></font></p>
+<p style="margin-bottom: 0cm; line-height: 100%"><font face="Times New Roman, serif"><font size="6" style="font-size: 28pt"><i><b>R3
+= 1/ (A/Z<sub>out</sub> − 1/R2)</b></i></font></font></p>
+</body>
+</html>
\ 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
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n"
+"<html>\n"
+"<head>\n"
+" <meta http-equiv=\"content-type\" content=\"text/html charset=windows-1252\"/>\n"
+" <title></title>\n"
+" <meta name=\"generator\" content=\"LibreOffice 5.0.3.2 (Windows)\"/>\n"
+" <meta name=\"created\" content=\"00:00:00\"/>\n"
+" <meta name=\"changed\" content=\"2016-01-16T13:35:05.776000000\"/>\n"
+" <meta name=\"created\" content=\"2016-01-16T12:43:25.862000000\">\n"
+" <meta name=\"changed\" content=\"2016-01-16T12:46:35.137000000\">\n"
+" <style type=\"text/css\">\n"
+" @page { margin: 2cm }\n"
+" p { margin-bottom: 0.25cm line-height: 120% }\n"
+" a:link { so-language: zxx }\n"
+" </style>\n"
+"</head>\n"
+"<body lang=\"fr-FR\" dir=\"ltr\">\n"
+"<p style=\"margin-bottom: 0cm line-height: 100%\"><font face=\"Times New Roman, serif\"><font size=\"5\" style=\"font-size: 18pt\">Z<sub>in</sub>\n"
+"desired input impedance in Ω</font></font></p>\n"
+"<p style=\"margin-bottom: 0cm line-height: 100%\"><font face=\"Times New Roman, serif\"><font size=\"5\" style=\"font-size: 18pt\">Z<sub>out</sub>\n"
+"desired output impedance in Ω</font></font></p>\n"
+"<p style=\"margin-bottom: 0cm line-height: 100%\"><font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 28pt\"><i><b>Z<sub>in</sub>\n"
+"= Z<sub>out</sub></b></i></font></font></p>\n"
+"<p style=\"margin-bottom: 0cm line-height: 100%\"><br/>\n"
+"</p>\n"
+"<p style=\"margin-bottom: 0cm line-height: 100%\"><font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 22pt\"><b>Attenuation\n"
+"is 6dB</b></font></font></p>\n"
+"<p style=\"margin-bottom: 0cm line-height: 100%\"><br/>\n"
+"</p>\n"
+"<p style=\"margin-bottom: 0cm line-height: 100%\"><font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 28pt\"><b>Splitted\n"
+"attenuator</b></font></font></p>\n"
+"<p style=\"margin-bottom: 0cm line-height: 100%\"><font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 28pt\"><i><b>R1\n"
+"= R2 = R3 = Z<sub>out</sub>/3</b></i></font></font></p>\n"
+"</body>\n"
+"</html>\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 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=windows-1252"/>
+ <title></title>
+ <meta name="generator" content="LibreOffice 5.0.3.2 (Windows)"/>
+ <meta name="created" content="00:00:00"/>
+ <meta name="changed" content="2016-01-16T13:35:05.776000000"/>
+ <meta name="created" content="2016-01-16T12:43:25.862000000">
+ <meta name="changed" content="2016-01-16T12:46:35.137000000">
+ <style type="text/css">
+ @page { margin: 2cm }
+ p { margin-bottom: 0.25cm; line-height: 120% }
+ a:link { so-language: zxx }
+ </style>
+</head>
+<body lang="fr-FR" dir="ltr">
+<p style="margin-bottom: 0cm; line-height: 100%"><font face="Times New Roman, serif"><font size="5" style="font-size: 18pt">Z<sub>in</sub>
+desired input impedance in Ω</font></font></p>
+<p style="margin-bottom: 0cm; line-height: 100%"><font face="Times New Roman, serif"><font size="5" style="font-size: 18pt">Z<sub>out</sub>
+desired output impedance in Ω</font></font></p>
+<p style="margin-bottom: 0cm; line-height: 100%"><font face="Times New Roman, serif"><font size="6" style="font-size: 28pt"><i><b>Z<sub>in</sub>
+= Z<sub>out</sub></b></i></font></font></p>
+<p style="margin-bottom: 0cm; line-height: 100%"><br/>
+
+</p>
+<p style="margin-bottom: 0cm; line-height: 100%"><font face="Times New Roman, serif"><font size="6" style="font-size: 22pt"><b>Attenuation
+is 6dB</b></font></font></p>
+<p style="margin-bottom: 0cm; line-height: 100%"><br/>
+
+</p>
+<p style="margin-bottom: 0cm; line-height: 100%"><font face="Times New Roman, serif"><font size="6" style="font-size: 28pt"><b>Splitted
+attenuator</b></font></font></p>
+<p style="margin-bottom: 0cm; line-height: 100%"><font face="Times New Roman, serif"><font size="6" style="font-size: 28pt"><i><b>R1
+= R2 = R3 = Z<sub>out</sub>/3</b></i></font></font></p>
+</body>
+</html>
\ 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
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n"
+"<html>\n"
+"<head>\n"
+" <meta http-equiv=\"content-type\" content=\"text/html charset=windows-1252\"/>\n"
+" <title></title>\n"
+" <meta name=\"generator\" content=\"LibreOffice 5.0.3.2 (Windows)\"/>\n"
+" <meta name=\"created\" content=\"00:00:00\"/>\n"
+" <meta name=\"changed\" content=\"2016-01-16T13:25:20.291000000\"/>\n"
+" <style type=\"text/css\">\n"
+" @page { margin: 2cm }\n"
+" p { margin-bottom: 0.25cm line-height: 120% }\n"
+" a:link { so-language: zxx }\n"
+" </style>\n"
+"</head>\n"
+"<body lang=\"fr-FR\" dir=\"ltr\">\n"
+"<p style=\"margin-bottom: 0cm font-style: normal font-weight: normal line-height: 100%\">\n"
+"<font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 22pt\">Z<sub>in</sub>\n"
+"desired input impedance in Ω</font></font></p>\n"
+"<p style=\"margin-bottom: 0cm font-style: normal font-weight: normal line-height: 100%\">\n"
+"<font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 22pt\">Z<sub>out</sub>\n"
+"desired output impedance in Ω</font></font></p>\n"
+"<p style=\"margin-bottom: 0cm font-style: normal font-weight: normal line-height: 100%\">\n"
+"<font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 22pt\">a\n"
+"attenuation in dB</font></font></p>\n"
+"<p style=\"margin-bottom: 0cm font-weight: normal line-height: 100%\">\n"
+"<font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 22pt\"><i>L\n"
+"= 10 <sup>a/10</sup> (the loss)</i></font></font></p>\n"
+"<p style=\"margin-bottom: 0cm font-weight: normal line-height: 100%\">\n"
+"<font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 22pt\"><i>A\n"
+"= (L + 1)/(L &minus 1)</i></font></font></p>\n"
+"<p style=\"margin-bottom: 0cm font-weight: normal line-height: 100%\">\n"
+"<br/>\n"
+"</p>\n"
+"<p style=\"margin-bottom: 0cm font-style: normal line-height: 100%\"><font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 28pt\"><b>Tee\n"
+"attenuator</b></font></font></p>\n"
+"<p style=\"margin-left: 2cm margin-bottom: 0cm font-weight: normal line-height: 100%\">\n"
+"<font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 28pt\"><i>R2\n"
+"= 2*&radic (L * Z<sub>in</sub> * Z<sub>out</sub> )/(L &minus 1)</i></font></font></p>\n"
+"<p style=\"margin-left: 2cm margin-bottom: 0cm font-weight: normal line-height: 100%\">\n"
+"<font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 28pt\"><i>R1\n"
+"= Z<sub>in</sub> * A &minus R2</i></font></font></p>\n"
+"<p style=\"margin-left: 2cm margin-bottom: 0cm font-weight: normal line-height: 100%\">\n"
+"<font face=\"Times New Roman, serif\"><font size=\"6\" style=\"font-size: 28pt\"><i>R3\n"
+"= Z<sub>out</sub> * A &minus R2</i></font></font></p>\n"
+"</body>\n"
+"</html>\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 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=windows-1252"/>
+ <title></title>
+ <meta name="generator" content="LibreOffice 5.0.3.2 (Windows)"/>
+ <meta name="created" content="00:00:00"/>
+ <meta name="changed" content="2016-01-16T13:25:20.291000000"/>
+ <style type="text/css">
+ @page { margin: 2cm }
+ p { margin-bottom: 0.25cm; line-height: 120% }
+ a:link { so-language: zxx }
+ </style>
+</head>
+<body lang="fr-FR" dir="ltr">
+<p style="margin-bottom: 0cm; font-style: normal; font-weight: normal; line-height: 100%">
+<font face="Times New Roman, serif"><font size="6" style="font-size: 22pt">Z<sub>in</sub>
+desired input impedance in Ω</font></font></p>
+<p style="margin-bottom: 0cm; font-style: normal; font-weight: normal; line-height: 100%">
+<font face="Times New Roman, serif"><font size="6" style="font-size: 22pt">Z<sub>out</sub>
+desired output impedance in Ω</font></font></p>
+<p style="margin-bottom: 0cm; font-style: normal; font-weight: normal; line-height: 100%">
+<font face="Times New Roman, serif"><font size="6" style="font-size: 22pt">a
+attenuation in dB</font></font></p>
+<p style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
+<font face="Times New Roman, serif"><font size="6" style="font-size: 22pt"><i>L
+= 10 <sup>a/10</sup> (the loss)</i></font></font></p>
+<p style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
+<font face="Times New Roman, serif"><font size="6" style="font-size: 22pt"><i>A
+= (L + 1)/(L − 1)</i></font></font></p>
+<p style="margin-bottom: 0cm; font-weight: normal; line-height: 100%">
+<br/>
+
+</p>
+<p style="margin-bottom: 0cm; font-style: normal; line-height: 100%"><font face="Times New Roman, serif"><font size="6" style="font-size: 28pt"><b>Tee
+attenuator</b></font></font></p>
+<p style="margin-left: 2cm; margin-bottom: 0cm; font-weight: normal; line-height: 100%">
+<font face="Times New Roman, serif"><font size="6" style="font-size: 28pt"><i>R2
+= 2*√ (L * Z<sub>in</sub> * Z<sub>out</sub> )/(L − 1)</i></font></font></p>
+<p style="margin-left: 2cm; margin-bottom: 0cm; font-weight: normal; line-height: 100%">
+<font face="Times New Roman, serif"><font size="6" style="font-size: 28pt"><i>R1
+= Z<sub>in</sub> * A − R2</i></font></font></p>
+<p style="margin-left: 2cm; margin-bottom: 0cm; font-weight: normal; line-height: 100%">
+<font face="Times New Roman, serif"><font size="6" style="font-size: 28pt"><i>R3
+= Z<sub>out</sub> * A − R2</i></font></font></p>
+</body>
+</html>
\ 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 bdddbe4050..0000000000
Binary files a/pcb_calculator/bitmaps/sources/attenuator/bridged_tee_formula.png and /dev/null differ
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 a7ca12ac5e..0000000000
Binary files a/pcb_calculator/bitmaps/sources/attenuator/splitter_formula.png and /dev/null differ
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 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
- <FileVersion major="1" minor="11" />
+ <FileVersion major="1" minor="13" />
<object class="Project" expanded="1">
<property name="class_decoration"></property>
<property name="code_generation">C++</property>
@@ -20,67 +20,35 @@
<property name="path">.</property>
<property name="precompiled_header"></property>
<property name="relative_path">1</property>
+ <property name="skip_lua_events">1</property>
<property name="skip_php_events">1</property>
<property name="skip_python_events">1</property>
+ <property name="ui_table">UI</property>
<property name="use_enum">0</property>
<property name="use_microsoft_bom">0</property>
<object class="Dialog" expanded="1">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_layer"></property>
<property name="aui_managed">0</property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
+ <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
<property name="center">wxBOTH</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
<property name="enabled">1</property>
<property name="event_handler">impl_virtual</property>
<property name="extra_style"></property>
<property name="fg"></property>
- <property name="floatable">1</property>
<property name="font"></property>
- <property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
<property name="maximum_size"></property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
<property name="minimum_size"></property>
- <property name="moveable">1</property>
<property name="name">DIALOG_EDITOR_DATA_BASE</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="pin_button">1</property>
<property name="pos"></property>
- <property name="resize">Resizable</property>
- <property name="show">1</property>
- <property name="size">310,210</property>
+ <property name="size">292,200</property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">Regulator Parameters</property>
- <property name="toolbar_pane">0</property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@@ -195,10 +163,6 @@
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@@ -383,10 +347,6 @@
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@@ -561,10 +521,6 @@
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@@ -648,10 +604,6 @@
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@@ -833,10 +785,6 @@
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@@ -1011,10 +959,6 @@
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@@ -1046,6 +990,16 @@
</object>
</object>
</object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxEXPAND</property>
+ <property name="proportion">1</property>
+ <object class="spacer" expanded="1">
+ <property name="height">0</property>
+ <property name="permission">protected</property>
+ <property name="width">0</property>
+ </object>
+ </object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND | wxALL</property>
@@ -1099,10 +1053,6 @@
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@@ -1133,7 +1083,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
- <property name="flag">wxEXPAND</property>
+ <property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxStdDialogButtonSizer" expanded="1">
<property name="Apply">0</property>
@@ -1148,7 +1098,7 @@
<property name="name">m_sdbSizerButtons</property>
<property name="permission">protected</property>
<event name="OnApplyButtonClick"></event>
- <event name="OnCancelButtonClick">OnCancelClick</event>
+ <event name="OnCancelButtonClick"></event>
<event name="OnContextHelpButtonClick"></event>
<event name="OnHelpButtonClick"></event>
<event name="OnNoButtonClick"></event>
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 <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
+class DIALOG_SHIM;
+
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/stattext.h>
@@ -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 @@
<object class="notebookpage" expanded="1">
<property name="bitmap"></property>
<property name="label">Track Width</property>
- <property name="select">1</property>
+ <property name="select">0</property>
<object class="wxPanel" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
@@ -15262,7 +15262,7 @@
<object class="notebookpage" expanded="1">
<property name="bitmap"></property>
<property name="label">RF Attenuators</property>
- <property name="select">0</property>
+ <property name="select">1</property>
<object class="wxPanel" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
@@ -17506,11 +17506,11 @@
<property name="parent">1</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
- <object class="sizeritem" expanded="0">
+ <object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property>
- <object class="wxPanel" expanded="0">
+ <object class="wxHtmlWindow" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@@ -17543,7 +17543,7 @@
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
- <property name="minimum_size">200,-1</property>
+ <property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_panelAttFormula</property>
<property name="pane_border">1</property>
@@ -17554,16 +17554,20 @@
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size">-1,-1</property>
+ <property name="size"></property>
+ <property name="style">wxHW_SCROLLBAR_AUTO</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
- <property name="window_style">wxSIMPLE_BORDER|wxTAB_TRAVERSAL</property>
+ <property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
+ <event name="OnHtmlCellClicked"></event>
+ <event name="OnHtmlCellHover"></event>
+ <event name="OnHtmlLinkClicked"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
@@ -17577,7 +17581,7 @@
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
- <event name="OnPaint">OnPaintAttFormulaPanel</event>
+ <event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
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(),