From 2dd53b6a43a2e12857723f2e67c23a568005492b Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:40:57 +0200
Subject: [PATCH 001/197] spice wip

---
 CMakeLists.txt                                |  11 +-
 eeschema/CMakeLists.txt                       |  17 +-
 eeschema/eeschema_id.h                        |   6 +-
 eeschema/menubar.cpp                          |  20 ++
 .../netlist_exporter_pspice.cpp               | 210 ++++++++----------
 .../netlist_exporter_pspice.h                 |   3 +
 eeschema/schframe.cpp                         |   4 +-
 eeschema/schframe.h                           |   3 +
 8 files changed, 149 insertions(+), 125 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ac2a10491..67964436db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,7 @@ endif()
 
 option( BUILD_GITHUB_PLUGIN "Build the GITHUB_PLUGIN for pcbnew." ON )
 
+option( KICAD_SPICE "Build Kicad with internal Spice simulator." OFF )
 
 # This can be set to a custom name to brag about a particular branch in the "About" dialog:
 set( KICAD_REPO_NAME "product" CACHE STRING "Name of the tree from which this build came." )
@@ -98,7 +99,7 @@ endif()
 
 
 # Add option to add user directories for linker, if any
-LINK_DIRECTORIES( ${LINK_DIRECTORIES_PATH} )
+LINK_DIRECTORIES( ${LINK_DIRECTORIES_PATH} /usr/local/lib )
 
 if( UNIX )
     set( KICAD_USER_CONFIG_DIR $ENV{HOME} CACHE PATH "Location of user specific KiCad config files" )
@@ -436,7 +437,9 @@ add_definitions( -DWX_COMPATIBILITY )
 # See line 41 of CMakeModules/FindwxWidgets.cmake
 set( wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --static=no )
 
-find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml stc REQUIRED )
+find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml stc richtext REQUIRED )
+
+
 
 # Include wxWidgets macros.
 include( ${wxWidgets_USE_FILE} )
@@ -517,6 +520,10 @@ set( INC_AFTER
     )
 
 
+#if ( KICAD_SPICE )
+#    find_package(MathGL2 2.3.4 COMPONENTS wx REQUIRED )
+#endif ()
+
 # Find Python and other scripting resources
 if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES )
     # force a python version < 3.0
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 7c871e9934..e5ba974215 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -7,6 +7,7 @@ include_directories(
     ./widgets
     ../common
     ../common/dialogs
+    ./ngspice
     ${INC_AFTER}
     )
 
@@ -175,6 +176,9 @@ set( EESCHEMA_SRCS
     transform.cpp
     viewlib_frame.cpp
     viewlibs.cpp
+    sim/simulate.cpp
+    sim/dialog_simulate_plot.cpp
+    sim/ngspice.cpp
 
     netlist_exporters/netlist_exporter.cpp
     netlist_exporters/netlist_exporter_cadstar.cpp
@@ -241,12 +245,19 @@ add_executable( eeschema WIN32 MACOSX_BUNDLE
 set_source_files_properties( ../common/single_top.cpp PROPERTIES
     COMPILE_DEFINITIONS "TOP_FRAME=FRAME_SCH;PGM_DATA_FILE_EXT=\"sch\";BUILD_KIWAY_DLL"
     )
+
+if (KICAD_SPICE)
+    set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} mgl mgl-wx)
+else()
+    set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} )
+endif()
+
 target_link_libraries( eeschema
     #singletop  # replaces common, giving us restrictive control and link warnings.
     # There's way too much crap coming in from common yet.
     common
     bitmaps
-    ${wxWidgets_LIBRARIES}
+    ${EESCHEMA_LINK_LIBS}
     )
 
 # the DSO (KIFACE) housing the main eeschema code:
@@ -259,9 +270,9 @@ target_link_libraries( eeschema_kiface
     bitmaps
     polygon
     gal
-    ${wxWidgets_LIBRARIES}
+    ${EESCHEMA_LINK_LIBS}
     ${GDI_PLUS_LIBRARIES}
-    )
+)
 set_target_properties( eeschema_kiface PROPERTIES
     # Decorate OUTPUT_NAME with PREFIX and SUFFIX, creating something like
     # _eeschema.so, _eeschema.dll, or _eeschema.kiface
diff --git a/eeschema/eeschema_id.h b/eeschema/eeschema_id.h
index 683e476290..de486b3b71 100644
--- a/eeschema/eeschema_id.h
+++ b/eeschema/eeschema_id.h
@@ -254,7 +254,11 @@ enum id_eeschema_frm
     ID_END_EESCHEMA_ID_LIST,
 
     ID_UPDATE_PCB_FROM_SCH,
-    ID_UPDATE_SCH_FROM_PCB
+    ID_UPDATE_SCH_FROM_PCB,
+
+    ID_SIM_RUN,
+    ID_SIM_STOP,
+    ID_SIM_ADD_PROBE
 };
 
 
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index 162c4cd4a0..480f9da1f4 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -422,6 +422,25 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
                  _( "Import and export settings" ),
                  KiBitmap( save_setup_xpm ) );
 
+
+    wxMenu* simMenu = new wxMenu;
+
+    AddMenuItem( simMenu,
+                 ID_SIM_RUN,
+                 _("Run simulation"), _( "Run simulation" ),
+                 KiBitmap( pcbnew_xpm ) );
+
+    AddMenuItem( simMenu,
+                  ID_SIM_STOP,
+                  _( "Stop simulation" ), _( "Stop simulation" ),
+                  KiBitmap( pcbnew_xpm ) );
+
+    AddMenuItem( simMenu,
+                ID_SIM_ADD_PROBE,
+                _( "Add probe" ), _( "Add probe" ),
+                KiBitmap( pcbnew_xpm ) );
+
+
     // Menu Tools:
     wxMenu* toolsMenu = new wxMenu;
 
@@ -526,6 +545,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
     menuBar->Append( viewMenu, _( "&View" ) );
     menuBar->Append( placeMenu, _( "&Place" ) );
     menuBar->Append( preferencesMenu, _( "P&references" ) );
+    menuBar->Append( simMenu, _( "&Simulate" ) );
     menuBar->Append( toolsMenu, _( "&Tools" ) );
     menuBar->Append( helpMenu, _( "&Help" ) );
 
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 3de6f3cb52..0adbaeba16 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -27,6 +27,8 @@
 #include <build_version.h>
 #include <confirm.h>
 
+#include <map>
+
 #include <schframe.h>
 #include <netlist.h>
 #include <sch_reference_list.h>
@@ -36,9 +38,13 @@
 
 bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions )
 {
-    FILE* f = NULL;
-    bool aUsePrefix = aNetlistOptions & NET_USE_X_PREFIX;
-    bool aUseNetcodeAsNetName = aNetlistOptions & NET_USE_NETCODES_AS_NETNAMES;
+    return false;
+}
+
+
+bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
+{
+    bool aUsePrefix = aCtl & NET_USE_X_PREFIX;
 
     int                 ret = 0;
     int                 nbitems;
@@ -55,31 +61,23 @@ bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsign
     wxString            delimeters = wxT( "{:,; }" );
     wxString            disableStr = wxT( "N" );
 
-    if( ( f = wxFopen( aOutFileName, wxT( "wt" ) ) ) == NULL )
-    {
-        msg.Printf( _( "Failed to create file '%s'" ),
-                    GetChars( aOutFileName ) );
-        DisplayError( NULL, msg );
-        return false;
-    }
-
-    ret |= fprintf( f, "* %s\n\n", TO_UTF8( aOutFileName ) );
-    ret |= fprintf( f, "* %s (Spice format) creation date: %s\n\n",
-                    NETLIST_HEAD_STRING, TO_UTF8( DateAndTime() ) );
+    std::map<wxString, int> netIndices;
 
     // Prepare list of nets generation (not used here, but...
     for( unsigned ii = 0; ii < m_masterList->size(); ii++ )
         m_masterList->GetItem( ii )->m_Flag = 0;
 
-    ret |= fprintf( f, "* To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N\n" );
-    ret |= fprintf( f, "* To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0\n" );
-
     // Create text list starting by [.-]pspice , or [.-]gnucap (simulator
     // commands) and create text list starting by [+]pspice , or [+]gnucap
     // (simulator commands)
     bufnum[BUFYPOS_LEN] = 0;
     SCH_SHEET_LIST sheetList( g_RootSheet );
 
+    std::vector<wxString> directives;
+    std::vector<wxString> probeNets;
+
+    netIndices["GND"] = 0;
+
     for( unsigned i = 0; i < sheetList.size(); i++ )
     {
         for( EDA_ITEM* item = sheetList[i].LastDrawList(); item; item = item->Next() )
@@ -99,72 +97,24 @@ bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsign
 
             ident = text.GetChar( 0 );
 
-            if( ident != '.' && ident != '-' && ident != '+' )
-                continue;
-
-            text.Remove( 0, 1 );    // Remove the first char.
-            text.Remove( 6 );       // text contains 6 char.
-            text.MakeLower();
-
-            if( text != wxT( "pspice" ) && text != wxT( "gnucap" ) )
-                continue;
-
-            text = drawText->GetText().Mid( 7 );
-            l1 = text.Length();
-            text.Trim( false );
-            l2 = text.Length();
-
-            if( l1 == l2 )
-                continue;           // no whitespace after ident text
-
+            if( ident == '.' )
             {
-                // Put the Y position as an ascii string, for sort by vertical
-                // position, using usual sort string by alphabetic value
-                int ypos = drawText->GetPosition().y;
-
-                for( int ii = 0; ii < BUFYPOS_LEN; ii++ )
-                {
-                    bufnum[BUFYPOS_LEN - 1 - ii] = (ypos & 63) + ' ';
-                    ypos >>= 6;
-                }
-
-                // First BUFYPOS_LEN char are the Y position.
-                msg.Printf( wxT( "%s %s" ), bufnum, text.GetData() );
-
-                if( ident == '+' )
-                    spiceCommandAtEndFile.Add( msg );
-                else
-                    spiceCommandAtBeginFile.Add( msg );
+                    printf("Directive found: '%s'\n", (const char *) text.c_str());
+                    directives.push_back(text);
             }
         }
     }
 
-    // Print texts starting by [.-]pspice , ou [.-]gnucap (of course, without
-    // the Y position string)
-    nbitems = spiceCommandAtBeginFile.GetCount();
-
-    if( nbitems )
-    {
-        spiceCommandAtBeginFile.Sort();
-
-        for( int ii = 0; ii < nbitems; ii++ )
-        {
-            spiceCommandAtBeginFile[ii].Remove( 0, BUFYPOS_LEN );
-            spiceCommandAtBeginFile[ii].Trim( true );
-            spiceCommandAtBeginFile[ii].Trim( false );
-            ret |= fprintf( f, "%s\n", TO_UTF8( spiceCommandAtBeginFile[ii] ) );
-        }
-    }
-    ret |= fprintf( f, "\n" );
-
-    //  Create component list
 
     m_ReferencesAlreadyFound.Clear();
 
+
+    int curNetIndex = 1;
+
     for( unsigned sheet_idx = 0; sheet_idx < sheetList.size(); sheet_idx++ )
     {
-        ret |= fprintf( f, "* Sheet Name: %s\n",
-                        TO_UTF8( sheetList[sheet_idx].PathHumanReadable() ) );
+        //printf( "* Sheet Name: %s\n",
+        //                TO_UTF8( sheetList[sheet_idx].PathHumanReadable() ) );
 
         for( EDA_ITEM* item = sheetList[sheet_idx].LastDrawList(); item; item = item->Next() )
         {
@@ -178,6 +128,33 @@ bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsign
             // Reset NodeSeqIndex Count:
             pinSequence.clear();
 
+            SCH_FIELD*   spicePrimitiveType = comp->FindField( wxT( "Spice_Primitive" ) );
+            SCH_FIELD*   spiceModel = comp->FindField( wxT( "Spice_Model" ) );
+
+            wxString RefName = comp->GetRef( &sheetList[sheet_idx] );
+            wxString CompValue = comp->GetField( VALUE )->GetText();
+
+            wxString model("");
+            wxString primType ("X");
+
+            if(spicePrimitiveType)
+                primType = spicePrimitiveType->GetText();
+            else {
+                if (RefName.StartsWith(wxT("IC")) || RefName.StartsWith("U") )
+                    primType = wxT("X"); // subckt
+                else
+                    primType = RefName.GetChar(0);
+            }
+
+            if(spiceModel)
+            {
+            //    printf("model specified\n");
+                model = spiceModel->GetText();
+            } else {
+            //    printf("no model\n");
+                model = CompValue;
+            }
+
             // Check to see if component should be removed from Spice Netlist:
             SCH_FIELD*  netlistEnabledField = comp->FindField( wxT( "Spice_Netlist_Enabled" ) );
 
@@ -234,21 +211,30 @@ bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsign
                 }
             }
 
-            //Get Standard Reference Designator:
-            wxString RefName = comp->GetRef( &sheetList[sheet_idx] );
+
+            if(CompValue == wxT("SPICE_PROBE"))
+            {
+                NETLIST_OBJECT* pin = m_SortedComponentPinList[0];
+
+                printf("Probe net: %s\n", (const char*) pin->GetNetName().c_str() );
+
+                probeNets.push_back(pin->GetNetName());
+                continue;
+            }
 
             //Conditionally add Prefix only for devices that begin with U or IC:
             if( aUsePrefix )
             {
-                if( RefName.StartsWith( wxT( "U" ) ) || RefName.StartsWith( wxT( "IC" ) ) )
-                    RefName = wxT( "X" ) + RefName;
+                //if( RefName.StartsWith( wxT( "U" ) ) || RefName.StartsWith( wxT( "IC" ) ) )
+                //    RefName = wxT( "X" ) + RefName;
             }
 
-            ret |= fprintf( f, "%s ", TO_UTF8( RefName ) );
+            printf( "Ref %s primType %s model/value '%s'\n", TO_UTF8( RefName ), (const char*)primType.c_str(), (const char *)model.c_str() );
 
-            // Write pin list:
             int activePinIndex = 0;
 
+            formatter->Print(0, "%s%s ", (const char *)primType.c_str(), (const char *)RefName.c_str());
+
             for( unsigned ii = 0; ii < m_SortedComponentPinList.size(); ii++ )
             {
                 // Case of Alt Sequence definition with Unused/Invalid Node index:
@@ -282,56 +268,41 @@ bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsign
                 if( !pin )
                     continue;
 
-                sprintPinNetName( netName , wxT( "N-%.6d" ), pin, aUseNetcodeAsNetName );
+                wxString netName = pin->GetNetName();
+                int netIdx;
+
+                if (netIndices.find(netName) == netIndices.end())
+                {
+                    netIdx = curNetIndex++;
+                    netIndices[netName] = netIdx;
+                } else {
+                    netIdx = netIndices[netName];
+                }
+
+                //printf("net %s index %d\n", (const char*)netName.c_str(), netIdx);
+//                sprintPinNetName( netName , wxT( "N-%.6d" ), pin, aUseNetcodeAsNetName );
 
                 //Replace parenthesis with underscore to prevent parse issues with Simulators:
-                netName.Replace( wxT( "(" ), wxT( "_" ) );
-                netName.Replace( wxT( ")" ), wxT( "_" ) );
+//                netName.Replace( wxT( "(" ), wxT( "_" ) );
+//                netName.Replace( wxT( ")" ), wxT( "_" ) );
 
-                if( netName.IsEmpty() )
-                    netName = wxT( "?" );
+//                if( netName.IsEmpty() )
+//                    netName = wxT( "?" );
 
-                ret |= fprintf( f, " %s", TO_UTF8( netName ) );
+//                ret |= fprintf( f, " %s", TO_UTF8( netName ) );
+
+                formatter->Print(0, "%d ", netIdx );
             }
 
-            // Get Component Value Name:
-            wxString CompValue = comp->GetField( VALUE )->GetText();
+            formatter->Print(0, "%s\n",(const char *) model.c_str());
 
-            // Check if Override Model Name is Provided:
-            SCH_FIELD* spiceModelField = comp->FindField( wxT( "spice_model" ) );
 
-            if( spiceModelField )
-            {
-                // Get Model Name String:
-                wxString ModelNameStr = spiceModelField->GetText();
-
-                // Verify Field Exists and is not empty:
-                if( !ModelNameStr.IsEmpty() )
-                    CompValue = ModelNameStr;
-            }
-
-            // Print Component Value:
-            ret |= fprintf( f, " %s\t\t",TO_UTF8( CompValue ) );
-
-            // Show Seq Spec on same line as component using line-comment ";":
-            for( unsigned ii = 0; ii < pinSequence.size(); ++ii )
-            {
-                if( ii == 0 )
-                    ret |= fprintf( f, ";Node Sequence Spec.<" );
-
-                ret |= fprintf( f, "%s", TO_UTF8( stdPinNameArray.Item( pinSequence[ii] ) ) );
-
-                if( ii < pinSequence.size()-1 )
-                    ret |= fprintf( f, "," );
-                else
-                    ret |= fprintf( f, ">" );
-            }
-
-            // Next Netlist line record:
-            ret |= fprintf( f, "\n" );
         }
+
+
     }
 
+#if 0
     m_SortedComponentPinList.clear();
 
     // Print texts starting with [+]pspice or [+]gnucap
@@ -354,5 +325,8 @@ bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsign
     ret |= fprintf( f, "\n.end\n" );
     fclose( f );
 
+#endif
+
+
     return ret >= 0;
 }
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index c57938f69b..959a176c59 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -45,6 +45,9 @@ public:
      * writes to specified output file
      */
     bool WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions );
+
+    bool Format( OUTPUTFORMATTER* aOutputFormatter, int aCtl );
+
 };
 
 #endif
diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp
index 9cca131108..079d2c0654 100644
--- a/eeschema/schframe.cpp
+++ b/eeschema/schframe.cpp
@@ -264,6 +264,9 @@ BEGIN_EVENT_TABLE( SCH_EDIT_FRAME, EDA_DRAW_FRAME )
     EVT_TOOL( ID_GET_ERC, SCH_EDIT_FRAME::OnErc )
     EVT_TOOL( ID_GET_NETLIST, SCH_EDIT_FRAME::OnCreateNetlist )
     EVT_TOOL( ID_UPDATE_PCB_FROM_SCH, SCH_EDIT_FRAME::OnUpdatePCB )
+    EVT_TOOL( ID_SIM_RUN, SCH_EDIT_FRAME::OnSimulationRun )
+    EVT_TOOL( ID_SIM_STOP, SCH_EDIT_FRAME::OnSimulationStop )
+    EVT_TOOL( ID_SIM_ADD_PROBE, SCH_EDIT_FRAME::OnSimulationAddProbe )
     EVT_TOOL( ID_GET_TOOLS, SCH_EDIT_FRAME::OnCreateBillOfMaterials )
     EVT_TOOL( ID_FIND_ITEMS, SCH_EDIT_FRAME::OnFindItems )
     EVT_TOOL( wxID_REPLACE, SCH_EDIT_FRAME::OnFindItems )
@@ -1371,4 +1374,3 @@ void SCH_EDIT_FRAME::UpdateTitle()
 
     SetTitle( title );
 }
-
diff --git a/eeschema/schframe.h b/eeschema/schframe.h
index 9f87accc2a..0cac05e445 100644
--- a/eeschema/schframe.h
+++ b/eeschema/schframe.h
@@ -813,6 +813,9 @@ private:
     void OnErc( wxCommandEvent& event );
     void OnCreateNetlist( wxCommandEvent& event );
     void OnUpdatePCB( wxCommandEvent& event );
+    void OnSimulationRun( wxCommandEvent& event );
+    void OnSimulationStop( wxCommandEvent& event );
+    void OnSimulationAddProbe( wxCommandEvent& event );
     void OnCreateBillOfMaterials( wxCommandEvent& event );
     void OnFindItems( wxCommandEvent& event );
     void OnFindDialogClose( wxFindDialogEvent& event );

From f1f69979e69186d3a72ab7917d9b458282e0f9c5 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:01 +0200
Subject: [PATCH 002/197] ngspice: something starts to work

---
 common/kiway.cpp                              |   2 +
 eeschema/CMakeLists.txt                       |  12 +-
 eeschema/diodes.lib                           |   6 +
 eeschema/eeschema.cpp                         |  10 +-
 .../netlist_exporter_pspice.cpp               |  27 +-
 .../netlist_exporter_pspice.h                 |  20 ++
 eeschema/ngspice/sharedspice.h                | 328 ++++++++++++++++++
 eeschema/noname.sch                           | 197 +++++++++++
 eeschema/sim/ngspice.cpp                      | 252 ++++++++++++++
 eeschema/sim/ngspice.h                        |  20 ++
 eeschema/sim/sim_plot_frame.cpp               | 130 +++++++
 eeschema/sim/sim_plot_frame.h                 |  43 +++
 eeschema/sim/sim_plot_frame_base.cpp          |  76 ++++
 eeschema/sim/sim_plot_frame_base.h            |  67 ++++
 eeschema/sim/sim_plot_panel.cpp               |  75 ++++
 eeschema/sim/sim_plot_panel.h                 |  34 ++
 eeschema/sim/simulate.cpp                     |  79 +++++
 eeschema/sim/simulate.h                       |  11 +
 eeschema/sim/spice_simulator.h                |  44 +++
 include/frame_type.h                          |   3 +-
 20 files changed, 1421 insertions(+), 15 deletions(-)
 create mode 100644 eeschema/diodes.lib
 create mode 100644 eeschema/ngspice/sharedspice.h
 create mode 100644 eeschema/noname.sch
 create mode 100644 eeschema/sim/ngspice.cpp
 create mode 100644 eeschema/sim/ngspice.h
 create mode 100644 eeschema/sim/sim_plot_frame.cpp
 create mode 100644 eeschema/sim/sim_plot_frame.h
 create mode 100644 eeschema/sim/sim_plot_frame_base.cpp
 create mode 100644 eeschema/sim/sim_plot_frame_base.h
 create mode 100644 eeschema/sim/sim_plot_panel.cpp
 create mode 100644 eeschema/sim/sim_plot_panel.h
 create mode 100644 eeschema/sim/simulate.cpp
 create mode 100644 eeschema/sim/simulate.h
 create mode 100644 eeschema/sim/spice_simulator.h

diff --git a/common/kiway.cpp b/common/kiway.cpp
index dcfdaa14e3..f7b240542e 100644
--- a/common/kiway.cpp
+++ b/common/kiway.cpp
@@ -247,6 +247,7 @@ KIWAY::FACE_T KIWAY::KifaceType( FRAME_T aFrameType )
     case FRAME_SCH_LIB_EDITOR:
     case FRAME_SCH_VIEWER:
     case FRAME_SCH_VIEWER_MODAL:
+    case FRAME_SIMULATOR:
         return FACE_SCH;
 
     case FRAME_PCB:
@@ -301,6 +302,7 @@ KIWAY_PLAYER* KIWAY::Player( FRAME_T aFrameType, bool doCreate, KIWAY_PLAYER* aP
         return NULL;
     }
 
+    printf("Player %d\n", aFrameType);
     // return the previously opened window
     KIWAY_PLAYER* frame = GetPlayerFrame( aFrameType );
 
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index e5ba974215..523bea3f00 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -177,7 +177,9 @@ set( EESCHEMA_SRCS
     viewlib_frame.cpp
     viewlibs.cpp
     sim/simulate.cpp
-    sim/dialog_simulate_plot.cpp
+    sim/sim_plot_frame_base.cpp
+    sim/sim_plot_frame.cpp
+    sim/sim_plot_panel.cpp
     sim/ngspice.cpp
 
     netlist_exporters/netlist_exporter.cpp
@@ -246,11 +248,11 @@ set_source_files_properties( ../common/single_top.cpp PROPERTIES
     COMPILE_DEFINITIONS "TOP_FRAME=FRAME_SCH;PGM_DATA_FILE_EXT=\"sch\";BUILD_KIWAY_DLL"
     )
 
-if (KICAD_SPICE)
+#if (KICAD_SPICE)
     set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} mgl mgl-wx)
-else()
-    set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} )
-endif()
+#else()
+#    set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} )
+#endif()
 
 target_link_libraries( eeschema
     #singletop  # replaces common, giving us restrictive control and link warnings.
diff --git a/eeschema/diodes.lib b/eeschema/diodes.lib
new file mode 100644
index 0000000000..3f277af53f
--- /dev/null
+++ b/eeschema/diodes.lib
@@ -0,0 +1,6 @@
+* Copyright © 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Linear Technology Corporation.   All rights reserved.
+*
+* Mike Engelhardt
+*
+.model 1N914 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75)
+.model 1N4148 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75)
\ No newline at end of file
diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp
index 1c7703929b..208a49dd52 100644
--- a/eeschema/eeschema.cpp
+++ b/eeschema/eeschema.cpp
@@ -46,6 +46,7 @@
 #include <wildcards_and_files_ext.h>
 
 #include <kiway.h>
+#include <sim/sim_plot_frame.h>
 
 // The main sheet of the project
 SCH_SHEET*  g_RootSheet = NULL;
@@ -70,6 +71,8 @@ static struct IFACE : public KIFACE_I
 
     wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 )
     {
+        printf("Create class %d\n", aClassId);
+
         switch( aClassId )
         {
         case FRAME_SCH:
@@ -92,6 +95,12 @@ static struct IFACE : public KIFACE_I
             }
             break;
 
+        case FRAME_SIMULATOR:
+            {
+                SIM_PLOT_FRAME_BASE* frame = new SIM_PLOT_FRAME( aKiway, aParent );
+                return frame;
+            }
+            break;
 
         case FRAME_SCH_VIEWER:
         case FRAME_SCH_VIEWER_MODAL:
@@ -238,4 +247,3 @@ void IFACE::OnKifaceEnd()
     wxConfigSaveSetups( KifaceSettings(), cfg_params() );
     end_common();
 }
-
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 0adbaeba16..72766d451a 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -61,7 +61,7 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
     wxString            delimeters = wxT( "{:,; }" );
     wxString            disableStr = wxT( "N" );
 
-    std::map<wxString, int> netIndices;
+    //std::map<wxString, int> netIndices;
 
     // Prepare list of nets generation (not used here, but...
     for( unsigned ii = 0; ii < m_masterList->size(); ii++ )
@@ -74,9 +74,12 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
     SCH_SHEET_LIST sheetList( g_RootSheet );
 
     std::vector<wxString> directives;
-    std::vector<wxString> probeNets;
 
-    netIndices["GND"] = 0;
+    formatter->Print(0, "Kicad schematic\n");
+
+    m_probes.clear();
+    m_netMap.clear();
+    m_netMap["GND"] = 0;
 
     for( unsigned i = 0; i < sheetList.size(); i++ )
     {
@@ -216,9 +219,9 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
             {
                 NETLIST_OBJECT* pin = m_SortedComponentPinList[0];
 
-                printf("Probe net: %s\n", (const char*) pin->GetNetName().c_str() );
+                //printf("Probe net: %s\n", (const char*) pin->GetNetName().c_str() );
 
-                probeNets.push_back(pin->GetNetName());
+                m_probes.push_back(pin->GetNetName());
                 continue;
             }
 
@@ -271,12 +274,12 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
                 wxString netName = pin->GetNetName();
                 int netIdx;
 
-                if (netIndices.find(netName) == netIndices.end())
+                if (m_netMap.find(netName) == m_netMap.end())
                 {
                     netIdx = curNetIndex++;
-                    netIndices[netName] = netIdx;
+                    m_netMap[netName] = netIdx;
                 } else {
-                    netIdx = netIndices[netName];
+                    netIdx = m_netMap[netName];
                 }
 
                 //printf("net %s index %d\n", (const char*)netName.c_str(), netIdx);
@@ -302,6 +305,14 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
 
     }
 
+    for( auto dir : directives )
+    {
+        formatter->Print(0, "%s\n", (const char *)dir.c_str());
+
+    }
+
+    formatter->Print(0, ".end\n");
+
 #if 0
     m_SortedComponentPinList.clear();
 
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index 959a176c59..1d2fb59f7c 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -27,6 +27,7 @@
 #define NETLIST_EXPORTER_PSPICE_H
 
 #include "netlist_exporter.h"
+#include <map>
 
 /**
  * Class NETLIST_EXPORTER_PSPICE
@@ -40,6 +41,9 @@ public:
     {
     }
 
+    typedef std::map<wxString, int> NetIndexMap;
+    typedef std::vector<wxString> ProbeList;
+
     /**
      * Function WriteNetlist
      * writes to specified output file
@@ -48,6 +52,22 @@ public:
 
     bool Format( OUTPUTFORMATTER* aOutputFormatter, int aCtl );
 
+    const NetIndexMap& GetNetIndexMap ( ) const
+    {
+        return m_netMap;
+    }
+
+    const ProbeList& GetProbeList() const
+    {
+        return m_probes;
+    }
+
+
+
+private:
+    NetIndexMap m_netMap;
+    ProbeList m_probes;
+
 };
 
 #endif
diff --git a/eeschema/ngspice/sharedspice.h b/eeschema/ngspice/sharedspice.h
new file mode 100644
index 0000000000..d0f4711686
--- /dev/null
+++ b/eeschema/ngspice/sharedspice.h
@@ -0,0 +1,328 @@
+/* header file for shared ngspice */
+/* Copyright 2013 Holger Vogt */
+/* Modified BSD license */
+
+/*
+Interface between a calling program (caller) and ngspice.dll (ngspice.so)
+
+**
+ngSpice_Init(SendChar*, SendStat*, ControlledExit*,
+             SendData*, SendInitData*, BGThreadRunning*, void*)
+After caller has loaded ngspice.dll, the simulator has to be initialized
+by calling ngSpice_Init(). Address pointers of several callback functions
+defined in the caller are sent to ngspice.dll.
+
+Callback funtion typedefs
+SendChar       typedef of callback function for reading printf, fprintf, fputs
+SendStat       typedef of callback function for reading status string and precent value
+ControlledExit typedef of callback function for tranferring a signal upon
+               ngspice controlled_exit to caller. May be used by caller
+               to detach ngspice.dll.
+SendData       typedef of callback function for sending an array of structs containing
+               data values of all vectors in the current plot (simulation output)
+SendInitData   typedef of callback function for sending an array of structs containing info on
+               all vectors in the current plot (immediately before simulation starts)
+BGThreadRunning typedef of callback function for sending a boolean signal (true if thread
+                is running)
+
+The void pointer may contain the object address of the calling
+function ('self' or 'this' pointer), so that the answer may be directed
+to a calling object. Callback functions are defined in the global section.
+
+**
+ngSpice_Command(char*)
+Send a valid command (see the control or interactive commands) from caller
+to ngspice.dll. Will be executed immediately (as if in interactive mode).
+Some commands are rejected (e.g. 'plot', because there is no graphics interface).
+Command 'quit' will remove internal data, and then send a notice to caller via
+ngexit().
+
+**
+ngGet_Vec_Info(char*)
+receives the name of a vector (may be in the form 'vectorname' or
+<plotname>.vectorname) and returns a pointer to a vector_info struct.
+The caller may then directly assess the vector data (but probably should
+not modify them).
+
+**
+ngSpice_Circ(char**)
+sends an array of null-terminated char* to ngspice.dll. Each char* contains a
+single line of a circuit (each line like in an input file **.sp). The last
+entry to char** has to be NULL. Upon receiving the arry, ngspice.dll will
+immediately parse the input and set up the circuit structure (as if received
+the circuit from a file by the 'source' command.
+
+**
+char* ngSpice_CurPlot();
+returns to the caller a pointer to the name of the current plot
+
+**
+char** ngSpice_AllPlots()
+returns to the caller a pointer to an array of all plots (by their typename)
+
+**
+char** ngSpice_AllVecs(char*);
+returns to the caller a pointer to an array of vector names in the plot
+named by the string in the argument.
+
+**
+Additional basics:
+No memory mallocing and freeing across the interface:
+Memory allocated in ngspice.dll has to be freed in ngspice.dll.
+Memory allocated in the calling program has to be freed only there.
+
+ngspice.dll should never call exit() directly, but handle either the 'quit'
+request to the caller or an request for exiting upon error,
+done by callback function ngexit().
+*/
+
+#ifndef NGSPICE_DLL_H
+#define NGSPICE_DLL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__CYGWIN__)
+  #ifdef SHARED_MODULE
+    #define IMPEXP __declspec(dllexport)
+  #else
+    #define IMPEXP __declspec(dllimport)
+  #endif
+#else
+  /* use with gcc flag -fvisibility=hidden */
+  #if __GNUC__ >= 4
+    #define IMPEXP __attribute__ ((visibility ("default")))
+    #define IMPEXPLOCAL  __attribute__ ((visibility ("hidden")))
+  #else
+    #define IMPEXP
+    #define IMPEXP_LOCAL
+  #endif
+#endif
+
+/* required only if header is used by the caller,
+   is already defined in ngspice.dll */
+#ifndef ngspice_NGSPICE_H
+/* Complex numbers. */
+struct ngcomplex {
+    double cx_real;
+    double cx_imag;
+} ;
+
+typedef struct ngcomplex ngcomplex_t;
+#endif
+
+/* vector info obtained from any vector in ngspice.dll.
+   Allows direct access to the ngspice internal vector structure,
+   as defined in include/ngspice/devc.h . */
+typedef struct vector_info {
+    char *v_name;		/* Same as so_vname. */
+    int v_type;			/* Same as so_vtype. */
+    short v_flags;		/* Flags (a combination of VF_*). */
+    double *v_realdata;		/* Real data. */
+    ngcomplex_t *v_compdata;	/* Complex data. */
+    int v_length;		/* Length of the vector. */
+} vector_info, *pvector_info;
+
+typedef struct vecvalues {
+    char* name;        /* name of a specific vector */
+    double creal;      /* actual data value */
+    double cimag;      /* actual data value */
+    bool is_scale;     /* if 'name' is the scale vector */
+    bool is_complex;   /* if the data are complex numbers */
+} vecvalues, *pvecvalues;
+
+typedef struct vecvaluesall {
+    int veccount;      /* number of vectors in plot */
+    int vecindex;      /* index of actual set of vectors. i.e. the number of accepted data points */
+    pvecvalues *vecsa; /* values of actual set of vectors, indexed from 0 to veccount - 1 */
+} vecvaluesall, *pvecvaluesall;
+
+/* info for a specific vector */
+typedef struct vecinfo
+{
+    int number;     /* number of vector, as postion in the linked list of vectors, starts with 0 */
+    char *vecname;  /* name of the actual vector */
+    bool is_real;   /* TRUE if the actual vector has real data */
+    void *pdvec;    /* a void pointer to struct dvec *d, the actual vector */
+    void *pdvecscale; /* a void pointer to struct dvec *ds, the scale vector */
+} vecinfo, *pvecinfo;
+
+/* info for the current plot */
+typedef struct vecinfoall
+{
+    /* the plot */
+    char *name;
+    char *title;
+    char *date;
+    char *type;
+    int veccount;
+
+    /* the data as an array of vecinfo with length equal to the number of vectors in the plot */
+    pvecinfo *vecs;
+
+} vecinfoall, *pvecinfoall;
+
+
+/* callback functions
+addresses received from caller with ngSpice_Init() function
+*/
+/* sending output from stdout, stderr to caller */
+typedef int (SendChar)(char*, int, void*);
+/*
+   char* string to be sent to caller output
+   int   identification number of calling ngspice shared lib
+   void* return pointer received from caller, e.g. pointer to object having sent the request
+*/
+/* sending simulation status to caller */
+typedef int (SendStat)(char*, int, void*);
+/*
+   char* simulation status and value (in percent) to be sent to caller
+   int   identification number of calling ngspice shared lib
+   void* return pointer received from caller
+*/
+/* asking for controlled exit */
+typedef int (ControlledExit)(int, bool, bool, int, void*);
+/*
+   int   exit status
+   bool  if true: immediate unloading dll, if false: just set flag, unload is done when function has returned
+   bool  if true: exit upon 'quit', if false: exit due to ngspice.dll error
+   int   identification number of calling ngspice shared lib
+   void* return pointer received from caller
+*/
+/* send back actual vector data */
+typedef int (SendData)(pvecvaluesall, int, int, void*);
+/*
+   vecvaluesall* pointer to array of structs containing actual values from all vectors
+   int           number of structs (one per vector)
+   int           identification number of calling ngspice shared lib
+   void*         return pointer received from caller
+*/
+
+/* send back initailization vector data */
+typedef int (SendInitData)(pvecinfoall, int, void*);
+/*
+   vecinfoall* pointer to array of structs containing data from all vectors right after initialization
+   int         identification number of calling ngspice shared lib
+   void*       return pointer received from caller
+*/
+
+/* indicate if background thread is running */
+typedef int (BGThreadRunning)(bool, int, void*);
+/*
+   bool        true if background thread is running
+   int         identification number of calling ngspice shared lib
+   void*       return pointer received from caller
+*/
+
+/* callback functions
+   addresses received from caller with ngSpice_Init_Sync() function
+*/
+
+/* ask for VSRC EXTERNAL value */
+typedef int (GetVSRCData)(double*, double, char*, int, void*);
+/*
+   double*     return voltage value
+   double      actual time
+   char*       node name
+   int         identification number of calling ngspice shared lib
+   void*       return pointer received from caller
+*/
+
+/* ask for ISRC EXTERNAL value */
+typedef int (GetISRCData)(double*, double, char*, int, void*);
+/*
+   double*     return current value
+   double      actual time
+   char*       node name
+   int         identification number of calling ngspice shared lib
+   void*       return pointer received from caller
+*/
+
+/* ask for new delta time depending on synchronization requirements */
+typedef int (GetSyncData)(double, double*, double, int, int, int, void*);
+/*
+   double      actual time (ckt->CKTtime)
+   double*     delta time (ckt->CKTdelta)
+   double      old delta time (olddelta)
+   int         redostep (as set by ngspice)
+   int         identification number of calling ngspice shared lib
+   int         location of call for synchronization in dctran.c
+   void*       return pointer received from caller
+*/
+
+/* ngspice initialization,
+printfcn: pointer to callback function for reading printf, fprintf
+statfcn: pointer to callback function for the status string and percent value
+ControlledExit: pointer to callback function for setting a 'quit' signal in caller
+SendData: pointer to callback function for returning data values of all current output vectors
+SendInitData: pointer to callback function for returning information of all output vectors just initialized
+BGThreadRunning: pointer to callback function indicating if workrt thread is running
+userData: pointer to user-defined data, will not be modified, but
+          handed over back to caller during Callback, e.g. address of calling object */
+IMPEXP
+int  ngSpice_Init(SendChar* printfcn, SendStat* statfcn, ControlledExit* ngexit,
+                  SendData* sdata, SendInitData* sinitdata, BGThreadRunning* bgtrun, void* userData);
+
+/* initialization of synchronizing functions
+vsrcdat: pointer to callback function for retrieving a voltage source value from caller
+isrcdat: pointer to callback function for retrieving a current source value from caller
+syncdat: pointer to callback function for synchronization
+ident: pointer to integer unique to this shared library (defaults to 0)
+userData: pointer to user-defined data, will not be modified, but
+          handed over back to caller during Callback, e.g. address of calling object.
+          If NULL is sent here, userdata info from ngSpice_Init() will be kept, otherwise
+          userdata will be overridden by new value from here.
+*/
+IMPEXP
+int  ngSpice_Init_Sync(GetVSRCData *vsrcdat, GetISRCData *isrcdat, GetSyncData *syncdat, int *ident, void *userData);
+
+/* Caller may send ngspice commands to ngspice.dll.
+Commands are executed immediately */
+IMPEXP
+int  ngSpice_Command(char* command);
+
+
+/* get info about a vector */
+IMPEXP
+pvector_info ngGet_Vec_Info(char* vecname);
+
+
+/* send a circuit to ngspice.dll
+   The circuit description is a dynamic array
+   of char*. Each char* corresponds to a single circuit
+   line. The last entry of the array has to be a NULL */
+IMPEXP
+int ngSpice_Circ(char** circarray);
+
+
+/* return to the caller a pointer to the name of the current plot */
+IMPEXP
+char* ngSpice_CurPlot(void);
+
+
+/* return to the caller a pointer to an array of all plots created
+so far by ngspice.dll */
+IMPEXP
+char** ngSpice_AllPlots(void);
+
+
+/* return to the caller a pointer to an array of vector names in the plot
+named by plotname */
+IMPEXP
+char** ngSpice_AllVecs(char* plotname);
+
+/* returns TRUE if ngspice is running in a second (background) thread */
+IMPEXP
+bool ngSpice_running(void);
+
+/* set a breakpoint in ngspice */
+IMPEXP
+bool ngSpice_SetBkpt(double time);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/eeschema/noname.sch b/eeschema/noname.sch
new file mode 100644
index 0000000000..d63205268f
--- /dev/null
+++ b/eeschema/noname.sch
@@ -0,0 +1,197 @@
+EESchema Schematic File Version 2
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:pspice
+LIBS:noname-cache
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L VSOURCE V1
+U 1 1 57336052
+P 4400 4050
+F 0 "V1" H 4528 4096 50  0000 L CNN
+F 1 "SINE(0 1.5 1k 0 0 0 0)" H 4528 4005 50  0000 L CNN
+F 2 "" H 4400 4050 50  0000 C CNN
+F 3 "" H 4400 4050 50  0000 C CNN
+F 4 "Value" H 4400 4050 60  0001 C CNN "Fieldname"
+F 5 "V" H 4400 4050 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 4100 4250 60  0001 C CNN "Spice_Node_Sequence"
+	1    4400 4050
+	-1   0    0    1   
+$EndComp
+$Comp
+L GND #PWR1
+U 1 1 573360D3
+P 4400 4350
+F 0 "#PWR1" H 4400 4100 50  0001 C CNN
+F 1 "GND" H 4405 4177 50  0000 C CNN
+F 2 "" H 4400 4350 50  0000 C CNN
+F 3 "" H 4400 4350 50  0000 C CNN
+	1    4400 4350
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R1
+U 1 1 573360F5
+P 4650 3700
+F 0 "R1" V 4443 3700 50  0000 C CNN
+F 1 "1k" V 4534 3700 50  0000 C CNN
+F 2 "" V 4580 3700 50  0000 C CNN
+F 3 "" H 4650 3700 50  0000 C CNN
+F 4 "Value" H 4650 3700 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 4650 3700 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 4650 3700 60  0001 C CNN "Spice_Primitive"
+	1    4650 3700
+	0    1    1    0   
+$EndComp
+$Comp
+L D D1
+U 1 1 573361B8
+P 5100 3700
+F 0 "D1" H 5100 3485 50  0000 C CNN
+F 1 "1N4148" H 5100 3576 50  0000 C CNN
+F 2 "" H 5100 3700 50  0000 C CNN
+F 3 "" H 5100 3700 50  0000 C CNN
+F 4 "Value" H 5100 3700 60  0001 C CNN "Fieldname"
+F 5 "D" H 5100 3700 60  0001 C CNN "Spice_Primitive"
+F 6 "2 1" H 5100 3700 60  0001 C CNN "Spice_Node_Sequence"
+	1    5100 3700
+	-1   0    0    1   
+$EndComp
+$Comp
+L C C1
+U 1 1 5733628F
+P 5400 4000
+F 0 "C1" H 5515 4046 50  0000 L CNN
+F 1 "100n" H 5515 3955 50  0000 L CNN
+F 2 "" H 5438 3850 50  0000 C CNN
+F 3 "" H 5400 4000 50  0000 C CNN
+F 4 "Value" H 5400 4000 60  0001 C CNN "Fieldname"
+F 5 "C" H 5400 4000 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 5400 4000 60  0001 C CNN "SpiceMapping"
+	1    5400 4000
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R2
+U 1 1 573362F7
+P 5750 4000
+F 0 "R2" H 5680 3954 50  0000 R CNN
+F 1 "100k" H 5680 4045 50  0000 R CNN
+F 2 "" V 5680 4000 50  0000 C CNN
+F 3 "" H 5750 4000 50  0000 C CNN
+F 4 "Value" H 5750 4000 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 5750 4000 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 5750 4000 60  0001 C CNN "Spice_Primitive"
+	1    5750 4000
+	-1   0    0    1   
+$EndComp
+Text Notes 4300 4900 0    60   ~ 0
+*.tran 1u 10m\n
+$Comp
+L SPICE_PROBE U1
+U 1 1 573367CB
+P 4400 3700
+F 0 "U1" H 4400 3700 60  0001 C CNN
+F 1 "SPICE_PROBE" H 4400 3700 60  0001 C CNN
+F 2 "" H 4400 3700 60  0000 C CNN
+F 3 "" H 4400 3700 60  0000 C CNN
+	1    4400 3700
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4400 4350 4400 4250
+Wire Wire Line
+	4400 4300 5750 4300
+Connection ~ 4400 4300
+Wire Wire Line
+	5250 3700 5750 3700
+Wire Wire Line
+	5750 3700 5750 3850
+Wire Wire Line
+	5400 3850 5400 3700
+Connection ~ 5400 3700
+Wire Wire Line
+	5400 4300 5400 4150
+Wire Wire Line
+	5750 4300 5750 4150
+Connection ~ 5400 4300
+Wire Wire Line
+	4800 3700 4950 3700
+Connection ~ 4900 3700
+Wire Wire Line
+	4400 3850 4400 3700
+Wire Wire Line
+	4400 3700 4500 3700
+Connection ~ 5650 3700
+Connection ~ 4400 3700
+Text Notes 4300 4800 0    60   ~ 0
+.include diodes.lib\n
+Text Label 4400 3800 0    60   ~ 0
+in
+$Comp
+L SPICE_PROBE U?
+U 1 1 5734D78F
+P 4900 3700
+F 0 "U?" H 4900 3700 60  0001 C CNN
+F 1 "SPICE_PROBE" H 4900 3700 60  0001 C CNN
+F 2 "" H 4900 3700 60  0000 C CNN
+F 3 "" H 4900 3700 60  0000 C CNN
+	1    4900 3700
+	1    0    0    -1  
+$EndComp
+$Comp
+L SPICE_PROBE U?
+U 1 1 5734D7B3
+P 5400 3700
+F 0 "U?" H 5400 3700 60  0001 C CNN
+F 1 "SPICE_PROBE" H 5400 3700 60  0001 C CNN
+F 2 "" H 5400 3700 60  0000 C CNN
+F 3 "" H 5400 3700 60  0000 C CNN
+	1    5400 3700
+	1    0    0    -1  
+$EndComp
+Text Label 5550 3700 0    60   ~ 0
+rect
+Text Notes 4300 5000 0    60   ~ 0
+.ac dec 10 1 1Meg\n
+$EndSCHEMATC
diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
new file mode 100644
index 0000000000..322d354bb7
--- /dev/null
+++ b/eeschema/sim/ngspice.cpp
@@ -0,0 +1,252 @@
+#include "sharedspice.h"
+#include <cstdio>
+#include <sstream>
+
+#include <wx/dynlib.h>
+
+#include <string>
+#include <vector>
+
+#include "spice_simulator.h"
+
+#include <reporter.h>
+
+using namespace std;
+
+
+class NGSPICE : public SPICE_SIMULATOR {
+
+public:
+    NGSPICE();
+    virtual ~NGSPICE();
+
+    void Init();
+    bool LoadNetlist(const string& netlist);
+    bool Command(const string& cmd);
+
+    string GetConsole() const;
+
+    const vector<double> GetPlot( std::string name, int max_len = -1);
+
+private:
+
+
+
+    typedef void (*ngSpice_Init)(SendChar*, SendStat*, ControlledExit*,
+             SendData*, SendInitData*, BGThreadRunning*, void*);
+
+    typedef int (*ngSpice_Circ)(char** circarray);
+    typedef int (*ngSpice_Command)(char* command);
+    typedef pvector_info (*ngGet_Vec_Info)(char* vecname);
+    typedef char** (*ngSpice_AllVecs)(char* plotname);
+    typedef char** (*ngSpice_AllPlots)(void);
+
+
+    ngSpice_Init m_ngSpice_Init;
+    ngSpice_Circ m_ngSpice_Circ;
+    ngSpice_Command m_ngSpice_Command;
+    ngGet_Vec_Info m_ngGet_Vec_Info;
+    ngSpice_AllPlots m_ngSpice_AllPlots;
+    ngSpice_AllVecs m_ngSpice_AllVecs;
+
+    wxDynamicLibrary *m_dll;
+
+    static int cbSendChar( char* what, int id, void* user)
+    {
+        NGSPICE *sim = reinterpret_cast<NGSPICE*>(user);
+
+        printf("sim %p cr %p\n",sim, sim->m_consoleReporter );
+        if(sim->m_consoleReporter)
+            sim->m_consoleReporter->Report(what);
+        return 0;
+    }
+
+    static int cbSendStat( char* what, int id, void* user)
+    {
+    /*    NGSPICE *sim = reinterpret_cast<NGSPICE*>(user);
+        if(sim->m_consoleReporter)
+            sim->m_consoleReporter->Report(what);*/
+        return 0;
+    }
+
+};
+
+
+
+
+NGSPICE::NGSPICE()
+{
+    m_dll = new wxDynamicLibrary("/home/twl/projects_sw/ngspice-26/src/.libs/libngspice.so.0.0.0"); //, wxDL_LAZY);
+
+    printf("DLL at %p\n", m_dll);
+
+    assert(m_dll);
+
+    m_ngSpice_Init = (ngSpice_Init) m_dll->GetSymbol("ngSpice_Init");
+    printf("Init @ %p\n", m_ngSpice_Init);
+
+
+    m_ngSpice_Circ = (ngSpice_Circ) m_dll->GetSymbol("ngSpice_Circ");
+    m_ngSpice_Command = (ngSpice_Command) m_dll->GetSymbol("ngSpice_Command");
+    m_ngGet_Vec_Info = (ngGet_Vec_Info) m_dll->GetSymbol("ngGet_Vec_Info");
+    m_ngSpice_AllPlots = (ngSpice_AllPlots) m_dll->GetSymbol("ngSpice_AllPlots");
+    m_ngSpice_AllVecs = (ngSpice_AllVecs) m_dll->GetSymbol("ngSpice_AllVecs");
+
+
+}
+
+void NGSPICE::Init()
+{
+    m_ngSpice_Init( &cbSendChar, &cbSendStat, NULL, NULL, NULL, NULL, this);
+}
+
+const vector<double> NGSPICE::GetPlot( std::string name, int max_len )
+{
+    vector<double> data;
+
+    vector_info *vi = m_ngGet_Vec_Info((char*)name.c_str());
+
+    if(vi->v_realdata)
+        for(int i = 0; i<vi->v_length;i++)
+            data.push_back(vi->v_realdata[i]);
+
+    return data;
+
+}
+
+
+static string loadFile(const string& filename)
+{
+
+    FILE *f=fopen(filename.c_str(),"rb");
+    char buf[10000];
+    int n = fread(buf, 1, 10000, f);
+    fclose(f);
+    buf[n] = 0;
+    return buf;
+}
+
+bool NGSPICE::LoadNetlist(const string& netlist)
+{
+    char *lines[16384];
+    stringstream ss(netlist);
+    int n = 0;
+
+    while(!ss.eof())
+    {
+        char line[1024];
+        ss.getline(line, 1024);
+
+        lines[n++] = strdup(line);
+	    printf("l '%s'\n", line);
+    }
+    lines[n]= NULL;
+
+    printf("netlist contains %d lines\n", n);
+    m_ngSpice_Circ(lines);
+
+    for(int i = 0; i < n; i++)
+        delete lines[i];
+
+    return true;
+}
+
+
+bool NGSPICE::Command(const string& cmd )
+{
+    m_ngSpice_Command( (char*)(cmd + string("\n")).c_str());
+
+    return true;
+}
+
+
+#if 0
+bool NGSPICE::Run()
+{
+//    m_ngSpice_Command("run\n");
+    char **plots = m_ngSpice_AllPlots();
+
+    for(int i = 0; plots[i]; i++)
+    {
+        printf("-> plot : %s\n", plots[i]);
+        char **vecs = m_ngSpice_AllVecs(plots[i]);
+
+        for(int j = 0; vecs[j]; j++)
+        {
+            printf("   - vector %s\n", vecs[j]);
+
+            vector_info *vi = m_ngGet_Vec_Info(vecs[j]);
+
+            printf("       - v_type %x\n", vi->v_type);
+            printf("       - v_flags %x\n", vi->v_flags);
+            printf("       - v_length %d\n", vi->v_length);
+
+
+        }
+
+    }
+
+
+}
+
+#endif
+
+NGSPICE::~NGSPICE()
+{
+    printf("Killing ngspice\n");
+    delete m_dll;
+}
+
+#if 0
+main()
+{
+    NGSPICE spice;
+    spice.Init();
+    spice.LoadNetlist(loadFile("1.ckt"));
+
+    spice.Command("tran .05 1");
+    spice.Command("save all");
+
+    spice.Run();
+    vector<double> t = spice.GetPlot("time");
+    vector<double> v1 = spice.GetPlot("V(1)");
+    vector<double> v2 = spice.GetPlot("V(2)");
+
+    // Prepare data.
+
+    // Plot line from given x and y data. Color is selected automatically.
+    plt::plot(t, v1);
+    // Plot a red dashed line from given x and y data.
+    plt::plot(t, v2,"r--");
+
+    for(int i=0;i<v1.size();i++)
+        printf("%.10f\n",v2[i]);
+
+    // Add graph title
+    plt::title("Sample figure");
+    // Enable legend.
+    plt::legend();
+    // save figure
+    plt::show();
+
+
+//    spice.Run();
+}
+
+#endif
+
+
+
+std::string NGSPICE::GetConsole() const {
+    return "";
+}
+
+SPICE_SIMULATOR::~SPICE_SIMULATOR()
+{
+
+}
+
+SPICE_SIMULATOR *SPICE_SIMULATOR::CreateInstance( const std::string name )
+{
+    return new NGSPICE;
+}
diff --git a/eeschema/sim/ngspice.h b/eeschema/sim/ngspice.h
new file mode 100644
index 0000000000..f32f90262a
--- /dev/null
+++ b/eeschema/sim/ngspice.h
@@ -0,0 +1,20 @@
+#ifndef __NGSPICE_H
+#define __NGSPICE_H
+
+#include <string>
+#include <vector>
+
+class SPICE_SIMULATOR {
+
+public:
+    SPICE_SIMULATOR();
+    ~SPICE_SIMULATOR();
+
+    virtual void Init();
+    virtual bool LoadNetlist(const std::string& netlist);
+    virtual bool Command(const std::string& cmd);
+
+    const std::vector<double> GetPlot( std::string name, int max_len = -1);
+};
+
+#endif
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
new file mode 100644
index 0000000000..f04663420c
--- /dev/null
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -0,0 +1,130 @@
+#include <schframe.h>
+#include <fctsys.h>
+#include <kiface_i.h>
+#include <pgm_base.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <gestfich.h>
+#include <confirm.h>
+#include <base_units.h>
+#include <msgpanel.h>
+#include <html_messagebox.h>
+
+#include <general.h>
+#include <eeschema_id.h>
+#include <netlist.h>
+#include <lib_pin.h>
+#include <class_library.h>
+#include <schframe.h>
+#include <sch_component.h>
+
+#include <dialog_helpers.h>
+#include <libeditframe.h>
+#include <viewlib_frame.h>
+#include <hotkeys.h>
+#include <eeschema_config.h>
+#include <sch_sheet.h>
+#include <sch_sheet_path.h>
+
+#include <invoke_sch_dialog.h>
+#include <dialogs/dialog_schematic_find.h>
+
+#include <wx/display.h>
+#include <build_version.h>
+#include <wildcards_and_files_ext.h>
+
+#include <netlist_exporter_kicad.h>
+#include <kiway.h>
+
+#include <netlist_exporters/netlist_exporter_pspice.h>
+
+#include <reporter.h>
+
+#include "sim_plot_frame.h"
+#include "sim_plot_panel.h"
+#include "spice_simulator.h"
+
+
+class SIM_REPORTER : public REPORTER
+{
+public:
+    SIM_REPORTER( wxRichTextCtrl *console )
+    {
+        m_console = console;
+    }
+
+    ~SIM_REPORTER( )
+    {
+
+    }
+
+    virtual REPORTER& Report( const wxString& aText, SEVERITY aSeverity = RPT_UNDEFINED )
+    {
+        m_console->WriteText(aText);
+        m_console->Newline();
+        return *this;
+    }
+
+private:
+    wxRichTextCtrl *m_console;
+
+};
+
+
+SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY *aKiway, wxWindow* parent )
+    : SIM_PLOT_FRAME_BASE( aKiway, parent )
+{
+    m_exporter = NULL;
+    m_simulator = NULL;
+}
+
+SIM_PLOT_FRAME::~SIM_PLOT_FRAME()
+{
+
+}
+
+void SIM_PLOT_FRAME::StartSimulation()
+{
+    if(m_exporter)
+        delete m_exporter;
+
+    if(m_simulator)
+        delete m_simulator;
+
+    m_simulator = SPICE_SIMULATOR::CreateInstance("ngspice");
+    m_simulator->SetConsoleReporter( new SIM_REPORTER( m_simConsole ) );
+    m_simulator->Init();
+    //m_simulator->SetConsoleReporter( , this );
+
+    NETLIST_OBJECT_LIST* net_atoms = m_schematicFrame->BuildNetListBase();
+    m_exporter = new NETLIST_EXPORTER_PSPICE ( net_atoms, Prj().SchLibs() );
+    STRING_FORMATTER formatter;
+
+    m_exporter->Format( &formatter, GNL_ALL );
+    m_plotPanel->DeleteTraces();
+
+    printf("*******************\n%s\n", (const char *)formatter.GetString().c_str());
+
+    m_simulator->LoadNetlist( formatter.GetString() );
+    m_simulator->Command("run\n");
+
+    auto mapping = m_exporter->GetNetIndexMap();
+    auto data_t = m_simulator->GetPlot("time");
+
+    for(auto name : m_exporter->GetProbeList())
+    {
+        char spiceName[1024];
+
+        sprintf(spiceName,"V(%d)", mapping[name] );
+        //printf("probe %s->%s\n", (const char *) name.c_str(), spiceName);
+        auto data_y = m_simulator->GetPlot(spiceName);
+
+        //printf("%d - %d data points\n", data_t.size(), data_y.size() );
+        m_plotPanel->AddTrace(wxT("V(") + name + wxT(")"), data_t.size(), data_t.data(), data_y.data(), 0);
+    }
+
+    delete m_simulator;
+    m_simulator = NULL;
+    //m_simulator->Command("quit\n");
+
+}
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
new file mode 100644
index 0000000000..0d4e334c55
--- /dev/null
+++ b/eeschema/sim/sim_plot_frame.h
@@ -0,0 +1,43 @@
+#ifndef __sim_plot_frame__
+#define __sim_plot_frame__
+
+/**
+@file
+Subclass of SIM_PLOT_FRAME_BASE, which is generated by wxFormBuilder.
+*/
+
+#include "sim_plot_frame_base.h"
+
+#include "kiway_player.h"
+
+#include <netlist_exporters/netlist_exporter_pspice.h>
+//// end generated include
+
+class SPICE_SIMULATOR;
+class NETLIST_EXPORTER_PSPICE;
+
+/** Implementing SIM_PLOT_FRAME_BASE */
+class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
+{
+	public:
+		/** Constructor */
+		SIM_PLOT_FRAME(KIWAY *aKiway, wxWindow* parent );
+		~SIM_PLOT_FRAME();
+
+		void SetSchFrame( SCH_EDIT_FRAME* schFrame )
+		{
+			m_schematicFrame = schFrame;
+		}
+
+		void StartSimulation();
+
+	private:
+
+		SCH_EDIT_FRAME *m_schematicFrame;
+		NETLIST_EXPORTER_PSPICE *m_exporter;
+		SPICE_SIMULATOR *m_simulator;
+
+	//// end generated class members
+};
+
+#endif // __sim_plot_frame__
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
new file mode 100644
index 0000000000..fba4149597
--- /dev/null
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -0,0 +1,76 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "sim_plot_panel.h"
+
+#include "sim_plot_frame_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( KIWAY* aKiway, wxWindow* aParent ) :
+    KIWAY_PLAYER( aKiway, aParent, FRAME_SIMULATOR, _( "Spice Simulation" ),
+           wxDefaultPosition, wxDefaultSize, KICAD_DEFAULT_DRAWFRAME_STYLE, wxT("Spice Simulation" ) )
+
+{
+	this->SetSizeHints(  wxSize( 1920,1000 ),  wxSize( 1920,1000 ) );
+
+	m_menubar1 = new wxMenuBar( 0 );
+	m_menu1 = new wxMenu();
+	wxMenuItem* m_menuItem2;
+	m_menuItem2 = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("Save Plot") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menu1->Append( m_menuItem2 );
+
+	m_menu1->AppendSeparator();
+
+	wxMenuItem* m_menuItem1;
+	m_menuItem1 = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("Exit Simulation") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menu1->Append( m_menuItem1 );
+
+	m_menubar1->Append( m_menu1, wxT("File") );
+
+	this->SetMenuBar( m_menubar1 );
+
+	wxBoxSizer* bSizer1;
+	bSizer1 = new wxBoxSizer( wxVERTICAL );
+
+	m_auiToolBar1 = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT );
+	m_toolZoomIn = m_auiToolBar1->AddTool( wxID_ANY, wxT("Zoom In"), wxNullBitmap /*wxBitmap( wxT("zoom.png"), wxBITMAP_TYPE_ANY )*/, wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); 
+
+	m_auiToolBar1->Realize();
+
+	bSizer1->Add( m_auiToolBar1, 0, wxALL, 5 );
+
+	m_splitter1 = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
+	m_splitter1->SetSashGravity( 0.2 );
+	m_splitter1->SetSashSize( 0 );
+	m_splitter1->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitter1OnIdle ), NULL, this );
+
+	m_plotPanel = new SIM_PLOT_PANEL( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel3 = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer3;
+	bSizer3 = new wxBoxSizer( wxVERTICAL );
+
+	m_simConsole = new wxRichTextCtrl( m_panel3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS );
+	bSizer3->Add( m_simConsole, 1, wxEXPAND | wxALL, 5 );
+
+
+	m_panel3->SetSizer( bSizer3 );
+	m_panel3->Layout();
+	bSizer3->Fit( m_panel3 );
+	m_splitter1->SplitHorizontally( m_plotPanel, m_panel3, 700 );
+	bSizer1->Add( m_splitter1, 1, wxEXPAND, 5 );
+
+
+	this->SetSizer( bSizer1 );
+	this->Layout();
+
+	this->Centre( wxBOTH );
+}
+
+SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
+{
+}
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
new file mode 100644
index 0000000000..3889326dad
--- /dev/null
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -0,0 +1,67 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __SIM_PLOT_FRAME_BASE_H__
+#define __SIM_PLOT_FRAME_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+class KIWAY_PLAYER;
+class SIM_PLOT_PANEL;
+
+#include "kiway_player.h"
+#include <wx/string.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/menu.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/aui/aui.h>
+#include <wx/aui/auibar.h>
+#include <wx/panel.h>
+#include <wx/richtext/richtextctrl.h>
+#include <wx/sizer.h>
+#include <wx/splitter.h>
+#include <wx/frame.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class SIM_PLOT_FRAME_BASE
+///////////////////////////////////////////////////////////////////////////////
+class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
+{
+	private:
+	
+	protected:
+		wxMenuBar* m_menubar1;
+		wxMenu* m_menu1;
+		wxAuiToolBar* m_auiToolBar1;
+		wxAuiToolBarItem* m_toolZoomIn; 
+		wxSplitterWindow* m_splitter1;
+		SIM_PLOT_PANEL* m_plotPanel;
+		wxPanel* m_panel3;
+		wxRichTextCtrl* m_simConsole;
+	
+	public:
+		SIM_PLOT_FRAME_BASE( KIWAY* aKiway, wxWindow* aParent );
+		~SIM_PLOT_FRAME_BASE();
+		
+		void m_splitter1OnIdle( wxIdleEvent& )
+		{
+			m_splitter1->SetSashPosition( 700 );
+			m_splitter1->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitter1OnIdle ), NULL, this );
+		}
+	
+};
+
+
+#endif //__SIM_PLOT_FRAME_BASE_H__
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
new file mode 100644
index 0000000000..22b9598347
--- /dev/null
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -0,0 +1,75 @@
+#include "sim_plot_panel.h"
+#include <boost/foreach.hpp>
+
+static SIM_PLOT_PANEL *panel = NULL;
+
+static int drawPlotFunc( mglGraph *graph )
+{
+
+	printf("DrawPlot [%d traces]!\n", panel->m_traces.size());
+
+	graph->Clf();
+	//graph->SetRanges(-10e-3,10e-3,-2,2);
+	graph->Axis("x");
+	graph->Label('x',"Time",0);
+	graph->AddRange('x', 0, 10e-3);
+
+	graph->Axis("y");
+	graph->Label('y',"Voltage",0);
+	graph->SetRange('y', -1.5, 1.5);
+
+
+	for(auto t : panel->m_traces)
+	{
+			graph->AddLegend((const char *)t.name.c_str(),"");
+			graph->Plot(t.y);
+	}
+
+	graph->Box();
+	graph->Grid();
+	if ( panel->m_traces.size() )
+		graph->Legend(1,"-#");
+
+
+	return 0;
+}
+
+
+SIM_PLOT_PANEL::SIM_PLOT_PANEL( wxWindow *  	parent,
+				wxWindowID  	id,
+				const wxPoint &  	pos,
+				const wxSize &  	size,
+			    	long  	style,
+				const wxString &  	name )
+    : wxMathGL ( parent, id, pos, size, style, name )
+{
+	panel = this;
+
+	AutoResize = true;
+	SetDraw( drawPlotFunc );
+	Update();
+}
+
+
+SIM_PLOT_PANEL::~SIM_PLOT_PANEL()
+{
+
+}
+
+void SIM_PLOT_PANEL::AddTrace(const wxString& name, int n_points, double *t, double *x, int flags )
+{
+	Trace trace;
+
+	trace.name = name;
+	trace.x.Set(t, n_points);
+	trace.y.Set(x, n_points);
+
+	m_traces.push_back(trace);
+	Update();
+}
+
+void SIM_PLOT_PANEL::DeleteTraces()
+{
+	m_traces.clear();
+	Update();
+}
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
new file mode 100644
index 0000000000..cae716073b
--- /dev/null
+++ b/eeschema/sim/sim_plot_panel.h
@@ -0,0 +1,34 @@
+#ifndef __SIM_PLOT_PANEL_H
+#define __SIM_PLOT_PANEL_H
+
+#include "mgl2/canvas_wnd.h"
+#include "mgl2/wx.h"
+
+
+class SIM_PLOT_PANEL : public wxMathGL
+{
+public:
+    SIM_PLOT_PANEL( 	wxWindow *  	parent,
+		wxWindowID  	id,
+		const wxPoint &  	pos = wxDefaultPosition,
+		const wxSize &  	size = wxDefaultSize,
+		long  	style = 0,
+		const wxString &  	name = wxPanelNameStr );
+
+    ~SIM_PLOT_PANEL();
+
+
+
+
+    struct Trace {
+        wxString name;
+        mglData x, y;
+    };
+
+    std::vector<Trace> m_traces;
+
+    void AddTrace(const wxString& name, int n_points, double *t, double *x, int flags = 0 );
+    void DeleteTraces();
+};
+
+#endif
diff --git a/eeschema/sim/simulate.cpp b/eeschema/sim/simulate.cpp
new file mode 100644
index 0000000000..188b97cc80
--- /dev/null
+++ b/eeschema/sim/simulate.cpp
@@ -0,0 +1,79 @@
+#include <schframe.h>
+#include <fctsys.h>
+#include <kiface_i.h>
+#include <pgm_base.h>
+#include <gr_basic.h>
+#include <class_drawpanel.h>
+#include <gestfich.h>
+#include <confirm.h>
+#include <base_units.h>
+#include <msgpanel.h>
+#include <html_messagebox.h>
+
+#include <general.h>
+#include <eeschema_id.h>
+#include <netlist.h>
+#include <lib_pin.h>
+#include <class_library.h>
+#include <schframe.h>
+#include <sch_component.h>
+
+#include <dialog_helpers.h>
+#include <libeditframe.h>
+#include <viewlib_frame.h>
+#include <hotkeys.h>
+#include <eeschema_config.h>
+#include <sch_sheet.h>
+#include <sch_sheet_path.h>
+
+#include <invoke_sch_dialog.h>
+#include <dialogs/dialog_schematic_find.h>
+
+#include <wx/display.h>
+#include <build_version.h>
+#include <wildcards_and_files_ext.h>
+
+#include <netlist_exporter_kicad.h>
+#include <kiway.h>
+
+#include <netlist_exporters/netlist_exporter_pspice.h>
+
+#include <sim/sim_plot_frame.h>
+
+void SCH_EDIT_FRAME::OnSimulationRun( wxCommandEvent& event )
+{
+    #if 0
+
+    NETLIST_OBJECT_LIST* net_atoms = BuildNetListBase();
+    NETLIST_EXPORTER_PSPICE exporter( net_atoms, Prj().SchLibs() );
+    STRING_FORMATTER formatter;
+
+    exporter.Format( &formatter, GNL_ALL );
+
+    printf("*******************\n%s\n", (const char *)formatter.GetString().c_str());
+    #endif
+
+    SIM_PLOT_FRAME* simFrame = (SIM_PLOT_FRAME*) Kiway().Player( FRAME_SIMULATOR, false );
+
+    if( !simFrame )
+    {
+        simFrame = (SIM_PLOT_FRAME*) Kiway().Player( FRAME_SIMULATOR, true );
+        simFrame->Show( true );
+    }
+
+
+    // On Windows, Raise() does not bring the window on screen, when iconized
+    if( simFrame->IsIconized() )
+        simFrame->Iconize( false );
+
+    simFrame->Raise();
+
+    simFrame->SetSchFrame( this );
+    simFrame->StartSimulation();
+}
+
+void SCH_EDIT_FRAME::OnSimulationStop( wxCommandEvent& event )
+{}
+
+void SCH_EDIT_FRAME::OnSimulationAddProbe( wxCommandEvent& event )
+{}
diff --git a/eeschema/sim/simulate.h b/eeschema/sim/simulate.h
new file mode 100644
index 0000000000..602d4ebcd1
--- /dev/null
+++ b/eeschema/sim/simulate.h
@@ -0,0 +1,11 @@
+#include <schframe.h>
+
+void SCH_EDIT_FRAME::OnSimulationRun( wxCommandEvent& event )
+{}
+
+void SCH_EDIT_FRAME::OnSimulationStop( wxCommandEvent& event )
+{}
+
+void SCH_EDIT_FRAME::OnSimulationAddProbe( wxCommandEvent& event )
+{}
+    
diff --git a/eeschema/sim/spice_simulator.h b/eeschema/sim/spice_simulator.h
new file mode 100644
index 0000000000..95cafcd518
--- /dev/null
+++ b/eeschema/sim/spice_simulator.h
@@ -0,0 +1,44 @@
+#ifndef __NGSPICE_H
+#define __NGSPICE_H
+
+#include <string>
+#include <vector>
+
+enum SimTraceType
+{
+SIM_AC_MAG = 0x1,
+SIM_AC_PHASE = 0x2,
+SIM_TR_VOLTAGE = 0x4,
+SIM_TR_CURRENT = 0x8,
+SIM_TR_FFT = 0x10
+};
+
+class REPORTER;
+
+class SPICE_SIMULATOR {
+
+public:
+    typedef void (*ConsoleCallback)( bool isError, const wxString& message, void *userData );
+
+    static SPICE_SIMULATOR *CreateInstance( const std::string name );
+
+    SPICE_SIMULATOR(){}
+    virtual ~SPICE_SIMULATOR() = 0;
+
+    virtual void Init() = 0;
+    virtual bool LoadNetlist(const std::string& netlist) = 0;
+    virtual bool Command(const std::string& cmd) = 0;
+    virtual void SetConsoleReporter ( REPORTER *rep )
+    {
+        m_consoleReporter = rep;
+    }
+
+    virtual const std::vector<double> GetPlot( std::string name, int max_len = -1) = 0;
+
+protected:
+    REPORTER *m_consoleReporter;
+
+};
+
+
+#endif
diff --git a/include/frame_type.h b/include/frame_type.h
index d5b411c640..ca0d1818fc 100644
--- a/include/frame_type.h
+++ b/include/frame_type.h
@@ -37,7 +37,8 @@ enum FRAME_T
     FRAME_SCH_LIB_EDITOR,
     FRAME_SCH_VIEWER,
     FRAME_SCH_VIEWER_MODAL,
-
+    FRAME_SIMULATOR,
+    
     FRAME_PCB,
     FRAME_PCB_MODULE_EDITOR,
     FRAME_PCB_MODULE_VIEWER,

From 095af6e77a909434323f7f75b548b10f90ec3b8a Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:01 +0200
Subject: [PATCH 003/197] wip

---
 CMakeLists.txt                       |   2 +-
 eeschema/CMakeLists.txt              |   2 +-
 eeschema/noname.sch                  |  39 +------
 eeschema/sim/ngspice.cpp             |   9 +-
 eeschema/sim/sim_plot_frame.cpp      |  19 +++-
 eeschema/sim/sim_plot_frame.h        |  10 ++
 eeschema/sim/sim_plot_frame_base.cpp | 155 +++++++++++++++++++++------
 eeschema/sim/sim_plot_frame_base.h   |  37 +++++--
 eeschema/sim/sim_plot_panel.cpp      |   4 +-
 9 files changed, 187 insertions(+), 90 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67964436db..11b1792ac2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -521,7 +521,7 @@ set( INC_AFTER
 
 
 #if ( KICAD_SPICE )
-#    find_package(MathGL2 2.3.4 COMPONENTS wx REQUIRED )
+#find_package(MathGL2 2.1 COMPONENTS wx REQUIRED )
 #endif ()
 
 # Find Python and other scripting resources
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 523bea3f00..2405ec36d2 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -249,7 +249,7 @@ set_source_files_properties( ../common/single_top.cpp PROPERTIES
     )
 
 #if (KICAD_SPICE)
-    set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} mgl mgl-wx)
+    set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} mgl-wx mgl mgl-wx)
 #else()
 #    set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} )
 #endif()
diff --git a/eeschema/noname.sch b/eeschema/noname.sch
index d63205268f..2366ad21a5 100644
--- a/eeschema/noname.sch
+++ b/eeschema/noname.sch
@@ -126,18 +126,7 @@ F 6 "R" V 5750 4000 60  0001 C CNN "Spice_Primitive"
 	-1   0    0    1   
 $EndComp
 Text Notes 4300 4900 0    60   ~ 0
-*.tran 1u 10m\n
-$Comp
-L SPICE_PROBE U1
-U 1 1 573367CB
-P 4400 3700
-F 0 "U1" H 4400 3700 60  0001 C CNN
-F 1 "SPICE_PROBE" H 4400 3700 60  0001 C CNN
-F 2 "" H 4400 3700 60  0000 C CNN
-F 3 "" H 4400 3700 60  0000 C CNN
-	1    4400 3700
-	1    0    0    -1  
-$EndComp
+.tran 1u 10m\n
 Wire Wire Line
 	4400 4350 4400 4250
 Wire Wire Line
@@ -162,36 +151,12 @@ Wire Wire Line
 	4400 3850 4400 3700
 Wire Wire Line
 	4400 3700 4500 3700
-Connection ~ 5650 3700
-Connection ~ 4400 3700
 Text Notes 4300 4800 0    60   ~ 0
 .include diodes.lib\n
 Text Label 4400 3800 0    60   ~ 0
 in
-$Comp
-L SPICE_PROBE U?
-U 1 1 5734D78F
-P 4900 3700
-F 0 "U?" H 4900 3700 60  0001 C CNN
-F 1 "SPICE_PROBE" H 4900 3700 60  0001 C CNN
-F 2 "" H 4900 3700 60  0000 C CNN
-F 3 "" H 4900 3700 60  0000 C CNN
-	1    4900 3700
-	1    0    0    -1  
-$EndComp
-$Comp
-L SPICE_PROBE U?
-U 1 1 5734D7B3
-P 5400 3700
-F 0 "U?" H 5400 3700 60  0001 C CNN
-F 1 "SPICE_PROBE" H 5400 3700 60  0001 C CNN
-F 2 "" H 5400 3700 60  0000 C CNN
-F 3 "" H 5400 3700 60  0000 C CNN
-	1    5400 3700
-	1    0    0    -1  
-$EndComp
 Text Label 5550 3700 0    60   ~ 0
 rect
 Text Notes 4300 5000 0    60   ~ 0
-.ac dec 10 1 1Meg\n
+*.ac dec 10 1 1Meg\n
 $EndSCHEMATC
diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 322d354bb7..c51c557d8c 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -28,6 +28,8 @@ public:
 
     const vector<double> GetPlot( std::string name, int max_len = -1);
 
+    void dump();
+
 private:
 
 
@@ -155,13 +157,12 @@ bool NGSPICE::LoadNetlist(const string& netlist)
 bool NGSPICE::Command(const string& cmd )
 {
     m_ngSpice_Command( (char*)(cmd + string("\n")).c_str());
-
+    dump();
     return true;
 }
 
 
-#if 0
-bool NGSPICE::Run()
+void NGSPICE::dump()
 {
 //    m_ngSpice_Command("run\n");
     char **plots = m_ngSpice_AllPlots();
@@ -189,7 +190,7 @@ bool NGSPICE::Run()
 
 }
 
-#endif
+
 
 NGSPICE::~NGSPICE()
 {
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index f04663420c..e56cc4ab08 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -76,6 +76,9 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY *aKiway, wxWindow* parent )
 {
     m_exporter = NULL;
     m_simulator = NULL;
+    m_currentPlot = NULL;
+
+    NewPlot();
 }
 
 SIM_PLOT_FRAME::~SIM_PLOT_FRAME()
@@ -101,7 +104,7 @@ void SIM_PLOT_FRAME::StartSimulation()
     STRING_FORMATTER formatter;
 
     m_exporter->Format( &formatter, GNL_ALL );
-    m_plotPanel->DeleteTraces();
+    //m_plotPanel->DeleteTraces();
 
     printf("*******************\n%s\n", (const char *)formatter.GetString().c_str());
 
@@ -109,7 +112,7 @@ void SIM_PLOT_FRAME::StartSimulation()
     m_simulator->Command("run\n");
 
     auto mapping = m_exporter->GetNetIndexMap();
-    auto data_t = m_simulator->GetPlot("time");
+//    auto data_t = m_simulator->GetPlot("time");
 
     for(auto name : m_exporter->GetProbeList())
     {
@@ -117,14 +120,20 @@ void SIM_PLOT_FRAME::StartSimulation()
 
         sprintf(spiceName,"V(%d)", mapping[name] );
         //printf("probe %s->%s\n", (const char *) name.c_str(), spiceName);
-        auto data_y = m_simulator->GetPlot(spiceName);
+    //    auto data_y = m_simulator->GetPlot(spiceName);
 
         //printf("%d - %d data points\n", data_t.size(), data_y.size() );
-        m_plotPanel->AddTrace(wxT("V(") + name + wxT(")"), data_t.size(), data_t.data(), data_y.data(), 0);
+    //    m_plotPanel->AddTrace(wxT("V(") + name + wxT(")"), data_t.size(), data_t.data(), data_y.data(), 0);
     }
 
     delete m_simulator;
     m_simulator = NULL;
     //m_simulator->Command("quit\n");
-
+}
+
+void SIM_PLOT_FRAME::NewPlot()
+{
+    SIM_PLOT_PANEL *plot = new SIM_PLOT_PANEL ( this, wxID_ANY );
+    m_plotNotebook->AddPage ( plot, wxT("Plot1"), true );
+    m_currentPlot = plot;
 }
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 0d4e334c55..98a3c0dc8b 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -15,6 +15,7 @@ Subclass of SIM_PLOT_FRAME_BASE, which is generated by wxFormBuilder.
 
 class SPICE_SIMULATOR;
 class NETLIST_EXPORTER_PSPICE;
+class SIM_PLOT_PANEL;
 
 /** Implementing SIM_PLOT_FRAME_BASE */
 class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
@@ -24,6 +25,8 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
 		SIM_PLOT_FRAME(KIWAY *aKiway, wxWindow* parent );
 		~SIM_PLOT_FRAME();
 
+
+
 		void SetSchFrame( SCH_EDIT_FRAME* schFrame )
 		{
 			m_schematicFrame = schFrame;
@@ -31,8 +34,15 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
 
 		void StartSimulation();
 
+		void NewPlot();
+
+
+
 	private:
 
+		virtual void onNewPlot( wxCommandEvent& event ) { NewPlot(); }
+
+		SIM_PLOT_PANEL *m_currentPlot;
 		SCH_EDIT_FRAME *m_schematicFrame;
 		NETLIST_EXPORTER_PSPICE *m_exporter;
 		SPICE_SIMULATOR *m_simulator;
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index fba4149597..5abf5aa814 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -5,8 +5,6 @@
 // PLEASE DO "NOT" EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "sim_plot_panel.h"
-
 #include "sim_plot_frame_base.h"
 
 ///////////////////////////////////////////////////////////////////////////
@@ -16,61 +14,156 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( KIWAY* aKiway, wxWindow* aParent ) :
            wxDefaultPosition, wxDefaultSize, KICAD_DEFAULT_DRAWFRAME_STYLE, wxT("Spice Simulation" ) )
 
 {
-	this->SetSizeHints(  wxSize( 1920,1000 ),  wxSize( 1920,1000 ) );
-
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
 	m_menubar1 = new wxMenuBar( 0 );
 	m_menu1 = new wxMenu();
-	wxMenuItem* m_menuItem2;
-	m_menuItem2 = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("Save Plot") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu1->Append( m_menuItem2 );
-
+	wxMenuItem* m_menuItem7;
+	m_menuItem7 = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("New Plot") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menu1->Append( m_menuItem7 );
+	
 	m_menu1->AppendSeparator();
-
+	
+	wxMenuItem* m_menuItem8;
+	m_menuItem8 = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("Open Workbook") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menu1->Append( m_menuItem8 );
+	
+	wxMenuItem* m_menuItem2;
+	m_menuItem2 = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("Save Workbook") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menu1->Append( m_menuItem2 );
+	
+	m_menu1->AppendSeparator();
+	
 	wxMenuItem* m_menuItem1;
 	m_menuItem1 = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("Exit Simulation") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menu1->Append( m_menuItem1 );
-
-	m_menubar1->Append( m_menu1, wxT("File") );
-
+	
+	m_menubar1->Append( m_menu1, wxT("File") ); 
+	
+	m_menu2 = new wxMenu();
+	wxMenuItem* m_menuItem3;
+	m_menuItem3 = new wxMenuItem( m_menu2, wxID_ANY, wxString( wxT("Zoom In") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menu2->Append( m_menuItem3 );
+	
+	wxMenuItem* m_menuItem4;
+	m_menuItem4 = new wxMenuItem( m_menu2, wxID_ANY, wxString( wxT("Zoom Out") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menu2->Append( m_menuItem4 );
+	
+	wxMenuItem* m_menuItem5;
+	m_menuItem5 = new wxMenuItem( m_menu2, wxID_ANY, wxString( wxT("Fit on Screen") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menu2->Append( m_menuItem5 );
+	
+	m_menu2->AppendSeparator();
+	
+	wxMenuItem* m_menuItem6;
+	m_menuItem6 = new wxMenuItem( m_menu2, wxID_ANY, wxString( wxT("Show grid") ) , wxEmptyString, wxITEM_CHECK );
+	m_menu2->Append( m_menuItem6 );
+	
+	m_menubar1->Append( m_menu2, wxT("View") ); 
+	
 	this->SetMenuBar( m_menubar1 );
-
+	
 	wxBoxSizer* bSizer1;
 	bSizer1 = new wxBoxSizer( wxVERTICAL );
-
-	m_auiToolBar1 = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT );
-	m_toolZoomIn = m_auiToolBar1->AddTool( wxID_ANY, wxT("Zoom In"), wxNullBitmap /*wxBitmap( wxT("zoom.png"), wxBITMAP_TYPE_ANY )*/, wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); 
-
-	m_auiToolBar1->Realize();
-
-	bSizer1->Add( m_auiToolBar1, 0, wxALL, 5 );
-
-	m_splitter1 = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
+	
+	m_splitter1 = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_BORDER );
 	m_splitter1->SetSashGravity( 0.2 );
 	m_splitter1->SetSashSize( 0 );
 	m_splitter1->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitter1OnIdle ), NULL, this );
-
-	m_plotPanel = new SIM_PLOT_PANEL( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	
+	m_panel31 = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer5;
+	bSizer5 = new wxBoxSizer( wxVERTICAL );
+	
+	m_splitter2 = new wxSplitterWindow( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3DBORDER );
+	m_splitter2->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitter2OnIdle ), NULL, this );
+	
+	m_panel61 = new wxPanel( m_splitter2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel61->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer6;
+	bSizer6 = new wxBoxSizer( wxVERTICAL );
+	
+	m_plotNotebook = new wxAuiNotebook( m_panel61, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_DEFAULT_STYLE );
+	m_plotNotebook->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	
+	bSizer6->Add( m_plotNotebook, 1, wxEXPAND, 5 );
+	
+	
+	m_panel61->SetSizer( bSizer6 );
+	m_panel61->Layout();
+	bSizer6->Fit( m_panel61 );
+	m_panel7 = new wxPanel( m_splitter2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer7;
+	bSizer7 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText2 = new wxStaticText( m_panel7, wxID_ANY, wxT("Signals"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+	m_staticText2->Wrap( -1 );
+	bSizer7->Add( m_staticText2, 0, wxALL|wxEXPAND, 5 );
+	
+	m_signals = new wxListBox( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_MULTIPLE|wxLB_SORT ); 
+	bSizer7->Add( m_signals, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText21 = new wxStaticText( m_panel7, wxID_ANY, wxT("Parameters"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+	m_staticText21->Wrap( -1 );
+	bSizer7->Add( m_staticText21, 0, wxALL|wxEXPAND, 5 );
+	
+	m_signals1 = new wxListBox( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_MULTIPLE|wxLB_SORT ); 
+	bSizer7->Add( m_signals1, 0, wxALL|wxEXPAND, 5 );
+	
+	wxFlexGridSizer* fgSizer1;
+	fgSizer1 = new wxFlexGridSizer( 1, 3, 0, 0 );
+	fgSizer1->SetFlexibleDirection( wxBOTH );
+	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_button1 = new wxButton( m_panel7, wxID_ANY, wxT("Probe"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer1->Add( m_button1, 0, wxALL, 5 );
+	
+	m_button2 = new wxButton( m_panel7, wxID_ANY, wxT("Tune"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer1->Add( m_button2, 0, wxALL, 5 );
+	
+	
+	bSizer7->Add( fgSizer1, 0, wxEXPAND, 5 );
+	
+	
+	m_panel7->SetSizer( bSizer7 );
+	m_panel7->Layout();
+	bSizer7->Fit( m_panel7 );
+	m_splitter2->SplitVertically( m_panel61, m_panel7, 0 );
+	bSizer5->Add( m_splitter2, 1, wxEXPAND, 5 );
+	
+	
+	m_panel31->SetSizer( bSizer5 );
+	m_panel31->Layout();
+	bSizer5->Fit( m_panel31 );
 	m_panel3 = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer3;
 	bSizer3 = new wxBoxSizer( wxVERTICAL );
-
+	
 	m_simConsole = new wxRichTextCtrl( m_panel3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS );
 	bSizer3->Add( m_simConsole, 1, wxEXPAND | wxALL, 5 );
-
-
+	
+	
 	m_panel3->SetSizer( bSizer3 );
 	m_panel3->Layout();
 	bSizer3->Fit( m_panel3 );
-	m_splitter1->SplitHorizontally( m_plotPanel, m_panel3, 700 );
+	m_splitter1->SplitHorizontally( m_panel31, m_panel3, 700 );
 	bSizer1->Add( m_splitter1, 1, wxEXPAND, 5 );
-
-
+	
+	
 	this->SetSizer( bSizer1 );
 	this->Layout();
-
+	
 	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onNewPlot ) );
 }
 
 SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
 {
+	// Disconnect Events
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onNewPlot ) );
+	
 }
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index 3889326dad..d7056336a7 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -11,7 +11,6 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 class KIWAY_PLAYER;
-class SIM_PLOT_PANEL;
 
 #include "kiway_player.h"
 #include <wx/string.h>
@@ -23,12 +22,14 @@ class SIM_PLOT_PANEL;
 #include <wx/font.h>
 #include <wx/colour.h>
 #include <wx/settings.h>
-#include <wx/aui/aui.h>
-#include <wx/aui/auibar.h>
-#include <wx/panel.h>
-#include <wx/richtext/richtextctrl.h>
+#include <wx/aui/auibook.h>
 #include <wx/sizer.h>
+#include <wx/panel.h>
+#include <wx/stattext.h>
+#include <wx/listbox.h>
+#include <wx/button.h>
 #include <wx/splitter.h>
+#include <wx/richtext/richtextctrl.h>
 #include <wx/frame.h>
 
 ///////////////////////////////////////////////////////////////////////////
@@ -44,12 +45,25 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 	protected:
 		wxMenuBar* m_menubar1;
 		wxMenu* m_menu1;
-		wxAuiToolBar* m_auiToolBar1;
-		wxAuiToolBarItem* m_toolZoomIn; 
+		wxMenu* m_menu2;
 		wxSplitterWindow* m_splitter1;
-		SIM_PLOT_PANEL* m_plotPanel;
+		wxPanel* m_panel31;
+		wxSplitterWindow* m_splitter2;
+		wxPanel* m_panel61;
+		wxAuiNotebook* m_plotNotebook;
+		wxPanel* m_panel7;
+		wxStaticText* m_staticText2;
+		wxListBox* m_signals;
+		wxStaticText* m_staticText21;
+		wxListBox* m_signals1;
+		wxButton* m_button1;
+		wxButton* m_button2;
 		wxPanel* m_panel3;
 		wxRichTextCtrl* m_simConsole;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void onNewPlot( wxCommandEvent& event ) { event.Skip(); }
+		
 	
 	public:
 		SIM_PLOT_FRAME_BASE( KIWAY* aKiway, wxWindow* aParent );
@@ -60,8 +74,13 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 			m_splitter1->SetSashPosition( 700 );
 			m_splitter1->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitter1OnIdle ), NULL, this );
 		}
+		
+		void m_splitter2OnIdle( wxIdleEvent& )
+		{
+			m_splitter2->SetSashPosition( 0 );
+			m_splitter2->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitter2OnIdle ), NULL, this );
+		}
 	
 };
 
-
 #endif //__SIM_PLOT_FRAME_BASE_H__
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 22b9598347..9e74dd34b0 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -12,7 +12,7 @@ static int drawPlotFunc( mglGraph *graph )
 	//graph->SetRanges(-10e-3,10e-3,-2,2);
 	graph->Axis("x");
 	graph->Label('x',"Time",0);
-	graph->AddRange('x', 0, 10e-3);
+	graph->SetRange('x', 0, 10e-3);
 
 	graph->Axis("y");
 	graph->Label('y',"Voltage",0);
@@ -47,7 +47,7 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( wxWindow *  	parent,
 
 	AutoResize = true;
 	SetDraw( drawPlotFunc );
-	Update();
+//	Update();
 }
 
 

From bfb08fb7c43f29b03c4e591b55e6a24378aadabc Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:03 +0200
Subject: [PATCH 004/197] test schematic added

---
 demos/sim/device.dcm   |  572 +++++++
 demos/sim/device.lib   | 3585 ++++++++++++++++++++++++++++++++++++++++
 demos/sim/diodes.lib   |    6 +
 demos/sim/noname.sch   |  162 ++
 demos/sim/power.dcm    |  234 +++
 demos/sim/power.lib    |  936 +++++++++++
 demos/sim/pspice.dcm   |   16 +
 demos/sim/pspice.lib   |  204 +++
 demos/sim/sim_test.sch |  183 ++
 9 files changed, 5898 insertions(+)
 create mode 100644 demos/sim/device.dcm
 create mode 100644 demos/sim/device.lib
 create mode 100644 demos/sim/diodes.lib
 create mode 100644 demos/sim/noname.sch
 create mode 100644 demos/sim/power.dcm
 create mode 100644 demos/sim/power.lib
 create mode 100644 demos/sim/pspice.dcm
 create mode 100644 demos/sim/pspice.lib
 create mode 100644 demos/sim/sim_test.sch

diff --git a/demos/sim/device.dcm b/demos/sim/device.dcm
new file mode 100644
index 0000000000..cd74c88cf5
--- /dev/null
+++ b/demos/sim/device.dcm
@@ -0,0 +1,572 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP C
+D Unpolarized capacitor
+$ENDCMP
+#
+$CMP CP
+D Polarised capacitor
+$ENDCMP
+#
+$CMP CP1
+D Polarised capacitor
+$ENDCMP
+#
+$CMP CP1_Small
+D Polarised capacitor
+$ENDCMP
+#
+$CMP CP_Small
+D Polarised capacitor
+$ENDCMP
+#
+$CMP CTRIM
+D Variable capacitor
+K trimmer
+$ENDCMP
+#
+$CMP C_Small
+D Unpolarized capacitor
+$ENDCMP
+#
+$CMP Coded_Switch
+D 4 bits rotary switch
+K Rotary, Hex
+$ENDCMP
+#
+$CMP Crystal
+D Two pin crystal
+K Quartz, Ceramic, Filter, Resonator
+$ENDCMP
+#
+$CMP Crystal_Small
+D Two pin crystal
+K Quartz, Resonator, Ceramic, Filter
+$ENDCMP
+#
+$CMP D
+D Diode
+$ENDCMP
+#
+$CMP DUAL_POT
+D Potentionmetre
+K R
+$ENDCMP
+#
+$CMP D_Schottky
+D Diode schottky
+$ENDCMP
+#
+$CMP D_Schottky_Small
+D Diode Schottky
+$ENDCMP
+#
+$CMP D_Schottky_x2_ACom_AKK
+D Double diode Schottky (Serie)
+K DEV DIODE
+$ENDCMP
+#
+$CMP D_Schottky_x2_ACom_KAK
+D Double diode Schottky (Serie)
+K DEV DIODE
+$ENDCMP
+#
+$CMP D_Schottky_x2_ACom_KKA
+D Double diode Schottky (Serie)
+K DEV DIODE
+$ENDCMP
+#
+$CMP D_Schottky_x2_KCom_AAK
+D Double diode Schottky (Serie)
+K DEV DIODE
+$ENDCMP
+#
+$CMP D_Schottky_x2_KCom_AKA
+D Double diode Schottky (Serie)
+K DEV DIODE
+$ENDCMP
+#
+$CMP D_Schottky_x2_KCom_KAA
+D Double diode Schottky (Serie)
+K DEV DIODE
+$ENDCMP
+#
+$CMP D_Schottky_x2_Serial_ACK
+D Double diode Schottky (Serie)
+K DEV DIODE
+$ENDCMP
+#
+$CMP D_Schottky_x2_Serial_AKC
+D Double diode Schottky (Serie)
+K DEV DIODE
+$ENDCMP
+#
+$CMP D_Schottky_x2_Serial_CAK
+D Double diode Schottky (Serie)
+K DEV DIODE
+$ENDCMP
+#
+$CMP D_Schottky_x2_Serial_CKA
+D Double diode Schottky (Serie)
+K DEV DIODE
+$ENDCMP
+#
+$CMP D_Schottky_x2_Serial_KAC
+D Double diode Schottky (Serie)
+K DEV DIODE
+$ENDCMP
+#
+$CMP D_Schottky_x2_Serial_KCA
+D Double diode Schottky (Serie)
+K DEV DIODE
+$ENDCMP
+#
+$CMP D_Small
+D Diode
+$ENDCMP
+#
+$CMP Darl_NPN
+D Darlington NPN transistor
+K Q
+$ENDCMP
+#
+$CMP Diode_Bridge
+D Diode bridge
+K Graetz
+$ENDCMP
+#
+$CMP EMI_FILTER
+D Filtre EMI
+K EMI
+$ENDCMP
+#
+$CMP EMI_FILTER2
+D Filtre EMI
+K EMI
+$ENDCMP
+#
+$CMP FILTER
+D Filtre EMI
+K EMI
+$ENDCMP
+#
+$CMP FP_Small
+D Fuse polarised
+$ENDCMP
+#
+$CMP F_Small
+D Fuse
+$ENDCMP
+#
+$CMP Jumper_NC_Small
+D Jumper normally close
+K Jumper, Link
+$ENDCMP
+#
+$CMP Jumper_NO_Small
+D Jumper normally open
+K Jumper, Link
+$ENDCMP
+#
+$CMP LED
+K LED
+$ENDCMP
+#
+$CMP LED_RABG
+D Common Anode RGB LED
+K RGB LED
+$ENDCMP
+#
+$CMP LED_RCBG
+D Common Cathode RGB LED
+K RGB LED
+$ENDCMP
+#
+$CMP LED_RGB
+D LED RGB 6 pins
+$ENDCMP
+#
+$CMP LED_RGB_EP
+D LED RGB 6 pins, exposed pad
+$ENDCMP
+#
+$CMP L_Small
+D Inductor
+$ENDCMP
+#
+$CMP Led_RGB_CA
+D Common Anode RGB LED
+K RGB LED
+$ENDCMP
+#
+$CMP Led_Small
+D Led
+$ENDCMP
+#
+$CMP Led_x2
+D DOUBLE type Bicolore
+K LED
+$ENDCMP
+#
+$CMP PHOTORESISTOR
+D Photo resistor
+$ENDCMP
+#
+$CMP POT
+D Potentionmetre
+K R
+$ENDCMP
+#
+$CMP Q_NIGBT_CEG
+D Transistor N-IGBT (general)
+K igbt n-igbt transistor
+$ENDCMP
+#
+$CMP Q_NIGBT_CGE
+D Transistor N-IGBT (general)
+K igbt n-igbt transistor
+$ENDCMP
+#
+$CMP Q_NIGBT_ECG
+D Transistor N-IGBT (general)
+K igbt n-igbt transistor
+$ENDCMP
+#
+$CMP Q_NIGBT_ECGC
+D Transistor N-IGBT, collector connected to mounting plane (general)
+K igbt n-igbt transistor
+$ENDCMP
+#
+$CMP Q_NIGBT_EGC
+D Transistor N-IGBT (general)
+K igbt n-igbt transistor
+$ENDCMP
+#
+$CMP Q_NIGBT_GCE
+D Transistor N-IGBT (general)
+K igbt n-igbt transistor
+$ENDCMP
+#
+$CMP Q_NIGBT_GCEC
+D Transistor N-IGBT, collector connected to mounting plane (general)
+K igbt n-igbt transistor
+$ENDCMP
+#
+$CMP Q_NIGBT_GEC
+D Transistor N-IGBT (general)
+K igbt n-igbt transistor
+$ENDCMP
+#
+$CMP Q_NJFET_DGS
+D Transistor N-JFET (general)
+K njfet n-jfet transistor
+$ENDCMP
+#
+$CMP Q_NJFET_DSG
+D Transistor N-JFET (general)
+K njfet n-jfet transistor
+$ENDCMP
+#
+$CMP Q_NJFET_GDS
+D Transistor N-JFET (general)
+K njfet n-jfet transistor
+$ENDCMP
+#
+$CMP Q_NJFET_GSD
+D Transistor N-JFET (general)
+K njfet n-jfet transistor
+$ENDCMP
+#
+$CMP Q_NJFET_SDG
+D Transistor N-JFET (general)
+K njfet n-jfet transistor
+$ENDCMP
+#
+$CMP Q_NJFET_SGD
+D Transistor N-JFET (general)
+K njfet n-jfet transistor
+$ENDCMP
+#
+$CMP Q_NMOS_DGS
+D Transistor N-MOSFET (general)
+K nmos n-mos n-mosfet transistor
+$ENDCMP
+#
+$CMP Q_NMOS_DSG
+D Transistor N-MOSFET (general)
+K nmos n-mos n-mosfet transistor
+$ENDCMP
+#
+$CMP Q_NMOS_GDS
+D Transistor N-MOSFET (general)
+K nmos n-mos n-mosfet transistor
+$ENDCMP
+#
+$CMP Q_NMOS_GDSD
+D Transistor N-MOSFET, collector connected to mounting plane (general)
+K nmos n-mos n-mosfet transistor
+$ENDCMP
+#
+$CMP Q_NMOS_GSD
+D Transistor N-MOSFET (general)
+K nmos n-mos n-mosfet transistor
+$ENDCMP
+#
+$CMP Q_NMOS_SDG
+D Transistor N-MOSFET (general)
+K nmos n-mos n-mosfet transistor
+$ENDCMP
+#
+$CMP Q_NMOS_SDGD
+D Transistor N-MOSFET, collector connected to mounting plane (general)
+K nmos n-mos n-mosfet transistor
+$ENDCMP
+#
+$CMP Q_NMOS_SGD
+D Transistor N-MOSFET (general)
+K nmos n-mos n-mosfet transistor
+$ENDCMP
+#
+$CMP Q_NPN_BCE
+D Transistor NPN (general)
+K npn transistor
+$ENDCMP
+#
+$CMP Q_NPN_BCEC
+D Transistor NPN, collector connected to mounting plane (general)
+K npn transistor
+$ENDCMP
+#
+$CMP Q_NPN_BEC
+D Transistor NPN (general)
+K npn transistor
+$ENDCMP
+#
+$CMP Q_NPN_CBE
+D Transistor NPN (general)
+K npn transistor
+$ENDCMP
+#
+$CMP Q_NPN_CEB
+D Transistor NPN (general)
+K npn transistor
+$ENDCMP
+#
+$CMP Q_NPN_EBC
+D Transistor NPN (general)
+K npn transistor
+$ENDCMP
+#
+$CMP Q_NPN_ECB
+D Transistor NPN (general)
+K npn transistor
+$ENDCMP
+#
+$CMP Q_NPN_ECBC
+D Transistor NPN, collector connected to mounting plane (general)
+K npn transistor
+$ENDCMP
+#
+$CMP Q_PJFET_DGS
+D Transistor P-JFET (general)
+K pjfet p-jfet transistor
+$ENDCMP
+#
+$CMP Q_PJFET_DSG
+D Transistor P-JFET (general)
+K pjfet p-jfet transistor
+$ENDCMP
+#
+$CMP Q_PJFET_GDS
+D Transistor P-JFET (general)
+K pjfet p-jfet transistor
+$ENDCMP
+#
+$CMP Q_PJFET_GSD
+D Transistor P-JFET (general)
+K pjfet p-jfet transistor
+$ENDCMP
+#
+$CMP Q_PJFET_SDG
+D Transistor P-JFET (general)
+K pjfet p-jfet transistor
+$ENDCMP
+#
+$CMP Q_PJFET_SGD
+D Transistor P-JFET (general)
+K pjfet p-jfet transistor
+$ENDCMP
+#
+$CMP Q_PMOS_DGS
+D Transistor P-MOSFET (general)
+K pmos p-mos p-mosfet transistor
+$ENDCMP
+#
+$CMP Q_PMOS_DSG
+D Transistor P-MOSFET (general)
+K pmos p-mos p-mosfet transistor
+$ENDCMP
+#
+$CMP Q_PMOS_GDS
+D Transistor P-MOSFET (general)
+K pmos p-mos p-mosfet transistor
+$ENDCMP
+#
+$CMP Q_PMOS_GDSD
+D Transistor P-MOSFET, collector connected to mounting plane (general)
+K pmos p-mos p-mosfet transistor
+$ENDCMP
+#
+$CMP Q_PMOS_GSD
+D Transistor P-MOSFET (general)
+K pmos p-mos p-mosfet transistor
+$ENDCMP
+#
+$CMP Q_PMOS_SDG
+D Transistor P-MOSFET (general)
+K pmos p-mos p-mosfet transistor
+$ENDCMP
+#
+$CMP Q_PMOS_SDGD
+D Transistor P-MOSFET, collector connected to mounting plane (general)
+K pmos p-mos p-mosfet transistor
+$ENDCMP
+#
+$CMP Q_PMOS_SGD
+D Transistor P-MOSFET (general)
+K pmos p-mos p-mosfet transistor
+$ENDCMP
+#
+$CMP Q_PNP_BCE
+D Transistor PNP (general)
+K pnp transistor
+$ENDCMP
+#
+$CMP Q_PNP_BCEC
+D Transistor PNP, collector connected to mounting plane (general)
+K pnp transistor
+$ENDCMP
+#
+$CMP Q_PNP_BEC
+D Transistor PNP (general)
+K pnp transistor
+$ENDCMP
+#
+$CMP Q_PNP_CBE
+D Transistor PNP (general)
+K pnp transistor
+$ENDCMP
+#
+$CMP Q_PNP_CEB
+D Transistor PNP (general)
+K pnp transistor
+$ENDCMP
+#
+$CMP Q_PNP_EBC
+D Transistor PNP (general)
+K pnp transistor
+$ENDCMP
+#
+$CMP Q_PNP_ECB
+D Transistor PNP (general)
+K pnp transistor
+$ENDCMP
+#
+$CMP Q_PNP_ECBC
+D Transistor PNP, collector connected to mounting plane (general)
+K pnp transistor
+$ENDCMP
+#
+$CMP R
+D Resistor
+K R DEV
+$ENDCMP
+#
+$CMP RR8
+D 8 resistors
+K R DEV
+$ENDCMP
+#
+$CMP R_PACK4
+D 4 resistors Pack
+K R DEV
+$ENDCMP
+#
+$CMP R_PACK8
+D 8 resistors Pack
+K R DEV
+$ENDCMP
+#
+$CMP R_Small
+D Resistor
+$ENDCMP
+#
+$CMP SCHDPAK
+D Diode schotty - cms
+K DIODE SCHOTTKY CMS
+$ENDCMP
+#
+$CMP SCR
+D Thyristor
+$ENDCMP
+#
+$CMP SP3T
+D 3 position switch, SP3T
+K switch SP3T
+$ENDCMP
+#
+$CMP SPST
+D Interrupteur simple
+K switch
+$ENDCMP
+#
+$CMP SWITCH_INV
+D inverseur
+K switch
+$ENDCMP
+#
+$CMP SWITCH_INV_MSM
+D Switch inverseur M S M
+K switch
+$ENDCMP
+#
+$CMP SW_PUSH
+D Button
+K Switch
+$ENDCMP
+#
+$CMP Switch_DPST
+D Double Pole Single Throw (DPST) Switch
+K switch
+$ENDCMP
+#
+$CMP Switch_SPDT_x2
+D Double Single Pole Double Throw (SPDT) switch
+$ENDCMP
+#
+$CMP THERMISTOR
+D Resistance
+K R DEV
+$ENDCMP
+#
+$CMP THYRISTOR
+D Diode simple
+K DEV DIODE
+$ENDCMP
+#
+$CMP TVS
+D Transient voltage suppressor diode (bi-directional)
+K DEV TVS TRANSIENT SUPPROESSOR ESD
+$ENDCMP
+#
+$CMP VR
+D VARISTANCE
+K VR  DEV
+$ENDCMP
+#
+$CMP ZENER
+D Diode zener
+K DEV DIODE
+$ENDCMP
+#
+#End Doc Library
diff --git a/demos/sim/device.lib b/demos/sim/device.lib
new file mode 100644
index 0000000000..8ac1269f1e
--- /dev/null
+++ b/demos/sim/device.lib
@@ -0,0 +1,3585 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# Battery
+#
+DEF Battery BT 0 0 N Y 1 F N
+F0 "BT" 100 50 50 H V L CNN
+F1 "Battery" 100 -50 50 H V L CNN
+F2 "" 0 40 50 V V C CNN
+F3 "" 0 40 50 V V C CNN
+DRAW
+P 2 0 1 10 20 95 60 95 N
+P 2 0 1 10 40 115 40 75 N
+S -90 -7 90 -17 0 1 0 F
+S -90 50 90 40 0 1 0 F
+S -62 -30 58 -50 0 1 0 F
+S -62 27 58 7 0 1 0 F
+X ~ 1 0 150 100 D 50 50 1 1 P
+X ~ 2 0 -150 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# C
+#
+DEF C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ C?
+ C_????_*
+ C_????
+ SMD*_c
+ Capacitor*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 40 40 1 1 P
+X ~ 2 0 -150 110 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CP
+#
+DEF CP C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "CP" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ CP*
+ C_Axial*
+ C_Radial*
+ TantalC*
+ C*elec
+ c_elec*
+ SMD*_Pol
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -70 90 -30 90 N
+P 2 0 1 0 -50 110 -50 70 N
+S -90 20 -90 40 0 1 0 N
+S -90 20 90 20 0 1 0 N
+S 90 -20 -90 -40 0 1 0 F
+S 90 40 -90 40 0 1 0 N
+S 90 40 90 20 0 1 0 N
+X ~ 1 0 150 110 D 40 40 1 1 P
+X ~ 2 0 -150 110 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CP1
+#
+DEF CP1 C 0 10 N N 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "CP1" 25 -100 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ SMD*_Pol
+ C_Axial*
+ C_Radial*
+ c_elec*
+ C*elec
+ TantalC*
+ CP*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 30 80 30 N
+P 2 0 1 0 -70 90 -30 90 N
+P 2 0 1 0 -50 70 -50 110 N
+A 0 -150 128 1287 513 0 1 20 N -80 -50 80 -50
+X ~ 1 0 150 110 D 40 40 1 1 P
+X ~ 2 0 -150 130 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CP1_Small
+#
+DEF CP1_Small C 0 10 N N 1 F N
+F0 "C" 10 70 50 H V L CNN
+F1 "CP1_Small" 10 -80 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ CP*
+ C_Axial*
+ C_Radial*
+ TantalC*
+ C*elec
+ c_elec*
+ SMD*_Pol
+$ENDFPLIST
+DRAW
+P 2 0 1 12 -60 20 60 20 N
+P 2 0 1 0 -50 60 -30 60 N
+P 2 0 1 0 -40 50 -40 70 N
+A 0 -140 125 1186 614 0 1 12 N -60 -30 60 -30
+X ~ 1 0 100 80 D 40 40 1 1 P
+X ~ 2 0 -100 80 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CP_Small
+#
+DEF CP_Small C 0 10 N N 1 F N
+F0 "C" 10 70 50 H V L CNN
+F1 "CP_Small" 10 -80 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ CP*
+ C_Axial*
+ C_Radial*
+ TantalC*
+ C*elec
+ c_elec*
+ SMD*_Pol
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -50 60 -30 60 N
+P 2 0 1 0 -40 50 -40 70 N
+S -60 -12 60 -27 0 1 0 F
+S -60 27 60 12 0 1 0 N
+X ~ 1 0 100 73 D 40 40 1 1 P
+X ~ 2 0 -100 73 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CRYSTAL_SMD
+#
+DEF CRYSTAL_SMD X 0 40 Y N 1 F N
+F0 "X" 0 90 50 H V C CNN
+F1 "CRYSTAL_SMD" 30 -110 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -70 -70 70 -70 N
+P 2 0 1 16 -70 50 -70 -50 N
+P 2 0 1 16 70 50 70 -50 N
+P 5 0 1 12 -40 40 40 40 40 -40 -40 -40 -40 40 f
+X 1 1 -200 0 130 R 25 20 1 1 P
+X 2 2 200 0 130 L 25 20 1 1 P
+X case 3 0 -100 30 U 25 20 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CTRIM
+#
+DEF CTRIM C 0 10 N N 1 F N
+F0 "C" 60 -80 50 H V C CNN
+F1 "CTRIM" 120 -140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+P 2 0 1 12 50 100 -50 -100 N
+P 2 0 1 12 50 100 20 90 N
+P 2 0 1 12 50 100 60 70 N
+X ~ 1 0 150 120 D 40 40 1 1 P
+X ~ 2 0 -150 120 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# C_Small
+#
+DEF C_Small C 0 10 N N 1 F N
+F0 "C" 10 70 50 H V L CNN
+F1 "C_Small" 10 -80 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ C?
+ C_????_*
+ C_????
+ SMD*_c
+ Capacitor*
+$ENDFPLIST
+DRAW
+P 2 0 1 13 -60 -20 60 -20 N
+P 2 0 1 12 -60 20 60 20 N
+X ~ 1 0 100 75 D 40 40 1 1 P
+X ~ 2 0 -100 80 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Coded_Switch
+#
+DEF Coded_Switch SW 0 40 Y Y 1 F N
+F0 "SW" 100 350 50 H V C CNN
+F1 "Coded_Switch" 0 -349 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 11 0 1 0 -10 -100 -10 80 -30 60 -50 60 0 110 50 60 30 60 10 80 10 -100 -10 -100 -10 -100 N
+S 300 300 -300 -300 0 1 0 f
+C 0 0 150 0 1 0 N
+X CM 1 600 250 300 L 50 50 1 1 P
+X D0 2 600 50 300 L 50 50 1 1 P
+X D1 3 600 -50 300 L 50 50 1 1 P
+X D2 4 600 -150 300 L 50 50 1 1 P
+X D3 5 600 -250 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Crystal
+#
+DEF Crystal Y 0 40 N N 1 F N
+F0 "Y" 0 150 50 H V C CNN
+F1 "Crystal" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Crystal_*
+$ENDFPLIST
+DRAW
+P 2 0 1 12 -100 -50 -100 50 N
+P 2 0 1 12 100 -50 100 50 N
+S -50 100 50 -100 0 1 12 N
+X 1 1 -150 0 50 R 40 40 1 1 P
+X 2 2 150 0 50 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Crystal_Small
+#
+DEF Crystal_Small Y 0 40 N N 1 F N
+F0 "Y" 0 100 50 H V C CNN
+F1 "Crystal_Small" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Crystal_
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -50 -30 -50 30 N
+P 2 0 1 0 50 -30 50 30 N
+S -30 -60 30 60 0 1 0 N
+X 1 1 -100 0 50 R 40 40 1 1 P
+X 2 2 100 0 50 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D
+#
+DEF D D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Diode_*
+ D-Pak_TO252AA
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+$ENDFPLIST
+DRAW
+P 2 0 1 6 -50 50 -50 -50 N
+P 3 0 1 0 50 50 -50 0 50 -50 F
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DUAL_POT
+#
+DEF DUAL_POT RV 0 40 Y N 1 F N
+F0 "RV" 160 310 50 H V C CNN
+F1 "DUAL_POT" 290 -300 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 4 0 1 0 200 200 80 200 80 200 80 200 N
+P 5 0 1 0 80 -220 80 -180 50 -200 80 -220 80 -220 N
+P 5 0 1 0 150 -200 100 -180 130 -150 150 -200 150 -200 N
+P 5 0 1 0 200 -200 80 -200 80 -200 80 -200 80 -200 N
+P 6 0 1 0 80 180 80 220 50 200 80 180 80 180 80 180 N
+P 6 0 1 0 110 160 100 150 100 -150 110 -160 110 -160 110 -160 N
+P 6 0 1 0 150 200 100 180 130 150 150 200 150 200 150 200 N
+T 0 -20 -100 30 0 0 0 H Normal 0 C C
+T 0 -20 300 30 0 0 0 H Normal 0 C C
+T 0 -20 -300 30 0 0 0 L Normal 0 C C
+T 0 -20 100 30 0 0 0 L Normal 0 C C
+S -100 250 -100 250 0 1 0 N
+S -100 250 -100 250 0 1 0 N
+S -100 250 -100 250 0 1 0 N
+S -100 250 -100 250 0 1 0 N
+S -50 -50 50 -350 0 1 0 N
+S -50 350 50 50 0 1 0 N
+X 1 1 -150 300 100 R 40 40 1 1 P
+X 2 2 300 200 100 L 40 40 1 1 P
+X 3 3 -150 100 100 R 40 40 1 1 P
+X ~ 4 -150 -100 100 R 40 40 1 1 P
+X ~ 5 300 -200 100 L 40 40 1 1 P
+X ~ 6 -150 -300 100 R 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky
+#
+DEF D_Schottky D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Schottky" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ D-Pak_TO252AA
+ Diode_*
+ *SingleDiode
+ *SingleDiode*
+ *_Diode_*
+$ENDFPLIST
+DRAW
+P 3 0 1 0 50 50 -50 0 50 -50 F
+P 6 0 1 8 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_Small
+#
+DEF D_Schottky_Small D 0 10 N N 1 F N
+F0 "D" -50 80 50 H V L CNN
+F1 "D_Schottky_Small" -280 -80 50 H V L CNN
+F2 "" 0 0 50 V V C CNN
+F3 "" 0 0 50 V V C CNN
+$FPLIST
+ Diode_*
+ D-Pak_TO252AA
+ *SingleDiode
+ *SingleDiode*
+ *_Diode_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -30 -40 -30 40 N
+P 3 0 1 0 -30 -40 -20 -40 -20 -30 N
+P 3 0 1 0 -30 40 -40 40 -40 30 N
+P 4 0 1 0 30 -40 -30 0 30 40 30 -40 F
+X K 1 -100 0 70 R 50 50 1 1 P
+X A 2 100 0 70 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_x2_ACom_AKK
+#
+DEF D_Schottky_x2_ACom_AKK D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_x2_ACom_AKK" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -150 50 -150 -50 -150 -50 N
+P 3 0 1 10 -50 0 50 0 50 0 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -150 50 -170 50 -170 40 -170 40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -130 -40 -130 -50 -150 -50 -150 -50 -150 -50 N
+P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X A 1 0 -200 100 U 50 50 0 1 P
+X K 2 -300 0 150 R 50 50 0 1 P
+X K 3 300 0 150 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_x2_ACom_KAK
+#
+DEF D_Schottky_x2_ACom_KAK D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_x2_ACom_KAK" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -150 50 -150 -50 -150 -50 N
+P 3 0 1 10 -50 0 50 0 50 0 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -150 50 -170 50 -170 40 -170 40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -130 -40 -130 -50 -150 -50 -150 -50 -150 -50 N
+P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X K 1 -300 0 150 R 50 50 0 1 P
+X A 2 0 -200 100 U 50 50 0 1 P
+X K 3 300 0 150 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_x2_ACom_KKA
+#
+DEF D_Schottky_x2_ACom_KKA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_x2_ACom_KKA" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -150 50 -150 -50 -150 -50 N
+P 3 0 1 10 -50 0 50 0 50 0 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -150 50 -170 50 -170 40 -170 40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -130 -40 -130 -50 -150 -50 -150 -50 -150 -50 N
+P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X K 1 -300 0 150 R 50 50 0 1 P
+X K 2 300 0 150 L 50 50 0 1 P
+X A 3 0 -200 100 U 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_x2_KCom_AAK
+#
+DEF D_Schottky_x2_KCom_AAK D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_x2_KCom_AAK" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 -50 0 50 0 50 0 N
+P 3 0 1 10 50 -50 50 50 50 50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 50 -50 70 -50 70 -40 70 -40 N
+P 4 0 1 10 50 50 30 50 30 40 30 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
+X A 1 -300 0 150 R 50 50 0 1 P
+X A 2 300 0 150 L 50 50 0 1 P
+X K 3 0 -200 100 U 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_x2_KCom_AKA
+#
+DEF D_Schottky_x2_KCom_AKA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_x2_KCom_AKA" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 -50 0 50 0 50 0 N
+P 3 0 1 10 50 -50 50 50 50 50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 50 -50 70 -50 70 -40 70 -40 N
+P 4 0 1 10 50 50 30 50 30 40 30 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
+X A 1 -300 0 150 R 50 50 0 1 P
+X K 2 0 -200 100 U 50 50 0 1 P
+X A 3 300 0 150 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_x2_KCom_KAA
+#
+DEF D_Schottky_x2_KCom_KAA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_x2_KCom_KAA" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 -50 0 50 0 50 0 N
+P 3 0 1 10 50 -50 50 50 50 50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 50 -50 70 -50 70 -40 70 -40 N
+P 4 0 1 10 50 50 30 50 30 40 30 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
+X K 1 0 -200 100 U 50 50 0 1 P
+X A 2 -300 0 150 R 50 50 0 1 P
+X A 3 300 0 150 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_x2_Serial_ACK
+#
+DEF D_Schottky_x2_Serial_ACK D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_x2_Serial_ACK" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 0 0 -100 N
+P 2 0 1 0 250 0 300 0 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 -50 0 50 0 50 0 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X A 1 -300 0 150 R 50 50 0 1 P
+X common 2 0 -200 100 U 50 50 0 1 P
+X K 3 300 0 150 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_x2_Serial_AKC
+#
+DEF D_Schottky_x2_Serial_AKC D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_x2_Serial_AKC" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 0 0 -100 N
+P 2 0 1 0 250 0 300 0 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 -50 0 50 0 50 0 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X A 1 -300 0 150 R 50 50 0 1 P
+X K 2 300 0 150 L 50 50 0 1 P
+X common 3 0 -200 100 U 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_x2_Serial_CAK
+#
+DEF D_Schottky_x2_Serial_CAK D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_x2_Serial_CAK" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 -50 0 50 0 50 0 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X common 1 0 -200 100 U 50 50 0 1 P
+X A 2 -300 0 150 R 50 50 0 1 P
+X K 3 300 0 150 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_x2_Serial_CKA
+#
+DEF D_Schottky_x2_Serial_CKA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_x2_Serial_CKA" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 -50 0 50 0 50 0 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X common 1 0 -200 100 U 50 50 0 1 P
+X K 2 300 0 150 L 50 50 0 1 P
+X A 3 -300 0 150 R 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_x2_Serial_KAC
+#
+DEF D_Schottky_x2_Serial_KAC D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_x2_Serial_KAC" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 0 0 -100 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 -50 0 50 0 50 0 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X K 1 300 0 150 L 50 50 0 1 P
+X A 2 -300 0 150 R 50 50 0 1 P
+X common 3 0 -200 100 U 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Schottky_x2_Serial_KCA
+#
+DEF D_Schottky_x2_Serial_KCA D 0 30 Y N 1 F N
+F0 "D" 50 -100 50 H V C CNN
+F1 "D_Schottky_x2_Serial_KCA" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 0 0 -100 N
+P 2 0 1 0 250 0 300 0 N
+P 3 0 1 10 -50 -50 -50 50 -50 50 N
+P 3 0 1 10 -50 0 50 0 50 0 N
+P 3 0 1 10 150 50 150 -50 150 -50 N
+P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
+P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
+P 4 0 1 10 150 50 130 50 130 40 130 40 N
+P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
+P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X K 1 300 0 150 L 50 50 0 1 P
+X common 2 0 -200 100 U 50 50 0 1 P
+X A 3 -300 0 150 R 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# D_Small
+#
+DEF D_Small D 0 10 N N 1 F N
+F0 "D" -50 80 50 H V L CNN
+F1 "D_Small" -150 -80 50 H V L CNN
+F2 "" 0 0 50 V V C CNN
+F3 "" 0 0 50 V V C CNN
+$FPLIST
+ Diode_*
+ D-Pak_TO252AA
+ *SingleDiode
+ *SingleDiode*
+ *_Diode_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -30 -40 -30 40 N
+P 4 0 1 0 30 -40 -30 0 30 40 30 -40 F
+X K 1 -100 0 70 R 50 50 1 1 P
+X A 2 100 0 70 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Darl_NPN
+#
+DEF Darl_NPN Q 0 10 Y Y 1 F N
+F0 "Q" 0 200 50 H V C CNN
+F1 "Darl_NPN" -200 -150 50 H V C CNN
+F2 "" 0 -50 50 H V C CNN
+F3 "" 0 -50 50 H V C CNN
+$FPLIST
+ OldSowjetaera_Transistor*
+ Q_*
+ Transistor_*
+ SO-8_PowerPAK_Vishay_Single
+ VLM0806_Housing
+ VLM0806_Housing*
+ powermite3
+ sc70
+ sc70*
+ sot*
+ TO-220_Bipolar*
+ TO-220_Neutral123
+ TO-247_Horizontal_Neutral123
+$ENDFPLIST
+DRAW
+P 2 0 0 0 -150 -100 -150 100 N
+P 2 0 0 0 50 0 50 -200 N
+P 2 0 1 0 50 -100 150 -200 N
+P 3 0 1 0 -150 0 -50 -100 50 -100 N
+P 3 0 1 0 -150 0 -50 100 150 100 N
+P 3 0 1 0 -50 -100 -65 -20 -130 -90 F
+P 3 0 1 0 50 -100 150 0 150 100 N
+P 3 0 1 0 150 -200 135 -120 70 -185 F
+X ~ 1 150 -300 100 U 40 40 1 1 P
+X ~ 2 -250 0 100 R 40 40 1 1 I
+X ~ 3 150 200 100 D 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Diode_Bridge
+#
+DEF Diode_Bridge D 0 50 Y Y 1 F N
+F0 "D" -250 300 50 H V C CNN
+F1 "Diode_Bridge" 350 -350 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 0 0  -300 0  -200 -100 N
+P 2 0 0 0  -300 0  -200 100 N
+P 2 0 0 8  -150 -250  -50 -150 N
+P 2 0 0 8  -150 250  -50 150 N
+P 2 0 0 0  0 -300  -100 -200 N
+P 2 0 0 0  0 -300  100 -200 N
+P 2 0 0 0  0 300  -100 200 N
+P 2 0 0 0  0 300  100 200 N
+P 2 0 0 8  150 -50  250 -150 N
+P 2 0 0 8  150 50  250 150 N
+P 2 0 0 0  300 0  200 -100 N
+P 2 0 0 0  300 0  200 100 N
+P 4 0 0 0  -250 -150  -150 -50  -100 -200  -250 -150 F
+P 4 0 0 0  -150 50  -250 150  -100 200  -150 50 F
+P 4 0 0 0  50 -150  150 -250  200 -100  50 -150 F
+P 4 0 0 0  50 150  150 250  200 100  50 150 F
+X - 1 -400 0 100 R 50 50 1 1 I
+X ~ 2 0 -400 100 U 50 50 1 1 I
+X + 3 400 0 100 L 50 50 1 1 I
+X ~ 4 0 400 100 D 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# EMI_FILTER
+#
+DEF EMI_FILTER FI 0 40 Y N 1 F N
+F0 "FI" 150 150 50 H V C CNN
+F1 "EMI_FILTER" 400 -148 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 0 -260 -80 260 -80 260 -80 N
+P 5 0 1 0 -260 -40 260 -40 260 -40 260 -40 260 -40 N
+A -250 0 50 1 1799 0 1 0 N -200 0 -300 0
+A -150 0 50 1 1799 0 1 0 N -100 0 -200 0
+A -50 0 50 1 1799 0 1 0 N 0 0 -100 0
+A 0 0 0 0 0 0 1 0 N 0 0 0 0
+A 50 0 50 1 1799 0 1 0 N 100 0 0 0
+A 150 0 50 1 1799 0 1 0 N 200 0 100 0
+A 250 0 50 1 1799 0 1 0 N 300 0 200 0
+X VI 1 -450 0 150 R 40 40 1 1 P
+X GND 2 0 -250 170 U 40 40 1 1 P
+X VO 3 450 0 150 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# EMI_FILTER2
+#
+DEF EMI_FILTER2 FI 0 40 Y N 1 F N
+F0 "FI" 0 100 50 H V C CNN
+F1 "EMI_FILTER2" 50 -150 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 4 0 1 0 -150 -80 150 -80 150 -80 150 -80 N
+P 4 0 1 0 -150 -30 150 -30 150 -30 150 -30 N
+A -150 0 50 1 1799 0 1 0 N -100 0 -200 0
+A -50 0 50 1 1799 0 1 0 N 0 0 -100 0
+A 0 0 0 0 0 0 1 0 N 0 0 0 0
+A 50 0 50 1 1799 0 1 0 N 100 0 0 0
+A 150 0 50 1 1799 0 1 0 N 200 0 100 0
+X VI 1 -350 0 150 R 40 40 1 1 P
+X GND 2 0 -250 170 U 40 40 1 1 P
+X VO 3 350 0 150 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# FILTER
+#
+DEF FILTER FB 0 40 Y N 1 F N
+F0 "FB" 0 150 50 H V C CNN
+F1 "FILTER" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+S -225 75 225 -50 0 1 0 N
+A -150 0 50 1 1799 0 1 0 N -100 0 -200 0
+A -50 0 50 1 1799 0 1 0 N 0 0 -100 0
+A 0 0 0 0 0 0 1 0 N 0 0 0 0
+A 50 0 50 1 1799 0 1 0 N 100 0 0 0
+A 150 0 50 1 1799 0 1 0 N 200 0 100 0
+X 1 1 -350 0 150 R 40 40 1 1 P
+X 2 2 350 0 150 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# FP_Small
+#
+DEF FP_Small F 0 10 N N 1 F N
+F0 "F" -40 60 50 H V L CNN
+F1 "FP_Small" -120 -60 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ CP*
+ SM*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -50 0 50 0 N
+S -50 20 -30 -20 0 1 0 F
+S -50 20 50 -20 0 1 0 N
+X ~ 1 -100 0 50 R 40 40 1 1 W
+X ~ 2 100 0 50 L 40 40 1 1 w
+ENDDRAW
+ENDDEF
+#
+# FUSE
+#
+DEF FUSE F 0 10 Y Y 1 F N
+F0 "F" 100 50 50 H V C CNN
+F1 "FUSE" -100 -50 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+A -75 0 75 1 1799 0 1 0 N 0 0 -150 0
+A 75 0 75 -1799 -1 0 1 0 N 0 0 150 0
+X ~ 1 -250 0 100 R 40 40 1 1 I
+X ~ 2 250 0 100 L 40 40 1 1 I
+ENDDRAW
+ENDDEF
+#
+# F_Small
+#
+DEF F_Small F 0 10 N N 1 F N
+F0 "F" -40 60 50 H V L CNN
+F1 "F_Small" -120 -60 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ CP*
+ SM*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -50 0 50 0 N
+S -50 20 50 -20 0 1 0 N
+X ~ 1 -100 0 50 R 40 40 1 1 P
+X ~ 2 100 0 50 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# HCPLXX
+#
+DEF HCPLXX U 0 10 Y Y 1 F N
+F0 "U" 0 550 50 H V C CNN
+F1 "HCPLXX" 0 -550 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 0 0 -250 -50 -50 -50 N
+P 2 0 0 0 -100 -100 -50 -150 N
+P 2 0 0 0 -100 -100 -50 -150 N
+P 2 0 0 0 -100 -100 0 -150 N
+P 2 0 0 0 -100 -100 0 -150 N
+P 3 0 0 0 -50 -150 -50 -150 -100 -150 N
+P 3 0 0 0 -50 -150 -50 -150 -100 -150 N
+P 3 0 0 0 -50 -100 0 -150 -50 -100 N
+P 3 0 0 0 -50 -100 0 -150 -50 -100 N
+P 2 0 1 0 200 -150 200 -350 N
+P 2 0 1 0 200 200 200 200 F
+P 3 0 1 0 -350 200 -150 200 -150 100 N
+P 3 0 1 0 -250 100 -50 100 -150 -50 F
+P 3 0 1 0 -150 -50 -150 -150 -350 -150 N
+P 3 0 1 0 50 300 250 300 250 300 f
+P 3 0 1 0 200 -250 300 -350 350 -350 N
+P 3 0 1 0 200 -250 300 -150 350 -150 N
+P 3 0 1 0 300 -350 295 -300 250 -345 F
+P 4 0 1 0 50 150 250 150 150 300 150 300 F
+P 4 0 1 0 150 50 150 400 350 400 350 400 N
+P 4 0 1 0 200 -250 150 -250 150 50 350 50 N
+S -350 500 350 -500 0 1 0 N
+X NC 1 -550 400 200 R 50 50 1 1 U
+X ~ 2 -550 200 200 R 50 50 1 1 I
+X ~ 3 -550 -150 200 R 50 50 1 1 O
+X NC 4 -550 -350 200 R 50 50 1 1 I
+X ~ 5 550 -350 200 L 50 50 1 1 I
+X ~ 6 550 -150 200 L 50 50 1 1 I
+X ~ 7 550 50 200 L 50 50 1 1 U
+X ~ 8 550 400 200 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# HEATSINK
+#
+DEF HEATSINK HS 0 40 Y Y 1 F N
+F0 "HS" 0 200 50 H V C CNN
+F1 "HEATSINK" 0 -50 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 10 0 1 0 -25 50 -50 50 -50 150 -75 150 -75 50 -100 50 -100 150 -125 150 -125 0 -50 0 N
+P 13 0 1 0 -25 50 -25 150 0 150 0 50 25 50 25 150 50 150 50 50 75 50 75 150 100 150 100 0 -50 0 N
+ENDDRAW
+ENDDEF
+#
+# INDUCTOR
+#
+DEF INDUCTOR L 0 40 N N 1 F N
+F0 "L" -50 0 50 V V C CNN
+F1 "INDUCTOR" 100 0 50 V V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Choke_*
+ *Coil*
+$ENDFPLIST
+DRAW
+A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
+A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
+A 0 51 51 -889 889 0 1 0 N 1 1 1 102
+A 0 148 48 -889 889 0 1 0 N 1 101 1 196
+X 1 1 0 300 100 D 50 50 1 1 P
+X 2 2 0 -300 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# INDUCTOR_SMALL
+#
+DEF INDUCTOR_SMALL L 0 0 N N 1 F N
+F0 "L" 0 100 50 H V C CNN
+F1 "INDUCTOR_SMALL" 0 -50 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Choke_*
+ *Coil*
+$ENDFPLIST
+DRAW
+A -150 0 50 1 1799 0 1 0 N -100 0 -200 0
+A -50 0 50 1 1799 0 1 0 N 0 0 -100 0
+A 50 0 50 1 1799 0 1 0 N 100 0 0 0
+A 150 0 50 1 1799 0 1 0 N 200 0 100 0
+X 1 1 -250 0 50 R 30 30 1 1 I
+X 2 2 250 0 50 L 30 30 1 1 I
+ENDDRAW
+ENDDEF
+#
+# JACK_2P
+#
+DEF JACK_2P J 0 40 Y Y 1 F N
+F0 "J" -350 -200 50 H V C CNN
+F1 "JACK_2P" -150 250 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 0 150 0 300 0 300 0 N
+P 4 0 1 0 0 -100 -50 -50 -100 -100 -100 -100 N
+P 4 0 1 0 0 -100 300 -100 300 -100 300 -100 N
+P 4 0 1 0 50 -50 100 -100 150 -50 150 -50 N
+P 4 0 1 0 150 0 100 0 100 -100 100 -100 N
+P 5 0 1 0 300 150 -250 150 -300 100 -350 150 -350 150 N
+S -450 150 -400 -100 0 1 0 F
+S 300 -150 -400 200 0 1 0 N
+X ~ 1 450 -100 150 L 50 50 1 1 P
+X ~ 2 450 0 150 L 50 50 1 1 P
+X ~ 3 450 150 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# JUMPER
+#
+DEF JUMPER JP 0 30 Y N 1 F N
+F0 "JP" 0 150 50 H V C CNN
+F1 "JUMPER" 0 -80 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C -100 0 35 0 1 0 N
+C 100 0 35 0 1 0 N
+A 0 -26 125 1426 373 0 1 0 N -98 50 99 50
+X 1 1 -300 0 165 R 50 50 0 1 P
+X 2 2 300 0 165 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# JUMPER3
+#
+DEF JUMPER3 JP 0 30 Y N 1 F N
+F0 "JP" 50 -100 50 H V L CNN
+F1 "JUMPER3" 0 100 50 H V C BNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C -120 0 35 0 1 0 N
+C 0 0 36 0 1 0 N
+C 120 0 35 0 1 0 N
+A -60 10 64 386 1413 0 1 0 N -10 50 -110 50
+A 60 10 64 386 1413 0 1 0 N 110 50 10 50
+X 1 1 -250 0 95 R 40 40 0 1 P
+X 2 2 0 -100 60 U 40 40 0 1 P
+X 3 3 250 0 95 L 40 40 0 1 P
+ENDDRAW
+ENDDEF
+#
+# Jumper_NC_Small
+#
+DEF ~Jumper_NC_Small JP 0 30 N N 1 F N
+F0 "JP" 0 80 50 H V C CNN
+F1 "Jumper_NC_Small" 10 -60 50 H I C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C -40 0 20 0 1 0 N
+C 40 0 20 0 1 0 N
+A 0 -10 57 450 1350 0 1 0 N 40 30 -40 30
+X 1 1 -100 0 40 R 50 50 0 1 P
+X 2 2 100 0 40 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# Jumper_NO_Small
+#
+DEF ~Jumper_NO_Small JP 0 30 N N 1 F N
+F0 "JP" 0 80 50 H V C CNN
+F1 "Jumper_NO_Small" 10 -60 50 H I C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C -40 0 20 0 1 0 N
+C 40 0 20 0 1 0 N
+X 1 1 -100 0 40 R 50 50 0 1 P
+X 2 2 100 0 40 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# LED
+#
+DEF LED D 0 40 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "LED" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ LED-*
+ LED_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -50 50 -50 -50 N
+P 3 0 1 0 -80 -25 -125 -65 -120 -40 N
+P 3 0 1 0 -65 -40 -110 -80 -105 -55 N
+P 3 0 1 0 50 50 -50 0 50 -50 F
+X K 1 -200 0 150 R 40 40 1 1 P
+X A 2 200 0 150 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED_RABG
+#
+DEF LED_RABG D 0 50 Y N 1 F N
+F0 "D" 75 350 50 H V C CNN
+F1 "LED_RABG" 25 -350 50 H V C CNN
+F2 "" -50 -50 50 H V C CNN
+F3 "" -50 -50 50 H V C CNN
+DRAW
+P 2 0 1 0 -75 -200 -150 -200 N
+P 2 0 1 0 -75 -150 -75 -250 N
+P 2 0 1 0 -75 0 -150 0 N
+P 2 0 1 0 -75 200 -150 200 N
+P 2 0 1 0 25 0 150 0 N
+P 3 0 1 0 -75 50 -75 -50 -75 -50 N
+P 3 0 1 0 -75 250 -75 150 -75 150 N
+P 4 0 1 0 -78 -116 -98 -116 -78 -126 -78 -126 N
+P 4 0 1 0 -65 80 -85 80 -65 70 -65 70 N
+P 4 0 1 0 -65 280 -85 280 -65 270 -65 270 N
+P 4 0 1 0 25 200 75 200 75 -200 25 -200 N
+P 5 0 1 0 -5 -150 -55 -140 -45 -130 -85 -120 -85 -120 N
+P 5 0 1 0 25 -150 25 -250 -75 -200 25 -150 25 -150 F
+P 6 0 1 0 -5 50 -55 60 -45 70 -85 80 -85 80 -85 80 N
+P 6 0 1 0 -5 250 -55 260 -45 270 -85 280 -85 280 -85 280 N
+P 6 0 1 0 25 50 25 -50 -75 0 25 50 25 50 25 50 F
+P 6 0 1 0 25 250 25 150 -75 200 25 250 25 250 25 250 F
+S 25 -50 25 50 0 1 0 N
+S 25 50 25 50 0 1 0 N
+S 25 150 25 250 0 1 0 N
+S 25 250 25 250 0 1 0 N
+S 150 300 -150 -300 0 1 0 f
+X RED_CATHODE 1 -300 200 150 R 50 50 1 1 P
+X COMMON_ANODE 2 300 0 150 L 50 50 1 1 P
+X BLUE_CATHODE 3 -300 -200 150 R 50 50 1 1 P
+X GREEN_CATHODE 4 -300 0 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED_RCBG
+#
+DEF LED_RCBG D 0 50 Y N 1 F N
+F0 "D" 0 350 50 H V C CNN
+F1 "LED_RCBG" 0 -350 50 H V C CNN
+F2 "" 0 -50 50 H V C CNN
+F3 "" 0 -50 50 H V C CNN
+DRAW
+P 2 0 1 0 -25 -150 -25 -250 N
+P 2 0 1 0 -25 0 -150 0 N
+P 2 0 1 0 75 -200 150 -200 N
+P 2 0 1 0 75 0 150 0 N
+P 2 0 1 0 75 200 150 200 N
+P 3 0 1 0 -25 50 -25 -50 -25 -50 N
+P 3 0 1 0 -25 250 -25 150 -25 150 N
+P 4 0 1 0 -28 -116 -48 -116 -28 -126 -28 -126 N
+P 4 0 1 0 -25 200 -75 200 -75 -200 -25 -200 N
+P 4 0 1 0 -15 80 -35 80 -15 70 -15 70 N
+P 4 0 1 0 -15 280 -35 280 -15 270 -15 270 N
+P 5 0 1 0 45 -150 -5 -140 5 -130 -35 -120 -35 -120 N
+P 5 0 1 0 75 -150 75 -250 -25 -200 75 -150 75 -150 F
+P 6 0 1 0 45 50 -5 60 5 70 -35 80 -35 80 -35 80 N
+P 6 0 1 0 45 250 -5 260 5 270 -35 280 -35 280 -35 280 N
+P 6 0 1 0 75 50 75 -50 -25 0 75 50 75 50 75 50 F
+P 6 0 1 0 75 250 75 150 -25 200 75 250 75 250 75 250 F
+S 75 -50 75 50 0 1 0 N
+S 75 50 75 50 0 1 0 N
+S 75 150 75 250 0 1 0 N
+S 75 250 75 250 0 1 0 N
+S 150 300 -150 -300 0 1 0 f
+X RED_ANODE 1 300 200 150 L 50 50 1 1 P
+X COMMON_CATHODE 2 -300 0 150 R 50 50 1 1 P
+X BLUE_ANODE 3 300 -200 150 L 50 50 1 1 P
+X GREEN_ANODE 4 300 0 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED_RGB
+#
+DEF LED_RGB D 0 0 Y Y 1 F N
+F0 "D" 0 425 50 H V C CNN
+F1 "LED_RGB" 0 350 50 H V C CNN
+F2 "" 0 -50 50 H V C CNN
+F3 "" 0 -50 50 H V C CNN
+DRAW
+P 2 0 1 0 -50 -200 -100 -200 N
+P 2 0 1 0 -50 -150 -50 -250 N
+P 2 0 1 0 -50 0 -100 0 N
+P 2 0 1 0 -50 200 -100 200 N
+P 2 0 1 0 50 -200 100 -200 N
+P 2 0 1 0 50 0 100 0 N
+P 2 0 1 0 50 200 100 200 N
+P 3 0 1 0 -50 50 -50 -50 -50 -50 N
+P 3 0 1 0 -50 250 -50 150 -50 150 N
+P 4 0 1 0 -53 -116 -73 -116 -53 -126 -53 -126 N
+P 4 0 1 0 -40 80 -60 80 -40 70 -40 70 N
+P 4 0 1 0 -40 280 -60 280 -40 270 -40 270 N
+P 5 0 1 0 20 -150 -30 -140 -20 -130 -60 -120 -60 -120 N
+P 5 0 1 0 50 -150 50 -250 -50 -200 50 -150 50 -150 F
+P 6 0 1 0 20 50 -30 60 -20 70 -60 80 -60 80 -60 80 N
+P 6 0 1 0 20 250 -30 260 -20 270 -60 280 -60 280 -60 280 N
+P 6 0 1 0 50 50 50 -50 -50 0 50 50 50 50 50 50 F
+P 6 0 1 0 50 250 50 150 -50 200 50 250 50 250 50 250 F
+T 0 -75 -250 50 0 0 0 B Normal 0 C C
+T 0 -75 -50 50 0 0 0 G Normal 0 C C
+T 0 -75 150 50 0 0 0 R Normal 0 C C
+S 50 -50 50 50 0 1 0 N
+S 50 50 50 50 0 1 0 N
+S 50 150 50 250 0 1 0 N
+S 50 250 50 250 0 1 0 N
+S 100 300 -100 -300 0 1 0 f
+X RC 1 -200 200 100 R 50 50 1 1 P
+X GC 2 -200 0 100 R 50 50 1 1 P
+X BC 3 -200 -200 100 R 50 50 1 1 P
+X BA 4 200 -200 100 L 50 50 1 1 P
+X GA 5 200 0 100 L 50 50 1 1 P
+X RA 6 200 200 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LED_RGB_EP
+#
+DEF LED_RGB_EP D 0 0 Y Y 1 F N
+F0 "D" 0 450 50 H V C CNN
+F1 "LED_RGB_EP" 0 350 50 H V C CNN
+F2 "" 0 -50 50 H V C CNN
+F3 "" 0 -50 50 H V C CNN
+DRAW
+P 2 0 1 0 -50 -200 -100 -200 N
+P 2 0 1 0 -50 -150 -50 -250 N
+P 2 0 1 0 -50 0 -100 0 N
+P 2 0 1 0 -50 200 -100 200 N
+P 2 0 1 0 50 -200 100 -200 N
+P 2 0 1 0 50 200 100 200 N
+P 2 0 1 0 100 0 50 0 N
+P 3 0 1 0 -50 50 -50 -50 -50 -50 N
+P 3 0 1 0 -50 250 -50 150 -50 150 N
+P 4 0 1 0 -53 -116 -73 -116 -53 -126 -53 -126 N
+P 4 0 1 0 -40 80 -60 80 -40 70 -40 70 N
+P 4 0 1 0 -40 280 -60 280 -40 270 -40 270 N
+P 5 0 1 0 20 -150 -30 -140 -20 -130 -60 -120 -60 -120 N
+P 5 0 1 0 50 -150 50 -250 -50 -200 50 -150 50 -150 F
+P 6 0 1 0 20 50 -30 60 -20 70 -60 80 -60 80 -60 80 N
+P 6 0 1 0 20 250 -30 260 -20 270 -60 280 -60 280 -60 280 N
+P 6 0 1 0 50 50 50 -50 -50 0 50 50 50 50 50 50 F
+P 6 0 1 0 50 250 50 150 -50 200 50 250 50 250 50 250 F
+T 0 -75 -250 50 0 0 0 B Normal 0 C C
+T 0 -75 -50 50 0 0 0 G Normal 0 C C
+T 0 -75 150 50 0 0 0 R Normal 0 C C
+S 50 -50 50 50 0 1 0 N
+S 50 50 50 50 0 1 0 N
+S 50 150 50 250 0 1 0 N
+S 50 250 50 250 0 1 0 N
+S 100 300 -100 -300 0 1 0 f
+X RC 1 -200 200 100 R 50 50 1 1 P
+X GC 2 -200 0 100 R 50 50 1 1 P
+X BC 3 -200 -200 100 R 50 50 1 1 P
+X BA 4 200 -200 100 L 50 50 1 1 P
+X GA 5 200 0 100 L 50 50 1 1 P
+X RA 6 200 200 100 L 50 50 1 1 P
+X ~ PAD 0 -500 200 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# LIGNE_A_RETARD
+#
+DEF LIGNE_A_RETARD L 0 40 Y N 1 F N
+F0 "L" 0 100 50 H V C CNN
+F1 "LIGNE_A_RETARD" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -100 200 -100 -200 N
+A 0 -150 50 899 1 0 1 0 N 0 -100 50 -150
+A 0 -150 50 -1 -899 0 1 0 N 50 -150 0 -199
+A 0 -50 50 899 1 0 1 0 N 0 0 50 -50
+A 0 -50 50 -1 -899 0 1 0 N 50 -50 0 -99
+A 0 50 50 899 1 0 1 0 N 0 100 50 50
+A 0 50 50 -1 -899 0 1 0 N 50 50 0 1
+A 0 150 50 899 1 0 1 0 N 0 200 50 150
+A 0 150 50 -1 -899 0 1 0 N 50 150 0 101
+X 1 1 0 300 100 D 50 50 1 1 P
+X 2 2 0 -300 100 U 50 50 1 1 P
+X COMMUN 3 -200 0 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# L_Small
+#
+DEF L_Small L 0 10 N N 1 F N
+F0 "L" 30 40 50 H V L CNN
+F1 "L_Small" 30 -40 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Choke_*
+ *Coil*
+$ENDFPLIST
+DRAW
+A 0 -60 20 -899 899 0 1 0 N 0 -80 0 -40
+A 0 -20 20 -899 899 0 1 0 N 0 -40 0 0
+A 0 20 20 -899 899 0 1 0 N 0 0 0 40
+A 0 60 20 -899 899 0 1 0 N 0 40 0 80
+X ~ 1 0 100 20 D 40 40 1 1 P
+X ~ 2 0 -100 20 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Led_RGB_CA
+#
+DEF Led_RGB_CA D 0 50 Y N 1 F N
+F0 "D" 0 350 50 H V C CNN
+F1 "Led_RGB_CA" 0 -350 50 H V C CNN
+F2 "" -45 -50 50 H V C CNN
+F3 "" -45 -50 50 H V C CNN
+DRAW
+P 2 0 1 0 -70 -200 -100 -200 N
+P 2 0 1 0 -70 -150 -70 -250 N
+P 2 0 1 0 -70 0 -100 0 N
+P 2 0 1 0 -70 200 -100 200 N
+P 2 0 1 0 100 0 30 0 N
+P 3 0 1 0 -70 50 -70 -50 -70 -50 N
+P 3 0 1 0 -70 250 -70 150 -70 150 N
+P 4 0 1 0 -73 -116 -93 -116 -73 -126 -73 -126 N
+P 4 0 1 0 -60 80 -80 80 -60 70 -60 70 N
+P 4 0 1 0 -60 280 -80 280 -60 270 -60 270 N
+P 4 0 1 0 30 200 70 200 70 -200 30 -200 N
+P 5 0 1 0 0 -150 -50 -140 -40 -130 -80 -120 -80 -120 N
+P 5 0 1 0 30 -150 30 -250 -70 -200 30 -150 30 -150 F
+P 6 0 1 0 0 50 -50 60 -40 70 -80 80 -80 80 -80 80 N
+P 6 0 1 0 0 250 -50 260 -40 270 -80 280 -80 280 -80 280 N
+P 6 0 1 0 30 50 30 -50 -70 0 30 50 30 50 30 50 F
+P 6 0 1 0 30 250 30 150 -70 200 30 250 30 250 30 250 F
+T 0 0 -120 25 0 0 0 B Normal 0 C C
+T 0 0 80 25 0 0 0 G Normal 0 C C
+T 0 0 280 25 0 0 0 R Normal 0 C C
+S 30 -50 30 50 0 1 0 N
+S 30 50 30 50 0 1 0 N
+S 30 150 30 250 0 1 0 N
+S 30 250 30 250 0 1 0 N
+S 100 300 -100 -300 0 1 0 f
+X ~ 1 200 0 100 L 50 50 1 1 P
+X R 2 -200 200 100 R 50 50 1 1 P
+X G 3 -200 0 100 R 50 50 1 1 P
+X B 4 -200 -200 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Led_Small
+#
+DEF Led_Small D 0 10 N N 1 F N
+F0 "D" -50 125 50 H V L CNN
+F1 "Led_Small" -175 -100 50 H V L CNN
+F2 "" 0 0 50 V V C CNN
+F3 "" 0 0 50 V V C CNN
+$FPLIST
+ LED-*
+ LED_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -30 -40 -30 40 N
+P 4 0 1 0 30 -40 -30 0 30 40 30 -40 F
+P 5 0 1 0 0 30 -20 50 -10 50 -20 50 -20 40 N
+P 5 0 1 0 20 50 0 70 10 70 0 70 0 60 N
+X K 1 -100 0 70 R 40 40 1 1 P
+X A 2 100 0 70 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Led_x2
+#
+DEF Led_x2 D 0 0 Y Y 1 F N
+F0 "D" 0 225 50 H V C CNN
+F1 "Led_x2" 0 -250 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -180 0 -100 0 N
+P 2 0 1 0 0 -50 0 -150 N
+P 2 0 1 0 0 150 0 50 N
+P 2 0 1 0 150 -100 100 -100 N
+P 2 0 1 0 150 100 100 100 N
+P 3 0 1 0 -30 -125 -75 -165 -70 -140 N
+P 3 0 1 0 -30 75 -75 35 -70 60 N
+P 3 0 1 0 -15 -140 -60 -180 -55 -155 N
+P 3 0 1 0 -15 60 -60 20 -55 45 N
+P 3 0 1 0 100 -50 0 -100 100 -150 F
+P 3 0 1 0 100 150 0 100 100 50 F
+P 4 0 1 0 0 100 -100 100 -100 -100 0 -100 N
+C 0 0 180 0 1 0 N
+X A1 1 300 100 150 L 40 40 1 1 I
+X K 2 -300 0 120 R 40 40 1 1 I
+X A2 3 300 -100 150 L 40 40 1 1 I
+ENDDRAW
+ENDDEF
+#
+# OPTO_NPN
+#
+DEF OPTO_NPN Q 0 0 Y Y 1 F N
+F0 "Q" 150 50 50 H V L CNN
+F1 "OPTO_NPN" 150 -100 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 0 75 -75 N
+P 2 0 1 0 0 0 100 100 N
+P 2 0 1 0 0 100 0 -100 N
+P 5 0 1 0 -30 -50 -30 -30 -50 -50 -30 -50 -30 -50 N
+P 5 0 1 0 50 -100 100 -100 100 -50 50 -100 50 -100 N
+P 6 0 1 0 -110 10 -70 -30 -70 -10 -30 -50 -30 -50 -30 -50 N
+P 6 0 1 0 -110 80 -70 40 -70 60 -30 20 -30 20 -30 20 N
+P 6 0 1 0 -30 20 -30 40 -50 20 -30 20 -30 20 -30 20 N
+X E 1 100 -200 100 U 40 40 1 1 P
+X C 3 100 200 100 D 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# PHDARL
+#
+DEF PHDARL U 0 10 Y Y 1 F N
+F0 "U" 10 320 50 H V C CNN
+F1 "PHDARL" 10 -320 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 0 0 -350 -50 -150 -50 N
+P 2 0 0 0 -200 -100 -150 -150 N
+P 2 0 0 0 -200 -100 -100 -150 N
+P 2 0 0 0 50 150 50 -50 N
+P 2 0 0 0 150 -50 100 -100 N
+P 2 0 0 0 200 -100 250 -100 N
+P 2 0 0 0 250 0 250 -200 N
+P 2 0 0 0 250 0 250 -200 N
+P 3 0 0 0 -150 -150 -150 -150 -200 -150 N
+P 3 0 0 0 -150 -100 -100 -150 -150 -100 N
+P 3 0 0 0 50 50 150 150 350 150 N
+P 3 0 0 0 100 -100 150 -100 150 -50 N
+P 3 0 0 0 250 -100 350 0 350 150 N
+P 4 0 0 0 -350 100 -150 100 -250 -50 -350 100 N
+P 4 0 0 0 50 0 150 -100 150 -100 200 -100 N
+P 3 0 1 0 -400 -200 -250 -200 -250 -50 N
+P 3 0 1 0 -400 200 -250 200 -250 100 N
+P 3 0 1 0 250 -100 350 -200 400 -200 N
+P 3 0 1 0 350 150 350 200 400 200 N
+S -400 250 400 -250 0 1 0 N
+X ~ 1 -600 200 200 R 50 50 1 1 I
+X ~ 2 -600 -200 200 R 50 50 1 1 I
+X ~ 4 600 -200 200 L 50 50 1 1 P
+X ~ 5 600 200 200 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# PHOTORESISTOR
+#
+DEF PHOTORESISTOR U 0 0 Y Y 1 F N
+F0 "U" 10 320 50 H V C CNN
+F1 "PHOTORESISTOR" 10 -320 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 0 0 -350 -50 -150 -50 N
+P 2 0 0 0 -200 -100 -150 -150 N
+P 2 0 0 0 -200 -100 -100 -150 N
+P 3 0 0 0 -150 -150 -150 -150 -200 -150 N
+P 3 0 0 0 -150 -100 -100 -150 -150 -100 N
+P 4 0 0 0 -350 100 -150 100 -250 -50 -350 100 N
+P 2 0 1 0 250 -150 250 -150 N
+P 3 0 1 0 -400 -200 -250 -200 -250 -50 N
+P 3 0 1 0 -400 200 -250 200 -250 100 N
+P 4 0 1 0 400 -200 250 -200 250 -150 250 -150 N
+P 5 0 1 0 400 200 250 200 250 150 250 150 250 150 N
+P 10 0 1 0 250 150 220 120 270 70 220 20 270 -30 220 -80 270 -130 250 -150 250 -150 250 -150 N
+S -400 250 400 -250 0 1 0 N
+X A 1 -600 200 200 R 50 50 1 1 I
+X K 2 -600 -200 200 R 50 50 1 1 I
+X Rh 3 600 200 200 L 50 50 1 1 P
+X Rl 4 600 -200 200 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# PHTRANS
+#
+DEF PHTRANS U 0 10 Y Y 1 F N
+F0 "U" -50 350 50 H V C CNN
+F1 "PHTRANS" -50 -350 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 0 0 -250 -50 -50 -50 N
+P 2 0 0 0 -100 -100 -50 -150 N
+P 2 0 0 0 -100 -100 -50 -150 N
+P 2 0 0 0 -100 -100 0 -150 N
+P 2 0 0 0 -100 -100 0 -150 N
+P 3 0 0 0 -50 -150 -50 -150 -100 -150 N
+P 3 0 0 0 -50 -150 -50 -150 -100 -150 N
+P 3 0 0 0 -50 -100 0 -150 -50 -100 N
+P 3 0 0 0 -50 -100 0 -150 -50 -100 N
+P 2 0 1 0 200 0 200 -200 N
+P 3 0 1 0 -350 200 -150 200 -150 100 N
+P 3 0 1 0 -250 100 -50 100 -150 -50 F
+P 3 0 1 0 -150 -50 -150 -150 -350 -150 N
+P 3 0 1 0 200 -100 300 -200 350 -200 N
+P 3 0 1 0 200 -100 300 0 350 0 N
+P 3 0 1 0 300 -200 295 -150 250 -195 F
+P 4 0 1 0 200 -100 150 -100 150 200 350 200 N
+S 350 -250 -350 250 0 1 0 N
+X ~ 1 -550 200 200 R 50 50 1 1 I
+X ~ 2 -550 -150 200 R 50 50 1 1 I
+X ~ 4 550 -200 200 L 50 50 1 1 I
+X ~ 5 550 0 200 L 50 50 1 1 I
+X ~ 6 550 200 200 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# PICO7
+#
+DEF PICO7 T 0 40 Y N 1 F N
+F0 "T" -250 -350 50 H V C CNN
+F1 "PICO7" 0 550 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -20 -400 -20 400 N
+P 2 0 1 0 20 400 20 -400 N
+A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
+A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
+A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
+A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
+A -100 50 50 899 1 0 1 0 N -100 100 -50 50
+A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
+A -100 150 50 899 1 0 1 0 N -100 200 -50 150
+A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
+A 100 -350 50 899 -1799 0 1 0 N 100 -300 51 -350
+A 100 -350 50 1799 -899 0 1 0 N 51 -350 100 -399
+A 100 -250 50 899 -1799 0 1 0 N 100 -200 51 -250
+A 100 -250 50 1799 -899 0 1 0 N 51 -250 100 -299
+A 100 -150 50 899 -1799 0 1 0 N 100 -100 51 -150
+A 100 -150 50 1799 -899 0 1 0 N 51 -150 100 -199
+A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
+A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
+A 100 250 50 899 -1799 0 1 0 N 100 300 51 250
+A 100 250 50 1799 -899 0 1 0 N 51 250 100 201
+A 100 350 50 899 -1799 0 1 0 N 100 400 51 350
+A 100 350 50 1799 -899 0 1 0 N 51 350 100 301
+X SA RD 400 400 300 L 50 50 1 1 P
+X AA YE -400 200 300 R 50 50 1 1 P
+X SC WH 400 -100 300 L 50 50 1 1 P
+X SD BK 400 -400 300 L 50 50 1 1 P
+X AB BL -400 -200 300 R 50 50 1 1 P
+X ~ BR 0 -650 300 U 50 50 1 1 P
+X SB GR 400 100 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# POT
+#
+DEF POT RV 0 40 Y N 1 F N
+F0 "RV" 0 -80 50 H V C CNN
+F1 "POT" 0 0 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 0 0 40 -20 60 20 60 F
+S -100 40 100 -40 0 1 0 N
+X 1 1 -150 0 50 R 40 40 1 1 P
+X 2 2 0 150 100 D 40 40 1 1 P
+X 3 3 150 0 50 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Photores
+#
+DEF Photores R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "Photores" 210 0 50 V V C TNN
+F2 "" -70 0 50 V V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ R?
+ R?-*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -180 90 -280 190 N
+P 2 0 1 0 -180 90 -210 90 N
+P 2 0 1 0 -180 90 -180 120 N
+P 2 0 1 0 -140 140 -240 240 N
+P 2 0 1 0 -140 140 -240 240 N
+P 2 0 1 0 -140 140 -240 240 N
+P 2 0 1 0 -140 140 -240 240 N
+P 2 0 1 0 -140 140 -240 240 N
+P 2 0 1 0 -140 140 -240 240 N
+P 2 0 1 0 -140 140 -240 240 N
+P 2 0 1 0 -140 140 -240 240 N
+P 2 0 1 0 -140 140 -170 140 N
+P 2 0 1 0 -140 140 -170 140 N
+P 2 0 1 0 -140 140 -170 140 N
+P 2 0 1 0 -140 140 -170 140 N
+P 2 0 1 0 -140 140 -170 140 N
+P 2 0 1 0 -140 140 -170 140 N
+P 2 0 1 0 -140 140 -170 140 N
+P 2 0 1 0 -140 140 -170 140 N
+P 2 0 1 0 -140 140 -140 170 N
+P 2 0 1 0 -140 140 -140 170 N
+P 2 0 1 0 -140 140 -140 170 N
+P 2 0 1 0 -140 140 -140 170 N
+P 2 0 1 0 -140 140 -140 170 N
+P 2 0 1 0 -140 140 -140 170 N
+P 2 0 1 0 -140 140 -140 170 N
+P 2 0 1 0 -140 140 -140 170 N
+S -40 150 40 -150 0 1 12 N
+C 0 0 180 0 1 0 N
+X ~ 1 0 250 100 D 50 50 1 1 P
+X ~ 2 0 -250 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# QUARTZCMS4
+#
+DEF QUARTZCMS4 X 0 40 Y N 1 F N
+F0 "X" 0 150 50 H V C CNN
+F1 "QUARTZCMS4" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -100 100 -100 -100 N
+P 2 0 1 0 100 100 100 -100 N
+P 5 0 1 0 -50 50 50 50 50 -50 -50 -50 -50 50 N
+X 1 1 -300 0 200 R 40 40 1 1 P
+X 3 3 300 0 200 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NIGBT_CEG
+#
+DEF Q_NIGBT_CEG Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NIGBT_CEG" 750 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 10 30 -40 30 -80 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 10 30 80 30 40 N
+P 2 0 1 0 100 -95 30 -60 N
+P 2 0 1 0 100 -35 30 0 N
+P 2 0 1 0 100 95 30 60 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
+P 4 0 1 0 85 75 75 95 40 65 85 75 F
+C 50 0 111 0 1 10 N
+X C 1 100 200 100 D 50 50 1 1 P
+X E 2 100 -200 100 U 50 50 1 1 P
+X G 3 -200 0 210 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_NIGBT_CGE
+#
+DEF Q_NIGBT_CGE Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NIGBT_CGE" 750 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 10 30 -40 30 -80 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 10 30 80 30 40 N
+P 2 0 1 0 100 -95 30 -60 N
+P 2 0 1 0 100 -35 30 0 N
+P 2 0 1 0 100 95 30 60 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
+P 4 0 1 0 85 75 75 95 40 65 85 75 F
+C 50 0 111 0 1 10 N
+X C 1 100 200 100 D 50 50 1 1 P
+X G 2 -200 0 210 R 50 50 1 1 I
+X E 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NIGBT_ECG
+#
+DEF Q_NIGBT_ECG Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NIGBT_ECG" 750 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 10 30 -40 30 -80 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 10 30 80 30 40 N
+P 2 0 1 0 100 -95 30 -60 N
+P 2 0 1 0 100 -35 30 0 N
+P 2 0 1 0 100 95 30 60 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
+P 4 0 1 0 85 75 75 95 40 65 85 75 F
+C 50 0 111 0 1 10 N
+X E 1 100 -200 100 U 50 50 1 1 P
+X C 2 100 200 100 D 50 50 1 1 P
+X G 3 -200 0 210 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_NIGBT_ECGC
+#
+DEF Q_NIGBT_ECGC Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NIGBT_ECGC" 700 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 10 30 -40 30 -80 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 10 30 80 30 40 N
+P 2 0 1 0 100 -95 30 -60 N
+P 2 0 1 0 100 -35 30 0 N
+P 2 0 1 0 100 95 30 60 N
+P 2 0 1 0 100 100 200 100 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
+P 4 0 1 0 85 75 75 95 40 65 85 75 F
+C 50 0 111 0 1 10 N
+X E 1 100 -200 100 U 50 50 1 1 P
+X C 2 100 200 100 D 50 50 1 1 P
+X G 3 -200 0 210 R 50 50 1 1 I
+X C 4 200 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NIGBT_EGC
+#
+DEF Q_NIGBT_EGC Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NIGBT_EGC" 750 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 10 30 -40 30 -80 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 10 30 80 30 40 N
+P 2 0 1 0 100 -95 30 -60 N
+P 2 0 1 0 100 -35 30 0 N
+P 2 0 1 0 100 95 30 60 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
+P 4 0 1 0 85 75 75 95 40 65 85 75 F
+C 50 0 111 0 1 10 N
+X E 1 100 -200 100 U 50 50 1 1 P
+X G 2 -200 0 210 R 50 50 1 1 I
+X C 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NIGBT_GCE
+#
+DEF Q_NIGBT_GCE Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NIGBT_GCE" 750 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 10 30 -40 30 -80 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 10 30 80 30 40 N
+P 2 0 1 0 100 -95 30 -60 N
+P 2 0 1 0 100 -35 30 0 N
+P 2 0 1 0 100 95 30 60 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
+P 4 0 1 0 85 75 75 95 40 65 85 75 F
+C 50 0 111 0 1 10 N
+X G 1 -200 0 210 R 50 50 1 1 I
+X C 2 100 200 100 D 50 50 1 1 P
+X E 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NIGBT_GCEC
+#
+DEF Q_NIGBT_GCEC Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NIGBT_GCEC" 700 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 10 30 -40 30 -80 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 10 30 80 30 40 N
+P 2 0 1 0 100 -95 30 -60 N
+P 2 0 1 0 100 -35 30 0 N
+P 2 0 1 0 100 95 30 60 N
+P 2 0 1 0 100 100 200 100 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
+P 4 0 1 0 85 75 75 95 40 65 85 75 F
+C 50 0 111 0 1 10 N
+X G 1 -200 0 210 R 50 50 1 1 I
+X C 2 100 200 100 D 50 50 1 1 P
+X E 3 100 -200 100 U 50 50 1 1 P
+X C 4 200 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NIGBT_GEC
+#
+DEF Q_NIGBT_GEC Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NIGBT_GEC" 750 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 10 30 -40 30 -80 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 10 30 80 30 40 N
+P 2 0 1 0 100 -95 30 -60 N
+P 2 0 1 0 100 -35 30 0 N
+P 2 0 1 0 100 95 30 60 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
+P 4 0 1 0 85 75 75 95 40 65 85 75 F
+C 50 0 111 0 1 10 N
+X G 1 -200 0 210 R 50 50 1 1 I
+X E 2 100 -200 100 U 50 50 1 1 P
+X C 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NJFET_DGS
+#
+DEF Q_NJFET_DGS Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NJFET_DGS" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 3 0 1 0 100 -100 100 -50 10 -50 N
+P 3 0 1 0 100 100 100 55 10 55 N
+P 4 0 1 0 0 0 -40 15 -40 -15 0 0 F
+C 50 0 111 0 1 10 N
+X D 1 100 200 100 D 50 50 1 1 P
+X G 2 -200 0 210 R 50 50 1 1 I
+X S 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NJFET_DSG
+#
+DEF Q_NJFET_DSG Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NJFET_DSG" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 3 0 1 0 100 -100 100 -50 10 -50 N
+P 3 0 1 0 100 100 100 55 10 55 N
+P 4 0 1 0 0 0 -40 15 -40 -15 0 0 F
+C 50 0 111 0 1 10 N
+X D 1 100 200 100 D 50 50 1 1 P
+X S 2 100 -200 100 U 50 50 1 1 P
+X G 3 -200 0 210 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_NJFET_GDS
+#
+DEF Q_NJFET_GDS Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NJFET_GDS" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 3 0 1 0 100 -100 100 -50 10 -50 N
+P 3 0 1 0 100 100 100 55 10 55 N
+P 4 0 1 0 0 0 -40 15 -40 -15 0 0 F
+C 50 0 111 0 1 10 N
+X G 1 -200 0 210 R 50 50 1 1 I
+X D 2 100 200 100 D 50 50 1 1 P
+X S 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NJFET_GSD
+#
+DEF Q_NJFET_GSD Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NJFET_GSD" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 3 0 1 0 100 -100 100 -50 10 -50 N
+P 3 0 1 0 100 100 100 55 10 55 N
+P 4 0 1 0 0 0 -40 15 -40 -15 0 0 F
+C 50 0 111 0 1 10 N
+X G 1 -200 0 210 R 50 50 1 1 I
+X S 2 100 -200 100 U 50 50 1 1 P
+X D 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NJFET_SDG
+#
+DEF Q_NJFET_SDG Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NJFET_SDG" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 3 0 1 0 100 -100 100 -50 10 -50 N
+P 3 0 1 0 100 100 100 55 10 55 N
+P 4 0 1 0 0 0 -40 15 -40 -15 0 0 F
+C 50 0 111 0 1 10 N
+X S 1 100 -200 100 U 50 50 1 1 P
+X D 2 100 200 100 D 50 50 1 1 P
+X G 3 -200 0 210 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_NJFET_SGD
+#
+DEF Q_NJFET_SGD Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NJFET_SGD" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 3 0 1 0 100 -100 100 -50 10 -50 N
+P 3 0 1 0 100 100 100 55 10 55 N
+P 4 0 1 0 0 0 -40 15 -40 -15 0 0 F
+C 50 0 111 0 1 10 N
+X S 1 100 -200 100 U 50 50 1 1 P
+X G 2 -200 0 210 R 50 50 1 1 I
+X D 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NMOS_DGS
+#
+DEF Q_NMOS_DGS Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NMOS_DGS" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 40 0 80 15 80 -15 40 0 F
+C 50 0 111 0 1 10 N
+X D 1 100 200 100 D 50 50 1 1 P
+X G 2 -200 0 210 R 50 50 1 1 I
+X S 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NMOS_DSG
+#
+DEF Q_NMOS_DSG Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NMOS_DSG" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 40 0 80 15 80 -15 40 0 F
+C 50 0 111 0 1 10 N
+X D 1 100 200 100 D 50 50 1 1 P
+X S 2 100 -200 100 U 50 50 1 1 P
+X G 3 -200 0 210 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_NMOS_GDS
+#
+DEF Q_NMOS_GDS Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NMOS_GDS" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 40 0 80 15 80 -15 40 0 F
+C 50 0 111 0 1 10 N
+X G 1 -200 0 210 R 50 50 1 1 I
+X D 2 100 200 100 D 50 50 1 1 P
+X S 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NMOS_GDSD
+#
+DEF Q_NMOS_GDSD Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NMOS_GDSD" 700 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 2 0 1 0 100 100 200 100 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 40 0 80 15 80 -15 40 0 F
+C 50 0 111 0 1 10 N
+X G 1 -200 0 210 R 50 50 1 1 I
+X D 2 100 200 100 D 50 50 1 1 P
+X S 3 100 -200 100 U 50 50 1 1 P
+X D 4 200 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NMOS_GSD
+#
+DEF Q_NMOS_GSD Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NMOS_GSD" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 40 0 80 15 80 -15 40 0 F
+C 50 0 111 0 1 10 N
+X G 1 -200 0 210 R 50 50 1 1 I
+X S 2 100 -200 100 U 50 50 1 1 P
+X D 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NMOS_SDG
+#
+DEF Q_NMOS_SDG Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NMOS_SDG" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 40 0 80 15 80 -15 40 0 F
+C 50 0 111 0 1 10 N
+X S 1 100 -200 100 U 50 50 1 1 P
+X D 2 100 200 100 D 50 50 1 1 P
+X G 3 -200 0 210 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_NMOS_SDGD
+#
+DEF Q_NMOS_SDGD Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NMOS_SDGD" 700 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 2 0 1 0 100 100 200 100 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 40 0 80 15 80 -15 40 0 F
+C 50 0 111 0 1 10 N
+X S 1 100 -200 100 U 50 50 1 1 P
+X D 2 100 200 100 D 50 50 1 1 P
+X G 3 -200 0 210 R 50 50 1 1 I
+X D 4 200 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NMOS_SGD
+#
+DEF Q_NMOS_SGD Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NMOS_SGD" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 40 0 80 15 80 -15 40 0 F
+C 50 0 111 0 1 10 N
+X S 1 100 -200 100 U 50 50 1 1 P
+X G 2 -200 0 210 R 50 50 1 1 I
+X D 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NPN_BCE
+#
+DEF Q_NPN_BCE Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NPN_BCE" 600 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
+C 50 0 111 0 1 10 N
+X B 1 -200 0 225 R 50 50 1 1 I
+X C 2 100 200 100 D 50 50 1 1 P
+X E 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NPN_BCEC
+#
+DEF Q_NPN_BCEC Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NPN_BCEC" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 2 0 1 0 100 100 200 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
+C 50 0 111 0 1 10 N
+X B 1 -200 0 225 R 50 50 1 1 I
+X C 2 100 200 100 D 50 50 1 1 P
+X E 3 100 -200 100 U 50 50 1 1 P
+X C 4 200 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NPN_BEC
+#
+DEF Q_NPN_BEC Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NPN_BEC" 600 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
+C 50 0 111 0 1 10 N
+X B 1 -200 0 225 R 50 50 1 1 I
+X E 2 100 -200 100 U 50 50 1 1 P
+X C 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NPN_CBE
+#
+DEF Q_NPN_CBE Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NPN_CBE" 600 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
+C 50 0 111 0 1 10 N
+X C 1 100 200 100 D 50 50 1 1 P
+X B 2 -200 0 225 R 50 50 1 1 I
+X E 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NPN_CEB
+#
+DEF Q_NPN_CEB Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NPN_CEB" 600 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
+C 50 0 111 0 1 10 N
+X C 1 100 200 100 D 50 50 1 1 P
+X E 2 100 -200 100 U 50 50 1 1 P
+X B 3 -200 0 225 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_NPN_EBC
+#
+DEF Q_NPN_EBC Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NPN_EBC" 600 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
+C 50 0 111 0 1 10 N
+X E 1 100 -200 100 U 50 50 1 1 P
+X B 2 -200 0 225 R 50 50 1 1 P
+X C 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NPN_ECB
+#
+DEF Q_NPN_ECB Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NPN_ECB" 600 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
+C 50 0 111 0 1 10 N
+X E 1 100 -200 100 U 50 50 1 1 P
+X C 2 100 200 100 D 50 50 1 1 P
+X B 3 -200 0 225 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NPN_ECBC
+#
+DEF Q_NPN_ECBC Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NPN_ECBC" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 2 0 1 0 100 100 200 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
+C 50 0 111 0 1 10 N
+X E 1 100 -200 100 U 50 50 1 1 P
+X C 2 100 200 100 D 50 50 1 1 P
+X B 3 -200 0 225 R 50 50 1 1 P
+X C 4 200 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PJFET_DGS
+#
+DEF Q_PJFET_DGS Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PJFET_DGS" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 3 0 1 0 100 -100 100 -50 10 -50 N
+P 3 0 1 0 100 100 100 55 10 55 N
+P 4 0 1 0 -45 0 -5 15 -5 -15 -45 0 F
+C 50 0 111 0 1 10 N
+X D 1 100 200 100 D 50 50 1 1 P
+X G 2 -200 0 210 R 50 50 1 1 I
+X S 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PJFET_DSG
+#
+DEF Q_PJFET_DSG Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PJFET_DSG" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 3 0 1 0 100 -100 100 -50 10 -50 N
+P 3 0 1 0 100 100 100 55 10 55 N
+P 4 0 1 0 -45 0 -5 15 -5 -15 -45 0 F
+C 50 0 111 0 1 10 N
+X D 1 100 200 100 D 50 50 1 1 P
+X S 2 100 -200 100 U 50 50 1 1 P
+X G 3 -200 0 210 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_PJFET_GDS
+#
+DEF Q_PJFET_GDS Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PJFET_GDS" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 3 0 1 0 100 -100 100 -50 10 -50 N
+P 3 0 1 0 100 100 100 55 10 55 N
+P 4 0 1 0 -45 0 -5 15 -5 -15 -45 0 F
+C 50 0 111 0 1 10 N
+X G 1 -200 0 210 R 50 50 1 1 I
+X D 2 100 200 100 D 50 50 1 1 P
+X S 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PJFET_GSD
+#
+DEF Q_PJFET_GSD Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PJFET_GSD" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 3 0 1 0 100 -100 100 -50 10 -50 N
+P 3 0 1 0 100 100 100 55 10 55 N
+P 4 0 1 0 -45 0 -5 15 -5 -15 -45 0 F
+C 50 0 111 0 1 10 N
+X G 1 -200 0 210 R 50 50 1 1 I
+X S 2 100 -200 100 U 50 50 1 1 P
+X D 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PJFET_SDG
+#
+DEF Q_PJFET_SDG Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PJFET_SDG" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 3 0 1 0 100 -100 100 -50 10 -50 N
+P 3 0 1 0 100 100 100 55 10 55 N
+P 4 0 1 0 -45 0 -5 15 -5 -15 -45 0 F
+C 50 0 111 0 1 10 N
+X S 1 100 -200 100 U 50 50 1 1 P
+X D 2 100 200 100 D 50 50 1 1 P
+X G 3 -200 0 210 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_PJFET_SGD
+#
+DEF Q_PJFET_SGD Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PJFET_SGD" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 3 0 1 0 100 -100 100 -50 10 -50 N
+P 3 0 1 0 100 100 100 55 10 55 N
+P 4 0 1 0 -45 0 -5 15 -5 -15 -45 0 F
+C 50 0 111 0 1 10 N
+X S 1 100 -200 100 U 50 50 1 1 P
+X G 2 -200 0 210 R 50 50 1 1 I
+X D 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PMOS_DGS
+#
+DEF Q_PMOS_DGS Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PMOS_DGS" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 90 0 50 -15 50 15 90 0 F
+C 50 0 111 0 1 10 N
+X D 1 100 200 100 D 50 50 1 1 P
+X G 2 -200 0 210 R 50 50 1 1 I
+X S 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PMOS_DSG
+#
+DEF Q_PMOS_DSG Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PMOS_DSG" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 90 0 50 -15 50 15 90 0 F
+C 50 0 111 0 1 10 N
+X D 1 100 200 100 D 50 50 1 1 P
+X S 2 100 -200 100 U 50 50 1 1 P
+X G 3 -200 0 210 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_PMOS_GDS
+#
+DEF Q_PMOS_GDS Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PMOS_GDS" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 90 0 50 -15 50 15 90 0 F
+C 50 0 111 0 1 10 N
+X G 1 -200 0 210 R 50 50 1 1 I
+X D 2 100 200 100 D 50 50 1 1 P
+X S 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PMOS_GDSD
+#
+DEF Q_PMOS_GDSD Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PMOS_GDSD" 700 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 2 0 1 0 200 100 100 100 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 90 0 50 -15 50 15 90 0 F
+C 50 0 111 0 1 10 N
+X G 1 -200 0 210 R 50 50 1 1 I
+X D 2 100 200 100 D 50 50 1 1 P
+X S 3 100 -200 100 U 50 50 1 1 P
+X D 4 200 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PMOS_GSD
+#
+DEF Q_PMOS_GSD Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PMOS_GSD" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 90 0 50 -15 50 15 90 0 F
+C 50 0 111 0 1 10 N
+X G 1 -200 0 210 R 50 50 1 1 I
+X S 2 100 -200 100 U 50 50 1 1 P
+X D 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PMOS_SDG
+#
+DEF Q_PMOS_SDG Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PMOS_SDG" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 90 0 50 -15 50 15 90 0 F
+C 50 0 111 0 1 10 N
+X S 1 100 -200 100 U 50 50 1 1 P
+X D 2 100 200 100 D 50 50 1 1 P
+X G 3 -200 0 210 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_PMOS_SDGD
+#
+DEF Q_PMOS_SDGD Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PMOS_SDGD" 700 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 2 0 1 0 200 100 100 100 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 90 0 50 -15 50 15 90 0 F
+C 50 0 111 0 1 10 N
+X S 1 100 -200 100 U 50 50 1 1 P
+X D 2 100 200 100 D 50 50 1 1 P
+X G 3 -200 0 210 R 50 50 1 1 I
+X D 4 200 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PMOS_SGD
+#
+DEF Q_PMOS_SGD Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PMOS_SGD" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 30 -70 100 -70 N
+P 2 0 1 10 30 -50 30 -90 N
+P 2 0 1 0 30 0 100 0 N
+P 2 0 1 10 30 20 30 -20 N
+P 2 0 1 0 30 70 100 70 N
+P 2 0 1 10 30 90 30 50 N
+P 2 0 1 0 100 -70 100 -100 N
+P 2 0 1 0 100 -70 100 0 N
+P 2 0 1 0 100 100 100 70 N
+P 3 0 1 10 10 75 10 -75 10 -75 N
+P 4 0 1 0 90 0 50 -15 50 15 90 0 F
+C 50 0 111 0 1 10 N
+X S 1 100 -200 100 U 50 50 1 1 P
+X G 2 -200 0 210 R 50 50 1 1 I
+X D 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PNP_BCE
+#
+DEF Q_PNP_BCE Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PNP_BCE" 600 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
+C 50 0 111 0 1 10 N
+X B 1 -200 0 225 R 50 50 1 1 I
+X C 2 100 200 100 D 50 50 1 1 P
+X E 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PNP_BCEC
+#
+DEF Q_PNP_BCEC Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PNP_BCEC" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 2 0 1 0 200 100 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
+C 50 0 111 0 1 10 N
+X B 1 -200 0 225 R 50 50 1 1 I
+X C 2 100 200 100 D 50 50 1 1 P
+X E 3 100 -200 100 U 50 50 1 1 P
+X C 4 200 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PNP_BEC
+#
+DEF Q_PNP_BEC Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PNP_BEC" 600 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
+C 50 0 111 0 1 10 N
+X B 1 -200 0 225 R 50 50 1 1 I
+X E 2 100 -200 100 U 50 50 1 1 P
+X C 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PNP_CBE
+#
+DEF Q_PNP_CBE Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PNP_CBE" 600 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
+C 50 0 111 0 1 10 N
+X C 1 100 200 100 D 50 50 1 1 P
+X B 2 -200 0 225 R 50 50 1 1 I
+X E 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PNP_CEB
+#
+DEF Q_PNP_CEB Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PNP_CEB" 600 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
+C 50 0 111 0 1 10 N
+X C 1 100 200 100 D 50 50 1 1 P
+X E 2 100 -200 100 U 50 50 1 1 P
+X B 3 -200 0 225 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_PNP_EBC
+#
+DEF Q_PNP_EBC Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PNP_EBC" 600 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
+C 50 0 111 0 1 10 N
+X E 1 100 -200 100 U 50 50 1 1 P
+X B 2 -200 0 225 R 50 50 1 1 I
+X C 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_PNP_ECB
+#
+DEF Q_PNP_ECB Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PNP_ECB" 600 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
+C 50 0 111 0 1 10 N
+X E 1 100 -200 100 U 50 50 1 1 P
+X C 2 100 200 100 D 50 50 1 1 P
+X B 3 -200 0 225 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Q_PNP_ECBC
+#
+DEF Q_PNP_ECBC Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_PNP_ECBC" 650 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 25 25 100 100 N
+P 2 0 1 0 200 100 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
+C 50 0 111 0 1 10 N
+X E 1 100 -200 100 U 50 50 1 1 P
+X C 2 100 200 100 D 50 50 1 1 P
+X B 3 -200 0 225 R 50 50 1 1 I
+X C 4 200 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# RELAY_2RT
+#
+DEF RELAY_2RT K 0 40 Y N 1 F N
+F0 "K" -50 400 50 H V C CNN
+F1 "RELAY_2RT" 150 -500 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -100 -350 -90 -350 N
+P 2 0 1 0 -100 -250 -50 -250 N
+P 2 0 1 0 -100 -50 50 -50 N
+P 2 0 1 0 -90 -350 -70 -369 N
+P 2 0 1 0 -90 -319 -90 -300 N
+P 2 0 1 0 -80 -330 -90 -319 N
+P 2 0 1 0 -80 -290 -90 -300 N
+P 2 0 1 0 -70 -369 -50 -369 N
+P 2 0 1 0 -50 -410 -50 -209 N
+P 2 0 1 0 -50 -330 -80 -330 N
+P 2 0 1 0 -50 -330 0 -330 N
+P 2 0 1 0 -50 -290 -80 -290 N
+P 2 0 1 0 -50 -250 0 -250 N
+P 2 0 1 0 -50 -209 0 -209 N
+P 2 0 1 0 0 -410 -50 -410 N
+P 2 0 1 0 0 -369 -50 -369 N
+P 2 0 1 0 0 -369 29 -369 N
+P 2 0 1 0 0 -330 29 -330 N
+P 2 0 1 0 0 -290 -50 -290 N
+P 2 0 1 0 0 -290 29 -290 N
+P 2 0 1 0 0 -250 29 -250 N
+P 2 0 1 0 0 -209 0 -410 N
+P 2 0 1 0 10 -119 89 -119 N
+P 2 0 1 0 10 -9 89 -9 N
+P 2 0 1 0 10 180 50 221 N
+P 2 0 1 0 10 290 39 290 N
+P 2 0 1 0 29 -369 39 -360 N
+P 2 0 1 0 29 -330 39 -340 N
+P 2 0 1 0 29 -290 39 -280 N
+P 2 0 1 0 29 -250 39 -259 N
+P 2 0 1 0 39 -360 39 -340 N
+P 2 0 1 0 39 -259 39 -280 N
+P 2 0 1 0 39 261 10 290 N
+P 2 0 1 0 39 261 50 250 N
+P 2 0 1 0 39 290 89 290 N
+P 2 0 1 0 50 -150 50 -130 N
+P 2 0 1 0 50 -130 50 -119 N
+P 2 0 1 0 50 -80 10 -119 N
+P 2 0 1 0 50 -50 10 -9 N
+P 2 0 1 0 50 -50 100 -50 N
+P 2 0 1 0 50 50 50 -9 N
+P 2 0 1 0 50 50 100 50 N
+P 2 0 1 0 50 150 50 180 N
+P 2 0 1 0 50 150 100 150 N
+P 2 0 1 0 50 221 89 180 N
+P 2 0 1 0 50 250 -100 250 N
+P 2 0 1 0 50 250 60 250 N
+P 2 0 1 0 50 350 50 290 N
+P 2 0 1 0 50 350 100 350 N
+P 2 0 1 0 60 250 100 250 N
+P 2 0 1 0 89 -119 50 -80 N
+P 2 0 1 0 89 -9 50 -50 N
+P 2 0 1 0 89 180 10 180 N
+P 2 0 1 0 89 290 50 250 N
+P 2 0 1 0 100 -150 50 -150 N
+X T1 1 400 -150 300 L 50 50 1 1 P
+X R1 3 400 50 300 L 50 50 1 1 P
+X C1 5 -400 -50 300 R 50 50 1 1 P
+X 8 8 -400 -250 300 R 50 50 1 1 I
+X 9 9 -400 -350 300 R 50 50 1 1 I
+X C2 12 -400 250 300 R 50 50 1 1 P
+X R2 14 400 350 300 L 50 50 1 1 P
+X T2 16 400 150 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# RR8
+#
+DEF RR8 RR 0 40 Y N 1 F N
+F0 "RR" 50 550 50 H V C CNN
+F1 "RR8" 30 0 50 V V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 -50 -400 -50 500 50 500 100 450 100 -400 -50 -400 N
+X COM 1 -350 450 300 R 50 50 1 1 P I
+X 2 2 -350 350 300 R 50 50 1 1 P I
+X 3 3 -350 250 300 R 50 50 1 1 P I
+X 4 4 -350 150 300 R 50 50 1 1 P I
+X 5 5 -350 50 300 R 50 50 1 1 P I
+X 6 6 -350 -50 300 R 50 50 1 1 P I
+X 7 7 -350 -150 300 R 50 50 1 1 P I
+X 8 8 -350 -250 300 R 50 50 1 1 P I
+X 9 9 -350 -350 300 R 50 50 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# RR9
+#
+DEF RR9 RR 0 40 Y N 1 F N
+F0 "RR" 50 600 50 H V C CNN
+F1 "RR9" 30 0 50 V V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 -50 -450 -50 550 50 550 100 500 100 -450 -50 -450 N
+X COM 1 -350 500 300 R 50 50 1 1 P I
+X 2 2 -350 400 300 R 50 50 1 1 P I
+X 3 3 -350 300 300 R 50 50 1 1 P I
+X 4 4 -350 200 300 R 50 50 1 1 P I
+X 5 5 -350 100 300 R 50 50 1 1 P I
+X 6 6 -350 0 300 R 50 50 1 1 P I
+X 7 7 -350 -100 300 R 50 50 1 1 P I
+X 8 8 -350 -200 300 R 50 50 1 1 P I
+X 9 9 -350 -300 300 R 50 50 1 1 P I
+X 10 10 -350 -400 300 R 50 50 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# RVAR
+#
+DEF RVAR R 0 0 N Y 1 F N
+F0 "R" 80 -50 50 V V C CNN
+F1 "RVAR" -80 60 50 V V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -70 -120 80 120 N
+P 3 0 1 0 80 90 80 120 50 110 F
+S -40 150 40 -150 0 1 0 N
+X ~ 1 0 250 100 D 50 50 1 1 P
+X ~ 2 0 -250 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R_PACK4
+#
+DEF R_PACK4 RP 0 20 Y N 1 F N
+F0 "RP" 0 450 50 H V C CNN
+F1 "R_PACK4" 0 -50 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 5 0 1 0 -100 400 -100 0 100 0 100 400 -100 400 N
+P 7 0 1 0 -100 50 -80 70 -40 30 0 70 40 30 80 70 100 50 N
+P 7 0 1 0 -100 150 -80 170 -40 130 0 170 40 130 80 170 100 150 N
+P 7 0 1 0 -100 250 -80 270 -40 230 0 270 40 230 80 270 100 250 N
+P 7 0 1 0 -100 350 -80 370 -40 330 0 370 40 330 80 370 100 350 N
+X P1 1 -200 350 100 R 40 40 1 1 P
+X P2 2 -200 250 100 R 40 40 1 1 P
+X P3 3 -200 150 100 R 40 40 1 1 P
+X P4 4 -200 50 100 R 40 40 1 1 P
+X R4 5 200 50 100 L 40 40 1 1 P
+X R3 6 200 150 100 L 40 40 1 1 P
+X R2 7 200 250 100 L 40 40 1 1 P
+X R1 8 200 350 100 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R_PACK8
+#
+DEF R_PACK8 RP 0 20 Y N 1 F N
+F0 "RP" 0 450 50 H V C CNN
+F1 "R_PACK8" 0 -450 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 7 0 1 0 -100 -350 -80 -330 -40 -370 0 -330 40 -370 80 -330 100 -350 N
+P 7 0 1 0 -100 -250 -80 -230 -40 -270 0 -230 40 -270 80 -230 100 -250 N
+P 7 0 1 0 -100 -150 -80 -130 -40 -170 0 -130 40 -170 80 -130 100 -150 N
+P 7 0 1 0 -100 -50 -80 -30 -40 -70 0 -30 40 -70 80 -30 100 -50 N
+P 7 0 1 0 -100 50 -80 70 -40 30 0 70 40 30 80 70 100 50 N
+P 7 0 1 0 -100 150 -80 170 -40 130 0 170 40 130 80 170 100 150 N
+P 7 0 1 0 -100 250 -80 270 -40 230 0 270 40 230 80 270 100 250 N
+P 7 0 1 0 -100 350 -80 370 -40 330 0 370 40 330 80 370 100 350 N
+S -100 400 100 -400 0 1 0 N
+X P1 1 -200 350 100 R 40 40 1 1 P
+X P2 2 -200 250 100 R 40 40 1 1 P
+X P3 3 -200 150 100 R 40 40 1 1 P
+X P4 4 -200 50 100 R 40 40 1 1 P
+X P5 5 -200 -50 100 R 40 40 1 1 P
+X P6 6 -200 -150 100 R 40 40 1 1 P
+X P7 7 -200 -250 100 R 40 40 1 1 P
+X P8 8 -200 -350 100 R 40 40 1 1 P
+X R8 9 200 -350 100 L 40 40 1 1 P
+X R7 10 200 -250 100 L 40 40 1 1 P
+X R6 11 200 -150 100 L 40 40 1 1 P
+X R5 12 200 -50 100 L 40 40 1 1 P
+X R4 13 200 50 100 L 40 40 1 1 P
+X R3 14 200 150 100 L 40 40 1 1 P
+X R2 15 200 250 100 L 40 40 1 1 P
+X R1 16 200 350 100 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R_Small
+#
+DEF R_Small R 0 10 N N 1 F N
+F0 "R" 30 20 50 H V L CNN
+F1 "R_Small" 30 -40 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Resistor_*
+ R_*
+$ENDFPLIST
+DRAW
+S -30 70 30 -70 0 1 8 N
+X ~ 1 0 100 30 D 40 40 1 1 P
+X ~ 2 0 -100 30 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# SCHDPAK
+#
+DEF SCHDPAK D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "SCHDPAK" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 100 0 50 0 N
+P 2 0 1 0 100 50 100 -50 N
+P 3 0 1 0 50 50 -50 0 50 -50 F
+P 6 0 1 0 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
+X A 1 200 -50 100 L 40 40 1 1 P
+X K 2 -200 0 150 R 40 40 1 1 P
+X A 3 200 50 100 L 40 40 1 1 I
+ENDDRAW
+ENDDEF
+#
+# SCR
+#
+DEF SCR U 0 10 Y N 1 F N
+F0 "U" 150 250 50 H V C CNN
+F1 "SCR" 150 -350 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 0 0 -200 -150 200 -150 N
+P 2 0 1 0 0 -150 -200 -400 N
+P 3 0 1 0 -150 100 150 100 0 -150 F
+X K 1 0 -550 400 U 50 50 1 1 I
+X G 2 -350 -400 150 R 50 50 1 1 I
+X A 3 0 400 300 D 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# SP3T
+#
+DEF SP3T SW 0 0 N Y 1 F N
+F0 "SW" -100 150 50 H V C CNN
+F1 "SP3T" -100 -100 50 H V C CNN
+F2 "" -625 175 50 H V C CNN
+F3 "" -625 175 50 H V C CNN
+$FPLIST
+ SW*
+ SP3T*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -100 0 100 100 N
+C -125 0 25 0 1 0 N
+C 125 -100 25 0 1 0 N
+C 125 0 25 0 1 0 N
+C 125 100 25 0 1 0 N
+X 1 1 300 100 150 L 50 50 1 1 P
+X 2 2 300 0 150 L 50 50 1 1 P
+X 3 3 -300 0 150 R 50 50 1 1 P
+X 4 4 300 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# SPEAKER
+#
+DEF SPEAKER SP 0 0 N Y 1 F N
+F0 "SP" -100 250 50 H V C CNN
+F1 "SPEAKER" -100 -250 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 4 0 0 0 100 150 250 300 250 -300 100 -150 N
+P 5 0 0 0 -100 150 100 150 100 -150 -100 -150 -100 150 F
+X 1 1 -300 100 200 R 40 40 1 1 I
+X 2 2 -300 -100 200 R 40 40 1 1 I
+ENDDRAW
+ENDDEF
+#
+# SPST
+#
+DEF SPST SW 0 0 N Y 1 F N
+F0 "SW" 0 100 50 H V C CNN
+F1 "SPST" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 0 0 -100 0 100 100 N
+C -150 0 50 0 0 0 N
+C 150 0 50 0 0 0 N
+X 1 1 -500 0 300 R 50 50 1 1 I
+X 2 2 500 0 300 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# SWITCH_INV
+#
+DEF SWITCH_INV SW 0 0 N Y 1 F N
+F0 "SW" -200 150 50 H V C CNN
+F1 "SWITCH_INV" -150 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -100 0 150 50 N
+C -150 0 50 0 0 0 N
+C 150 -100 50 0 0 0 N
+C 150 100 50 0 1 0 N
+X 1 1 500 100 300 L 50 50 1 1 P
+X 2 2 -500 0 300 R 50 50 1 1 P
+X 3 3 500 -100 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# SWITCH_INV_MSM
+#
+DEF SWITCH_INV_MSM SW 0 0 N Y 1 F N
+F0 "SW" -199 150 50 H V C CNN
+F1 "SWITCH_INV_MSM" -250 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 5 0 1 0 -100 0 120 0 120 0 120 0 120 0 N
+C -150 0 50 0 0 0 N
+C 150 -100 50 0 0 0 N
+C 150 100 50 0 1 0 N
+C 170 0 40 0 1 0 N
+X 1 1 500 100 300 L 50 50 1 1 P
+X 2 2 -500 0 300 R 50 50 1 1 P
+X 3 3 500 -100 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# SW_PUSH
+#
+DEF SW_PUSH SW 0 40 N N 1 F N
+F0 "SW" 150 110 50 H V C CNN
+F1 "SW_PUSH" 0 -80 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 4 0 1 0 -40 60 -30 90 30 90 40 60 N
+S -170 50 170 60 0 1 0 N
+X 1 1 -300 0 200 R 50 50 0 1 P I
+X 2 2 300 0 200 L 50 50 0 1 P I
+ENDDRAW
+ENDDEF
+#
+# SW_PUSH_SMALL
+#
+DEF SW_PUSH_SMALL SW 0 40 N N 1 F N
+F0 "SW" 150 110 50 H V C CNN
+F1 "SW_PUSH_SMALL" 0 -79 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 0 -100 100 -60 60 -60 60 N
+P 4 0 1 0 60 -60 100 -100 100 -100 100 -100 N
+P 6 0 1 0 -10 60 10 70 70 10 60 -10 60 -10 60 -10 N
+P 7 0 1 0 -50 80 80 -50 90 -40 -40 90 -50 80 -50 80 -50 80 N
+C -60 60 10 0 1 0 N
+C 60 -60 10 0 1 0 N
+X 1 1 -100 100 0 R 50 50 0 1 P
+X 2 2 100 -100 0 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# Switch_DPST
+#
+DEF Switch_DPST SW 0 0 N Y 1 F N
+F0 "SW" 300 50 50 H V C CNN
+F1 "Switch_DPST" 300 -50 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 0 0 -100 -200 100 -100 N
+P 2 0 0 0 -100 200 100 300 N
+P 2 0 0 0 0 250 0 -150 N
+C -150 -200 50 0 0 0 N
+C -150 200 50 0 0 0 N
+C 150 -200 50 0 0 0 N
+C 150 200 50 0 0 0 N
+X 1 1 -300 -200 100 R 50 50 1 1 I
+X 2 2 300 -200 100 L 50 50 1 1 I
+X 3 3 -300 200 100 R 50 50 1 1 I
+X 4 4 300 200 100 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Switch_SPDT_x2
+#
+DEF Switch_SPDT_x2 SW 0 0 Y Y 2 F N
+F0 "SW" -200 150 50 H V C CNN
+F1 "Switch_SPDT_x2" -250 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -100 0 150 50 N
+C -150 0 50 0 0 0 N
+C 150 -100 50 0 0 0 N
+C 150 100 50 0 1 0 N
+X A 1 300 100 100 L 50 50 1 1 P
+X B 2 -300 0 100 R 50 50 1 1 P
+X C 3 300 -100 100 L 50 50 1 1 P
+X A 4 300 100 100 L 50 50 2 1 P
+X B 5 -300 0 100 R 50 50 2 1 P
+X C 6 300 -100 100 L 50 50 2 1 P
+ENDDRAW
+ENDDEF
+#
+# TEMPLATE
+#
+DEF TEMPLATE J 0 40 N N 1 F N
+F0 "J" 160 210 50 H V L BNN
+F1 "TEMPLATE" 150 100 50 H V L BNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+S 0 100 100 120 0 1 0 F
+S 90 210 10 120 0 1 0 F
+X ~ 1 0 0 100 U 50 50 1 1 U
+X ~ 2 100 0 100 U 50 50 1 1 U
+ENDDRAW
+ENDDEF
+#
+# THERMISTOR
+#
+DEF THERMISTOR TH 0 0 N Y 1 F N
+F0 "TH" 100 50 50 V V C CNN
+F1 "THERMISTOR" -100 0 50 V V C BNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ R?
+ SM0603
+ SM0805
+$ENDFPLIST
+DRAW
+P 5 0 1 0 -75 125 -75 75 75 -75 75 -125 75 -125 N
+T 900 75 -150 60 0 0 1 - Normal 0 C C
+S -40 150 40 -150 0 1 8 N
+X ~ 1 0 250 100 D 50 50 1 1 P
+X ~ 2 0 -250 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# THYRISTOR
+#
+DEF THYRISTOR T 0 40 N N 1 F N
+F0 "T" 0 100 50 H V C CNN
+F1 "THYRISTOR" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -50 50 -50 -50 N
+P 3 0 1 0 50 50 -50 0 50 -50 F
+P 4 0 1 0 -50 0 -100 50 -100 50 -100 50 N
+X A A 200 0 150 L 50 50 1 1 P
+X G G -100 100 50 D 50 50 1 1 P
+X K K -200 0 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# TR1-SO8
+#
+DEF TR1-SO8 T 0 40 Y N 1 F N
+F0 "T" 0 250 50 H V C CNN
+F1 "TR1-SO8" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS TRANSFO-SO8
+DRAW
+P 2 0 1 0 -25 200 -25 -200 N
+P 2 0 1 0 25 -200 25 200 N
+A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
+A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
+A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
+A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
+A -100 50 50 899 1 0 1 0 N -100 100 -50 50
+A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
+A -100 150 50 899 1 0 1 0 N -100 200 -50 150
+A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
+A 100 -50 50 899 -1799 0 1 0 N 100 0 51 -50
+A 100 -50 50 1799 -899 0 1 0 N 51 -50 100 -99
+A 100 50 50 899 -1799 0 1 0 N 100 100 51 50
+A 100 50 50 1799 -899 0 1 0 N 51 50 100 1
+A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
+A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
+A 101 -150 50 910 -1799 0 1 0 N 101 -100 52 -150
+A 101 -150 50 -912 -1799 0 1 0 N 101 -199 52 -150
+X AA 1 -300 200 200 R 50 50 1 1 P
+X AB 4 -300 -200 200 R 50 50 1 1 P
+X SA 5 300 -200 200 L 50 50 1 1 P
+X SB 8 300 200 200 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# TRANSFO
+#
+DEF TRANSFO T 0 40 Y N 1 F N
+F0 "T" 0 250 50 H V C CNN
+F1 "TRANSFO" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -25 200 -25 -200 N
+P 2 0 1 0 25 -200 25 200 N
+A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
+A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
+A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
+A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
+A -100 50 50 899 1 0 1 0 N -100 100 -50 50
+A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
+A -100 150 50 899 1 0 1 0 N -100 200 -50 150
+A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
+A 100 -50 50 899 -1799 0 1 0 N 100 0 51 -50
+A 100 -50 50 1799 -899 0 1 0 N 51 -50 100 -99
+A 100 50 50 899 -1799 0 1 0 N 100 100 51 50
+A 100 50 50 1799 -899 0 1 0 N 51 50 100 1
+A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
+A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
+A 101 -150 50 910 -1799 0 1 0 N 101 -100 52 -150
+A 101 -150 50 -912 -1799 0 1 0 N 101 -199 52 -150
+X AA 1 -400 200 300 R 50 50 1 1 P
+X AB 2 -400 -200 300 R 50 50 1 1 P
+X SA 3 400 -200 300 L 50 50 1 1 P
+X SB 4 400 200 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# TRANSFO-AUDIO
+#
+DEF TRANSFO-AUDIO T 0 40 Y N 1 F N
+F0 "T" 0 460 50 H V C CNN
+F1 "TRANSFO-AUDIO" 10 370 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -25 200 -25 -200 N
+P 2 0 1 0 25 -200 25 200 N
+P 9 0 1 0 -150 250 -100 300 100 300 150 250 150 -250 100 -300 -100 -300 -150 -250 -150 250 N
+A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
+A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
+A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
+A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
+A -100 50 50 899 1 0 1 0 N -100 100 -50 50
+A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
+A -100 150 50 899 1 0 1 0 N -100 200 -50 150
+A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
+A 100 -50 50 899 -1799 0 1 0 N 100 0 51 -50
+A 100 -50 50 1799 -899 0 1 0 N 51 -50 100 -99
+A 100 50 50 899 -1799 0 1 0 N 100 100 51 50
+A 100 50 50 1799 -899 0 1 0 N 51 50 100 1
+A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
+A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
+A 101 -150 50 910 -1799 0 1 0 N 101 -100 52 -150
+A 101 -150 50 -912 -1799 0 1 0 N 101 -199 52 -150
+X ~ 0 0 -400 100 U 50 50 1 1 I
+X AA 1 -400 200 300 R 50 50 1 1 P
+X AB 2 -400 -200 300 R 50 50 1 1 P
+X SA 3 400 -200 300 L 50 50 1 1 P
+X SB 4 400 200 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# TRANSFO2
+#
+DEF TRANSFO2 T 0 40 Y N 1 F N
+F0 "T" 0 500 50 H V C CNN
+F1 "TRANSFO2" 0 -500 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -20 -400 -20 400 N
+P 2 0 1 0 20 400 20 -400 N
+A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
+A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
+A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
+A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
+A -100 50 50 899 1 0 1 0 N -100 100 -50 50
+A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
+A -100 150 50 899 1 0 1 0 N -100 200 -50 150
+A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
+A 100 -350 50 899 -1799 0 1 0 N 100 -300 51 -350
+A 100 -350 50 1799 -899 0 1 0 N 51 -350 100 -399
+A 100 -250 50 899 -1799 0 1 0 N 100 -200 51 -250
+A 100 -250 50 1799 -899 0 1 0 N 51 -250 100 -299
+A 100 -150 50 899 -1799 0 1 0 N 100 -100 51 -150
+A 100 -150 50 1799 -899 0 1 0 N 51 -150 100 -199
+A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
+A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
+A 100 250 50 899 -1799 0 1 0 N 100 300 51 250
+A 100 250 50 1799 -899 0 1 0 N 51 250 100 201
+A 100 350 50 899 -1799 0 1 0 N 100 400 51 350
+A 100 350 50 1799 -899 0 1 0 N 51 350 100 301
+X AA 1 -400 200 300 R 50 50 1 1 P
+X AB 2 -400 -200 300 R 50 50 1 1 P
+X SA 3 400 400 300 L 50 50 1 1 P
+X SB 4 400 100 300 L 50 50 1 1 P
+X SC 5 400 -100 300 L 50 50 1 1 P
+X SD 6 400 -400 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# TRANSFO4
+#
+DEF TRANSFO4 T 0 40 Y N 1 F N
+F0 "T" 0 250 50 H V C CNN
+F1 "TRANSFO4" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -25 200 -25 -200 N
+P 2 0 1 0 25 -200 25 200 N
+A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
+A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
+A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
+A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
+A -100 50 50 899 1 0 1 0 N -100 100 -50 50
+A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
+A -100 150 50 899 1 0 1 0 N -100 200 -50 150
+A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
+A 100 -50 50 899 -1799 0 1 0 N 100 0 51 -50
+A 100 -50 50 1799 -899 0 1 0 N 51 -50 100 -99
+A 100 50 50 899 -1799 0 1 0 N 100 100 51 50
+A 100 50 50 1799 -899 0 1 0 N 51 50 100 1
+A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
+A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
+A 101 -150 50 910 -1799 0 1 0 N 101 -100 52 -150
+A 101 -150 50 -912 -1799 0 1 0 N 101 -199 52 -150
+X PR1 1 -400 200 300 R 50 50 1 1 P
+X PM 2 -400 0 300 R 50 50 1 1 P
+X PR2 3 -400 -200 300 R 50 50 1 1 P
+X S1 4 400 -200 300 L 50 50 1 1 P
+X S2 5 400 200 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# TRANSFO_3
+#
+DEF TRANSFO_3 T 0 40 Y N 1 F N
+F0 "T" 0 500 50 H V C CNN
+F1 "TRANSFO_3" 0 -500 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -20 -400 -20 400 N
+P 2 0 1 0 20 400 20 -400 N
+A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
+A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
+A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
+A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
+A -100 50 50 899 1 0 1 0 N -100 100 -50 50
+A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
+A -100 150 50 899 1 0 1 0 N -100 200 -50 150
+A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
+A 100 -350 50 899 -1799 0 1 0 N 100 -300 51 -350
+A 100 -350 50 1799 -899 0 1 0 N 51 -350 100 -399
+A 100 -250 50 899 -1799 0 1 0 N 100 -200 51 -250
+A 100 -250 50 1799 -899 0 1 0 N 51 -250 100 -299
+A 100 -150 50 899 -1799 0 1 0 N 100 -100 51 -150
+A 100 -150 50 1799 -899 0 1 0 N 51 -150 100 -199
+A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
+A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
+A 100 250 50 899 -1799 0 1 0 N 100 300 51 250
+A 100 250 50 1799 -899 0 1 0 N 51 250 100 201
+A 100 350 50 899 -1799 0 1 0 N 100 400 51 350
+A 100 350 50 1799 -899 0 1 0 N 51 350 100 301
+X IN+ 1 -400 200 300 R 50 50 1 1 P
+X PM 2 -400 0 300 R 50 50 1 1 P
+X IN- 3 -400 -200 300 R 50 50 1 1 P
+X OUT1A 4 400 400 300 L 50 50 1 1 P
+X OUT1B 5 400 100 300 L 50 50 1 1 P
+X OUT2A 6 400 -100 300 L 50 50 1 1 P
+X OUT2B 7 400 -400 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# TRIAC
+#
+DEF TRIAC U 0 10 Y Y 1 F N
+F0 "U" -250 350 50 H V C CNN
+F1 "TRIAC" -300 -250 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -300 -50 0 -50 N
+P 2 0 1 0 -150 -50 -300 -200 N
+P 2 0 1 0 0 200 300 200 N
+P 3 0 1 0 -300 200 -150 -50 0 200 F
+P 3 0 1 0 150 200 0 -50 300 -50 F
+X ~ 1 0 -250 200 U 50 50 1 1 P
+X ~ 2 0 400 200 D 50 50 1 1 P
+X ~ 3 -500 -200 200 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# TST
+#
+DEF TST P 0 40 N N 1 F N
+F0 "P" 0 300 50 H V C BNN
+F1 "TST" 0 250 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 200 -50 150 0 100 50 150 0 200 0 200 N
+X ~ 1 0 0 100 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# TVS
+#
+DEF TVS D 0 40 Y Y 1 F N
+F0 "D" 0 150 50 H V C CNN
+F1 "TVS" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 12 0 50 0 -50 N
+P 4 0 1 0 -100 50 -100 -50 0 0 -100 50 F
+P 4 0 1 0 0 0 100 50 100 -50 0 0 F
+X ~ 1 -300 0 300 R 50 50 1 1 P
+X ~ 2 300 0 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# VARICAP
+#
+DEF VARICAP D 0 40 Y N 1 F N
+F0 "D" 0 130 50 H V C CNN
+F1 "VARICAP" 0 -120 50 H V C TNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -150 0 -61 0 N
+P 2 0 1 0 -120 -100 70 70 N
+P 2 0 1 0 50 -90 50 90 N
+P 2 0 1 0 109 0 150 0 N
+P 2 0 1 0 110 -90 110 90 N
+P 3 0 1 0 -60 90 -60 -90 50 0 F
+P 3 0 1 0 90 90 50 90 85 50 F
+X ANODE 1 -250 0 100 R 50 50 1 1 P
+X CATHODE 2 250 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# VR
+#
+DEF VR VR 0 0 N Y 1 F N
+F0 "VR" 60 -46 50 V V C TNN
+F1 "VR" 0 0 50 V V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 5 0 1 0 -60 -100 -60 -60 60 60 60 100 60 100 N
+S -40 150 40 -150 0 1 0 N
+X ~ 1 0 250 100 D 50 50 1 1 P
+X ~ 2 0 -250 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ZENER
+#
+DEF ZENER D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "ZENER" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ D?
+ SO*
+ SM*
+$ENDFPLIST
+DRAW
+P 5 0 1 8 -70 50 -50 30 -50 -30 -30 -50 -30 -50 N
+P 5 0 1 0 -50 0 50 50 50 -50 -50 0 -50 0 F
+X K 1 -200 0 150 R 50 50 1 1 P
+X A 2 200 0 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# ZENERsmall
+#
+DEF ZENERsmall D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "ZENERsmall" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ D?
+ SO*
+ SM*
+$ENDFPLIST
+DRAW
+P 4 0 1 8 -60 40 -40 20 -40 -20 -20 -40 N
+P 4 0 1 0 40 40 -40 0 40 -40 40 40 F
+X K 1 -100 0 60 R 40 40 1 1 P
+X A 2 100 0 60 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/sim/diodes.lib b/demos/sim/diodes.lib
new file mode 100644
index 0000000000..3f277af53f
--- /dev/null
+++ b/demos/sim/diodes.lib
@@ -0,0 +1,6 @@
+* Copyright © 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Linear Technology Corporation.   All rights reserved.
+*
+* Mike Engelhardt
+*
+.model 1N914 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75)
+.model 1N4148 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75)
\ No newline at end of file
diff --git a/demos/sim/noname.sch b/demos/sim/noname.sch
new file mode 100644
index 0000000000..2366ad21a5
--- /dev/null
+++ b/demos/sim/noname.sch
@@ -0,0 +1,162 @@
+EESchema Schematic File Version 2
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:pspice
+LIBS:noname-cache
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L VSOURCE V1
+U 1 1 57336052
+P 4400 4050
+F 0 "V1" H 4528 4096 50  0000 L CNN
+F 1 "SINE(0 1.5 1k 0 0 0 0)" H 4528 4005 50  0000 L CNN
+F 2 "" H 4400 4050 50  0000 C CNN
+F 3 "" H 4400 4050 50  0000 C CNN
+F 4 "Value" H 4400 4050 60  0001 C CNN "Fieldname"
+F 5 "V" H 4400 4050 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 4100 4250 60  0001 C CNN "Spice_Node_Sequence"
+	1    4400 4050
+	-1   0    0    1   
+$EndComp
+$Comp
+L GND #PWR1
+U 1 1 573360D3
+P 4400 4350
+F 0 "#PWR1" H 4400 4100 50  0001 C CNN
+F 1 "GND" H 4405 4177 50  0000 C CNN
+F 2 "" H 4400 4350 50  0000 C CNN
+F 3 "" H 4400 4350 50  0000 C CNN
+	1    4400 4350
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R1
+U 1 1 573360F5
+P 4650 3700
+F 0 "R1" V 4443 3700 50  0000 C CNN
+F 1 "1k" V 4534 3700 50  0000 C CNN
+F 2 "" V 4580 3700 50  0000 C CNN
+F 3 "" H 4650 3700 50  0000 C CNN
+F 4 "Value" H 4650 3700 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 4650 3700 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 4650 3700 60  0001 C CNN "Spice_Primitive"
+	1    4650 3700
+	0    1    1    0   
+$EndComp
+$Comp
+L D D1
+U 1 1 573361B8
+P 5100 3700
+F 0 "D1" H 5100 3485 50  0000 C CNN
+F 1 "1N4148" H 5100 3576 50  0000 C CNN
+F 2 "" H 5100 3700 50  0000 C CNN
+F 3 "" H 5100 3700 50  0000 C CNN
+F 4 "Value" H 5100 3700 60  0001 C CNN "Fieldname"
+F 5 "D" H 5100 3700 60  0001 C CNN "Spice_Primitive"
+F 6 "2 1" H 5100 3700 60  0001 C CNN "Spice_Node_Sequence"
+	1    5100 3700
+	-1   0    0    1   
+$EndComp
+$Comp
+L C C1
+U 1 1 5733628F
+P 5400 4000
+F 0 "C1" H 5515 4046 50  0000 L CNN
+F 1 "100n" H 5515 3955 50  0000 L CNN
+F 2 "" H 5438 3850 50  0000 C CNN
+F 3 "" H 5400 4000 50  0000 C CNN
+F 4 "Value" H 5400 4000 60  0001 C CNN "Fieldname"
+F 5 "C" H 5400 4000 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 5400 4000 60  0001 C CNN "SpiceMapping"
+	1    5400 4000
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R2
+U 1 1 573362F7
+P 5750 4000
+F 0 "R2" H 5680 3954 50  0000 R CNN
+F 1 "100k" H 5680 4045 50  0000 R CNN
+F 2 "" V 5680 4000 50  0000 C CNN
+F 3 "" H 5750 4000 50  0000 C CNN
+F 4 "Value" H 5750 4000 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 5750 4000 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 5750 4000 60  0001 C CNN "Spice_Primitive"
+	1    5750 4000
+	-1   0    0    1   
+$EndComp
+Text Notes 4300 4900 0    60   ~ 0
+.tran 1u 10m\n
+Wire Wire Line
+	4400 4350 4400 4250
+Wire Wire Line
+	4400 4300 5750 4300
+Connection ~ 4400 4300
+Wire Wire Line
+	5250 3700 5750 3700
+Wire Wire Line
+	5750 3700 5750 3850
+Wire Wire Line
+	5400 3850 5400 3700
+Connection ~ 5400 3700
+Wire Wire Line
+	5400 4300 5400 4150
+Wire Wire Line
+	5750 4300 5750 4150
+Connection ~ 5400 4300
+Wire Wire Line
+	4800 3700 4950 3700
+Connection ~ 4900 3700
+Wire Wire Line
+	4400 3850 4400 3700
+Wire Wire Line
+	4400 3700 4500 3700
+Text Notes 4300 4800 0    60   ~ 0
+.include diodes.lib\n
+Text Label 4400 3800 0    60   ~ 0
+in
+Text Label 5550 3700 0    60   ~ 0
+rect
+Text Notes 4300 5000 0    60   ~ 0
+*.ac dec 10 1 1Meg\n
+$EndSCHEMATC
diff --git a/demos/sim/power.dcm b/demos/sim/power.dcm
new file mode 100644
index 0000000000..58f6869757
--- /dev/null
+++ b/demos/sim/power.dcm
@@ -0,0 +1,234 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP +12C
+K POWER, PWR
+$ENDCMP
+#
+$CMP +12L
+K POWER, PWR
+$ENDCMP
+#
+$CMP +12LF
+K POWER, PWR
+$ENDCMP
+#
+$CMP +12P
+K POWER, PWR
+$ENDCMP
+#
+$CMP +12V
+K POWER, PWR
+$ENDCMP
+#
+$CMP +12VA
+K POWER, PWR
+$ENDCMP
+#
+$CMP +15V
+K POWER, PWR
+$ENDCMP
+#
+$CMP +1V1
+K POWER, PWR
+$ENDCMP
+#
+$CMP +1V2
+K POWER, PWR
+$ENDCMP
+#
+$CMP +1V5
+K POWER, PWR
+$ENDCMP
+#
+$CMP +1V8
+K POWER, PWR
+$ENDCMP
+#
+$CMP +24V
+K POWER, PWR
+$ENDCMP
+#
+$CMP +2V5
+K POWER, PWR
+$ENDCMP
+#
+$CMP +36V
+K POWER, PWR
+$ENDCMP
+#
+$CMP +3V3
+K POWER, PWR
+$ENDCMP
+#
+$CMP +48V
+K POWER, PWR
+$ENDCMP
+#
+$CMP +5C
+K POWER, PWR
+$ENDCMP
+#
+$CMP +5F
+K POWER, PWR
+$ENDCMP
+#
+$CMP +5P
+K POWER, PWR
+$ENDCMP
+#
+$CMP +5V
+K POWER, PWR
+$ENDCMP
+#
+$CMP +5VA
+K POWER, PWR
+$ENDCMP
+#
+$CMP +5VD
+K POWER, PWR
+$ENDCMP
+#
+$CMP +5VL
+K POWER, PWR
+$ENDCMP
+#
+$CMP +5VP
+K POWER, PWR
+$ENDCMP
+#
+$CMP +6V
+K POWER, PWR
+$ENDCMP
+#
+$CMP +8V
+K POWER, PWR
+$ENDCMP
+#
+$CMP +9V
+K POWER, PWR
+$ENDCMP
+#
+$CMP +9VA
+K POWER, PWR
+$ENDCMP
+#
+$CMP +BATT
+K POWER, PWR
+$ENDCMP
+#
+$CMP -10V
+K POWER, PWR
+$ENDCMP
+#
+$CMP -12V
+K POWER, PWR
+$ENDCMP
+#
+$CMP -12VA
+K POWER, PWR
+$ENDCMP
+#
+$CMP -15V
+K POWER, PWR
+$ENDCMP
+#
+$CMP -24V
+K POWER, PWR
+$ENDCMP
+#
+$CMP -36V
+K POWER, PWR
+$ENDCMP
+#
+$CMP -48V
+K POWER, PWR
+$ENDCMP
+#
+$CMP -5V
+K POWER, PWR
+$ENDCMP
+#
+$CMP -5VA
+K POWER, PWR
+$ENDCMP
+#
+$CMP -6V
+K POWER, PWR
+$ENDCMP
+#
+$CMP -8V
+K POWER, PWR
+$ENDCMP
+#
+$CMP -9VA
+K POWER, PWR
+$ENDCMP
+#
+$CMP Earth
+D Ground
+K POWER, PWR, GND, GROUND
+$ENDCMP
+#
+$CMP Earth_Clean
+D Clean Earth
+K POWER, PWR, GND, GROUND, CLEAN, SIGNAL
+$ENDCMP
+#
+$CMP Earth_Protective
+D Protective Earth
+K POWER, PWR, EARTH, PROTECTIVE, GND, GROUND, PE
+$ENDCMP
+#
+$CMP GND
+K POWER, PWR
+$ENDCMP
+#
+$CMP GNDA
+K POWER, PWR
+$ENDCMP
+#
+$CMP GNDD
+K POWER, PWR
+$ENDCMP
+#
+$CMP GNDPWR
+K POWER, PWR
+$ENDCMP
+#
+$CMP GNDREF
+K POWER, PWR
+$ENDCMP
+#
+$CMP VAA
+K POWER, PWR
+$ENDCMP
+#
+$CMP VCC
+K POWER, PWR
+$ENDCMP
+#
+$CMP VCOM
+K POWER, PWR
+$ENDCMP
+#
+$CMP VDD
+K POWER, PWR
+$ENDCMP
+#
+$CMP VEE
+K POWER, PWR
+$ENDCMP
+#
+$CMP VMEM
+K POWER, PWR
+$ENDCMP
+#
+$CMP VPP
+K POWER, PWR
+$ENDCMP
+#
+$CMP VSS
+K POWER, PWR
+$ENDCMP
+#
+#End Doc Library
diff --git a/demos/sim/power.lib b/demos/sim/power.lib
new file mode 100644
index 0000000000..17a023b4b1
--- /dev/null
+++ b/demos/sim/power.lib
@@ -0,0 +1,936 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# +12C
+#
+DEF +12C #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+12C" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +12C 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +12L
+#
+DEF +12L #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+12L" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +12L 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +12LF
+#
+DEF +12LF #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+12LF" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +12LF 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +12P
+#
+DEF +12P #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+12P" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +12P 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +12V
+#
+DEF +12V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+12V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +12V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +12VA
+#
+DEF +12VA #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+12VA" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +12VA 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +15V
+#
+DEF +15V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+15V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +15V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +1V0
+#
+DEF +1V0 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+1V0" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +1V0 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +1V1
+#
+DEF +1V1 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+1V1" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +1V1 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +1V2
+#
+DEF +1V2 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+1V2" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +1V2 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +1V35
+#
+DEF +1V35 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+1V35" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +1V35 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +1V5
+#
+DEF +1V5 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+1V5" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +1V5 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +1V8
+#
+DEF +1V8 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+1V8" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +1V8 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +24V
+#
+DEF +24V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+24V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +24V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +2V5
+#
+DEF +2V5 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+2V5" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +2V5 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +3.3VADC
+#
+DEF +3.3VADC #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 150 -50 50 H I C CNN
+F1 "+3.3VADC" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 0 0 0 0 40 0 40 N
+P 6 0 1 0 0 40 20 20 0 70 -20 20 0 40 0 40 N
+X +3.3VADC 1 0 0 0 U 50 50 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +3.3VDAC
+#
+DEF +3.3VDAC #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 150 -50 50 H I C CNN
+F1 "+3.3VDAC" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 0 0 0 0 40 0 40 N
+P 6 0 1 0 0 40 20 20 0 70 -20 20 0 40 0 40 N
+X +3.3VDAC 1 0 0 0 U 50 50 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +3.3VP
+#
+DEF +3.3VP #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 150 -50 50 H I C CNN
+F1 "+3.3VP" 0 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 0 0 0 0 40 0 40 N
+P 7 0 1 0 20 30 0 40 -20 30 -10 70 10 70 20 30 20 30 N
+X +3.3VP 1 0 0 0 U 50 50 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# +36V
+#
+DEF +36V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+36V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +36V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +3V3
+#
+DEF +3V3 #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+3V3" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS +3.3V
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +3V3 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +48V
+#
+DEF +48V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+48V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +48V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +5C
+#
+DEF +5C #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+5C" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5C 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +5F
+#
+DEF +5F #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+5F" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5F 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +5P
+#
+DEF +5P #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+5P" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5P 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +5V
+#
+DEF +5V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+5V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +5VA
+#
+DEF +5VA #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+5VA" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5VA 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +5VD
+#
+DEF +5VD #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+5VD" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5VD 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +5VL
+#
+DEF +5VL #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+5VL" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5VL 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +5VP
+#
+DEF +5VP #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+5VP" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5VP 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +6V
+#
+DEF +6V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+6V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +6V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +8V
+#
+DEF +8V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+8V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +8V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +9V
+#
+DEF +9V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+9V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +9V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +9VA
+#
+DEF +9VA #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -125 50 H I C CNN
+F1 "+9VA" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +9VA 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# +BATT
+#
+DEF +BATT #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "+BATT" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +BATT 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# -10V
+#
+DEF -10V #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 100 50 H I C CNN
+F1 "-10V" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
+X -10V 1 0 0 0 U 50 50 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -12V
+#
+DEF -12V #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 100 50 H I C CNN
+F1 "-12V" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
+X -12V 1 0 0 0 U 50 50 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -12VA
+#
+DEF -12VA #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "-12VA" 0 140 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X -12VA 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# -15V
+#
+DEF -15V #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 100 50 H I C CNN
+F1 "-15V" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
+X -15V 1 0 0 0 U 50 50 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -24V
+#
+DEF -24V #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 100 50 H I C CNN
+F1 "-24V" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
+X -24V 1 0 0 0 U 50 50 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -36V
+#
+DEF -36V #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 100 50 H I C CNN
+F1 "-36V" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
+X -36V 1 0 0 0 U 50 50 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -48V
+#
+DEF -48V #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 100 50 H I C CNN
+F1 "-48V" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
+X -48V 1 0 0 0 U 50 50 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -5V
+#
+DEF -5V #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 100 50 H I C CNN
+F1 "-5V" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
+X -5V 1 0 0 0 U 50 50 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -5VA
+#
+DEF -5VA #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 100 50 H I C CNN
+F1 "-5VA" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
+X -5VA 1 0 0 0 U 50 50 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -6V
+#
+DEF -6V #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 100 50 H I C CNN
+F1 "-6V" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
+X -6V 1 0 0 0 U 50 50 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -8V
+#
+DEF -8V #PWR 0 0 Y Y 1 F N
+F0 "#PWR" 0 100 50 H I C CNN
+F1 "-8V" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
+X -8V 1 0 0 0 U 50 50 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# -9VA
+#
+DEF -9VA #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -125 50 H I C CNN
+F1 "-9VA" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 0 0 100 N
+P 4 0 1 0 30 50 -30 50 0 100 30 50 F
+X -9VA 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# Earth
+#
+DEF ~Earth #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "Earth" 0 -150 50 H I C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -25 -75 25 -75 N
+P 2 0 1 0 -5 -100 5 -100 N
+P 2 0 1 0 0 -50 0 0 N
+P 2 0 1 0 50 -50 -50 -50 N
+X Earth 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# Earth_Clean
+#
+DEF ~Earth_Clean #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 250 0 50 H I C CNN
+F1 "Earth_Clean" 300 -150 50 H I C CNN
+F2 "" 0 -50 50 H V C CNN
+F3 "" 0 -50 50 H V C CNN
+DRAW
+A 0 -150 100 1 1799 0 1 0 N 100 -150 -100 -150
+P 2 0 1 0 -25 -125 25 -125 N
+P 2 0 1 0 -5 -150 5 -150 N
+P 2 0 1 0 0 -100 0 0 N
+P 2 0 1 0 50 -100 -50 -100 N
+X Earth_Clean 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# Earth_Protective
+#
+DEF ~Earth_Protective #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 250 -250 50 H I C CNN
+F1 "Earth_Protective" 450 -150 50 H I C CNN
+F2 "" 0 -100 50 H V C CNN
+F3 "" 0 -100 50 H V C CNN
+DRAW
+C 0 -150 100 0 1 0 N
+P 2 0 1 0 -25 -175 25 -175 N
+P 2 0 1 0 -5 -200 5 -200 N
+P 2 0 1 0 0 -150 0 0 N
+P 2 0 1 0 50 -150 -50 -150 N
+X Earth_Protective 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# GNDA
+#
+DEF GNDA #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "GNDA" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GNDA 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# GNDD
+#
+DEF GNDD #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "GNDD" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GNDD 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# GNDPWR
+#
+DEF GNDPWR #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -200 50 H I C CNN
+F1 "GNDPWR" 0 -130 50 H V C CNN
+F2 "" 0 -50 50 H V C CNN
+F3 "" 0 -50 50 H V C CNN
+DRAW
+P 2 0 1 0 0 -50 0 0 N
+P 3 0 1 8 -40 -50 -50 -80 -50 -80 N
+P 3 0 1 8 -20 -50 -30 -80 -30 -80 N
+P 3 0 1 8 0 -50 -10 -80 -10 -80 N
+P 3 0 1 8 20 -50 10 -80 10 -80 N
+P 3 0 1 8 40 -50 -40 -50 -40 -50 N
+P 4 0 1 8 40 -50 30 -80 30 -80 30 -80 N
+X GNDPWR 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# GNDREF
+#
+DEF GNDREF #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "GNDREF" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -25 -75 25 -75 N
+P 2 0 1 0 -5 -100 5 -100 N
+P 2 0 1 0 0 -50 0 0 N
+P 2 0 1 0 50 -50 -50 -50 N
+X GNDREF 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# HT
+#
+DEF HT #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 120 50 H I C CNN
+F1 "HT" 0 90 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 3 0 1 0 0 0 0 40 0 40 N
+P 6 0 1 0 0 40 20 20 0 70 -20 20 0 40 0 40 N
+X HT 1 0 0 0 U 50 50 0 0 W N
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 95 50 H I C CNN
+F1 "PWR_FLAG" 0 180 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 50 -75 100 0 150 75 100 0 50 N
+X pwr 1 0 0 0 U 50 50 0 0 w
+ENDDRAW
+ENDDEF
+#
+# VAA
+#
+DEF VAA #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VAA" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C 0 75 25 0 1 0 N
+P 2 0 1 0 0 0 0 50 N
+X VAA 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# VCC
+#
+DEF VCC #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VCC" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C 0 75 25 0 1 0 N
+P 2 0 1 0 0 0 0 50 N
+X VCC 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# VCOM
+#
+DEF VCOM #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VCOM" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C 0 75 25 0 1 0 N
+P 2 0 1 0 0 0 0 50 N
+X VCOM 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# VDD
+#
+DEF VDD #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VDD" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C 0 75 25 0 1 0 N
+P 2 0 1 0 0 0 0 50 N
+X VDD 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# VEE
+#
+DEF VEE #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VEE" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C 0 75 25 0 1 0 N
+P 2 0 1 0 0 0 0 50 N
+X VEE 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# VMEM
+#
+DEF VMEM #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VMEM" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X VMEM 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# VPP
+#
+DEF VPP #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VPP" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X VPP 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# VSS
+#
+DEF VSS #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VSS" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C 0 75 25 0 1 0 N
+P 2 0 1 0 0 0 0 50 N
+X VSS 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/sim/pspice.dcm b/demos/sim/pspice.dcm
new file mode 100644
index 0000000000..a12d4ba99d
--- /dev/null
+++ b/demos/sim/pspice.dcm
@@ -0,0 +1,16 @@
+EESchema-DOCLIB  Version 2.0
+#
+$CMP R
+D Resistance
+K R DEV
+$ENDCMP
+#
+$CMP VSOURCE
+D Spice Voltage Source
+$ENDCMP
+#
+$CMP Value
+D Spice Voltage Source
+$ENDCMP
+#
+#End Doc Library
diff --git a/demos/sim/pspice.lib b/demos/sim/pspice.lib
new file mode 100644
index 0000000000..56df072b1f
--- /dev/null
+++ b/demos/sim/pspice.lib
@@ -0,0 +1,204 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# 0
+#
+DEF 0 #GND 0 0 Y Y 1 F P
+F0 "#GND" 0 -100 50 H I C CNN
+F1 "0" 0 -70 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 4 0 1 0 -50 0 0 -50 50 0 -50 0 N
+X 0 1 0 0 0 R 40 40 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# CAP
+#
+DEF CAP C 0 10 Y Y 1 F N
+F0 "C" 100 150 50 V V C CNN
+F1 "CAP" 100 -150 50 V V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+ALIAS C
+DRAW
+P 2 0 1 0 -150 -50 150 -50 N
+P 2 0 1 0 -150 50 150 50 N
+X ~ 1 0 250 200 D 40 40 1 1 P
+X ~ 2 0 -250 200 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# DIODE
+#
+DEF DIODE D 0 40 Y N 1 F N
+F0 "D" 0 150 50 H V C CNN
+F1 "DIODE" 0 -175 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 -75 100 -75 -100 N
+P 3 0 1 0 75 100 75 -100 -75 0 F
+X K 1 -200 0 150 R 50 50 1 1 I
+X A 2 200 0 150 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# INDUCTOR
+#
+DEF INDUCTOR L 0 0 N Y 1 F N
+F0 "L" 0 100 50 H V C CNN
+F1 "INDUCTOR" 0 -50 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+A -150 0 50 1 1799 0 1 0 N -100 0 -200 0
+A -50 0 50 1 1799 0 1 0 N 0 0 -100 0
+A 50 0 50 1 1799 0 1 0 N 100 0 0 0
+A 150 0 50 1 1799 0 1 0 N 200 0 100 0
+X 1 1 -250 0 50 R 30 30 1 1 I
+X 2 2 250 0 50 L 30 30 1 1 I
+ENDDRAW
+ENDDEF
+#
+# ISOURCE
+#
+DEF ISOURCE I 0 40 Y Y 1 F N
+F0 "I" 0 -180 50 H V C CNN
+F1 "ISOURCE" 10 170 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C 0 -150 250 0 1 0 N
+C 0 150 250 0 1 0 N
+T 0 -320 -10 100 0 0 1 I Normal 0 C C
+P 2 0 1 0 -350 -200 -350 200 F
+P 3 0 1 0 -400 200 -350 300 -300 200 F
+X E1 1 0 700 300 D 50 50 1 1 I
+X E2 2 0 -700 300 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# QNPN
+#
+DEF QNPN Q 0 0 Y Y 1 F N
+F0 "Q" -100 300 50 H V C CNN
+F1 "QNPN" -100 200 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 0 0 0 0 150 -150 N
+P 4 0 0 0 150 -150 150 -50 50 -150 150 -150 F
+P 2 0 1 0 0 -150 0 150 N
+P 2 0 1 0 0 0 150 150 N
+P 4 0 1 0 -100 -150 0 -150 0 -150 0 -150 N
+X C 1 150 350 200 D 40 40 1 1 P
+X B 2 -300 0 300 R 40 40 1 1 I
+X E 3 150 -350 200 U 40 40 1 1 P
+X Substrat 4 -100 -350 200 U 50 20 1 1 I
+ENDDRAW
+ENDDEF
+#
+# QPNP
+#
+DEF QPNP Q 0 0 Y Y 1 F N
+F0 "Q" -100 300 50 H V C CNN
+F1 "QPNP" -100 200 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 2 0 1 0 0 -150 0 150 N
+P 2 0 1 0 0 0 150 -150 N
+P 2 0 1 0 0 0 150 150 N
+P 3 0 1 0 -100 -150 0 -150 0 -150 N
+P 4 0 1 0 120 -180 180 -120 85 -85 120 -180 F
+X C 1 150 350 200 D 40 40 1 1 C
+X B 2 -300 0 300 R 40 40 1 1 I
+X E 3 150 -350 200 U 40 40 1 1 E
+X Substrat 4 -100 -350 200 U 50 20 1 1 I
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R" 0 0 50 V V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+S -40 150 40 -150 0 1 0 N
+X ~ 1 0 250 100 D 50 50 1 1 P
+X ~ 2 0 -250 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# SPICE_DIRECTIVE
+#
+DEF ~SPICE_DIRECTIVE X 0 40 Y Y 1 F N
+F0 "X" 0 0 60 H I C CNN
+F1 "SPICE_DIRECTIVE" -75 300 60 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+T 0 450 0 60 0 0 0 SPICE~Command Normal 0 C C
+P 5 0 0 0 50 -50 850 -50 850 50 50 50 50 -50 N
+ENDDRAW
+ENDDEF
+#
+# SPICE_PROBE
+#
+DEF ~SPICE_PROBE U 0 40 N N 1 F N
+F0 "U" 0 0 60 H I C CNN
+F1 "SPICE_PROBE" 0 0 60 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+P 2 0 0 0 -61 148 -63 165 N
+P 3 0 0 0 -61 167 -55 170 -45 156 N
+P 4 0 0 0 -1 1 -20 46 -9 50 1 1 F
+P 6 0 0 0 -10 49 6 55 -33 158 -71 142 -32 42 -19 46 N
+P 11 0 0 0 -61 169 -63 179 -61 188 -52 190 -42 189 -42 183 -47 181 -52 184 -57 189 -62 199 -63 202 N
+X ~ 1 0 0 0 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# VSOURCE
+#
+DEF ~VSOURCE V 0 40 Y Y 1 F N
+F0 "V" 200 200 50 H V C CNN
+F1 "VSOURCE" 250 100 50 H I C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+F4 "Value" 0 0 60 H I C CNN "Fieldname"
+F5 "V" 0 0 60 H I C CNN "Spice_Primitive"
+F6 "1 2" -300 200 60 H I C CNN "Spice_Node_Sequence"
+DRAW
+C 0 0 100 0 1 0 N
+P 2 0 1 0 0 -75 0 75 N
+P 4 0 1 0 0 75 -25 25 25 25 0 75 F
+X ~ 1 0 200 100 D 50 50 1 1 I
+X ~ 2 0 -200 100 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Value
+#
+DEF Value V 0 40 Y Y 1 F N
+F0 "V" 200 200 50 H V C CNN
+F1 "Value" 250 100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+F4 "V" 0 0 60 H I C CNN "SpicePrimitive"
+F5 "1 2" -300 200 60 H I C CNN "SpicePinMapping"
+DRAW
+C 0 0 100 0 1 0 N
+P 2 0 1 0 0 -75 0 75 N
+P 4 0 1 0 0 75 -25 25 25 25 0 75 F
+X ~ 1 0 200 100 D 50 50 1 1 I
+X ~ 2 0 -200 100 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/sim/sim_test.sch b/demos/sim/sim_test.sch
new file mode 100644
index 0000000000..93e2cf981e
--- /dev/null
+++ b/demos/sim/sim_test.sch
@@ -0,0 +1,183 @@
+EESchema Schematic File Version 2
+LIBS:74xgxx
+LIBS:74xx
+LIBS:ac-dc
+LIBS:actel
+LIBS:adc-dac
+LIBS:analog_switches
+LIBS:atmel
+LIBS:audio
+LIBS:brooktre
+LIBS:cmos4000
+LIBS:cmos_ieee
+LIBS:conn
+LIBS:contrib
+LIBS:cypress
+LIBS:dc-dc
+LIBS:device
+LIBS:digital-audio
+LIBS:display
+LIBS:dsp
+LIBS:elec-unifil
+LIBS:ftdi
+LIBS:gennum
+LIBS:graphic
+LIBS:hc11
+LIBS:intel
+LIBS:interface
+LIBS:ir
+LIBS:linear
+LIBS:logo
+LIBS:memory
+LIBS:microchip
+LIBS:microchip_pic10mcu
+LIBS:microchip_pic12mcu
+LIBS:microchip_pic16mcu
+LIBS:microchip_pic18mcu
+LIBS:microchip_pic32mcu
+LIBS:microcontrollers
+LIBS:motor_drivers
+LIBS:motorola
+LIBS:msp430
+LIBS:nordicsemi
+LIBS:nxp_armmcu
+LIBS:onsemi
+LIBS:opto
+LIBS:philips
+LIBS:power
+LIBS:powerint
+LIBS:pspice
+LIBS:references
+LIBS:regul
+LIBS:relays
+LIBS:rfcom
+LIBS:sensors
+LIBS:silabs
+LIBS:siliconi
+LIBS:stm8
+LIBS:stm32
+LIBS:supertex
+LIBS:switches
+LIBS:texas
+LIBS:transf
+LIBS:transistors
+LIBS:ttl_ieee
+LIBS:valves
+LIBS:video
+LIBS:xilinx
+LIBS:fmc
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L VSOURCE V?
+U 1 1 57336052
+P 4400 4050
+F 0 "V?" H 4528 4096 50  0000 L CNN
+F 1 "DC 10" H 4528 4005 50  0000 L CNN
+F 2 "" H 4400 4050 50  0000 C CNN
+F 3 "" H 4400 4050 50  0000 C CNN
+F 4 "Value" H 4400 4050 60  0001 C CNN "Fieldname"
+F 5 "V" H 4400 4050 60  0001 C CNN "SpicePrimitive"
+F 6 "1 2" H 4100 4250 60  0001 C CNN "SpicePinMapping"
+	1    4400 4050
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 573360D3
+P 4400 4350
+F 0 "#PWR?" H 4400 4100 50  0001 C CNN
+F 1 "GND" H 4405 4177 50  0000 C CNN
+F 2 "" H 4400 4350 50  0000 C CNN
+F 3 "" H 4400 4350 50  0000 C CNN
+	1    4400 4350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4400 4350 4400 4250
+Wire Wire Line
+	4400 4300 5750 4300
+Connection ~ 4400 4300
+$Comp
+L R R?
+U 1 1 573360F5
+P 4650 3700
+F 0 "R?" V 4443 3700 50  0000 C CNN
+F 1 "10k" V 4534 3700 50  0000 C CNN
+F 2 "" V 4580 3700 50  0000 C CNN
+F 3 "" H 4650 3700 50  0000 C CNN
+F 4 "1 2" H 4650 3700 60  0001 C CNN "SpiceMapping"
+F 5 "R" V 4650 3700 60  0001 C CNN "SpicePrimitive"
+	1    4650 3700
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	4500 3700 4400 3700
+Wire Wire Line
+	4400 3700 4400 3850
+Wire Wire Line
+	4800 3700 4950 3700
+$Comp
+L D D?
+U 1 1 573361B8
+P 5100 3700
+F 0 "D?" H 5100 3485 50  0000 C CNN
+F 1 "1N4148" H 5100 3576 50  0000 C CNN
+F 2 "" H 5100 3700 50  0000 C CNN
+F 3 "" H 5100 3700 50  0000 C CNN
+F 4 "D" H 5100 3700 60  0001 C CNN "SpicePrimitive"
+F 5 "1 2" H 5100 3700 60  0001 C CNN "SpiceMapping"
+	1    5100 3700
+	-1   0    0    1   
+$EndComp
+$Comp
+L C C?
+U 1 1 5733628F
+P 5400 4000
+F 0 "C?" H 5515 4046 50  0000 L CNN
+F 1 "100n" H 5515 3955 50  0000 L CNN
+F 2 "" H 5438 3850 50  0000 C CNN
+F 3 "" H 5400 4000 50  0000 C CNN
+F 4 "C" H 5400 4000 60  0001 C CNN "SpicePrimitive"
+F 5 "1 2" H 5400 4000 60  0001 C CNN "SpiceMapping"
+	1    5400 4000
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R?
+U 1 1 573362F7
+P 5750 4000
+F 0 "R?" H 5680 3954 50  0000 R CNN
+F 1 "100k" H 5680 4045 50  0000 R CNN
+F 2 "" V 5680 4000 50  0000 C CNN
+F 3 "" H 5750 4000 50  0000 C CNN
+F 4 "1 2" H 5750 4000 60  0001 C CNN "SpiceMapping"
+F 5 "R" V 5750 4000 60  0001 C CNN "SpicePrimitive"
+	1    5750 4000
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5250 3700 5750 3700
+Wire Wire Line
+	5750 3700 5750 3850
+Wire Wire Line
+	5400 3850 5400 3700
+Connection ~ 5400 3700
+Wire Wire Line
+	5400 4300 5400 4150
+Wire Wire Line
+	5750 4300 5750 4150
+Connection ~ 5400 4300
+$EndSCHEMATC

From 7b05dc2a13666547cdd4d6384920f2bbf7e1ae36 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:04 +0200
Subject: [PATCH 005/197] Fbp files for simulator

---
 eeschema/dialogs/dialog_simulate_plot.cpp |   55 +
 eeschema/dialogs/dialog_simulate_plot.fbp |  556 ++++++++
 eeschema/dialogs/dialog_simulate_plot.h   |   63 +
 eeschema/sim/sim_plot_frame_base.fbp      | 1524 +++++++++++++++++++++
 4 files changed, 2198 insertions(+)
 create mode 100644 eeschema/dialogs/dialog_simulate_plot.cpp
 create mode 100644 eeschema/dialogs/dialog_simulate_plot.fbp
 create mode 100644 eeschema/dialogs/dialog_simulate_plot.h
 create mode 100644 eeschema/sim/sim_plot_frame_base.fbp

diff --git a/eeschema/dialogs/dialog_simulate_plot.cpp b/eeschema/dialogs/dialog_simulate_plot.cpp
new file mode 100644
index 0000000000..c4b1b9be71
--- /dev/null
+++ b/eeschema/dialogs/dialog_simulate_plot.cpp
@@ -0,0 +1,55 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "sim_plot_panel.h"
+
+#include "dialog_simulate_plot.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+SIM_PLOT_FRAME::SIM_PLOT_FRAME( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer1;
+	bSizer1 = new wxBoxSizer( wxVERTICAL );
+	
+	m_auiToolBar1 = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); 
+	m_toolZoomIn = m_auiToolBar1->AddTool( wxID_ANY, wxT("Zoom In"), wxNullBitmap, wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); 
+	
+	m_auiToolBar1->Realize(); 
+	
+	bSizer1->Add( m_auiToolBar1, 0, wxALL, 5 );
+	
+	m_splitter1 = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
+	m_splitter1->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME::m_splitter1OnIdle ), NULL, this );
+	
+	m_plotPanel = new SIM_PLOT_PANEL( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel3 = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer3;
+	bSizer3 = new wxBoxSizer( wxVERTICAL );
+	
+	m_simConsole = new wxRichTextCtrl( m_panel3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0|wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS );
+	bSizer3->Add( m_simConsole, 1, wxEXPAND | wxALL, 5 );
+	
+	
+	m_panel3->SetSizer( bSizer3 );
+	m_panel3->Layout();
+	bSizer3->Fit( m_panel3 );
+	m_splitter1->SplitHorizontally( m_plotPanel, m_panel3, 0 );
+	bSizer1->Add( m_splitter1, 1, wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bSizer1 );
+	this->Layout();
+	
+	this->Centre( wxBOTH );
+}
+
+SIM_PLOT_FRAME::~SIM_PLOT_FRAME()
+{
+}
diff --git a/eeschema/dialogs/dialog_simulate_plot.fbp b/eeschema/dialogs/dialog_simulate_plot.fbp
new file mode 100644
index 0000000000..6aecf4e088
--- /dev/null
+++ b/eeschema/dialogs/dialog_simulate_plot.fbp
@@ -0,0 +1,556 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<wxFormBuilder_Project>
+    <FileVersion major="1" minor="13" />
+    <object class="Project" expanded="1">
+        <property name="class_decoration"></property>
+        <property name="code_generation">C++</property>
+        <property name="disconnect_events">1</property>
+        <property name="disconnect_mode">source_name</property>
+        <property name="disconnect_php_events">0</property>
+        <property name="disconnect_python_events">0</property>
+        <property name="embedded_files_path">res</property>
+        <property name="encoding">UTF-8</property>
+        <property name="event_generation">connect</property>
+        <property name="file"></property>
+        <property name="first_id">1000</property>
+        <property name="help_provider">none</property>
+        <property name="internationalize">0</property>
+        <property name="name">SpiceWIndow</property>
+        <property name="namespace"></property>
+        <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="Frame" expanded="1">
+            <property name="aui_managed">0</property>
+            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
+            <property name="bg"></property>
+            <property name="center">wxBOTH</property>
+            <property name="context_help"></property>
+            <property name="context_menu">1</property>
+            <property name="enabled">1</property>
+            <property name="event_handler">impl_virtual</property>
+            <property name="extra_style"></property>
+            <property name="fg"></property>
+            <property name="font"></property>
+            <property name="hidden">0</property>
+            <property name="id">wxID_ANY</property>
+            <property name="maximum_size"></property>
+            <property name="minimum_size"></property>
+            <property name="name">SIM_PLOT_FRAME</property>
+            <property name="pos"></property>
+            <property name="size">548,434</property>
+            <property name="style">wxDEFAULT_FRAME_STYLE</property>
+            <property name="subclass"></property>
+            <property name="title">Spice Simulation</property>
+            <property name="tooltip"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style">wxTAB_TRAVERSAL</property>
+            <property name="xrc_skip_sizer">1</property>
+            <event name="OnActivate"></event>
+            <event name="OnActivateApp"></event>
+            <event name="OnAuiFindManager"></event>
+            <event name="OnAuiPaneButton"></event>
+            <event name="OnAuiPaneClose"></event>
+            <event name="OnAuiPaneMaximize"></event>
+            <event name="OnAuiPaneRestore"></event>
+            <event name="OnAuiRender"></event>
+            <event name="OnChar"></event>
+            <event name="OnClose"></event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnHibernate"></event>
+            <event name="OnIconize"></event>
+            <event name="OnIdle"></event>
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI"></event>
+            <object class="wxBoxSizer" expanded="1">
+                <property name="minimum_size"></property>
+                <property name="name">bSizer1</property>
+                <property name="orient">wxVERTICAL</property>
+                <property name="permission">none</property>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL</property>
+                    <property name="proportion">0</property>
+                    <object class="wxAuiToolBar" 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_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="bitmapsize"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</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="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="label_visible">0</property>
+                        <property name="margins"></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">m_auiToolBar1</property>
+                        <property name="packing">1</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="separation">5</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="style">wxAUI_TB_HORZ_LAYOUT</property>
+                        <property name="subclass"></property>
+                        <property name="toolbar_label">label</property>
+                        <property name="toolbar_pane">0</property>
+                        <property name="tooltip"></property>
+                        <property name="use_explicit_ids">0</property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                        <object class="tool" expanded="1">
+                            <property name="bitmap">Load From File; </property>
+                            <property name="context_menu">0</property>
+                            <property name="id">wxID_ANY</property>
+                            <property name="kind">wxITEM_NORMAL</property>
+                            <property name="label">Zoom In</property>
+                            <property name="name">m_toolZoomIn</property>
+                            <property name="permission">protected</property>
+                            <property name="statusbar"></property>
+                            <property name="tooltip"></property>
+                            <event name="OnAuiToolBarBeginDrag"></event>
+                            <event name="OnAuiToolBarMiddleClick"></event>
+                            <event name="OnAuiToolBarOverflowClick"></event>
+                            <event name="OnAuiToolBarRightClick"></event>
+                            <event name="OnAuiToolBarToolDropDown"></event>
+                            <event name="OnMenuSelection"></event>
+                            <event name="OnToolClicked"></event>
+                            <event name="OnToolEnter"></event>
+                            <event name="OnToolRClicked"></event>
+                            <event name="OnUpdateUI"></event>
+                        </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="wxSplitterWindow" 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_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</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="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_pane_size">0</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">m_splitter1</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="sashgravity">0.0</property>
+                        <property name="sashpos">0</property>
+                        <property name="sashsize">-1</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="splitmode">wxSPLIT_HORIZONTAL</property>
+                        <property name="style">wxSP_3D</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"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnSplitterDClick"></event>
+                        <event name="OnSplitterSashPosChanged"></event>
+                        <event name="OnSplitterSashPosChanging"></event>
+                        <event name="OnSplitterUnsplit"></event>
+                        <event name="OnUpdateUI"></event>
+                        <object class="splitteritem" expanded="1">
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_plotPanel</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="subclass">SIM_PLOT_PANEL; sim_plot_panel.h</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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="splitteritem" expanded="1">
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_panel3</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxBoxSizer" expanded="1">
+                                    <property name="minimum_size"></property>
+                                    <property name="name">bSizer3</property>
+                                    <property name="orient">wxVERTICAL</property>
+                                    <property name="permission">none</property>
+                                    <object class="sizeritem" expanded="1">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND | wxALL</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxRichTextCtrl" 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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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">m_simConsole</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></property>
+                                            <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">wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS</property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRichTextCharacter"></event>
+                                            <event name="OnRichTextContentDeleted"></event>
+                                            <event name="OnRichTextContentInserted"></event>
+                                            <event name="OnRichTextDelete"></event>
+                                            <event name="OnRichTextReturn"></event>
+                                            <event name="OnRichTextStyleChanged"></event>
+                                            <event name="OnRichTextStyleSheetChanged"></event>
+                                            <event name="OnRichTextStyleSheetReplaced"></event>
+                                            <event name="OnRichTextStyleSheetReplacing"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnText"></event>
+                                            <event name="OnTextEnter"></event>
+                                            <event name="OnTextMaxLen"></event>
+                                            <event name="OnTextURL"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</wxFormBuilder_Project>
diff --git a/eeschema/dialogs/dialog_simulate_plot.h b/eeschema/dialogs/dialog_simulate_plot.h
new file mode 100644
index 0000000000..d9a581c036
--- /dev/null
+++ b/eeschema/dialogs/dialog_simulate_plot.h
@@ -0,0 +1,63 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_SIMULATE_PLOT_H__
+#define __DIALOG_SIMULATE_PLOT_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+class SIM_PLOT_PANEL;
+
+#include <wx/string.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/gdicmn.h>
+#include <wx/aui/aui.h>
+#include <wx/aui/auibar.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/panel.h>
+#include <wx/richtext/richtextctrl.h>
+#include <wx/sizer.h>
+#include <wx/splitter.h>
+#include <wx/frame.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class SIM_PLOT_FRAME
+///////////////////////////////////////////////////////////////////////////////
+class SIM_PLOT_FRAME : public wxFrame 
+{
+	private:
+	
+	protected:
+		wxAuiToolBar* m_auiToolBar1;
+		wxAuiToolBarItem* m_toolZoomIn; 
+		wxSplitterWindow* m_splitter1;
+		SIM_PLOT_PANEL* m_plotPanel;
+		wxPanel* m_panel3;
+		wxRichTextCtrl* m_simConsole;
+	
+	public:
+		
+		SIM_PLOT_FRAME( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Spice Simulation"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 548,434 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+		
+		~SIM_PLOT_FRAME();
+		
+		void m_splitter1OnIdle( wxIdleEvent& )
+		{
+			m_splitter1->SetSashPosition( 0 );
+			m_splitter1->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME::m_splitter1OnIdle ), NULL, this );
+		}
+	
+};
+
+#endif //__DIALOG_SIMULATE_PLOT_H__
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
new file mode 100644
index 0000000000..75b7870454
--- /dev/null
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -0,0 +1,1524 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<wxFormBuilder_Project>
+    <FileVersion major="1" minor="13" />
+    <object class="Project" expanded="1">
+        <property name="class_decoration"></property>
+        <property name="code_generation">C++</property>
+        <property name="disconnect_events">1</property>
+        <property name="disconnect_mode">source_name</property>
+        <property name="disconnect_php_events">0</property>
+        <property name="disconnect_python_events">0</property>
+        <property name="embedded_files_path">.</property>
+        <property name="encoding">UTF-8</property>
+        <property name="event_generation">connect</property>
+        <property name="file">sim_plot_frame_base</property>
+        <property name="first_id">1000</property>
+        <property name="help_provider">none</property>
+        <property name="internationalize">0</property>
+        <property name="name">SpiceWIndow</property>
+        <property name="namespace"></property>
+        <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="Frame" expanded="1">
+            <property name="aui_managed">0</property>
+            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
+            <property name="bg"></property>
+            <property name="center">wxBOTH</property>
+            <property name="context_help"></property>
+            <property name="context_menu">1</property>
+            <property name="enabled">1</property>
+            <property name="event_handler">impl_virtual</property>
+            <property name="extra_style"></property>
+            <property name="fg"></property>
+            <property name="font"></property>
+            <property name="hidden">0</property>
+            <property name="id">wxID_ANY</property>
+            <property name="maximum_size"></property>
+            <property name="minimum_size"></property>
+            <property name="name">SIM_PLOT_FRAME_BASE</property>
+            <property name="pos"></property>
+            <property name="size">1280,900</property>
+            <property name="style">wxDEFAULT_FRAME_STYLE</property>
+            <property name="subclass">KIWAY_PLAYER; kiway_player.h</property>
+            <property name="title">Simulation Workbook</property>
+            <property name="tooltip"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style">wxTAB_TRAVERSAL</property>
+            <property name="xrc_skip_sizer">1</property>
+            <event name="OnActivate"></event>
+            <event name="OnActivateApp"></event>
+            <event name="OnAuiFindManager"></event>
+            <event name="OnAuiPaneButton"></event>
+            <event name="OnAuiPaneClose"></event>
+            <event name="OnAuiPaneMaximize"></event>
+            <event name="OnAuiPaneRestore"></event>
+            <event name="OnAuiRender"></event>
+            <event name="OnChar"></event>
+            <event name="OnClose"></event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnHibernate"></event>
+            <event name="OnIconize"></event>
+            <event name="OnIdle"></event>
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI"></event>
+            <object class="wxMenuBar" expanded="1">
+                <property name="bg"></property>
+                <property name="context_help"></property>
+                <property name="context_menu">1</property>
+                <property name="enabled">1</property>
+                <property name="fg"></property>
+                <property name="font"></property>
+                <property name="hidden">0</property>
+                <property name="id">wxID_ANY</property>
+                <property name="label">MyMenuBar</property>
+                <property name="maximum_size"></property>
+                <property name="minimum_size"></property>
+                <property name="name">m_menubar1</property>
+                <property name="permission">protected</property>
+                <property name="pos"></property>
+                <property name="size"></property>
+                <property name="style"></property>
+                <property name="subclass"></property>
+                <property name="tooltip"></property>
+                <property name="window_extra_style"></property>
+                <property name="window_name"></property>
+                <property name="window_style"></property>
+                <event name="OnChar"></event>
+                <event name="OnEnterWindow"></event>
+                <event name="OnEraseBackground"></event>
+                <event name="OnKeyDown"></event>
+                <event name="OnKeyUp"></event>
+                <event name="OnKillFocus"></event>
+                <event name="OnLeaveWindow"></event>
+                <event name="OnLeftDClick"></event>
+                <event name="OnLeftDown"></event>
+                <event name="OnLeftUp"></event>
+                <event name="OnMiddleDClick"></event>
+                <event name="OnMiddleDown"></event>
+                <event name="OnMiddleUp"></event>
+                <event name="OnMotion"></event>
+                <event name="OnMouseEvents"></event>
+                <event name="OnMouseWheel"></event>
+                <event name="OnPaint"></event>
+                <event name="OnRightDClick"></event>
+                <event name="OnRightDown"></event>
+                <event name="OnRightUp"></event>
+                <event name="OnSetFocus"></event>
+                <event name="OnSize"></event>
+                <event name="OnUpdateUI"></event>
+                <object class="wxMenu" expanded="1">
+                    <property name="label">File</property>
+                    <property name="name">m_menu1</property>
+                    <property name="permission">protected</property>
+                    <object class="wxMenuItem" expanded="1">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">New Plot</property>
+                        <property name="name">m_menuItem7</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection">onNewPlot</event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="separator" expanded="1">
+                        <property name="name">m_separator3</property>
+                        <property name="permission">none</property>
+                    </object>
+                    <object class="wxMenuItem" expanded="1">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Open Workbook</property>
+                        <property name="name">m_menuItem8</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="wxMenuItem" expanded="0">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Save Workbook</property>
+                        <property name="name">m_menuItem2</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="separator" expanded="0">
+                        <property name="name">m_separator1</property>
+                        <property name="permission">none</property>
+                    </object>
+                    <object class="wxMenuItem" expanded="0">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Exit Simulation</property>
+                        <property name="name">m_menuItem1</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="wxMenu" expanded="1">
+                    <property name="label">View</property>
+                    <property name="name">m_menu2</property>
+                    <property name="permission">protected</property>
+                    <object class="wxMenuItem" expanded="1">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Zoom In</property>
+                        <property name="name">m_menuItem3</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="wxMenuItem" expanded="1">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Zoom Out</property>
+                        <property name="name">m_menuItem4</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="wxMenuItem" expanded="1">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Fit on Screen</property>
+                        <property name="name">m_menuItem5</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="separator" expanded="1">
+                        <property name="name">m_separator2</property>
+                        <property name="permission">none</property>
+                    </object>
+                    <object class="wxMenuItem" expanded="1">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="kind">wxITEM_CHECK</property>
+                        <property name="label">Show grid</property>
+                        <property name="name">m_menuItem6</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+            </object>
+            <object class="wxBoxSizer" expanded="1">
+                <property name="minimum_size"></property>
+                <property name="name">bSizer1</property>
+                <property name="orient">wxVERTICAL</property>
+                <property name="permission">none</property>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND</property>
+                    <property name="proportion">1</property>
+                    <object class="wxSplitterWindow" 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_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</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="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_pane_size">0</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">m_splitter1</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="sashgravity">0.2</property>
+                        <property name="sashpos">700</property>
+                        <property name="sashsize">0</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="splitmode">wxSPLIT_HORIZONTAL</property>
+                        <property name="style">wxSP_BORDER</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"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnSplitterDClick"></event>
+                        <event name="OnSplitterSashPosChanged"></event>
+                        <event name="OnSplitterSashPosChanging"></event>
+                        <event name="OnSplitterUnsplit"></event>
+                        <event name="OnUpdateUI"></event>
+                        <object class="splitteritem" expanded="1">
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_panel31</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxBoxSizer" expanded="1">
+                                    <property name="minimum_size"></property>
+                                    <property name="name">bSizer5</property>
+                                    <property name="orient">wxVERTICAL</property>
+                                    <property name="permission">none</property>
+                                    <object class="sizeritem" expanded="1">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxSplitterWindow" 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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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_pane_size">0</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">m_splitter2</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="sashgravity">0.0</property>
+                                            <property name="sashpos">0</property>
+                                            <property name="sashsize">-1</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="splitmode">wxSPLIT_VERTICAL</property>
+                                            <property name="style">wxSP_3DBORDER</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"></property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnSplitterDClick"></event>
+                                            <event name="OnSplitterSashPosChanged"></event>
+                                            <event name="OnSplitterSashPosChanging"></event>
+                                            <event name="OnSplitterUnsplit"></event>
+                                            <event name="OnUpdateUI"></event>
+                                            <object class="splitteritem" expanded="1">
+                                                <object class="wxPanel" 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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg">wxSYS_COLOUR_WINDOW</property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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">m_panel61</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                    <object class="wxBoxSizer" expanded="1">
+                                                        <property name="minimum_size"></property>
+                                                        <property name="name">bSizer6</property>
+                                                        <property name="orient">wxVERTICAL</property>
+                                                        <property name="permission">none</property>
+                                                        <object class="sizeritem" expanded="1">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxEXPAND</property>
+                                                            <property name="proportion">1</property>
+                                                            <object class="wxAuiNotebook" 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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg">wxSYS_COLOUR_WINDOW</property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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">m_plotNotebook</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style">wxAUI_NB_DEFAULT_STYLE</property>
+                                                                <property name="subclass"></property>
+                                                                <property name="tab_ctrl_height">-1</property>
+                                                                <property name="toolbar_pane">0</property>
+                                                                <property name="tooltip"></property>
+                                                                <property name="uniform_bitmap_size"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnAuiNotebookAllowDND"></event>
+                                                                <event name="OnAuiNotebookBeginDrag"></event>
+                                                                <event name="OnAuiNotebookButton"></event>
+                                                                <event name="OnAuiNotebookDragMotion"></event>
+                                                                <event name="OnAuiNotebookEndDrag"></event>
+                                                                <event name="OnAuiNotebookPageChanged"></event>
+                                                                <event name="OnAuiNotebookPageChanging"></event>
+                                                                <event name="OnAuiNotebookPageClose"></event>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                    </object>
+                                                </object>
+                                            </object>
+                                            <object class="splitteritem" expanded="1">
+                                                <object class="wxPanel" 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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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">m_panel7</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                    <object class="wxBoxSizer" expanded="1">
+                                                        <property name="minimum_size"></property>
+                                                        <property name="name">bSizer7</property>
+                                                        <property name="orient">wxVERTICAL</property>
+                                                        <property name="permission">none</property>
+                                                        <object class="sizeritem" expanded="1">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" 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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Signals</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">m_staticText2</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style">wxALIGN_CENTRE</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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="1">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxListBox" 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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</property>
+                                                                <property name="center_pane">0</property>
+                                                                <property name="choices"></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="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">m_signals</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style">wxLB_MULTIPLE|wxLB_SORT</property>
+                                                                <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>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnListBox"></event>
+                                                                <event name="OnListBoxDClick"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="1">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" 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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Parameters</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">m_staticText21</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style">wxALIGN_CENTRE</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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="1">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxListBox" 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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</property>
+                                                                <property name="center_pane">0</property>
+                                                                <property name="choices"></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="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">m_signals1</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style">wxLB_MULTIPLE|wxLB_SORT</property>
+                                                                <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>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnListBox"></event>
+                                                                <event name="OnListBoxDClick"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="1">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxFlexGridSizer" expanded="1">
+                                                                <property name="cols">3</property>
+                                                                <property name="flexible_direction">wxBOTH</property>
+                                                                <property name="growablecols"></property>
+                                                                <property name="growablerows"></property>
+                                                                <property name="hgap">0</property>
+                                                                <property name="minimum_size"></property>
+                                                                <property name="name">fgSizer1</property>
+                                                                <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                                                <property name="permission">none</property>
+                                                                <property name="rows">1</property>
+                                                                <property name="vgap">0</property>
+                                                                <object class="sizeritem" expanded="1">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxButton" 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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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">0</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="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="label">Probe</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">m_button1</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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>
+                                                                        <event name="OnButtonClick"></event>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="1">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxButton" 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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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">0</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="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="label">Tune</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">m_button2</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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>
+                                                                        <event name="OnButtonClick"></event>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                            </object>
+                                                        </object>
+                                                    </object>
+                                                </object>
+                                            </object>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="splitteritem" expanded="1">
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_panel3</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxBoxSizer" expanded="1">
+                                    <property name="minimum_size"></property>
+                                    <property name="name">bSizer3</property>
+                                    <property name="orient">wxVERTICAL</property>
+                                    <property name="permission">none</property>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND | wxALL</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxRichTextCtrl" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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">m_simConsole</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style">wxTE_READONLY</property>
+                                            <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">wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS</property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRichTextCharacter"></event>
+                                            <event name="OnRichTextContentDeleted"></event>
+                                            <event name="OnRichTextContentInserted"></event>
+                                            <event name="OnRichTextDelete"></event>
+                                            <event name="OnRichTextReturn"></event>
+                                            <event name="OnRichTextStyleChanged"></event>
+                                            <event name="OnRichTextStyleSheetChanged"></event>
+                                            <event name="OnRichTextStyleSheetReplaced"></event>
+                                            <event name="OnRichTextStyleSheetReplacing"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnText"></event>
+                                            <event name="OnTextEnter"></event>
+                                            <event name="OnTextMaxLen"></event>
+                                            <event name="OnTextURL"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</wxFormBuilder_Project>

From 9dc681b1982cfaf18b6a34df508f18742dbf69ad Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:04 +0200
Subject: [PATCH 006/197] Build fixes (for mathgl2)

---
 eeschema/CMakeLists.txt         | 2 +-
 eeschema/sim/sim_plot_panel.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 2405ec36d2..183f9b1a82 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -249,7 +249,7 @@ set_source_files_properties( ../common/single_top.cpp PROPERTIES
     )
 
 #if (KICAD_SPICE)
-    set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} mgl-wx mgl mgl-wx)
+    set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} mgl2 mgl2-wx)
 #else()
 #    set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} )
 #endif()
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 9e74dd34b0..b3e16a8ccf 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -1,5 +1,4 @@
 #include "sim_plot_panel.h"
-#include <boost/foreach.hpp>
 
 static SIM_PLOT_PANEL *panel = NULL;
 

From b4d9e7ee997e89bd74a752a993194330931f08c5 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:04 +0200
Subject: [PATCH 007/197] Fixed asserts in DIALOG_LIB_EDIT_TEXT_BASE.

---
 eeschema/dialogs/dialog_lib_edit_text_base.cpp | 6 +++---
 eeschema/dialogs/dialog_lib_edit_text_base.fbp | 5 +++--
 eeschema/dialogs/dialog_lib_edit_text_base.h   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/eeschema/dialogs/dialog_lib_edit_text_base.cpp b/eeschema/dialogs/dialog_lib_edit_text_base.cpp
index 047cfdb931..683bbc80a8 100644
--- a/eeschema/dialogs/dialog_lib_edit_text_base.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_text_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version May  6 2016)
+// C++ code generated with wxFormBuilder (version Jun 21 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -35,7 +35,7 @@ DIALOG_LIB_EDIT_TEXT_BASE::DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindow
 	m_TextValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	m_TextValue->SetMinSize( wxSize( 200,-1 ) );
 	
-	bTextValueOptsSizer->Add( m_TextValue, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );
+	bTextValueOptsSizer->Add( m_TextValue, 1, wxALL|wxEXPAND, 5 );
 	
 	m_TextValueSelectButton = new wxButton( this, wxID_ANY, _("Select"), wxDefaultPosition, wxDefaultSize, 0 );
 	bTextValueOptsSizer->Add( m_TextValueSelectButton, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -54,7 +54,7 @@ DIALOG_LIB_EDIT_TEXT_BASE::DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindow
 	bTextSizeSizer->Add( m_TextSizeText, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
 	m_TextSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bTextSizeSizer->Add( m_TextSize, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 );
+	bTextSizeSizer->Add( m_TextSize, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 );
 	
 	
 	bUpperBoxSizer->Add( bTextSizeSizer, 0, wxEXPAND, 5 );
diff --git a/eeschema/dialogs/dialog_lib_edit_text_base.fbp b/eeschema/dialogs/dialog_lib_edit_text_base.fbp
index d48e9be0e4..1edc5896aa 100644
--- a/eeschema/dialogs/dialog_lib_edit_text_base.fbp
+++ b/eeschema/dialogs/dialog_lib_edit_text_base.fbp
@@ -214,7 +214,7 @@
                                                 <property name="permission">none</property>
                                                 <object class="sizeritem" expanded="0">
                                                     <property name="border">5</property>
-                                                    <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND</property>
+                                                    <property name="flag">wxALL|wxEXPAND</property>
                                                     <property name="proportion">1</property>
                                                     <object class="wxTextCtrl" expanded="0">
                                                         <property name="BottomDockable">1</property>
@@ -489,7 +489,7 @@
                                         </object>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT|wxTOP</property>
+                                            <property name="flag">wxBOTTOM|wxLEFT|wxRIGHT|wxTOP</property>
                                             <property name="proportion">0</property>
                                             <object class="wxTextCtrl" expanded="0">
                                                 <property name="BottomDockable">1</property>
@@ -684,6 +684,7 @@
                                         <property name="minimum_size"></property>
                                         <property name="name">sOptionsSizer</property>
                                         <property name="orient">wxVERTICAL</property>
+                                        <property name="parent">1</property>
                                         <property name="permission">none</property>
                                         <event name="OnUpdateUI"></event>
                                         <object class="sizeritem" expanded="0">
diff --git a/eeschema/dialogs/dialog_lib_edit_text_base.h b/eeschema/dialogs/dialog_lib_edit_text_base.h
index d0dcb7d897..bc03e8d5f7 100644
--- a/eeschema/dialogs/dialog_lib_edit_text_base.h
+++ b/eeschema/dialogs/dialog_lib_edit_text_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version May  6 2016)
+// C++ code generated with wxFormBuilder (version Jun 21 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!

From 9748b65a6d76845f7f96e30d8cb39647803c84ed Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:06 +0200
Subject: [PATCH 008/197] str[n]icmp -> str[n]casecmp

---
 eeschema/class_libentry.cpp          |  4 ++--
 eeschema/class_library.cpp           | 10 +++++-----
 eeschema/lib_text.cpp                |  2 +-
 eeschema/load_one_schematic_file.cpp | 22 +++++++++++-----------
 eeschema/sch_bitmap.cpp              | 10 +++++-----
 eeschema/sch_component.cpp           |  2 +-
 eeschema/sch_sheet.cpp               |  2 +-
 eeschema/sch_text.cpp                | 24 ++++++++++++------------
 8 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/eeschema/class_libentry.cpp b/eeschema/class_libentry.cpp
index 96ad5cc6f3..f3190a2f63 100644
--- a/eeschema/class_libentry.cpp
+++ b/eeschema/class_libentry.cpp
@@ -885,7 +885,7 @@ bool LIB_PART::Load( LINE_READER& aLineReader, wxString& aErrorMsg )
         {
             p = strtok( line, " \t\n" );
 
-            if( p && stricmp( p, "ENDDEF" ) == 0 )
+            if( p && strcasecmp( p, "ENDDEF" ) == 0 )
                 break;
         }
 
@@ -1143,7 +1143,7 @@ bool LIB_PART::LoadFootprints( LINE_READER& aLineReader, wxString& aErrorMsg )
 
         p = strtok( line, " \t\r\n" );
 
-        if( stricmp( p, "$ENDFPLIST" ) == 0 )
+        if( strcasecmp( p, "$ENDFPLIST" ) == 0 )
             break;
 
         m_FootprintList.Add( FROM_UTF8( p ) );
diff --git a/eeschema/class_library.cpp b/eeschema/class_library.cpp
index 7af694295d..197c2a6f41 100644
--- a/eeschema/class_library.cpp
+++ b/eeschema/class_library.cpp
@@ -458,7 +458,7 @@ bool PART_LIB::Load( wxString& aErrorMsg )
     {
         char * line = reader.Line();
 
-        if( type == LIBRARY_TYPE_EESCHEMA && strnicmp( line, "$HEADER", 7 ) == 0 )
+        if( type == LIBRARY_TYPE_EESCHEMA && strncasecmp( line, "$HEADER", 7 ) == 0 )
         {
             if( !LoadHeader( reader ) )
             {
@@ -471,7 +471,7 @@ bool PART_LIB::Load( wxString& aErrorMsg )
 
         wxString msg;
 
-        if( strnicmp( line, "DEF", 3 ) == 0 )
+        if( strncasecmp( line, "DEF", 3 ) == 0 )
         {
             // Read one DEF/ENDDEF part entry from library:
             LIB_PART* part = new LIB_PART( wxEmptyString, this );
@@ -536,10 +536,10 @@ bool PART_LIB::LoadHeader( LINE_READER& aLineReader )
         text = strtok( line, " \t\r\n" );
         data = strtok( NULL, " \t\r\n" );
 
-        if( stricmp( text, "TimeStamp" ) == 0 )
+        if( strcasecmp( text, "TimeStamp" ) == 0 )
             timeStamp = atol( data );
 
-        if( stricmp( text, "$ENDHEADER" ) == 0 )
+        if( strcasecmp( text, "$ENDHEADER" ) == 0 )
             return true;
     }
 
@@ -574,7 +574,7 @@ bool PART_LIB::LoadDocs( wxString& aErrorMsg )
         return false;
     }
 
-    if( strnicmp( line, DOCFILE_IDENT, 10 ) != 0 )
+    if( strncasecmp( line, DOCFILE_IDENT, 10 ) != 0 )
     {
         aErrorMsg.Printf( _( "File '%s' is not a valid component library document file." ),
                           GetChars( fn.GetFullPath() ) );
diff --git a/eeschema/lib_text.cpp b/eeschema/lib_text.cpp
index be8ad78402..28f3f442c0 100644
--- a/eeschema/lib_text.cpp
+++ b/eeschema/lib_text.cpp
@@ -142,7 +142,7 @@ bool LIB_TEXT::Load( LINE_READER& aLineReader, wxString& errorMsg )
 
     m_Size.y = m_Size.x;
 
-    if( strnicmp( tmp, "Italic", 6 ) == 0 )
+    if( strncasecmp( tmp, "Italic", 6 ) == 0 )
         m_Italic = true;
 
     if( thickness > 0 )
diff --git a/eeschema/load_one_schematic_file.cpp b/eeschema/load_one_schematic_file.cpp
index 5d4e3458a9..bb4dc81ff2 100644
--- a/eeschema/load_one_schematic_file.cpp
+++ b/eeschema/load_one_schematic_file.cpp
@@ -160,7 +160,7 @@ again." );
         while( *line == ' ' )
             line++;
 
-        if( strnicmp( line, "EELAYER END", 11 ) == 0 )
+        if( strncasecmp( line, "EELAYER END", 11 ) == 0 )
             break;  // end of not used header found
     }
 
@@ -342,66 +342,66 @@ bool ReadSchemaDescr( LINE_READER* aLine, wxString& aMsgDiag, SCH_SCREEN* aScree
 
         line = aLine->Line();
 
-        if( strnicmp( line, "$End", 4 ) == 0 )
+        if( strncasecmp( line, "$End", 4 ) == 0 )
         {
             aScreen->SetTitleBlock( tb );
             break;
         }
 
-        if( strnicmp( line, "Sheet", 2 ) == 0 )
+        if( strncasecmp( line, "Sheet", 2 ) == 0 )
             sscanf( line + 5, " %d %d",
                     &aScreen->m_ScreenNumber, &aScreen->m_NumberOfScreens );
 
-        if( strnicmp( line, "Title", 2 ) == 0 )
+        if( strncasecmp( line, "Title", 2 ) == 0 )
         {
             ReadDelimitedText( buf, line, 256 );
             tb.SetTitle( FROM_UTF8( buf ) );
             continue;
         }
 
-        if( strnicmp( line, "Date", 2 ) == 0 )
+        if( strncasecmp( line, "Date", 2 ) == 0 )
         {
             ReadDelimitedText( buf, line, 256 );
             tb.SetDate( FROM_UTF8( buf ) );
             continue;
         }
 
-        if( strnicmp( line, "Rev", 2 ) == 0 )
+        if( strncasecmp( line, "Rev", 2 ) == 0 )
         {
             ReadDelimitedText( buf, line, 256 );
             tb.SetRevision( FROM_UTF8( buf ) );
             continue;
         }
 
-        if( strnicmp( line, "Comp", 4 ) == 0 )
+        if( strncasecmp( line, "Comp", 4 ) == 0 )
         {
             ReadDelimitedText( buf, line, 256 );
             tb.SetCompany( FROM_UTF8( buf ) );
             continue;
         }
 
-        if( strnicmp( line, "Comment1", 8 ) == 0 )
+        if( strncasecmp( line, "Comment1", 8 ) == 0 )
         {
             ReadDelimitedText( buf, line, 256 );
             tb.SetComment1( FROM_UTF8( buf ) );
             continue;
         }
 
-        if( strnicmp( line, "Comment2", 8 ) == 0 )
+        if( strncasecmp( line, "Comment2", 8 ) == 0 )
         {
             ReadDelimitedText( buf, line, 256 );
             tb.SetComment2( FROM_UTF8( buf ) );
             continue;
         }
 
-        if( strnicmp( line, "Comment3", 8 ) == 0 )
+        if( strncasecmp( line, "Comment3", 8 ) == 0 )
         {
             ReadDelimitedText( buf, line, 256 );
             tb.SetComment3( FROM_UTF8( buf ) );
             continue;
         }
 
-        if( strnicmp( line, "Comment4", 8 ) == 0 )
+        if( strncasecmp( line, "Comment4", 8 ) == 0 )
         {
             ReadDelimitedText( buf, line, 256 );
             tb.SetComment4( FROM_UTF8( buf ) );
diff --git a/eeschema/sch_bitmap.cpp b/eeschema/sch_bitmap.cpp
index f02be0a57e..44e0a52c01 100644
--- a/eeschema/sch_bitmap.cpp
+++ b/eeschema/sch_bitmap.cpp
@@ -136,7 +136,7 @@ bool SCH_BITMAP::Load( LINE_READER& aLine, wxString& aErrorMsg )
 {
     char* line = aLine.Line();
 
-    if( strnicmp( line, "$Bitmap", 7 ) != 0 )
+    if( strncasecmp( line, "$Bitmap", 7 ) != 0 )
     {
         aErrorMsg.Printf( wxT( "Eeschema file bitmap image load error at line %d, aborted" ),
                           aLine.LineNumber() );
@@ -151,13 +151,13 @@ bool SCH_BITMAP::Load( LINE_READER& aLine, wxString& aErrorMsg )
 
         line = aLine.Line();
 
-        if( strnicmp( line, "Pos", 3 ) == 0 )
+        if( strncasecmp( line, "Pos", 3 ) == 0 )
         {
             sscanf( line + 3, "%d %d", &m_pos.x, &m_pos.y );
             continue;
         }
 
-        if( strnicmp( line, "Scale", 5 ) == 0 )
+        if( strncasecmp( line, "Scale", 5 ) == 0 )
         {
             double scale = 1.0;
             sscanf( line + 5, "%lf", &scale );
@@ -165,12 +165,12 @@ bool SCH_BITMAP::Load( LINE_READER& aLine, wxString& aErrorMsg )
             continue;
         }
 
-        if( strnicmp( line, "Data", 4 ) == 0 )
+        if( strncasecmp( line, "Data", 4 ) == 0 )
         {
             m_image->LoadData( aLine, aErrorMsg );
         }
 
-        if( strnicmp( line, "$EndBitmap", 4 ) == 0 )
+        if( strncasecmp( line, "$EndBitmap", 4 ) == 0 )
             break;
     }
 
diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp
index 097a4991ab..f1f3840419 100644
--- a/eeschema/sch_component.cpp
+++ b/eeschema/sch_component.cpp
@@ -1450,7 +1450,7 @@ bool SCH_COMPONENT::Load( LINE_READER& aLine, wxString& aErrorMsg )
         if( !(line = aLine.ReadLine()) )
             return false;
 
-        if( strnicmp( "$End", line, 4 ) != 0 )
+        if( strncasecmp( "$End", line, 4 ) != 0 )
         {
             aErrorMsg.Printf( wxT( "Component End expected at line %d, aborted" ),
                               aLine.LineNumber() );
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index e437ce4816..5b74045917 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -316,7 +316,7 @@ bool SCH_SHEET::Load( LINE_READER& aLine, wxString& aErrorMsg )
         }
     }
 
-    if( strnicmp( "$End", ((char*)aLine), 4 ) != 0 )
+    if( strncasecmp( "$End", ((char*)aLine), 4 ) != 0 )
     {
         aErrorMsg.Printf( wxT( "**Eeschema file end_sheet struct error at line %d, aborted\n" ),
                           aLine.LineNumber() );
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index 65c9726f3e..ec2bfd6d9b 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -484,7 +484,7 @@ bool SCH_TEXT::Load( LINE_READER& aLine, wxString& aErrorMsg )
         m_Thickness = m_Bold ? GetPenSizeForBold( size ) : 0;
     }
 
-    if( strnicmp( Name2, "Italic", 6 ) == 0 )
+    if( strncasecmp( Name2, "Italic", 6 ) == 0 )
         m_Italic = 1;
 
     return true;
@@ -947,7 +947,7 @@ bool SCH_LABEL::Load( LINE_READER& aLine, wxString& aErrorMsg )
         m_Thickness = m_Bold ? GetPenSizeForBold( size ) : 0;
     }
 
-    if( stricmp( Name2, "Italic" ) == 0 )
+    if( strcasecmp( Name2, "Italic" ) == 0 )
         m_Italic = 1;
 
     return true;
@@ -1077,19 +1077,19 @@ bool SCH_GLOBALLABEL::Load( LINE_READER& aLine, wxString& aErrorMsg )
     m_Bold = ( thickness != 0 );
     m_Thickness = m_Bold ? GetPenSizeForBold( size ) : 0;
 
-    if( stricmp( Name2, SheetLabelType[NET_OUTPUT] ) == 0 )
+    if( strcasecmp( Name2, SheetLabelType[NET_OUTPUT] ) == 0 )
         m_shape = NET_OUTPUT;
 
-    if( stricmp( Name2, SheetLabelType[NET_BIDI] ) == 0 )
+    if( strcasecmp( Name2, SheetLabelType[NET_BIDI] ) == 0 )
         m_shape = NET_BIDI;
 
-    if( stricmp( Name2, SheetLabelType[NET_TRISTATE] ) == 0 )
+    if( strcasecmp( Name2, SheetLabelType[NET_TRISTATE] ) == 0 )
         m_shape = NET_TRISTATE;
 
-    if( stricmp( Name2, SheetLabelType[NET_UNSPECIFIED] ) == 0 )
+    if( strcasecmp( Name2, SheetLabelType[NET_UNSPECIFIED] ) == 0 )
         m_shape = NET_UNSPECIFIED;
 
-    if( stricmp( Name3, "Italic" ) == 0 )
+    if( strcasecmp( Name3, "Italic" ) == 0 )
         m_Italic = 1;
 
     return true;
@@ -1521,19 +1521,19 @@ bool SCH_HIERLABEL::Load( LINE_READER& aLine, wxString& aErrorMsg )
     m_Bold = ( thickness != 0 );
     m_Thickness = m_Bold ? GetPenSizeForBold( size ) : 0;
 
-    if( stricmp( Name2, SheetLabelType[NET_OUTPUT] ) == 0 )
+    if( strcasecmp( Name2, SheetLabelType[NET_OUTPUT] ) == 0 )
         m_shape = NET_OUTPUT;
 
-    if( stricmp( Name2, SheetLabelType[NET_BIDI] ) == 0 )
+    if( strcasecmp( Name2, SheetLabelType[NET_BIDI] ) == 0 )
         m_shape = NET_BIDI;
 
-    if( stricmp( Name2, SheetLabelType[NET_TRISTATE] ) == 0 )
+    if( strcasecmp( Name2, SheetLabelType[NET_TRISTATE] ) == 0 )
         m_shape = NET_TRISTATE;
 
-    if( stricmp( Name2, SheetLabelType[NET_UNSPECIFIED] ) == 0 )
+    if( strcasecmp( Name2, SheetLabelType[NET_UNSPECIFIED] ) == 0 )
         m_shape = NET_UNSPECIFIED;
 
-    if( stricmp( Name3, "Italic" ) == 0 )
+    if( strcasecmp( Name3, "Italic" ) == 0 )
         m_Italic = 1;
 
     return true;

From 9e2485ea9796c202a1adf7cada099057586c6295 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:07 +0200
Subject: [PATCH 009/197] SPICE_SIMULATOR: Code formatting & clean up

---
 eeschema/CMakeLists.txt          |   1 +
 eeschema/sim/ngspice.cpp         | 298 ++++++++++++++-----------------
 eeschema/sim/ngspice.h           |  77 ++++++--
 eeschema/sim/sim_plot_frame.cpp  |  33 ++--
 eeschema/sim/sim_plot_frame.h    |  40 ++---
 eeschema/sim/sim_plot_panel.cpp  |  78 ++++----
 eeschema/sim/spice_simulator.cpp |  31 ++++
 eeschema/sim/spice_simulator.h   |  71 +++++---
 8 files changed, 349 insertions(+), 280 deletions(-)
 create mode 100644 eeschema/sim/spice_simulator.cpp

diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 183f9b1a82..405384bba2 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -180,6 +180,7 @@ set( EESCHEMA_SRCS
     sim/sim_plot_frame_base.cpp
     sim/sim_plot_frame.cpp
     sim/sim_plot_panel.cpp
+    sim/spice_simulator.cpp
     sim/ngspice.cpp
 
     netlist_exporters/netlist_exporter.cpp
diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index c51c557d8c..a698d67e40 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -1,122 +1,142 @@
-#include "sharedspice.h"
-#include <cstdio>
-#include <sstream>
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "ngspice.h"
 
 #include <wx/dynlib.h>
-
-#include <string>
-#include <vector>
-
-#include "spice_simulator.h"
-
 #include <reporter.h>
+#include <sstream>
+
+// TODO cmake modules to add include directory for ngspice
 
 using namespace std;
 
-
-class NGSPICE : public SPICE_SIMULATOR {
-
-public:
-    NGSPICE();
-    virtual ~NGSPICE();
-
-    void Init();
-    bool LoadNetlist(const string& netlist);
-    bool Command(const string& cmd);
-
-    string GetConsole() const;
-
-    const vector<double> GetPlot( std::string name, int max_len = -1);
-
-    void dump();
-
-private:
-
-
-
-    typedef void (*ngSpice_Init)(SendChar*, SendStat*, ControlledExit*,
-             SendData*, SendInitData*, BGThreadRunning*, void*);
-
-    typedef int (*ngSpice_Circ)(char** circarray);
-    typedef int (*ngSpice_Command)(char* command);
-    typedef pvector_info (*ngGet_Vec_Info)(char* vecname);
-    typedef char** (*ngSpice_AllVecs)(char* plotname);
-    typedef char** (*ngSpice_AllPlots)(void);
-
-
-    ngSpice_Init m_ngSpice_Init;
-    ngSpice_Circ m_ngSpice_Circ;
-    ngSpice_Command m_ngSpice_Command;
-    ngGet_Vec_Info m_ngGet_Vec_Info;
-    ngSpice_AllPlots m_ngSpice_AllPlots;
-    ngSpice_AllVecs m_ngSpice_AllVecs;
-
-    wxDynamicLibrary *m_dll;
-
-    static int cbSendChar( char* what, int id, void* user)
-    {
-        NGSPICE *sim = reinterpret_cast<NGSPICE*>(user);
-
-        printf("sim %p cr %p\n",sim, sim->m_consoleReporter );
-        if(sim->m_consoleReporter)
-            sim->m_consoleReporter->Report(what);
-        return 0;
-    }
-
-    static int cbSendStat( char* what, int id, void* user)
-    {
-    /*    NGSPICE *sim = reinterpret_cast<NGSPICE*>(user);
-        if(sim->m_consoleReporter)
-            sim->m_consoleReporter->Report(what);*/
-        return 0;
-    }
-
-};
-
-
-
-
 NGSPICE::NGSPICE()
 {
-    m_dll = new wxDynamicLibrary("/home/twl/projects_sw/ngspice-26/src/.libs/libngspice.so.0.0.0"); //, wxDL_LAZY);
-
-    printf("DLL at %p\n", m_dll);
-
-    assert(m_dll);
-
-    m_ngSpice_Init = (ngSpice_Init) m_dll->GetSymbol("ngSpice_Init");
-    printf("Init @ %p\n", m_ngSpice_Init);
-
-
-    m_ngSpice_Circ = (ngSpice_Circ) m_dll->GetSymbol("ngSpice_Circ");
-    m_ngSpice_Command = (ngSpice_Command) m_dll->GetSymbol("ngSpice_Command");
-    m_ngGet_Vec_Info = (ngGet_Vec_Info) m_dll->GetSymbol("ngGet_Vec_Info");
-    m_ngSpice_AllPlots = (ngSpice_AllPlots) m_dll->GetSymbol("ngSpice_AllPlots");
-    m_ngSpice_AllVecs = (ngSpice_AllVecs) m_dll->GetSymbol("ngSpice_AllVecs");
-
+    m_dll = new wxDynamicLibrary( "libngspice.so" );
+    assert( m_dll );
 
+    // Obtain function pointers
+    m_ngSpice_Init = (ngSpice_Init) m_dll->GetSymbol( "ngSpice_Init" );
+    m_ngSpice_Circ = (ngSpice_Circ) m_dll->GetSymbol( "ngSpice_Circ" );
+    m_ngSpice_Command = (ngSpice_Command) m_dll->GetSymbol( "ngSpice_Command" );
+    m_ngGet_Vec_Info = (ngGet_Vec_Info) m_dll->GetSymbol( "ngGet_Vec_Info" );
+    m_ngSpice_AllPlots = (ngSpice_AllPlots) m_dll->GetSymbol( "ngSpice_AllPlots" );
+    m_ngSpice_AllVecs = (ngSpice_AllVecs) m_dll->GetSymbol( "ngSpice_AllVecs" );
 }
 
+
+NGSPICE::~NGSPICE()
+{
+    delete m_dll;
+}
+
+
 void NGSPICE::Init()
 {
     m_ngSpice_Init( &cbSendChar, &cbSendStat, NULL, NULL, NULL, NULL, this);
 }
 
-const vector<double> NGSPICE::GetPlot( std::string name, int max_len )
+
+const vector<double> NGSPICE::GetPlot( const string& aName, int aMaxLen )
 {
     vector<double> data;
 
-    vector_info *vi = m_ngGet_Vec_Info((char*)name.c_str());
+    vector_info* vi = m_ngGet_Vec_Info( (char*) aName.c_str() );
 
-    if(vi->v_realdata)
-        for(int i = 0; i<vi->v_length;i++)
-            data.push_back(vi->v_realdata[i]);
+    if( vi->v_realdata )
+    {
+        for( int i = 0; i < vi->v_length; i++ )
+            data.push_back( vi->v_realdata[i] );
+    }
 
     return data;
 
 }
 
 
+bool NGSPICE::LoadNetlist(const string& aNetlist)
+{
+    // TODO remove the hard limit
+    char* lines[16384];
+    stringstream ss( aNetlist );
+    int n = 0;
+
+    while( !ss.eof() && n < 16384 )
+    {
+        char line[1024];
+        ss.getline( line, sizeof(line) );
+
+        lines[n++] = strdup(line);
+	    printf("l '%s'\n", line);
+    }
+
+    lines[n] = NULL;
+    m_ngSpice_Circ( lines );
+
+    for(int i = 0; i < n; i++)
+        delete lines[i];
+
+    return true;
+}
+
+
+bool NGSPICE::Command( const string& aCmd )
+{
+    m_ngSpice_Command( (char*)( aCmd + string( "\n" ) ).c_str() );
+    dump();
+
+    return true;
+}
+
+
+void NGSPICE::dump()
+{
+//    m_ngSpice_Command("run\n");
+    char** plots = m_ngSpice_AllPlots();
+
+    for( int i = 0; plots[i]; ++i )
+    {
+        printf( "-> plot : %s\n", plots[i] );
+        char** vecs = m_ngSpice_AllVecs( plots[i] );
+
+        for( int j = 0; vecs[j]; j++ )
+        {
+            printf( "   - vector %s\n", vecs[j] );
+
+            vector_info* vi = m_ngGet_Vec_Info( vecs[j] );
+
+            printf( "       - v_type %x\n", vi->v_type );
+            printf( "       - v_flags %x\n", vi->v_flags );
+            printf( "       - v_length %d\n", vi->v_length );
+        }
+    }
+}
+
+
+#if 0
 static string loadFile(const string& filename)
 {
 
@@ -128,77 +148,7 @@ static string loadFile(const string& filename)
     return buf;
 }
 
-bool NGSPICE::LoadNetlist(const string& netlist)
-{
-    char *lines[16384];
-    stringstream ss(netlist);
-    int n = 0;
 
-    while(!ss.eof())
-    {
-        char line[1024];
-        ss.getline(line, 1024);
-
-        lines[n++] = strdup(line);
-	    printf("l '%s'\n", line);
-    }
-    lines[n]= NULL;
-
-    printf("netlist contains %d lines\n", n);
-    m_ngSpice_Circ(lines);
-
-    for(int i = 0; i < n; i++)
-        delete lines[i];
-
-    return true;
-}
-
-
-bool NGSPICE::Command(const string& cmd )
-{
-    m_ngSpice_Command( (char*)(cmd + string("\n")).c_str());
-    dump();
-    return true;
-}
-
-
-void NGSPICE::dump()
-{
-//    m_ngSpice_Command("run\n");
-    char **plots = m_ngSpice_AllPlots();
-
-    for(int i = 0; plots[i]; i++)
-    {
-        printf("-> plot : %s\n", plots[i]);
-        char **vecs = m_ngSpice_AllVecs(plots[i]);
-
-        for(int j = 0; vecs[j]; j++)
-        {
-            printf("   - vector %s\n", vecs[j]);
-
-            vector_info *vi = m_ngGet_Vec_Info(vecs[j]);
-
-            printf("       - v_type %x\n", vi->v_type);
-            printf("       - v_flags %x\n", vi->v_flags);
-            printf("       - v_length %d\n", vi->v_length);
-
-
-        }
-
-    }
-
-
-}
-
-
-
-NGSPICE::~NGSPICE()
-{
-    printf("Killing ngspice\n");
-    delete m_dll;
-}
-
-#if 0
 main()
 {
     NGSPICE spice;
@@ -238,16 +188,28 @@ main()
 
 
 
-std::string NGSPICE::GetConsole() const {
+string NGSPICE::GetConsole() const {
     return "";
 }
 
-SPICE_SIMULATOR::~SPICE_SIMULATOR()
-{
 
+int NGSPICE::cbSendChar( char* what, int id, void* user)
+{
+    NGSPICE* sim = reinterpret_cast<NGSPICE*>( user );
+
+    printf("sim %p cr %p\n",sim, sim->m_consoleReporter );
+
+    if( sim->m_consoleReporter )
+        sim->m_consoleReporter->Report( what );
+
+    return 0;
 }
 
-SPICE_SIMULATOR *SPICE_SIMULATOR::CreateInstance( const std::string name )
+
+int NGSPICE::cbSendStat( char* what, int id, void* user)
 {
-    return new NGSPICE;
+/*    NGSPICE *sim = reinterpret_cast<NGSPICE*>(user);
+    if(sim->m_consoleReporter)
+        sim->m_consoleReporter->Report(what);*/
+    return 0;
 }
diff --git a/eeschema/sim/ngspice.h b/eeschema/sim/ngspice.h
index f32f90262a..f69b76bffa 100644
--- a/eeschema/sim/ngspice.h
+++ b/eeschema/sim/ngspice.h
@@ -1,20 +1,73 @@
-#ifndef __NGSPICE_H
-#define __NGSPICE_H
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 
-#include <string>
-#include <vector>
+#ifndef NGSPICE_H
+#define NGSPICE_H
 
-class SPICE_SIMULATOR {
+#include "sharedspice.h"
+#include "spice_simulator.h"
+
+class wxDynamicLibrary;
+
+class NGSPICE : public SPICE_SIMULATOR {
 
 public:
-    SPICE_SIMULATOR();
-    ~SPICE_SIMULATOR();
+    NGSPICE();
+    virtual ~NGSPICE();
 
-    virtual void Init();
-    virtual bool LoadNetlist(const std::string& netlist);
-    virtual bool Command(const std::string& cmd);
+    void Init();
+    bool LoadNetlist( const std::string& aNetlist );
+    bool Command( const std::string& aCmd );
 
-    const std::vector<double> GetPlot( std::string name, int max_len = -1);
+    std::string GetConsole() const;
+
+    const std::vector<double> GetPlot( const std::string& aName, int aMaxLen = -1 );
+
+    void dump();
+
+private:
+    typedef void (*ngSpice_Init)( SendChar*, SendStat*, ControlledExit*,
+                                    SendData*, SendInitData*, BGThreadRunning*, void* );
+
+    // ngspice library functions
+    typedef int (*ngSpice_Circ)(char** circarray);
+    typedef int (*ngSpice_Command)(char* command);
+    typedef pvector_info (*ngGet_Vec_Info)(char* vecname);
+    typedef char** (*ngSpice_AllVecs)(char* plotname);
+    typedef char** (*ngSpice_AllPlots)(void);
+
+    ngSpice_Init m_ngSpice_Init;
+    ngSpice_Circ m_ngSpice_Circ;
+    ngSpice_Command m_ngSpice_Command;
+    ngGet_Vec_Info m_ngGet_Vec_Info;
+    ngSpice_AllPlots m_ngSpice_AllPlots;
+    ngSpice_AllVecs m_ngSpice_AllVecs;
+
+    wxDynamicLibrary* m_dll;
+
+    static int cbSendChar( char* what, int id, void* user );
+    static int cbSendStat( char* what, int id, void* user );
 };
 
-#endif
+#endif /* NGSPICE_H */
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index e56cc4ab08..1098023fde 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -44,18 +44,22 @@
 #include "sim_plot_panel.h"
 #include "spice_simulator.h"
 
+#ifdef KICAD_SCRIPTING
+ #include <python_scripting.h>
+#endif
+
 
 class SIM_REPORTER : public REPORTER
 {
 public:
-    SIM_REPORTER( wxRichTextCtrl *console )
+    SIM_REPORTER( wxRichTextCtrl* console )
     {
         m_console = console;
+
     }
 
-    ~SIM_REPORTER( )
+    ~SIM_REPORTER()
     {
-
     }
 
     virtual REPORTER& Report( const wxString& aText, SEVERITY aSeverity = RPT_UNDEFINED )
@@ -66,35 +70,37 @@ public:
     }
 
 private:
-    wxRichTextCtrl *m_console;
-
+    wxRichTextCtrl* m_console;
 };
 
 
-SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY *aKiway, wxWindow* parent )
-    : SIM_PLOT_FRAME_BASE( aKiway, parent )
+SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
+    : SIM_PLOT_FRAME_BASE( aKiway, aParent )
 {
     m_exporter = NULL;
     m_simulator = NULL;
     m_currentPlot = NULL;
+    m_pyConsole = NULL;
 
     NewPlot();
+    TogglePythonConsole();
 }
 
+
 SIM_PLOT_FRAME::~SIM_PLOT_FRAME()
 {
-
 }
 
+
 void SIM_PLOT_FRAME::StartSimulation()
 {
-    if(m_exporter)
+    if( m_exporter )
         delete m_exporter;
 
-    if(m_simulator)
+    if( m_simulator )
         delete m_simulator;
 
-    m_simulator = SPICE_SIMULATOR::CreateInstance("ngspice");
+    m_simulator = SPICE_SIMULATOR::CreateInstance( "ngspice" );
     m_simulator->SetConsoleReporter( new SIM_REPORTER( m_simConsole ) );
     m_simulator->Init();
     //m_simulator->SetConsoleReporter( , this );
@@ -131,9 +137,10 @@ void SIM_PLOT_FRAME::StartSimulation()
     //m_simulator->Command("quit\n");
 }
 
+
 void SIM_PLOT_FRAME::NewPlot()
 {
-    SIM_PLOT_PANEL *plot = new SIM_PLOT_PANEL ( this, wxID_ANY );
-    m_plotNotebook->AddPage ( plot, wxT("Plot1"), true );
+    SIM_PLOT_PANEL* plot = new SIM_PLOT_PANEL( this, wxID_ANY );
+    m_plotNotebook->AddPage( plot, wxT( "Plot1" ), true );
     m_currentPlot = plot;
 }
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 98a3c0dc8b..bcccf81eb2 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -20,34 +20,32 @@ class SIM_PLOT_PANEL;
 /** Implementing SIM_PLOT_FRAME_BASE */
 class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
 {
-	public:
-		/** Constructor */
-		SIM_PLOT_FRAME(KIWAY *aKiway, wxWindow* parent );
-		~SIM_PLOT_FRAME();
+    public:
+        /** Constructor */
+        SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent );
+        ~SIM_PLOT_FRAME();
 
+        void SetSchFrame( SCH_EDIT_FRAME* schFrame )
+        {
+            m_schematicFrame = schFrame;
+        }
 
+        void StartSimulation();
 
-		void SetSchFrame( SCH_EDIT_FRAME* schFrame )
-		{
-			m_schematicFrame = schFrame;
-		}
+        void NewPlot();
 
-		void StartSimulation();
+        void TogglePythonConsole();
 
-		void NewPlot();
+    private:
+        virtual void onNewPlot( wxCommandEvent& event ) { NewPlot(); }
 
+        SIM_PLOT_PANEL* m_currentPlot;
+        SCH_EDIT_FRAME* m_schematicFrame;
+        NETLIST_EXPORTER_PSPICE* m_exporter;
+        SPICE_SIMULATOR* m_simulator;
+        wxWindow* m_pyConsole;
 
-
-	private:
-
-		virtual void onNewPlot( wxCommandEvent& event ) { NewPlot(); }
-
-		SIM_PLOT_PANEL *m_currentPlot;
-		SCH_EDIT_FRAME *m_schematicFrame;
-		NETLIST_EXPORTER_PSPICE *m_exporter;
-		SPICE_SIMULATOR *m_simulator;
-
-	//// end generated class members
+    //// end generated class members
 };
 
 #endif // __sim_plot_frame__
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index b3e16a8ccf..421877dc06 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -4,71 +4,65 @@ static SIM_PLOT_PANEL *panel = NULL;
 
 static int drawPlotFunc( mglGraph *graph )
 {
+    printf("DrawPlot [%d traces]!\n", panel->m_traces.size());
 
-	printf("DrawPlot [%d traces]!\n", panel->m_traces.size());
+    graph->Clf();
+    //graph->SetRanges(-10e-3,10e-3,-2,2);
+    graph->Axis("x");
+    graph->Label('x',"Time",0);
+    graph->SetRange('x', 0, 10e-3);
 
-	graph->Clf();
-	//graph->SetRanges(-10e-3,10e-3,-2,2);
-	graph->Axis("x");
-	graph->Label('x',"Time",0);
-	graph->SetRange('x', 0, 10e-3);
+    graph->Axis("y");
+    graph->Label('y',"Voltage",0);
+    graph->SetRange('y', -1.5, 1.5);
 
-	graph->Axis("y");
-	graph->Label('y',"Voltage",0);
-	graph->SetRange('y', -1.5, 1.5);
+    for( auto t : panel->m_traces )
+    {
+        graph->AddLegend( (const char*) t.name.c_str(), "" );
+        graph->Plot( t.y );
+    }
+
+    graph->Box();
+    graph->Grid();
+    if ( panel->m_traces.size() )
+        graph->Legend(1,"-#");
 
 
-	for(auto t : panel->m_traces)
-	{
-			graph->AddLegend((const char *)t.name.c_str(),"");
-			graph->Plot(t.y);
-	}
-
-	graph->Box();
-	graph->Grid();
-	if ( panel->m_traces.size() )
-		graph->Legend(1,"-#");
-
-
-	return 0;
+    return 0;
 }
 
 
-SIM_PLOT_PANEL::SIM_PLOT_PANEL( wxWindow *  	parent,
-				wxWindowID  	id,
-				const wxPoint &  	pos,
-				const wxSize &  	size,
-			    	long  	style,
-				const wxString &  	name )
-    : wxMathGL ( parent, id, pos, size, style, name )
+SIM_PLOT_PANEL::SIM_PLOT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint& pos,
+                const wxSize& size, long style, const wxString& name )
+    : wxMathGL( parent, id, pos, size, style, name )
 {
-	panel = this;
+    panel = this;
 
-	AutoResize = true;
-	SetDraw( drawPlotFunc );
-//	Update();
+    AutoResize = true;
+    SetDraw( drawPlotFunc );
+//    Update();
 }
 
 
 SIM_PLOT_PANEL::~SIM_PLOT_PANEL()
 {
-
 }
 
+
 void SIM_PLOT_PANEL::AddTrace(const wxString& name, int n_points, double *t, double *x, int flags )
 {
-	Trace trace;
+    Trace trace;
 
-	trace.name = name;
-	trace.x.Set(t, n_points);
-	trace.y.Set(x, n_points);
+    trace.name = name;
+    trace.x.Set(t, n_points);
+    trace.y.Set(x, n_points);
 
-	m_traces.push_back(trace);
-	Update();
+    m_traces.push_back(trace);
+    Update();
 }
 
 void SIM_PLOT_PANEL::DeleteTraces()
 {
-	m_traces.clear();
-	Update();
+    m_traces.clear();
+    Update();
 }
diff --git a/eeschema/sim/spice_simulator.cpp b/eeschema/sim/spice_simulator.cpp
new file mode 100644
index 0000000000..7e47068796
--- /dev/null
+++ b/eeschema/sim/spice_simulator.cpp
@@ -0,0 +1,31 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "ngspice.h"
+
+SPICE_SIMULATOR* SPICE_SIMULATOR::CreateInstance( const std::string& )
+{
+    return new NGSPICE;
+}
+
diff --git a/eeschema/sim/spice_simulator.h b/eeschema/sim/spice_simulator.h
index 95cafcd518..7935139a65 100644
--- a/eeschema/sim/spice_simulator.h
+++ b/eeschema/sim/spice_simulator.h
@@ -1,44 +1,67 @@
-#ifndef __NGSPICE_H
-#define __NGSPICE_H
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef SPICE_SIMULATOR_H
+#define SPICE_SIMULATOR_H
 
 #include <string>
 #include <vector>
 
-enum SimTraceType
-{
-SIM_AC_MAG = 0x1,
-SIM_AC_PHASE = 0x2,
-SIM_TR_VOLTAGE = 0x4,
-SIM_TR_CURRENT = 0x8,
-SIM_TR_FFT = 0x10
-};
-
 class REPORTER;
 
+enum SIM_TRACE_TYPE
+{
+    SIM_AC_MAG = 0x1,
+    SIM_AC_PHASE = 0x2,
+    SIM_TR_VOLTAGE = 0x4,
+    SIM_TR_CURRENT = 0x8,
+    SIM_TR_FFT = 0x10
+};
+
 class SPICE_SIMULATOR {
 
 public:
-    typedef void (*ConsoleCallback)( bool isError, const wxString& message, void *userData );
+    SPICE_SIMULATOR() {}
+    virtual ~SPICE_SIMULATOR() {}
 
-    static SPICE_SIMULATOR *CreateInstance( const std::string name );
+    static SPICE_SIMULATOR* CreateInstance( const std::string& aName );
 
-    SPICE_SIMULATOR(){}
-    virtual ~SPICE_SIMULATOR() = 0;
+    typedef void (*ConsoleCallback)( bool isError, const std::string& message, void* userData );
 
     virtual void Init() = 0;
-    virtual bool LoadNetlist(const std::string& netlist) = 0;
-    virtual bool Command(const std::string& cmd) = 0;
-    virtual void SetConsoleReporter ( REPORTER *rep )
+    virtual bool LoadNetlist( const std::string& aNetlist ) = 0;
+    virtual bool Command( const std::string& aCmd ) = 0;
+
+    virtual void SetConsoleReporter( REPORTER* aReporter )
     {
-        m_consoleReporter = rep;
+        m_consoleReporter = aReporter;
     }
 
-    virtual const std::vector<double> GetPlot( std::string name, int max_len = -1) = 0;
+    virtual const std::vector<double> GetPlot( const std::string& aName, int aMaxLen = -1) = 0;
 
 protected:
-    REPORTER *m_consoleReporter;
-
+    REPORTER* m_consoleReporter;
 };
 
-
-#endif
+#endif /* SPICE_SIMULATOR_H */

From e72b54a6e0cf7f14455dc0b0611f392f89be9e1b Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:07 +0200
Subject: [PATCH 010/197] Code cleanup

---
 .../netlist_exporter_pspice.cpp               | 127 +++++++-----------
 eeschema/sim/ngspice.cpp                      |  32 ++---
 eeschema/sim/sim_plot_frame.cpp               |  70 +++++-----
 eeschema/sim/sim_plot_frame.h                 |  35 ++++-
 eeschema/sim/sim_plot_panel.cpp               |  72 ++++++----
 eeschema/sim/sim_plot_panel.h                 |  42 ++++--
 eeschema/sim/simulate.cpp                     |  84 +++++-------
 eeschema/sim/spice_simulator.h                |   4 +-
 8 files changed, 232 insertions(+), 234 deletions(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 72766d451a..0cd7d70e68 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -44,81 +44,54 @@ bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsign
 
 bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
 {
-    bool aUsePrefix = aCtl & NET_USE_X_PREFIX;
-
     int                 ret = 0;
-    int                 nbitems;
-    wxString            text;
-    wxArrayString       spiceCommandAtBeginFile;
-    wxArrayString       spiceCommandAtEndFile;
-    wxString            msg;
-    wxString            netName;
-
-    #define BUFYPOS_LEN 4
-    wxChar              bufnum[BUFYPOS_LEN + 1];
     std::vector<int>    pinSequence;                    // numeric indices into m_SortedComponentPinList
     wxArrayString       stdPinNameArray;                // Array containing Standard Pin Names
-    wxString            delimeters = wxT( "{:,; }" );
-    wxString            disableStr = wxT( "N" );
-
-    //std::map<wxString, int> netIndices;
+    const wxString      delimiters( "{:,; }" );
+    const wxString      disableStr( "N" );
 
     // Prepare list of nets generation (not used here, but...
     for( unsigned ii = 0; ii < m_masterList->size(); ii++ )
         m_masterList->GetItem( ii )->m_Flag = 0;
 
-    // Create text list starting by [.-]pspice , or [.-]gnucap (simulator
-    // commands) and create text list starting by [+]pspice , or [+]gnucap
-    // (simulator commands)
-    bufnum[BUFYPOS_LEN] = 0;
     SCH_SHEET_LIST sheetList( g_RootSheet );
-
     std::vector<wxString> directives;
 
-    formatter->Print(0, "Kicad schematic\n");
+    formatter->Print( 0, ".title KiCad schematic\n" );
 
     m_probes.clear();
     m_netMap.clear();
+
+    // Ground net has to be always assigned to node 0
     m_netMap["GND"] = 0;
 
     for( unsigned i = 0; i < sheetList.size(); i++ )
     {
         for( EDA_ITEM* item = sheetList[i].LastDrawList(); item; item = item->Next() )
         {
-            size_t l1, l2;
-            wxChar ident;
-
             if( item->Type() != SCH_TEXT_T )
                 continue;
 
-            SCH_TEXT*   drawText = (SCH_TEXT*) item;
-
-            text = drawText->GetText();
+            wxString text = static_cast<SCH_TEXT*>( item )->GetText();
 
             if( text.IsEmpty() )
                 continue;
 
-            ident = text.GetChar( 0 );
-
-            if( ident == '.' )
+            if( text.GetChar( 0 ) == '.' )
             {
-                    printf("Directive found: '%s'\n", (const char *) text.c_str());
-                    directives.push_back(text);
+                wxLogDebug( "Directive found: '%s'\n", (const char *) text.c_str() );
+                directives.push_back( text );
             }
         }
     }
 
-
     m_ReferencesAlreadyFound.Clear();
 
-
     int curNetIndex = 1;
 
     for( unsigned sheet_idx = 0; sheet_idx < sheetList.size(); sheet_idx++ )
     {
-        //printf( "* Sheet Name: %s\n",
-        //                TO_UTF8( sheetList[sheet_idx].PathHumanReadable() ) );
-
+        // Process component attributes to find Spice directives
         for( EDA_ITEM* item = sheetList[sheet_idx].LastDrawList(); item; item = item->Next() )
         {
             SCH_COMPONENT* comp = findNextComponentAndCreatePinList( item, &sheetList[sheet_idx] );
@@ -131,35 +104,35 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
             // Reset NodeSeqIndex Count:
             pinSequence.clear();
 
-            SCH_FIELD*   spicePrimitiveType = comp->FindField( wxT( "Spice_Primitive" ) );
-            SCH_FIELD*   spiceModel = comp->FindField( wxT( "Spice_Model" ) );
+            SCH_FIELD* spicePrimitiveType = comp->FindField( wxT( "Spice_Primitive" ) );
+            SCH_FIELD* spiceModel = comp->FindField( wxT( "Spice_Model" ) );
 
             wxString RefName = comp->GetRef( &sheetList[sheet_idx] );
             wxString CompValue = comp->GetField( VALUE )->GetText();
 
-            wxString model("");
-            wxString primType ("X");
+            wxString model( "" );
+            wxString primType( "X" );
 
-            if(spicePrimitiveType)
-                primType = spicePrimitiveType->GetText();
-            else {
-                if (RefName.StartsWith(wxT("IC")) || RefName.StartsWith("U") )
-                    primType = wxT("X"); // subckt
-                else
-                    primType = RefName.GetChar(0);
-            }
-
-            if(spiceModel)
+            if( spicePrimitiveType )
             {
-            //    printf("model specified\n");
-                model = spiceModel->GetText();
-            } else {
-            //    printf("no model\n");
-                model = CompValue;
+                primType = spicePrimitiveType->GetText();
             }
+            else
+            {
+                // Convert ceratin modules to subcircuits
+                if( RefName.StartsWith( "IC" ) || RefName.StartsWith( "U" ) )
+                    primType = "X";
+                else
+                    primType = RefName.GetChar( 0 );
+            }
+
+            if( spiceModel )
+                model = spiceModel->GetText();
+            else
+                model = CompValue;
 
             // Check to see if component should be removed from Spice Netlist:
-            SCH_FIELD*  netlistEnabledField = comp->FindField( wxT( "Spice_Netlist_Enabled" ) );
+            SCH_FIELD* netlistEnabledField = comp->FindField( wxT( "Spice_Netlist_Enabled" ) );
 
             if( netlistEnabledField )
             {
@@ -170,7 +143,7 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
             }
 
             // Check if Alternative Pin Sequence is Available:
-            SCH_FIELD*  spiceSeqField = comp->FindField( wxT( "Spice_Node_Sequence" ) );
+            SCH_FIELD* spiceSeqField = comp->FindField( wxT( "Spice_Node_Sequence" ) );
 
             if( spiceSeqField )
             {
@@ -180,7 +153,6 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
                 // Verify Field Exists and is not empty:
                 if( !nodeSeqIndexLineStr.IsEmpty() )
                 {
-
                     // Create an Array of Standard Pin Names from part definition:
                     stdPinNameArray.Clear();
 
@@ -195,7 +167,7 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
                     }
 
                     // Get Alt Pin Name Array From User:
-                    wxStringTokenizer tkz( nodeSeqIndexLineStr, delimeters );
+                    wxStringTokenizer tkz( nodeSeqIndexLineStr, delimiters );
 
                     while( tkz.HasMoreTokens() )
                     {
@@ -206,15 +178,13 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
                         seq = stdPinNameArray.Index(pinIndex);
 
                         if( seq != wxNOT_FOUND )
-                        {
                             pinSequence.push_back( seq );
-                        }
                     }
-
                 }
             }
 
-
+            // TODO remove?
+#if 0
             if(CompValue == wxT("SPICE_PROBE"))
             {
                 NETLIST_OBJECT* pin = m_SortedComponentPinList[0];
@@ -231,12 +201,14 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
                 //if( RefName.StartsWith( wxT( "U" ) ) || RefName.StartsWith( wxT( "IC" ) ) )
                 //    RefName = wxT( "X" ) + RefName;
             }
+#endif
 
-            printf( "Ref %s primType %s model/value '%s'\n", TO_UTF8( RefName ), (const char*)primType.c_str(), (const char *)model.c_str() );
+            wxLogDebug( "Ref %s primType %s model/value '%s'\n",
+                    TO_UTF8( RefName ), (const char*) primType.c_str(), (const char*) model.c_str() );
 
             int activePinIndex = 0;
 
-            formatter->Print(0, "%s%s ", (const char *)primType.c_str(), (const char *)RefName.c_str());
+            formatter->Print( 0, "%s%s ", (const char*) primType.c_str(), (const char*) RefName.c_str() );
 
             for( unsigned ii = 0; ii < m_SortedComponentPinList.size(); ii++ )
             {
@@ -274,7 +246,8 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
                 wxString netName = pin->GetNetName();
                 int netIdx;
 
-                if (m_netMap.find(netName) == m_netMap.end())
+                // Assign a node number (associated with net)
+                if( m_netMap.find( netName ) == m_netMap.end() )
                 {
                     netIdx = curNetIndex++;
                     m_netMap[netName] = netIdx;
@@ -282,6 +255,7 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
                     netIdx = m_netMap[netName];
                 }
 
+// TODO remove?
                 //printf("net %s index %d\n", (const char*)netName.c_str(), netIdx);
 //                sprintPinNetName( netName , wxT( "N-%.6d" ), pin, aUseNetcodeAsNetName );
 
@@ -294,25 +268,22 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
 
 //                ret |= fprintf( f, " %s", TO_UTF8( netName ) );
 
-                formatter->Print(0, "%d ", netIdx );
+                formatter->Print( 0, "%d ", netIdx );
             }
 
-            formatter->Print(0, "%s\n",(const char *) model.c_str());
-
-
+            formatter->Print( 0, "%s\n", (const char*) model.c_str() );
         }
-
-
     }
 
-    for( auto dir : directives )
+    // Print out all directives found in the text fields on the schematics
+    for( auto& dir : directives )
     {
-        formatter->Print(0, "%s\n", (const char *)dir.c_str());
-
+        formatter->Print( 0, "%s\n", (const char*) dir.c_str() );
     }
 
-    formatter->Print(0, ".end\n");
+    formatter->Print( -1, ".end\n" );
 
+// TODO remove?
 #if 0
     m_SortedComponentPinList.clear();
 
@@ -335,9 +306,7 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
 
     ret |= fprintf( f, "\n.end\n" );
     fclose( f );
-
 #endif
 
-
     return ret >= 0;
 }
diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index a698d67e40..e19ac269d6 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -26,6 +26,7 @@
 #include "ngspice.h"
 
 #include <wx/dynlib.h>
+#include <wx/log.h>
 #include <reporter.h>
 #include <sstream>
 
@@ -56,7 +57,7 @@ NGSPICE::~NGSPICE()
 
 void NGSPICE::Init()
 {
-    m_ngSpice_Init( &cbSendChar, &cbSendStat, NULL, NULL, NULL, NULL, this);
+    m_ngSpice_Init( &cbSendChar, &cbSendStat, NULL, NULL, NULL, NULL, this );
 }
 
 
@@ -73,11 +74,10 @@ const vector<double> NGSPICE::GetPlot( const string& aName, int aMaxLen )
     }
 
     return data;
-
 }
 
 
-bool NGSPICE::LoadNetlist(const string& aNetlist)
+bool NGSPICE::LoadNetlist( const string& aNetlist )
 {
     // TODO remove the hard limit
     char* lines[16384];
@@ -90,7 +90,7 @@ bool NGSPICE::LoadNetlist(const string& aNetlist)
         ss.getline( line, sizeof(line) );
 
         lines[n++] = strdup(line);
-	    printf("l '%s'\n", line);
+        wxLogDebug( "l '%s'\n", line );
     }
 
     lines[n] = NULL;
@@ -119,18 +119,18 @@ void NGSPICE::dump()
 
     for( int i = 0; plots[i]; ++i )
     {
-        printf( "-> plot : %s\n", plots[i] );
+        wxLogDebug( "-> plot : %s\n", plots[i] );
         char** vecs = m_ngSpice_AllVecs( plots[i] );
 
         for( int j = 0; vecs[j]; j++ )
         {
-            printf( "   - vector %s\n", vecs[j] );
+            wxLogDebug( "   - vector %s\n", vecs[j] );
 
             vector_info* vi = m_ngGet_Vec_Info( vecs[j] );
 
-            printf( "       - v_type %x\n", vi->v_type );
-            printf( "       - v_flags %x\n", vi->v_flags );
-            printf( "       - v_length %d\n", vi->v_length );
+            wxLogDebug( "       - v_type %x\n", vi->v_type );
+            wxLogDebug( "       - v_flags %x\n", vi->v_flags );
+            wxLogDebug( "       - v_length %d\n", vi->v_length );
         }
     }
 }
@@ -171,7 +171,7 @@ main()
     plt::plot(t, v2,"r--");
 
     for(int i=0;i<v1.size();i++)
-        printf("%.10f\n",v2[i]);
+        wxLogDebug("%.10f\n",v2[i]);
 
     // Add graph title
     plt::title("Sample figure");
@@ -193,11 +193,11 @@ string NGSPICE::GetConsole() const {
 }
 
 
-int NGSPICE::cbSendChar( char* what, int id, void* user)
+int NGSPICE::cbSendChar( char* what, int id, void* user )
 {
     NGSPICE* sim = reinterpret_cast<NGSPICE*>( user );
 
-    printf("sim %p cr %p\n",sim, sim->m_consoleReporter );
+    wxLogDebug( "sim %p cr %p\n", sim, sim->m_consoleReporter );
 
     if( sim->m_consoleReporter )
         sim->m_consoleReporter->Report( what );
@@ -206,10 +206,10 @@ int NGSPICE::cbSendChar( char* what, int id, void* user)
 }
 
 
-int NGSPICE::cbSendStat( char* what, int id, void* user)
+int NGSPICE::cbSendStat( char* what, int id, void* user )
 {
-/*    NGSPICE *sim = reinterpret_cast<NGSPICE*>(user);
-    if(sim->m_consoleReporter)
-        sim->m_consoleReporter->Report(what);*/
+/*    NGSPICE* sim = reinterpret_cast<NGSPICE*>( user );
+    if( sim->m_consoleReporter )
+        sim->m_consoleReporter->Report( what );*/
     return 0;
 }
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 1098023fde..2b3a286deb 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -1,41 +1,32 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
 #include <schframe.h>
-#include <fctsys.h>
-#include <kiface_i.h>
-#include <pgm_base.h>
-#include <gr_basic.h>
-#include <class_drawpanel.h>
-#include <gestfich.h>
-#include <confirm.h>
-#include <base_units.h>
-#include <msgpanel.h>
-#include <html_messagebox.h>
-
-#include <general.h>
-#include <eeschema_id.h>
-#include <netlist.h>
-#include <lib_pin.h>
-#include <class_library.h>
-#include <schframe.h>
-#include <sch_component.h>
-
-#include <dialog_helpers.h>
-#include <libeditframe.h>
-#include <viewlib_frame.h>
-#include <hotkeys.h>
-#include <eeschema_config.h>
-#include <sch_sheet.h>
-#include <sch_sheet_path.h>
-
-#include <invoke_sch_dialog.h>
-#include <dialogs/dialog_schematic_find.h>
-
-#include <wx/display.h>
-#include <build_version.h>
-#include <wildcards_and_files_ext.h>
-
-#include <netlist_exporter_kicad.h>
 #include <kiway.h>
 
+#include <netlist_exporter_kicad.h>
 #include <netlist_exporters/netlist_exporter_pspice.h>
 
 #include <reporter.h>
@@ -52,10 +43,9 @@
 class SIM_REPORTER : public REPORTER
 {
 public:
-    SIM_REPORTER( wxRichTextCtrl* console )
+    SIM_REPORTER( wxRichTextCtrl* aConsole )
     {
-        m_console = console;
-
+        m_console = aConsole;
     }
 
     ~SIM_REPORTER()
@@ -64,7 +54,7 @@ public:
 
     virtual REPORTER& Report( const wxString& aText, SEVERITY aSeverity = RPT_UNDEFINED )
     {
-        m_console->WriteText(aText);
+        m_console->WriteText( aText );
         m_console->Newline();
         return *this;
     }
@@ -112,7 +102,7 @@ void SIM_PLOT_FRAME::StartSimulation()
     m_exporter->Format( &formatter, GNL_ALL );
     //m_plotPanel->DeleteTraces();
 
-    printf("*******************\n%s\n", (const char *)formatter.GetString().c_str());
+    wxLogDebug( "*******************\n%s\n", (const char *)formatter.GetString().c_str() );
 
     m_simulator->LoadNetlist( formatter.GetString() );
     m_simulator->Command("run\n");
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index bcccf81eb2..1ab6cf6253 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -1,3 +1,28 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
 #ifndef __sim_plot_frame__
 #define __sim_plot_frame__
 
@@ -7,11 +32,8 @@ Subclass of SIM_PLOT_FRAME_BASE, which is generated by wxFormBuilder.
 */
 
 #include "sim_plot_frame_base.h"
-
 #include "kiway_player.h"
-
 #include <netlist_exporters/netlist_exporter_pspice.h>
-//// end generated include
 
 class SPICE_SIMULATOR;
 class NETLIST_EXPORTER_PSPICE;
@@ -25,9 +47,9 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent );
         ~SIM_PLOT_FRAME();
 
-        void SetSchFrame( SCH_EDIT_FRAME* schFrame )
+        void SetSchFrame( SCH_EDIT_FRAME* aSchFrame )
         {
-            m_schematicFrame = schFrame;
+            m_schematicFrame = aSchFrame;
         }
 
         void StartSimulation();
@@ -37,7 +59,7 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void TogglePythonConsole();
 
     private:
-        virtual void onNewPlot( wxCommandEvent& event ) { NewPlot(); }
+        virtual void onNewPlot( wxCommandEvent& aEvent ) { NewPlot(); }
 
         SIM_PLOT_PANEL* m_currentPlot;
         SCH_EDIT_FRAME* m_schematicFrame;
@@ -45,7 +67,6 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         SPICE_SIMULATOR* m_simulator;
         wxWindow* m_pyConsole;
 
-    //// end generated class members
 };
 
 #endif // __sim_plot_frame__
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 421877dc06..2bac6162be 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -1,32 +1,56 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
 #include "sim_plot_panel.h"
 
-static SIM_PLOT_PANEL *panel = NULL;
+static SIM_PLOT_PANEL* panel = NULL;
 
-static int drawPlotFunc( mglGraph *graph )
+static int drawPlotFunc( mglGraph* aGraph )
 {
-    printf("DrawPlot [%d traces]!\n", panel->m_traces.size());
+    printf( "DrawPlot [%lu traces]!\n", panel->m_traces.size() );
 
-    graph->Clf();
-    //graph->SetRanges(-10e-3,10e-3,-2,2);
-    graph->Axis("x");
-    graph->Label('x',"Time",0);
-    graph->SetRange('x', 0, 10e-3);
+    aGraph->Clf();
+    //aGraph->SetRanges(-10e-3,10e-3,-2,2);
+    aGraph->Axis( "x" );
+    aGraph->Label( 'x', "Time", 0 );
+    aGraph->SetRange( 'x', 0, 10e-3 );
 
-    graph->Axis("y");
-    graph->Label('y',"Voltage",0);
-    graph->SetRange('y', -1.5, 1.5);
+    aGraph->Axis( "y" );
+    aGraph->Label( 'y', "Voltage", 0 );
+    aGraph->SetRange( 'y', -1.5, 1.5 );
 
     for( auto t : panel->m_traces )
     {
-        graph->AddLegend( (const char*) t.name.c_str(), "" );
-        graph->Plot( t.y );
+        aGraph->AddLegend( (const char*) t.name.c_str(), "" );
+        aGraph->Plot( t.y );
     }
 
-    graph->Box();
-    graph->Grid();
-    if ( panel->m_traces.size() )
-        graph->Legend(1,"-#");
+    aGraph->Box();
+    aGraph->Grid();
 
+    if( panel->m_traces.size() )
+        aGraph->Legend( 1, "-#" );
 
     return 0;
 }
@@ -49,18 +73,20 @@ SIM_PLOT_PANEL::~SIM_PLOT_PANEL()
 }
 
 
-void SIM_PLOT_PANEL::AddTrace(const wxString& name, int n_points, double *t, double *x, int flags )
+void SIM_PLOT_PANEL::AddTrace( const wxString& aName, int aPoints,
+                                double* aT, double* aX, int aFlags )
 {
-    Trace trace;
+    TRACE trace;
 
-    trace.name = name;
-    trace.x.Set(t, n_points);
-    trace.y.Set(x, n_points);
+    trace.name = aName;
+    trace.x.Set( aT, aPoints );
+    trace.y.Set( aX, aPoints );
 
-    m_traces.push_back(trace);
+    m_traces.push_back( trace );
     Update();
 }
 
+
 void SIM_PLOT_PANEL::DeleteTraces()
 {
     m_traces.clear();
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index cae716073b..cb5424367a 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -1,33 +1,49 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
 #ifndef __SIM_PLOT_PANEL_H
 #define __SIM_PLOT_PANEL_H
 
 #include "mgl2/canvas_wnd.h"
 #include "mgl2/wx.h"
 
-
 class SIM_PLOT_PANEL : public wxMathGL
 {
 public:
-    SIM_PLOT_PANEL( 	wxWindow *  	parent,
-		wxWindowID  	id,
-		const wxPoint &  	pos = wxDefaultPosition,
-		const wxSize &  	size = wxDefaultSize,
-		long  	style = 0,
-		const wxString &  	name = wxPanelNameStr );
+    SIM_PLOT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxPanelNameStr );
 
     ~SIM_PLOT_PANEL();
 
-
-
-
-    struct Trace {
+    struct TRACE {
         wxString name;
         mglData x, y;
     };
 
-    std::vector<Trace> m_traces;
+    std::vector<TRACE> m_traces;
 
-    void AddTrace(const wxString& name, int n_points, double *t, double *x, int flags = 0 );
+    void AddTrace( const wxString& name, int n_points, double *t, double *x, int flags = 0 );
     void DeleteTraces();
 };
 
diff --git a/eeschema/sim/simulate.cpp b/eeschema/sim/simulate.cpp
index 188b97cc80..c499061827 100644
--- a/eeschema/sim/simulate.cpp
+++ b/eeschema/sim/simulate.cpp
@@ -1,58 +1,33 @@
-#include <schframe.h>
-#include <fctsys.h>
-#include <kiface_i.h>
-#include <pgm_base.h>
-#include <gr_basic.h>
-#include <class_drawpanel.h>
-#include <gestfich.h>
-#include <confirm.h>
-#include <base_units.h>
-#include <msgpanel.h>
-#include <html_messagebox.h>
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 
-#include <general.h>
-#include <eeschema_id.h>
-#include <netlist.h>
-#include <lib_pin.h>
-#include <class_library.h>
-#include <schframe.h>
-#include <sch_component.h>
-
-#include <dialog_helpers.h>
-#include <libeditframe.h>
-#include <viewlib_frame.h>
-#include <hotkeys.h>
-#include <eeschema_config.h>
-#include <sch_sheet.h>
-#include <sch_sheet_path.h>
-
-#include <invoke_sch_dialog.h>
-#include <dialogs/dialog_schematic_find.h>
-
-#include <wx/display.h>
-#include <build_version.h>
-#include <wildcards_and_files_ext.h>
-
-#include <netlist_exporter_kicad.h>
 #include <kiway.h>
-
-#include <netlist_exporters/netlist_exporter_pspice.h>
-
-#include <sim/sim_plot_frame.h>
+#include <schframe.h>
+#include "sim_plot_frame.h"
 
 void SCH_EDIT_FRAME::OnSimulationRun( wxCommandEvent& event )
 {
-    #if 0
-
-    NETLIST_OBJECT_LIST* net_atoms = BuildNetListBase();
-    NETLIST_EXPORTER_PSPICE exporter( net_atoms, Prj().SchLibs() );
-    STRING_FORMATTER formatter;
-
-    exporter.Format( &formatter, GNL_ALL );
-
-    printf("*******************\n%s\n", (const char *)formatter.GetString().c_str());
-    #endif
-
     SIM_PLOT_FRAME* simFrame = (SIM_PLOT_FRAME*) Kiway().Player( FRAME_SIMULATOR, false );
 
     if( !simFrame )
@@ -61,7 +36,6 @@ void SCH_EDIT_FRAME::OnSimulationRun( wxCommandEvent& event )
         simFrame->Show( true );
     }
 
-
     // On Windows, Raise() does not bring the window on screen, when iconized
     if( simFrame->IsIconized() )
         simFrame->Iconize( false );
@@ -72,8 +46,12 @@ void SCH_EDIT_FRAME::OnSimulationRun( wxCommandEvent& event )
     simFrame->StartSimulation();
 }
 
+
 void SCH_EDIT_FRAME::OnSimulationStop( wxCommandEvent& event )
-{}
+{
+}
+
 
 void SCH_EDIT_FRAME::OnSimulationAddProbe( wxCommandEvent& event )
-{}
+{
+}
diff --git a/eeschema/sim/spice_simulator.h b/eeschema/sim/spice_simulator.h
index 7935139a65..43d589c16b 100644
--- a/eeschema/sim/spice_simulator.h
+++ b/eeschema/sim/spice_simulator.h
@@ -47,8 +47,6 @@ public:
 
     static SPICE_SIMULATOR* CreateInstance( const std::string& aName );
 
-    typedef void (*ConsoleCallback)( bool isError, const std::string& message, void* userData );
-
     virtual void Init() = 0;
     virtual bool LoadNetlist( const std::string& aNetlist ) = 0;
     virtual bool Command( const std::string& aCmd ) = 0;
@@ -58,7 +56,7 @@ public:
         m_consoleReporter = aReporter;
     }
 
-    virtual const std::vector<double> GetPlot( const std::string& aName, int aMaxLen = -1) = 0;
+    virtual const std::vector<double> GetPlot( const std::string& aName, int aMaxLen = -1 ) = 0;
 
 protected:
     REPORTER* m_consoleReporter;

From 9ef2cb94bf78bf0cce1320e92e6bb47f277df6b2 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:07 +0200
Subject: [PATCH 011/197] Simulation executes in a separate thread

---
 eeschema/sim/ngspice.cpp        |   6 +
 eeschema/sim/ngspice.h          |   1 +
 eeschema/sim/sim_plot_frame.cpp | 197 ++++++++++++++++++++++++++------
 eeschema/sim/sim_plot_frame.h   |  14 +++
 eeschema/sim/spice_simulator.h  |   3 +-
 5 files changed, 187 insertions(+), 34 deletions(-)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index e19ac269d6..4e74896702 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -103,6 +103,12 @@ bool NGSPICE::LoadNetlist( const string& aNetlist )
 }
 
 
+bool NGSPICE::Run()
+{
+    return Command( "run\n" );
+}
+
+
 bool NGSPICE::Command( const string& aCmd )
 {
     m_ngSpice_Command( (char*)( aCmd + string( "\n" ) ).c_str() );
diff --git a/eeschema/sim/ngspice.h b/eeschema/sim/ngspice.h
index f69b76bffa..bdd12248f4 100644
--- a/eeschema/sim/ngspice.h
+++ b/eeschema/sim/ngspice.h
@@ -38,6 +38,7 @@ public:
 
     void Init();
     bool LoadNetlist( const std::string& aNetlist );
+    bool Run();
     bool Command( const std::string& aCmd );
 
     std::string GetConsole() const;
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 2b3a286deb..1aa5818001 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -40,27 +40,56 @@
 #endif
 
 
-class SIM_REPORTER : public REPORTER
+class SIM_THREAD_REPORTER : public REPORTER
 {
 public:
-    SIM_REPORTER( wxRichTextCtrl* aConsole )
-    {
-        m_console = aConsole;
-    }
-
-    ~SIM_REPORTER()
+    SIM_THREAD_REPORTER( SIM_PLOT_FRAME* aParent )
+        : m_parent( aParent )
     {
     }
 
     virtual REPORTER& Report( const wxString& aText, SEVERITY aSeverity = RPT_UNDEFINED )
     {
-        m_console->WriteText( aText );
-        m_console->Newline();
+        wxThreadEvent* event = new wxThreadEvent( wxEVT_SIM_REPORT );
+        event->SetPayload( aText );
+        wxQueueEvent( m_parent, event );
         return *this;
     }
 
 private:
-    wxRichTextCtrl* m_console;
+    SIM_PLOT_FRAME* m_parent;
+};
+
+
+class SIM_THREAD : public wxThread
+{
+public:
+    SIM_THREAD( SIM_PLOT_FRAME* aParent, SPICE_SIMULATOR* aSimulator )
+        : m_parent( aParent ), m_sim( aSimulator )
+    {}
+
+    ~SIM_THREAD()
+    {
+        wxCriticalSectionLocker lock( m_parent->m_simThreadCS );
+
+        // Let know the parent that the pointer is not valid anymore
+        m_parent->m_simThread = NULL;
+    }
+
+private:
+    // Thread routine
+    ExitCode Entry()
+    {
+        assert( m_sim );
+
+        m_sim->Run();
+        wxQueueEvent( m_parent, new wxThreadEvent( wxEVT_SIM_FINISHED ) );
+
+        return (ExitCode) 0;
+    }
+
+    SIM_PLOT_FRAME* m_parent;
+    SPICE_SIMULATOR* m_sim;
 };
 
 
@@ -71,29 +100,36 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     m_simulator = NULL;
     m_currentPlot = NULL;
     m_pyConsole = NULL;
+    m_simThread = NULL;
+
+    Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SIM_PLOT_FRAME::onClose ), NULL, this );
+    Connect( wxEVT_SIM_REPORT, wxThreadEventHandler( SIM_PLOT_FRAME::onSimReport ), NULL, this );
+    Connect( wxEVT_SIM_FINISHED, wxThreadEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
 
     NewPlot();
-    TogglePythonConsole();
 }
 
 
 SIM_PLOT_FRAME::~SIM_PLOT_FRAME()
 {
+    // m_simThread should be already destroyed by onClose()
+    assert( m_simThread == NULL );
+
+    delete m_exporter;
+    delete m_simulator;
 }
 
 
 void SIM_PLOT_FRAME::StartSimulation()
 {
-    if( m_exporter )
-        delete m_exporter;
+    delete m_exporter;
+    delete m_simulator;
 
-    if( m_simulator )
-        delete m_simulator;
+    m_simConsole->Clear();
 
     m_simulator = SPICE_SIMULATOR::CreateInstance( "ngspice" );
-    m_simulator->SetConsoleReporter( new SIM_REPORTER( m_simConsole ) );
+    m_simulator->SetConsoleReporter( new SIM_THREAD_REPORTER( this ) );
     m_simulator->Init();
-    //m_simulator->SetConsoleReporter( , this );
 
     NETLIST_OBJECT_LIST* net_atoms = m_schematicFrame->BuildNetListBase();
     m_exporter = new NETLIST_EXPORTER_PSPICE ( net_atoms, Prj().SchLibs() );
@@ -102,29 +138,59 @@ void SIM_PLOT_FRAME::StartSimulation()
     m_exporter->Format( &formatter, GNL_ALL );
     //m_plotPanel->DeleteTraces();
 
-    wxLogDebug( "*******************\n%s\n", (const char *)formatter.GetString().c_str() );
-
     m_simulator->LoadNetlist( formatter.GetString() );
-    m_simulator->Command("run\n");
 
-    auto mapping = m_exporter->GetNetIndexMap();
-//    auto data_t = m_simulator->GetPlot("time");
-
-    for(auto name : m_exporter->GetProbeList())
+    // Execute the simulation in a separate thread
     {
-        char spiceName[1024];
+        wxCriticalSectionLocker lock( m_simThreadCS );
 
-        sprintf(spiceName,"V(%d)", mapping[name] );
-        //printf("probe %s->%s\n", (const char *) name.c_str(), spiceName);
-    //    auto data_y = m_simulator->GetPlot(spiceName);
+        assert( m_simThread == NULL );
+        m_simThread = new SIM_THREAD( this, m_simulator );
 
-        //printf("%d - %d data points\n", data_t.size(), data_y.size() );
-    //    m_plotPanel->AddTrace(wxT("V(") + name + wxT(")"), data_t.size(), data_t.data(), data_y.data(), 0);
+        if( m_simThread->Run() != wxTHREAD_NO_ERROR )
+        {
+            wxLogError( "Can't create the simulator thread!" );
+            delete m_simThread;
+        }
     }
+}
 
-    delete m_simulator;
-    m_simulator = NULL;
-    //m_simulator->Command("quit\n");
+
+void SIM_PLOT_FRAME::PauseSimulation()
+{
+    wxCriticalSectionLocker lock( m_simThreadCS );
+
+    if( m_simThread )
+    {
+        if( m_simThread->Pause() != wxTHREAD_NO_ERROR )
+            wxLogError( "Cannot pause the simulation thread" );
+    }
+}
+
+
+void SIM_PLOT_FRAME::ResumeSimulation()
+{
+    wxCriticalSectionLocker lock( m_simThreadCS );
+
+    if( m_simThread )
+    {
+        if( m_simThread->Resume() != wxTHREAD_NO_ERROR )
+            wxLogError( "Cannot resume the simulation thread" );
+    }
+}
+
+
+void SIM_PLOT_FRAME::StopSimulation()
+{
+    wxCriticalSectionLocker lock( m_simThreadCS );
+
+    if( m_simThread )
+    {
+        // we could use m_simThread->Delete() if there was a way to run the simulation
+        // in parts, so the thread would be able to call TestDestroy()
+        if( m_simThread->Kill() != wxTHREAD_NO_ERROR )
+            wxLogError( "Cannot delete the simulation thread" );
+    }
 }
 
 
@@ -134,3 +200,68 @@ void SIM_PLOT_FRAME::NewPlot()
     m_plotNotebook->AddPage( plot, wxT( "Plot1" ), true );
     m_currentPlot = plot;
 }
+
+
+void SIM_PLOT_FRAME::onClose( wxCloseEvent& aEvent )
+{
+    {
+        wxCriticalSectionLocker lock( m_simThreadCS );
+
+        if( m_simThread )
+        {
+            if( m_simThread->Delete() != wxTHREAD_NO_ERROR )
+                wxLogError( "Cannot delete the simulation thread" );
+        }
+    }
+
+    int timeout = 10;
+
+    while( 1 )
+    {
+        // Wait until the thread is finished
+        {
+            wxCriticalSectionLocker lock( m_simThreadCS );
+
+            if( m_simThread == NULL )
+                break;
+        }
+
+        wxThread::This()->Sleep( 1 );
+
+        if( --timeout == 0 )
+        {
+            m_simThread->Kill();        // no mercy
+            break;
+        }
+    }
+
+    Destroy();
+}
+
+
+void SIM_PLOT_FRAME::onSimReport( wxThreadEvent& aEvent )
+{
+    m_simConsole->WriteText( aEvent.GetPayload<wxString>() );
+    m_simConsole->Newline();
+}
+
+
+void SIM_PLOT_FRAME::onSimFinished( wxThreadEvent& aEvent )
+{
+    wxLogDebug( "Simulation finished" );
+
+    auto mapping = m_exporter->GetNetIndexMap();
+    //    auto data_t = m_simulator->GetPlot( "time" );
+
+    for( auto name : m_exporter->GetProbeList() )
+    {
+        char spiceName[1024];
+
+        snprintf( spiceName, sizeof( spiceName ), "V(%d)", mapping[name] );
+        //wxLogDebug( "probe %s->%s\n", (const char *) name.c_str(), spiceName );
+        //    auto data_y = m_simulator->GetPlot( spiceName );
+
+        //wxLogDebug( "%d - %d data points\n", data_t.size(), data_y.size() );
+        //    m_plotPanel->AddTrace(wxT("V(") + name + wxT(")"), data_t.size(), data_t.data(), data_y.data(), 0);
+    }
+}
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 1ab6cf6253..5eb2ea260c 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -34,10 +34,12 @@ Subclass of SIM_PLOT_FRAME_BASE, which is generated by wxFormBuilder.
 #include "sim_plot_frame_base.h"
 #include "kiway_player.h"
 #include <netlist_exporters/netlist_exporter_pspice.h>
+#include <wx/event.h>
 
 class SPICE_SIMULATOR;
 class NETLIST_EXPORTER_PSPICE;
 class SIM_PLOT_PANEL;
+class SIM_THREAD;
 
 /** Implementing SIM_PLOT_FRAME_BASE */
 class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
@@ -53,20 +55,32 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         }
 
         void StartSimulation();
+        void PauseSimulation();
+        void ResumeSimulation();
+        void StopSimulation();
 
         void NewPlot();
 
         void TogglePythonConsole();
 
     private:
+        virtual void onClose( wxCloseEvent& aEvent );
         virtual void onNewPlot( wxCommandEvent& aEvent ) { NewPlot(); }
+        virtual void onSimReport( wxThreadEvent& aEvent );
+        virtual void onSimFinished( wxThreadEvent& aEvent );
 
         SIM_PLOT_PANEL* m_currentPlot;
         SCH_EDIT_FRAME* m_schematicFrame;
         NETLIST_EXPORTER_PSPICE* m_exporter;
         SPICE_SIMULATOR* m_simulator;
         wxWindow* m_pyConsole;
+        SIM_THREAD* m_simThread;
+        wxCriticalSection m_simThreadCS;
 
+        friend class SIM_THREAD;
 };
 
+wxDEFINE_EVENT( wxEVT_SIM_REPORT, wxThreadEvent );
+wxDEFINE_EVENT( wxEVT_SIM_FINISHED, wxThreadEvent );
+
 #endif // __sim_plot_frame__
diff --git a/eeschema/sim/spice_simulator.h b/eeschema/sim/spice_simulator.h
index 43d589c16b..9d34540eae 100644
--- a/eeschema/sim/spice_simulator.h
+++ b/eeschema/sim/spice_simulator.h
@@ -42,13 +42,14 @@ enum SIM_TRACE_TYPE
 class SPICE_SIMULATOR {
 
 public:
-    SPICE_SIMULATOR() {}
+    SPICE_SIMULATOR() : m_consoleReporter( NULL ) {}
     virtual ~SPICE_SIMULATOR() {}
 
     static SPICE_SIMULATOR* CreateInstance( const std::string& aName );
 
     virtual void Init() = 0;
     virtual bool LoadNetlist( const std::string& aNetlist ) = 0;
+    virtual bool Run() = 0;
     virtual bool Command( const std::string& aCmd ) = 0;
 
     virtual void SetConsoleReporter( REPORTER* aReporter )

From 75b0e3e0a2aefe454973ad301a2344b5204ceb74 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:07 +0200
Subject: [PATCH 012/197] Missing include in reporter.h

---
 include/reporter.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/reporter.h b/include/reporter.h
index a00dd50e70..e5599ea5cb 100644
--- a/include/reporter.h
+++ b/include/reporter.h
@@ -25,6 +25,8 @@
 #ifndef _REPORTER_H_
 #define _REPORTER_H_
 
+#include <wx/string.h>
+
 /**
  * @file reporter.h
  * @author Wayne Stambaugh
@@ -32,7 +34,6 @@
  *       me to write this.
  */
 
-class wxString;
 class wxTextCtrl;
 class wxHtmlListbox;
 class WX_HTML_REPORT_PANEL;
@@ -81,11 +82,8 @@ public:
     REPORTER& Report( const char* aText, SEVERITY aSeverity = RPT_UNDEFINED );
 
     REPORTER& operator <<( const wxString& aText ) { return Report( aText ); }
-
     REPORTER& operator <<( const wxChar* aText ) { return Report( wxString( aText ) ); }
-
     REPORTER& operator <<( wxChar aChar ) { return Report( wxString( aChar ) ); }
-
     REPORTER& operator <<( const char* aText ) { return Report( aText ); }
 };
 

From 402a4383396dcf639ed5b78c09374bfa229c3664 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:09 +0200
Subject: [PATCH 013/197] NETLIST_EXPORTER_PSPICE adjusts paths for .include
 directives

---
 .../netlist_exporter_pspice.cpp               | 22 +++++++++++++++++--
 .../netlist_exporter_pspice.h                 | 10 ++++-----
 eeschema/sim/sim_plot_frame.cpp               |  2 +-
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 0cd7d70e68..fe8e26b5c8 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -28,6 +28,7 @@
 #include <confirm.h>
 
 #include <map>
+#include <search_stack.h>
 
 #include <schframe.h>
 #include <netlist.h>
@@ -79,8 +80,25 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
 
             if( text.GetChar( 0 ) == '.' )
             {
-                wxLogDebug( "Directive found: '%s'\n", (const char *) text.c_str() );
-                directives.push_back( text );
+                wxStringTokenizer tokenizer( text, "\r\n" );
+
+                while( tokenizer.HasMoreTokens() )
+                {
+                    wxString directive( tokenizer.GetNextToken() );
+                    wxLogDebug( "Directive found: '%s'\n", (const char *) directive.c_str() );
+
+                    // Fix paths for .include directives
+                    if( m_paths && directive.StartsWith( ".inc" ) )
+                    {
+                        wxString file( directive.AfterFirst( ' ' ) );
+                        wxString path( m_paths->FindValidPath( file ) );
+                        directives.push_back( wxString( ".include " ) + path );
+                    }
+                    else
+                    {
+                        directives.push_back( directive );
+                    }
+                }
             }
         }
     }
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index 1d2fb59f7c..3166a1c830 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -29,6 +29,8 @@
 #include "netlist_exporter.h"
 #include <map>
 
+class SEARCH_STACK;
+
 /**
  * Class NETLIST_EXPORTER_PSPICE
  * generates a PSPICE compatible netlist
@@ -36,8 +38,8 @@
 class NETLIST_EXPORTER_PSPICE : public NETLIST_EXPORTER
 {
 public:
-    NETLIST_EXPORTER_PSPICE( NETLIST_OBJECT_LIST* aMasterList, PART_LIBS* aLibs ) :
-        NETLIST_EXPORTER( aMasterList, aLibs )
+    NETLIST_EXPORTER_PSPICE( NETLIST_OBJECT_LIST* aMasterList, PART_LIBS* aLibs, SEARCH_STACK* aPaths = NULL ) :
+        NETLIST_EXPORTER( aMasterList, aLibs ), m_paths( aPaths )
     {
     }
 
@@ -62,12 +64,10 @@ public:
         return m_probes;
     }
 
-
-
 private:
     NetIndexMap m_netMap;
     ProbeList m_probes;
-
+    SEARCH_STACK* m_paths;
 };
 
 #endif
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 1aa5818001..e348bff9c7 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -132,7 +132,7 @@ void SIM_PLOT_FRAME::StartSimulation()
     m_simulator->Init();
 
     NETLIST_OBJECT_LIST* net_atoms = m_schematicFrame->BuildNetListBase();
-    m_exporter = new NETLIST_EXPORTER_PSPICE ( net_atoms, Prj().SchLibs() );
+    m_exporter = new NETLIST_EXPORTER_PSPICE( net_atoms, Prj().SchLibs(), Prj().SchSearchS() );
     STRING_FORMATTER formatter;
 
     m_exporter->Format( &formatter, GNL_ALL );

From 171e64931306ad296e77b53db23a244d9e0aec36 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:10 +0200
Subject: [PATCH 014/197] Fixed type names (NET_INDEX_MAP & PROBE_LIST)

---
 eeschema/netlist_exporters/netlist_exporter_pspice.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index 3166a1c830..9659cb9bbb 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -43,8 +43,8 @@ public:
     {
     }
 
-    typedef std::map<wxString, int> NetIndexMap;
-    typedef std::vector<wxString> ProbeList;
+    typedef std::map<wxString, int> NET_INDEX_MAP;
+    typedef std::vector<wxString> PROBE_LIST;
 
     /**
      * Function WriteNetlist
@@ -54,19 +54,19 @@ public:
 
     bool Format( OUTPUTFORMATTER* aOutputFormatter, int aCtl );
 
-    const NetIndexMap& GetNetIndexMap ( ) const
+    const NET_INDEX_MAP& GetNetIndexMap() const
     {
         return m_netMap;
     }
 
-    const ProbeList& GetProbeList() const
+    const PROBE_LIST& GetProbeList() const
     {
         return m_probes;
     }
 
 private:
-    NetIndexMap m_netMap;
-    ProbeList m_probes;
+    NET_INDEX_MAP m_netMap;
+    PROBE_LIST m_probes;
     SEARCH_STACK* m_paths;
 };
 

From 0d8c095215fd3b19fb5c3c1c49b3acd67ca6d761 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:10 +0200
Subject: [PATCH 015/197] Fill the signal list box when a simulation is
 finished

---
 eeschema/sim/sim_plot_frame.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index e348bff9c7..f124c9bc7d 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -248,16 +248,24 @@ void SIM_PLOT_FRAME::onSimReport( wxThreadEvent& aEvent )
 
 void SIM_PLOT_FRAME::onSimFinished( wxThreadEvent& aEvent )
 {
-    wxLogDebug( "Simulation finished" );
+    const auto& netMapping = m_exporter->GetNetIndexMap();
+
+    // Fill the signals listbox
+    m_signals->Clear();
+
+    for( const auto& net : netMapping )
+    {
+        if( net.first != "GND" )
+            m_signals->Append( net.first );
+    }
 
-    auto mapping = m_exporter->GetNetIndexMap();
     //    auto data_t = m_simulator->GetPlot( "time" );
 
-    for( auto name : m_exporter->GetProbeList() )
+    for( auto& name : m_exporter->GetProbeList() )
     {
         char spiceName[1024];
 
-        snprintf( spiceName, sizeof( spiceName ), "V(%d)", mapping[name] );
+        snprintf( spiceName, sizeof( spiceName ), "V(%d)", netMapping.at( name ) );
         //wxLogDebug( "probe %s->%s\n", (const char *) name.c_str(), spiceName );
         //    auto data_y = m_simulator->GetPlot( spiceName );
 

From b6eab191d0ea772788a0a5de14a2f3b6c05f5196 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:10 +0200
Subject: [PATCH 016/197] Added a button to add Spice fields to a schematic
 component

---
 .../dialog_edit_component_in_schematic.cpp    |  34 ++-
 ...dialog_edit_component_in_schematic_fbp.cpp | 211 +++++++++---------
 ...dialog_edit_component_in_schematic_fbp.fbp | 146 +++++++++---
 .../dialog_edit_component_in_schematic_fbp.h  |  18 +-
 .../netlist_exporter_pspice.cpp               | 105 ++++++---
 .../netlist_exporter_pspice.h                 |  12 +-
 6 files changed, 347 insertions(+), 179 deletions(-)

diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
index ad63a11d98..68f6c1e33c 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
@@ -46,6 +46,7 @@
 #include <sch_validators.h>
 
 #include <dialog_edit_component_in_schematic_fbp.h>
+#include <netlist_exporter_pspice.h>
 
 
 /**
@@ -126,7 +127,7 @@ private:
     void showButtonHandler( wxCommandEvent& event );
     void OnTestChipName( wxCommandEvent& event );
     void OnSelectChipName( wxCommandEvent& event );
-	void OnInitDlg( wxInitDialogEvent& event )
+    void OnInitDlg( wxInitDialogEvent& event )
     {
         TransferDataToWindow();
 
@@ -134,6 +135,8 @@ private:
         FinishDialogSettings();
     }
 
+    void EditSpiceFields( wxCommandEvent& event );
+
     SCH_FIELD* findField( const wxString& aFieldName );
 
     /**
@@ -141,7 +144,7 @@ private:
      * update the listbox showing fields, according to the fields texts
      * must be called after a text change in fields, if this change is not an edition
      */
-    void updateDisplay( )
+    void updateDisplay()
     {
         for( unsigned ii = FIELD1;  ii<m_FieldsBuf.size(); ii++ )
             setRowItem( ii, m_FieldsBuf[ii] );
@@ -284,6 +287,33 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnSelectChipName( wxCommandEvent& event
 }
 
 
+void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::EditSpiceFields( wxCommandEvent& event )
+{
+    for( const auto& fieldName : NETLIST_EXPORTER_PSPICE::GetSpiceFields() )
+    {
+        SCH_FIELD* schField = findField( fieldName );
+        // @todo move everything to the bottom, so the fields are grouped and in the same order?
+
+        // Do not modify the existing value, just add missing fields with default values
+        if( schField == NULL )
+        {
+            unsigned fieldNdx = m_FieldsBuf.size();
+            SCH_FIELD newField( wxPoint(), fieldNdx, m_cmp, fieldName );
+            newField.SetOrientation( m_FieldsBuf[REFERENCE].GetOrientation() );
+            m_FieldsBuf.push_back( newField );
+            schField = &m_FieldsBuf.back();
+        }
+
+        if( schField->GetText().IsEmpty() )
+        {
+            schField->SetText( NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( fieldName, m_cmp ) );
+        }
+    }
+
+    updateDisplay();
+}
+
+
 void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnListItemSelected( wxListEvent& event )
 {
     DBG( printf( "OnListItemSelected()\n" ); )
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp
index 6dddb57b88..39fb52cd28 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version May 21 2016)
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -12,287 +12,291 @@
 DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
+
 	wxBoxSizer* mainSizer;
 	mainSizer = new wxBoxSizer( wxVERTICAL );
-	
+
 	wxBoxSizer* upperSizer;
 	upperSizer = new wxBoxSizer( wxHORIZONTAL );
-	
+
 	wxStaticBoxSizer* optionsSizer;
 	optionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Component") ), wxVERTICAL );
-	
+
 	m_staticTextUnit = new wxStaticText( optionsSizer->GetStaticBox(), wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextUnit->Wrap( -1 );
 	optionsSizer->Add( m_staticTextUnit, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
+
 	wxArrayString unitChoiceChoices;
 	unitChoice = new wxChoice( optionsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, unitChoiceChoices, 0 );
 	unitChoice->SetSelection( 0 );
 	optionsSizer->Add( unitChoice, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
+
 	wxBoxSizer* bSizerUnitsInterchangeable;
 	bSizerUnitsInterchangeable = new wxBoxSizer( wxHORIZONTAL );
-	
+
 	unitsInterchageableText = new wxStaticText( optionsSizer->GetStaticBox(), wxID_ANY, _("Units are interchangeable:"), wxDefaultPosition, wxDefaultSize, 0 );
 	unitsInterchageableText->Wrap( -1 );
 	bSizerUnitsInterchangeable->Add( unitsInterchageableText, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
+
 	unitsInterchageableLabel = new wxStaticText( optionsSizer->GetStaticBox(), wxID_ANY, _("Yes"), wxDefaultPosition, wxDefaultSize, 0 );
 	unitsInterchageableLabel->Wrap( -1 );
 	bSizerUnitsInterchangeable->Add( unitsInterchageableLabel, 0, wxALL, 5 );
-	
-	
+
+
 	optionsSizer->Add( bSizerUnitsInterchangeable, 0, wxEXPAND, 5 );
-	
+
 	wxString orientationRadioBoxChoices[] = { _("0"), _("+90"), _("180"), _("-90") };
 	int orientationRadioBoxNChoices = sizeof( orientationRadioBoxChoices ) / sizeof( wxString );
 	orientationRadioBox = new wxRadioBox( optionsSizer->GetStaticBox(), wxID_ANY, _("Orientation (Degrees)"), wxDefaultPosition, wxDefaultSize, orientationRadioBoxNChoices, orientationRadioBoxChoices, 1, wxRA_SPECIFY_COLS );
 	orientationRadioBox->SetSelection( 0 );
 	orientationRadioBox->SetToolTip( _("Select if the component is to be rotated when drawn") );
-	
+
 	optionsSizer->Add( orientationRadioBox, 0, wxEXPAND|wxALL, 5 );
-	
+
 	wxString mirrorRadioBoxChoices[] = { _("Normal"), _("Mirror ---"), _("Mirror |") };
 	int mirrorRadioBoxNChoices = sizeof( mirrorRadioBoxChoices ) / sizeof( wxString );
 	mirrorRadioBox = new wxRadioBox( optionsSizer->GetStaticBox(), wxID_ANY, _("Mirror"), wxDefaultPosition, wxDefaultSize, mirrorRadioBoxNChoices, mirrorRadioBoxChoices, 1, wxRA_SPECIFY_COLS );
 	mirrorRadioBox->SetSelection( 0 );
 	mirrorRadioBox->SetToolTip( _("Pick the graphical transformation to be used when displaying the component, if any") );
-	
+
 	optionsSizer->Add( mirrorRadioBox, 0, wxALL|wxEXPAND, 5 );
-	
+
 	convertCheckBox = new wxCheckBox( optionsSizer->GetStaticBox(), wxID_ANY, _("Converted Shape"), wxDefaultPosition, wxDefaultSize, 0 );
 	convertCheckBox->SetToolTip( _("Use the alternate shape of this component.\nFor gates, this is the \"De Morgan\" conversion") );
-	
+
 	optionsSizer->Add( convertCheckBox, 0, wxALL, 5 );
-	
+
 	wxStaticBoxSizer* sbSizerChipName;
 	sbSizerChipName = new wxStaticBoxSizer( new wxStaticBox( optionsSizer->GetStaticBox(), wxID_ANY, _("Chip Name") ), wxVERTICAL );
-	
+
 	chipnameTextCtrl = new wxTextCtrl( sbSizerChipName->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	chipnameTextCtrl->SetToolTip( _("The name of the symbol in the library from which this component came") );
-	
+
 	sbSizerChipName->Add( chipnameTextCtrl, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
+
 	wxBoxSizer* bSizerChpinameButt;
 	bSizerChpinameButt = new wxBoxSizer( wxHORIZONTAL );
-	
+
 	m_buttonTestChipName = new wxButton( sbSizerChipName->GetStaticBox(), wxID_ANY, _("Test"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerChpinameButt->Add( m_buttonTestChipName, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
+
 	m_buttonSelectChipName = new wxButton( sbSizerChipName->GetStaticBox(), wxID_ANY, _("Select"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerChpinameButt->Add( m_buttonSelectChipName, 0, wxTOP|wxBOTTOM, 5 );
-	
-	
+
+
 	sbSizerChipName->Add( bSizerChpinameButt, 1, wxEXPAND, 5 );
-	
-	
+
+
 	optionsSizer->Add( sbSizerChipName, 0, wxEXPAND|wxALL, 5 );
-	
+
 	m_staticTextTimeStamp = new wxStaticText( optionsSizer->GetStaticBox(), wxID_ANY, _("Timestamp"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextTimeStamp->Wrap( -1 );
 	optionsSizer->Add( m_staticTextTimeStamp, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
+
 	m_textCtrlTimeStamp = new wxTextCtrl( optionsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
 	m_textCtrlTimeStamp->SetToolTip( _("An unique ID (a time stamp) to identify the component.\nThis is an alternate identifier to the reference.") );
-	
+
 	optionsSizer->Add( m_textCtrlTimeStamp, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
+
 	m_staticline1 = new wxStaticLine( optionsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
 	optionsSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
-	
+
+	spiceFieldsButton = new wxButton( optionsSizer->GetStaticBox(), wxID_ANY, _("Add Spice fields"), wxDefaultPosition, wxDefaultSize, 0 );
+	optionsSizer->Add( spiceFieldsButton, 0, wxALL|wxEXPAND, 5 );
+
 	defaultsButton = new wxButton( optionsSizer->GetStaticBox(), wxID_ANY, _("Reset to Library Defaults"), wxDefaultPosition, wxDefaultSize, 0 );
 	defaultsButton->SetToolTip( _("Set position and style of fields and component orientation  to default lib value.\nFields texts are not modified.") );
-	
+
 	optionsSizer->Add( defaultsButton, 0, wxALL|wxEXPAND, 5 );
-	
-	
+
+
 	upperSizer->Add( optionsSizer, 0, wxEXPAND|wxALL, 5 );
-	
+
 	wxStaticBoxSizer* fieldsSizer;
 	fieldsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Fields") ), wxHORIZONTAL );
-	
+
 	wxStaticBoxSizer* gridStaticBoxSizer;
 	gridStaticBoxSizer = new wxStaticBoxSizer( new wxStaticBox( fieldsSizer->GetStaticBox(), wxID_ANY, wxEmptyString ), wxVERTICAL );
-	
+
 	fieldListCtrl = new wxListCtrl( gridStaticBoxSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES );
 	fieldListCtrl->SetMinSize( wxSize( 220,-1 ) );
-	
+
 	gridStaticBoxSizer->Add( fieldListCtrl, 1, wxALL|wxEXPAND, 8 );
-	
+
 	addFieldButton = new wxButton( gridStaticBoxSizer->GetStaticBox(), wxID_ANY, _("Add Field"), wxDefaultPosition, wxDefaultSize, 0 );
 	addFieldButton->SetToolTip( _("Add a new custom field") );
-	
+
 	gridStaticBoxSizer->Add( addFieldButton, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
+
 	deleteFieldButton = new wxButton( gridStaticBoxSizer->GetStaticBox(), wxID_ANY, _("Delete Field"), wxDefaultPosition, wxDefaultSize, 0 );
 	deleteFieldButton->SetToolTip( _("Delete one of the optional fields") );
-	
+
 	gridStaticBoxSizer->Add( deleteFieldButton, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
+
 	moveUpButton = new wxButton( gridStaticBoxSizer->GetStaticBox(), wxID_ANY, _("Move Up"), wxDefaultPosition, wxDefaultSize, 0 );
 	moveUpButton->SetToolTip( _("Move the selected optional fields up one position") );
-	
+
 	gridStaticBoxSizer->Add( moveUpButton, 0, wxALL|wxEXPAND, 5 );
-	
-	
+
+
 	fieldsSizer->Add( gridStaticBoxSizer, 3, wxEXPAND|wxRIGHT|wxLEFT, 8 );
-	
+
 	wxBoxSizer* fieldEditBoxSizer;
 	fieldEditBoxSizer = new wxBoxSizer( wxVERTICAL );
-	
+
 	wxBoxSizer* bSizerJustification;
 	bSizerJustification = new wxBoxSizer( wxHORIZONTAL );
-	
+
 	wxString m_FieldHJustifyCtrlChoices[] = { _("Left"), _("Center"), _("Right") };
 	int m_FieldHJustifyCtrlNChoices = sizeof( m_FieldHJustifyCtrlChoices ) / sizeof( wxString );
 	m_FieldHJustifyCtrl = new wxRadioBox( fieldsSizer->GetStaticBox(), wxID_ANY, _("Horiz. Justify"), wxDefaultPosition, wxDefaultSize, m_FieldHJustifyCtrlNChoices, m_FieldHJustifyCtrlChoices, 1, wxRA_SPECIFY_COLS );
 	m_FieldHJustifyCtrl->SetSelection( 2 );
 	bSizerJustification->Add( m_FieldHJustifyCtrl, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
+
 	wxString m_FieldVJustifyCtrlChoices[] = { _("Bottom"), _("Center"), _("Top") };
 	int m_FieldVJustifyCtrlNChoices = sizeof( m_FieldVJustifyCtrlChoices ) / sizeof( wxString );
 	m_FieldVJustifyCtrl = new wxRadioBox( fieldsSizer->GetStaticBox(), wxID_ANY, _("Vert. Justify"), wxDefaultPosition, wxDefaultSize, m_FieldVJustifyCtrlNChoices, m_FieldVJustifyCtrlChoices, 1, wxRA_SPECIFY_COLS );
 	m_FieldVJustifyCtrl->SetSelection( 2 );
 	bSizerJustification->Add( m_FieldVJustifyCtrl, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	
+
+
 	fieldEditBoxSizer->Add( bSizerJustification, 1, wxEXPAND|wxBOTTOM, 5 );
-	
+
 	wxBoxSizer* bSizerStyle;
 	bSizerStyle = new wxBoxSizer( wxHORIZONTAL );
-	
+
 	wxStaticBoxSizer* visibilitySizer;
 	visibilitySizer = new wxStaticBoxSizer( new wxStaticBox( fieldsSizer->GetStaticBox(), wxID_ANY, _("Visibility") ), wxVERTICAL );
-	
+
 	showCheckBox = new wxCheckBox( visibilitySizer->GetStaticBox(), wxID_ANY, _("Show"), wxDefaultPosition, wxDefaultSize, 0 );
 	showCheckBox->SetToolTip( _("Check if you want this field visible") );
-	
+
 	visibilitySizer->Add( showCheckBox, 0, wxALL, 5 );
-	
+
 	rotateCheckBox = new wxCheckBox( visibilitySizer->GetStaticBox(), wxID_ANY, _("Rotate"), wxDefaultPosition, wxDefaultSize, 0 );
 	rotateCheckBox->SetToolTip( _("Check if you want this field's text rotated 90 degrees") );
-	
+
 	visibilitySizer->Add( rotateCheckBox, 0, wxALL, 5 );
-	
-	
+
+
 	bSizerStyle->Add( visibilitySizer, 1, wxEXPAND|wxALL, 5 );
-	
+
 	wxString m_StyleRadioBoxChoices[] = { _("Normal"), _("Italic"), _("Bold"), _("Bold Italic") };
 	int m_StyleRadioBoxNChoices = sizeof( m_StyleRadioBoxChoices ) / sizeof( wxString );
 	m_StyleRadioBox = new wxRadioBox( fieldsSizer->GetStaticBox(), wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, m_StyleRadioBoxNChoices, m_StyleRadioBoxChoices, 1, wxRA_SPECIFY_COLS );
 	m_StyleRadioBox->SetSelection( 3 );
 	m_StyleRadioBox->SetToolTip( _("The style of the currently selected field's text in the schematic") );
-	
+
 	bSizerStyle->Add( m_StyleRadioBox, 1, wxEXPAND|wxALL, 5 );
-	
-	
+
+
 	fieldEditBoxSizer->Add( bSizerStyle, 1, wxEXPAND|wxBOTTOM, 5 );
-	
+
 	wxBoxSizer* fieldNameBoxSizer;
 	fieldNameBoxSizer = new wxBoxSizer( wxVERTICAL );
-	
+
 	fieldNameLabel = new wxStaticText( fieldsSizer->GetStaticBox(), wxID_ANY, _("Field Name"), wxDefaultPosition, wxDefaultSize, 0 );
 	fieldNameLabel->Wrap( -1 );
 	fieldNameBoxSizer->Add( fieldNameLabel, 0, wxTOP, 5 );
-	
+
 	fieldNameTextCtrl = new wxTextCtrl( fieldsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fieldNameTextCtrl->SetToolTip( _("The name of the currently selected field\nSome fixed fields names are not editable") );
-	
+
 	fieldNameBoxSizer->Add( fieldNameTextCtrl, 0, wxBOTTOM|wxEXPAND, 5 );
-	
+
 	fieldValueLabel = new wxStaticText( fieldsSizer->GetStaticBox(), wxID_ANY, _("Field Value"), wxDefaultPosition, wxDefaultSize, 0 );
 	fieldValueLabel->Wrap( -1 );
 	fieldNameBoxSizer->Add( fieldValueLabel, 0, wxALIGN_TOP|wxTOP, 5 );
-	
+
 	fieldValueTextCtrl = new wxTextCtrl( fieldsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fieldValueTextCtrl->SetToolTip( _("The name of the currently selected field\nSome fixed fields names are not editable") );
-	
+
 	fieldNameBoxSizer->Add( fieldValueTextCtrl, 0, wxEXPAND|wxBOTTOM, 5 );
-	
+
 	m_show_datasheet_button = new wxButton( fieldsSizer->GetStaticBox(), wxID_ANY, _("Show in Browser"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_show_datasheet_button->SetToolTip( _("If your datasheet is an http:// link or a complete file path, then it may show in your browser by pressing this button.") );
-	
+
 	fieldNameBoxSizer->Add( m_show_datasheet_button, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	
+
+
 	fieldEditBoxSizer->Add( fieldNameBoxSizer, 0, wxBOTTOM|wxEXPAND, 5 );
-	
+
 	wxFlexGridSizer* fgSizerPosSize;
 	fgSizerPosSize = new wxFlexGridSizer( 3, 3, 0, 0 );
 	fgSizerPosSize->AddGrowableCol( 1 );
 	fgSizerPosSize->SetFlexibleDirection( wxBOTH );
 	fgSizerPosSize->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
+
 	textSizeLabel = new wxStaticText( fieldsSizer->GetStaticBox(), wxID_ANY, _("Size"), wxDefaultPosition, wxDefaultSize, 0 );
 	textSizeLabel->Wrap( -1 );
 	fgSizerPosSize->Add( textSizeLabel, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	textSizeTextCtrl = new wxTextCtrl( fieldsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	textSizeTextCtrl->SetToolTip( _("The size of the currently selected field's text in the schematic") );
-	
+
 	fgSizerPosSize->Add( textSizeTextCtrl, 0, wxEXPAND|wxBOTTOM, 5 );
-	
+
 	m_staticTextUnitSize = new wxStaticText( fieldsSizer->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextUnitSize->Wrap( -1 );
 	fgSizerPosSize->Add( m_staticTextUnitSize, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	posXLabel = new wxStaticText( fieldsSizer->GetStaticBox(), wxID_ANY, _("PosX"), wxDefaultPosition, wxDefaultSize, 0 );
 	posXLabel->Wrap( -1 );
 	fgSizerPosSize->Add( posXLabel, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	posXTextCtrl = new wxTextCtrl( fieldsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	posXTextCtrl->SetToolTip( _("The X coordinate of the text relative to the component") );
-	
+
 	fgSizerPosSize->Add( posXTextCtrl, 0, wxEXPAND|wxTOP, 5 );
-	
+
 	m_staticTextUnitPosX = new wxStaticText( fieldsSizer->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextUnitPosX->Wrap( -1 );
 	fgSizerPosSize->Add( m_staticTextUnitPosX, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	posYLabel = new wxStaticText( fieldsSizer->GetStaticBox(), wxID_ANY, _("PosY"), wxDefaultPosition, wxDefaultSize, 0 );
 	posYLabel->Wrap( -1 );
 	fgSizerPosSize->Add( posYLabel, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	posYTextCtrl = new wxTextCtrl( fieldsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	posYTextCtrl->SetToolTip( _("The Y coordinate of the text relative to the component") );
-	
+
 	fgSizerPosSize->Add( posYTextCtrl, 0, wxEXPAND, 5 );
-	
+
 	m_staticTextUnitPosY = new wxStaticText( fieldsSizer->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextUnitPosY->Wrap( -1 );
 	fgSizerPosSize->Add( m_staticTextUnitPosY, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fieldEditBoxSizer->Add( fgSizerPosSize, 1, wxEXPAND|wxTOP, 5 );
-	
-	
+
+
 	fieldsSizer->Add( fieldEditBoxSizer, 2, wxEXPAND, 5 );
-	
-	
+
+
 	upperSizer->Add( fieldsSizer, 1, wxALL|wxEXPAND, 5 );
-	
-	
+
+
 	mainSizer->Add( upperSizer, 1, wxEXPAND, 5 );
-	
+
 	stdDialogButtonSizer = new wxStdDialogButtonSizer();
 	stdDialogButtonSizerOK = new wxButton( this, wxID_OK );
 	stdDialogButtonSizer->AddButton( stdDialogButtonSizerOK );
 	stdDialogButtonSizerCancel = new wxButton( this, wxID_CANCEL );
 	stdDialogButtonSizer->AddButton( stdDialogButtonSizerCancel );
 	stdDialogButtonSizer->Realize();
-	
+
 	mainSizer->Add( stdDialogButtonSizer, 0, wxALL|wxEXPAND, 5 );
-	
-	
+
+
 	this->SetSizer( mainSizer );
 	this->Layout();
-	
+
 	// Connect Events
 	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnCloseDialog ) );
 	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnInitDlg ) );
 	m_buttonTestChipName->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnTestChipName ), NULL, this );
 	m_buttonSelectChipName->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnSelectChipName ), NULL, this );
+	spiceFieldsButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::EditSpiceFields ), NULL, this );
 	defaultsButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::SetInitCmp ), NULL, this );
 	fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnListItemDeselected ), NULL, this );
 	fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnListItemSelected ), NULL, this );
@@ -311,6 +315,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::~DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
 	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnInitDlg ) );
 	m_buttonTestChipName->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnTestChipName ), NULL, this );
 	m_buttonSelectChipName->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnSelectChipName ), NULL, this );
+	spiceFieldsButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::EditSpiceFields ), NULL, this );
 	defaultsButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::SetInitCmp ), NULL, this );
 	fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnListItemDeselected ), NULL, this );
 	fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnListItemSelected ), NULL, this );
@@ -320,5 +325,5 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::~DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
 	m_show_datasheet_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::showButtonHandler ), NULL, this );
 	stdDialogButtonSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnCancelButtonClick ), NULL, this );
 	stdDialogButtonSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnOKButtonClick ), NULL, this );
-	
+
 }
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp
index d46b0b57e5..0bc9b0f873 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp
@@ -44,7 +44,7 @@
             <property name="minimum_size"></property>
             <property name="name">DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP</property>
             <property name="pos"></property>
-            <property name="size">688,586</property>
+            <property name="size">928,741</property>
             <property name="style">wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU</property>
             <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
             <property name="title">Component Properties</property>
@@ -286,11 +286,11 @@
                                         <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
                                     <property name="flag">wxEXPAND</property>
                                     <property name="proportion">0</property>
-                                    <object class="wxBoxSizer" expanded="1">
+                                    <object class="wxBoxSizer" expanded="0">
                                         <property name="minimum_size"></property>
                                         <property name="name">bSizerUnitsInterchangeable</property>
                                         <property name="orient">wxHORIZONTAL</property>
@@ -378,11 +378,11 @@
                                                 <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
-                                        <object class="sizeritem" expanded="1">
+                                        <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALL</property>
                                             <property name="proportion">0</property>
-                                            <object class="wxStaticText" expanded="1">
+                                            <object class="wxStaticText" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
@@ -731,11 +731,11 @@
                                         <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
                                     <property name="flag">wxEXPAND|wxALL</property>
                                     <property name="proportion">0</property>
-                                    <object class="wxStaticBoxSizer" expanded="1">
+                                    <object class="wxStaticBoxSizer" expanded="0">
                                         <property name="id">wxID_ANY</property>
                                         <property name="label">Chip Name</property>
                                         <property name="minimum_size"></property>
@@ -835,20 +835,20 @@
                                                 <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
-                                        <object class="sizeritem" expanded="1">
+                                        <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxEXPAND</property>
                                             <property name="proportion">1</property>
-                                            <object class="wxBoxSizer" expanded="1">
+                                            <object class="wxBoxSizer" expanded="0">
                                                 <property name="minimum_size"></property>
                                                 <property name="name">bSizerChpinameButt</property>
                                                 <property name="orient">wxHORIZONTAL</property>
                                                 <property name="permission">none</property>
-                                                <object class="sizeritem" expanded="1">
+                                                <object class="sizeritem" expanded="0">
                                                     <property name="border">5</property>
                                                     <property name="flag">wxTOP|wxBOTTOM|wxRIGHT</property>
                                                     <property name="proportion">0</property>
-                                                    <object class="wxButton" expanded="1">
+                                                    <object class="wxButton" expanded="0">
                                                         <property name="BottomDockable">1</property>
                                                         <property name="LeftDockable">1</property>
                                                         <property name="RightDockable">1</property>
@@ -932,11 +932,11 @@
                                                         <event name="OnUpdateUI"></event>
                                                     </object>
                                                 </object>
-                                                <object class="sizeritem" expanded="1">
+                                                <object class="sizeritem" expanded="0">
                                                     <property name="border">5</property>
                                                     <property name="flag">wxTOP|wxBOTTOM</property>
                                                     <property name="proportion">0</property>
-                                                    <object class="wxButton" expanded="1">
+                                                    <object class="wxButton" expanded="0">
                                                         <property name="BottomDockable">1</property>
                                                         <property name="LeftDockable">1</property>
                                                         <property name="RightDockable">1</property>
@@ -1024,11 +1024,11 @@
                                         </object>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
                                     <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
                                     <property name="proportion">0</property>
-                                    <object class="wxStaticText" expanded="1">
+                                    <object class="wxStaticText" expanded="0">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
@@ -1107,11 +1107,11 @@
                                         <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
                                     <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND</property>
                                     <property name="proportion">0</property>
-                                    <object class="wxTextCtrl" expanded="1">
+                                    <object class="wxTextCtrl" expanded="0">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
@@ -1198,11 +1198,11 @@
                                         <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
                                     <property name="flag">wxEXPAND | wxALL</property>
                                     <property name="proportion">0</property>
-                                    <object class="wxStaticLine" expanded="1">
+                                    <object class="wxStaticLine" expanded="0">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
@@ -1279,6 +1279,94 @@
                                         <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALL|wxEXPAND</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxButton" 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_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</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">0</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="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="label">Add Spice fields</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">spiceFieldsButton</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <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>
+                                        <event name="OnButtonClick">EditSpiceFields</event>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
                                 <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
                                     <property name="flag">wxALL|wxEXPAND</property>
@@ -1386,7 +1474,7 @@
                                     <property name="border">8</property>
                                     <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
                                     <property name="proportion">3</property>
-                                    <object class="wxStaticBoxSizer" expanded="1">
+                                    <object class="wxStaticBoxSizer" expanded="0">
                                         <property name="id">wxID_ANY</property>
                                         <property name="label"></property>
                                         <property name="minimum_size"></property>
@@ -1770,16 +1858,16 @@
                                     <property name="border">5</property>
                                     <property name="flag">wxEXPAND</property>
                                     <property name="proportion">2</property>
-                                    <object class="wxBoxSizer" expanded="1">
+                                    <object class="wxBoxSizer" expanded="0">
                                         <property name="minimum_size"></property>
                                         <property name="name">fieldEditBoxSizer</property>
                                         <property name="orient">wxVERTICAL</property>
                                         <property name="permission">none</property>
-                                        <object class="sizeritem" expanded="1">
+                                        <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxEXPAND|wxBOTTOM</property>
                                             <property name="proportion">1</property>
-                                            <object class="wxBoxSizer" expanded="1">
+                                            <object class="wxBoxSizer" expanded="0">
                                                 <property name="minimum_size"></property>
                                                 <property name="name">bSizerJustification</property>
                                                 <property name="orient">wxHORIZONTAL</property>
@@ -1966,20 +2054,20 @@
                                                 </object>
                                             </object>
                                         </object>
-                                        <object class="sizeritem" expanded="1">
+                                        <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxEXPAND|wxBOTTOM</property>
                                             <property name="proportion">1</property>
-                                            <object class="wxBoxSizer" expanded="1">
+                                            <object class="wxBoxSizer" expanded="0">
                                                 <property name="minimum_size"></property>
                                                 <property name="name">bSizerStyle</property>
                                                 <property name="orient">wxHORIZONTAL</property>
                                                 <property name="permission">none</property>
-                                                <object class="sizeritem" expanded="1">
+                                                <object class="sizeritem" expanded="0">
                                                     <property name="border">5</property>
                                                     <property name="flag">wxEXPAND|wxALL</property>
                                                     <property name="proportion">1</property>
-                                                    <object class="wxStaticBoxSizer" expanded="1">
+                                                    <object class="wxStaticBoxSizer" expanded="0">
                                                         <property name="id">wxID_ANY</property>
                                                         <property name="label">Visibility</property>
                                                         <property name="minimum_size"></property>
@@ -2258,11 +2346,11 @@
                                                 </object>
                                             </object>
                                         </object>
-                                        <object class="sizeritem" expanded="1">
+                                        <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxBOTTOM|wxEXPAND</property>
                                             <property name="proportion">0</property>
-                                            <object class="wxBoxSizer" expanded="1">
+                                            <object class="wxBoxSizer" expanded="0">
                                                 <property name="minimum_size"></property>
                                                 <property name="name">fieldNameBoxSizer</property>
                                                 <property name="orient">wxVERTICAL</property>
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h
index 4e50064713..d2087a70cc 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version May 21 2016)
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -40,7 +40,7 @@ class DIALOG_SHIM;
 class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP : public DIALOG_SHIM
 {
 	private:
-	
+
 	protected:
 		wxStaticText* m_staticTextUnit;
 		wxChoice* unitChoice;
@@ -55,6 +55,7 @@ class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP : public DIALOG_SHIM
 		wxStaticText* m_staticTextTimeStamp;
 		wxTextCtrl* m_textCtrlTimeStamp;
 		wxStaticLine* m_staticline1;
+		wxButton* spiceFieldsButton;
 		wxButton* defaultsButton;
 		wxListCtrl* fieldListCtrl;
 		wxButton* addFieldButton;
@@ -82,12 +83,13 @@ class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP : public DIALOG_SHIM
 		wxStdDialogButtonSizer* stdDialogButtonSizer;
 		wxButton* stdDialogButtonSizerOK;
 		wxButton* stdDialogButtonSizerCancel;
-		
+
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnCloseDialog( wxCloseEvent& event ) { event.Skip(); }
 		virtual void OnInitDlg( wxInitDialogEvent& event ) { event.Skip(); }
 		virtual void OnTestChipName( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnSelectChipName( wxCommandEvent& event ) { event.Skip(); }
+		virtual void EditSpiceFields( wxCommandEvent& event ) { event.Skip(); }
 		virtual void SetInitCmp( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
 		virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
@@ -97,13 +99,13 @@ class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP : public DIALOG_SHIM
 		virtual void showButtonHandler( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
-		
-	
+
+
 	public:
-		
-		DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 688,586 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU ); 
+
+		DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 928,741 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU );
 		~DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP();
-	
+
 };
 
 #endif //__DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP_H__
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index fe8e26b5c8..756542f75d 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -49,7 +49,6 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
     std::vector<int>    pinSequence;                    // numeric indices into m_SortedComponentPinList
     wxArrayString       stdPinNameArray;                // Array containing Standard Pin Names
     const wxString      delimiters( "{:,; }" );
-    const wxString      disableStr( "N" );
 
     // Prepare list of nets generation (not used here, but...
     for( unsigned ii = 0; ii < m_masterList->size(); ii++ )
@@ -85,7 +84,6 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
                 while( tokenizer.HasMoreTokens() )
                 {
                     wxString directive( tokenizer.GetNextToken() );
-                    wxLogDebug( "Directive found: '%s'\n", (const char *) directive.c_str() );
 
                     // Fix paths for .include directives
                     if( m_paths && directive.StartsWith( ".inc" ) )
@@ -122,56 +120,41 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
             // Reset NodeSeqIndex Count:
             pinSequence.clear();
 
+            // Obtain Spice fields
             SCH_FIELD* spicePrimitiveType = comp->FindField( wxT( "Spice_Primitive" ) );
             SCH_FIELD* spiceModel = comp->FindField( wxT( "Spice_Model" ) );
+            SCH_FIELD* netlistEnabledField = comp->FindField( wxT( "Spice_Netlist_Enabled" ) );
+            SCH_FIELD* spiceSeqField = comp->FindField( wxT( "Spice_Node_Sequence" ) );
 
-            wxString RefName = comp->GetRef( &sheetList[sheet_idx] );
-            wxString CompValue = comp->GetField( VALUE )->GetText();
+            wxString model = spiceModel ? spiceModel->GetText()
+                : GetSpiceFieldDefVal( "Spice_Model", comp );
 
-            wxString model( "" );
-            wxString primType( "X" );
+            wxString primType = spicePrimitiveType ? spicePrimitiveType->GetText()
+                : GetSpiceFieldDefVal( "Spice_Primitive", comp );
 
-            if( spicePrimitiveType )
-            {
-                primType = spicePrimitiveType->GetText();
-            }
-            else
-            {
-                // Convert ceratin modules to subcircuits
-                if( RefName.StartsWith( "IC" ) || RefName.StartsWith( "U" ) )
-                    primType = "X";
-                else
-                    primType = RefName.GetChar( 0 );
-            }
-
-            if( spiceModel )
-                model = spiceModel->GetText();
-            else
-                model = CompValue;
+            const wxString& RefName = comp->GetRef( &sheetList[sheet_idx] );
 
             // Check to see if component should be removed from Spice Netlist:
-            SCH_FIELD* netlistEnabledField = comp->FindField( wxT( "Spice_Netlist_Enabled" ) );
-
             if( netlistEnabledField )
             {
                 wxString netlistEnabled = netlistEnabledField->GetText();
 
-                if( netlistEnabled.CmpNoCase( disableStr ) == 0 )
+                if( netlistEnabled.CmpNoCase( "N" ) == 0
+                        || netlistEnabled.CmpNoCase( "F" ) == 0
+                        || netlistEnabled == "0" )
                     continue;
             }
 
-            // Check if Alternative Pin Sequence is Available:
-            SCH_FIELD* spiceSeqField = comp->FindField( wxT( "Spice_Node_Sequence" ) );
-
+            // Check if an alternative pin sequence is available:
             if( spiceSeqField )
             {
-                // Get String containing the Sequence of Nodes:
+                // Get the string containing the sequence of nodes:
                 wxString nodeSeqIndexLineStr = spiceSeqField->GetText();
 
-                // Verify Field Exists and is not empty:
+                // Verify field exists and is not empty:
                 if( !nodeSeqIndexLineStr.IsEmpty() )
                 {
-                    // Create an Array of Standard Pin Names from part definition:
+                    // Create an array of standard pin names from part definition:
                     stdPinNameArray.Clear();
 
                     for( unsigned ii = 0; ii < m_SortedComponentPinList.size(); ii++ )
@@ -193,7 +176,7 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
                         int         seq;
 
                         // Find PinName In Standard List assign Standard List Index to Name:
-                        seq = stdPinNameArray.Index(pinIndex);
+                        seq = stdPinNameArray.Index( pinIndex );
 
                         if( seq != wxNOT_FOUND )
                             pinSequence.push_back( seq );
@@ -221,9 +204,6 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
             }
 #endif
 
-            wxLogDebug( "Ref %s primType %s model/value '%s'\n",
-                    TO_UTF8( RefName ), (const char*) primType.c_str(), (const char*) model.c_str() );
-
             int activePinIndex = 0;
 
             formatter->Print( 0, "%s%s ", (const char*) primType.c_str(), (const char*) RefName.c_str() );
@@ -247,6 +227,7 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
                     {
                         // Case of Alt Pin Sequence in control Bad Index or not using all
                         // pins for simulation:
+                        wxASSERT_MSG( false, "Used an invalid pin number in node sequence" );
                         continue;
                     }
                 }
@@ -328,3 +309,55 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
 
     return ret >= 0;
 }
+
+
+wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
+        SCH_COMPONENT* aComponent )
+{
+    if( aField == "Spice_Primitive" )
+    {
+        wxString RefName = aComponent->GetField( REFERENCE )->GetText();
+
+        // Convert ICs to subcircuits
+        if( RefName.StartsWith( "IC" ) || RefName.StartsWith( "U" ) )
+            return wxString( "X" );
+        else
+            return RefName.GetChar( 0 );
+    }
+
+    if( aField == "Spice_Model" )
+    {
+        return aComponent->GetField( VALUE )->GetText();
+    }
+
+    if( aField == "Spice_Netlist_Enabled" )
+    {
+        return wxString( "Y" );
+    }
+
+    if( aField == "Spice_Node_Sequence" )
+    {
+        wxString nodeSeq;
+        std::vector<LIB_PIN*> pins;
+
+        aComponent->GetPins( pins );
+
+        for( auto pin : pins )
+            nodeSeq += pin->GetNumberString() + " ";
+
+        nodeSeq.Trim();
+
+        return nodeSeq;
+    }
+
+    wxASSERT_MSG( "Missing default value definition for a Spice field: %s" , aField );
+
+    return wxString( "<unknown>" );
+}
+
+const std::vector<wxString> NETLIST_EXPORTER_PSPICE::m_spiceFields = {
+    "Spice_Primitive",
+    "Spice_Model",
+    "Spice_Netlist_Enabled",
+    "Spice_Node_Sequence"
+};
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index 9659cb9bbb..3e23ae9e28 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1992-2013 jp.charras at wanadoo.fr
  * Copyright (C) 2013 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 1992-2015 KiCad Developers
+ * Copyright (C) 1992-2016 KiCad Developers
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -64,10 +64,20 @@ public:
         return m_probes;
     }
 
+    static const std::vector<wxString>& GetSpiceFields()
+    {
+        return m_spiceFields;
+    }
+
+    static wxString GetSpiceFieldDefVal( const wxString& aField, SCH_COMPONENT* aComponent );
+
 private:
     NET_INDEX_MAP m_netMap;
     PROBE_LIST m_probes;
     SEARCH_STACK* m_paths;
+
+    // Fields that are used during netlist export & simulation
+    static const std::vector<wxString> m_spiceFields;
 };
 
 #endif

From a4868a0e5a22d78e79374db0450a9b481e915b53 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:10 +0200
Subject: [PATCH 017/197] Minor fixes to debug output

---
 eeschema/sim/ngspice.cpp        | 14 +++++---------
 eeschema/sim/sim_plot_panel.cpp |  2 --
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 4e74896702..a927db5d93 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -88,9 +88,7 @@ bool NGSPICE::LoadNetlist( const string& aNetlist )
     {
         char line[1024];
         ss.getline( line, sizeof(line) );
-
         lines[n++] = strdup(line);
-        wxLogDebug( "l '%s'\n", line );
     }
 
     lines[n] = NULL;
@@ -125,18 +123,18 @@ void NGSPICE::dump()
 
     for( int i = 0; plots[i]; ++i )
     {
-        wxLogDebug( "-> plot : %s\n", plots[i] );
+        wxLogDebug( "-> plot : %s", plots[i] );
         char** vecs = m_ngSpice_AllVecs( plots[i] );
 
         for( int j = 0; vecs[j]; j++ )
         {
-            wxLogDebug( "   - vector %s\n", vecs[j] );
+            wxLogDebug( "   - vector %s", vecs[j] );
 
             vector_info* vi = m_ngGet_Vec_Info( vecs[j] );
 
-            wxLogDebug( "       - v_type %x\n", vi->v_type );
-            wxLogDebug( "       - v_flags %x\n", vi->v_flags );
-            wxLogDebug( "       - v_length %d\n", vi->v_length );
+            wxLogDebug( "       - v_type %x", vi->v_type );
+            wxLogDebug( "       - v_flags %x", vi->v_flags );
+            wxLogDebug( "       - v_length %d", vi->v_length );
         }
     }
 }
@@ -203,8 +201,6 @@ int NGSPICE::cbSendChar( char* what, int id, void* user )
 {
     NGSPICE* sim = reinterpret_cast<NGSPICE*>( user );
 
-    wxLogDebug( "sim %p cr %p\n", sim, sim->m_consoleReporter );
-
     if( sim->m_consoleReporter )
         sim->m_consoleReporter->Report( what );
 
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 2bac6162be..eb53800fcc 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -28,8 +28,6 @@ static SIM_PLOT_PANEL* panel = NULL;
 
 static int drawPlotFunc( mglGraph* aGraph )
 {
-    printf( "DrawPlot [%lu traces]!\n", panel->m_traces.size() );
-
     aGraph->Clf();
     //aGraph->SetRanges(-10e-3,10e-3,-2,2);
     aGraph->Axis( "x" );

From 112cf074f679bc0266269d01a01bb9dc37ea3251 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:11 +0200
Subject: [PATCH 018/197] Heuristics to correct passive component values

---
 .../netlist_exporter_pspice.cpp               | 42 ++++++++++++++++---
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 756542f75d..0d66e704ba 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -23,6 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include "netlist_exporter_pspice.h"
 #include <fctsys.h>
 #include <build_version.h>
 #include <confirm.h>
@@ -34,8 +35,9 @@
 #include <netlist.h>
 #include <sch_reference_list.h>
 #include <class_netlist_object.h>
+
 #include <wx/tokenzr.h>
-#include "netlist_exporter_pspice.h"
+#include <wx/regex.h>
 
 bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions )
 {
@@ -316,18 +318,48 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
 {
     if( aField == "Spice_Primitive" )
     {
-        wxString RefName = aComponent->GetField( REFERENCE )->GetText();
+        const wxString& refName = aComponent->GetField( REFERENCE )->GetText();
 
         // Convert ICs to subcircuits
-        if( RefName.StartsWith( "IC" ) || RefName.StartsWith( "U" ) )
+        if( refName.StartsWith( "IC" ) || refName.StartsWith( "U" ) )
             return wxString( "X" );
         else
-            return RefName.GetChar( 0 );
+            return refName.GetChar( 0 );
     }
 
     if( aField == "Spice_Model" )
     {
-        return aComponent->GetField( VALUE )->GetText();
+        wxChar prim = aComponent->GetField( REFERENCE )->GetText().GetChar( 0 );
+        wxString value = aComponent->GetField( VALUE )->GetText();
+
+        // Is it a passive component?
+        if( prim == 'C' || prim == 'L' || prim == 'R' )
+        {
+            // Regular expression to match common formats used for passive parts description
+            // (e.g. 100k, 2k3, 1 uF)
+            wxRegEx passiveVal( "^([0-9\\. ]+)([fFpPnNuUmMkKgGtT]|M(e|E)(g|G))?([fFhH]|ohm)?([-1-9 ]*)$" );
+
+            if( passiveVal.Matches( value ) )
+            {
+                wxString prefix( passiveVal.GetMatch( value, 1 ) );
+                wxString unit( passiveVal.GetMatch( value, 2 ) );
+                wxString suffix( passiveVal.GetMatch( value, 6 ) );
+
+                prefix.Trim(); prefix.Trim( false );
+                unit.Trim(); unit.Trim( false );
+                suffix.Trim(); suffix.Trim( false );
+
+                // Make 'mega' units comply with the Spice expectations
+                if( unit == "M" )
+                    unit = "Meg";
+
+                wxLogDebug( "Changed passive value: %s..", value );
+                value = prefix + unit + suffix;
+                wxLogDebug( "..to: %s", value );
+            }
+        }
+
+        return value;
     }
 
     if( aField == "Spice_Netlist_Enabled" )

From aa3e251cdd9456088be0f534ddf000a80fc21789 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:11 +0200
Subject: [PATCH 019/197] Sim plots get consecutive numbers

---
 eeschema/sim/sim_plot_frame.cpp | 5 ++---
 eeschema/sim/sim_plot_frame.h   | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index f124c9bc7d..e55876e5d6 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -98,7 +98,6 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
 {
     m_exporter = NULL;
     m_simulator = NULL;
-    m_currentPlot = NULL;
     m_pyConsole = NULL;
     m_simThread = NULL;
 
@@ -197,8 +196,8 @@ void SIM_PLOT_FRAME::StopSimulation()
 void SIM_PLOT_FRAME::NewPlot()
 {
     SIM_PLOT_PANEL* plot = new SIM_PLOT_PANEL( this, wxID_ANY );
-    m_plotNotebook->AddPage( plot, wxT( "Plot1" ), true );
-    m_currentPlot = plot;
+    m_plotNotebook->AddPage( plot,
+            wxString::Format( wxT( "Plot%lu" ), m_plotNotebook->GetPageCount() + 1 ), true );
 }
 
 
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 5eb2ea260c..d3a12f6706 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -69,7 +69,6 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         virtual void onSimReport( wxThreadEvent& aEvent );
         virtual void onSimFinished( wxThreadEvent& aEvent );
 
-        SIM_PLOT_PANEL* m_currentPlot;
         SCH_EDIT_FRAME* m_schematicFrame;
         NETLIST_EXPORTER_PSPICE* m_exporter;
         SPICE_SIMULATOR* m_simulator;

From ac17165947694828ab1ba3e80d38be4a28d42ca8 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:11 +0200
Subject: [PATCH 020/197] Initial version of simulator probe tool

---
 eeschema/onleftclick.cpp        | 29 +++++++++++++++++++++++++++++
 eeschema/schedit.cpp            |  4 ++++
 eeschema/schframe.cpp           |  2 +-
 eeschema/schframe.h             |  1 -
 eeschema/sim/ngspice.cpp        |  4 +++-
 eeschema/sim/sim_plot_frame.cpp | 33 ++++++++++++++++++++++++++++++---
 eeschema/sim/sim_plot_frame.h   |  4 +---
 eeschema/sim/simulate.cpp       |  5 -----
 8 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/eeschema/onleftclick.cpp b/eeschema/onleftclick.cpp
index 1f4f760ca1..114b2266e3 100644
--- a/eeschema/onleftclick.cpp
+++ b/eeschema/onleftclick.cpp
@@ -28,9 +28,11 @@
  */
 
 #include <fctsys.h>
+#include <kiway.h>
 #include <eeschema_id.h>
 #include <class_drawpanel.h>
 #include <schframe.h>
+#include <sim/sim_plot_frame.h>
 #include <menus_helpers.h>
 
 #include <sch_bus_entry.h>
@@ -43,6 +45,8 @@
 #include <sch_sheet.h>
 #include <sch_sheet_path.h>
 #include <sch_bitmap.h>
+
+#include <class_netlist_object.h>
 #include <class_library.h>      // fo class SCHLIB_FILTER to filter power parts
 
 
@@ -321,6 +325,31 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
         }
         break;
 
+    case ID_SIM_ADD_PROBE:
+        {
+            const KICAD_T wiresAndComponents[] = { SCH_LINE_T, SCH_COMPONENT_T, SCH_SHEET_PIN_T };
+            item = LocateAndShowItem( aPosition, wiresAndComponents );
+
+            if( !item )
+                break;
+
+            NETLIST_OBJECT_LIST* netlist = BuildNetListBase();
+
+            for( NETLIST_OBJECT* obj : *netlist )
+            {
+                if( obj->m_Comp == item )
+                {
+                    SIM_PLOT_FRAME* simFrame = (SIM_PLOT_FRAME*) Kiway().Player( FRAME_SIMULATOR, false );
+
+                    if( simFrame )
+                        simFrame->AddVoltagePlot( obj->GetNetName() );
+
+                    break;
+                }
+            }
+        }
+        break;
+
     default:
         SetToolID( ID_NO_TOOL_SELECTED, m_canvas->GetDefaultCursor(), wxEmptyString );
         wxFAIL_MSG( wxT( "SCH_EDIT_FRAME::OnLeftClick invalid tool ID <" ) +
diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp
index 059dbf2b7a..0784edc47e 100644
--- a/eeschema/schedit.cpp
+++ b/eeschema/schedit.cpp
@@ -609,6 +609,10 @@ void SCH_EDIT_FRAME::OnSelectTool( wxCommandEvent& aEvent )
         SetToolID( id, wxCURSOR_BULLSEYE, _( "Delete item" ) );
         break;
 
+    case ID_SIM_ADD_PROBE:
+        SetToolID( id, wxCURSOR_BULLSEYE, _( "Add a simulator probe" ) );
+        break;
+
     default:
         SetRepeatItem( NULL );
     }
diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp
index 079d2c0654..eb46bda90b 100644
--- a/eeschema/schframe.cpp
+++ b/eeschema/schframe.cpp
@@ -266,7 +266,6 @@ BEGIN_EVENT_TABLE( SCH_EDIT_FRAME, EDA_DRAW_FRAME )
     EVT_TOOL( ID_UPDATE_PCB_FROM_SCH, SCH_EDIT_FRAME::OnUpdatePCB )
     EVT_TOOL( ID_SIM_RUN, SCH_EDIT_FRAME::OnSimulationRun )
     EVT_TOOL( ID_SIM_STOP, SCH_EDIT_FRAME::OnSimulationStop )
-    EVT_TOOL( ID_SIM_ADD_PROBE, SCH_EDIT_FRAME::OnSimulationAddProbe )
     EVT_TOOL( ID_GET_TOOLS, SCH_EDIT_FRAME::OnCreateBillOfMaterials )
     EVT_TOOL( ID_FIND_ITEMS, SCH_EDIT_FRAME::OnFindItems )
     EVT_TOOL( wxID_REPLACE, SCH_EDIT_FRAME::OnFindItems )
@@ -282,6 +281,7 @@ BEGIN_EVENT_TABLE( SCH_EDIT_FRAME, EDA_DRAW_FRAME )
     EVT_TOOL( ID_ZOOM_SELECTION, SCH_EDIT_FRAME::OnSelectTool )
     EVT_TOOL_RANGE( ID_SCHEMATIC_VERTICAL_TOOLBAR_START, ID_SCHEMATIC_VERTICAL_TOOLBAR_END,
                     SCH_EDIT_FRAME::OnSelectTool )
+    EVT_TOOL( ID_SIM_ADD_PROBE, SCH_EDIT_FRAME::OnSelectTool )
 
     EVT_MENU( ID_CANCEL_CURRENT_COMMAND, SCH_EDIT_FRAME::OnCancelCurrentCommand )
     EVT_MENU( ID_SCH_DRAG_ITEM, SCH_EDIT_FRAME::OnDragItem )
diff --git a/eeschema/schframe.h b/eeschema/schframe.h
index 0cac05e445..61a909bd7a 100644
--- a/eeschema/schframe.h
+++ b/eeschema/schframe.h
@@ -815,7 +815,6 @@ private:
     void OnUpdatePCB( wxCommandEvent& event );
     void OnSimulationRun( wxCommandEvent& event );
     void OnSimulationStop( wxCommandEvent& event );
-    void OnSimulationAddProbe( wxCommandEvent& event );
     void OnCreateBillOfMaterials( wxCommandEvent& event );
     void OnFindItems( wxCommandEvent& event );
     void OnFindDialogClose( wxFindDialogEvent& event );
diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index a927db5d93..06ddc6883b 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -67,8 +67,10 @@ const vector<double> NGSPICE::GetPlot( const string& aName, int aMaxLen )
 
     vector_info* vi = m_ngGet_Vec_Info( (char*) aName.c_str() );
 
-    if( vi->v_realdata )
+    if( vi && vi->v_realdata )
     {
+        data.reserve( vi->v_length );
+
         for( int i = 0; i < vi->v_length; i++ )
             data.push_back( vi->v_realdata[i] );
     }
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index e55876e5d6..94c219b56d 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -98,7 +98,6 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
 {
     m_exporter = NULL;
     m_simulator = NULL;
-    m_pyConsole = NULL;
     m_simThread = NULL;
 
     Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SIM_PLOT_FRAME::onClose ), NULL, this );
@@ -126,6 +125,7 @@ void SIM_PLOT_FRAME::StartSimulation()
 
     m_simConsole->Clear();
 
+    /// @todo is it necessary to recreate simulator every time?
     m_simulator = SPICE_SIMULATOR::CreateInstance( "ngspice" );
     m_simulator->SetConsoleReporter( new SIM_THREAD_REPORTER( this ) );
     m_simulator->Init();
@@ -201,6 +201,32 @@ void SIM_PLOT_FRAME::NewPlot()
 }
 
 
+void SIM_PLOT_FRAME::AddVoltagePlot( const wxString& aNetName )
+{
+    if( !m_exporter )
+        return;
+
+    const auto& netMapping = m_exporter->GetNetIndexMap();
+
+    if( netMapping.count( aNetName ) == 0 )
+        return;
+
+    wxString spiceName( wxString::Format( "V(%d)", netMapping.at( aNetName ) ) );
+    auto data_y = m_simulator->GetPlot( (const char*) spiceName.c_str() );
+
+    wxLogDebug( "probe %s", spiceName );
+
+    if( data_y.empty() )
+        return;
+
+    auto data_t = m_simulator->GetPlot( "time" );
+
+    wxLogDebug( "%lu - %lu data points", data_t.size(), data_y.size() );
+    SIM_PLOT_PANEL* plotPanel = static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetCurrentPage() );
+    plotPanel->AddTrace( aNetName, data_t.size(), data_t.data(), data_y.data(), 0 );
+}
+
+
 void SIM_PLOT_FRAME::onClose( wxCloseEvent& aEvent )
 {
     {
@@ -258,8 +284,8 @@ void SIM_PLOT_FRAME::onSimFinished( wxThreadEvent& aEvent )
             m_signals->Append( net.first );
     }
 
-    //    auto data_t = m_simulator->GetPlot( "time" );
-
+// TODO remove?
+#if 0
     for( auto& name : m_exporter->GetProbeList() )
     {
         char spiceName[1024];
@@ -271,4 +297,5 @@ void SIM_PLOT_FRAME::onSimFinished( wxThreadEvent& aEvent )
         //wxLogDebug( "%d - %d data points\n", data_t.size(), data_y.size() );
         //    m_plotPanel->AddTrace(wxT("V(") + name + wxT(")"), data_t.size(), data_t.data(), data_y.data(), 0);
     }
+#endif
 }
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index d3a12f6706..79b8c91dc6 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -60,8 +60,7 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void StopSimulation();
 
         void NewPlot();
-
-        void TogglePythonConsole();
+        void AddVoltagePlot( const wxString& aNetName );
 
     private:
         virtual void onClose( wxCloseEvent& aEvent );
@@ -72,7 +71,6 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         SCH_EDIT_FRAME* m_schematicFrame;
         NETLIST_EXPORTER_PSPICE* m_exporter;
         SPICE_SIMULATOR* m_simulator;
-        wxWindow* m_pyConsole;
         SIM_THREAD* m_simThread;
         wxCriticalSection m_simThreadCS;
 
diff --git a/eeschema/sim/simulate.cpp b/eeschema/sim/simulate.cpp
index c499061827..0880bce572 100644
--- a/eeschema/sim/simulate.cpp
+++ b/eeschema/sim/simulate.cpp
@@ -50,8 +50,3 @@ void SCH_EDIT_FRAME::OnSimulationRun( wxCommandEvent& event )
 void SCH_EDIT_FRAME::OnSimulationStop( wxCommandEvent& event )
 {
 }
-
-
-void SCH_EDIT_FRAME::OnSimulationAddProbe( wxCommandEvent& event )
-{
-}

From ae5424c44a7492f5c1fedd00a5d83ef64c7a92cf Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:12 +0200
Subject: [PATCH 021/197] Probe cursor (TODO: has to be discussed)

---
 eeschema/schedit.cpp      |  3 ++-
 eeschema/schframe.h       |  2 ++
 eeschema/sim/simulate.cpp | 29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp
index 0784edc47e..aa9615a9f1 100644
--- a/eeschema/schedit.cpp
+++ b/eeschema/schedit.cpp
@@ -610,7 +610,8 @@ void SCH_EDIT_FRAME::OnSelectTool( wxCommandEvent& aEvent )
         break;
 
     case ID_SIM_ADD_PROBE:
-        SetToolID( id, wxCURSOR_BULLSEYE, _( "Add a simulator probe" ) );
+        SetToolID( id, -1, _( "Add a simulator probe" ) );
+        m_canvas->SetCursor( CURSOR_PROBE );
         break;
 
     default:
diff --git a/eeschema/schframe.h b/eeschema/schframe.h
index 61a909bd7a..1cdec7b898 100644
--- a/eeschema/schframe.h
+++ b/eeschema/schframe.h
@@ -1382,6 +1382,8 @@ public:
 
     wxString GetNetListerCommand() const { return m_netListerCommand; }
 
+    const static wxCursor CURSOR_PROBE;
+
     DECLARE_EVENT_TABLE()
 };
 
diff --git a/eeschema/sim/simulate.cpp b/eeschema/sim/simulate.cpp
index 0880bce572..43965ae25d 100644
--- a/eeschema/sim/simulate.cpp
+++ b/eeschema/sim/simulate.cpp
@@ -50,3 +50,32 @@ void SCH_EDIT_FRAME::OnSimulationRun( wxCommandEvent& event )
 void SCH_EDIT_FRAME::OnSimulationStop( wxCommandEvent& event )
 {
 }
+
+
+static const unsigned char cursor_probe[] = {
+   0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x70,
+   0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04,
+   0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x20, 0x04,
+   0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x84, 0x00,
+   0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x80, 0x10, 0x00,
+   0x00, 0x40, 0x08, 0x00, 0x00, 0x20, 0x04, 0x00, 0x00, 0x10, 0x02, 0x00,
+   0x00, 0x08, 0x01, 0x00, 0x80, 0x85, 0x00, 0x00, 0x40, 0x42, 0x00, 0x00,
+   0x20, 0x21, 0x00, 0x00, 0x20, 0x11, 0x00, 0x00, 0x20, 0x09, 0x00, 0x00,
+   0x20, 0x16, 0x00, 0x00, 0x50, 0x10, 0x00, 0x00, 0x88, 0x08, 0x00, 0x00,
+   0x44, 0x07, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
+   0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 };
+
+static const unsigned char cursor_probe_mask[] {
+   0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x70,
+   0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04,
+   0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0xc0, 0x07, 0x00, 0x00, 0xe0, 0x07,
+   0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0xfc, 0x00,
+   0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x80, 0x1f, 0x00,
+   0x00, 0xc0, 0x0f, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 0xf0, 0x03, 0x00,
+   0x00, 0xf8, 0x01, 0x00, 0x80, 0xfd, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00,
+   0xe0, 0x3f, 0x00, 0x00, 0xe0, 0x1f, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00,
+   0xe0, 0x1f, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00, 0xf8, 0x0f, 0x00, 0x00,
+   0x7c, 0x07, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
+   0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 };
+
+const wxCursor SCH_EDIT_FRAME::CURSOR_PROBE( (const char*) cursor_probe, 31, 32, 0, 31, (const char*) cursor_probe_mask );

From 91d1f7135b75c71c97b7fa076515201cc77138cc Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:12 +0200
Subject: [PATCH 022/197] SIM_PLOT_PAINTER class

---
 eeschema/sim/sim_plot_panel.cpp | 70 ++++++++++++++++-----------------
 eeschema/sim/sim_plot_panel.h   | 27 ++++++++++++-
 2 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index eb53800fcc..c1c0888c3d 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -24,45 +24,12 @@
 
 #include "sim_plot_panel.h"
 
-static SIM_PLOT_PANEL* panel = NULL;
-
-static int drawPlotFunc( mglGraph* aGraph )
-{
-    aGraph->Clf();
-    //aGraph->SetRanges(-10e-3,10e-3,-2,2);
-    aGraph->Axis( "x" );
-    aGraph->Label( 'x', "Time", 0 );
-    aGraph->SetRange( 'x', 0, 10e-3 );
-
-    aGraph->Axis( "y" );
-    aGraph->Label( 'y', "Voltage", 0 );
-    aGraph->SetRange( 'y', -1.5, 1.5 );
-
-    for( auto t : panel->m_traces )
-    {
-        aGraph->AddLegend( (const char*) t.name.c_str(), "" );
-        aGraph->Plot( t.y );
-    }
-
-    aGraph->Box();
-    aGraph->Grid();
-
-    if( panel->m_traces.size() )
-        aGraph->Legend( 1, "-#" );
-
-    return 0;
-}
-
-
 SIM_PLOT_PANEL::SIM_PLOT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint& pos,
                 const wxSize& size, long style, const wxString& name )
-    : wxMathGL( parent, id, pos, size, style, name )
+    : wxMathGL( parent, id, pos, size, style, name ), m_painter( this )
 {
-    panel = this;
-
     AutoResize = true;
-    SetDraw( drawPlotFunc );
-//    Update();
+    SetDraw( &m_painter );
 }
 
 
@@ -90,3 +57,36 @@ void SIM_PLOT_PANEL::DeleteTraces()
     m_traces.clear();
     Update();
 }
+
+
+int SIM_PLOT_PAINTER::Draw( mglGraph* aGraph )
+{
+    const std::vector<SIM_PLOT_PANEL::TRACE>& traces = m_parent->m_traces;
+
+    aGraph->Clf();
+
+    //aGraph->SetRanges(-10e-3,10e-3,-2,2);
+    aGraph->Axis( "x" );
+    aGraph->Label( 'x', "Time", 0 );
+    //aGraph->SetRange( 'x', 0, 10e-3 );
+
+    aGraph->Axis( "y" );
+    aGraph->Label( 'y', "Voltage", 0 );
+    //aGraph->SetRange( 'y', -1.5, 1.5 );
+
+    for( auto t : traces )
+    {
+        aGraph->AddLegend( (const char*) t.name.c_str(), "" );
+        aGraph->Plot( t.y );
+    }
+
+    aGraph->Box();
+    aGraph->Grid();
+
+    if( traces.size() )
+        aGraph->Legend( 1, "-#" );
+
+    aGraph->SetAutoRanges( 0, 0, 0, 0 );
+
+    return 0;
+}
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index cb5424367a..f39f50e184 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -25,9 +25,31 @@
 #ifndef __SIM_PLOT_PANEL_H
 #define __SIM_PLOT_PANEL_H
 
-#include "mgl2/canvas_wnd.h"
 #include "mgl2/wx.h"
 
+class SIM_PLOT_PANEL;
+
+class SIM_PLOT_PAINTER : public mglDraw
+{
+public:
+    SIM_PLOT_PAINTER( SIM_PLOT_PANEL* aParent )
+        : m_parent( aParent )
+    {
+    }
+
+    ~SIM_PLOT_PAINTER()
+    {
+    }
+
+    //void Click() override;
+
+    int Draw( mglGraph* aGraph ) override;
+
+private:
+    SIM_PLOT_PANEL* m_parent;
+};
+
+
 class SIM_PLOT_PANEL : public wxMathGL
 {
 public:
@@ -45,6 +67,9 @@ public:
 
     void AddTrace( const wxString& name, int n_points, double *t, double *x, int flags = 0 );
     void DeleteTraces();
+
+private:
+    SIM_PLOT_PAINTER m_painter;
 };
 
 #endif

From 0261a0e59c206f5c9473ac186e81098f695ecf3c Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:14 +0200
Subject: [PATCH 023/197] Axis autorange

---
 eeschema/sim/sim_plot_panel.cpp | 92 +++++++++++++++++++++++++++------
 eeschema/sim/sim_plot_panel.h   | 16 ++++--
 2 files changed, 88 insertions(+), 20 deletions(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index c1c0888c3d..2b0418bba3 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -24,11 +24,14 @@
 
 #include "sim_plot_panel.h"
 
+#include <limits>
+
 SIM_PLOT_PANEL::SIM_PLOT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint& pos,
                 const wxSize& size, long style, const wxString& name )
     : wxMathGL( parent, id, pos, size, style, name ), m_painter( this )
 {
     AutoResize = true;
+    resetRanges();
     SetDraw( &m_painter );
 }
 
@@ -38,16 +41,46 @@ SIM_PLOT_PANEL::~SIM_PLOT_PANEL()
 }
 
 
+template<typename T>
+static std::pair<T, T> find_minmax( const T* aArray, unsigned int aSize )
+{
+    std::pair<T, T> result( std::numeric_limits<T>::max(), std::numeric_limits<T>::min() );
+    const T* ptr = aArray;
+
+    for( unsigned int i = 0; i < aSize; ++i )
+    {
+        if( *ptr < result.first )
+            result.first = *ptr;
+
+        if( *ptr > result.second )
+            result.second = *ptr;
+
+        ++ptr;
+    }
+
+    return result;
+}
+
+
 void SIM_PLOT_PANEL::AddTrace( const wxString& aName, int aPoints,
-                                double* aT, double* aX, int aFlags )
+                                double* aT, double* aY, int aFlags )
 {
     TRACE trace;
 
     trace.name = aName;
     trace.x.Set( aT, aPoints );
-    trace.y.Set( aX, aPoints );
-
+    trace.y.Set( aY, aPoints );
     m_traces.push_back( trace );
+
+    // Update axis ranges
+    std::pair<double, double> traceRangeT = find_minmax( aT, aPoints );
+    m_axisRangeX.first = std::min( traceRangeT.first, m_axisRangeX.first );
+    m_axisRangeX.second = std::max( traceRangeT.second, m_axisRangeX.second );
+
+    std::pair<double, double> traceRangeY = find_minmax( aY, aPoints );
+    m_axisRangeY.first = std::min( traceRangeY.first, m_axisRangeY.first );
+    m_axisRangeY.second = std::max( traceRangeY.second, m_axisRangeY.second );
+
     Update();
 }
 
@@ -55,38 +88,65 @@ void SIM_PLOT_PANEL::AddTrace( const wxString& aName, int aPoints,
 void SIM_PLOT_PANEL::DeleteTraces()
 {
     m_traces.clear();
+    resetRanges();
     Update();
 }
 
 
+void SIM_PLOT_PANEL::resetRanges()
+{
+    // Set ranges to inverted values, so when there is a new plot added, it will
+    // overridden with correct values
+    m_axisRangeX.first = std::numeric_limits<double>::max();
+    m_axisRangeX.second = std::numeric_limits<double>::min();
+    m_axisRangeY.first = std::numeric_limits<double>::max();
+    m_axisRangeY.second = std::numeric_limits<double>::min();
+}
+
+
 int SIM_PLOT_PAINTER::Draw( mglGraph* aGraph )
 {
     const std::vector<SIM_PLOT_PANEL::TRACE>& traces = m_parent->m_traces;
+    const std::pair<double, double>& axisRangeX = m_parent->m_axisRangeX;
+    std::pair<double, double> axisRangeY = m_parent->m_axisRangeY;
 
     aGraph->Clf();
 
-    //aGraph->SetRanges(-10e-3,10e-3,-2,2);
-    aGraph->Axis( "x" );
-    aGraph->Label( 'x', "Time", 0 );
-    //aGraph->SetRange( 'x', 0, 10e-3 );
+    // Axis settings
+    // Use autorange values if possible
+    if( axisRangeX.first < axisRangeX.second )
+        aGraph->SetRange( 'x', axisRangeX.first, axisRangeX.second );
+    else
+        aGraph->SetRange( 'x', 0, 1 );
 
-    aGraph->Axis( "y" );
-    aGraph->Label( 'y', "Voltage", 0 );
-    //aGraph->SetRange( 'y', -1.5, 1.5 );
-
-    for( auto t : traces )
+    if( axisRangeY.first < axisRangeY.second )
     {
-        aGraph->AddLegend( (const char*) t.name.c_str(), "" );
-        aGraph->Plot( t.y );
+        // Increase the Y axis range, so it is easy to read the extreme values
+        axisRangeY.first -= axisRangeY.second * 0.1;
+        axisRangeY.second += axisRangeY.second * 0.1;
+        aGraph->SetRange( 'y', axisRangeY.first, axisRangeY.second );
     }
+    else
+    {
+        aGraph->SetRange( 'y', 0, 1 );
+    }
+
+    aGraph->Axis( "xy" );
+    aGraph->Label( 'x', "Time [s]", 0 );
+    aGraph->Label( 'y', "Voltage [V]", 0 );
 
     aGraph->Box();
     aGraph->Grid();
 
+    // Draw traces
+    for( auto t : traces )
+    {
+        aGraph->AddLegend( (const char*) t.name.c_str(), "" );
+        aGraph->Plot( t.y, "-" );
+    }
+
     if( traces.size() )
         aGraph->Legend( 1, "-#" );
 
-    aGraph->SetAutoRanges( 0, 0, 0, 0 );
-
     return 0;
 }
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index f39f50e184..3b2db15a21 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -32,7 +32,7 @@ class SIM_PLOT_PANEL;
 class SIM_PLOT_PAINTER : public mglDraw
 {
 public:
-    SIM_PLOT_PAINTER( SIM_PLOT_PANEL* aParent )
+    SIM_PLOT_PAINTER( const SIM_PLOT_PANEL* aParent )
         : m_parent( aParent )
     {
     }
@@ -46,7 +46,7 @@ public:
     int Draw( mglGraph* aGraph ) override;
 
 private:
-    SIM_PLOT_PANEL* m_parent;
+    const SIM_PLOT_PANEL* m_parent;
 };
 
 
@@ -63,13 +63,21 @@ public:
         mglData x, y;
     };
 
-    std::vector<TRACE> m_traces;
-
     void AddTrace( const wxString& name, int n_points, double *t, double *x, int flags = 0 );
     void DeleteTraces();
 
 private:
     SIM_PLOT_PAINTER m_painter;
+
+    // Traces to be plotted
+    std::vector<TRACE> m_traces;
+
+    // Axis ranges determined by the added traces data
+    std::pair<double, double> m_axisRangeX, m_axisRangeY;
+
+    void resetRanges();
+
+    friend class SIM_PLOT_PAINTER;
 };
 
 #endif

From 781a12222cfcf9b024be08700e2d4ada23ea2c4a Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:14 +0200
Subject: [PATCH 024/197] Fixed simulation plot legend

---
 eeschema/sim/sim_plot_panel.cpp | 49 +++++++++++++++++++++++++++++++--
 eeschema/sim/sim_plot_panel.h   | 10 +++++--
 2 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 2b0418bba3..aa319abfa9 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -68,6 +68,7 @@ void SIM_PLOT_PANEL::AddTrace( const wxString& aName, int aPoints,
     TRACE trace;
 
     trace.name = aName;
+    trace.style = wxString( '-' ) + m_painter.GenerateColor( SIM_PLOT_PAINTER::DARK );
     trace.x.Set( aT, aPoints );
     trace.y.Set( aY, aPoints );
     m_traces.push_back( trace );
@@ -141,12 +142,54 @@ int SIM_PLOT_PAINTER::Draw( mglGraph* aGraph )
     // Draw traces
     for( auto t : traces )
     {
-        aGraph->AddLegend( (const char*) t.name.c_str(), "" );
-        aGraph->Plot( t.y, "-" );
+        aGraph->AddLegend( (const char*) t.name.c_str(), t.style );
+        aGraph->Plot( t.y, t.style );
     }
 
     if( traces.size() )
-        aGraph->Legend( 1, "-#" );
+        aGraph->Legend( 1, "-#" );  // legend entries horizontally + draw a box around legend
 
     return 0;
 }
+
+
+wxString SIM_PLOT_PAINTER::GenerateColor( COLOR_TYPE aType )
+{
+    const char colors[] = "rgbcmylenupq";
+    const unsigned int colorsNumber = sizeof( colors ) - 1;
+
+    // Safe defaults
+    char color = 'k';       // black
+    int shade = 5;
+
+    switch( aType )
+    {
+        case LIGHT:
+            color = colors[m_lightColorIdx % colorsNumber];
+            shade = 5 + m_lightColorIdx / colorsNumber;
+            ++m_lightColorIdx;
+
+            if( shade == 10 )
+            {
+                // Reached the color limit
+                shade = 5;
+                m_lightColorIdx = 0;
+            }
+            break;
+
+        case DARK:
+            color = toupper( colors[m_darkColorIdx % colorsNumber] );
+            shade = 5 - m_darkColorIdx / colorsNumber;
+            ++m_darkColorIdx;
+
+            if( shade == 0 )
+            {
+                // Reached the color limit
+                shade = 5;
+                m_darkColorIdx = 0;
+            }
+            break;
+    }
+
+    return wxString::Format( "{%c%d}", color, shade );
+}
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 3b2db15a21..74c5f92f20 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -33,7 +33,7 @@ class SIM_PLOT_PAINTER : public mglDraw
 {
 public:
     SIM_PLOT_PAINTER( const SIM_PLOT_PANEL* aParent )
-        : m_parent( aParent )
+        : m_parent( aParent ), m_lightColorIdx( 0 ), m_darkColorIdx( 0 )
     {
     }
 
@@ -45,8 +45,14 @@ public:
 
     int Draw( mglGraph* aGraph ) override;
 
+    enum COLOR_TYPE { LIGHT, DARK };
+
+    ///> Generates a new, unique color for plotting curves
+    wxString GenerateColor( COLOR_TYPE aType );
+
 private:
     const SIM_PLOT_PANEL* m_parent;
+    int m_lightColorIdx, m_darkColorIdx;
 };
 
 
@@ -59,7 +65,7 @@ public:
     ~SIM_PLOT_PANEL();
 
     struct TRACE {
-        wxString name;
+        wxString name, style;
         mglData x, y;
     };
 

From 40224f48fb48d461984a011918a510851e258374 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:14 +0200
Subject: [PATCH 025/197] Minor simulation plot style changes

---
 eeschema/sim/sim_plot_panel.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index aa319abfa9..3f197b5125 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -109,9 +109,12 @@ int SIM_PLOT_PAINTER::Draw( mglGraph* aGraph )
 {
     const std::vector<SIM_PLOT_PANEL::TRACE>& traces = m_parent->m_traces;
     const std::pair<double, double>& axisRangeX = m_parent->m_axisRangeX;
-    std::pair<double, double> axisRangeY = m_parent->m_axisRangeY;
+    const std::pair<double, double>& axisRangeY = m_parent->m_axisRangeY;
 
     aGraph->Clf();
+    //aGraph->SetPlotFactor( 1.5 );
+    //aGraph->LoadFont( "termes" );
+    aGraph->SetFontSize( 1.5 );
 
     // Axis settings
     // Use autorange values if possible
@@ -123,9 +126,8 @@ int SIM_PLOT_PAINTER::Draw( mglGraph* aGraph )
     if( axisRangeY.first < axisRangeY.second )
     {
         // Increase the Y axis range, so it is easy to read the extreme values
-        axisRangeY.first -= axisRangeY.second * 0.1;
-        axisRangeY.second += axisRangeY.second * 0.1;
-        aGraph->SetRange( 'y', axisRangeY.first, axisRangeY.second );
+        double range = axisRangeY.second - axisRangeY.first;
+        aGraph->SetRange( 'y', axisRangeY.first - 0.1 * range, axisRangeY.second + 0.1 * range );
     }
     else
     {
@@ -147,7 +149,10 @@ int SIM_PLOT_PAINTER::Draw( mglGraph* aGraph )
     }
 
     if( traces.size() )
+    {
+        aGraph->SetFontSize( 2.5 );
         aGraph->Legend( 1, "-#" );  // legend entries horizontally + draw a box around legend
+    }
 
     return 0;
 }

From d5acd7575d1732491a455ed83476e4cefec9342f Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:15 +0200
Subject: [PATCH 026/197] Updated demo schematics for simulation

---
 demos/sim/noname.sch   | 162 -----------------------------------------
 demos/sim/sim_test.sch | 120 +++++++++++-------------------
 2 files changed, 43 insertions(+), 239 deletions(-)
 delete mode 100644 demos/sim/noname.sch

diff --git a/demos/sim/noname.sch b/demos/sim/noname.sch
deleted file mode 100644
index 2366ad21a5..0000000000
--- a/demos/sim/noname.sch
+++ /dev/null
@@ -1,162 +0,0 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:pspice
-LIBS:noname-cache
-EELAYER 25 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 1
-Title ""
-Date ""
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L VSOURCE V1
-U 1 1 57336052
-P 4400 4050
-F 0 "V1" H 4528 4096 50  0000 L CNN
-F 1 "SINE(0 1.5 1k 0 0 0 0)" H 4528 4005 50  0000 L CNN
-F 2 "" H 4400 4050 50  0000 C CNN
-F 3 "" H 4400 4050 50  0000 C CNN
-F 4 "Value" H 4400 4050 60  0001 C CNN "Fieldname"
-F 5 "V" H 4400 4050 60  0001 C CNN "Spice_Primitive"
-F 6 "1 2" H 4100 4250 60  0001 C CNN "Spice_Node_Sequence"
-	1    4400 4050
-	-1   0    0    1   
-$EndComp
-$Comp
-L GND #PWR1
-U 1 1 573360D3
-P 4400 4350
-F 0 "#PWR1" H 4400 4100 50  0001 C CNN
-F 1 "GND" H 4405 4177 50  0000 C CNN
-F 2 "" H 4400 4350 50  0000 C CNN
-F 3 "" H 4400 4350 50  0000 C CNN
-	1    4400 4350
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R1
-U 1 1 573360F5
-P 4650 3700
-F 0 "R1" V 4443 3700 50  0000 C CNN
-F 1 "1k" V 4534 3700 50  0000 C CNN
-F 2 "" V 4580 3700 50  0000 C CNN
-F 3 "" H 4650 3700 50  0000 C CNN
-F 4 "Value" H 4650 3700 60  0001 C CNN "Fieldname"
-F 5 "1 2" H 4650 3700 60  0001 C CNN "SpiceMapping"
-F 6 "R" V 4650 3700 60  0001 C CNN "Spice_Primitive"
-	1    4650 3700
-	0    1    1    0   
-$EndComp
-$Comp
-L D D1
-U 1 1 573361B8
-P 5100 3700
-F 0 "D1" H 5100 3485 50  0000 C CNN
-F 1 "1N4148" H 5100 3576 50  0000 C CNN
-F 2 "" H 5100 3700 50  0000 C CNN
-F 3 "" H 5100 3700 50  0000 C CNN
-F 4 "Value" H 5100 3700 60  0001 C CNN "Fieldname"
-F 5 "D" H 5100 3700 60  0001 C CNN "Spice_Primitive"
-F 6 "2 1" H 5100 3700 60  0001 C CNN "Spice_Node_Sequence"
-	1    5100 3700
-	-1   0    0    1   
-$EndComp
-$Comp
-L C C1
-U 1 1 5733628F
-P 5400 4000
-F 0 "C1" H 5515 4046 50  0000 L CNN
-F 1 "100n" H 5515 3955 50  0000 L CNN
-F 2 "" H 5438 3850 50  0000 C CNN
-F 3 "" H 5400 4000 50  0000 C CNN
-F 4 "Value" H 5400 4000 60  0001 C CNN "Fieldname"
-F 5 "C" H 5400 4000 60  0001 C CNN "Spice_Primitive"
-F 6 "1 2" H 5400 4000 60  0001 C CNN "SpiceMapping"
-	1    5400 4000
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R2
-U 1 1 573362F7
-P 5750 4000
-F 0 "R2" H 5680 3954 50  0000 R CNN
-F 1 "100k" H 5680 4045 50  0000 R CNN
-F 2 "" V 5680 4000 50  0000 C CNN
-F 3 "" H 5750 4000 50  0000 C CNN
-F 4 "Value" H 5750 4000 60  0001 C CNN "Fieldname"
-F 5 "1 2" H 5750 4000 60  0001 C CNN "SpiceMapping"
-F 6 "R" V 5750 4000 60  0001 C CNN "Spice_Primitive"
-	1    5750 4000
-	-1   0    0    1   
-$EndComp
-Text Notes 4300 4900 0    60   ~ 0
-.tran 1u 10m\n
-Wire Wire Line
-	4400 4350 4400 4250
-Wire Wire Line
-	4400 4300 5750 4300
-Connection ~ 4400 4300
-Wire Wire Line
-	5250 3700 5750 3700
-Wire Wire Line
-	5750 3700 5750 3850
-Wire Wire Line
-	5400 3850 5400 3700
-Connection ~ 5400 3700
-Wire Wire Line
-	5400 4300 5400 4150
-Wire Wire Line
-	5750 4300 5750 4150
-Connection ~ 5400 4300
-Wire Wire Line
-	4800 3700 4950 3700
-Connection ~ 4900 3700
-Wire Wire Line
-	4400 3850 4400 3700
-Wire Wire Line
-	4400 3700 4500 3700
-Text Notes 4300 4800 0    60   ~ 0
-.include diodes.lib\n
-Text Label 4400 3800 0    60   ~ 0
-in
-Text Label 5550 3700 0    60   ~ 0
-rect
-Text Notes 4300 5000 0    60   ~ 0
-*.ac dec 10 1 1Meg\n
-$EndSCHEMATC
diff --git a/demos/sim/sim_test.sch b/demos/sim/sim_test.sch
index 93e2cf981e..d884ed6ad4 100644
--- a/demos/sim/sim_test.sch
+++ b/demos/sim/sim_test.sch
@@ -1,71 +1,35 @@
 EESchema Schematic File Version 2
-LIBS:74xgxx
-LIBS:74xx
-LIBS:ac-dc
-LIBS:actel
-LIBS:adc-dac
-LIBS:analog_switches
-LIBS:atmel
-LIBS:audio
-LIBS:brooktre
-LIBS:cmos4000
-LIBS:cmos_ieee
-LIBS:conn
-LIBS:contrib
-LIBS:cypress
-LIBS:dc-dc
-LIBS:device
-LIBS:digital-audio
-LIBS:display
-LIBS:dsp
-LIBS:elec-unifil
-LIBS:ftdi
-LIBS:gennum
-LIBS:graphic
-LIBS:hc11
-LIBS:intel
-LIBS:interface
-LIBS:ir
-LIBS:linear
-LIBS:logo
-LIBS:memory
-LIBS:microchip
-LIBS:microchip_pic10mcu
-LIBS:microchip_pic12mcu
-LIBS:microchip_pic16mcu
-LIBS:microchip_pic18mcu
-LIBS:microchip_pic32mcu
-LIBS:microcontrollers
-LIBS:motor_drivers
-LIBS:motorola
-LIBS:msp430
-LIBS:nordicsemi
-LIBS:nxp_armmcu
-LIBS:onsemi
-LIBS:opto
-LIBS:philips
 LIBS:power
-LIBS:powerint
-LIBS:pspice
-LIBS:references
-LIBS:regul
-LIBS:relays
-LIBS:rfcom
-LIBS:sensors
-LIBS:silabs
-LIBS:siliconi
-LIBS:stm8
-LIBS:stm32
-LIBS:supertex
-LIBS:switches
-LIBS:texas
-LIBS:transf
+LIBS:device
 LIBS:transistors
-LIBS:ttl_ieee
-LIBS:valves
-LIBS:video
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
 LIBS:xilinx
-LIBS:fmc
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:pspice
+LIBS:sim_test-cache
 EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
@@ -81,11 +45,11 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L VSOURCE V?
+L VSOURCE V1
 U 1 1 57336052
 P 4400 4050
-F 0 "V?" H 4528 4096 50  0000 L CNN
-F 1 "DC 10" H 4528 4005 50  0000 L CNN
+F 0 "V1" H 4528 4096 50  0000 L CNN
+F 1 "0.2 AC 1 SIN(0 1 2)" H 4528 4005 50  0000 L CNN
 F 2 "" H 4400 4050 50  0000 C CNN
 F 3 "" H 4400 4050 50  0000 C CNN
 F 4 "Value" H 4400 4050 60  0001 C CNN "Fieldname"
@@ -95,10 +59,10 @@ F 6 "1 2" H 4100 4250 60  0001 C CNN "SpicePinMapping"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR?
+L GND #PWR1
 U 1 1 573360D3
 P 4400 4350
-F 0 "#PWR?" H 4400 4100 50  0001 C CNN
+F 0 "#PWR1" H 4400 4100 50  0001 C CNN
 F 1 "GND" H 4405 4177 50  0000 C CNN
 F 2 "" H 4400 4350 50  0000 C CNN
 F 3 "" H 4400 4350 50  0000 C CNN
@@ -111,10 +75,10 @@ Wire Wire Line
 	4400 4300 5750 4300
 Connection ~ 4400 4300
 $Comp
-L R R?
+L R R1
 U 1 1 573360F5
 P 4650 3700
-F 0 "R?" V 4443 3700 50  0000 C CNN
+F 0 "R1" V 4443 3700 50  0000 C CNN
 F 1 "10k" V 4534 3700 50  0000 C CNN
 F 2 "" V 4580 3700 50  0000 C CNN
 F 3 "" H 4650 3700 50  0000 C CNN
@@ -130,10 +94,10 @@ Wire Wire Line
 Wire Wire Line
 	4800 3700 4950 3700
 $Comp
-L D D?
+L D D1
 U 1 1 573361B8
 P 5100 3700
-F 0 "D?" H 5100 3485 50  0000 C CNN
+F 0 "D1" H 5100 3485 50  0000 C CNN
 F 1 "1N4148" H 5100 3576 50  0000 C CNN
 F 2 "" H 5100 3700 50  0000 C CNN
 F 3 "" H 5100 3700 50  0000 C CNN
@@ -143,10 +107,10 @@ F 5 "1 2" H 5100 3700 60  0001 C CNN "SpiceMapping"
 	-1   0    0    1   
 $EndComp
 $Comp
-L C C?
+L C C1
 U 1 1 5733628F
 P 5400 4000
-F 0 "C?" H 5515 4046 50  0000 L CNN
+F 0 "C1" H 5515 4046 50  0000 L CNN
 F 1 "100n" H 5515 3955 50  0000 L CNN
 F 2 "" H 5438 3850 50  0000 C CNN
 F 3 "" H 5400 4000 50  0000 C CNN
@@ -156,10 +120,10 @@ F 5 "1 2" H 5400 4000 60  0001 C CNN "SpiceMapping"
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R?
+L R R2
 U 1 1 573362F7
 P 5750 4000
-F 0 "R?" H 5680 3954 50  0000 R CNN
+F 0 "R2" H 5680 3954 50  0000 R CNN
 F 1 "100k" H 5680 4045 50  0000 R CNN
 F 2 "" V 5680 4000 50  0000 C CNN
 F 3 "" H 5750 4000 50  0000 C CNN
@@ -180,4 +144,6 @@ Wire Wire Line
 Wire Wire Line
 	5750 4300 5750 4150
 Connection ~ 5400 4300
+Text Notes 4500 3200 0    60   ~ 0
+.include diodes.lib\n.tran 1m 1000m 1m 10m
 $EndSCHEMATC

From 549a96da0b75da00cbca5fb98e902b86d16b2a42 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:15 +0200
Subject: [PATCH 027/197] License for KIWAY_HOLDER

---
 common/kiway_holder.cpp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/common/kiway_holder.cpp b/common/kiway_holder.cpp
index a0a2dcfe76..000f39145b 100644
--- a/common/kiway_holder.cpp
+++ b/common/kiway_holder.cpp
@@ -1,4 +1,28 @@
 
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2014 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
+ * Copyright (C) 2016 KiCad Developers, see CHANGELOG.TXT for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
 #include <kiway.h>
 #include <kiway_player.h>
 

From 2b1d2d7bd15e63ac2550430b3daf5f3a05cb1982 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:15 +0200
Subject: [PATCH 028/197] Fixed Kiway problems in SIM_PLOT_FRAME

---
 eeschema/eeschema.cpp           | 2 +-
 eeschema/sim/sim_plot_frame.cpp | 4 +++-
 eeschema/sim/simulate.cpp       | 9 ++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp
index 208a49dd52..378c51fb75 100644
--- a/eeschema/eeschema.cpp
+++ b/eeschema/eeschema.cpp
@@ -97,7 +97,7 @@ static struct IFACE : public KIFACE_I
 
         case FRAME_SIMULATOR:
             {
-                SIM_PLOT_FRAME_BASE* frame = new SIM_PLOT_FRAME( aKiway, aParent );
+                SIM_PLOT_FRAME* frame = new SIM_PLOT_FRAME( aKiway, aParent );
                 return frame;
             }
             break;
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 94c219b56d..67b9619299 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -94,8 +94,10 @@ private:
 
 
 SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
-    : SIM_PLOT_FRAME_BASE( aKiway, aParent )
+    : SIM_PLOT_FRAME_BASE( aParent )
 {
+    SetKiway( this, aKiway );
+
     m_exporter = NULL;
     m_simulator = NULL;
     m_simThread = NULL;
diff --git a/eeschema/sim/simulate.cpp b/eeschema/sim/simulate.cpp
index 43965ae25d..efd5e316f4 100644
--- a/eeschema/sim/simulate.cpp
+++ b/eeschema/sim/simulate.cpp
@@ -28,13 +28,8 @@
 
 void SCH_EDIT_FRAME::OnSimulationRun( wxCommandEvent& event )
 {
-    SIM_PLOT_FRAME* simFrame = (SIM_PLOT_FRAME*) Kiway().Player( FRAME_SIMULATOR, false );
-
-    if( !simFrame )
-    {
-        simFrame = (SIM_PLOT_FRAME*) Kiway().Player( FRAME_SIMULATOR, true );
-        simFrame->Show( true );
-    }
+    SIM_PLOT_FRAME* simFrame = (SIM_PLOT_FRAME*) Kiway().Player( FRAME_SIMULATOR, true );
+    simFrame->Show( true );
 
     // On Windows, Raise() does not bring the window on screen, when iconized
     if( simFrame->IsIconized() )

From 751a3355038729524b6a754ea337253772fc2049 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:16 +0200
Subject: [PATCH 029/197] Minor SIM_PLOT_FRAME redesign

---
 eeschema/sim/sim_plot_frame_base.cpp |   86 +-
 eeschema/sim/sim_plot_frame_base.fbp | 2241 +++++++++++++-------------
 eeschema/sim/sim_plot_frame_base.h   |   31 +-
 3 files changed, 1138 insertions(+), 1220 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index 5abf5aa814..6eb3b205e7 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -9,76 +9,65 @@
 
 ///////////////////////////////////////////////////////////////////////////
 
-SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( KIWAY* aKiway, wxWindow* aParent ) :
-    KIWAY_PLAYER( aKiway, aParent, FRAME_SIMULATOR, _( "Spice Simulation" ),
-           wxDefaultPosition, wxDefaultSize, KICAD_DEFAULT_DRAWFRAME_STYLE, wxT("Spice Simulation" ) )
-
+SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : KIWAY_PLAYER( parent, id, title, pos, size, style, name )
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 	
 	m_menubar1 = new wxMenuBar( 0 );
 	m_menu1 = new wxMenu();
 	wxMenuItem* m_menuItem7;
-	m_menuItem7 = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("New Plot") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuItem7 = new wxMenuItem( m_menu1, wxID_ANY, wxString( _("New Plot") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menu1->Append( m_menuItem7 );
 	
 	m_menu1->AppendSeparator();
 	
 	wxMenuItem* m_menuItem8;
-	m_menuItem8 = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("Open Workbook") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuItem8 = new wxMenuItem( m_menu1, wxID_ANY, wxString( _("Open Workbook") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menu1->Append( m_menuItem8 );
 	
 	wxMenuItem* m_menuItem2;
-	m_menuItem2 = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("Save Workbook") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuItem2 = new wxMenuItem( m_menu1, wxID_ANY, wxString( _("Save Workbook") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menu1->Append( m_menuItem2 );
 	
 	m_menu1->AppendSeparator();
 	
 	wxMenuItem* m_menuItem1;
-	m_menuItem1 = new wxMenuItem( m_menu1, wxID_ANY, wxString( wxT("Exit Simulation") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuItem1 = new wxMenuItem( m_menu1, wxID_ANY, wxString( _("Exit Simulation") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menu1->Append( m_menuItem1 );
 	
-	m_menubar1->Append( m_menu1, wxT("File") ); 
+	m_menubar1->Append( m_menu1, _("File") ); 
 	
 	m_menu2 = new wxMenu();
 	wxMenuItem* m_menuItem3;
-	m_menuItem3 = new wxMenuItem( m_menu2, wxID_ANY, wxString( wxT("Zoom In") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuItem3 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _("Zoom In") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menu2->Append( m_menuItem3 );
 	
 	wxMenuItem* m_menuItem4;
-	m_menuItem4 = new wxMenuItem( m_menu2, wxID_ANY, wxString( wxT("Zoom Out") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuItem4 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _("Zoom Out") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menu2->Append( m_menuItem4 );
 	
 	wxMenuItem* m_menuItem5;
-	m_menuItem5 = new wxMenuItem( m_menu2, wxID_ANY, wxString( wxT("Fit on Screen") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuItem5 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _("Fit on Screen") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menu2->Append( m_menuItem5 );
 	
 	m_menu2->AppendSeparator();
 	
 	wxMenuItem* m_menuItem6;
-	m_menuItem6 = new wxMenuItem( m_menu2, wxID_ANY, wxString( wxT("Show grid") ) , wxEmptyString, wxITEM_CHECK );
+	m_menuItem6 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _("Show grid") ) , wxEmptyString, wxITEM_CHECK );
 	m_menu2->Append( m_menuItem6 );
 	
-	m_menubar1->Append( m_menu2, wxT("View") ); 
+	m_menubar1->Append( m_menu2, _("View") ); 
 	
 	this->SetMenuBar( m_menubar1 );
 	
 	wxBoxSizer* bSizer1;
 	bSizer1 = new wxBoxSizer( wxVERTICAL );
 	
-	m_splitter1 = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_BORDER );
-	m_splitter1->SetSashGravity( 0.2 );
-	m_splitter1->SetSashSize( 0 );
-	m_splitter1->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitter1OnIdle ), NULL, this );
-	
-	m_panel31 = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer5;
-	bSizer5 = new wxBoxSizer( wxVERTICAL );
+	bSizer5 = new wxBoxSizer( wxHORIZONTAL );
 	
-	m_splitter2 = new wxSplitterWindow( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3DBORDER );
-	m_splitter2->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitter2OnIdle ), NULL, this );
-	
-	m_panel61 = new wxPanel( m_splitter2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel61 = new wxPanel( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	m_panel61->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 	
 	wxBoxSizer* bSizer6;
@@ -94,18 +83,20 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( KIWAY* aKiway, wxWindow* aParent ) :
 	m_panel61->SetSizer( bSizer6 );
 	m_panel61->Layout();
 	bSizer6->Fit( m_panel61 );
-	m_panel7 = new wxPanel( m_splitter2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	bSizer5->Add( m_panel61, 3, wxEXPAND | wxALL, 5 );
+	
+	m_panel7 = new wxPanel( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer7;
 	bSizer7 = new wxBoxSizer( wxVERTICAL );
 	
-	m_staticText2 = new wxStaticText( m_panel7, wxID_ANY, wxT("Signals"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+	m_staticText2 = new wxStaticText( m_panel7, wxID_ANY, _("Signals"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
 	m_staticText2->Wrap( -1 );
 	bSizer7->Add( m_staticText2, 0, wxALL|wxEXPAND, 5 );
 	
-	m_signals = new wxListBox( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_MULTIPLE|wxLB_SORT ); 
+	m_signals = new wxListBox( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_SORT ); 
 	bSizer7->Add( m_signals, 0, wxALL|wxEXPAND, 5 );
 	
-	m_staticText21 = new wxStaticText( m_panel7, wxID_ANY, wxT("Parameters"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+	m_staticText21 = new wxStaticText( m_panel7, wxID_ANY, _("Parameters"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
 	m_staticText21->Wrap( -1 );
 	bSizer7->Add( m_staticText21, 0, wxALL|wxEXPAND, 5 );
 	
@@ -113,43 +104,48 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( KIWAY* aKiway, wxWindow* aParent ) :
 	bSizer7->Add( m_signals1, 0, wxALL|wxEXPAND, 5 );
 	
 	wxFlexGridSizer* fgSizer1;
-	fgSizer1 = new wxFlexGridSizer( 1, 3, 0, 0 );
+	fgSizer1 = new wxFlexGridSizer( 1, 0, 0, 0 );
 	fgSizer1->SetFlexibleDirection( wxBOTH );
 	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
-	m_button1 = new wxButton( m_panel7, wxID_ANY, wxT("Probe"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer1->Add( m_button1, 0, wxALL, 5 );
+	m_simulateBtn = new wxButton( m_panel7, wxID_ANY, _("Simulate"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer1->Add( m_simulateBtn, 0, wxALL, 5 );
 	
-	m_button2 = new wxButton( m_panel7, wxID_ANY, wxT("Tune"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer1->Add( m_button2, 0, wxALL, 5 );
+	m_probeBtn = new wxButton( m_panel7, wxID_ANY, _("Probe"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer1->Add( m_probeBtn, 0, wxALL|wxEXPAND, 5 );
+	
+	m_tuneBtn = new wxButton( m_panel7, wxID_ANY, _("Tune"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer1->Add( m_tuneBtn, 0, wxALL|wxEXPAND, 5 );
 	
 	
-	bSizer7->Add( fgSizer1, 0, wxEXPAND, 5 );
+	bSizer7->Add( fgSizer1, 0, wxALL|wxEXPAND, 5 );
 	
 	
 	m_panel7->SetSizer( bSizer7 );
 	m_panel7->Layout();
 	bSizer7->Fit( m_panel7 );
-	m_splitter2->SplitVertically( m_panel61, m_panel7, 0 );
-	bSizer5->Add( m_splitter2, 1, wxEXPAND, 5 );
+	bSizer5->Add( m_panel7, 1, wxEXPAND | wxALL, 5 );
 	
 	
 	m_panel31->SetSizer( bSizer5 );
 	m_panel31->Layout();
 	bSizer5->Fit( m_panel31 );
-	m_panel3 = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	bSizer1->Add( m_panel31, 3, wxEXPAND | wxALL, 5 );
+	
+	m_panel3 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer3;
 	bSizer3 = new wxBoxSizer( wxVERTICAL );
 	
 	m_simConsole = new wxRichTextCtrl( m_panel3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS );
+	m_simConsole->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	
 	bSizer3->Add( m_simConsole, 1, wxEXPAND | wxALL, 5 );
 	
 	
 	m_panel3->SetSizer( bSizer3 );
 	m_panel3->Layout();
 	bSizer3->Fit( m_panel3 );
-	m_splitter1->SplitHorizontally( m_panel31, m_panel3, 700 );
-	bSizer1->Add( m_splitter1, 1, wxEXPAND, 5 );
+	bSizer1->Add( m_panel3, 1, wxEXPAND | wxALL, 5 );
 	
 	
 	this->SetSizer( bSizer1 );
@@ -159,11 +155,19 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( KIWAY* aKiway, wxWindow* aParent ) :
 	
 	// Connect Events
 	this->Connect( m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onNewPlot ) );
+	m_signals->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
+	m_simulateBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
+	m_probeBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onPlaceProbe ), NULL, this );
+	m_tuneBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onTune ), NULL, this );
 }
 
 SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
 {
 	// Disconnect Events
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onNewPlot ) );
+	m_signals->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
+	m_simulateBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
+	m_probeBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onPlaceProbe ), NULL, this );
+	m_tuneBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onTune ), NULL, this );
 	
 }
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index 75b7870454..7679c9c661 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -14,8 +14,8 @@
         <property name="file">sim_plot_frame_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
-        <property name="internationalize">0</property>
-        <property name="name">SpiceWIndow</property>
+        <property name="internationalize">1</property>
+        <property name="name">SpiceWindow</property>
         <property name="namespace"></property>
         <property name="path">.</property>
         <property name="precompiled_header"></property>
@@ -50,7 +50,7 @@
             <property name="title">Simulation Workbook</property>
             <property name="tooltip"></property>
             <property name="window_extra_style"></property>
-            <property name="window_name"></property>
+            <property name="window_name">SIM_PLOT_FRAME</property>
             <property name="window_style">wxTAB_TRAVERSAL</property>
             <property name="xrc_skip_sizer">1</property>
             <event name="OnActivate"></event>
@@ -88,7 +88,7 @@
             <event name="OnSetFocus"></event>
             <event name="OnSize"></event>
             <event name="OnUpdateUI"></event>
-            <object class="wxMenuBar" expanded="1">
+            <object class="wxMenuBar" expanded="0">
                 <property name="bg"></property>
                 <property name="context_help"></property>
                 <property name="context_menu">1</property>
@@ -105,7 +105,7 @@
                 <property name="pos"></property>
                 <property name="size"></property>
                 <property name="style"></property>
-                <property name="subclass"></property>
+                <property name="subclass">; </property>
                 <property name="tooltip"></property>
                 <property name="window_extra_style"></property>
                 <property name="window_name"></property>
@@ -133,11 +133,11 @@
                 <event name="OnSetFocus"></event>
                 <event name="OnSize"></event>
                 <event name="OnUpdateUI"></event>
-                <object class="wxMenu" expanded="1">
+                <object class="wxMenu" expanded="0">
                     <property name="label">File</property>
                     <property name="name">m_menu1</property>
                     <property name="permission">protected</property>
-                    <object class="wxMenuItem" expanded="1">
+                    <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
@@ -152,11 +152,11 @@
                         <event name="OnMenuSelection">onNewPlot</event>
                         <event name="OnUpdateUI"></event>
                     </object>
-                    <object class="separator" expanded="1">
+                    <object class="separator" expanded="0">
                         <property name="name">m_separator3</property>
                         <property name="permission">none</property>
                     </object>
-                    <object class="wxMenuItem" expanded="1">
+                    <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
@@ -206,11 +206,11 @@
                         <event name="OnUpdateUI"></event>
                     </object>
                 </object>
-                <object class="wxMenu" expanded="1">
+                <object class="wxMenu" expanded="0">
                     <property name="label">View</property>
                     <property name="name">m_menu2</property>
                     <property name="permission">protected</property>
-                    <object class="wxMenuItem" expanded="1">
+                    <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
@@ -225,7 +225,7 @@
                         <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
                     </object>
-                    <object class="wxMenuItem" expanded="1">
+                    <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
@@ -240,7 +240,7 @@
                         <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
                     </object>
-                    <object class="wxMenuItem" expanded="1">
+                    <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
@@ -255,11 +255,11 @@
                         <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
                     </object>
-                    <object class="separator" expanded="1">
+                    <object class="separator" expanded="0">
                         <property name="name">m_separator2</property>
                         <property name="permission">none</property>
                     </object>
-                    <object class="wxMenuItem" expanded="1">
+                    <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
@@ -283,9 +283,9 @@
                 <property name="permission">none</property>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
-                    <property name="flag">wxEXPAND</property>
-                    <property name="proportion">1</property>
-                    <object class="wxSplitterWindow" expanded="1">
+                    <property name="flag">wxEXPAND | wxALL</property>
+                    <property name="proportion">3</property>
+                    <object class="wxPanel" expanded="1">
                         <property name="BottomDockable">1</property>
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
@@ -316,12 +316,11 @@
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
                         <property name="maximum_size"></property>
-                        <property name="min_pane_size">0</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">m_splitter1</property>
+                        <property name="name">m_panel31</property>
                         <property name="pane_border">1</property>
                         <property name="pane_position"></property>
                         <property name="pane_size"></property>
@@ -329,19 +328,14 @@
                         <property name="pin_button">1</property>
                         <property name="pos"></property>
                         <property name="resize">Resizable</property>
-                        <property name="sashgravity">0.2</property>
-                        <property name="sashpos">700</property>
-                        <property name="sashsize">0</property>
                         <property name="show">1</property>
                         <property name="size"></property>
-                        <property name="splitmode">wxSPLIT_HORIZONTAL</property>
-                        <property name="style">wxSP_BORDER</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"></property>
+                        <property name="window_style">wxTAB_TRAVERSAL</property>
                         <event name="OnChar"></event>
                         <event name="OnEnterWindow"></event>
                         <event name="OnEraseBackground"></event>
@@ -364,969 +358,893 @@
                         <event name="OnRightUp"></event>
                         <event name="OnSetFocus"></event>
                         <event name="OnSize"></event>
-                        <event name="OnSplitterDClick"></event>
-                        <event name="OnSplitterSashPosChanged"></event>
-                        <event name="OnSplitterSashPosChanging"></event>
-                        <event name="OnSplitterUnsplit"></event>
                         <event name="OnUpdateUI"></event>
-                        <object class="splitteritem" expanded="1">
-                            <object class="wxPanel" 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_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</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="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">m_panel31</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="show">1</property>
-                                <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                                <object class="wxBoxSizer" expanded="1">
+                        <object class="wxBoxSizer" expanded="1">
+                            <property name="minimum_size"></property>
+                            <property name="name">bSizer5</property>
+                            <property name="orient">wxHORIZONTAL</property>
+                            <property name="permission">none</property>
+                            <object class="sizeritem" expanded="1">
+                                <property name="border">5</property>
+                                <property name="flag">wxEXPAND | wxALL</property>
+                                <property name="proportion">3</property>
+                                <object class="wxPanel" 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_name"></property>
+                                    <property name="aui_position"></property>
+                                    <property name="aui_row"></property>
+                                    <property name="best_size"></property>
+                                    <property name="bg">wxSYS_COLOUR_WINDOW</property>
+                                    <property name="caption"></property>
+                                    <property name="caption_visible">1</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="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="name">bSizer5</property>
-                                    <property name="orient">wxVERTICAL</property>
-                                    <property name="permission">none</property>
-                                    <object class="sizeritem" expanded="1">
-                                        <property name="border">5</property>
-                                        <property name="flag">wxEXPAND</property>
-                                        <property name="proportion">1</property>
-                                        <object class="wxSplitterWindow" 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_name"></property>
-                                            <property name="aui_position"></property>
-                                            <property name="aui_row"></property>
-                                            <property name="best_size"></property>
-                                            <property name="bg"></property>
-                                            <property name="caption"></property>
-                                            <property name="caption_visible">1</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="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_pane_size">0</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">m_splitter2</property>
-                                            <property name="pane_border">1</property>
-                                            <property name="pane_position"></property>
-                                            <property name="pane_size"></property>
-                                            <property name="permission">protected</property>
-                                            <property name="pin_button">1</property>
-                                            <property name="pos"></property>
-                                            <property name="resize">Resizable</property>
-                                            <property name="sashgravity">0.0</property>
-                                            <property name="sashpos">0</property>
-                                            <property name="sashsize">-1</property>
-                                            <property name="show">1</property>
-                                            <property name="size"></property>
-                                            <property name="splitmode">wxSPLIT_VERTICAL</property>
-                                            <property name="style">wxSP_3DBORDER</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"></property>
-                                            <event name="OnChar"></event>
-                                            <event name="OnEnterWindow"></event>
-                                            <event name="OnEraseBackground"></event>
-                                            <event name="OnKeyDown"></event>
-                                            <event name="OnKeyUp"></event>
-                                            <event name="OnKillFocus"></event>
-                                            <event name="OnLeaveWindow"></event>
-                                            <event name="OnLeftDClick"></event>
-                                            <event name="OnLeftDown"></event>
-                                            <event name="OnLeftUp"></event>
-                                            <event name="OnMiddleDClick"></event>
-                                            <event name="OnMiddleDown"></event>
-                                            <event name="OnMiddleUp"></event>
-                                            <event name="OnMotion"></event>
-                                            <event name="OnMouseEvents"></event>
-                                            <event name="OnMouseWheel"></event>
-                                            <event name="OnPaint"></event>
-                                            <event name="OnRightDClick"></event>
-                                            <event name="OnRightDown"></event>
-                                            <event name="OnRightUp"></event>
-                                            <event name="OnSetFocus"></event>
-                                            <event name="OnSize"></event>
-                                            <event name="OnSplitterDClick"></event>
-                                            <event name="OnSplitterSashPosChanged"></event>
-                                            <event name="OnSplitterSashPosChanging"></event>
-                                            <event name="OnSplitterUnsplit"></event>
-                                            <event name="OnUpdateUI"></event>
-                                            <object class="splitteritem" expanded="1">
-                                                <object class="wxPanel" 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_name"></property>
-                                                    <property name="aui_position"></property>
-                                                    <property name="aui_row"></property>
-                                                    <property name="best_size"></property>
-                                                    <property name="bg">wxSYS_COLOUR_WINDOW</property>
-                                                    <property name="caption"></property>
-                                                    <property name="caption_visible">1</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="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">m_panel61</property>
-                                                    <property name="pane_border">1</property>
-                                                    <property name="pane_position"></property>
-                                                    <property name="pane_size"></property>
-                                                    <property name="permission">protected</property>
-                                                    <property name="pin_button">1</property>
-                                                    <property name="pos"></property>
-                                                    <property name="resize">Resizable</property>
-                                                    <property name="show">1</property>
-                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
-                                                    <object class="wxBoxSizer" expanded="1">
+                                    <property name="moveable">1</property>
+                                    <property name="name">m_panel61</property>
+                                    <property name="pane_border">1</property>
+                                    <property name="pane_position"></property>
+                                    <property name="pane_size"></property>
+                                    <property name="permission">protected</property>
+                                    <property name="pin_button">1</property>
+                                    <property name="pos"></property>
+                                    <property name="resize">Resizable</property>
+                                    <property name="show">1</property>
+                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                    <event name="OnChar"></event>
+                                    <event name="OnEnterWindow"></event>
+                                    <event name="OnEraseBackground"></event>
+                                    <event name="OnKeyDown"></event>
+                                    <event name="OnKeyUp"></event>
+                                    <event name="OnKillFocus"></event>
+                                    <event name="OnLeaveWindow"></event>
+                                    <event name="OnLeftDClick"></event>
+                                    <event name="OnLeftDown"></event>
+                                    <event name="OnLeftUp"></event>
+                                    <event name="OnMiddleDClick"></event>
+                                    <event name="OnMiddleDown"></event>
+                                    <event name="OnMiddleUp"></event>
+                                    <event name="OnMotion"></event>
+                                    <event name="OnMouseEvents"></event>
+                                    <event name="OnMouseWheel"></event>
+                                    <event name="OnPaint"></event>
+                                    <event name="OnRightDClick"></event>
+                                    <event name="OnRightDown"></event>
+                                    <event name="OnRightUp"></event>
+                                    <event name="OnSetFocus"></event>
+                                    <event name="OnSize"></event>
+                                    <event name="OnUpdateUI"></event>
+                                    <object class="wxBoxSizer" expanded="0">
+                                        <property name="minimum_size"></property>
+                                        <property name="name">bSizer6</property>
+                                        <property name="orient">wxVERTICAL</property>
+                                        <property name="permission">none</property>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxEXPAND</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxAuiNotebook" expanded="0">
+                                                <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_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg">wxSYS_COLOUR_WINDOW</property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</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="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">m_plotNotebook</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style">wxAUI_NB_DEFAULT_STYLE</property>
+                                                <property name="subclass"></property>
+                                                <property name="tab_ctrl_height">-1</property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="uniform_bitmap_size"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnAuiNotebookAllowDND"></event>
+                                                <event name="OnAuiNotebookBeginDrag"></event>
+                                                <event name="OnAuiNotebookButton"></event>
+                                                <event name="OnAuiNotebookDragMotion"></event>
+                                                <event name="OnAuiNotebookEndDrag"></event>
+                                                <event name="OnAuiNotebookPageChanged"></event>
+                                                <event name="OnAuiNotebookPageChanging"></event>
+                                                <event name="OnAuiNotebookPageClose"></event>
+                                                <event name="OnAuiNotebookPageClosed"></event>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem" expanded="1">
+                                <property name="border">5</property>
+                                <property name="flag">wxEXPAND | wxALL</property>
+                                <property name="proportion">1</property>
+                                <object class="wxPanel" 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_name"></property>
+                                    <property name="aui_position"></property>
+                                    <property name="aui_row"></property>
+                                    <property name="best_size"></property>
+                                    <property name="bg"></property>
+                                    <property name="caption"></property>
+                                    <property name="caption_visible">1</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="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">m_panel7</property>
+                                    <property name="pane_border">1</property>
+                                    <property name="pane_position"></property>
+                                    <property name="pane_size"></property>
+                                    <property name="permission">protected</property>
+                                    <property name="pin_button">1</property>
+                                    <property name="pos"></property>
+                                    <property name="resize">Resizable</property>
+                                    <property name="show">1</property>
+                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                    <event name="OnChar"></event>
+                                    <event name="OnEnterWindow"></event>
+                                    <event name="OnEraseBackground"></event>
+                                    <event name="OnKeyDown"></event>
+                                    <event name="OnKeyUp"></event>
+                                    <event name="OnKillFocus"></event>
+                                    <event name="OnLeaveWindow"></event>
+                                    <event name="OnLeftDClick"></event>
+                                    <event name="OnLeftDown"></event>
+                                    <event name="OnLeftUp"></event>
+                                    <event name="OnMiddleDClick"></event>
+                                    <event name="OnMiddleDown"></event>
+                                    <event name="OnMiddleUp"></event>
+                                    <event name="OnMotion"></event>
+                                    <event name="OnMouseEvents"></event>
+                                    <event name="OnMouseWheel"></event>
+                                    <event name="OnPaint"></event>
+                                    <event name="OnRightDClick"></event>
+                                    <event name="OnRightDown"></event>
+                                    <event name="OnRightUp"></event>
+                                    <event name="OnSetFocus"></event>
+                                    <event name="OnSize"></event>
+                                    <event name="OnUpdateUI"></event>
+                                    <object class="wxBoxSizer" expanded="1">
+                                        <property name="minimum_size"></property>
+                                        <property name="name">bSizer7</property>
+                                        <property name="orient">wxVERTICAL</property>
+                                        <property name="permission">none</property>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxStaticText" expanded="0">
+                                                <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_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</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="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="label">Signals</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">m_staticText2</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style">wxALIGN_CENTRE</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"></property>
+                                                <property name="wrap">-1</property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxListBox" expanded="0">
+                                                <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_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="choices"></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="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">m_signals</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style">wxLB_SINGLE|wxLB_SORT</property>
+                                                <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>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnListBox"></event>
+                                                <event name="OnListBoxDClick">onSignalDblClick</event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxStaticText" expanded="0">
+                                                <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_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</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="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="label">Parameters</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">m_staticText21</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style">wxALIGN_CENTRE</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"></property>
+                                                <property name="wrap">-1</property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxListBox" expanded="0">
+                                                <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_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="choices"></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="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">m_signals1</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style">wxLB_MULTIPLE|wxLB_SORT</property>
+                                                <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>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnListBox"></event>
+                                                <event name="OnListBoxDClick"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxFlexGridSizer" expanded="1">
+                                                <property name="cols">0</property>
+                                                <property name="flexible_direction">wxBOTH</property>
+                                                <property name="growablecols"></property>
+                                                <property name="growablerows"></property>
+                                                <property name="hgap">0</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="name">fgSizer1</property>
+                                                <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                                <property name="permission">none</property>
+                                                <property name="rows">1</property>
+                                                <property name="vgap">0</property>
+                                                <object class="sizeritem" expanded="1">
+                                                    <property name="border">5</property>
+                                                    <property name="flag">wxALL</property>
+                                                    <property name="proportion">0</property>
+                                                    <object class="wxButton" 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_name"></property>
+                                                        <property name="aui_position"></property>
+                                                        <property name="aui_row"></property>
+                                                        <property name="best_size"></property>
+                                                        <property name="bg"></property>
+                                                        <property name="caption"></property>
+                                                        <property name="caption_visible">1</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">0</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="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="label">Simulate</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="name">bSizer6</property>
-                                                        <property name="orient">wxVERTICAL</property>
-                                                        <property name="permission">none</property>
-                                                        <object class="sizeritem" expanded="1">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxEXPAND</property>
-                                                            <property name="proportion">1</property>
-                                                            <object class="wxAuiNotebook" 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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg">wxSYS_COLOUR_WINDOW</property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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">m_plotNotebook</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style">wxAUI_NB_DEFAULT_STYLE</property>
-                                                                <property name="subclass"></property>
-                                                                <property name="tab_ctrl_height">-1</property>
-                                                                <property name="toolbar_pane">0</property>
-                                                                <property name="tooltip"></property>
-                                                                <property name="uniform_bitmap_size"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnAuiNotebookAllowDND"></event>
-                                                                <event name="OnAuiNotebookBeginDrag"></event>
-                                                                <event name="OnAuiNotebookButton"></event>
-                                                                <event name="OnAuiNotebookDragMotion"></event>
-                                                                <event name="OnAuiNotebookEndDrag"></event>
-                                                                <event name="OnAuiNotebookPageChanged"></event>
-                                                                <event name="OnAuiNotebookPageChanging"></event>
-                                                                <event name="OnAuiNotebookPageClose"></event>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
+                                                        <property name="moveable">1</property>
+                                                        <property name="name">m_simulateBtn</property>
+                                                        <property name="pane_border">1</property>
+                                                        <property name="pane_position"></property>
+                                                        <property name="pane_size"></property>
+                                                        <property name="permission">protected</property>
+                                                        <property name="pin_button">1</property>
+                                                        <property name="pos"></property>
+                                                        <property name="resize">Resizable</property>
+                                                        <property name="show">1</property>
+                                                        <property name="size"></property>
+                                                        <property name="style"></property>
+                                                        <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>
+                                                        <event name="OnButtonClick">onSimulate</event>
+                                                        <event name="OnChar"></event>
+                                                        <event name="OnEnterWindow"></event>
+                                                        <event name="OnEraseBackground"></event>
+                                                        <event name="OnKeyDown"></event>
+                                                        <event name="OnKeyUp"></event>
+                                                        <event name="OnKillFocus"></event>
+                                                        <event name="OnLeaveWindow"></event>
+                                                        <event name="OnLeftDClick"></event>
+                                                        <event name="OnLeftDown"></event>
+                                                        <event name="OnLeftUp"></event>
+                                                        <event name="OnMiddleDClick"></event>
+                                                        <event name="OnMiddleDown"></event>
+                                                        <event name="OnMiddleUp"></event>
+                                                        <event name="OnMotion"></event>
+                                                        <event name="OnMouseEvents"></event>
+                                                        <event name="OnMouseWheel"></event>
+                                                        <event name="OnPaint"></event>
+                                                        <event name="OnRightDClick"></event>
+                                                        <event name="OnRightDown"></event>
+                                                        <event name="OnRightUp"></event>
+                                                        <event name="OnSetFocus"></event>
+                                                        <event name="OnSize"></event>
+                                                        <event name="OnUpdateUI"></event>
                                                     </object>
                                                 </object>
-                                            </object>
-                                            <object class="splitteritem" expanded="1">
-                                                <object class="wxPanel" 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_name"></property>
-                                                    <property name="aui_position"></property>
-                                                    <property name="aui_row"></property>
-                                                    <property name="best_size"></property>
-                                                    <property name="bg"></property>
-                                                    <property name="caption"></property>
-                                                    <property name="caption_visible">1</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="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">m_panel7</property>
-                                                    <property name="pane_border">1</property>
-                                                    <property name="pane_position"></property>
-                                                    <property name="pane_size"></property>
-                                                    <property name="permission">protected</property>
-                                                    <property name="pin_button">1</property>
-                                                    <property name="pos"></property>
-                                                    <property name="resize">Resizable</property>
-                                                    <property name="show">1</property>
-                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
-                                                    <object class="wxBoxSizer" expanded="1">
+                                                <object class="sizeritem" expanded="0">
+                                                    <property name="border">5</property>
+                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                    <property name="proportion">0</property>
+                                                    <object class="wxButton" expanded="0">
+                                                        <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_name"></property>
+                                                        <property name="aui_position"></property>
+                                                        <property name="aui_row"></property>
+                                                        <property name="best_size"></property>
+                                                        <property name="bg"></property>
+                                                        <property name="caption"></property>
+                                                        <property name="caption_visible">1</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">0</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="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="label">Probe</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="name">bSizer7</property>
-                                                        <property name="orient">wxVERTICAL</property>
-                                                        <property name="permission">none</property>
-                                                        <object class="sizeritem" expanded="1">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" 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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Signals</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">m_staticText2</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style">wxALIGN_CENTRE</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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="1">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxListBox" 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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</property>
-                                                                <property name="center_pane">0</property>
-                                                                <property name="choices"></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="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">m_signals</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style">wxLB_MULTIPLE|wxLB_SORT</property>
-                                                                <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>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnListBox"></event>
-                                                                <event name="OnListBoxDClick"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="1">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" 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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Parameters</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">m_staticText21</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style">wxALIGN_CENTRE</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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="1">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxListBox" 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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</property>
-                                                                <property name="center_pane">0</property>
-                                                                <property name="choices"></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="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">m_signals1</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style">wxLB_MULTIPLE|wxLB_SORT</property>
-                                                                <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>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnListBox"></event>
-                                                                <event name="OnListBoxDClick"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="1">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxFlexGridSizer" expanded="1">
-                                                                <property name="cols">3</property>
-                                                                <property name="flexible_direction">wxBOTH</property>
-                                                                <property name="growablecols"></property>
-                                                                <property name="growablerows"></property>
-                                                                <property name="hgap">0</property>
-                                                                <property name="minimum_size"></property>
-                                                                <property name="name">fgSizer1</property>
-                                                                <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
-                                                                <property name="permission">none</property>
-                                                                <property name="rows">1</property>
-                                                                <property name="vgap">0</property>
-                                                                <object class="sizeritem" expanded="1">
-                                                                    <property name="border">5</property>
-                                                                    <property name="flag">wxALL</property>
-                                                                    <property name="proportion">0</property>
-                                                                    <object class="wxButton" 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_name"></property>
-                                                                        <property name="aui_position"></property>
-                                                                        <property name="aui_row"></property>
-                                                                        <property name="best_size"></property>
-                                                                        <property name="bg"></property>
-                                                                        <property name="caption"></property>
-                                                                        <property name="caption_visible">1</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">0</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="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="label">Probe</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">m_button1</property>
-                                                                        <property name="pane_border">1</property>
-                                                                        <property name="pane_position"></property>
-                                                                        <property name="pane_size"></property>
-                                                                        <property name="permission">protected</property>
-                                                                        <property name="pin_button">1</property>
-                                                                        <property name="pos"></property>
-                                                                        <property name="resize">Resizable</property>
-                                                                        <property name="show">1</property>
-                                                                        <property name="size"></property>
-                                                                        <property name="style"></property>
-                                                                        <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>
-                                                                        <event name="OnButtonClick"></event>
-                                                                        <event name="OnChar"></event>
-                                                                        <event name="OnEnterWindow"></event>
-                                                                        <event name="OnEraseBackground"></event>
-                                                                        <event name="OnKeyDown"></event>
-                                                                        <event name="OnKeyUp"></event>
-                                                                        <event name="OnKillFocus"></event>
-                                                                        <event name="OnLeaveWindow"></event>
-                                                                        <event name="OnLeftDClick"></event>
-                                                                        <event name="OnLeftDown"></event>
-                                                                        <event name="OnLeftUp"></event>
-                                                                        <event name="OnMiddleDClick"></event>
-                                                                        <event name="OnMiddleDown"></event>
-                                                                        <event name="OnMiddleUp"></event>
-                                                                        <event name="OnMotion"></event>
-                                                                        <event name="OnMouseEvents"></event>
-                                                                        <event name="OnMouseWheel"></event>
-                                                                        <event name="OnPaint"></event>
-                                                                        <event name="OnRightDClick"></event>
-                                                                        <event name="OnRightDown"></event>
-                                                                        <event name="OnRightUp"></event>
-                                                                        <event name="OnSetFocus"></event>
-                                                                        <event name="OnSize"></event>
-                                                                        <event name="OnUpdateUI"></event>
-                                                                    </object>
-                                                                </object>
-                                                                <object class="sizeritem" expanded="1">
-                                                                    <property name="border">5</property>
-                                                                    <property name="flag">wxALL</property>
-                                                                    <property name="proportion">0</property>
-                                                                    <object class="wxButton" 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_name"></property>
-                                                                        <property name="aui_position"></property>
-                                                                        <property name="aui_row"></property>
-                                                                        <property name="best_size"></property>
-                                                                        <property name="bg"></property>
-                                                                        <property name="caption"></property>
-                                                                        <property name="caption_visible">1</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">0</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="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="label">Tune</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">m_button2</property>
-                                                                        <property name="pane_border">1</property>
-                                                                        <property name="pane_position"></property>
-                                                                        <property name="pane_size"></property>
-                                                                        <property name="permission">protected</property>
-                                                                        <property name="pin_button">1</property>
-                                                                        <property name="pos"></property>
-                                                                        <property name="resize">Resizable</property>
-                                                                        <property name="show">1</property>
-                                                                        <property name="size"></property>
-                                                                        <property name="style"></property>
-                                                                        <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>
-                                                                        <event name="OnButtonClick"></event>
-                                                                        <event name="OnChar"></event>
-                                                                        <event name="OnEnterWindow"></event>
-                                                                        <event name="OnEraseBackground"></event>
-                                                                        <event name="OnKeyDown"></event>
-                                                                        <event name="OnKeyUp"></event>
-                                                                        <event name="OnKillFocus"></event>
-                                                                        <event name="OnLeaveWindow"></event>
-                                                                        <event name="OnLeftDClick"></event>
-                                                                        <event name="OnLeftDown"></event>
-                                                                        <event name="OnLeftUp"></event>
-                                                                        <event name="OnMiddleDClick"></event>
-                                                                        <event name="OnMiddleDown"></event>
-                                                                        <event name="OnMiddleUp"></event>
-                                                                        <event name="OnMotion"></event>
-                                                                        <event name="OnMouseEvents"></event>
-                                                                        <event name="OnMouseWheel"></event>
-                                                                        <event name="OnPaint"></event>
-                                                                        <event name="OnRightDClick"></event>
-                                                                        <event name="OnRightDown"></event>
-                                                                        <event name="OnRightUp"></event>
-                                                                        <event name="OnSetFocus"></event>
-                                                                        <event name="OnSize"></event>
-                                                                        <event name="OnUpdateUI"></event>
-                                                                    </object>
-                                                                </object>
-                                                            </object>
-                                                        </object>
+                                                        <property name="moveable">1</property>
+                                                        <property name="name">m_probeBtn</property>
+                                                        <property name="pane_border">1</property>
+                                                        <property name="pane_position"></property>
+                                                        <property name="pane_size"></property>
+                                                        <property name="permission">protected</property>
+                                                        <property name="pin_button">1</property>
+                                                        <property name="pos"></property>
+                                                        <property name="resize">Resizable</property>
+                                                        <property name="show">1</property>
+                                                        <property name="size"></property>
+                                                        <property name="style"></property>
+                                                        <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>
+                                                        <event name="OnButtonClick">onPlaceProbe</event>
+                                                        <event name="OnChar"></event>
+                                                        <event name="OnEnterWindow"></event>
+                                                        <event name="OnEraseBackground"></event>
+                                                        <event name="OnKeyDown"></event>
+                                                        <event name="OnKeyUp"></event>
+                                                        <event name="OnKillFocus"></event>
+                                                        <event name="OnLeaveWindow"></event>
+                                                        <event name="OnLeftDClick"></event>
+                                                        <event name="OnLeftDown"></event>
+                                                        <event name="OnLeftUp"></event>
+                                                        <event name="OnMiddleDClick"></event>
+                                                        <event name="OnMiddleDown"></event>
+                                                        <event name="OnMiddleUp"></event>
+                                                        <event name="OnMotion"></event>
+                                                        <event name="OnMouseEvents"></event>
+                                                        <event name="OnMouseWheel"></event>
+                                                        <event name="OnPaint"></event>
+                                                        <event name="OnRightDClick"></event>
+                                                        <event name="OnRightDown"></event>
+                                                        <event name="OnRightUp"></event>
+                                                        <event name="OnSetFocus"></event>
+                                                        <event name="OnSize"></event>
+                                                        <event name="OnUpdateUI"></event>
+                                                    </object>
+                                                </object>
+                                                <object class="sizeritem" expanded="0">
+                                                    <property name="border">5</property>
+                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                    <property name="proportion">0</property>
+                                                    <object class="wxButton" expanded="0">
+                                                        <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_name"></property>
+                                                        <property name="aui_position"></property>
+                                                        <property name="aui_row"></property>
+                                                        <property name="best_size"></property>
+                                                        <property name="bg"></property>
+                                                        <property name="caption"></property>
+                                                        <property name="caption_visible">1</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">0</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="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="label">Tune</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">m_tuneBtn</property>
+                                                        <property name="pane_border">1</property>
+                                                        <property name="pane_position"></property>
+                                                        <property name="pane_size"></property>
+                                                        <property name="permission">protected</property>
+                                                        <property name="pin_button">1</property>
+                                                        <property name="pos"></property>
+                                                        <property name="resize">Resizable</property>
+                                                        <property name="show">1</property>
+                                                        <property name="size"></property>
+                                                        <property name="style"></property>
+                                                        <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>
+                                                        <event name="OnButtonClick">onTune</event>
+                                                        <event name="OnChar"></event>
+                                                        <event name="OnEnterWindow"></event>
+                                                        <event name="OnEraseBackground"></event>
+                                                        <event name="OnKeyDown"></event>
+                                                        <event name="OnKeyUp"></event>
+                                                        <event name="OnKillFocus"></event>
+                                                        <event name="OnLeaveWindow"></event>
+                                                        <event name="OnLeftDClick"></event>
+                                                        <event name="OnLeftDown"></event>
+                                                        <event name="OnLeftUp"></event>
+                                                        <event name="OnMiddleDClick"></event>
+                                                        <event name="OnMiddleDown"></event>
+                                                        <event name="OnMiddleUp"></event>
+                                                        <event name="OnMotion"></event>
+                                                        <event name="OnMouseEvents"></event>
+                                                        <event name="OnMouseWheel"></event>
+                                                        <event name="OnPaint"></event>
+                                                        <event name="OnRightDClick"></event>
+                                                        <event name="OnRightDown"></event>
+                                                        <event name="OnRightUp"></event>
+                                                        <event name="OnSetFocus"></event>
+                                                        <event name="OnSize"></event>
+                                                        <event name="OnUpdateUI"></event>
                                                     </object>
                                                 </object>
                                             </object>
@@ -1335,184 +1253,187 @@
                                 </object>
                             </object>
                         </object>
-                        <object class="splitteritem" expanded="1">
-                            <object class="wxPanel" 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_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</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="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">m_panel3</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="show">1</property>
-                                <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                                <object class="wxBoxSizer" expanded="1">
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND | wxALL</property>
+                    <property name="proportion">1</property>
+                    <object class="wxPanel" 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_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</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="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">m_panel3</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="show">1</property>
+                        <property name="size"></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">wxTAB_TRAVERSAL</property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                        <object class="wxBoxSizer" expanded="1">
+                            <property name="minimum_size"></property>
+                            <property name="name">bSizer3</property>
+                            <property name="orient">wxVERTICAL</property>
+                            <property name="permission">none</property>
+                            <object class="sizeritem" expanded="0">
+                                <property name="border">5</property>
+                                <property name="flag">wxEXPAND | wxALL</property>
+                                <property name="proportion">1</property>
+                                <object class="wxRichTextCtrl" expanded="0">
+                                    <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_name"></property>
+                                    <property name="aui_position"></property>
+                                    <property name="aui_row"></property>
+                                    <property name="best_size"></property>
+                                    <property name="bg"></property>
+                                    <property name="caption"></property>
+                                    <property name="caption_visible">1</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="fg"></property>
+                                    <property name="floatable">1</property>
+                                    <property name="font">,90,90,-1,76,0</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="name">bSizer3</property>
-                                    <property name="orient">wxVERTICAL</property>
-                                    <property name="permission">none</property>
-                                    <object class="sizeritem" expanded="0">
-                                        <property name="border">5</property>
-                                        <property name="flag">wxEXPAND | wxALL</property>
-                                        <property name="proportion">1</property>
-                                        <object class="wxRichTextCtrl" expanded="0">
-                                            <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_name"></property>
-                                            <property name="aui_position"></property>
-                                            <property name="aui_row"></property>
-                                            <property name="best_size"></property>
-                                            <property name="bg"></property>
-                                            <property name="caption"></property>
-                                            <property name="caption_visible">1</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="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">m_simConsole</property>
-                                            <property name="pane_border">1</property>
-                                            <property name="pane_position"></property>
-                                            <property name="pane_size"></property>
-                                            <property name="permission">protected</property>
-                                            <property name="pin_button">1</property>
-                                            <property name="pos"></property>
-                                            <property name="resize">Resizable</property>
-                                            <property name="show">1</property>
-                                            <property name="size"></property>
-                                            <property name="style">wxTE_READONLY</property>
-                                            <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">wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS</property>
-                                            <event name="OnChar"></event>
-                                            <event name="OnEnterWindow"></event>
-                                            <event name="OnEraseBackground"></event>
-                                            <event name="OnKeyDown"></event>
-                                            <event name="OnKeyUp"></event>
-                                            <event name="OnKillFocus"></event>
-                                            <event name="OnLeaveWindow"></event>
-                                            <event name="OnLeftDClick"></event>
-                                            <event name="OnLeftDown"></event>
-                                            <event name="OnLeftUp"></event>
-                                            <event name="OnMiddleDClick"></event>
-                                            <event name="OnMiddleDown"></event>
-                                            <event name="OnMiddleUp"></event>
-                                            <event name="OnMotion"></event>
-                                            <event name="OnMouseEvents"></event>
-                                            <event name="OnMouseWheel"></event>
-                                            <event name="OnPaint"></event>
-                                            <event name="OnRichTextCharacter"></event>
-                                            <event name="OnRichTextContentDeleted"></event>
-                                            <event name="OnRichTextContentInserted"></event>
-                                            <event name="OnRichTextDelete"></event>
-                                            <event name="OnRichTextReturn"></event>
-                                            <event name="OnRichTextStyleChanged"></event>
-                                            <event name="OnRichTextStyleSheetChanged"></event>
-                                            <event name="OnRichTextStyleSheetReplaced"></event>
-                                            <event name="OnRichTextStyleSheetReplacing"></event>
-                                            <event name="OnRightDClick"></event>
-                                            <event name="OnRightDown"></event>
-                                            <event name="OnRightUp"></event>
-                                            <event name="OnSetFocus"></event>
-                                            <event name="OnSize"></event>
-                                            <event name="OnText"></event>
-                                            <event name="OnTextEnter"></event>
-                                            <event name="OnTextMaxLen"></event>
-                                            <event name="OnTextURL"></event>
-                                            <event name="OnUpdateUI"></event>
-                                        </object>
-                                    </object>
+                                    <property name="moveable">1</property>
+                                    <property name="name">m_simConsole</property>
+                                    <property name="pane_border">1</property>
+                                    <property name="pane_position"></property>
+                                    <property name="pane_size"></property>
+                                    <property name="permission">protected</property>
+                                    <property name="pin_button">1</property>
+                                    <property name="pos"></property>
+                                    <property name="resize">Resizable</property>
+                                    <property name="show">1</property>
+                                    <property name="size"></property>
+                                    <property name="style">wxTE_READONLY</property>
+                                    <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">wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS</property>
+                                    <event name="OnChar"></event>
+                                    <event name="OnEnterWindow"></event>
+                                    <event name="OnEraseBackground"></event>
+                                    <event name="OnKeyDown"></event>
+                                    <event name="OnKeyUp"></event>
+                                    <event name="OnKillFocus"></event>
+                                    <event name="OnLeaveWindow"></event>
+                                    <event name="OnLeftDClick"></event>
+                                    <event name="OnLeftDown"></event>
+                                    <event name="OnLeftUp"></event>
+                                    <event name="OnMiddleDClick"></event>
+                                    <event name="OnMiddleDown"></event>
+                                    <event name="OnMiddleUp"></event>
+                                    <event name="OnMotion"></event>
+                                    <event name="OnMouseEvents"></event>
+                                    <event name="OnMouseWheel"></event>
+                                    <event name="OnPaint"></event>
+                                    <event name="OnRichTextCharacter"></event>
+                                    <event name="OnRichTextContentDeleted"></event>
+                                    <event name="OnRichTextContentInserted"></event>
+                                    <event name="OnRichTextDelete"></event>
+                                    <event name="OnRichTextReturn"></event>
+                                    <event name="OnRichTextStyleChanged"></event>
+                                    <event name="OnRichTextStyleSheetChanged"></event>
+                                    <event name="OnRichTextStyleSheetReplaced"></event>
+                                    <event name="OnRichTextStyleSheetReplacing"></event>
+                                    <event name="OnRightDClick"></event>
+                                    <event name="OnRightDown"></event>
+                                    <event name="OnRightUp"></event>
+                                    <event name="OnSetFocus"></event>
+                                    <event name="OnSize"></event>
+                                    <event name="OnText"></event>
+                                    <event name="OnTextEnter"></event>
+                                    <event name="OnTextMaxLen"></event>
+                                    <event name="OnTextURL"></event>
+                                    <event name="OnUpdateUI"></event>
                                 </object>
                             </object>
                         </object>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index d7056336a7..514f9e4ddf 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -10,6 +10,7 @@
 
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
 class KIWAY_PLAYER;
 
 #include "kiway_player.h"
@@ -28,7 +29,6 @@ class KIWAY_PLAYER;
 #include <wx/stattext.h>
 #include <wx/listbox.h>
 #include <wx/button.h>
-#include <wx/splitter.h>
 #include <wx/richtext/richtextctrl.h>
 #include <wx/frame.h>
 
@@ -46,9 +46,7 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxMenuBar* m_menubar1;
 		wxMenu* m_menu1;
 		wxMenu* m_menu2;
-		wxSplitterWindow* m_splitter1;
 		wxPanel* m_panel31;
-		wxSplitterWindow* m_splitter2;
 		wxPanel* m_panel61;
 		wxAuiNotebook* m_plotNotebook;
 		wxPanel* m_panel7;
@@ -56,30 +54,25 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxListBox* m_signals;
 		wxStaticText* m_staticText21;
 		wxListBox* m_signals1;
-		wxButton* m_button1;
-		wxButton* m_button2;
+		wxButton* m_simulateBtn;
+		wxButton* m_probeBtn;
+		wxButton* m_tuneBtn;
 		wxPanel* m_panel3;
 		wxRichTextCtrl* m_simConsole;
 		
 		// Virtual event handlers, overide them in your derived class
 		virtual void onNewPlot( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSignalDblClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSimulate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onPlaceProbe( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onTune( wxCommandEvent& event ) { event.Skip(); }
 		
 	
 	public:
-		SIM_PLOT_FRAME_BASE( KIWAY* aKiway, wxWindow* aParent );
+		
+		SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Simulation Workbook"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1280,900 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("SIM_PLOT_FRAME") );
+		
 		~SIM_PLOT_FRAME_BASE();
-		
-		void m_splitter1OnIdle( wxIdleEvent& )
-		{
-			m_splitter1->SetSashPosition( 700 );
-			m_splitter1->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitter1OnIdle ), NULL, this );
-		}
-		
-		void m_splitter2OnIdle( wxIdleEvent& )
-		{
-			m_splitter2->SetSashPosition( 0 );
-			m_splitter2->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitter2OnIdle ), NULL, this );
-		}
 	
 };
 

From 0d764741f90d2221b01a1796afcb35beef8e3c09 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:16 +0200
Subject: [PATCH 030/197] Simulation commands moved from eeschema menu to
 SIM_PLOT_FRAME buttons

---
 eeschema/eeschema_id.h          |  3 +--
 eeschema/menubar.cpp            | 28 +++++++----------------
 eeschema/schframe.cpp           |  4 ++--
 eeschema/schframe.h             |  3 +--
 eeschema/sim/sim_plot_frame.cpp | 40 ++++++++++++++++++++++++++++-----
 eeschema/sim/sim_plot_frame.h   | 17 ++++++++++----
 eeschema/sim/simulate.cpp       |  9 +-------
 7 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/eeschema/eeschema_id.h b/eeschema/eeschema_id.h
index de486b3b71..2e94e51e5a 100644
--- a/eeschema/eeschema_id.h
+++ b/eeschema/eeschema_id.h
@@ -256,8 +256,7 @@ enum id_eeschema_frm
     ID_UPDATE_PCB_FROM_SCH,
     ID_UPDATE_SCH_FROM_PCB,
 
-    ID_SIM_RUN,
-    ID_SIM_STOP,
+    ID_SIM_SHOW,
     ID_SIM_ADD_PROBE
 };
 
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index 480f9da1f4..b0962d3350 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -422,25 +422,6 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
                  _( "Import and export settings" ),
                  KiBitmap( save_setup_xpm ) );
 
-
-    wxMenu* simMenu = new wxMenu;
-
-    AddMenuItem( simMenu,
-                 ID_SIM_RUN,
-                 _("Run simulation"), _( "Run simulation" ),
-                 KiBitmap( pcbnew_xpm ) );
-
-    AddMenuItem( simMenu,
-                  ID_SIM_STOP,
-                  _( "Stop simulation" ), _( "Stop simulation" ),
-                  KiBitmap( pcbnew_xpm ) );
-
-    AddMenuItem( simMenu,
-                ID_SIM_ADD_PROBE,
-                _( "Add probe" ), _( "Add probe" ),
-                KiBitmap( pcbnew_xpm ) );
-
-
     // Menu Tools:
     wxMenu* toolsMenu = new wxMenu;
 
@@ -511,6 +492,14 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
                  _( "Run CvPcb" ),
                  KiBitmap( cvpcb_xpm ) );
 
+    toolsMenu->AppendSeparator();
+
+    // Simulator
+    AddMenuItem( toolsMenu,
+                 ID_SIM_SHOW,
+                 _("Simula&te"), _( "Simulate the circuit" ),
+                 wxNullBitmap );
+
     // Help Menu:
     wxMenu* helpMenu = new wxMenu;
 
@@ -545,7 +534,6 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
     menuBar->Append( viewMenu, _( "&View" ) );
     menuBar->Append( placeMenu, _( "&Place" ) );
     menuBar->Append( preferencesMenu, _( "P&references" ) );
-    menuBar->Append( simMenu, _( "&Simulate" ) );
     menuBar->Append( toolsMenu, _( "&Tools" ) );
     menuBar->Append( helpMenu, _( "&Help" ) );
 
diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp
index eb46bda90b..ccd1180859 100644
--- a/eeschema/schframe.cpp
+++ b/eeschema/schframe.cpp
@@ -264,8 +264,7 @@ BEGIN_EVENT_TABLE( SCH_EDIT_FRAME, EDA_DRAW_FRAME )
     EVT_TOOL( ID_GET_ERC, SCH_EDIT_FRAME::OnErc )
     EVT_TOOL( ID_GET_NETLIST, SCH_EDIT_FRAME::OnCreateNetlist )
     EVT_TOOL( ID_UPDATE_PCB_FROM_SCH, SCH_EDIT_FRAME::OnUpdatePCB )
-    EVT_TOOL( ID_SIM_RUN, SCH_EDIT_FRAME::OnSimulationRun )
-    EVT_TOOL( ID_SIM_STOP, SCH_EDIT_FRAME::OnSimulationStop )
+    EVT_TOOL( ID_SIM_SHOW, SCH_EDIT_FRAME::OnSimulate )
     EVT_TOOL( ID_GET_TOOLS, SCH_EDIT_FRAME::OnCreateBillOfMaterials )
     EVT_TOOL( ID_FIND_ITEMS, SCH_EDIT_FRAME::OnFindItems )
     EVT_TOOL( wxID_REPLACE, SCH_EDIT_FRAME::OnFindItems )
@@ -281,6 +280,7 @@ BEGIN_EVENT_TABLE( SCH_EDIT_FRAME, EDA_DRAW_FRAME )
     EVT_TOOL( ID_ZOOM_SELECTION, SCH_EDIT_FRAME::OnSelectTool )
     EVT_TOOL_RANGE( ID_SCHEMATIC_VERTICAL_TOOLBAR_START, ID_SCHEMATIC_VERTICAL_TOOLBAR_END,
                     SCH_EDIT_FRAME::OnSelectTool )
+
     EVT_TOOL( ID_SIM_ADD_PROBE, SCH_EDIT_FRAME::OnSelectTool )
 
     EVT_MENU( ID_CANCEL_CURRENT_COMMAND, SCH_EDIT_FRAME::OnCancelCurrentCommand )
diff --git a/eeschema/schframe.h b/eeschema/schframe.h
index 1cdec7b898..7c7938f65d 100644
--- a/eeschema/schframe.h
+++ b/eeschema/schframe.h
@@ -813,8 +813,7 @@ private:
     void OnErc( wxCommandEvent& event );
     void OnCreateNetlist( wxCommandEvent& event );
     void OnUpdatePCB( wxCommandEvent& event );
-    void OnSimulationRun( wxCommandEvent& event );
-    void OnSimulationStop( wxCommandEvent& event );
+    void OnSimulate( wxCommandEvent& event );
     void OnCreateBillOfMaterials( wxCommandEvent& event );
     void OnFindItems( wxCommandEvent& event );
     void OnFindDialogClose( wxFindDialogEvent& event );
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 67b9619299..de287f846a 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -24,6 +24,7 @@
  */
 
 #include <schframe.h>
+#include <eeschema_id.h>
 #include <kiway.h>
 
 #include <netlist_exporter_kicad.h>
@@ -35,11 +36,6 @@
 #include "sim_plot_panel.h"
 #include "spice_simulator.h"
 
-#ifdef KICAD_SCRIPTING
- #include <python_scripting.h>
-#endif
-
-
 class SIM_THREAD_REPORTER : public REPORTER
 {
 public:
@@ -229,6 +225,40 @@ void SIM_PLOT_FRAME::AddVoltagePlot( const wxString& aNetName )
 }
 
 
+bool SIM_PLOT_FRAME::isSimulationRunning()
+{
+    wxCriticalSectionLocker lock( m_simThreadCS );
+
+    return ( m_simThread != NULL );
+
+}
+
+
+void SIM_PLOT_FRAME::onSimulate( wxCommandEvent& event )
+{
+    if( isSimulationRunning() )
+    {
+        StopSimulation();
+        m_simulateBtn->SetLabel( wxT( "Simulate" ) );
+    }
+    else
+    {
+        StartSimulation();
+        m_simulateBtn->SetLabel( wxT( "Stop" ) );
+    }
+}
+
+
+void SIM_PLOT_FRAME::onPlaceProbe( wxCommandEvent& event )
+{
+    if( m_schematicFrame == NULL )
+        return;
+
+    wxCommandEvent* placeProbe = new wxCommandEvent( wxEVT_TOOL, ID_SIM_ADD_PROBE );
+    wxQueueEvent( m_schematicFrame, placeProbe );
+}
+
+
 void SIM_PLOT_FRAME::onClose( wxCloseEvent& aEvent )
 {
     {
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 79b8c91dc6..3dee6e70ce 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -63,10 +63,19 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void AddVoltagePlot( const wxString& aNetName );
 
     private:
-        virtual void onClose( wxCloseEvent& aEvent );
-        virtual void onNewPlot( wxCommandEvent& aEvent ) { NewPlot(); }
-        virtual void onSimReport( wxThreadEvent& aEvent );
-        virtual void onSimFinished( wxThreadEvent& aEvent );
+        bool isSimulationRunning();
+
+        void onNewPlot( wxCommandEvent& aEvent ) override
+        {
+            NewPlot();
+        }
+
+        void onSimulate( wxCommandEvent& event ) override;
+        void onPlaceProbe( wxCommandEvent& event ) override;
+
+        void onClose( wxCloseEvent& aEvent );
+        void onSimReport( wxThreadEvent& aEvent );
+        void onSimFinished( wxThreadEvent& aEvent );
 
         SCH_EDIT_FRAME* m_schematicFrame;
         NETLIST_EXPORTER_PSPICE* m_exporter;
diff --git a/eeschema/sim/simulate.cpp b/eeschema/sim/simulate.cpp
index efd5e316f4..68d1ee5daf 100644
--- a/eeschema/sim/simulate.cpp
+++ b/eeschema/sim/simulate.cpp
@@ -26,7 +26,7 @@
 #include <schframe.h>
 #include "sim_plot_frame.h"
 
-void SCH_EDIT_FRAME::OnSimulationRun( wxCommandEvent& event )
+void SCH_EDIT_FRAME::OnSimulate( wxCommandEvent& event )
 {
     SIM_PLOT_FRAME* simFrame = (SIM_PLOT_FRAME*) Kiway().Player( FRAME_SIMULATOR, true );
     simFrame->Show( true );
@@ -36,14 +36,7 @@ void SCH_EDIT_FRAME::OnSimulationRun( wxCommandEvent& event )
         simFrame->Iconize( false );
 
     simFrame->Raise();
-
     simFrame->SetSchFrame( this );
-    simFrame->StartSimulation();
-}
-
-
-void SCH_EDIT_FRAME::OnSimulationStop( wxCommandEvent& event )
-{
 }
 
 

From cb463f48b11570480ccbd99dbfec4844fa6b07c6 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:16 +0200
Subject: [PATCH 031/197] Add a signal on double click

---
 eeschema/sim/sim_plot_frame.cpp | 12 +++++++++---
 eeschema/sim/sim_plot_frame.h   |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index de287f846a..73f1b321d9 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -212,14 +212,11 @@ void SIM_PLOT_FRAME::AddVoltagePlot( const wxString& aNetName )
     wxString spiceName( wxString::Format( "V(%d)", netMapping.at( aNetName ) ) );
     auto data_y = m_simulator->GetPlot( (const char*) spiceName.c_str() );
 
-    wxLogDebug( "probe %s", spiceName );
-
     if( data_y.empty() )
         return;
 
     auto data_t = m_simulator->GetPlot( "time" );
 
-    wxLogDebug( "%lu - %lu data points", data_t.size(), data_y.size() );
     SIM_PLOT_PANEL* plotPanel = static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetCurrentPage() );
     plotPanel->AddTrace( aNetName, data_t.size(), data_t.data(), data_y.data(), 0 );
 }
@@ -234,6 +231,15 @@ bool SIM_PLOT_FRAME::isSimulationRunning()
 }
 
 
+void SIM_PLOT_FRAME::onSignalDblClick( wxCommandEvent& event )
+{
+    int idx = m_signals->GetSelection();
+
+    if( idx != wxNOT_FOUND )
+        AddVoltagePlot( m_signals->GetString( idx ) );
+}
+
+
 void SIM_PLOT_FRAME::onSimulate( wxCommandEvent& event )
 {
     if( isSimulationRunning() )
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 3dee6e70ce..fe427a838e 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -70,6 +70,7 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
             NewPlot();
         }
 
+        void onSignalDblClick( wxCommandEvent& event ) override;
         void onSimulate( wxCommandEvent& event ) override;
         void onPlaceProbe( wxCommandEvent& event ) override;
 

From 8a6e6f2d3606b6d855c2a5c48a08172daeeae7c3 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:16 +0200
Subject: [PATCH 032/197] Do not add a trace if it is already plotted

---
 eeschema/sim/sim_plot_panel.cpp | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 3f197b5125..707d0c679f 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -24,6 +24,7 @@
 
 #include "sim_plot_panel.h"
 
+#include <algorithm>
 #include <limits>
 
 SIM_PLOT_PANEL::SIM_PLOT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint& pos,
@@ -65,13 +66,27 @@ static std::pair<T, T> find_minmax( const T* aArray, unsigned int aSize )
 void SIM_PLOT_PANEL::AddTrace( const wxString& aName, int aPoints,
                                 double* aT, double* aY, int aFlags )
 {
-    TRACE trace;
+    // Find previous entry, if there is one
+    auto it = std::find_if( m_traces.begin(), m_traces.end(),
+            [&](const TRACE& t) { return t.name == aName; });
 
-    trace.name = aName;
-    trace.style = wxString( '-' ) + m_painter.GenerateColor( SIM_PLOT_PAINTER::DARK );
-    trace.x.Set( aT, aPoints );
-    trace.y.Set( aY, aPoints );
-    m_traces.push_back( trace );
+    if( it == m_traces.end() )
+    {
+        // New entry
+        TRACE trace;
+        trace.name = aName;
+        trace.style = wxString( '-' ) + m_painter.GenerateColor( SIM_PLOT_PAINTER::DARK );
+        trace.x.Set( aT, aPoints );
+        trace.y.Set( aY, aPoints );
+        m_traces.push_back( trace );
+    }
+    else
+    {
+        // Update
+        TRACE& trace = *it;
+        trace.x.Set( aT, aPoints );
+        trace.y.Set( aY, aPoints );
+    }
 
     // Update axis ranges
     std::pair<double, double> traceRangeT = find_minmax( aT, aPoints );

From 8fdb9e8307b492863fab1774857e884cab5c5b42 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:17 +0200
Subject: [PATCH 033/197] SIM_PLOT_FRAME::NewPlot() ->
 SIM_PLOT_FRAME::NewPlotPanel()

---
 eeschema/sim/sim_plot_frame.cpp | 4 ++--
 eeschema/sim/sim_plot_frame.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 73f1b321d9..da37117a82 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -102,7 +102,7 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     Connect( wxEVT_SIM_REPORT, wxThreadEventHandler( SIM_PLOT_FRAME::onSimReport ), NULL, this );
     Connect( wxEVT_SIM_FINISHED, wxThreadEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
 
-    NewPlot();
+    NewPlotPanel();
 }
 
 
@@ -191,7 +191,7 @@ void SIM_PLOT_FRAME::StopSimulation()
 }
 
 
-void SIM_PLOT_FRAME::NewPlot()
+void SIM_PLOT_FRAME::NewPlotPanel()
 {
     SIM_PLOT_PANEL* plot = new SIM_PLOT_PANEL( this, wxID_ANY );
     m_plotNotebook->AddPage( plot,
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index fe427a838e..90e9a1e997 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -59,7 +59,7 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void ResumeSimulation();
         void StopSimulation();
 
-        void NewPlot();
+        void NewPlotPanel();
         void AddVoltagePlot( const wxString& aNetName );
 
     private:
@@ -67,7 +67,7 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
 
         void onNewPlot( wxCommandEvent& aEvent ) override
         {
-            NewPlot();
+            NewPlotPanel();
         }
 
         void onSignalDblClick( wxCommandEvent& event ) override;

From 38042ac9e06768285c97fef7129987e9daac8c5a Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:17 +0200
Subject: [PATCH 034/197] NGSPICE class minor cleanup

---
 eeschema/sim/ngspice.cpp |  6 ------
 eeschema/sim/ngspice.h   | 17 +++++++----------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 06ddc6883b..180873016a 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -193,12 +193,6 @@ main()
 #endif
 
 
-
-string NGSPICE::GetConsole() const {
-    return "";
-}
-
-
 int NGSPICE::cbSendChar( char* what, int id, void* user )
 {
     NGSPICE* sim = reinterpret_cast<NGSPICE*>( user );
diff --git a/eeschema/sim/ngspice.h b/eeschema/sim/ngspice.h
index bdd12248f4..262a8a2e98 100644
--- a/eeschema/sim/ngspice.h
+++ b/eeschema/sim/ngspice.h
@@ -36,16 +36,11 @@ public:
     NGSPICE();
     virtual ~NGSPICE();
 
-    void Init();
-    bool LoadNetlist( const std::string& aNetlist );
-    bool Run();
-    bool Command( const std::string& aCmd );
-
-    std::string GetConsole() const;
-
-    const std::vector<double> GetPlot( const std::string& aName, int aMaxLen = -1 );
-
-    void dump();
+    void Init() override;
+    bool LoadNetlist( const std::string& aNetlist ) override;
+    bool Run() override;
+    bool Command( const std::string& aCmd ) override;
+    const std::vector<double> GetPlot( const std::string& aName, int aMaxLen = -1 ) override;
 
 private:
     typedef void (*ngSpice_Init)( SendChar*, SendStat*, ControlledExit*,
@@ -69,6 +64,8 @@ private:
 
     static int cbSendChar( char* what, int id, void* user );
     static int cbSendStat( char* what, int id, void* user );
+
+    void dump();
 };
 
 #endif /* NGSPICE_H */

From aea29fc7307eca4e1b0af78f1ebb7af9a7412768 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:18 +0200
Subject: [PATCH 035/197] Update already plotted signals upon simulation run

---
 eeschema/sim/sim_plot_frame.cpp | 67 ++++++++++++++++++---------------
 eeschema/sim/sim_plot_frame.h   | 17 +++++++++
 eeschema/sim/sim_plot_panel.cpp |  9 +++--
 eeschema/sim/sim_plot_panel.h   | 13 +++++--
 4 files changed, 69 insertions(+), 37 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index da37117a82..ca52f0931d 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -133,8 +133,6 @@ void SIM_PLOT_FRAME::StartSimulation()
     STRING_FORMATTER formatter;
 
     m_exporter->Format( &formatter, GNL_ALL );
-    //m_plotPanel->DeleteTraces();
-
     m_simulator->LoadNetlist( formatter.GetString() );
 
     // Execute the simulation in a separate thread
@@ -201,24 +199,13 @@ void SIM_PLOT_FRAME::NewPlotPanel()
 
 void SIM_PLOT_FRAME::AddVoltagePlot( const wxString& aNetName )
 {
-    if( !m_exporter )
-        return;
+    int nodeNumber = getNodeNumber( aNetName );
 
-    const auto& netMapping = m_exporter->GetNetIndexMap();
-
-    if( netMapping.count( aNetName ) == 0 )
-        return;
-
-    wxString spiceName( wxString::Format( "V(%d)", netMapping.at( aNetName ) ) );
-    auto data_y = m_simulator->GetPlot( (const char*) spiceName.c_str() );
-
-    if( data_y.empty() )
-        return;
-
-    auto data_t = m_simulator->GetPlot( "time" );
-
-    SIM_PLOT_PANEL* plotPanel = static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetCurrentPage() );
-    plotPanel->AddTrace( aNetName, data_t.size(), data_t.data(), data_y.data(), 0 );
+    if( nodeNumber >= -1 )
+    {
+        updatePlot( wxString::Format( "V(%d)", nodeNumber ), aNetName,
+                    static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetCurrentPage() ) );
+    }
 }
 
 
@@ -227,7 +214,33 @@ bool SIM_PLOT_FRAME::isSimulationRunning()
     wxCriticalSectionLocker lock( m_simThreadCS );
 
     return ( m_simThread != NULL );
+}
 
+
+void SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aTitle, SIM_PLOT_PANEL* aPanel )
+{
+    auto data_y = m_simulator->GetPlot( (const char*) aSpiceName.c_str() );
+    auto data_t = m_simulator->GetPlot( "time" );
+
+    if( data_y.empty() || data_t.empty() )
+        return;
+
+    aPanel->AddTrace( aSpiceName, aTitle, data_t.size(), data_t.data(), data_y.data(), 0 );
+}
+
+
+int SIM_PLOT_FRAME::getNodeNumber( const wxString& aNetName )
+{
+    if( !m_exporter )
+        return -1;
+
+    const auto& netMapping = m_exporter->GetNetIndexMap();
+    auto it = netMapping.find( aNetName );
+
+    if( it == netMapping.end() )
+        return -1;
+
+    return it->second;
 }
 
 
@@ -322,18 +335,12 @@ void SIM_PLOT_FRAME::onSimFinished( wxThreadEvent& aEvent )
             m_signals->Append( net.first );
     }
 
-// TODO remove?
-#if 0
-    for( auto& name : m_exporter->GetProbeList() )
+    // If there are any signals plotted, update them
+    for( unsigned int i = 0; i < m_plotNotebook->GetPageCount(); ++i )
     {
-        char spiceName[1024];
+        SIM_PLOT_PANEL* plotPanel = static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetPage( i ) );
 
-        snprintf( spiceName, sizeof( spiceName ), "V(%d)", netMapping.at( name ) );
-        //wxLogDebug( "probe %s->%s\n", (const char *) name.c_str(), spiceName );
-        //    auto data_y = m_simulator->GetPlot( spiceName );
-
-        //wxLogDebug( "%d - %d data points\n", data_t.size(), data_y.size() );
-        //    m_plotPanel->AddTrace(wxT("V(") + name + wxT(")"), data_t.size(), data_t.data(), data_y.data(), 0);
+        for( const auto& trace : plotPanel->GetTraces() )
+            updatePlot( trace.spiceName, trace.title, plotPanel );
     }
-#endif
 }
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 90e9a1e997..66e1871e07 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -65,6 +65,23 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
     private:
         bool isSimulationRunning();
 
+        /**
+         * @brief Updates plot in a particular SIM_PLOT_PANEL. If the panel does not contain
+         * the plot, it will be added.
+         * @param aSpiceName is the plot name in the format accepted by the current simulator instance
+         * (for NGSPICE it is e.g. "V(1)").
+         * @param aTitle is the name used in the legend.
+         * @param aPanel is the panel that should receive the update.
+         */
+        void updatePlot( const wxString& aSpiceName, const wxString& aTitle, SIM_PLOT_PANEL* aPanel );
+
+        /**
+         * @brief Returns node number for a given net.
+         * @param aNetName is the net number.
+         * @return Corresponding net number or -1 if there is no such net.
+         */
+        int getNodeNumber( const wxString& aNetName );
+
         void onNewPlot( wxCommandEvent& aEvent ) override
         {
             NewPlotPanel();
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 707d0c679f..093803df27 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -63,18 +63,19 @@ static std::pair<T, T> find_minmax( const T* aArray, unsigned int aSize )
 }
 
 
-void SIM_PLOT_PANEL::AddTrace( const wxString& aName, int aPoints,
+void SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aTitle, int aPoints,
                                 double* aT, double* aY, int aFlags )
 {
     // Find previous entry, if there is one
     auto it = std::find_if( m_traces.begin(), m_traces.end(),
-            [&](const TRACE& t) { return t.name == aName; });
+            [&](const TRACE& t) { return t.title == aTitle; });
 
     if( it == m_traces.end() )
     {
         // New entry
         TRACE trace;
-        trace.name = aName;
+        trace.spiceName = aSpiceName;
+        trace.title = aTitle;
         trace.style = wxString( '-' ) + m_painter.GenerateColor( SIM_PLOT_PAINTER::DARK );
         trace.x.Set( aT, aPoints );
         trace.y.Set( aY, aPoints );
@@ -159,7 +160,7 @@ int SIM_PLOT_PAINTER::Draw( mglGraph* aGraph )
     // Draw traces
     for( auto t : traces )
     {
-        aGraph->AddLegend( (const char*) t.name.c_str(), t.style );
+        aGraph->AddLegend( (const char*) t.title.c_str(), t.style );
         aGraph->Plot( t.y, t.style );
     }
 
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 74c5f92f20..45ceb5c7a3 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -64,14 +64,21 @@ public:
 
     ~SIM_PLOT_PANEL();
 
-    struct TRACE {
-        wxString name, style;
+    struct TRACE
+    {
+        wxString spiceName, title, style;
         mglData x, y;
     };
 
-    void AddTrace( const wxString& name, int n_points, double *t, double *x, int flags = 0 );
+    void AddTrace( const wxString& aSpiceName, const wxString& aTitle, int aPoints,
+                    double* aT, double* aY, int aFlags );
     void DeleteTraces();
 
+    const std::vector<TRACE>& GetTraces() const
+    {
+        return m_traces;
+    }
+
 private:
     SIM_PLOT_PAINTER m_painter;
 

From 544da3feda449bb7b76a2ae885ba3de1e88f98b6 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:19 +0200
Subject: [PATCH 036/197] Handle 'Simulate' button label in idle event handler

---
 eeschema/sim/sim_plot_frame.cpp | 16 ++++++++++------
 eeschema/sim/sim_plot_frame.h   |  1 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index ca52f0931d..c01d170767 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -101,6 +101,7 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SIM_PLOT_FRAME::onClose ), NULL, this );
     Connect( wxEVT_SIM_REPORT, wxThreadEventHandler( SIM_PLOT_FRAME::onSimReport ), NULL, this );
     Connect( wxEVT_SIM_FINISHED, wxThreadEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
+    Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME::onIdle ), NULL, this );
 
     NewPlotPanel();
 }
@@ -256,15 +257,9 @@ void SIM_PLOT_FRAME::onSignalDblClick( wxCommandEvent& event )
 void SIM_PLOT_FRAME::onSimulate( wxCommandEvent& event )
 {
     if( isSimulationRunning() )
-    {
         StopSimulation();
-        m_simulateBtn->SetLabel( wxT( "Simulate" ) );
-    }
     else
-    {
         StartSimulation();
-        m_simulateBtn->SetLabel( wxT( "Stop" ) );
-    }
 }
 
 
@@ -315,6 +310,15 @@ void SIM_PLOT_FRAME::onClose( wxCloseEvent& aEvent )
 }
 
 
+void SIM_PLOT_FRAME::onIdle( wxIdleEvent& aEvent )
+{
+    if( isSimulationRunning() )
+        m_simulateBtn->SetLabel( wxT( "Stop" ) );
+    else
+        m_simulateBtn->SetLabel( wxT( "Simulate" ) );
+}
+
+
 void SIM_PLOT_FRAME::onSimReport( wxThreadEvent& aEvent )
 {
     m_simConsole->WriteText( aEvent.GetPayload<wxString>() );
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 66e1871e07..6132d343e3 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -92,6 +92,7 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void onPlaceProbe( wxCommandEvent& event ) override;
 
         void onClose( wxCloseEvent& aEvent );
+        void onIdle( wxIdleEvent& aEvent );
         void onSimReport( wxThreadEvent& aEvent );
         void onSimFinished( wxThreadEvent& aEvent );
 

From 9f3324bac70e26f7a32de237d506b7d93bc796e8 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:19 +0200
Subject: [PATCH 037/197] Changed the way ngspice is executed Previously it was
 run in a wxThread, but it did not allow to issue commands while the
 simulation is running. If you check ngspice shared library source code, then
 you will discover "bg_*" commands that executes commands in background, so
 the simulator still can be controlled.

---
 eeschema/sim/ngspice.cpp        |  39 +++++--
 eeschema/sim/ngspice.h          |   7 +-
 eeschema/sim/sim_plot_frame.cpp | 181 ++++++++------------------------
 eeschema/sim/sim_plot_frame.h   |  24 ++---
 eeschema/sim/sim_plot_panel.cpp |   6 +-
 eeschema/sim/sim_plot_panel.h   |   4 +-
 eeschema/sim/spice_reporter.h   |  51 +++++++++
 eeschema/sim/spice_simulator.h  |  16 +--
 8 files changed, 156 insertions(+), 172 deletions(-)
 create mode 100644 eeschema/sim/spice_reporter.h

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 180873016a..a918ca737d 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -24,10 +24,10 @@
  */
 
 #include "ngspice.h"
+#include "spice_reporter.h"
 
 #include <wx/dynlib.h>
 #include <wx/log.h>
-#include <reporter.h>
 #include <sstream>
 
 // TODO cmake modules to add include directory for ngspice
@@ -46,6 +46,7 @@ NGSPICE::NGSPICE()
     m_ngGet_Vec_Info = (ngGet_Vec_Info) m_dll->GetSymbol( "ngGet_Vec_Info" );
     m_ngSpice_AllPlots = (ngSpice_AllPlots) m_dll->GetSymbol( "ngSpice_AllPlots" );
     m_ngSpice_AllVecs = (ngSpice_AllVecs) m_dll->GetSymbol( "ngSpice_AllVecs" );
+    m_ngSpice_Running = (ngSpice_Running) m_dll->GetSymbol( "ngSpice_running" );
 }
 
 
@@ -57,7 +58,7 @@ NGSPICE::~NGSPICE()
 
 void NGSPICE::Init()
 {
-    m_ngSpice_Init( &cbSendChar, &cbSendStat, NULL, NULL, NULL, NULL, this );
+    m_ngSpice_Init( &cbSendChar, &cbSendStat, NULL, NULL, NULL, &cbBGThreadRunning, this );
 }
 
 
@@ -105,14 +106,25 @@ bool NGSPICE::LoadNetlist( const string& aNetlist )
 
 bool NGSPICE::Run()
 {
-    return Command( "run\n" );
+    return Command( "bg_run" );
+}
+
+
+bool NGSPICE::Stop()
+{
+    return Command( "bg_halt" );
+}
+
+
+bool NGSPICE::IsRunning()
+{
+    return m_ngSpice_Running();
 }
 
 
 bool NGSPICE::Command( const string& aCmd )
 {
-    m_ngSpice_Command( (char*)( aCmd + string( "\n" ) ).c_str() );
-    dump();
+    m_ngSpice_Command( (char*) aCmd.c_str() );
 
     return true;
 }
@@ -197,8 +209,8 @@ int NGSPICE::cbSendChar( char* what, int id, void* user )
 {
     NGSPICE* sim = reinterpret_cast<NGSPICE*>( user );
 
-    if( sim->m_consoleReporter )
-        sim->m_consoleReporter->Report( what );
+    if( sim->m_reporter )
+        sim->m_reporter->Report( what );
 
     return 0;
 }
@@ -209,5 +221,18 @@ int NGSPICE::cbSendStat( char* what, int id, void* user )
 /*    NGSPICE* sim = reinterpret_cast<NGSPICE*>( user );
     if( sim->m_consoleReporter )
         sim->m_consoleReporter->Report( what );*/
+
+    return 0;
+}
+
+
+int NGSPICE::cbBGThreadRunning( bool is_running, int id, void* user )
+{
+    NGSPICE* sim = reinterpret_cast<NGSPICE*>( user );
+
+    if( sim->m_reporter )
+        // I know the test below seems like an error, but well, it works somehow..
+        sim->m_reporter->OnSimStateChange( sim, is_running ? SIM_IDLE : SIM_RUNNING );
+
     return 0;
 }
diff --git a/eeschema/sim/ngspice.h b/eeschema/sim/ngspice.h
index 262a8a2e98..7decad324e 100644
--- a/eeschema/sim/ngspice.h
+++ b/eeschema/sim/ngspice.h
@@ -39,6 +39,8 @@ public:
     void Init() override;
     bool LoadNetlist( const std::string& aNetlist ) override;
     bool Run() override;
+    bool Stop() override;
+    bool IsRunning() override;
     bool Command( const std::string& aCmd ) override;
     const std::vector<double> GetPlot( const std::string& aName, int aMaxLen = -1 ) override;
 
@@ -50,8 +52,9 @@ private:
     typedef int (*ngSpice_Circ)(char** circarray);
     typedef int (*ngSpice_Command)(char* command);
     typedef pvector_info (*ngGet_Vec_Info)(char* vecname);
-    typedef char** (*ngSpice_AllVecs)(char* plotname);
     typedef char** (*ngSpice_AllPlots)(void);
+    typedef char** (*ngSpice_AllVecs)(char* plotname);
+    typedef bool (*ngSpice_Running)(void);
 
     ngSpice_Init m_ngSpice_Init;
     ngSpice_Circ m_ngSpice_Circ;
@@ -59,11 +62,13 @@ private:
     ngGet_Vec_Info m_ngGet_Vec_Info;
     ngSpice_AllPlots m_ngSpice_AllPlots;
     ngSpice_AllVecs m_ngSpice_AllVecs;
+    ngSpice_Running m_ngSpice_Running;
 
     wxDynamicLibrary* m_dll;
 
     static int cbSendChar( char* what, int id, void* user );
     static int cbSendStat( char* what, int id, void* user );
+    static int cbBGThreadRunning( bool is_running, int id, void* user );
 
     void dump();
 };
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index c01d170767..ef6d6c5014 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -30,13 +30,12 @@
 #include <netlist_exporter_kicad.h>
 #include <netlist_exporters/netlist_exporter_pspice.h>
 
-#include <reporter.h>
-
 #include "sim_plot_frame.h"
 #include "sim_plot_panel.h"
 #include "spice_simulator.h"
+#include "spice_reporter.h"
 
-class SIM_THREAD_REPORTER : public REPORTER
+class SIM_THREAD_REPORTER : public SPICE_REPORTER
 {
 public:
     SIM_THREAD_REPORTER( SIM_PLOT_FRAME* aParent )
@@ -44,48 +43,34 @@ public:
     {
     }
 
-    virtual REPORTER& Report( const wxString& aText, SEVERITY aSeverity = RPT_UNDEFINED )
+    REPORTER& Report( const wxString& aText, SEVERITY aSeverity = RPT_UNDEFINED ) override
     {
-        wxThreadEvent* event = new wxThreadEvent( wxEVT_SIM_REPORT );
-        event->SetPayload( aText );
+        wxCommandEvent* event = new wxCommandEvent( wxEVT_SIM_REPORT );
+        event->SetString( aText );
         wxQueueEvent( m_parent, event );
         return *this;
     }
 
-private:
-    SIM_PLOT_FRAME* m_parent;
-};
-
-
-class SIM_THREAD : public wxThread
-{
-public:
-    SIM_THREAD( SIM_PLOT_FRAME* aParent, SPICE_SIMULATOR* aSimulator )
-        : m_parent( aParent ), m_sim( aSimulator )
-    {}
-
-    ~SIM_THREAD()
+    void OnSimStateChange( SPICE_SIMULATOR* aObject, SIM_STATE aNewState ) override
     {
-        wxCriticalSectionLocker lock( m_parent->m_simThreadCS );
+        wxCommandEvent* event = NULL;
 
-        // Let know the parent that the pointer is not valid anymore
-        m_parent->m_simThread = NULL;
+        switch( aNewState )
+        {
+            case SIM_IDLE:
+                event = new wxCommandEvent( wxEVT_SIM_FINISHED );
+                break;
+
+            case SIM_RUNNING:
+                event = new wxCommandEvent( wxEVT_SIM_STARTED );
+                break;
+        }
+
+        wxQueueEvent( m_parent, event );
     }
 
 private:
-    // Thread routine
-    ExitCode Entry()
-    {
-        assert( m_sim );
-
-        m_sim->Run();
-        wxQueueEvent( m_parent, new wxThreadEvent( wxEVT_SIM_FINISHED ) );
-
-        return (ExitCode) 0;
-    }
-
     SIM_PLOT_FRAME* m_parent;
-    SPICE_SIMULATOR* m_sim;
 };
 
 
@@ -96,12 +81,11 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
 
     m_exporter = NULL;
     m_simulator = NULL;
-    m_simThread = NULL;
 
     Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SIM_PLOT_FRAME::onClose ), NULL, this );
-    Connect( wxEVT_SIM_REPORT, wxThreadEventHandler( SIM_PLOT_FRAME::onSimReport ), NULL, this );
-    Connect( wxEVT_SIM_FINISHED, wxThreadEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
-    Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME::onIdle ), NULL, this );
+    Connect( wxEVT_SIM_REPORT, wxCommandEventHandler( SIM_PLOT_FRAME::onSimReport ), NULL, this );
+    Connect( wxEVT_SIM_STARTED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimStarted ), NULL, this );
+    Connect( wxEVT_SIM_FINISHED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
 
     NewPlotPanel();
 }
@@ -109,9 +93,6 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
 
 SIM_PLOT_FRAME::~SIM_PLOT_FRAME()
 {
-    // m_simThread should be already destroyed by onClose()
-    assert( m_simThread == NULL );
-
     delete m_exporter;
     delete m_simulator;
 }
@@ -126,7 +107,7 @@ void SIM_PLOT_FRAME::StartSimulation()
 
     /// @todo is it necessary to recreate simulator every time?
     m_simulator = SPICE_SIMULATOR::CreateInstance( "ngspice" );
-    m_simulator->SetConsoleReporter( new SIM_THREAD_REPORTER( this ) );
+    m_simulator->SetReporter( new SIM_THREAD_REPORTER( this ) );
     m_simulator->Init();
 
     NETLIST_OBJECT_LIST* net_atoms = m_schematicFrame->BuildNetListBase();
@@ -135,58 +116,13 @@ void SIM_PLOT_FRAME::StartSimulation()
 
     m_exporter->Format( &formatter, GNL_ALL );
     m_simulator->LoadNetlist( formatter.GetString() );
-
-    // Execute the simulation in a separate thread
-    {
-        wxCriticalSectionLocker lock( m_simThreadCS );
-
-        assert( m_simThread == NULL );
-        m_simThread = new SIM_THREAD( this, m_simulator );
-
-        if( m_simThread->Run() != wxTHREAD_NO_ERROR )
-        {
-            wxLogError( "Can't create the simulator thread!" );
-            delete m_simThread;
-        }
-    }
-}
-
-
-void SIM_PLOT_FRAME::PauseSimulation()
-{
-    wxCriticalSectionLocker lock( m_simThreadCS );
-
-    if( m_simThread )
-    {
-        if( m_simThread->Pause() != wxTHREAD_NO_ERROR )
-            wxLogError( "Cannot pause the simulation thread" );
-    }
-}
-
-
-void SIM_PLOT_FRAME::ResumeSimulation()
-{
-    wxCriticalSectionLocker lock( m_simThreadCS );
-
-    if( m_simThread )
-    {
-        if( m_simThread->Resume() != wxTHREAD_NO_ERROR )
-            wxLogError( "Cannot resume the simulation thread" );
-    }
+    m_simulator->Run();
 }
 
 
 void SIM_PLOT_FRAME::StopSimulation()
 {
-    wxCriticalSectionLocker lock( m_simThreadCS );
-
-    if( m_simThread )
-    {
-        // we could use m_simThread->Delete() if there was a way to run the simulation
-        // in parts, so the thread would be able to call TestDestroy()
-        if( m_simThread->Kill() != wxTHREAD_NO_ERROR )
-            wxLogError( "Cannot delete the simulation thread" );
-    }
+    m_simulator->Stop();
 }
 
 
@@ -212,9 +148,7 @@ void SIM_PLOT_FRAME::AddVoltagePlot( const wxString& aNetName )
 
 bool SIM_PLOT_FRAME::isSimulationRunning()
 {
-    wxCriticalSectionLocker lock( m_simThreadCS );
-
-    return ( m_simThread != NULL );
+    return m_simulator ? m_simulator->IsRunning() : false;
 }
 
 
@@ -275,65 +209,29 @@ void SIM_PLOT_FRAME::onPlaceProbe( wxCommandEvent& event )
 
 void SIM_PLOT_FRAME::onClose( wxCloseEvent& aEvent )
 {
-    {
-        wxCriticalSectionLocker lock( m_simThreadCS );
-
-        if( m_simThread )
-        {
-            if( m_simThread->Delete() != wxTHREAD_NO_ERROR )
-                wxLogError( "Cannot delete the simulation thread" );
-        }
-    }
-
-    int timeout = 10;
-
-    while( 1 )
-    {
-        // Wait until the thread is finished
-        {
-            wxCriticalSectionLocker lock( m_simThreadCS );
-
-            if( m_simThread == NULL )
-                break;
-        }
-
-        wxThread::This()->Sleep( 1 );
-
-        if( --timeout == 0 )
-        {
-            m_simThread->Kill();        // no mercy
-            break;
-        }
-    }
+    if( isSimulationRunning() )
+        m_simulator->Stop();
 
     Destroy();
 }
 
 
-void SIM_PLOT_FRAME::onIdle( wxIdleEvent& aEvent )
+void SIM_PLOT_FRAME::onSimStarted( wxCommandEvent& aEvent )
 {
-    if( isSimulationRunning() )
-        m_simulateBtn->SetLabel( wxT( "Stop" ) );
-    else
-        m_simulateBtn->SetLabel( wxT( "Simulate" ) );
+    m_simulateBtn->SetLabel( wxT( "Stop" ) );
+    SetCursor( wxCURSOR_ARROWWAIT );
 }
 
 
-void SIM_PLOT_FRAME::onSimReport( wxThreadEvent& aEvent )
+void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
 {
-    m_simConsole->WriteText( aEvent.GetPayload<wxString>() );
-    m_simConsole->Newline();
-}
-
-
-void SIM_PLOT_FRAME::onSimFinished( wxThreadEvent& aEvent )
-{
-    const auto& netMapping = m_exporter->GetNetIndexMap();
+    m_simulateBtn->SetLabel( wxT( "Simulate" ) );
+    SetCursor( wxCURSOR_ARROW );
 
     // Fill the signals listbox
     m_signals->Clear();
 
-    for( const auto& net : netMapping )
+    for( const auto& net : m_exporter->GetNetIndexMap() )
     {
         if( net.first != "GND" )
             m_signals->Append( net.first );
@@ -343,8 +241,17 @@ void SIM_PLOT_FRAME::onSimFinished( wxThreadEvent& aEvent )
     for( unsigned int i = 0; i < m_plotNotebook->GetPageCount(); ++i )
     {
         SIM_PLOT_PANEL* plotPanel = static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetPage( i ) );
+        plotPanel->ResetAxisRanges();
 
         for( const auto& trace : plotPanel->GetTraces() )
             updatePlot( trace.spiceName, trace.title, plotPanel );
     }
 }
+
+
+void SIM_PLOT_FRAME::onSimReport( wxCommandEvent& aEvent )
+{
+    m_simConsole->AppendText( aEvent.GetString() );
+    m_simConsole->Newline();
+    m_simConsole->MoveEnd();        /// @todo does not work..
+}
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 6132d343e3..c688cc93dc 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -27,19 +27,17 @@
 #define __sim_plot_frame__
 
 /**
-@file
-Subclass of SIM_PLOT_FRAME_BASE, which is generated by wxFormBuilder.
-*/
+@file Subclass of SIM_PLOT_FRAME_BASE, which is generated by wxFormBuilder. */
 
 #include "sim_plot_frame_base.h"
 #include "kiway_player.h"
 #include <netlist_exporters/netlist_exporter_pspice.h>
+
 #include <wx/event.h>
 
 class SPICE_SIMULATOR;
 class NETLIST_EXPORTER_PSPICE;
 class SIM_PLOT_PANEL;
-class SIM_THREAD;
 
 /** Implementing SIM_PLOT_FRAME_BASE */
 class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
@@ -55,8 +53,6 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         }
 
         void StartSimulation();
-        void PauseSimulation();
-        void ResumeSimulation();
         void StopSimulation();
 
         void NewPlotPanel();
@@ -92,20 +88,18 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void onPlaceProbe( wxCommandEvent& event ) override;
 
         void onClose( wxCloseEvent& aEvent );
-        void onIdle( wxIdleEvent& aEvent );
-        void onSimReport( wxThreadEvent& aEvent );
-        void onSimFinished( wxThreadEvent& aEvent );
+
+        void onSimStarted( wxCommandEvent& aEvent );
+        void onSimFinished( wxCommandEvent& aEvent );
+        void onSimReport( wxCommandEvent& aEvent );
 
         SCH_EDIT_FRAME* m_schematicFrame;
         NETLIST_EXPORTER_PSPICE* m_exporter;
         SPICE_SIMULATOR* m_simulator;
-        SIM_THREAD* m_simThread;
-        wxCriticalSection m_simThreadCS;
-
-        friend class SIM_THREAD;
 };
 
-wxDEFINE_EVENT( wxEVT_SIM_REPORT, wxThreadEvent );
-wxDEFINE_EVENT( wxEVT_SIM_FINISHED, wxThreadEvent );
+wxDEFINE_EVENT( wxEVT_SIM_REPORT, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_SIM_STARTED, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_SIM_FINISHED, wxCommandEvent );
 
 #endif // __sim_plot_frame__
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 093803df27..7b330288c8 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -32,7 +32,7 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint&
     : wxMathGL( parent, id, pos, size, style, name ), m_painter( this )
 {
     AutoResize = true;
-    resetRanges();
+    ResetAxisRanges();
     SetDraw( &m_painter );
 }
 
@@ -105,12 +105,12 @@ void SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aTitl
 void SIM_PLOT_PANEL::DeleteTraces()
 {
     m_traces.clear();
-    resetRanges();
+    ResetAxisRanges();
     Update();
 }
 
 
-void SIM_PLOT_PANEL::resetRanges()
+void SIM_PLOT_PANEL::ResetAxisRanges()
 {
     // Set ranges to inverted values, so when there is a new plot added, it will
     // overridden with correct values
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 45ceb5c7a3..b71bf6ea32 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -79,6 +79,8 @@ public:
         return m_traces;
     }
 
+    void ResetAxisRanges();
+
 private:
     SIM_PLOT_PAINTER m_painter;
 
@@ -88,8 +90,6 @@ private:
     // Axis ranges determined by the added traces data
     std::pair<double, double> m_axisRangeX, m_axisRangeY;
 
-    void resetRanges();
-
     friend class SIM_PLOT_PAINTER;
 };
 
diff --git a/eeschema/sim/spice_reporter.h b/eeschema/sim/spice_reporter.h
new file mode 100644
index 0000000000..6b0e0b5bfc
--- /dev/null
+++ b/eeschema/sim/spice_reporter.h
@@ -0,0 +1,51 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef SPICE_REPORTER_H
+#define SPICE_REPORTER_H
+
+#include <reporter.h>
+
+class SPICE_SIMULATOR;
+
+enum SIM_STATE
+{
+    SIM_IDLE,
+    SIM_RUNNING
+};
+
+/**
+ * @brief Interface to receive simulation updates from SPICE_SIMULATOR class.
+ */
+class SPICE_REPORTER : public REPORTER
+{
+public:
+    virtual ~SPICE_REPORTER()
+    {
+    }
+
+    virtual void OnSimStateChange( SPICE_SIMULATOR* aObject, SIM_STATE aNewState ) = 0;
+};
+
+#endif /* SPICE_REPORTER_H */
diff --git a/eeschema/sim/spice_simulator.h b/eeschema/sim/spice_simulator.h
index 9d34540eae..ead779e3c3 100644
--- a/eeschema/sim/spice_simulator.h
+++ b/eeschema/sim/spice_simulator.h
@@ -28,7 +28,7 @@
 #include <string>
 #include <vector>
 
-class REPORTER;
+class SPICE_REPORTER;
 
 enum SIM_TRACE_TYPE
 {
@@ -39,10 +39,10 @@ enum SIM_TRACE_TYPE
     SIM_TR_FFT = 0x10
 };
 
-class SPICE_SIMULATOR {
-
+class SPICE_SIMULATOR
+{
 public:
-    SPICE_SIMULATOR() : m_consoleReporter( NULL ) {}
+    SPICE_SIMULATOR() : m_reporter( NULL ) {}
     virtual ~SPICE_SIMULATOR() {}
 
     static SPICE_SIMULATOR* CreateInstance( const std::string& aName );
@@ -50,17 +50,19 @@ public:
     virtual void Init() = 0;
     virtual bool LoadNetlist( const std::string& aNetlist ) = 0;
     virtual bool Run() = 0;
+    virtual bool Stop() = 0;
+    virtual bool IsRunning() = 0;
     virtual bool Command( const std::string& aCmd ) = 0;
 
-    virtual void SetConsoleReporter( REPORTER* aReporter )
+    virtual void SetReporter( SPICE_REPORTER* aReporter )
     {
-        m_consoleReporter = aReporter;
+        m_reporter = aReporter;
     }
 
     virtual const std::vector<double> GetPlot( const std::string& aName, int aMaxLen = -1 ) = 0;
 
 protected:
-    REPORTER* m_consoleReporter;
+    SPICE_REPORTER* m_reporter;
 };
 
 #endif /* SPICE_SIMULATOR_H */

From 50977be7b11a4fddb8476a112d8758ccff6dc788 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:20 +0200
Subject: [PATCH 038/197] Added TODO

---
 TODO | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 TODO

diff --git a/TODO b/TODO
new file mode 100644
index 0000000000..c2a9e5274b
--- /dev/null
+++ b/TODO
@@ -0,0 +1,36 @@
+fix spice netlist exporter
+view controls (zoom, pan, fit to screen)
+simulation settings
+plot settings - axis range, colors
+check what happens when nets are changed/removed and simulation rerun
+check what happens when the simulator is closed while simulation is running
+cmake check for mathgl, ngspice; there is one in the mathgl repo
+check changes to cmakefiles for temporary & dirty hacks
+tuner
+parameters?
+
+
+optional:
+progress bar (using SendStat callback?)
+export png
+show .cir source?
+"include spice library" in menu? or on sim_plot_frame?
+
+-- Installing: /usr/local/lib/python2.7/site-packages/pcbnew.py
+-- Up-to-date: /usr/local/share/kicad/scripting/plugins
+-- Installing: /usr/local/share/kicad/scripting/plugins/zip_wizard.py
+-- Installing: /usr/local/share/kicad/scripting/plugins/sdip_wizard.py
+-- Installing: /usr/local/share/kicad/scripting/plugins/PadArray.py
+-- Installing: /usr/local/share/kicad/scripting/plugins/HelpfulFootprintWizardPlugin.py
+-- Installing: /usr/local/share/kicad/scripting/plugins/touch_slider_wizard.py
+-- Installing: /usr/local/share/kicad/scripting/plugins/FPC_(SMD_type)_footprintwizard.py
+-- Installing: /usr/local/share/kicad/scripting/plugins/__init__.py
+-- Installing: /usr/local/share/kicad/scripting/plugins/bga_wizard.py
+-- Installing: /usr/local/share/kicad/scripting/plugins/qfp_wizard.py
+-- Installing: /usr/local/share/kicad/scripting/plugins/circular_pad_array_wizard.py
+-- Installing: /usr/local/share/kicad/scripting/plugins/FootprintWizardDrawingAids.py
+-- Installing: /usr/local/share/kicad/scripting/plugins/uss39_barcode.py
+-- Installing: /usr/local/share/kicad/scripting/plugins/qfn_wizard.py
+-- Installing: /usr/local/share/kicad/scripting/kicad_pyshell
+-- Installing: /usr/local/share/kicad/scripting/kicad_pyshell/__init__.py
+-- Installing: /usr/local/lib/python2.7/site-packages/_pcbnew.so

From 68e3daec6e0d77e4e43881d704a2eb69898d69bf Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:20 +0200
Subject: [PATCH 039/197] Removed probe-related stuff from
 NETLIST_EXPORTER_PSPICE

---
 .../netlist_exporter_pspice.cpp               | 21 -------------------
 .../netlist_exporter_pspice.h                 |  7 -------
 2 files changed, 28 deletions(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 0d66e704ba..706479fac2 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -61,7 +61,6 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
 
     formatter->Print( 0, ".title KiCad schematic\n" );
 
-    m_probes.clear();
     m_netMap.clear();
 
     // Ground net has to be always assigned to node 0
@@ -186,26 +185,6 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
                 }
             }
 
-            // TODO remove?
-#if 0
-            if(CompValue == wxT("SPICE_PROBE"))
-            {
-                NETLIST_OBJECT* pin = m_SortedComponentPinList[0];
-
-                //printf("Probe net: %s\n", (const char*) pin->GetNetName().c_str() );
-
-                m_probes.push_back(pin->GetNetName());
-                continue;
-            }
-
-            //Conditionally add Prefix only for devices that begin with U or IC:
-            if( aUsePrefix )
-            {
-                //if( RefName.StartsWith( wxT( "U" ) ) || RefName.StartsWith( wxT( "IC" ) ) )
-                //    RefName = wxT( "X" ) + RefName;
-            }
-#endif
-
             int activePinIndex = 0;
 
             formatter->Print( 0, "%s%s ", (const char*) primType.c_str(), (const char*) RefName.c_str() );
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index 3e23ae9e28..a960de0b4e 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -44,7 +44,6 @@ public:
     }
 
     typedef std::map<wxString, int> NET_INDEX_MAP;
-    typedef std::vector<wxString> PROBE_LIST;
 
     /**
      * Function WriteNetlist
@@ -59,11 +58,6 @@ public:
         return m_netMap;
     }
 
-    const PROBE_LIST& GetProbeList() const
-    {
-        return m_probes;
-    }
-
     static const std::vector<wxString>& GetSpiceFields()
     {
         return m_spiceFields;
@@ -73,7 +67,6 @@ public:
 
 private:
     NET_INDEX_MAP m_netMap;
-    PROBE_LIST m_probes;
     SEARCH_STACK* m_paths;
 
     // Fields that are used during netlist export & simulation

From 5795a2dbf33670d092d3f5207a3d3863711f6e62 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:20 +0200
Subject: [PATCH 040/197] Fixed Spice netlist exporter

---
 TODO                                                   | 2 +-
 eeschema/netlist_exporters/netlist_exporter_pspice.cpp | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/TODO b/TODO
index c2a9e5274b..2e2bf5456c 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-fix spice netlist exporter
+TEST: fix spice netlist exporter
 view controls (zoom, pan, fit to screen)
 simulation settings
 plot settings - axis range, colors
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 706479fac2..20c658c30a 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -41,7 +41,13 @@
 
 bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions )
 {
-    return false;
+    /// @todo take options into account
+    //bool aUsePrefix = aNetlistOptions & NET_USE_X_PREFIX;
+    //bool aUseNetcodeAsNetName = aNetlistOptions & NET_USE_NETCODES_AS_NETNAMES;
+
+    FILE_OUTPUTFORMATTER outputFile( aOutFileName, wxT( "wt" ), '\'' );
+
+    return Format( &outputFile, aNetlistOptions );
 }
 
 

From 951d16c6551ededea4846935fb7625e131892a9f Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:20 +0200
Subject: [PATCH 041/197] Fixed Spice netlist export options and added a few
 new flags

---
 .../dialog_edit_component_in_schematic.cpp    |  3 +-
 eeschema/dialogs/dialog_netlist.cpp           |  1 +
 eeschema/netlist.h                            |  7 --
 .../netlist_exporter_pspice.cpp               | 79 +++++++------------
 .../netlist_exporter_pspice.h                 | 13 ++-
 eeschema/sim/sim_plot_frame.cpp               |  2 +-
 6 files changed, 44 insertions(+), 61 deletions(-)

diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
index 68f6c1e33c..e72882c719 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
@@ -306,7 +306,8 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::EditSpiceFields( wxCommandEvent& event
 
         if( schField->GetText().IsEmpty() )
         {
-            schField->SetText( NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( fieldName, m_cmp ) );
+            schField->SetText( NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( fieldName, m_cmp,
+                NET_USE_X_PREFIX | NET_ADJUST_INCLUDE_PATHS | NET_ADJUST_PASSIVE_VALS ) );
         }
     }
 
diff --git a/eeschema/dialogs/dialog_netlist.cpp b/eeschema/dialogs/dialog_netlist.cpp
index bd42d3dd65..a78b8086ed 100644
--- a/eeschema/dialogs/dialog_netlist.cpp
+++ b/eeschema/dialogs/dialog_netlist.cpp
@@ -52,6 +52,7 @@
 #include <wildcards_and_files_ext.h>
 #include <wildcards_and_files_ext.h>
 #include <invoke_sch_dialog.h>
+#include <netlist_exporters/netlist_exporter_pspice.h>
 
 #include <eeschema_id.h>
 
diff --git a/eeschema/netlist.h b/eeschema/netlist.h
index 2d20554ad0..8c0f608a71 100644
--- a/eeschema/netlist.h
+++ b/eeschema/netlist.h
@@ -47,13 +47,6 @@ enum  NETLIST_TYPE_ID {
 };
 
 
-/// Options for Spice netlist generation (OR'ed bits
-enum netlistOptions {
-    NET_USE_X_PREFIX = 2,               // for Spice netlist : change "U" and "IC" reference prefix to "X"
-    NET_USE_NETCODES_AS_NETNAMES = 4    // for Spice netlist : use netcode numbers as netnames
-};
-
-
 #define NETLIST_HEAD_STRING "EESchema Netlist Version 1.1"
 
 // Max pin number per component and footprint
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 20c658c30a..1a71acba50 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -41,10 +41,6 @@
 
 bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions )
 {
-    /// @todo take options into account
-    //bool aUsePrefix = aNetlistOptions & NET_USE_X_PREFIX;
-    //bool aUseNetcodeAsNetName = aNetlistOptions & NET_USE_NETCODES_AS_NETNAMES;
-
     FILE_OUTPUTFORMATTER outputFile( aOutFileName, wxT( "wt" ), '\'' );
 
     return Format( &outputFile, aNetlistOptions );
@@ -53,11 +49,13 @@ bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsign
 
 bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
 {
-    int                 ret = 0;
     std::vector<int>    pinSequence;                    // numeric indices into m_SortedComponentPinList
     wxArrayString       stdPinNameArray;                // Array containing Standard Pin Names
     const wxString      delimiters( "{:,; }" );
 
+    // Netlist options
+    bool useNetcodeAsNetName = aCtl & NET_USE_NETCODES_AS_NETNAMES;
+
     // Prepare list of nets generation (not used here, but...
     for( unsigned ii = 0; ii < m_masterList->size(); ii++ )
         m_masterList->GetItem( ii )->m_Flag = 0;
@@ -93,7 +91,7 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
                     wxString directive( tokenizer.GetNextToken() );
 
                     // Fix paths for .include directives
-                    if( m_paths && directive.StartsWith( ".inc" ) )
+                    if( aCtl & NET_ADJUST_INCLUDE_PATHS && m_paths && directive.StartsWith( ".inc" ) )
                     {
                         wxString file( directive.AfterFirst( ' ' ) );
                         wxString path( m_paths->FindValidPath( file ) );
@@ -134,10 +132,10 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
             SCH_FIELD* spiceSeqField = comp->FindField( wxT( "Spice_Node_Sequence" ) );
 
             wxString model = spiceModel ? spiceModel->GetText()
-                : GetSpiceFieldDefVal( "Spice_Model", comp );
+                : GetSpiceFieldDefVal( "Spice_Model", comp, aCtl );
 
             wxString primType = spicePrimitiveType ? spicePrimitiveType->GetText()
-                : GetSpiceFieldDefVal( "Spice_Primitive", comp );
+                : GetSpiceFieldDefVal( "Spice_Primitive", comp, aCtl );
 
             const wxString& RefName = comp->GetRef( &sheetList[sheet_idx] );
 
@@ -146,6 +144,7 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
             {
                 wxString netlistEnabled = netlistEnabledField->GetText();
 
+                // Different ways of saying 'disabled' (no/false/0)
                 if( netlistEnabled.CmpNoCase( "N" ) == 0
                         || netlistEnabled.CmpNoCase( "F" ) == 0
                         || netlistEnabled == "0" )
@@ -237,24 +236,29 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
                 {
                     netIdx = curNetIndex++;
                     m_netMap[netName] = netIdx;
-                } else {
+                }
+                else
+                {
                     netIdx = m_netMap[netName];
                 }
 
-// TODO remove?
-                //printf("net %s index %d\n", (const char*)netName.c_str(), netIdx);
-//                sprintPinNetName( netName , wxT( "N-%.6d" ), pin, aUseNetcodeAsNetName );
+                if( useNetcodeAsNetName )
+                {
+                    formatter->Print( 0, "%d ", netIdx );
+                }
+                else
+                {
+                    sprintPinNetName( netName , wxT( "N-%.6d" ), pin, useNetcodeAsNetName );
 
-                //Replace parenthesis with underscore to prevent parse issues with Simulators:
-//                netName.Replace( wxT( "(" ), wxT( "_" ) );
-//                netName.Replace( wxT( ")" ), wxT( "_" ) );
+                    //Replace parenthesis with underscore to prevent parse issues with simulators
+                    netName.Replace( wxT( "(" ), wxT( "_" ) );
+                    netName.Replace( wxT( ")" ), wxT( "_" ) );
 
-//                if( netName.IsEmpty() )
-//                    netName = wxT( "?" );
+                    if( netName.IsEmpty() )
+                        netName = wxT( "?" );
 
-//                ret |= fprintf( f, " %s", TO_UTF8( netName ) );
-
-                formatter->Print( 0, "%d ", netIdx );
+                    formatter->Print( 0, "%s ", TO_UTF8( netName ) );
+                }
             }
 
             formatter->Print( 0, "%s\n", (const char*) model.c_str() );
@@ -269,44 +273,19 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
 
     formatter->Print( -1, ".end\n" );
 
-// TODO remove?
-#if 0
-    m_SortedComponentPinList.clear();
-
-    // Print texts starting with [+]pspice or [+]gnucap
-    nbitems = spiceCommandAtEndFile.GetCount();
-
-    if( nbitems )
-    {
-        ret |= fprintf( f, "\n" );
-        spiceCommandAtEndFile.Sort();
-
-        for( int ii = 0; ii < nbitems; ii++ )
-        {
-            spiceCommandAtEndFile[ii].Remove( 0, +BUFYPOS_LEN );
-            spiceCommandAtEndFile[ii].Trim( true );
-            spiceCommandAtEndFile[ii].Trim( false );
-            ret |= fprintf( f, "%s\n", TO_UTF8( spiceCommandAtEndFile[ii] ) );
-        }
-    }
-
-    ret |= fprintf( f, "\n.end\n" );
-    fclose( f );
-#endif
-
-    return ret >= 0;
+    return true;
 }
 
 
 wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
-        SCH_COMPONENT* aComponent )
+        SCH_COMPONENT* aComponent, int aCtl )
 {
     if( aField == "Spice_Primitive" )
     {
         const wxString& refName = aComponent->GetField( REFERENCE )->GetText();
 
         // Convert ICs to subcircuits
-        if( refName.StartsWith( "IC" ) || refName.StartsWith( "U" ) )
+        if( aCtl & NET_USE_X_PREFIX && ( refName.StartsWith( "IC" ) || refName.StartsWith( "U" ) ) )
             return wxString( "X" );
         else
             return refName.GetChar( 0 );
@@ -318,7 +297,7 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
         wxString value = aComponent->GetField( VALUE )->GetText();
 
         // Is it a passive component?
-        if( prim == 'C' || prim == 'L' || prim == 'R' )
+        if( aCtl & NET_ADJUST_PASSIVE_VALS && ( prim == 'C' || prim == 'L' || prim == 'R' ) )
         {
             // Regular expression to match common formats used for passive parts description
             // (e.g. 100k, 2k3, 1 uF)
@@ -338,9 +317,7 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
                 if( unit == "M" )
                     unit = "Meg";
 
-                wxLogDebug( "Changed passive value: %s..", value );
                 value = prefix + unit + suffix;
-                wxLogDebug( "..to: %s", value );
             }
         }
 
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index a960de0b4e..b547c12476 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -31,6 +31,16 @@
 
 class SEARCH_STACK;
 
+/// Flags for Spice netlist generation (can be combined)
+enum SPICE_NETLIST_OPTIONS {
+    NET_USE_X_PREFIX = 2,               // change "U" and "IC" reference prefix to "X"
+    NET_USE_NETCODES_AS_NETNAMES = 4,   // use netcode numbers as netnames
+    NET_ADJUST_INCLUDE_PATHS = 8,       // use full paths for included files (if they are in search path)
+    NET_ADJUST_PASSIVE_VALS = 16        // reformat passive component values (e.g. 1M -> 1Meg)
+};
+
+/// @todo add NET_ADJUST_INCLUDE_PATHS & NET_ADJUST_PASSIVE_VALS checkboxes in the netlist export dialog
+
 /**
  * Class NETLIST_EXPORTER_PSPICE
  * generates a PSPICE compatible netlist
@@ -43,6 +53,7 @@ public:
     {
     }
 
+    ///> Net name to node number mapping
     typedef std::map<wxString, int> NET_INDEX_MAP;
 
     /**
@@ -63,7 +74,7 @@ public:
         return m_spiceFields;
     }
 
-    static wxString GetSpiceFieldDefVal( const wxString& aField, SCH_COMPONENT* aComponent );
+    static wxString GetSpiceFieldDefVal( const wxString& aField, SCH_COMPONENT* aComponent, int aCtl );
 
 private:
     NET_INDEX_MAP m_netMap;
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index ef6d6c5014..f4ebd8a067 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -111,9 +111,9 @@ void SIM_PLOT_FRAME::StartSimulation()
     m_simulator->Init();
 
     NETLIST_OBJECT_LIST* net_atoms = m_schematicFrame->BuildNetListBase();
-    m_exporter = new NETLIST_EXPORTER_PSPICE( net_atoms, Prj().SchLibs(), Prj().SchSearchS() );
     STRING_FORMATTER formatter;
 
+    m_exporter = new NETLIST_EXPORTER_PSPICE( net_atoms, Prj().SchLibs(), Prj().SchSearchS() );
     m_exporter->Format( &formatter, GNL_ALL );
     m_simulator->LoadNetlist( formatter.GetString() );
     m_simulator->Run();

From 51906625eefbcca2d2f2a47a8009bc03b95f4876 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:21 +0200
Subject: [PATCH 042/197] Replaced sim plotting widget with wxMathPlot

---
 common/CMakeLists.txt           |    1 +
 common/widgets/mathplot.cpp     | 3001 +++++++++++++++++++++++++++++++
 eeschema/CMakeLists.txt         |   10 +-
 eeschema/sim/sim_plot_frame.cpp |   14 +-
 eeschema/sim/sim_plot_frame.h   |    2 +
 eeschema/sim/sim_plot_panel.cpp |  210 +--
 eeschema/sim/sim_plot_panel.h   |   80 +-
 include/widgets/mathplot.h      | 1695 +++++++++++++++++
 8 files changed, 4802 insertions(+), 211 deletions(-)
 create mode 100644 common/widgets/mathplot.cpp
 create mode 100644 include/widgets/mathplot.h

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index bbcaffa3b2..612c817bed 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -169,6 +169,7 @@ set( COMMON_DLG_SRCS
     )
 
 set( COMMON_WIDGET_SRCS
+    widgets/mathplot.cpp
     widgets/widget_hotkey_list.cpp
     )
 
diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
new file mode 100644
index 0000000000..18fe939fc2
--- /dev/null
+++ b/common/widgets/mathplot.cpp
@@ -0,0 +1,3001 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:            mathplot.cpp
+// Purpose:         Framework for plotting in wxWindows
+// Original Author: David Schalig
+// Maintainer:      Davide Rondini
+// Contributors:    Jose Luis Blanco, Val Greene
+// Created:         21/07/2003
+// Last edit:       09/09/2007
+// Copyright:       (c) David Schalig, Davide Rondini
+// Licence:         wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+// #pragma implementation "plot.h"
+#pragma implementation "mathplot.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include <wx/window.h>
+//#include <wx/wxprec.h>
+
+// Comment out for release operation:
+// (Added by J.L.Blanco, Aug 2007)
+// #define MATHPLOT_DO_LOGGING
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/object.h"
+#include "wx/font.h"
+#include "wx/colour.h"
+#include "wx/settings.h"
+#include "wx/sizer.h"
+#include "wx/log.h"
+#include "wx/intl.h"
+#include "wx/dcclient.h"
+#include "wx/cursor.h"
+#endif
+
+#include <widgets/mathplot.h>
+#include <wx/bmpbuttn.h>
+#include <wx/module.h>
+#include <wx/msgdlg.h>
+#include <wx/image.h>
+#include <wx/tipwin.h>
+
+#include <cmath>
+#include <cstdio> // used only for debug
+#include <ctime> // used for representation of x axes involving date
+
+// #include "pixel.xpm"
+
+// Memory leak debugging
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
+// Legend margins
+#define mpLEGEND_MARGIN 5
+#define mpLEGEND_LINEWIDTH 10
+
+// Minimum axis label separation
+#define mpMIN_X_AXIS_LABEL_SEPARATION 64
+#define mpMIN_Y_AXIS_LABEL_SEPARATION 32
+
+// Number of pixels to scroll when scrolling by a line
+#define mpSCROLL_NUM_PIXELS_PER_LINE  10
+
+// See doxygen comments.
+double mpWindow::zoomIncrementalFactor = 1.5;
+
+//-----------------------------------------------------------------------------
+// mpLayer
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(mpLayer, wxObject)
+
+mpLayer::mpLayer() : m_type(mpLAYER_UNDEF)
+{
+    SetPen((wxPen&) *wxBLACK_PEN);
+    SetFont((wxFont&) *wxNORMAL_FONT);
+    m_continuous = FALSE; // Default
+    m_showName   = TRUE;  // Default
+    m_drawOutsideMargins = TRUE;
+    m_visible = true;
+}
+
+wxBitmap mpLayer::GetColourSquare(int side)
+{
+    wxBitmap square(side, side, -1);
+    wxColour filler = m_pen.GetColour();
+    wxBrush brush(filler, wxSOLID);
+    wxMemoryDC dc;
+    dc.SelectObject(square);
+    dc.SetBackground(brush);
+    dc.Clear();
+    dc.SelectObject(wxNullBitmap);
+    return square;
+}
+
+//-----------------------------------------------------------------------------
+// mpInfoLayer
+//-----------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC_CLASS(mpInfoLayer, mpLayer)
+
+mpInfoLayer::mpInfoLayer()
+{
+    m_dim = wxRect(0,0,1,1);
+    m_brush = *wxTRANSPARENT_BRUSH;
+    m_reference.x = 0; m_reference.y = 0;
+    m_winX = 1; //parent->GetScrX();
+    m_winY = 1; //parent->GetScrY();
+    m_type = mpLAYER_INFO;
+}
+
+mpInfoLayer::mpInfoLayer(wxRect rect, const wxBrush* brush) : m_dim(rect)
+{
+    m_brush = *brush;
+    m_reference.x = rect.x;
+    m_reference.y = rect.y;
+    m_winX = 1; //parent->GetScrX();
+    m_winY = 1; //parent->GetScrY();
+    m_type = mpLAYER_INFO;
+}
+
+mpInfoLayer::~mpInfoLayer()
+{
+
+}
+
+void mpInfoLayer::UpdateInfo(mpWindow& w, wxEvent& event)
+{
+
+}
+
+bool mpInfoLayer::Inside(wxPoint& point)
+{
+    return m_dim.Contains(point);
+}
+
+void mpInfoLayer::Move(wxPoint delta)
+{
+    m_dim.SetX(m_reference.x + delta.x);
+    m_dim.SetY(m_reference.y + delta.y);
+}
+
+void mpInfoLayer::UpdateReference()
+{
+    m_reference.x = m_dim.x;
+    m_reference.y = m_dim.y;
+}
+
+
+void   mpInfoLayer::Plot(wxDC & dc, mpWindow & w)
+{
+    if (m_visible) {
+        // Adjust relative position inside the window
+        int scrx = w.GetScrX();
+        int scry = w.GetScrY();
+        // Avoid dividing by 0
+        if(scrx == 0) scrx=1;
+        if(scry == 0) scry=1;
+
+        if ((m_winX != scrx) || (m_winY != scry)) {
+#ifdef MATHPLOT_DO_LOGGING
+            // wxLogMessage(_("mpInfoLayer::Plot() screen size has changed from %d x %d to %d x %d"), m_winX, m_winY, scrx, scry);
+#endif
+            if (m_winX != 1) m_dim.x = (int) floor((double)(m_dim.x*scrx/m_winX));
+            if (m_winY != 1) {
+                m_dim.y = (int) floor((double)(m_dim.y*scry/m_winY));
+                UpdateReference();
+            }
+            // Finally update window size
+            m_winX = scrx;
+            m_winY = scry;
+        }
+        dc.SetPen(m_pen);
+        //     wxImage image0(wxT("pixel.png"), wxBITMAP_TYPE_PNG);
+        //     wxBitmap image1(image0);
+        //     wxBrush semiWhite(image1);
+        dc.SetBrush(m_brush);
+        dc.DrawRectangle(m_dim.x, m_dim.y, m_dim.width, m_dim.height);
+    }
+}
+
+wxPoint mpInfoLayer::GetPosition()
+{
+    return m_dim.GetPosition();
+}
+
+wxSize mpInfoLayer::GetSize()
+{
+    return m_dim.GetSize();
+}
+
+mpInfoCoords::mpInfoCoords() : mpInfoLayer()
+{
+
+}
+
+mpInfoCoords::mpInfoCoords(wxRect rect, const wxBrush* brush) : mpInfoLayer(rect, brush)
+{
+
+}
+
+mpInfoCoords::~mpInfoCoords()
+{
+
+}
+
+void mpInfoCoords::UpdateInfo(mpWindow& w, wxEvent& event)
+{
+    if (event.GetEventType() == wxEVT_MOTION) {
+        int mouseX = ((wxMouseEvent&)event).GetX();
+        int mouseY = ((wxMouseEvent&)event).GetY();
+        /* It seems that Windows port of wxWidgets don't support multi-line test to be drawn in a wxDC.
+           wxGTK instead works perfectly with it.
+           Info on wxForum: http://wxforum.shadonet.com/viewtopic.php?t=3451&highlight=drawtext+eol */
+#ifdef _WINDOWS
+        m_content.Printf(wxT("x = %f y = %f"), w.p2x(mouseX), w.p2y(mouseY));
+#else
+        m_content.Printf(wxT("x = %f\ny = %f"), w.p2x(mouseX), w.p2y(mouseY));
+#endif
+    }
+}
+
+void mpInfoCoords::Plot(wxDC & dc, mpWindow & w)
+{
+    if (m_visible) {
+        // Adjust relative position inside the window
+        int scrx = w.GetScrX();
+        int scry = w.GetScrY();
+        if ((m_winX != scrx) || (m_winY != scry)) {
+#ifdef MATHPLOT_DO_LOGGING
+            // wxLogMessage(_("mpInfoLayer::Plot() screen size has changed from %d x %d to %d x %d"), m_winX, m_winY, scrx, scry);
+#endif
+            if (m_winX != 1) m_dim.x = (int) floor((double)(m_dim.x*scrx/m_winX));
+            if (m_winY != 1) {
+                m_dim.y = (int) floor((double)(m_dim.y*scry/m_winY));
+                UpdateReference();
+            }
+            // Finally update window size
+            m_winX = scrx;
+            m_winY = scry;
+        }
+        dc.SetPen(m_pen);
+        //     wxImage image0(wxT("pixel.png"), wxBITMAP_TYPE_PNG);
+        //     wxBitmap image1(image0);
+        //     wxBrush semiWhite(image1);
+        dc.SetBrush(m_brush);
+        dc.SetFont(m_font);
+        int textX, textY;
+        dc.GetTextExtent(m_content, &textX, &textY);
+        if (m_dim.width < textX + 10) m_dim.width = textX + 10;
+        if (m_dim.height < textY + 10) m_dim.height = textY + 10;
+        dc.DrawRectangle(m_dim.x, m_dim.y, m_dim.width, m_dim.height);
+        dc.DrawText(m_content, m_dim.x + 5, m_dim.y + 5);
+    }
+}
+
+mpInfoLegend::mpInfoLegend() : mpInfoLayer()
+{
+
+}
+
+mpInfoLegend::mpInfoLegend(wxRect rect, const wxBrush* brush) : mpInfoLayer(rect, brush)
+{
+
+}
+
+mpInfoLegend::~mpInfoLegend()
+{
+
+}
+
+void mpInfoLegend::UpdateInfo(mpWindow& w, wxEvent& event)
+{
+
+}
+
+void mpInfoLegend::Plot(wxDC & dc, mpWindow & w)
+{
+    if (m_visible) {
+        // Adjust relative position inside the window
+        int scrx = w.GetScrX();
+        int scry = w.GetScrY();
+        if ((m_winX != scrx) || (m_winY != scry)) {
+#ifdef MATHPLOT_DO_LOGGING
+            // wxLogMessage(_("mpInfoLayer::Plot() screen size has changed from %d x %d to %d x %d"), m_winX, m_winY, scrx, scry);
+#endif
+            if (m_winX != 1) m_dim.x = (int) floor((double)(m_dim.x*scrx/m_winX));
+            if (m_winY != 1) {
+                m_dim.y = (int) floor((double)(m_dim.y*scry/m_winY));
+                UpdateReference();
+            }
+            // Finally update window size
+            m_winX = scrx;
+            m_winY = scry;
+        }
+        //     wxImage image0(wxT("pixel.png"), wxBITMAP_TYPE_PNG);
+        //     wxBitmap image1(image0);
+        //     wxBrush semiWhite(image1);
+        dc.SetBrush(m_brush);
+        dc.SetFont(m_font);
+        const int baseWidth = (mpLEGEND_MARGIN*2 + mpLEGEND_LINEWIDTH);
+        int textX = baseWidth, textY = mpLEGEND_MARGIN;
+        int plotCount = 0;
+        int posY = 0;
+        int tmpX = 0, tmpY = 0;
+        mpLayer* ly = NULL;
+        wxPen lpen;
+        wxString label;
+        for (unsigned int p = 0; p < w.CountAllLayers(); p++) {
+            ly = w.GetLayer(p);
+            if ((ly->GetLayerType() == mpLAYER_PLOT) && (ly->IsVisible())) {
+                label = ly->GetName();
+                dc.GetTextExtent(label, &tmpX, &tmpY);
+                textX = (textX > (tmpX + baseWidth)) ? textX : (tmpX + baseWidth + mpLEGEND_MARGIN);
+                textY += (tmpY);
+#ifdef MATHPLOT_DO_LOGGING
+                // wxLogMessage(_("mpInfoLegend::Plot() Adding layer %d: %s"), p, label.c_str());
+#endif
+            }
+        }
+        dc.SetPen(m_pen);
+        dc.SetBrush(m_brush);
+        m_dim.width = textX;
+        if (textY != mpLEGEND_MARGIN) { // Don't draw any thing if there are no visible layers
+            textY += mpLEGEND_MARGIN;
+            m_dim.height = textY;
+            dc.DrawRectangle(m_dim.x, m_dim.y, m_dim.width, m_dim.height);
+            for (unsigned int p2 = 0; p2 < w.CountAllLayers(); p2++) {
+                ly = w.GetLayer(p2);
+                if ((ly->GetLayerType() == mpLAYER_PLOT) && (ly->IsVisible())) {
+                    label = ly->GetName();
+                    lpen = ly->GetPen();
+                    dc.GetTextExtent(label, &tmpX, &tmpY);
+                    dc.SetPen(lpen);
+                    //textX = (textX > (tmpX + baseWidth)) ? textX : (tmpX + baseWidth);
+                    //textY += (tmpY + mpLEGEND_MARGIN);
+                    posY = m_dim.y + mpLEGEND_MARGIN + plotCount*tmpY + (tmpY>>1);
+                    dc.DrawLine(m_dim.x + mpLEGEND_MARGIN,   // X start coord
+                            posY,                        // Y start coord
+                            m_dim.x + mpLEGEND_LINEWIDTH + mpLEGEND_MARGIN, // X end coord
+                            posY);
+                    //dc.DrawRectangle(m_dim.x + 5, m_dim.y + 5 + plotCount*tmpY, 5, 5);
+                    dc.DrawText(label, m_dim.x + baseWidth, m_dim.y + mpLEGEND_MARGIN + plotCount*tmpY);
+                    plotCount++;
+                }
+            }
+        }
+    }
+}
+
+
+
+//-----------------------------------------------------------------------------
+// mpLayer implementations - functions
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(mpFX, mpLayer)
+
+mpFX::mpFX(wxString name, int flags)
+{
+    SetName(name);
+    m_flags = flags;
+    m_type = mpLAYER_PLOT;
+}
+
+void mpFX::Plot(wxDC & dc, mpWindow & w)
+{
+    if (m_visible) {
+        dc.SetPen( m_pen);
+
+        wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft();
+        wxCoord endPx   = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
+        wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
+        wxCoord maxYpx  = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
+
+        wxCoord iy = 0;
+        if (m_pen.GetWidth() <= 1)
+        {
+            for (wxCoord i = startPx; i < endPx; ++i)
+            {
+                iy = w.y2p( GetY(w.p2x(i)));
+                // Draw the point only if you can draw outside margins or if the point is inside margins
+                if (m_drawOutsideMargins || ((iy >= minYpx) && (iy <= maxYpx)))
+                    dc.DrawPoint(i, iy );// (wxCoord) ((w.GetPosY() - GetY( (double)i / w.GetScaleX() + w.GetPosX()) ) * w.GetScaleY()));
+            }
+        }
+        else
+        {
+            for (wxCoord i = startPx; i < endPx; ++i)
+            {
+                iy = w.y2p( GetY(w.p2x(i)));
+                // Draw the point only if you can draw outside margins or if the point is inside margins
+                if (m_drawOutsideMargins || ((iy >= minYpx) && (iy <= maxYpx)))
+                    dc.DrawLine( i, iy, i, iy);
+                //             wxCoord c = w.y2p( GetY(w.p2x(i)) ); //(wxCoord) ((w.GetPosY() - GetY( (double)i / w.GetScaleX() + w.GetPosX()) ) * w.GetScaleY());
+
+            }
+        }
+
+        if (!m_name.IsEmpty() && m_showName)
+        {
+            dc.SetFont(m_font);
+
+            wxCoord tx, ty;
+            dc.GetTextExtent(m_name, &tx, &ty);
+
+            /*if ((m_flags & mpALIGNMASK) == mpALIGN_RIGHT)
+              tx = (w.GetScrX()>>1) - tx - 8;
+              else if ((m_flags & mpALIGNMASK) == mpALIGN_CENTER)
+              tx = -tx/2;
+              else
+              tx = -(w.GetScrX()>>1) + 8;
+              */
+            if ((m_flags & mpALIGNMASK) == mpALIGN_RIGHT)
+                tx = (w.GetScrX() - tx) - w.GetMarginRight() - 8;
+            else if ((m_flags & mpALIGNMASK) == mpALIGN_CENTER)
+                tx = ((w.GetScrX() - w.GetMarginRight() - w.GetMarginLeft() - tx) / 2) + w.GetMarginLeft();
+            else
+                tx = w.GetMarginLeft() + 8;
+            dc.DrawText( m_name, tx, w.y2p(GetY(w.p2x(tx))) ); // (wxCoord) ((w.GetPosY() - GetY( (double)tx / w.GetScaleX() + w.GetPosX())) * w.GetScaleY()) );
+        }
+    }
+}
+
+IMPLEMENT_ABSTRACT_CLASS(mpFY, mpLayer)
+
+mpFY::mpFY(wxString name, int flags)
+{
+    SetName(name);
+    m_flags = flags;
+    m_type = mpLAYER_PLOT;
+}
+
+void mpFY::Plot(wxDC & dc, mpWindow & w)
+{
+    if (m_visible) {
+        dc.SetPen( m_pen);
+
+        wxCoord i, ix;
+
+        wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft();
+        wxCoord endPx   = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
+        wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
+        wxCoord maxYpx  = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
+
+        if (m_pen.GetWidth() <= 1)
+        {
+            for (i = minYpx; i < maxYpx; ++i)
+            {
+                ix = w.x2p(GetX(w.p2y(i)));
+                if (m_drawOutsideMargins || ((ix >= startPx) && (ix <= endPx)))
+                    dc.DrawPoint(ix, i);
+            }
+        }
+        else
+        {
+            for (i=0;i< w.GetScrY(); ++i)
+            {
+                ix = w.x2p(GetX(w.p2y(i)));
+                if (m_drawOutsideMargins || ((ix >= startPx) && (ix <= endPx)))
+                    dc.DrawLine(ix, i, ix, i);
+                //             wxCoord c =  w.x2p(GetX(w.p2y(i))); //(wxCoord) ((GetX( (double)i / w.GetScaleY() + w.GetPosY()) - w.GetPosX()) * w.GetScaleX());
+                //             dc.DrawLine(c, i, c, i);
+            }
+        }
+
+        if (!m_name.IsEmpty() && m_showName)
+        {
+            dc.SetFont(m_font);
+
+            wxCoord tx, ty;
+            dc.GetTextExtent(m_name, &tx, &ty);
+
+            if ((m_flags & mpALIGNMASK) == mpALIGN_TOP)
+                ty = w.GetMarginTop() + 8;
+            else if ((m_flags & mpALIGNMASK) == mpALIGN_CENTER)
+                ty = ((w.GetScrY() - w.GetMarginTop() - w.GetMarginBottom() - ty) / 2) + w.GetMarginTop();
+            else
+                ty = w.GetScrY() - 8 - ty - w.GetMarginBottom();
+
+            dc.DrawText( m_name, w.x2p(GetX(w.p2y(ty))), ty ); // (wxCoord) ((GetX( (double)i / w.GetScaleY() + w.GetPosY()) - w.GetPosX()) * w.GetScaleX()), -ty);
+        }
+    }
+}
+
+IMPLEMENT_ABSTRACT_CLASS(mpFXY, mpLayer)
+
+mpFXY::mpFXY(wxString name, int flags)
+{
+    SetName(name);
+    m_flags = flags;
+    m_type = mpLAYER_PLOT;
+}
+
+void mpFXY::UpdateViewBoundary(wxCoord xnew, wxCoord ynew)
+{
+    // Keep track of how many points have been drawn and the bouding box
+    maxDrawX = (xnew > maxDrawX) ? xnew : maxDrawX;
+    minDrawX = (xnew < minDrawX) ? xnew : minDrawX;
+    maxDrawY = (maxDrawY > ynew) ? maxDrawY : ynew;
+    minDrawY = (minDrawY < ynew) ? minDrawY : ynew;
+    //drawnPoints++;
+}
+
+void mpFXY::Plot(wxDC & dc, mpWindow & w)
+{
+    if (m_visible) {
+        dc.SetPen( m_pen);
+
+        double x, y;
+        // Do this to reset the counters to evaluate bounding box for label positioning
+        Rewind(); GetNextXY(x, y);
+        maxDrawX = x; minDrawX = x; maxDrawY = y; minDrawY = y;
+        //drawnPoints = 0;
+        Rewind();
+
+        wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft();
+        wxCoord endPx   = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
+        wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
+        wxCoord maxYpx  = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
+
+        wxCoord ix = 0, iy = 0;
+
+        if (!m_continuous)
+        {
+            // for some reason DrawPoint does not use the current pen,
+            // so we use DrawLine for fat pens
+            if (m_pen.GetWidth() <= 1)
+            {
+                while (GetNextXY(x, y))
+                {
+                    ix = w.x2p(x);
+                    iy = w.y2p(y);
+                    if (m_drawOutsideMargins || ((ix >= startPx) && (ix <= endPx) && (iy >= minYpx) && (iy <= maxYpx))) {
+                        dc.DrawPoint(ix, iy);
+                        UpdateViewBoundary(ix, iy);
+                    };
+                }
+            }
+            else
+            {
+                while (GetNextXY(x, y))
+                {
+                    ix = w.x2p(x);
+                    iy = w.y2p(y);
+                    if (m_drawOutsideMargins || ((ix >= startPx) && (ix <= endPx) && (iy >= minYpx) && (iy <= maxYpx))) {
+                        dc.DrawLine(ix, iy, ix, iy);
+                        UpdateViewBoundary(ix, iy);
+                    }
+                    //                dc.DrawLine(cx, cy, cx, cy);
+                }
+            }
+        }
+        else
+        {
+            // Old code
+            wxCoord x0=0,c0=0;
+            bool    first = TRUE;
+            while (GetNextXY(x, y))
+            {
+                wxCoord x1 = w.x2p(x); // (wxCoord) ((x - w.GetPosX()) * w.GetScaleX());
+                wxCoord c1 = w.y2p(y); // (wxCoord) ((w.GetPosY() - y) * w.GetScaleY());
+                if (first)
+                {
+                    first=FALSE;
+                    x0=x1;c0=c1;
+                }
+                bool outUp, outDown;
+                if((x1 >= startPx)&&(x0 <= endPx)) {
+                    outDown = (c0 > maxYpx) && (c1 > maxYpx);
+                    outUp = (c0 < minYpx) && (c1 < minYpx);
+                    if ( !outUp && !outDown ) {
+                        dc.DrawLine(x0, c0, x1, c1);
+                        UpdateViewBoundary(x1, c1);
+                    }
+                }
+                x0=x1; c0=c1;
+            }
+        }
+
+        if (!m_name.IsEmpty() && m_showName)
+        {
+            dc.SetFont(m_font);
+
+            wxCoord tx, ty;
+            dc.GetTextExtent(m_name, &tx, &ty);
+
+            // xxx implement else ... if (!HasBBox())
+            {
+                // const int sx = w.GetScrX();
+                // const int sy = w.GetScrY();
+
+                if ((m_flags & mpALIGNMASK) == mpALIGN_NW)
+                {
+                    tx = minDrawX + 8;
+                    ty = maxDrawY + 8;
+                }
+                else if ((m_flags & mpALIGNMASK) == mpALIGN_NE)
+                {
+                    tx = maxDrawX - tx - 8;
+                    ty = maxDrawY + 8;
+                }
+                else if ((m_flags & mpALIGNMASK) == mpALIGN_SE)
+                {
+                    tx = maxDrawX - tx - 8;
+                    ty = minDrawY - ty - 8;
+                }
+                else
+                { // mpALIGN_SW
+                    tx = minDrawX + 8;
+                    ty = minDrawY - ty - 8;
+                }
+            }
+
+            dc.DrawText( m_name, tx, ty);
+        }
+    }
+}
+
+//-----------------------------------------------------------------------------
+// mpProfile implementation
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(mpProfile, mpLayer)
+
+mpProfile::mpProfile(wxString name, int flags)
+{
+    SetName(name);
+    m_flags = flags;
+    m_type = mpLAYER_PLOT;
+}
+
+void mpProfile::Plot(wxDC & dc, mpWindow & w)
+{
+    if (m_visible) {
+        dc.SetPen( m_pen);
+
+        wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft();
+        wxCoord endPx   = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
+        wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
+        wxCoord maxYpx  = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
+
+        // Plot profile linking subsequent point of the profile, instead of mpFY, which plots simple points.
+        for (wxCoord i = startPx; i < endPx; ++i) {
+            wxCoord c0 = w.y2p( GetY(w.p2x(i)) ); // (wxCoord) ((w.GetYpos() - GetY( (double)i / w.GetXscl() + w.GetXpos()) ) * w.GetYscl());
+            wxCoord c1 = w.y2p( GetY(w.p2x(i+1)) );//(wxCoord) ((w.GetYpos() - GetY( (double)(i+1) / w.GetXscl() + (w.GetXpos() ) ) ) * w.GetYscl());
+            // c0 = (c0 <= maxYpx) ? ((c0 >= minYpx) ? c0 : minYpx) : maxYpx;
+            // c1 = (c1 <= maxYpx) ? ((c1 >= minYpx) ? c1 : minYpx) : maxYpx;
+            if (!m_drawOutsideMargins) {
+                c0 = (c0 <= maxYpx) ? ((c0 >= minYpx) ? c0 : minYpx) : maxYpx;
+                c1 = (c1 <= maxYpx) ? ((c1 >= minYpx) ? c1 : minYpx) : maxYpx;
+            }
+            dc.DrawLine(i, c0, i+1, c1);
+        };
+        if (!m_name.IsEmpty()) {
+            dc.SetFont(m_font);
+
+            wxCoord tx, ty;
+            dc.GetTextExtent(m_name, &tx, &ty);
+
+            if ((m_flags & mpALIGNMASK) == mpALIGN_RIGHT)
+                tx = (w.GetScrX() - tx) - w.GetMarginRight() - 8;
+            else if ((m_flags & mpALIGNMASK) == mpALIGN_CENTER)
+                tx = ((w.GetScrX() - w.GetMarginRight() - w.GetMarginLeft() - tx) / 2) + w.GetMarginLeft();
+            else
+                tx = w.GetMarginLeft() + 8;
+
+            dc.DrawText( m_name, tx, w.y2p( GetY( w.p2x(tx) ) ) );//(wxCoord) ((w.GetPosY() - GetY( (double)tx / w.GetScaleX() + w.GetPosX())) * w.GetScaleY()) );
+        }
+    }
+}
+
+//-----------------------------------------------------------------------------
+// mpLayer implementations - furniture (scales, ...)
+//-----------------------------------------------------------------------------
+
+#define mpLN10 2.3025850929940456840179914546844
+
+IMPLEMENT_DYNAMIC_CLASS(mpScaleX, mpLayer)
+
+mpScaleX::mpScaleX(wxString name, int flags, bool ticks, unsigned int type)
+{
+    SetName(name);
+    SetFont( (wxFont&) *wxSMALL_FONT);
+    SetPen( (wxPen&) *wxGREY_PEN);
+    m_flags = flags;
+    m_ticks = ticks;
+    m_labelType = type;
+    m_type = mpLAYER_AXIS;
+    m_labelFormat = wxT("");
+}
+
+void mpScaleX::Plot(wxDC & dc, mpWindow & w)
+{
+    if (m_visible) {
+        dc.SetPen( m_pen);
+        dc.SetFont( m_font);
+        int orgy=0;
+
+        const int extend = w.GetScrX(); //  /2;
+        if (m_flags == mpALIGN_CENTER)
+            orgy   = w.y2p(0); //(int)(w.GetPosY() * w.GetScaleY());
+        if (m_flags == mpALIGN_TOP) {
+            if (m_drawOutsideMargins)
+                orgy = X_BORDER_SEPARATION;
+            else
+                orgy = w.GetMarginTop();
+        }
+        if (m_flags == mpALIGN_BOTTOM) {
+            if (m_drawOutsideMargins)
+                orgy = X_BORDER_SEPARATION;
+            else
+                orgy = w.GetScrY() - w.GetMarginBottom();
+        }
+        if (m_flags == mpALIGN_BORDER_BOTTOM )
+            orgy = w.GetScrY() - 1;//dc.LogicalToDeviceY(0) - 1;
+        if (m_flags == mpALIGN_BORDER_TOP )
+            orgy = 1;//-dc.LogicalToDeviceY(0);
+
+        dc.DrawLine( 0, orgy, w.GetScrX(), orgy);
+
+        // To cut the axis line when draw outside margin is false, use this code
+        /*if (m_drawOutsideMargins == true)
+          dc.DrawLine( 0, orgy, w.GetScrX(), orgy);
+          else
+          dc.DrawLine( w.GetMarginLeft(), orgy, w.GetScrX() - w.GetMarginRight(), orgy); */
+
+        const double dig  = floor( log( 128.0 / w.GetScaleX() ) / mpLN10 );
+        const double step = exp( mpLN10 * dig);
+        const double end  = w.GetPosX() + (double)extend / w.GetScaleX();
+
+        wxCoord tx, ty;
+        wxString s;
+        wxString fmt;
+        int tmp = (int)dig;
+        if (m_labelType == mpX_NORMAL) {
+            if (!m_labelFormat.IsEmpty()) {
+                fmt = m_labelFormat;
+            } else {
+                if (tmp>=1) {
+                    fmt = wxT("%.f");
+                } else {
+                    tmp=8-tmp;
+                    fmt.Printf(wxT("%%.%df"), tmp >= -1 ? 2 : -tmp);
+                }
+            }
+        } else {
+            // Date and/or time axis representation
+            if (m_labelType == mpX_DATETIME) {
+                fmt = (wxT("%04.0f-%02.0f-%02.0fT%02.0f:%02.0f:%02.0f"));
+            } else if (m_labelType == mpX_DATE) {
+                fmt = (wxT("%04.0f-%02.0f-%02.0f"));
+            } else if ((m_labelType == mpX_TIME) && (end/60 < 2)) {
+                fmt = (wxT("%02.0f:%02.3f"));
+            } else {
+                fmt = (wxT("%02.0f:%02.0f:%02.0f"));
+            }
+        }
+
+        //double n = floor( (w.GetPosX() - (double)extend / w.GetScaleX()) / step ) * step ;
+        double n0 = floor( (w.GetPosX() /* - (double)(extend - w.GetMarginLeft() - w.GetMarginRight())/ w.GetScaleX() */) / step ) * step ;
+        double n = 0;
+#ifdef MATHPLOT_DO_LOGGING
+        wxLogMessage(wxT("mpScaleX::Plot: dig: %f , step: %f, end: %f, n: %f"), dig, step, end, n0);
+#endif
+        wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft();
+        wxCoord endPx   = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
+        wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
+        wxCoord maxYpx  = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
+
+        tmp=-65535;
+        int labelH = 0; // Control labels heigth to decide where to put axis name (below labels or on top of axis)
+        int maxExtent = 0;
+        for (n = n0; n < end; n += step) {
+            const int p = (int)((n - w.GetPosX()) * w.GetScaleX());
+#ifdef MATHPLOT_DO_LOGGING
+            wxLogMessage(wxT("mpScaleX::Plot: n: %f -> p = %d"), n, p);
+#endif
+            if ((p >= startPx) && (p <= endPx)) {
+                if (m_ticks) { // draw axis ticks
+                    if (m_flags == mpALIGN_BORDER_BOTTOM)
+                        dc.DrawLine( p, orgy, p, orgy-4);
+                    else
+                        dc.DrawLine( p, orgy, p, orgy+4);
+                } else { // draw grid dotted lines
+                    m_pen.SetStyle(wxDOT);
+                    dc.SetPen(m_pen);
+                    if ((m_flags == mpALIGN_BOTTOM) && !m_drawOutsideMargins) {
+                        dc.DrawLine( p, orgy+4, p, minYpx );
+                    } else {
+                        if ((m_flags == mpALIGN_TOP) && !m_drawOutsideMargins) {
+                            dc.DrawLine( p, orgy-4, p, maxYpx );
+                        } else {
+                            dc.DrawLine( p, 0/*-w.GetScrY()*/, p, w.GetScrY() );
+                        }
+                    }
+                    m_pen.SetStyle(wxSOLID);
+                    dc.SetPen(m_pen);
+                }
+                // Write ticks labels in s string
+                if (m_labelType == mpX_NORMAL)
+                    s.Printf(fmt, n);
+                else if (m_labelType == mpX_DATETIME) {
+                    time_t when = (time_t)n;
+                    struct tm tm = *localtime(&when);
+                    s.Printf(fmt, (double)tm.tm_year+1900, (double)tm.tm_mon+1, (double)tm.tm_mday, (double)tm.tm_hour, (double)tm.tm_min, (double)tm.tm_sec);
+                } else if (m_labelType == mpX_DATE) {
+                    time_t when = (time_t)n;
+                    struct tm tm = *localtime(&when);
+                    s.Printf(fmt, (double)tm.tm_year+1900, (double)tm.tm_mon+1, (double)tm.tm_mday);
+                } else if ((m_labelType == mpX_TIME) || (m_labelType == mpX_HOURS)) {
+                    double modulus = fabs(n);
+                    double sign = n/modulus;
+                    double hh = floor(modulus/3600);
+                    double mm = floor((modulus - hh*3600)/60);
+                    double ss = modulus - hh*3600 - mm*60;
+#ifdef MATHPLOT_DO_LOGGING
+                    wxLogMessage(wxT("%02.0f Hours, %02.0f minutes, %02.0f seconds"), sign*hh, mm, ss);
+#endif // MATHPLOT_DO_LOGGING
+                    if (fmt.Len() == 20) // Format with hours has 11 chars
+                        s.Printf(fmt, sign*hh, mm, floor(ss));
+                    else
+                        s.Printf(fmt, sign*mm, ss);
+                }
+                dc.GetTextExtent(s, &tx, &ty);
+                labelH = (labelH <= ty) ? ty : labelH;
+                /*				if ((p-tx/2-tmp) > 64) { // Problem about non-regular axis labels
+                                                if ((m_flags == mpALIGN_BORDER_BOTTOM) || (m_flags == mpALIGN_TOP)) {
+                                                dc.DrawText( s, p-tx/2, orgy-4-ty);
+                                                } else {
+                                                dc.DrawText( s, p-tx/2, orgy+4);
+                                                }
+                                                tmp=p+tx/2;
+                                                }
+                                                */
+                maxExtent = (tx > maxExtent) ? tx : maxExtent; // Keep in mind max label width
+            }
+        }
+        // Actually draw labels, taking care of not overlapping them, and distributing them regularly
+        double labelStep = ceil((maxExtent + mpMIN_X_AXIS_LABEL_SEPARATION)/(w.GetScaleX()*step))*step;
+        for (n = n0; n < end; n += labelStep) {
+            const int p = (int)((n - w.GetPosX()) * w.GetScaleX());
+#ifdef MATHPLOT_DO_LOGGING
+            wxLogMessage(wxT("mpScaleX::Plot: n_label = %f -> p_label = %d"), n, p);
+#endif
+            if ((p >= startPx) && (p <= endPx)) {
+                // Write ticks labels in s string
+                if (m_labelType == mpX_NORMAL)
+                    s.Printf(fmt, n);
+                else if (m_labelType == mpX_DATETIME) {
+                    time_t when = (time_t)n;
+                    struct tm tm = *localtime(&when);
+                    s.Printf(fmt, (double)tm.tm_year+1900, (double)tm.tm_mon+1, (double)tm.tm_mday, (double)tm.tm_hour, (double)tm.tm_min, (double)tm.tm_sec);
+                } else if (m_labelType == mpX_DATE) {
+                    time_t when = (time_t)n;
+                    struct tm tm = *localtime(&when);
+                    s.Printf(fmt, (double)tm.tm_year+1900, (double)tm.tm_mon+1, (double)tm.tm_mday);
+                } else if ((m_labelType == mpX_TIME) || (m_labelType == mpX_HOURS)) {
+                    double modulus = fabs(n);
+                    double sign = n/modulus;
+                    double hh = floor(modulus/3600);
+                    double mm = floor((modulus - hh*3600)/60);
+                    double ss = modulus - hh*3600 - mm*60;
+#ifdef MATHPLOT_DO_LOGGING
+                    wxLogMessage(wxT("%02.0f Hours, %02.0f minutes, %02.0f seconds"), sign*hh, mm, ss);
+#endif // MATHPLOT_DO_LOGGING
+                    if (fmt.Len() == 20) // Format with hours has 11 chars
+                        s.Printf(fmt, sign*hh, mm, floor(ss));
+                    else
+                        s.Printf(fmt, sign*mm, ss);
+                }
+                dc.GetTextExtent(s, &tx, &ty);
+                if ((m_flags == mpALIGN_BORDER_BOTTOM) || (m_flags == mpALIGN_TOP)) {
+                    dc.DrawText( s, p-tx/2, orgy-4-ty);
+                } else {
+                    dc.DrawText( s, p-tx/2, orgy+4);
+                }
+            }
+        }
+
+        // Draw axis name
+        dc.GetTextExtent(m_name, &tx, &ty);
+        switch (m_flags) {
+            case mpALIGN_BORDER_BOTTOM:
+                dc.DrawText( m_name, extend - tx - 4, orgy - 8 - ty - labelH);
+                break;
+            case mpALIGN_BOTTOM: {
+                                     if ((!m_drawOutsideMargins) && (w.GetMarginBottom() > (ty + labelH + 8))) {
+                                         dc.DrawText( m_name, (endPx - startPx - tx)>>1, orgy + 6 + labelH);
+                                     } else {
+                                         dc.DrawText( m_name, extend - tx - 4, orgy - 4 - ty);
+                                     }
+                                 } break;
+            case mpALIGN_CENTER:
+                                 dc.DrawText( m_name, extend - tx - 4, orgy - 4 - ty);
+                                 break;
+            case mpALIGN_TOP: {
+                                  if ((!m_drawOutsideMargins) && (w.GetMarginTop() > (ty + labelH + 8))) {
+                                      dc.DrawText( m_name, (endPx - startPx - tx)>>1, orgy - 6 - ty - labelH);
+                                  } else {
+                                      dc.DrawText( m_name, extend - tx - 4, orgy + 4);
+                                  }
+                              } break;
+            case mpALIGN_BORDER_TOP:
+                              dc.DrawText( m_name, extend - tx - 4, orgy + 6 + labelH);
+                              break;
+            default:
+                              break;
+        }
+    }
+    /*    if (m_flags != mpALIGN_TOP) {
+
+          if ((m_flags == mpALIGN_BORDER_BOTTOM) || (m_flags == mpALIGN_TOP)) {
+          dc.DrawText( m_name, extend - tx - 4, orgy - 4 - (ty*2));
+          } else {
+          dc.DrawText( m_name, extend - tx - 4, orgy - 4 - ty); //orgy + 4 + ty);
+          }
+          }; */
+}
+
+IMPLEMENT_DYNAMIC_CLASS(mpScaleY, mpLayer)
+
+mpScaleY::mpScaleY(wxString name, int flags, bool ticks)
+{
+    SetName(name);
+    SetFont( (wxFont&) *wxSMALL_FONT);
+    SetPen( (wxPen&) *wxGREY_PEN);
+    m_flags = flags;
+    m_ticks = ticks;
+    m_type = mpLAYER_AXIS;
+    m_labelFormat = wxT("");
+}
+
+void mpScaleY::Plot(wxDC & dc, mpWindow & w)
+{
+    if (m_visible) {
+        dc.SetPen( m_pen);
+        dc.SetFont( m_font);
+
+        int orgx=0;
+        const int extend = w.GetScrY(); // /2;
+        if (m_flags == mpALIGN_CENTER)
+            orgx   = w.x2p(0); //(int)(w.GetPosX() * w.GetScaleX());
+        if (m_flags == mpALIGN_LEFT) {
+            if (m_drawOutsideMargins)
+                orgx = Y_BORDER_SEPARATION;
+            else
+                orgx = w.GetMarginLeft();
+        }
+        if (m_flags == mpALIGN_RIGHT) {
+            if (m_drawOutsideMargins)
+                orgx = w.GetScrX() - Y_BORDER_SEPARATION;
+            else
+                orgx = w.GetScrX() - w.GetMarginRight();
+        }
+        if (m_flags == mpALIGN_BORDER_RIGHT )
+            orgx = w.GetScrX() - 1; //dc.LogicalToDeviceX(0) - 1;
+        if (m_flags == mpALIGN_BORDER_LEFT )
+            orgx = 1; //-dc.LogicalToDeviceX(0);
+
+
+        // Draw line
+        dc.DrawLine( orgx, 0, orgx, extend);
+
+        // To cut the axis line when draw outside margin is false, use this code
+        /* if (m_drawOutsideMargins == true)
+           dc.DrawLine( orgx, 0, orgx, extend);
+           else
+           dc.DrawLine( orgx, w.GetMarginTop(), orgx, w.GetScrY() - w.GetMarginBottom()); */
+
+        const double dig  = floor( log( 128.0 / w.GetScaleY() ) / mpLN10 );
+        const double step = exp( mpLN10 * dig);
+        const double end  = w.GetPosY() + (double)extend / w.GetScaleY();
+
+        wxCoord tx, ty;
+        wxString s;
+        wxString fmt;
+        int tmp = (int)dig;
+        double maxScaleAbs = fabs(w.GetDesiredYmax());
+        double minScaleAbs = fabs(w.GetDesiredYmin());
+        double endscale = (maxScaleAbs > minScaleAbs) ? maxScaleAbs : minScaleAbs;
+        if (m_labelFormat.IsEmpty()) {
+            if ((endscale < 1e4) && (endscale > 1e-3))
+                fmt = wxT("%.2f");
+            else
+                fmt = wxT("%.1e");
+        } else {
+            fmt = m_labelFormat;
+        }
+        /*    if (tmp>=1)
+              {*/
+        //    fmt = wxT("%7.5g");
+        //     }
+        //     else
+        //     {
+        //         tmp=8-tmp;
+        //         fmt.Printf(wxT("%%.%dg"), (tmp >= -1) ? 2 : -tmp);
+        //     }
+
+        double n = floor( (w.GetPosY() - (double)(extend - w.GetMarginTop() - w.GetMarginBottom())/ w.GetScaleY()) / step ) * step ;
+
+        /* wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft(); */
+        wxCoord endPx   = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
+        wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
+        wxCoord maxYpx  = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
+
+        tmp=65536;
+        int labelW = 0;
+        // Before staring cycle, calculate label height
+        int labelHeigth = 0;
+        s.Printf(fmt,n);
+        dc.GetTextExtent(s, &tx, &labelHeigth);
+        for (;n < end; n += step) {
+            const int p = (int)((w.GetPosY() - n) * w.GetScaleY());
+            if ((p >= minYpx) && (p <= maxYpx)) {
+                if (m_ticks) { // Draw axis ticks
+                    if (m_flags == mpALIGN_BORDER_LEFT) {
+                        dc.DrawLine( orgx, p, orgx+4, p);
+                    } else {
+                        dc.DrawLine( orgx-4, p, orgx, p); //( orgx, p, orgx+4, p);
+                    }
+                } else {
+                    m_pen.SetStyle(wxDOT);
+                    dc.SetPen( m_pen);
+                    if ((m_flags == mpALIGN_LEFT) && !m_drawOutsideMargins) {
+                        dc.DrawLine( orgx-4, p, endPx, p);
+                    } else {
+                        if ((m_flags == mpALIGN_RIGHT) && !m_drawOutsideMargins) {
+                            dc.DrawLine( minYpx, p, orgx+4, p);
+                        } else {
+                            dc.DrawLine( 0/*-w.GetScrX()*/, p, w.GetScrX(), p);
+                        }
+                    }
+                    m_pen.SetStyle(wxSOLID);
+                    dc.SetPen( m_pen);
+                }
+                // Print ticks labels
+                s.Printf(fmt, n);
+                dc.GetTextExtent(s, &tx, &ty);
+#ifdef MATHPLOT_DO_LOGGING
+                if (ty != labelHeigth) wxLogMessage(wxT("mpScaleY::Plot: ty(%f) and labelHeigth(%f) differ!"), ty, labelHeigth);
+#endif
+                labelW = (labelW <= tx) ? tx : labelW;
+                if ((tmp-p+labelHeigth/2) > mpMIN_Y_AXIS_LABEL_SEPARATION) {
+                    if ((m_flags == mpALIGN_BORDER_LEFT) || (m_flags == mpALIGN_RIGHT))
+                        dc.DrawText( s, orgx+4, p-ty/2);
+                    else
+                        dc.DrawText( s, orgx-4-tx, p-ty/2); //( s, orgx+4, p-ty/2);
+                    tmp=p-labelHeigth/2;
+                }
+            }
+        }
+        // Draw axis name
+
+        dc.GetTextExtent(m_name, &tx, &ty);
+        switch (m_flags) {
+            case mpALIGN_BORDER_LEFT:
+                dc.DrawText( m_name, labelW + 8, 4);
+                break;
+            case mpALIGN_LEFT: {
+                                   if ((!m_drawOutsideMargins) && (w.GetMarginLeft() > (ty + labelW + 8))) {
+                                       dc.DrawRotatedText( m_name, orgx - 6 - labelW - ty, (maxYpx - minYpx + tx)>>1, 90);
+                                   } else {
+                                       dc.DrawText( m_name, orgx + 4, 4);
+                                   }
+                               } break;
+            case mpALIGN_CENTER:
+                               dc.DrawText( m_name, orgx + 4, 4);
+                               break;
+            case mpALIGN_RIGHT: {
+                                    if ((!m_drawOutsideMargins) && (w.GetMarginRight() > (ty + labelW + 8))) {
+                                        dc.DrawRotatedText( m_name, orgx + 6 + labelW, (maxYpx - minYpx + tx)>>1, 90);
+                                    } else {
+                                        dc.DrawText( m_name, orgx - tx - 4, 4);
+                                    }
+                                } break;
+            case mpALIGN_BORDER_RIGHT:
+                                dc.DrawText( m_name, orgx - 6 - tx -labelW, 4);
+                                break;
+            default:
+                                break;
+        }
+    }
+
+    /*    if (m_flags != mpALIGN_RIGHT) {
+          dc.GetTextExtent(m_name, &tx, &ty);
+          if (m_flags == mpALIGN_BORDER_LEFT) {
+          dc.DrawText( m_name, orgx-tx-4, -extend + ty + 4);
+          } else {
+          if (m_flags == mpALIGN_BORDER_RIGHT )
+          dc.DrawText( m_name, orgx-(tx*2)-4, -extend + ty + 4);
+          else
+          dc.DrawText( m_name, orgx + 4, -extend + 4);
+          }
+          }; */
+}
+
+//-----------------------------------------------------------------------------
+// mpWindow
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(mpWindow, wxWindow)
+
+    BEGIN_EVENT_TABLE(mpWindow, wxWindow)
+    EVT_PAINT    ( mpWindow::OnPaint)
+    EVT_SIZE     ( mpWindow::OnSize)
+    EVT_SCROLLWIN_THUMBTRACK(mpWindow::OnScrollThumbTrack)
+    EVT_SCROLLWIN_PAGEUP(mpWindow::OnScrollPageUp)
+    EVT_SCROLLWIN_PAGEDOWN(mpWindow::OnScrollPageDown)
+    EVT_SCROLLWIN_LINEUP(mpWindow::OnScrollLineUp)
+    EVT_SCROLLWIN_LINEDOWN(mpWindow::OnScrollLineDown)
+    EVT_SCROLLWIN_TOP(mpWindow::OnScrollTop)
+EVT_SCROLLWIN_BOTTOM(mpWindow::OnScrollBottom)
+
+    EVT_MIDDLE_UP( mpWindow::OnShowPopupMenu)
+    EVT_RIGHT_DOWN( mpWindow::OnMouseRightDown) // JLB
+    EVT_RIGHT_UP ( mpWindow::OnShowPopupMenu)
+    EVT_MOUSEWHEEL( mpWindow::OnMouseWheel )   // JLB
+    EVT_MOTION( mpWindow::OnMouseMove )   // JLB
+    EVT_LEFT_DOWN( mpWindow::OnMouseLeftDown)
+EVT_LEFT_UP( mpWindow::OnMouseLeftRelease)
+
+    EVT_MENU( mpID_CENTER,    mpWindow::OnCenter)
+    EVT_MENU( mpID_FIT,       mpWindow::OnFit)
+    EVT_MENU( mpID_ZOOM_IN,   mpWindow::OnZoomIn)
+    EVT_MENU( mpID_ZOOM_OUT,  mpWindow::OnZoomOut)
+    EVT_MENU( mpID_LOCKASPECT,mpWindow::OnLockAspect)
+    EVT_MENU( mpID_HELP_MOUSE,mpWindow::OnMouseHelp)
+END_EVENT_TABLE()
+
+mpWindow::mpWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long flag )
+    : wxWindow( parent, id, pos, size, flag, wxT("mathplot") )
+{
+    m_scaleX = m_scaleY = 1.0;
+    m_posX   = m_posY   = 0;
+    m_desiredXmin=m_desiredYmin=0;
+    m_desiredXmax=m_desiredYmax=1;
+    m_scrX   = m_scrY   = 64; // Fixed from m_scrX = m_scrX = 64;
+    m_minX   = m_minY   = 0;
+    m_maxX   = m_maxY   = 0;
+    m_last_lx= m_last_ly= 0;
+    m_buff_bmp = NULL;
+    m_enableDoubleBuffer        = FALSE;
+    m_enableMouseNavigation     = TRUE;
+    m_mouseMovedAfterRightClick = FALSE;
+    m_movingInfoLayer = NULL;
+    // Set margins to 0
+    m_marginTop = 0; m_marginRight = 0; m_marginBottom = 0; m_marginLeft = 0;
+
+
+    m_lockaspect = FALSE;
+
+    m_popmenu.Append( mpID_CENTER,     _("Center"),      _("Center plot view to this position"));
+    m_popmenu.Append( mpID_FIT,        _("Fit"),         _("Set plot view to show all items"));
+    m_popmenu.Append( mpID_ZOOM_IN,    _("Zoom in"),     _("Zoom in plot view."));
+    m_popmenu.Append( mpID_ZOOM_OUT,   _("Zoom out"),    _("Zoom out plot view."));
+    m_popmenu.AppendCheckItem( mpID_LOCKASPECT, _("Lock aspect"), _("Lock horizontal and vertical zoom aspect."));
+    m_popmenu.Append( mpID_HELP_MOUSE,   _("Show mouse commands..."),    _("Show help about the mouse commands."));
+
+    m_layers.clear();
+    SetBackgroundColour( *wxWHITE );
+    m_bgColour = *wxWHITE;
+    m_fgColour = *wxBLACK;
+
+    m_enableScrollBars = false;
+    SetSizeHints(128, 128);
+
+    // J.L.Blanco: Eliminates the "flick" with the double buffer.
+    SetBackgroundStyle( wxBG_STYLE_CUSTOM );
+
+    UpdateAll();
+}
+
+mpWindow::~mpWindow()
+{
+    // Free all the layers:
+    DelAllLayers( true, false );
+
+    if (m_buff_bmp)
+    {
+        delete m_buff_bmp;
+        m_buff_bmp = NULL;
+    }
+}
+
+// Mouse handler, for detecting when the user drag with the right button or just "clicks" for the menu
+// JLB
+void mpWindow::OnMouseRightDown(wxMouseEvent     &event)
+{
+    m_mouseMovedAfterRightClick = FALSE;
+    m_mouseRClick_X = event.GetX();
+    m_mouseRClick_Y = event.GetY();
+    if (m_enableMouseNavigation)
+    {
+        SetCursor( *wxCROSS_CURSOR );
+    }
+}
+
+// Process mouse wheel events
+// JLB
+void mpWindow::OnMouseWheel( wxMouseEvent &event )
+{
+    if (!m_enableMouseNavigation)
+    {
+        event.Skip();
+        return;
+    }
+
+    //     GetClientSize( &m_scrX,&m_scrY);
+
+    if (event.m_controlDown)
+    {
+        wxPoint clickPt( event.GetX(),event.GetY() );
+        // CTRL key hold: Zoom in/out:
+        if (event.GetWheelRotation()>0)
+            ZoomIn( clickPt );
+        else    ZoomOut( clickPt );
+    }
+    else
+    {
+        // Scroll vertically or horizontally (this is SHIFT is hold down).
+        int change = - event.GetWheelRotation(); // Opposite direction (More intuitive)!
+        double changeUnitsX = change / m_scaleX;
+        double changeUnitsY = change / m_scaleY;
+
+        if (event.m_shiftDown)
+        {
+            m_posX 		+= changeUnitsX;
+            m_desiredXmax 	+= changeUnitsX;
+            m_desiredXmin 	+= changeUnitsX;
+        }
+        else
+        {
+            m_posY 		-= changeUnitsY;
+            m_desiredYmax	-= changeUnitsY;
+            m_desiredYmax	-= changeUnitsY;
+        }
+
+        UpdateAll();
+    }
+}
+
+// If the user "drags" with the right buttom pressed, do "pan"
+// JLB
+void mpWindow::OnMouseMove(wxMouseEvent     &event)
+{
+    if (!m_enableMouseNavigation)
+    {
+        event.Skip();
+        return;
+    }
+
+    if (event.m_rightDown)
+    {
+        m_mouseMovedAfterRightClick = TRUE;  // Hides the popup menu after releasing the button!
+
+        // The change:
+        int  Ax= m_mouseRClick_X - event.GetX();
+        int  Ay= m_mouseRClick_Y - event.GetY();
+
+        // For the next event, use relative to this coordinates.
+        m_mouseRClick_X = event.GetX();
+        m_mouseRClick_Y = event.GetY();
+
+        double   Ax_units = Ax / m_scaleX;
+        double   Ay_units = -Ay / m_scaleY;
+
+        m_posX += Ax_units;
+        m_posY += Ay_units;
+        m_desiredXmax 	+= Ax_units;
+        m_desiredXmin 	+= Ax_units;
+        m_desiredYmax 	+= Ay_units;
+        m_desiredYmin 	+= Ay_units;
+
+        UpdateAll();
+
+#ifdef MATHPLOT_DO_LOGGING
+        wxLogMessage(_("[mpWindow::OnMouseMove] Ax:%i Ay:%i m_posX:%f m_posY:%f"),Ax,Ay,m_posX,m_posY);
+#endif
+    } else {
+        if (event.m_leftDown) {
+            if (m_movingInfoLayer == NULL) {
+                wxClientDC dc(this);
+                wxPen pen(*wxBLACK, 1, wxDOT);
+                dc.SetPen(pen);
+                dc.SetBrush(*wxTRANSPARENT_BRUSH);
+                dc.DrawRectangle(m_mouseLClick_X, m_mouseLClick_Y, event.GetX() - m_mouseLClick_X, event.GetY() - m_mouseLClick_Y);
+            } else {
+                wxPoint moveVector(event.GetX() - m_mouseLClick_X, event.GetY() - m_mouseLClick_Y);
+                m_movingInfoLayer->Move(moveVector);
+            }
+            UpdateAll();
+        } else {
+            wxLayerList::iterator li;
+            for (li = m_layers.begin(); li != m_layers.end(); li++) {
+                if ((*li)->IsInfo() && (*li)->IsVisible()) {
+                    mpInfoLayer* tmpLyr = (mpInfoLayer*) (*li);
+                    tmpLyr->UpdateInfo(*this, event);
+                    // UpdateAll();
+                    RefreshRect(tmpLyr->GetRectangle());
+                }
+            }
+            /* if (m_coordTooltip) {
+               wxString toolTipContent;
+               toolTipContent.Printf(_("X = %f\nY = %f"), p2x(event.GetX()), p2y(event.GetY()));
+               wxTipWindow** ptr = NULL;
+               wxRect rectBounds(event.GetX(), event.GetY(), 5, 5);
+               wxTipWindow* tip = new wxTipWindow(this, toolTipContent, 100, ptr, &rectBounds);
+
+               } */
+        }
+    }
+    event.Skip();
+}
+
+void mpWindow::OnMouseLeftDown (wxMouseEvent &event)
+{
+    m_mouseLClick_X = event.GetX();
+    m_mouseLClick_Y = event.GetY();
+#ifdef MATHPLOT_DO_LOGGING
+    wxLogMessage(_("mpWindow::OnMouseLeftDown() X = %d , Y = %d"), event.GetX(), event.GetY());/*m_mouseLClick_X, m_mouseLClick_Y);*/
+#endif
+    wxPoint pointClicked = event.GetPosition();
+    m_movingInfoLayer = IsInsideInfoLayer(pointClicked);
+    if (m_movingInfoLayer != NULL) {
+#ifdef MATHPLOT_DO_LOGGING
+        wxLogMessage(_("mpWindow::OnMouseLeftDown() started moving layer %lx"), (long int) m_movingInfoLayer);/*m_mouseLClick_X, m_mouseLClick_Y);*/
+#endif
+    }
+    event.Skip();
+}
+
+void mpWindow::OnMouseLeftRelease (wxMouseEvent &event)
+{
+    wxPoint release(event.GetX(), event.GetY());
+    wxPoint press(m_mouseLClick_X, m_mouseLClick_Y);
+    if (m_movingInfoLayer != NULL) {
+        m_movingInfoLayer->UpdateReference();
+        m_movingInfoLayer = NULL;
+    } else {
+        if (release != press) {
+            ZoomRect(press, release);
+        } /*else {
+            if (m_coordTooltip) {
+            wxString toolTipContent;
+            toolTipContent.Printf(_("X = %f\nY = %f"), p2x(event.GetX()), p2y(event.GetY()));
+            SetToolTip(toolTipContent);
+            }
+            } */
+    }
+    event.Skip();
+}
+
+void mpWindow::Fit()
+{
+    if (UpdateBBox())
+        Fit(m_minX,m_maxX,m_minY,m_maxY );
+}
+
+
+// JL
+void mpWindow::Fit(double xMin, double xMax, double yMin, double yMax, wxCoord *printSizeX,wxCoord *printSizeY)
+{
+    // Save desired borders:
+    m_desiredXmin=xMin; m_desiredXmax=xMax;
+    m_desiredYmin=yMin; m_desiredYmax=yMax;
+
+    if (printSizeX!=NULL && printSizeY!=NULL)
+    {
+        // Printer:
+        m_scrX = *printSizeX;
+        m_scrY = *printSizeY;
+    }
+    else
+    {
+        // Normal case (screen):
+        GetClientSize( &m_scrX,&m_scrY);
+    }
+
+    double Ax,Ay;
+
+    Ax = xMax - xMin;
+    Ay = yMax - yMin;
+
+    m_scaleX = (Ax!=0) ? (m_scrX - m_marginLeft - m_marginRight)/Ax : 1; //m_scaleX = (Ax!=0) ? m_scrX/Ax : 1;
+    m_scaleY = (Ay!=0) ? (m_scrY - m_marginTop - m_marginBottom)/Ay : 1; //m_scaleY = (Ay!=0) ? m_scrY/Ay : 1;
+
+    if (m_lockaspect)
+    {
+#ifdef MATHPLOT_DO_LOGGING
+        wxLogMessage(_("mpWindow::Fit()(lock) m_scaleX=%f,m_scaleY=%f"), m_scaleX,m_scaleY);
+#endif
+        // Keep the lowest "scale" to fit the whole range required by that axis (to actually "fit"!):
+        double s = m_scaleX < m_scaleY ? m_scaleX : m_scaleY;
+        m_scaleX = s;
+        m_scaleY = s;
+    }
+
+    // Adjusts corner coordinates: This should be simply:
+    //   m_posX = m_minX;
+    //   m_posY = m_maxY;
+    // But account for centering if we have lock aspect:
+    m_posX = (xMin+xMax)/2 - ((m_scrX - m_marginLeft - m_marginRight)/2 + m_marginLeft)/m_scaleX ; // m_posX = (xMin+xMax)/2 - (m_scrX/2)/m_scaleX;
+    //	m_posY = (yMin+yMax)/2 + ((m_scrY - m_marginTop - m_marginBottom)/2 - m_marginTop)/m_scaleY;  // m_posY = (yMin+yMax)/2 + (m_scrY/2)/m_scaleY;
+    m_posY = (yMin+yMax)/2 + ((m_scrY - m_marginTop - m_marginBottom)/2 + m_marginTop)/m_scaleY;  // m_posY = (yMin+yMax)/2 + (m_scrY/2)/m_scaleY;
+
+#ifdef MATHPLOT_DO_LOGGING
+    wxLogMessage(_("mpWindow::Fit() m_desiredXmin=%f m_desiredXmax=%f  m_desiredYmin=%f m_desiredYmax=%f"), xMin,xMax,yMin,yMax);
+    wxLogMessage(_("mpWindow::Fit() m_scaleX = %f , m_scrX = %d,m_scrY=%d, Ax=%f, Ay=%f, m_posX=%f, m_posY=%f"), m_scaleX, m_scrX,m_scrY, Ax,Ay,m_posX,m_posY);
+#endif
+
+    // It is VERY IMPORTANT to DO NOT call Refresh if we are drawing to the printer!!
+    // Otherwise, the DC dimensions will be those of the window instead of the printer device
+    if (printSizeX==NULL || printSizeY==NULL)
+        UpdateAll();
+}
+
+// Patch ngpaton
+void mpWindow::DoZoomInXCalc (const int staticXpixel)
+{
+    // Preserve the position of the clicked point:
+    double staticX = p2x( staticXpixel );
+    // Zoom in:
+    m_scaleX = m_scaleX * zoomIncrementalFactor;
+    // Adjust the new m_posx
+    m_posX = staticX - (staticXpixel / m_scaleX);
+    // Adjust desired
+    m_desiredXmin = m_posX;
+    m_desiredXmax = m_posX + (m_scrX - (m_marginLeft + m_marginRight)) / m_scaleX;
+#ifdef MATHPLOT_DO_LOGGING
+    wxLogMessage(_("mpWindow::DoZoomInXCalc() prior X coord: (%f), new X coord: (%f) SHOULD BE EQUAL!!"), staticX, p2x(staticXpixel));
+#endif
+}
+
+void mpWindow::DoZoomInYCalc (const int staticYpixel)
+{
+    // Preserve the position of the clicked point:
+    double staticY = p2y( staticYpixel );
+    // Zoom in:
+    m_scaleY = m_scaleY * zoomIncrementalFactor;
+    // Adjust the new m_posy:
+    m_posY = staticY + (staticYpixel / m_scaleY);
+    // Adjust desired
+    m_desiredYmax = m_posY;
+    m_desiredYmin = m_posY - (m_scrY - (m_marginTop + m_marginBottom)) / m_scaleY;
+#ifdef MATHPLOT_DO_LOGGING
+    wxLogMessage(_("mpWindow::DoZoomInYCalc() prior Y coord: (%f), new Y coord: (%f) SHOULD BE EQUAL!!"), staticY, p2y(staticYpixel));
+#endif
+}
+
+void mpWindow::DoZoomOutXCalc  (const int staticXpixel)
+{
+    // Preserve the position of the clicked point:
+    double staticX = p2x( staticXpixel );
+    // Zoom out:
+    m_scaleX = m_scaleX / zoomIncrementalFactor;
+    // Adjust the new m_posx/y:
+    m_posX = staticX - (staticXpixel / m_scaleX);
+    // Adjust desired
+    m_desiredXmin = m_posX;
+    m_desiredXmax = m_posX + (m_scrX - (m_marginLeft + m_marginRight)) / m_scaleX;
+#ifdef MATHPLOT_DO_LOGGING
+    wxLogMessage(_("mpWindow::DoZoomOutXCalc() prior X coord: (%f), new X coord: (%f) SHOULD BE EQUAL!!"), staticX, p2x(staticXpixel));
+#endif
+}
+
+void mpWindow::DoZoomOutYCalc  (const int staticYpixel)
+{
+    // Preserve the position of the clicked point:
+    double staticY = p2y( staticYpixel );
+    // Zoom out:
+    m_scaleY = m_scaleY / zoomIncrementalFactor;
+    // Adjust the new m_posx/y:
+    m_posY = staticY + (staticYpixel / m_scaleY);
+    // Adjust desired
+    m_desiredYmax = m_posY;
+    m_desiredYmin = m_posY - (m_scrY - (m_marginTop + m_marginBottom)) / m_scaleY;
+#ifdef MATHPLOT_DO_LOGGING
+    wxLogMessage(_("mpWindow::DoZoomOutYCalc() prior Y coord: (%f), new Y coord: (%f) SHOULD BE EQUAL!!"), staticY, p2y(staticYpixel));
+#endif
+}
+
+
+void mpWindow::ZoomIn(const wxPoint& centerPoint )
+{
+    wxPoint	c(centerPoint);
+    if (c == wxDefaultPosition)
+    {
+        GetClientSize(&m_scrX, &m_scrY);
+        c.x = (m_scrX - m_marginLeft - m_marginRight)/2 + m_marginLeft; // c.x = m_scrX/2;
+        c.y = (m_scrY - m_marginTop - m_marginBottom)/2 - m_marginTop; // c.y = m_scrY/2;
+    }
+
+    // Preserve the position of the clicked point:
+    double prior_layer_x = p2x( c.x );
+    double prior_layer_y = p2y( c.y );
+
+    // Zoom in:
+    m_scaleX = m_scaleX * zoomIncrementalFactor;
+    m_scaleY = m_scaleY * zoomIncrementalFactor;
+
+    // Adjust the new m_posx/y:
+    m_posX = prior_layer_x - c.x / m_scaleX;
+    m_posY = prior_layer_y + c.y / m_scaleY;
+
+    m_desiredXmin = m_posX;
+    m_desiredXmax = m_posX + (m_scrX - m_marginLeft - m_marginRight) / m_scaleX; // m_desiredXmax = m_posX + m_scrX / m_scaleX;
+    m_desiredYmax = m_posY;
+    m_desiredYmin = m_posY - (m_scrY - m_marginTop - m_marginBottom) / m_scaleY; // m_desiredYmin = m_posY - m_scrY / m_scaleY;
+
+
+#ifdef MATHPLOT_DO_LOGGING
+    wxLogMessage(_("mpWindow::ZoomIn() prior coords: (%f,%f), new coords: (%f,%f) SHOULD BE EQUAL!!"), prior_layer_x,prior_layer_y, p2x(c.x),p2y(c.y));
+#endif
+
+    UpdateAll();
+}
+
+void mpWindow::ZoomOut(const wxPoint& centerPoint )
+{
+    wxPoint	c(centerPoint);
+    if (c == wxDefaultPosition)
+    {
+        GetClientSize(&m_scrX, &m_scrY);
+        c.x = (m_scrX - m_marginLeft - m_marginRight)/2 + m_marginLeft; // c.x = m_scrX/2;
+        c.y = (m_scrY - m_marginTop - m_marginBottom)/2 - m_marginTop; // c.y = m_scrY/2;
+    }
+
+    // Preserve the position of the clicked point:
+    double prior_layer_x = p2x( c.x );
+    double prior_layer_y = p2y( c.y );
+
+    // Zoom out:
+    m_scaleX = m_scaleX / zoomIncrementalFactor;
+    m_scaleY = m_scaleY / zoomIncrementalFactor;
+
+    // Adjust the new m_posx/y:
+    m_posX = prior_layer_x - c.x / m_scaleX;
+    m_posY = prior_layer_y + c.y / m_scaleY;
+
+    m_desiredXmin = m_posX;
+    m_desiredXmax = m_posX + (m_scrX - m_marginLeft - m_marginRight) / m_scaleX; // m_desiredXmax = m_posX + m_scrX / m_scaleX;
+    m_desiredYmax = m_posY;
+    m_desiredYmin = m_posY - (m_scrY - m_marginTop - m_marginBottom) / m_scaleY; // m_desiredYmin = m_posY - m_scrY / m_scaleY;
+
+#ifdef MATHPLOT_DO_LOGGING
+    wxLogMessage(_("mpWindow::ZoomOut() prior coords: (%f,%f), new coords: (%f,%f) SHOULD BE EQUAL!!"), prior_layer_x,prior_layer_y, p2x(c.x),p2y(c.y));
+#endif
+    UpdateAll();
+}
+
+void mpWindow::ZoomInX()
+{
+    m_scaleX = m_scaleX * zoomIncrementalFactor;
+    UpdateAll();
+}
+
+void mpWindow::ZoomOutX()
+{
+    m_scaleX = m_scaleX / zoomIncrementalFactor;
+    UpdateAll();
+}
+
+void mpWindow::ZoomInY()
+{
+    m_scaleY = m_scaleY * zoomIncrementalFactor;
+    UpdateAll();
+}
+
+void mpWindow::ZoomOutY()
+{
+    m_scaleY = m_scaleY / zoomIncrementalFactor;
+    UpdateAll();
+}
+
+void mpWindow::ZoomRect(wxPoint p0, wxPoint p1)
+{
+    // Compute the 2 corners in graph coordinates:
+    double p0x = p2x(p0.x);
+    double p0y = p2y(p0.y);
+    double p1x = p2x(p1.x);
+    double p1y = p2y(p1.y);
+
+    // Order them:
+    double zoom_x_min = p0x<p1x ? p0x:p1x;
+    double zoom_x_max = p0x>p1x ? p0x:p1x;
+    double zoom_y_min = p0y<p1y ? p0y:p1y;
+    double zoom_y_max = p0y>p1y ? p0y:p1y;
+
+#ifdef MATHPLOT_DO_LOGGING
+    wxLogMessage(_("Zoom: (%f,%f)-(%f,%f)"),zoom_x_min,zoom_y_min,zoom_x_max,zoom_y_max);
+#endif
+
+    Fit(zoom_x_min,zoom_x_max,zoom_y_min,zoom_y_max);
+}
+
+void mpWindow::LockAspect(bool enable)
+{
+    m_lockaspect = enable;
+    m_popmenu.Check(mpID_LOCKASPECT, enable);
+
+    // Try to fit again with the new config:
+    Fit( m_desiredXmin, m_desiredXmax, m_desiredYmin, m_desiredYmax );
+}
+
+void mpWindow::OnShowPopupMenu(wxMouseEvent &event)
+{
+    // Only display menu if the user has not "dragged" the figure
+    if (m_enableMouseNavigation)
+    {
+        SetCursor( *wxSTANDARD_CURSOR );
+    }
+
+    if (!m_mouseMovedAfterRightClick)   // JLB
+    {
+        m_clickedX = event.GetX();
+        m_clickedY = event.GetY();
+        PopupMenu( &m_popmenu, event.GetX(), event.GetY());
+    }
+}
+
+void mpWindow::OnLockAspect(wxCommandEvent& WXUNUSED(event))
+{
+    LockAspect( !m_lockaspect );
+}
+
+void mpWindow::OnMouseHelp(wxCommandEvent& WXUNUSED(event))
+{
+    wxMessageBox(_("Supported Mouse commands:\n \
+                - Left button down + Mark area: Rectangular zoom\n \
+                - Right button down + Move: Pan (Move)\n \
+                - Wheel: Vertical scroll\n \
+                - Wheel + SHIFT: Horizontal scroll\n \
+                - Wheel + CTRL: Zoom in/out"),_("wxMathPlot help"),wxOK,this);
+}
+
+void mpWindow::OnFit(wxCommandEvent& WXUNUSED(event))
+{
+    Fit();
+}
+
+void mpWindow::OnCenter(wxCommandEvent& WXUNUSED(event))
+{
+    GetClientSize(&m_scrX, &m_scrY);
+    int centerX = (m_scrX - m_marginLeft - m_marginRight)/2; // + m_marginLeft; // c.x = m_scrX/2;
+    int centerY = (m_scrY - m_marginTop - m_marginBottom)/2; // - m_marginTop; // c.y = m_scrY/2;
+    SetPos( p2x(m_clickedX - centerX), p2y(m_clickedY - centerY) );
+    //SetPos( p2x(m_clickedX-m_scrX/2), p2y(m_clickedY-m_scrY/2) );  //SetPos( (double)(m_clickedX-m_scrX/2) / m_scaleX + m_posX, (double)(m_scrY/2-m_clickedY) / m_scaleY + m_posY);
+}
+
+void mpWindow::OnZoomIn(wxCommandEvent& WXUNUSED(event))
+{
+    ZoomIn( wxPoint(m_mouseRClick_X,m_mouseRClick_Y) );
+}
+
+void mpWindow::OnZoomOut(wxCommandEvent& WXUNUSED(event))
+{
+    ZoomOut();
+}
+
+void mpWindow::OnSize( wxSizeEvent& WXUNUSED(event) )
+{
+    // Try to fit again with the new window size:
+    Fit( m_desiredXmin, m_desiredXmax, m_desiredYmin, m_desiredYmax );
+#ifdef MATHPLOT_DO_LOGGING
+    wxLogMessage(_("mpWindow::OnSize() m_scrX = %d, m_scrY = %d"), m_scrX, m_scrY);
+#endif // MATHPLOT_DO_LOGGING
+}
+
+bool mpWindow::AddLayer( mpLayer* layer, bool refreshDisplay )
+{
+    if (layer != NULL) {
+        m_layers.push_back( layer );
+        if (refreshDisplay) UpdateAll();
+        return true;
+    };
+    return false;
+}
+
+bool mpWindow::DelLayer(
+        mpLayer*    layer,
+        bool        alsoDeleteObject,
+        bool        refreshDisplay )
+{
+    wxLayerList::iterator layIt;
+    for (layIt = m_layers.begin(); layIt != m_layers.end(); layIt++)
+    {
+        if (*layIt == layer)
+        {
+            // Also delete the object?
+            if (alsoDeleteObject)
+                delete *layIt;
+            m_layers.erase(layIt); // this deleted the reference only
+            if (refreshDisplay)
+                UpdateAll();
+            return true;
+        }
+    }
+    return false;
+}
+
+void mpWindow::DelAllLayers( bool alsoDeleteObject, bool refreshDisplay)
+{
+    while ( m_layers.size()>0 )
+    {
+        // Also delete the object?
+        if (alsoDeleteObject) delete m_layers[0];
+        m_layers.erase( m_layers.begin() ); // this deleted the reference only
+    }
+    if (refreshDisplay)  UpdateAll();
+}
+
+// void mpWindow::DoPrepareDC(wxDC& dc)
+// {
+//     dc.SetDeviceOrigin(x2p(m_minX), y2p(m_maxY));
+// }
+
+void mpWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
+{
+    wxPaintDC dc(this);
+    dc.GetSize(&m_scrX, &m_scrY);   // This is the size of the visible area only!
+    //     DoPrepareDC(dc);
+
+#ifdef MATHPLOT_DO_LOGGING
+    {
+        int px, py;
+        GetViewStart( &px, &py );
+        wxLogMessage(_("[mpWindow::OnPaint] vis.area:%ix%i px=%i py=%i"),m_scrX,m_scrY,px,py);
+    }
+#endif
+
+    // Selects direct or buffered draw:
+    wxDC    *trgDc;
+
+    // J.L.Blanco @ Aug 2007: Added double buffer support
+    if (m_enableDoubleBuffer)
+    {
+        if (m_last_lx!=m_scrX || m_last_ly!=m_scrY)
+        {
+            if (m_buff_bmp) delete m_buff_bmp;
+            m_buff_bmp = new wxBitmap(m_scrX,m_scrY);
+            m_buff_dc.SelectObject(*m_buff_bmp);
+            m_last_lx=m_scrX;
+            m_last_ly=m_scrY;
+        }
+        trgDc = &m_buff_dc;
+    }
+    else
+    {
+        trgDc = &dc;
+    }
+
+    // Draw background:
+    //trgDc->SetDeviceOrigin(0,0);
+    trgDc->SetPen( *wxTRANSPARENT_PEN );
+    wxBrush brush( GetBackgroundColour() );
+    trgDc->SetBrush( brush );
+    trgDc->SetTextForeground(m_fgColour);
+    trgDc->DrawRectangle(0,0,m_scrX,m_scrY);
+
+    // Draw all the layers:
+    //trgDc->SetDeviceOrigin( m_scrX>>1, m_scrY>>1);  // Origin at the center
+    wxLayerList::iterator li;
+    for (li = m_layers.begin(); li != m_layers.end(); li++)
+    {
+        (*li)->Plot(*trgDc, *this);
+    };
+
+    // If doublebuffer, draw now to the window:
+    if (m_enableDoubleBuffer)
+    {
+        //trgDc->SetDeviceOrigin(0,0);
+        //dc.SetDeviceOrigin(0,0);  // Origin at the center
+        dc.Blit(0,0,m_scrX,m_scrY,trgDc,0,0);
+    }
+
+    /*    if (m_coordTooltip) {
+          wxString toolTipContent;
+          wxPoint mousePoint =  wxGetMousePosition();
+          toolTipContent.Printf(_("X = %f\nY = %f"), p2x(mousePoint.x), p2y(mousePoint.y));
+          SetToolTip(toolTipContent);
+          }*/
+    // If scrollbars are enabled, refresh them
+    if (m_enableScrollBars) {
+        /*       m_scrollX = (int) floor((m_posX - m_minX)*m_scaleX);
+                 m_scrollY = (int) floor((m_maxY - m_posY )*m_scaleY);
+                 Scroll(m_scrollX, m_scrollY);*/
+        // Scroll(x2p(m_posX), y2p(m_posY));
+        //             SetVirtualSize((int) ((m_maxX - m_minX)*m_scaleX), (int) ((m_maxY - m_minY)*m_scaleY));
+        //         int centerX = (m_scrX - m_marginLeft - m_marginRight)/2; // + m_marginLeft; // c.x = m_scrX/2;
+        // 	int centerY = (m_scrY - m_marginTop - m_marginBottom)/2; // - m_marginTop; // c.y = m_scrY/2;
+        /*SetScrollbars(1, 1, (int) ((m_maxX - m_minX)*m_scaleX), (int) ((m_maxY - m_minY)*m_scaleY));*/ //, x2p(m_posX + centerX/m_scaleX), y2p(m_posY - centerY/m_scaleY), true);
+    }
+
+}
+
+// void mpWindow::OnScroll2(wxScrollWinEvent &event)
+// {
+// #ifdef MATHPLOT_DO_LOGGING
+//     wxLogMessage(_("[mpWindow::OnScroll2] Init: m_posX=%f m_posY=%f, sc_pos = %d"),m_posX,m_posY, event.GetPosition());
+// #endif
+//     // If scrollbars are not enabled, Skip operation
+//     if (!m_enableScrollBars) {
+//         event.Skip();
+//         return;
+//     }
+// //     m_scrollX = (int) floor((m_posX - m_minX)*m_scaleX);
+// //     m_scrollY = (int) floor((m_maxY - m_posY /*- m_minY*/)*m_scaleY);
+// //     Scroll(m_scrollX, m_scrollY);
+//
+// //     GetClientSize( &m_scrX, &m_scrY);
+//     //Scroll(x2p(m_desiredXmin), y2p(m_desiredYmin));
+//     int pixelStep = 1;
+//     if (event.GetOrientation() == wxHORIZONTAL) {
+//         //m_desiredXmin -= (m_scrollX - event.GetPosition())/m_scaleX;
+//         //m_desiredXmax -= (m_scrollX - event.GetPosition())/m_scaleX;
+//         m_posX -= (m_scrollX - event.GetPosition())/m_scaleX;
+//         m_scrollX = event.GetPosition();
+//     }
+//     Fit(m_desiredXmin, m_desiredXmax, m_desiredYmin, m_desiredYmax);
+// // /*    int pixelStep = 1;
+// //     if (event.GetOrientation() == wxHORIZONTAL) {
+// //         m_posX 		-= (px - event.GetPosition())/m_scaleX;//(pixelStep/m_scaleX);
+// // 	m_desiredXmax 	-= (px - event.GetPosition())/m_scaleX;//(pixelStep/m_scaleX);
+// // 	m_desiredXmin 	-= (px - event.GetPosition())/m_scaleX;//(pixelStep/m_scaleX);
+// //         //SetPosX( (double)px / GetScaleX() + m_minX + (double)(width>>1)/GetScaleX());
+// // //         m_posX = p2x(px); //m_minX + (double)(px /*+ (m_scrX)*/)/GetScaleX();
+// //     } else {
+// //         m_posY 		+= (py - event.GetPosition())/m_scaleY;//(pixelStep/m_scaleY);
+// // 	m_desiredYmax	+= (py - event.GetPosition())/m_scaleY;//(pixelStep/m_scaleY);
+// // 	m_desiredYmax	+= (py - event.GetPosition())/m_scaleY;//(pixelStep/m_scaleY);
+// //         //SetPosY( m_maxY - (double)py / GetScaleY() - (double)(height>>1)/GetScaleY());
+// //         //m_posY = m_maxY - (double)py / GetScaleY() - (double)(height>>1)/GetScaleY();
+// // //         m_posY = p2y(py);//m_maxY - (double)(py /*+ (m_scrY)*/)/GetScaleY();
+// //     }*/
+// #ifdef MATHPLOT_DO_LOGGING
+//     int px, py;
+//     GetViewStart( &px, &py);
+//     wxLogMessage(_("[mpWindow::OnScroll2] End:  m_posX = %f, m_posY = %f, px = %f, py = %f"),m_posX, m_posY, px, py);
+// #endif
+//
+//     UpdateAll();
+// //     event.Skip();
+// }
+
+void mpWindow::SetMPScrollbars(bool status)
+{
+    // Temporary behaviour: always disable scrollbars
+    m_enableScrollBars = status; //false;
+    if (status == false)
+    {
+        SetScrollbar(wxHORIZONTAL, 0, 0, 0);
+        SetScrollbar(wxVERTICAL, 0, 0, 0);
+    }
+    // else the scroll bars will be updated in UpdateAll();
+    UpdateAll();
+
+    //     EnableScrolling(false, false);
+    //     m_enableScrollBars = status;
+    //     EnableScrolling(status, status);
+    /*    m_scrollX = (int) floor((m_posX - m_minX)*m_scaleX);
+          m_scrollY = (int) floor((m_posY - m_minY)*m_scaleY);*/
+    //     int scrollWidth = (int) floor((m_maxX - m_minX)*m_scaleX) - m_scrX;
+    //     int scrollHeight = (int) floor((m_minY - m_maxY)*m_scaleY) - m_scrY;
+
+    // /*    m_scrollX = (int) floor((m_posX - m_minX)*m_scaleX);
+    //     m_scrollY = (int) floor((m_maxY - m_posY /*- m_minY*/)*m_scaleY);
+    //     int scrollWidth = (int) floor(((m_maxX - m_minX) - (m_desiredXmax - m_desiredXmin))*m_scaleX);
+    //     int scrollHeight = (int) floor(((m_maxY - m_minY) - (m_desiredYmax - m_desiredYmin))*m_scaleY);
+    // #ifdef MATHPLOT_DO_LOGGING
+    //     wxLogMessage(_("mpWindow::SetMPScrollbars() scrollWidth = %d, scrollHeight = %d"), scrollWidth, scrollHeight);
+    // #endif
+    //     if(status) {
+    //         SetScrollbars(1,
+    //                       1,
+    //                       scrollWidth,
+    //                       scrollHeight,
+    //                       m_scrollX,
+    //                       m_scrollY);
+    // //         SetVirtualSize((int) (m_maxX - m_minX), (int) (m_maxY - m_minY));
+    //     }
+    //     Refresh(false);*/
+};
+
+bool mpWindow::UpdateBBox()
+{
+    bool first = TRUE;
+
+    for (wxLayerList::iterator li = m_layers.begin(); li != m_layers.end(); li++)
+    {
+        mpLayer* f = *li;
+
+        if (f->HasBBox())
+        {
+            if (first)
+            {
+                first = FALSE;
+                m_minX = f->GetMinX(); m_maxX=f->GetMaxX();
+                m_minY = f->GetMinY(); m_maxY=f->GetMaxY();
+            }
+            else
+            {
+                if (f->GetMinX()<m_minX)
+                    m_minX=f->GetMinX();
+
+                if (f->GetMaxX()>m_maxX)
+                    m_maxX=f->GetMaxX();
+
+                if (f->GetMinY()<m_minY)
+                    m_minY=f->GetMinY();
+
+                if (f->GetMaxY()>m_maxY)
+                    m_maxY=f->GetMaxY();
+            }
+        }
+        //node = node->GetNext();
+    }
+#ifdef MATHPLOT_DO_LOGGING
+    wxLogDebug(wxT("[mpWindow::UpdateBBox] Bounding box: Xmin = %f, Xmax = %f, Ymin = %f, YMax = %f"), m_minX, m_maxX, m_minY, m_maxY);
+#endif // MATHPLOT_DO_LOGGING
+    return first == FALSE;
+}
+
+// void mpWindow::UpdateAll()
+// {
+// GetClientSize( &m_scrX,&m_scrY);
+/*    if (m_enableScrollBars) {
+// The "virtual size" of the scrolled window:
+const int sx = (int)((m_maxX - m_minX) * GetScaleX());
+const int sy = (int)((m_maxY - m_minY) * GetScaleY());
+SetVirtualSize(sx, sy);
+SetScrollRate(1, 1);*/
+//         const int px = (int)((GetPosX() - m_minX) * GetScaleX());// - m_scrX); //(cx>>1));
+
+// J.L.Blanco, Aug 2007: Formula fixed:
+//         const int py = (int)((m_maxY - GetPosY()) * GetScaleY());// - m_scrY); //(cy>>1));
+//         int px, py;
+//         GetViewStart(&px0, &py0);
+// 	px = (int)((m_posX - m_minX)*m_scaleX);
+// 	py = (int)((m_maxY - m_posY)*m_scaleY);
+
+//         SetScrollbars( 1, 1, sx - m_scrX, sy - m_scrY, px, py, TRUE);
+//     }
+
+// Working code
+// 	UpdateBBox();
+//    Refresh( FALSE );
+// end working code
+
+// Old version
+/*   bool box = UpdateBBox();
+     if (box)
+     {
+     int cx, cy;
+     GetClientSize( &cx, &cy);
+
+// The "virtual size" of the scrolled window:
+const int sx = (int)((m_maxX - m_minX) * GetScaleX());
+const int sy = (int)((m_maxY - m_minY) * GetScaleY());
+
+const int px = (int)((GetPosX() - m_minX) * GetScaleX() - (cx>>1));
+
+// J.L.Blanco, Aug 2007: Formula fixed:
+const int py = (int)((m_maxY - GetPosY()) * GetScaleY() - (cy>>1));
+
+SetScrollbars( 1, 1, sx, sy, px, py, TRUE);
+
+#ifdef MATHPLOT_DO_LOGGING
+wxLogMessage(_("[mpWindow::UpdateAll] Size:%ix%i ScrollBars:%i,%i"),sx,sy,px,py);
+#endif
+}
+
+FitInside();
+Refresh( FALSE );
+*/
+// }
+
+void mpWindow::UpdateAll()
+{
+    if (UpdateBBox())
+    {
+        if (m_enableScrollBars)
+        {
+            int cx, cy;
+            GetClientSize( &cx, &cy);
+            // Do x scroll bar
+            {
+                // Convert margin sizes from pixels to coordinates
+                double leftMargin  = m_marginLeft / m_scaleX;
+                // Calculate the range in coords that we want to scroll over
+                double maxX = (m_desiredXmax > m_maxX) ? m_desiredXmax : m_maxX;
+                double minX = (m_desiredXmin < m_minX) ? m_desiredXmin : m_minX;
+                if ((m_posX + leftMargin) < minX)
+                    minX = m_posX + leftMargin;
+                // Calculate scroll bar size and thumb position
+                int sizeX = (int) ((maxX - minX) * m_scaleX);
+                int thumbX = (int)(((m_posX + leftMargin) - minX) * m_scaleX);
+                SetScrollbar(wxHORIZONTAL, thumbX, cx - (m_marginRight + m_marginLeft), sizeX);
+            }
+            // Do y scroll bar
+            {
+                // Convert margin sizes from pixels to coordinates
+                double topMargin = m_marginTop / m_scaleY;
+                // Calculate the range in coords that we want to scroll over
+                double maxY = (m_desiredYmax > m_maxY) ? m_desiredYmax : m_maxY;
+                if ((m_posY - topMargin) > maxY)
+                    maxY = m_posY - topMargin;
+                double minY = (m_desiredYmin < m_minY) ? m_desiredYmin : m_minY;
+                // Calculate scroll bar size and thumb position
+                int sizeY = (int)((maxY - minY) * m_scaleY);
+                int thumbY = (int)((maxY - (m_posY - topMargin)) * m_scaleY);
+                SetScrollbar(wxVERTICAL, thumbY, cy - (m_marginTop + m_marginBottom), sizeY);
+            }
+        }
+    }
+
+    Refresh( FALSE );
+}
+
+void mpWindow::DoScrollCalc    (const int position, const int orientation)
+{
+    if (orientation == wxVERTICAL)
+    {
+        // Y axis
+        // Get top margin in coord units
+        double topMargin = m_marginTop / m_scaleY;
+        // Calculate maximum Y coord to be shown in the graph
+        double maxY = m_desiredYmax > m_maxY ? m_desiredYmax  : m_maxY;
+        // Set new position
+        SetPosY((maxY - (position / m_scaleY)) + topMargin);
+    }
+    else
+    {
+        // X Axis
+        // Get left margin in coord units
+        double leftMargin  = m_marginLeft / m_scaleX;
+        // Calculate minimum X coord to be shown in the graph
+        double minX = (m_desiredXmin < m_minX) ? m_desiredXmin : m_minX;
+        // Set new position
+        SetPosX((minX + (position / m_scaleX)) - leftMargin);
+    }
+}
+
+void mpWindow::OnScrollThumbTrack (wxScrollWinEvent &event)
+{
+    DoScrollCalc(event.GetPosition(), event.GetOrientation());
+}
+
+void mpWindow::OnScrollPageUp (wxScrollWinEvent &event)
+{
+    int scrollOrientation = event.GetOrientation();
+    // Get position before page up
+    int position = GetScrollPos(scrollOrientation);
+    // Get thumb size
+    int thumbSize = GetScrollThumb(scrollOrientation);
+    // Need to adjust position by a page
+    position -= thumbSize;
+    if (position < 0)
+        position = 0;
+
+    DoScrollCalc(position, scrollOrientation);
+}
+void mpWindow::OnScrollPageDown (wxScrollWinEvent &event)
+{
+    int scrollOrientation = event.GetOrientation();
+    // Get position before page up
+    int position = GetScrollPos(scrollOrientation);
+    // Get thumb size
+    int thumbSize = GetScrollThumb(scrollOrientation);
+    // Get scroll range
+    int scrollRange = GetScrollRange(scrollOrientation);
+    // Need to adjust position by a page
+    position += thumbSize;
+    if (position > (scrollRange - thumbSize))
+        position = scrollRange - thumbSize;
+
+    DoScrollCalc(position, scrollOrientation);
+}
+
+void mpWindow::OnScrollLineUp     (wxScrollWinEvent &event)
+{
+    int scrollOrientation = event.GetOrientation();
+    // Get position before page up
+    int position = GetScrollPos(scrollOrientation);
+    // Need to adjust position by a line
+    position -= mpSCROLL_NUM_PIXELS_PER_LINE;
+    if (position < 0)
+        position = 0;
+
+    DoScrollCalc(position, scrollOrientation);
+}
+
+void mpWindow::OnScrollLineDown   (wxScrollWinEvent &event)
+{
+    int scrollOrientation = event.GetOrientation();
+    // Get position before page up
+    int position = GetScrollPos(scrollOrientation);
+    // Get thumb size
+    int thumbSize = GetScrollThumb(scrollOrientation);
+    // Get scroll range
+    int scrollRange = GetScrollRange(scrollOrientation);
+    // Need to adjust position by a page
+    position += mpSCROLL_NUM_PIXELS_PER_LINE;
+    if (position > (scrollRange - thumbSize))
+        position = scrollRange - thumbSize;
+
+    DoScrollCalc(position, scrollOrientation);
+}
+
+void mpWindow::OnScrollTop(wxScrollWinEvent &event)
+{
+    DoScrollCalc(0, event.GetOrientation());
+}
+
+void mpWindow::OnScrollBottom(wxScrollWinEvent &event)
+{
+    int scrollOrientation = event.GetOrientation();
+    // Get thumb size
+    int thumbSize = GetScrollThumb(scrollOrientation);
+    // Get scroll range
+    int scrollRange = GetScrollRange(scrollOrientation);
+
+    DoScrollCalc(scrollRange - thumbSize, scrollOrientation);
+}
+// End patch ngpaton
+
+void mpWindow::SetScaleX(double scaleX)
+{
+    if (scaleX!=0) m_scaleX=scaleX;
+    UpdateAll();
+}
+
+// New methods implemented by Davide Rondini
+
+unsigned int mpWindow::CountLayers()
+{
+    //wxNode *node = m_layers.GetFirst();
+    unsigned int layerNo = 0;
+    for(wxLayerList::iterator li = m_layers.begin(); li != m_layers.end(); li++)//while(node)
+    {
+        if ((*li)->HasBBox()) layerNo++;
+        // node = node->GetNext();
+    };
+    return layerNo;
+}
+
+mpLayer* mpWindow::GetLayer(int position)
+{
+    if ((position >= (int) m_layers.size()) || position < 0) return NULL;
+    return m_layers[position];
+}
+
+mpLayer* mpWindow::GetLayerByName( const wxString &name)
+{
+    for (wxLayerList::iterator it=m_layers.begin();it!=m_layers.end();it++)
+        if (! (*it)->GetName().Cmp( name ) )
+            return *it;
+    return NULL;    // Not found
+}
+
+void mpWindow::GetBoundingBox(double* bbox)
+{
+    bbox[0] = m_minX;
+    bbox[1] = m_maxX;
+    bbox[2] = m_minY;
+    bbox[3] = m_maxY;
+}
+
+bool mpWindow::SaveScreenshot(const wxString& filename, int type, wxSize imageSize, bool fit)
+{
+    int sizeX, sizeY;
+    int bk_scrX, bk_scrY;
+    if (imageSize == wxDefaultSize) {
+        sizeX = m_scrX;
+        sizeY = m_scrY;
+    } else {
+        sizeX = imageSize.x;
+        sizeY = imageSize.y;
+        bk_scrX = m_scrX;
+        bk_scrY = m_scrY;
+        SetScr(sizeX, sizeY);
+    }
+
+    wxBitmap screenBuffer(sizeX,sizeY);
+    wxMemoryDC screenDC;
+    screenDC.SelectObject(screenBuffer);
+    screenDC.SetPen( *wxTRANSPARENT_PEN );
+    wxBrush brush( GetBackgroundColour() );
+    screenDC.SetBrush( brush );
+    screenDC.DrawRectangle(0,0,sizeX,sizeY);
+
+    if (fit) {
+        Fit(m_minX, m_maxX, m_minY, m_maxY, &sizeX, &sizeY);
+    } else {
+        Fit(m_desiredXmin, m_desiredXmax, m_desiredYmin, m_desiredYmax, &sizeX, &sizeY);
+    }
+    // Draw all the layers:
+    wxLayerList::iterator li;
+    for (li = m_layers.begin(); li != m_layers.end(); li++)
+        (*li)->Plot(screenDC, *this);
+
+    if (imageSize != wxDefaultSize) {
+        // Restore dimensions
+        SetScr(bk_scrX, bk_scrY);
+        Fit(m_desiredXmin, m_desiredXmax, m_desiredYmin, m_desiredYmax, &bk_scrX, &bk_scrY);
+        UpdateAll();
+    }
+    // Once drawing is complete, actually save screen shot
+    wxImage screenImage = screenBuffer.ConvertToImage();
+    return screenImage.SaveFile(filename, type);
+}
+
+void mpWindow::SetMargins(int top, int right, int bottom, int left)
+{
+    m_marginTop = top;
+    m_marginRight = right;
+    m_marginBottom = bottom;
+    m_marginLeft = left;
+}
+
+mpInfoLayer* mpWindow::IsInsideInfoLayer(wxPoint& point)
+{
+    wxLayerList::iterator li;
+    for (li = m_layers.begin(); li != m_layers.end(); li++) {
+#ifdef MATHPLOT_DO_LOGGING
+        wxLogMessage(_("mpWindow::IsInsideInfoLayer() examinining layer = %p"), (*li));
+#endif // MATHPLOT_DO_LOGGING
+        if ((*li)->IsInfo()) {
+            mpInfoLayer* tmpLyr = (mpInfoLayer*) (*li);
+#ifdef MATHPLOT_DO_LOGGING
+            wxLogMessage(_("mpWindow::IsInsideInfoLayer() layer = %p"), (*li));
+#endif // MATHPLOT_DO_LOGGING
+            if (tmpLyr->Inside(point)) {
+                return tmpLyr;
+            }
+        }
+    }
+    return NULL;
+}
+
+void mpWindow::SetLayerVisible(const wxString &name, bool viewable)
+{
+    mpLayer* lx = GetLayerByName(name);
+    if ( lx ) {
+        lx->SetVisible(viewable);
+        UpdateAll();
+    }
+}
+
+bool mpWindow::IsLayerVisible(const wxString &name )
+{
+    mpLayer* lx = GetLayerByName(name);
+    return (lx) ? lx->IsVisible() : false;
+}
+
+void mpWindow::SetLayerVisible(const unsigned int position, bool viewable)
+{
+    mpLayer* lx = GetLayer(position);
+    if ( lx ) {
+        lx->SetVisible(viewable);
+        UpdateAll();
+    }
+}
+
+bool mpWindow::IsLayerVisible(const unsigned int position )
+{
+    mpLayer* lx = GetLayer(position);
+    return (lx) ? lx->IsVisible() : false;
+}
+
+void mpWindow::SetColourTheme(const wxColour& bgColour, const wxColour& drawColour, const wxColour& axesColour)
+{
+    SetBackgroundColour(bgColour);
+    SetForegroundColour(drawColour);
+    m_bgColour = bgColour;
+    m_fgColour = drawColour;
+    m_axColour = axesColour;
+    // cycle between layers to set colours and properties to them
+    wxLayerList::iterator li;
+    for (li = m_layers.begin(); li != m_layers.end(); li++) {
+        if ((*li)->GetLayerType() == mpLAYER_AXIS) {
+            wxPen axisPen = (*li)->GetPen(); // Get the old pen to modify only colour, not style or width
+            axisPen.SetColour(axesColour);
+            (*li)->SetPen(axisPen);
+        }
+        if ((*li)->GetLayerType() == mpLAYER_INFO) {
+            wxPen infoPen = (*li)->GetPen(); // Get the old pen to modify only colour, not style or width
+            infoPen.SetColour(drawColour);
+            (*li)->SetPen(infoPen);
+        }
+    }
+}
+
+// void mpWindow::EnableCoordTooltip(bool value)
+// {
+//      m_coordTooltip = value;
+// //      if (value) GetToolTip()->SetDelay(100);
+// }
+
+/*
+   double mpWindow::p2x(wxCoord pixelCoordX, bool drawOutside )
+   {
+   if (drawOutside) {
+   return m_posX + pixelCoordX/m_scaleX;
+   }
+// Draw inside margins
+double marginScaleX = ((double)(m_scrX - m_marginLeft - m_marginRight))/m_scrX;
+return m_marginLeft + (m_posX + pixelCoordX/m_scaleX)/marginScaleX;
+}
+
+double mpWindow::p2y(wxCoord pixelCoordY, bool drawOutside )
+{
+if (drawOutside) {
+return m_posY - pixelCoordY/m_scaleY;
+}
+// Draw inside margins
+double marginScaleY = ((double)(m_scrY - m_marginTop - m_marginBottom))/m_scrY;
+return m_marginTop + (m_posY - pixelCoordY/m_scaleY)/marginScaleY;
+}
+
+wxCoord mpWindow::x2p(double x, bool drawOutside)
+{
+if (drawOutside) {
+return (wxCoord) ((x-m_posX) * m_scaleX);
+}
+// Draw inside margins
+double marginScaleX = ((double)(m_scrX - m_marginLeft - m_marginRight))/m_scrX;
+#ifdef MATHPLOT_DO_LOGGING
+wxLogMessage(wxT("x2p ScrX = %d, marginRight = %d, marginLeft = %d, marginScaleX = %f"), m_scrX, m_marginRight, m_marginLeft,  marginScaleX);
+#endif // MATHPLOT_DO_LOGGING
+return (wxCoord) (int)(((x-m_posX) * m_scaleX)*marginScaleX) - m_marginLeft;
+}
+
+wxCoord mpWindow::y2p(double y, bool drawOutside)
+{
+if (drawOutside) {
+return (wxCoord) ( (m_posY-y) * m_scaleY);
+}
+// Draw inside margins
+double marginScaleY = ((double)(m_scrY - m_marginTop - m_marginBottom))/m_scrY;
+#ifdef MATHPLOT_DO_LOGGING
+wxLogMessage(wxT("y2p ScrY = %d, marginTop = %d, marginBottom = %d, marginScaleY = %f"), m_scrY, m_marginTop, m_marginBottom, marginScaleY);
+#endif // MATHPLOT_DO_LOGGING
+return (wxCoord) ((int)((m_posY-y) * m_scaleY)*marginScaleY) - m_marginTop;
+}
+*/
+
+
+//-----------------------------------------------------------------------------
+// mpFXYVector implementation - by Jose Luis Blanco (AGO-2007)
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(mpFXYVector, mpFXY)
+
+    // Constructor
+mpFXYVector::mpFXYVector(wxString name, int flags ) : mpFXY(name,flags)
+{
+    m_index = 0;
+    m_minX  = -1;
+    m_maxX  = 1;
+    m_minY  = -1;
+    m_maxY  = 1;
+    m_type = mpLAYER_PLOT;
+}
+
+void mpFXYVector::Rewind()
+{
+    m_index = 0;
+}
+
+bool mpFXYVector::GetNextXY(double & x, double & y)
+{
+    if (m_index>=m_xs.size())
+        return FALSE;
+    else
+    {
+        x = m_xs[m_index];
+        y = m_ys[m_index++];
+        return m_index<=m_xs.size();
+    }
+}
+
+void mpFXYVector::Clear()
+{
+    m_xs.clear();
+    m_ys.clear();
+}
+
+void mpFXYVector::SetData( const std::vector<double> &xs,const std::vector<double> &ys)
+{
+    // Check if the data vectora are of the same size
+    if (xs.size() != ys.size()) {
+        wxLogError(_("wxMathPlot error: X and Y vector are not of the same length!"));
+        return;
+    }
+    // Copy the data:
+    m_xs = xs;
+    m_ys = ys;
+
+
+    // Update internal variables for the bounding box.
+    if (xs.size()>0)
+    {
+        m_minX  = xs[0];
+        m_maxX  = xs[0];
+        m_minY  = ys[0];
+        m_maxY  = ys[0];
+
+        std::vector<double>::const_iterator  it;
+
+        for (it=xs.begin();it!=xs.end();it++)
+        {
+            if (*it<m_minX) m_minX=*it;
+            if (*it>m_maxX) m_maxX=*it;
+        }
+        for (it=ys.begin();it!=ys.end();it++)
+        {
+            if (*it<m_minY) m_minY=*it;
+            if (*it>m_maxY) m_maxY=*it;
+        }
+        m_minX-=0.5f;
+        m_minY-=0.5f;
+        m_maxX+=0.5f;
+        m_maxY+=0.5f;
+    }
+    else
+    {
+        m_minX  = -1;
+        m_maxX  = 1;
+        m_minY  = -1;
+        m_maxY  = 1;
+    }
+}
+
+//-----------------------------------------------------------------------------
+// mpText - provided by Val Greene
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(mpText, mpLayer)
+
+
+    /** @param name text to be displayed
+      @param offsetx x position in percentage (0-100)
+      @param offsetx y position in percentage (0-100)
+      */
+mpText::mpText( wxString name, int offsetx, int offsety )
+{
+    SetName(name);
+
+    if (offsetx >= 0 && offsetx <= 100)
+        m_offsetx = offsetx;
+    else
+        m_offsetx = 5;
+
+    if (offsety >= 0 && offsety <= 100)
+        m_offsety = offsety;
+    else
+        m_offsetx = 50;
+    m_type = mpLAYER_INFO;
+}
+
+/** mpText Layer plot handler.
+  This implementation will plot the text adjusted to the visible area.
+  */
+
+void mpText::Plot(wxDC & dc, mpWindow & w)
+{
+    if (m_visible) {
+        dc.SetPen(m_pen);
+        dc.SetFont(m_font);
+
+        wxCoord tw=0, th=0;
+        dc.GetTextExtent( GetName(), &tw, &th);
+
+        //     int left = -dc.LogicalToDeviceX(0);
+        //     int width = dc.LogicalToDeviceX(0) - left;
+        //     int bottom = dc.LogicalToDeviceY(0);
+        //     int height = bottom - -dc.LogicalToDeviceY(0);
+
+        /*    dc.DrawText( GetName(),
+              (int)((((float)width/100.0) * m_offsety) + left - (tw/2)),
+              (int)((((float)height/100.0) * m_offsetx) - bottom) );*/
+        int px = m_offsetx*(w.GetScrX() - w.GetMarginLeft() - w.GetMarginRight())/100;
+        int py = m_offsety*(w.GetScrY() - w.GetMarginTop() - w.GetMarginBottom())/100;
+        dc.DrawText( GetName(), px, py);
+    }
+}
+
+//-----------------------------------------------------------------------------
+// mpPrintout - provided by Davide Rondini
+//-----------------------------------------------------------------------------
+
+mpPrintout::mpPrintout(mpWindow *drawWindow, const wxChar *title) : wxPrintout(title)
+{
+    drawn = false;
+    plotWindow = drawWindow;
+}
+
+bool mpPrintout::OnPrintPage(int page)
+{
+
+    wxDC *trgDc = GetDC();
+    if ((trgDc) && (page == 1)) {
+        wxCoord m_prnX, m_prnY;
+        int marginX = 50;
+        int marginY = 50;
+        trgDc->GetSize(&m_prnX, &m_prnY);
+
+        m_prnX -= (2*marginX);
+        m_prnY -= (2*marginY);
+        trgDc->SetDeviceOrigin(marginX, marginY);
+
+#ifdef MATHPLOT_DO_LOGGING
+        wxLogMessage(wxT("Print Size: %d x %d\n"), m_prnX, m_prnY);
+        wxLogMessage(wxT("Screen Size: %d x %d\n"), plotWindow->GetScrX(), plotWindow->GetScrY());
+#endif
+
+        // Set the scale according to the page:
+        plotWindow->Fit(
+                plotWindow->GetDesiredXmin(),
+                plotWindow->GetDesiredXmax(),
+                plotWindow->GetDesiredYmin(),
+                plotWindow->GetDesiredYmax(),
+                &m_prnX,
+                &m_prnY );
+
+        // Get the colours of the plotWindow to restore them ath the end
+        wxColour oldBgColour = plotWindow->GetBackgroundColour();
+        wxColour oldFgColour = plotWindow->GetForegroundColour();
+        wxColour oldAxColour = plotWindow->GetAxesColour();
+
+        // Draw background, ensuring to use white background for printing.
+        trgDc->SetPen( *wxTRANSPARENT_PEN );
+        // wxBrush brush( plotWindow->GetBackgroundColour() );
+        wxBrush brush = *wxWHITE_BRUSH;
+        trgDc->SetBrush( brush );
+        trgDc->DrawRectangle(0,0,m_prnX,m_prnY);
+
+        // Draw all the layers:
+        //trgDc->SetDeviceOrigin( m_prnX>>1, m_prnY>>1);  // Origin at the center
+        mpLayer *layer;
+        for (unsigned int li = 0; li < plotWindow->CountAllLayers(); li++) {
+            layer = plotWindow->GetLayer(li);
+            layer->Plot(*trgDc, *plotWindow);
+        };
+        // Restore device origin
+        // trgDc->SetDeviceOrigin(0, 0);
+        // Restore colours
+        plotWindow->SetColourTheme(oldBgColour, oldFgColour, oldAxColour);
+        // Restore drawing
+        plotWindow->Fit(plotWindow->GetDesiredXmin(), plotWindow->GetDesiredXmax(), plotWindow->GetDesiredYmin(), plotWindow->GetDesiredYmax(), NULL, NULL);
+        plotWindow->UpdateAll();
+    }
+    return true;
+}
+
+bool mpPrintout::HasPage(int page)
+{
+    return (page == 1);
+}
+
+
+//-----------------------------------------------------------------------------
+// mpMovableObject - provided by Jose Luis Blanco
+//-----------------------------------------------------------------------------
+void mpMovableObject::TranslatePoint( double x,double y, double &out_x, double &out_y )
+{
+    double ccos = cos( m_reference_phi );  // Avoid computing cos/sin twice.
+    double csin = sin( m_reference_phi );
+
+    out_x = m_reference_x + ccos * x - csin * y;
+    out_y = m_reference_y + csin * x + ccos * y;
+}
+
+// This method updates the buffers m_trans_shape_xs/ys, and the precomputed bounding box.
+void mpMovableObject::ShapeUpdated()
+{
+    // Just in case...
+    if (m_shape_xs.size()!=m_shape_ys.size())
+    {
+        wxLogError(wxT("[mpMovableObject::ShapeUpdated] Error, m_shape_xs and m_shape_ys have different lengths!"));
+    }
+    else
+    {
+        double ccos = cos( m_reference_phi );  // Avoid computing cos/sin twice.
+        double csin = sin( m_reference_phi );
+
+        m_trans_shape_xs.resize(m_shape_xs.size());
+        m_trans_shape_ys.resize(m_shape_xs.size());
+
+        std::vector<double>::iterator itXi, itXo;
+        std::vector<double>::iterator itYi, itYo;
+
+        m_bbox_min_x=1e300;
+        m_bbox_max_x=-1e300;
+        m_bbox_min_y=1e300;
+        m_bbox_max_y=-1e300;
+
+        for (itXo=m_trans_shape_xs.begin(),itYo=m_trans_shape_ys.begin(),itXi=m_shape_xs.begin(),itYi=m_shape_ys.begin();
+                itXo!=m_trans_shape_xs.end(); itXo++,itYo++,itXi++,itYi++)
+        {
+            *itXo = m_reference_x + ccos * (*itXi) - csin * (*itYi);
+            *itYo = m_reference_y + csin * (*itXi) + ccos * (*itYi);
+
+            // Keep BBox:
+            if (*itXo < m_bbox_min_x) m_bbox_min_x = *itXo;
+            if (*itXo > m_bbox_max_x) m_bbox_max_x = *itXo;
+            if (*itYo < m_bbox_min_y) m_bbox_min_y = *itYo;
+            if (*itYo > m_bbox_max_y) m_bbox_max_y = *itYo;
+        }
+    }
+}
+
+void mpMovableObject::Plot(wxDC & dc, mpWindow & w)
+{
+    if (m_visible) {
+        dc.SetPen( m_pen);
+
+
+        std::vector<double>::iterator  itX=m_trans_shape_xs.begin();
+        std::vector<double>::iterator  itY=m_trans_shape_ys.begin();
+
+        if (!m_continuous)
+        {
+            // for some reason DrawPoint does not use the current pen,
+            // so we use DrawLine for fat pens
+            if (m_pen.GetWidth() <= 1)
+            {
+                while (itX!=m_trans_shape_xs.end())
+                {
+                    dc.DrawPoint( w.x2p(*(itX++)), w.y2p( *(itY++) ) );
+                }
+            }
+            else
+            {
+                while (itX!=m_trans_shape_xs.end())
+                {
+                    wxCoord cx = w.x2p(*(itX++));
+                    wxCoord cy = w.y2p(*(itY++));
+                    dc.DrawLine(cx, cy, cx, cy);
+                }
+            }
+        }
+        else
+        {
+            wxCoord cx0=0,cy0=0;
+            bool    first = TRUE;
+            while (itX!=m_trans_shape_xs.end())
+            {
+                wxCoord cx = w.x2p(*(itX++));
+                wxCoord cy = w.y2p(*(itY++));
+                if (first)
+                {
+                    first=FALSE;
+                    cx0=cx;cy0=cy;
+                }
+                dc.DrawLine(cx0, cy0, cx, cy);
+                cx0=cx; cy0=cy;
+            }
+        }
+
+        if (!m_name.IsEmpty() && m_showName)
+        {
+            dc.SetFont(m_font);
+
+            wxCoord tx, ty;
+            dc.GetTextExtent(m_name, &tx, &ty);
+
+            if (HasBBox())
+            {
+                wxCoord sx = (wxCoord) (( m_bbox_max_x - w.GetPosX()) * w.GetScaleX());
+                wxCoord sy = (wxCoord) ((w.GetPosY() - m_bbox_max_y ) * w.GetScaleY());
+
+                tx = sx - tx - 8;
+                ty = sy - 8 - ty;
+            }
+            else
+            {
+                const int sx = w.GetScrX()>>1;
+                const int sy = w.GetScrY()>>1;
+
+                if ((m_flags & mpALIGNMASK) == mpALIGN_NE)
+                {
+                    tx = sx - tx - 8;
+                    ty = -sy + 8;
+                }
+                else if ((m_flags & mpALIGNMASK) == mpALIGN_NW)
+                {
+                    tx = -sx + 8;
+                    ty = -sy + 8;
+                }
+                else if ((m_flags & mpALIGNMASK) == mpALIGN_SW)
+                {
+                    tx = -sx + 8;
+                    ty = sy - 8 - ty;
+                }
+                else
+                {
+                    tx = sx - tx - 8;
+                    ty = sy - 8 - ty;
+                }
+            }
+
+            dc.DrawText( m_name, tx, ty);
+        }
+    }
+}
+
+//-----------------------------------------------------------------------------
+// mpCovarianceEllipse - provided by Jose Luis Blanco
+//-----------------------------------------------------------------------------
+
+// Called to update the m_shape_xs, m_shape_ys vectors, whenever a parameter changes.
+void mpCovarianceEllipse::RecalculateShape()
+{
+    m_shape_xs.clear();
+    m_shape_ys.clear();
+
+    // Preliminar checks:
+    if (m_quantiles<0)  { wxLogError(wxT("[mpCovarianceEllipse] Error: quantiles must be non-negative")); return; }
+    if (m_cov_00<0)     { wxLogError(wxT("[mpCovarianceEllipse] Error: cov(0,0) must be non-negative")); return; }
+    if (m_cov_11<0)     { wxLogError(wxT("[mpCovarianceEllipse] Error: cov(1,1) must be non-negative")); return; }
+
+    m_shape_xs.resize( m_segments,0 );
+    m_shape_ys.resize( m_segments,0 );
+
+    // Compute the two eigenvalues of the covariance:
+    // -------------------------------------------------
+    double b = -m_cov_00 - m_cov_11;
+    double c = m_cov_00*m_cov_11 - m_cov_01*m_cov_01;
+
+    double D = b*b - 4*c;
+
+    if (D<0)     { wxLogError(wxT("[mpCovarianceEllipse] Error: cov is not positive definite")); return; }
+
+    double eigenVal0 =0.5*( -b + sqrt(D) );
+    double eigenVal1 =0.5*( -b - sqrt(D) );
+
+    // Compute the two corresponding eigenvectors:
+    // -------------------------------------------------
+    double  eigenVec0_x,eigenVec0_y;
+    double  eigenVec1_x,eigenVec1_y;
+
+    if (fabs(eigenVal0 - m_cov_00)>1e-6)
+    {
+        double k1x = m_cov_01 / ( eigenVal0 - m_cov_00 );
+        eigenVec0_y = 1;
+        eigenVec0_x = eigenVec0_y * k1x;
+    }
+    else
+    {
+        double k1y = m_cov_01 / ( eigenVal0 - m_cov_11 );
+        eigenVec0_x = 1;
+        eigenVec0_y = eigenVec0_x * k1y;
+    }
+
+    if (fabs(eigenVal1 - m_cov_00)>1e-6)
+    {
+        double k2x = m_cov_01 / ( eigenVal1 - m_cov_00 );
+        eigenVec1_y = 1;
+        eigenVec1_x = eigenVec1_y * k2x;
+    }
+    else
+    {
+        double k2y = m_cov_01 / ( eigenVal1 - m_cov_11 );
+        eigenVec1_x = 1;
+        eigenVec1_y = eigenVec1_x * k2y;
+    }
+
+    // Normalize the eigenvectors:
+    double len = sqrt( eigenVec0_x*eigenVec0_x + eigenVec0_y*eigenVec0_y );
+    eigenVec0_x /= len;  // It *CANNOT* be zero
+    eigenVec0_y /= len;
+
+    len = sqrt( eigenVec1_x*eigenVec1_x + eigenVec1_y*eigenVec1_y );
+    eigenVec1_x /= len;  // It *CANNOT* be zero
+    eigenVec1_y /= len;
+
+
+    // Take the sqrt of the eigenvalues (required for the ellipse scale):
+    eigenVal0 = sqrt(eigenVal0);
+    eigenVal1 = sqrt(eigenVal1);
+
+    // Compute the 2x2 matrix M = diag(eigVal) * (~eigVec)  (each eigen vector is a row):
+    double M_00 = eigenVec0_x * eigenVal0;
+    double M_01 = eigenVec0_y * eigenVal0;
+
+    double M_10 = eigenVec1_x * eigenVal1;
+    double M_11 = eigenVec1_y * eigenVal1;
+
+    // The points of the 2D ellipse:
+    double ang;
+    double Aang = 6.283185308/(m_segments-1);
+    int    i;
+    for (i=0,ang=0;i<m_segments;i++,ang+= Aang )
+    {
+        double ccos = cos(ang);
+        double csin = sin(ang);
+
+        m_shape_xs[i] = m_quantiles * (ccos * M_00 + csin * M_10 );
+        m_shape_ys[i] = m_quantiles * (ccos * M_01 + csin * M_11 );
+    } // end for points on ellipse
+
+
+    ShapeUpdated();
+}
+
+//-----------------------------------------------------------------------------
+// mpPolygon - provided by Jose Luis Blanco
+//-----------------------------------------------------------------------------
+void mpPolygon::setPoints(
+        const std::vector<double>&  points_xs,
+        const std::vector<double>&  points_ys,
+        bool                        closedShape )
+{
+    if ( points_xs.size()!=points_ys.size() )
+    {
+        wxLogError(wxT("[mpPolygon] Error: points_xs and points_ys must have the same number of elements"));
+    }
+    else
+    {
+        m_shape_xs = points_xs;
+        m_shape_ys = points_ys;
+
+        if ( closedShape && points_xs.size())
+        {
+            m_shape_xs.push_back( points_xs[0] );
+            m_shape_ys.push_back( points_ys[0] );
+        }
+
+        ShapeUpdated();
+    }
+}
+
+//-----------------------------------------------------------------------------
+// mpBitmapLayer - provided by Jose Luis Blanco
+//-----------------------------------------------------------------------------
+void mpBitmapLayer::GetBitmapCopy( wxImage &outBmp ) const
+{
+    if (m_validImg)
+        outBmp = m_bitmap;
+}
+
+void mpBitmapLayer::SetBitmap( const wxImage &inBmp, double x, double y, double lx, double ly )
+{
+    if (!inBmp.Ok())
+    {
+        wxLogError(wxT("[mpBitmapLayer] Assigned bitmap is not Ok()!"));
+    }
+    else
+    {
+        m_bitmap = inBmp; //.GetSubBitmap( wxRect(0, 0, inBmp.GetWidth(), inBmp.GetHeight()));
+        m_min_x = x;
+        m_min_y = y;
+        m_max_x = x+lx;
+        m_max_y = y+ly;
+        m_validImg = true;
+    }
+}
+
+
+void mpBitmapLayer::Plot(wxDC & dc, mpWindow & w)
+{
+    if (m_visible && m_validImg)
+    {
+        /*	1st: We compute (x0,y0)-(x1,y1), the pixel coordinates of the real outer limits
+                of the image rectangle within the (screen) mpWindow. Note that these coordinates
+                might fall well far away from the real view limits when the user zoom in.
+
+2nd: We compute (dx0,dy0)-(dx1,dy1), the pixel coordinates the rectangle that will
+be actually drawn into the mpWindow, i.e. the clipped real rectangle that
+avoids the non-visible parts. (offset_x,offset_y) are the pixel coordinates
+that correspond to the window point (dx0,dy0) within the image "m_bitmap", and
+(b_width,b_height) is the size of the bitmap patch that will be drawn.
+
+(x0,y0) .................  (x1,y0)
+.                          .
+.                          .
+(x0,y1) ................   (x1,y1)
+(In pixels!!)
+*/
+
+        // 1st step -------------------------------
+        wxCoord x0 = w.x2p(m_min_x);
+        wxCoord y0 = w.y2p(m_max_y);
+        wxCoord x1 = w.x2p(m_max_x);
+        wxCoord y1 = w.y2p(m_min_y);
+
+        // 2nd step -------------------------------
+        // Precompute the size of the actual bitmap pixel on the screen (e.g. will be >1 if zoomed in)
+        double screenPixelX = ( x1-x0 ) / (double)m_bitmap.GetWidth();
+        double screenPixelY = ( y1-y0 ) / (double)m_bitmap.GetHeight();
+
+        // The minimum number of pixels that the streched image will overpass the actual mpWindow borders:
+        wxCoord borderMarginX = (wxCoord)(screenPixelX+1); // ceil
+        wxCoord borderMarginY = (wxCoord)(screenPixelY+1); // ceil
+
+        // The actual drawn rectangle (dx0,dy0)-(dx1,dy1) is (x0,y0)-(x1,y1) clipped:
+        wxCoord dx0=x0,dx1=x1,dy0=y0,dy1=y1;
+        if (dx0<0) dx0=-borderMarginX;
+        if (dy0<0) dy0=-borderMarginY;
+        if (dx1>w.GetScrX()) dx1=w.GetScrX()+borderMarginX;
+        if (dy1>w.GetScrY()) dy1=w.GetScrY()+borderMarginY;
+
+        // For convenience, compute the width/height of the rectangle to be actually drawn:
+        wxCoord d_width = dx1-dx0+1;
+        wxCoord d_height = dy1-dy0+1;
+
+        // Compute the pixel offsets in the internally stored bitmap:
+        wxCoord offset_x= (wxCoord) ( (dx0-x0)/screenPixelX );
+        wxCoord offset_y= (wxCoord) ( (dy0-y0)/screenPixelY );
+
+        // and the size in pixel of the area to be actually drawn from the internally stored bitmap:
+        wxCoord b_width  = (wxCoord) ( (dx1-dx0+1)/screenPixelX );
+        wxCoord b_height = (wxCoord) ( (dy1-dy0+1)/screenPixelY );
+
+#ifdef MATHPLOT_DO_LOGGING
+        wxLogMessage(_("[mpBitmapLayer::Plot] screenPixel: x=%f y=%f  d_width=%ix%i"),screenPixelX,screenPixelY,d_width,d_height);
+        wxLogMessage(_("[mpBitmapLayer::Plot] offset: x=%i y=%i  bmpWidth=%ix%i"),offset_x,offset_y,b_width,b_height);
+#endif
+
+        // Is there any visible region?
+        if (d_width>0 && d_height>0)
+        {
+            // Build the scaled bitmap from the image, only if it has changed:
+            if (m_scaledBitmap.GetWidth()!=d_width ||
+                    m_scaledBitmap.GetHeight()!=d_height ||
+                    m_scaledBitmap_offset_x != offset_x ||
+                    m_scaledBitmap_offset_y != offset_y  )
+            {
+                wxRect r(wxRect(offset_x,offset_y,b_width,b_height));
+                // Just for the case....
+                if (r.x<0) r.x=0;
+                if (r.y<0) r.y=0;
+                if (r.width>m_bitmap.GetWidth()) r.width=m_bitmap.GetWidth();
+                if (r.height>m_bitmap.GetHeight()) r.height=m_bitmap.GetHeight();
+
+                m_scaledBitmap = wxBitmap(
+                        wxBitmap(m_bitmap).GetSubBitmap( r ).ConvertToImage()
+                        .Scale(d_width,d_height) );
+                m_scaledBitmap_offset_x = offset_x;
+                m_scaledBitmap_offset_y = offset_y;
+            }
+
+            // Draw it:
+            dc.DrawBitmap( m_scaledBitmap, dx0,dy0, true );
+        }
+    }
+
+    // Draw the name label
+    if (!m_name.IsEmpty() && m_showName)
+    {
+        dc.SetFont(m_font);
+
+        wxCoord tx, ty;
+        dc.GetTextExtent(m_name, &tx, &ty);
+
+        if (HasBBox())
+        {
+            wxCoord sx = (wxCoord) (( m_max_x - w.GetPosX()) * w.GetScaleX());
+            wxCoord sy = (wxCoord) ((w.GetPosY() - m_max_y ) * w.GetScaleY());
+
+            tx = sx - tx - 8;
+            ty = sy - 8 - ty;
+        }
+        else
+        {
+            const int sx = w.GetScrX()>>1;
+            const int sy = w.GetScrY()>>1;
+
+            if ((m_flags & mpALIGNMASK) == mpALIGN_NE)
+            {
+                tx = sx - tx - 8;
+                ty = -sy + 8;
+            }
+            else if ((m_flags & mpALIGNMASK) == mpALIGN_NW)
+            {
+                tx = -sx + 8;
+                ty = -sy + 8;
+            }
+            else if ((m_flags & mpALIGNMASK) == mpALIGN_SW)
+            {
+                tx = -sx + 8;
+                ty = sy - 8 - ty;
+            }
+            else
+            {
+                tx = sx - tx - 8;
+                ty = sy - 8 - ty;
+            }
+        }
+
+        dc.DrawText( m_name, tx, ty);
+    }
+}
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 405384bba2..995b684af2 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -249,18 +249,12 @@ set_source_files_properties( ../common/single_top.cpp PROPERTIES
     COMPILE_DEFINITIONS "TOP_FRAME=FRAME_SCH;PGM_DATA_FILE_EXT=\"sch\";BUILD_KIWAY_DLL"
     )
 
-#if (KICAD_SPICE)
-    set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} mgl2 mgl2-wx)
-#else()
-#    set ( EESCHEMA_LINK_LIBS ${wxWidgets_LIBRARIES} )
-#endif()
-
 target_link_libraries( eeschema
     #singletop  # replaces common, giving us restrictive control and link warnings.
     # There's way too much crap coming in from common yet.
     common
     bitmaps
-    ${EESCHEMA_LINK_LIBS}
+    ${wxWidgets_LIBRARIES}
     )
 
 # the DSO (KIFACE) housing the main eeschema code:
@@ -273,7 +267,7 @@ target_link_libraries( eeschema_kiface
     bitmaps
     polygon
     gal
-    ${EESCHEMA_LINK_LIBS}
+    ${wxWidgets_LIBRARIES}
     ${GDI_PLUS_LIBRARIES}
 )
 set_target_properties( eeschema_kiface PROPERTIES
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index f4ebd8a067..f2046ae0e6 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -140,11 +140,15 @@ void SIM_PLOT_FRAME::AddVoltagePlot( const wxString& aNetName )
 
     if( nodeNumber >= -1 )
     {
-        updatePlot( wxString::Format( "V(%d)", nodeNumber ), aNetName,
-                    static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetCurrentPage() ) );
+        updatePlot( wxString::Format( "V(%d)", nodeNumber ), aNetName, currentPlot() );
     }
 }
 
+SIM_PLOT_PANEL* SIM_PLOT_FRAME::currentPlot() const
+{
+    return static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetCurrentPage() );
+}
+
 
 bool SIM_PLOT_FRAME::isSimulationRunning()
 {
@@ -184,7 +188,10 @@ void SIM_PLOT_FRAME::onSignalDblClick( wxCommandEvent& event )
     int idx = m_signals->GetSelection();
 
     if( idx != wxNOT_FOUND )
+    {
         AddVoltagePlot( m_signals->GetString( idx ) );
+        currentPlot()->Fit();
+    }
 }
 
 
@@ -241,10 +248,9 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
     for( unsigned int i = 0; i < m_plotNotebook->GetPageCount(); ++i )
     {
         SIM_PLOT_PANEL* plotPanel = static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetPage( i ) );
-        plotPanel->ResetAxisRanges();
 
         for( const auto& trace : plotPanel->GetTraces() )
-            updatePlot( trace.spiceName, trace.title, plotPanel );
+            updatePlot( trace->GetSpiceName(), trace->GetName(), plotPanel );
     }
 }
 
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index c688cc93dc..65e8ce5009 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -59,6 +59,8 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void AddVoltagePlot( const wxString& aNetName );
 
     private:
+        SIM_PLOT_PANEL* currentPlot() const;
+
         bool isSimulationRunning();
 
         /**
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 7b330288c8..cd8ccaa3a6 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2016 CERN
  * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,188 +30,93 @@
 
 SIM_PLOT_PANEL::SIM_PLOT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint& pos,
                 const wxSize& size, long style, const wxString& name )
-    : wxMathGL( parent, id, pos, size, style, name ), m_painter( this )
+    : mpWindow( parent, id, pos, size, style ), m_colorIdx( 0 )
 {
-    AutoResize = true;
-    ResetAxisRanges();
-    SetDraw( &m_painter );
+    //SetMargins( 10, 10, 10, 10 );
+    LockAspect();
+
+    m_axis_x = new mpScaleX( wxT( "T [s]" ) );
+    m_axis_x->SetTicks( false );
+    AddLayer( m_axis_x );
+
+    m_axis_y = new mpScaleY( wxT( "U [V]" ) );
+    m_axis_y->SetTicks( false );
+    AddLayer( m_axis_y );
+
+    m_legend = new mpInfoLegend( wxRect( 0, 0, 40, 40 ), wxWHITE_BRUSH );
+    AddLayer( m_legend );
+
+    //m_coords = new mpInfoCoords( wxRect( 80, 20, 10, 10 ), wxWHITE_BRUSH );
+    //AddLayer( m_coords );
 }
 
 
 SIM_PLOT_PANEL::~SIM_PLOT_PANEL()
 {
-}
-
-
-template<typename T>
-static std::pair<T, T> find_minmax( const T* aArray, unsigned int aSize )
-{
-    std::pair<T, T> result( std::numeric_limits<T>::max(), std::numeric_limits<T>::min() );
-    const T* ptr = aArray;
-
-    for( unsigned int i = 0; i < aSize; ++i )
-    {
-        if( *ptr < result.first )
-            result.first = *ptr;
-
-        if( *ptr > result.second )
-            result.second = *ptr;
-
-        ++ptr;
-    }
-
-    return result;
+    // ~mpWindow destroys all the added layers, so there is no need to destroy m_traces contents
 }
 
 
 void SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aTitle, int aPoints,
-                                double* aT, double* aY, int aFlags )
+                                const double* aT, const double* aY, int aFlags )
 {
+    TRACE* t = NULL;
+
     // Find previous entry, if there is one
     auto it = std::find_if( m_traces.begin(), m_traces.end(),
-            [&](const TRACE& t) { return t.title == aTitle; });
+            [&](const TRACE* t) { return t->GetName() == aTitle; });
 
     if( it == m_traces.end() )
     {
         // New entry
-        TRACE trace;
-        trace.spiceName = aSpiceName;
-        trace.title = aTitle;
-        trace.style = wxString( '-' ) + m_painter.GenerateColor( SIM_PLOT_PAINTER::DARK );
-        trace.x.Set( aT, aPoints );
-        trace.y.Set( aY, aPoints );
-        m_traces.push_back( trace );
+        t = new TRACE( aTitle, aSpiceName );
+        t->SetPen( wxPen( generateColor(), 1, wxSOLID ) );
+        m_traces.push_back( t );
+
+        // It is a trick to keep legend always on the top
+        DelLayer( m_legend );
+        AddLayer( t );
+        AddLayer( m_legend );
     }
     else
     {
-        // Update
-        TRACE& trace = *it;
-        trace.x.Set( aT, aPoints );
-        trace.y.Set( aY, aPoints );
+        t = *it;
     }
 
-    // Update axis ranges
-    std::pair<double, double> traceRangeT = find_minmax( aT, aPoints );
-    m_axisRangeX.first = std::min( traceRangeT.first, m_axisRangeX.first );
-    m_axisRangeX.second = std::max( traceRangeT.second, m_axisRangeX.second );
-
-    std::pair<double, double> traceRangeY = find_minmax( aY, aPoints );
-    m_axisRangeY.first = std::min( traceRangeY.first, m_axisRangeY.first );
-    m_axisRangeY.second = std::max( traceRangeY.second, m_axisRangeY.second );
-
-    Update();
+    t->SetData( std::vector<double>( aT, aT + aPoints ), std::vector<double>( aY, aY + aPoints ) );
+    UpdateAll();
 }
 
 
 void SIM_PLOT_PANEL::DeleteTraces()
 {
+    for( TRACE* t : m_traces )
+    {
+        DelLayer( t, true );
+    }
+
     m_traces.clear();
-    ResetAxisRanges();
-    Update();
 }
 
 
-void SIM_PLOT_PANEL::ResetAxisRanges()
+wxColour SIM_PLOT_PANEL::generateColor()
 {
-    // Set ranges to inverted values, so when there is a new plot added, it will
-    // overridden with correct values
-    m_axisRangeX.first = std::numeric_limits<double>::max();
-    m_axisRangeX.second = std::numeric_limits<double>::min();
-    m_axisRangeY.first = std::numeric_limits<double>::max();
-    m_axisRangeY.second = std::numeric_limits<double>::min();
-}
-
-
-int SIM_PLOT_PAINTER::Draw( mglGraph* aGraph )
-{
-    const std::vector<SIM_PLOT_PANEL::TRACE>& traces = m_parent->m_traces;
-    const std::pair<double, double>& axisRangeX = m_parent->m_axisRangeX;
-    const std::pair<double, double>& axisRangeY = m_parent->m_axisRangeY;
-
-    aGraph->Clf();
-    //aGraph->SetPlotFactor( 1.5 );
-    //aGraph->LoadFont( "termes" );
-    aGraph->SetFontSize( 1.5 );
-
-    // Axis settings
-    // Use autorange values if possible
-    if( axisRangeX.first < axisRangeX.second )
-        aGraph->SetRange( 'x', axisRangeX.first, axisRangeX.second );
-    else
-        aGraph->SetRange( 'x', 0, 1 );
-
-    if( axisRangeY.first < axisRangeY.second )
-    {
-        // Increase the Y axis range, so it is easy to read the extreme values
-        double range = axisRangeY.second - axisRangeY.first;
-        aGraph->SetRange( 'y', axisRangeY.first - 0.1 * range, axisRangeY.second + 0.1 * range );
-    }
-    else
-    {
-        aGraph->SetRange( 'y', 0, 1 );
-    }
-
-    aGraph->Axis( "xy" );
-    aGraph->Label( 'x', "Time [s]", 0 );
-    aGraph->Label( 'y', "Voltage [V]", 0 );
-
-    aGraph->Box();
-    aGraph->Grid();
-
-    // Draw traces
-    for( auto t : traces )
-    {
-        aGraph->AddLegend( (const char*) t.title.c_str(), t.style );
-        aGraph->Plot( t.y, t.style );
-    }
-
-    if( traces.size() )
-    {
-        aGraph->SetFontSize( 2.5 );
-        aGraph->Legend( 1, "-#" );  // legend entries horizontally + draw a box around legend
-    }
-
-    return 0;
-}
-
-
-wxString SIM_PLOT_PAINTER::GenerateColor( COLOR_TYPE aType )
-{
-    const char colors[] = "rgbcmylenupq";
-    const unsigned int colorsNumber = sizeof( colors ) - 1;
-
-    // Safe defaults
-    char color = 'k';       // black
-    int shade = 5;
-
-    switch( aType )
-    {
-        case LIGHT:
-            color = colors[m_lightColorIdx % colorsNumber];
-            shade = 5 + m_lightColorIdx / colorsNumber;
-            ++m_lightColorIdx;
-
-            if( shade == 10 )
-            {
-                // Reached the color limit
-                shade = 5;
-                m_lightColorIdx = 0;
-            }
-            break;
-
-        case DARK:
-            color = toupper( colors[m_darkColorIdx % colorsNumber] );
-            shade = 5 - m_darkColorIdx / colorsNumber;
-            ++m_darkColorIdx;
-
-            if( shade == 0 )
-            {
-                // Reached the color limit
-                shade = 5;
-                m_darkColorIdx = 0;
-            }
-            break;
-    }
-
-    return wxString::Format( "{%c%d}", color, shade );
+    /// @todo have a look at:
+    /// http://stanford.edu/~mwaskom/software/seaborn/tutorial/color_palettes.html
+    /// https://github.com/Gnuplotting/gnuplot-palettes
+
+    const unsigned long colors[] = { 0x000080, 0x008000, 0x800000, 0x008080, 0x800080, 0x808000, 0x808080 };
+
+    //const unsigned long colors[] = { 0xe3cea6, 0xb4781f, 0x8adfb2, 0x2ca033, 0x999afb, 0x1c1ae3, 0x6fbffd, 0x007fff, 0xd6b2ca, 0x9a3d6a };
+
+    // hls
+    //const unsigned long colors[] = { 0x0f1689, 0x0f7289, 0x35890f, 0x0f8945, 0x89260f, 0x890f53, 0x89820f, 0x630f89 };
+
+    // pastels, good for dark background
+    //const unsigned long colors[] = { 0x2fd8fe, 0x628dfa, 0x53d8a6, 0xa5c266, 0xb3b3b3, 0x94c3e4, 0xca9f8d, 0xac680e };
+
+    const unsigned int colorCount = sizeof(colors) / sizeof(unsigned long);
+
+    /// @todo generate shades to avoid repeating colors
+    return wxColour( colors[m_colorIdx++ % colorCount] );
 }
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index b71bf6ea32..c3f7a568f4 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2016 CERN
  * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,38 +26,9 @@
 #ifndef __SIM_PLOT_PANEL_H
 #define __SIM_PLOT_PANEL_H
 
-#include "mgl2/wx.h"
+#include <widgets/mathplot.h>
 
-class SIM_PLOT_PANEL;
-
-class SIM_PLOT_PAINTER : public mglDraw
-{
-public:
-    SIM_PLOT_PAINTER( const SIM_PLOT_PANEL* aParent )
-        : m_parent( aParent ), m_lightColorIdx( 0 ), m_darkColorIdx( 0 )
-    {
-    }
-
-    ~SIM_PLOT_PAINTER()
-    {
-    }
-
-    //void Click() override;
-
-    int Draw( mglGraph* aGraph ) override;
-
-    enum COLOR_TYPE { LIGHT, DARK };
-
-    ///> Generates a new, unique color for plotting curves
-    wxString GenerateColor( COLOR_TYPE aType );
-
-private:
-    const SIM_PLOT_PANEL* m_parent;
-    int m_lightColorIdx, m_darkColorIdx;
-};
-
-
-class SIM_PLOT_PANEL : public wxMathGL
+class SIM_PLOT_PANEL : public mpWindow
 {
 public:
     SIM_PLOT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition,
@@ -64,33 +36,47 @@ public:
 
     ~SIM_PLOT_PANEL();
 
-    struct TRACE
-    {
-        wxString spiceName, title, style;
-        mglData x, y;
-    };
-
     void AddTrace( const wxString& aSpiceName, const wxString& aTitle, int aPoints,
-                    double* aT, double* aY, int aFlags );
+                    const double* aT, const double* aY, int aFlags );
+
     void DeleteTraces();
 
-    const std::vector<TRACE>& GetTraces() const
+    class TRACE : public mpFXYVector
+    {
+    public:
+        TRACE( const wxString& aTitle, const wxString& aSpiceName )
+            : mpFXYVector( aTitle ), m_spiceName( aSpiceName )
+        {
+            SetContinuity( true );
+            ShowName( false );
+        }
+
+        const wxString& GetSpiceName() const
+        {
+            return m_spiceName;
+        }
+
+    private:
+        wxString m_spiceName;
+    };
+
+    const std::vector<TRACE*>& GetTraces() const
     {
         return m_traces;
     }
 
-    void ResetAxisRanges();
-
 private:
-    SIM_PLOT_PAINTER m_painter;
+    wxColour generateColor();
+
+    unsigned int m_colorIdx;
 
     // Traces to be plotted
-    std::vector<TRACE> m_traces;
+    std::vector<TRACE*> m_traces;
 
-    // Axis ranges determined by the added traces data
-    std::pair<double, double> m_axisRangeX, m_axisRangeY;
-
-    friend class SIM_PLOT_PAINTER;
+    mpScaleX* m_axis_x;
+    mpScaleY* m_axis_y;
+    mpInfoLegend* m_legend;
+    //mpInfoCoords* m_coords;
 };
 
 #endif
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
new file mode 100644
index 0000000000..42c42a35d2
--- /dev/null
+++ b/include/widgets/mathplot.h
@@ -0,0 +1,1695 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:            mathplot.cpp
+// Purpose:         Framework for plotting in wxWindows
+// Original Author: David Schalig
+// Maintainer:      Davide Rondini
+// Contributors:    Jose Luis Blanco, Val Greene
+// Created:         21/07/2003
+// Last edit:       22/02/2009
+// Copyright:       (c) David Schalig, Davide Rondini
+// Licence:         wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MP_MATHPLOT_H_
+#define _MP_MATHPLOT_H_
+
+/** @file mathplot.h */
+/** @mainpage wxMathPlot
+    wxMathPlot is a framework for mathematical graph plotting in wxWindows.
+
+    The framework is designed for convenience and ease of use.
+
+    @section screenshots Screenshots
+    <a href="http://wxmathplot.sourceforge.net/screenshot.shtml">Go to the screenshots page.</a>
+
+    @section overview Overview
+    The heart of wxMathPlot is mpWindow, which is a 2D canvas for plot layers.
+    mpWindow can be embedded as subwindow in a wxPane, a wxFrame, or any other wxWindow.
+    mpWindow provides a zoomable and moveable view of the layers. The current view can
+    be controlled with the mouse, the scrollbars, and a context menu.
+
+    Plot layers are implementations of the abstract base class mpLayer. Those can
+    be function plots, scale rulers, or any other vector data visualisation. wxMathPlot provides two mpLayer implementations for plotting horizontal and vertical rulers: mpScaleX and mpScaleY.
+    For convenient function plotting a series of classes derived from mpLayer are provided, like mpFX, mpProfile, mpLegend and so on. These base classes already come with plot code, user's own functions can be implemented by overriding just one member for retrieving a function value.
+
+    mpWindow has built-in support for mouse-based pan and zoom through intuitive combinations of buttons and the mouse wheel. It also incorporates an optional double buffering mechanism to avoid flicker. Plots can be easily sent to printer evices or exported in bitmap formats like PNG, BMP or JPEG.
+
+    @section coding Coding conventions
+    wxMathPlot sticks to wxWindow's coding conventions. All entities defined by wxMathPlot have the prefix <i>mp</i>.
+
+    @section author Author and license
+    wxMathPlot is published under the terms of the wxWindow license.<br>
+    The original author is David Schalig <mrhill@users.sourceforge.net>.<br>
+    From June 2007 the project is maintained by Davide Rondini <cdron77@users.sourceforge.net>.<br>
+    Authors can be contacted via the wxMathPlot's homepage at
+    https://sourceforge.net/projects/wxmathplot<br>
+    Contributors:<br>
+    Jose Luis Blanco, Val Greene.<br>
+*/
+
+//this definition uses windows dll to export function. 
+//WXDLLIMPEXP_MATHPLOT definition definition changed to WXDLLIMPEXP_MATHPLOT  
+//mathplot_EXPORTS will be defined by cmake 
+#ifdef mathplot_EXPORTS 
+ #define WXDLLIMPEXP_MATHPLOT WXEXPORT 
+ #define WXDLLIMPEXP_DATA_MATHPLOT(type) WXEXPORT type 
+#else // not making DLL 
+ #define WXDLLIMPEXP_MATHPLOT 
+ #define WXDLLIMPEXP_DATA_MATHPLOT(type) type 
+#endif
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "mathplot.h"
+#endif
+
+#include <vector>
+
+// #include <wx/wx.h>
+#include <wx/defs.h>
+#include <wx/menu.h>
+#include <wx/scrolwin.h>
+#include <wx/event.h>
+#include <wx/dynarray.h>
+#include <wx/pen.h>
+#include <wx/dcmemory.h>
+#include <wx/string.h>
+#include <wx/print.h>
+#include <wx/image.h>
+
+
+#include <deque>
+
+// For memory leak debug
+#ifdef _WINDOWS
+#ifdef _DEBUG
+#include <crtdbg.h>
+#define DEBUG_NEW new(_NORMAL_BLOCK ,__FILE__, __LINE__)
+#else
+#define DEBUG_NEW new
+#endif // _DEBUG
+#endif // _WINDOWS
+
+// Separation for axes when set close to border
+#define X_BORDER_SEPARATION 40
+#define Y_BORDER_SEPARATION 60
+
+//-----------------------------------------------------------------------------
+// classes
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_MATHPLOT mpLayer;
+class WXDLLIMPEXP_MATHPLOT mpFX;
+class WXDLLIMPEXP_MATHPLOT mpFY;
+class WXDLLIMPEXP_MATHPLOT mpFXY;
+class WXDLLIMPEXP_MATHPLOT mpFXYVector;
+class WXDLLIMPEXP_MATHPLOT mpScaleX;
+class WXDLLIMPEXP_MATHPLOT mpScaleY;
+class WXDLLIMPEXP_MATHPLOT mpWindow;
+class WXDLLIMPEXP_MATHPLOT mpText;
+class WXDLLIMPEXP_MATHPLOT mpPrintout;
+
+/** Command IDs used by mpWindow */
+enum
+{
+    mpID_FIT = 2000,    //!< Fit view to match bounding box of all layers
+    mpID_ZOOM_IN,       //!< Zoom into view at clickposition / window center
+    mpID_ZOOM_OUT,      //!< Zoom out
+    mpID_CENTER,        //!< Center view on click position
+    mpID_LOCKASPECT,    //!< Lock x/y scaling aspect
+    mpID_HELP_MOUSE     //!< Shows information about the mouse commands
+};
+
+//-----------------------------------------------------------------------------
+// mpLayer
+//-----------------------------------------------------------------------------
+
+typedef enum __mp_Layer_Type {
+    mpLAYER_UNDEF,  //!< Layer type undefined
+    mpLAYER_AXIS,  //!< Axis type layer
+    mpLAYER_PLOT,  //!< Plot type layer
+    mpLAYER_INFO,   //!< Info box type layer
+    mpLAYER_BITMAP //!< Bitmap type layer
+} mpLayerType;
+
+/** Plot layer, abstract base class.
+    Any number of mpLayer implementations can be attached to mpWindow.
+    Examples for mpLayer implementations are function graphs, or scale rulers.
+
+    For convenience mpLayer defines a name, a font (wxFont), a pen (wxPen),
+    and a continuity property (bool) as class members.
+    The default values at constructor are the default font, a black pen, and
+     continuity set to false (draw separate points).
+    These may or may not be used by implementations.
+*/
+class WXDLLIMPEXP_MATHPLOT mpLayer : public wxObject
+{
+public:
+    mpLayer();
+
+    virtual ~mpLayer() {};
+
+    /** Check whether this layer has a bounding box.
+        The default implementation returns \a TRUE. Override and return
+        FALSE if your mpLayer implementation should be ignored by the calculation
+        of the global bounding box for all layers in a mpWindow.
+        @retval TRUE Has bounding box
+        @retval FALSE Has not bounding box
+    */
+    virtual bool   HasBBox() { return TRUE; }
+
+    /** Check whether the layer is an info box.
+        The default implementation returns \a FALSE. It is overrided to \a TRUE for mpInfoLayer
+        class and its derivative. It is necessary to define mouse actions behaviour over
+        info boxes.
+        @return whether the layer is an info boxes
+        @sa mpInfoLayer::IsInfo */
+    virtual bool IsInfo() { return false; };
+
+    /** Get inclusive left border of bounding box.
+        @return Value
+    */
+    virtual double GetMinX() { return -1.0; }
+
+    /** Get inclusive right border of bounding box.
+        @return Value
+    */
+    virtual double GetMaxX() { return  1.0; }
+
+    /** Get inclusive bottom border of bounding box.
+        @return Value
+    */
+    virtual double GetMinY() { return -1.0; }
+
+    /** Get inclusive top border of bounding box.
+        @return Value
+    */
+    virtual double GetMaxY() { return  1.0; }
+
+    /** Plot given view of layer to the given device context.
+        An implementation of this function has to transform layer coordinates to
+        wxDC coordinates based on the view parameters retrievable from the mpWindow
+        passed in \a w. 
+	Note that the public methods of mpWindow: x2p,y2p and p2x,p2y are already provided 
+	which transform layer coordinates to DC pixel coordinates, and <b>user code should rely 
+	on them</b> for portability and future changes to be applied transparently, instead of
+	implementing the following formulas manually.
+	
+	The passed device context \a dc has its coordinate origin set to the top-left corner 
+	of the visible area (the default). The coordinate orientation is as shown in the
+        following picture:
+        <pre>
+        (wxDC origin 0,0)
+               x-------------> ascending X ----------------+
+               |                                           |
+               |                                           |
+               V ascending Y                               |
+	           |                                           |
+	           |                                           |
+	           |                                           |
+	           +-------------------------------------------+  <-- right-bottom corner of the mpWindow visible area.
+        </pre>
+        Note that Y ascends in downward direction, whereas the usual vertical orientation
+        for mathematical plots is vice versa. Thus Y-orientation will be swapped usually,
+        when transforming between wxDC and mpLayer coordinates. This change of coordinates 
+	is taken into account in the methods p2x,p2y,x2p,y2p.
+
+        <b> Rules for transformation between mpLayer and wxDC coordinates </b>
+        @code
+        dc_X = (layer_X - mpWindow::GetPosX()) * mpWindow::GetScaleX()
+        dc_Y = (mpWindow::GetPosY() - layer_Y) * mpWindow::GetScaleY() // swapping Y-orientation
+
+        layer_X = (dc_X / mpWindow::GetScaleX()) + mpWindow::GetPosX() // scale guaranteed to be not 0
+        layer_Y = mpWindow::GetPosY() - (dc_Y / mpWindow::GetScaleY()) // swapping Y-orientation
+        @endcode
+
+        @param dc Device context to plot to.
+        @param w  View to plot. The visible area can be retrieved from this object.
+	@sa mpWindow::p2x,mpWindow::p2y,mpWindow::x2p,mpWindow::y2p
+    */
+    virtual void   Plot(wxDC & dc, mpWindow & w) = 0;
+
+    /** Get layer name.
+        @return Name
+    */
+    wxString       GetName() const { return m_name; }
+
+    /** Get font set for this layer.
+        @return Font
+    */
+    const wxFont&  GetFont() const { return m_font; }
+
+    /** Get pen set for this layer.
+        @return Pen
+    */
+    const wxPen&   GetPen()  const { return m_pen;  }
+
+    /** Set the 'continuity' property of the layer (true:draws a continuous line, false:draws separate points).
+      * @sa GetContinuity
+      */
+    void SetContinuity(bool continuity) {m_continuous = continuity;}
+
+    /** Gets the 'continuity' property of the layer.
+      * @sa SetContinuity
+      */
+    bool GetContinuity() const {return m_continuous;}
+
+    /** Shows or hides the text label with the name of the layer (default is visible).
+      */
+    void ShowName(bool show) { m_showName = show; };
+
+    /** Set layer name
+        @param name Name, will be copied to internal class member
+    */
+    void SetName(wxString name) { m_name = name; }
+
+    /** Set layer font
+        @param font Font, will be copied to internal class member
+    */
+    void SetFont(wxFont& font)  { m_font = font; }
+
+    /** Set layer pen
+        @param pen Pen, will be copied to internal class member
+    */
+    void SetPen(wxPen pen)     { m_pen  = pen;  }
+
+    /** Set Draw mode: inside or outside margins. Default is outside, which allows the layer to draw up to the mpWindow border.
+        @param drawModeOutside The draw mode to be set */
+    void SetDrawOutsideMargins(bool drawModeOutside) { m_drawOutsideMargins = drawModeOutside; };
+
+    /** Get Draw mode: inside or outside margins.
+        @return The draw mode */
+    bool GetDrawOutsideMargins() { return m_drawOutsideMargins; };
+
+    /** Get a small square bitmap filled with the colour of the pen used in the layer. Useful to create legends or similar reference to the layers.
+        @param side side length in pixels
+        @return a wxBitmap filled with layer's colour */
+    wxBitmap GetColourSquare(int side = 16);
+
+    /** Get layer type: a Layer can be of different types: plot lines, axis, info boxes, etc, this method returns the right value.
+        @return An integer indicating layer type */
+    mpLayerType GetLayerType() { return m_type; };
+	
+    /** Checks whether the layer is visible or not.
+        @return \a true if visible */
+    bool IsVisible() {return m_visible; };
+
+    /** Sets layer visibility.
+        @param show visibility bool. */
+    void SetVisible(bool show) { m_visible = show; };
+	
+	/** Get brush set for this layer.
+		@return brush. */
+	const wxBrush&   GetBrush() const { return m_brush; };
+	
+	/** Set layer brush
+		@param brush brush, will be copied to internal class member	*/
+	void SetBrush(wxBrush brush) { m_brush = brush; };
+
+protected:
+    wxFont   m_font;    //!< Layer's font
+    wxPen    m_pen;     //!< Layer's pen
+	wxBrush  m_brush;       //!< Layer's brush
+    wxString m_name;    //!< Layer's name
+    bool     m_continuous; //!< Specify if the layer will be plotted as a continuous line or a set of points.
+    bool     m_showName;  //!< States whether the name of the layer must be shown (default is true).
+    bool     m_drawOutsideMargins; //!< select if the layer should draw only inside margins or over all DC
+    mpLayerType m_type; //!< Define layer type, which is assigned by constructor
+	bool 	m_visible;	//!< Toggles layer visibility
+    DECLARE_DYNAMIC_CLASS(mpLayer)
+};
+
+
+//-----------------------------------------------------------------------------
+// mpInfoLayer
+//-----------------------------------------------------------------------------
+
+/** @class mpInfoLayer
+    @brief Base class to create small rectangular info boxes
+    mpInfoLayer is the base class to create a small rectangular info box in transparent overlay over plot layers. It is used to implement objects like legends.
+*/
+class WXDLLIMPEXP_MATHPLOT mpInfoLayer : public mpLayer
+{
+public:
+    /** Default constructor. */
+    mpInfoLayer();
+
+    /** Complete constructor.
+        @param rect Sets the initial size rectangle of the layer.
+        @param brush pointer to a fill brush. Default is transparent */
+    mpInfoLayer(wxRect rect, const wxBrush* brush = wxTRANSPARENT_BRUSH);
+
+    /** Destructor */
+    virtual ~mpInfoLayer();
+
+    /** Updates the content of the info box. Should be overidden by derived classes.
+        Update may behave in different ways according to the type of event which called it.
+        @param w parent mpWindow from which to obtain informations
+        @param event The event which called the update. */
+    virtual void UpdateInfo(mpWindow& w, wxEvent& event);
+
+    /** mpInfoLayer has not bounding box. @sa mpLayer::HasBBox
+        @return always \a FALSE */
+    virtual bool HasBBox() { return false; };
+
+    /** Plot method. Can be overidden by derived classes.
+        @param dc the device content where to plot
+        @param w the window to plot
+        @sa mpLayer::Plot */
+    virtual void   Plot(wxDC & dc, mpWindow & w);
+
+    /** Specifies that this is an Info box layer.
+        @return always \a TRUE
+        @sa mpLayer::IsInfo */
+    virtual bool IsInfo() { return true; };
+
+    /** Checks whether a point is inside the info box rectangle.
+        @param point The point to be checked
+        @return \a true if the point is inside the bounding box */
+    virtual bool Inside(wxPoint& point);
+
+    /** Moves the layer rectangle of given pixel deltas.
+        @param delta The wxPoint container for delta coordinates along x and y. Units are in pixels. */
+    virtual void Move(wxPoint delta);
+
+    /** Updates the rectangle reference point. Used by internal methods of mpWindow to correctly move mpInfoLayers. */
+    virtual void UpdateReference();
+
+    /** Returns the position of the upper left corner of the box (in pixels)
+        @return The rectangle position */
+    wxPoint GetPosition();
+
+    /** Returns the size of the box (in pixels)
+        @return The rectangle size */
+    wxSize GetSize();
+	
+	/** Returns the current rectangle coordinates.
+	    @return The info layer rectangle */
+	const wxRect& GetRectangle() { return m_dim; };
+
+protected:
+    wxRect m_dim;           //!< The bounding rectangle of the box. It may be resized dynamically by the Plot method.
+    wxPoint m_reference;    //!< Holds the reference point for movements
+    wxBrush m_brush;        //!< The brush to be used for the background
+    int m_winX, m_winY;     //!< Holds the mpWindow size. Used to rescale position when window is resized.
+    
+    DECLARE_DYNAMIC_CLASS(mpInfoLayer)
+};
+
+/** @class mpInfoCoords
+    @brief Implements an overlay box which shows the mouse coordinates in plot units.
+    When an mpInfoCoords layer is activated, when mouse is moved over the mpWindow, its coordinates (in mpWindow units, not pixels) are continuously reported inside the layer box. */
+class WXDLLIMPEXP_MATHPLOT mpInfoCoords : public mpInfoLayer
+{
+public:
+    /** Default constructor */
+    mpInfoCoords();
+    /** Complete constructor, setting initial rectangle and background brush.
+        @param rect The initial bounding rectangle.
+        @param brush The wxBrush to be used for box background: default is transparent */
+    mpInfoCoords(wxRect rect, const wxBrush* brush = wxTRANSPARENT_BRUSH);
+
+    /** Default destructor */
+    ~mpInfoCoords();
+
+    /** Updates the content of the info box. It is used to update coordinates.
+        @param w parent mpWindow from which to obtain information
+        @param event The event which called the update. */
+    virtual void UpdateInfo(mpWindow& w, wxEvent& event);
+
+    /** Plot method.
+        @param dc the device content where to plot
+        @param w the window to plot
+        @sa mpLayer::Plot */
+    virtual void   Plot(wxDC & dc, mpWindow & w);
+
+protected:
+    wxString m_content; //!< string holding the coordinates to be drawn.
+};
+
+/** @class mpInfoLegend
+    @brief Implements the legend to be added to the plot
+    This layer allows you to add a legend to describe the plots in the window. The legend uses the layer name as a label, and displays only layers of type mpLAYER_PLOT. */
+class WXDLLIMPEXP_MATHPLOT mpInfoLegend : public mpInfoLayer
+{
+public:
+    /** Default constructor */
+    mpInfoLegend();
+
+    /** Complete constructor, setting initial rectangle and background brush.
+        @param rect The initial bounding rectangle.
+        @param brush The wxBrush to be used for box background: default is transparent
+        @sa mpInfoLayer::mpInfoLayer */
+    mpInfoLegend(wxRect rect, const wxBrush* brush = wxTRANSPARENT_BRUSH);
+
+    /**  Default destructor */
+    ~mpInfoLegend();
+
+    /** Updates the content of the info box. Unused in this class.
+        @param w parent mpWindow from which to obtain information
+        @param event The event which called the update. */
+    virtual void UpdateInfo(mpWindow& w, wxEvent& event);
+
+    /** Plot method.
+        @param dc the device content where to plot
+        @param w the window to plot
+        @sa mpLayer::Plot */
+    virtual void   Plot(wxDC & dc, mpWindow & w);
+
+protected:
+    
+};
+
+
+//-----------------------------------------------------------------------------
+// mpLayer implementations - functions
+//-----------------------------------------------------------------------------
+
+/** @name Label alignment constants
+@{*/
+
+/** @internal */
+#define mpALIGNMASK    0x03
+/** Aligns label to the right. For use with mpFX. */
+#define mpALIGN_RIGHT  0x00
+/** Aligns label to the center. For use with mpFX and mpFY. */
+#define mpALIGN_CENTER 0x01
+/** Aligns label to the left. For use with mpFX. */
+#define mpALIGN_LEFT   0x02
+/** Aligns label to the top. For use with mpFY. */
+#define mpALIGN_TOP    mpALIGN_RIGHT
+/** Aligns label to the bottom. For use with mpFY. */
+#define mpALIGN_BOTTOM mpALIGN_LEFT
+/** Aligns X axis to bottom border. For mpScaleX */
+#define mpALIGN_BORDER_BOTTOM  0x04
+/** Aligns X axis to top border. For mpScaleX */
+#define mpALIGN_BORDER_TOP  0x05
+/** Set label for X axis in normal mode */
+#define mpX_NORMAL  0x00
+/** Set label for X axis in time mode: the value is represented as minutes:seconds.milliseconds if time is less than 2 minutes, hours:minutes:seconds otherwise. */
+#define mpX_TIME  0x01
+/** Set label for X axis in hours mode: the value is always represented as hours:minutes:seconds. */
+#define mpX_HOURS 0x02
+/** Set label for X axis in date mode: the value is always represented as yyyy-mm-dd. */
+#define mpX_DATE 0x03
+/** Set label for X axis in datetime mode: the value is always represented as yyyy-mm-ddThh:mm:ss. */
+#define mpX_DATETIME 0x04
+/** Aligns Y axis to left border. For mpScaleY */
+#define mpALIGN_BORDER_LEFT mpALIGN_BORDER_BOTTOM
+/** Aligns Y axis to right border. For mpScaleY */
+#define mpALIGN_BORDER_RIGHT mpALIGN_BORDER_TOP
+/** Aligns label to north-east. For use with mpFXY. */
+#define mpALIGN_NE     0x00
+/** Aligns label to north-west. For use with mpFXY. */
+#define mpALIGN_NW     0x01
+/** Aligns label to south-west. For use with mpFXY. */
+#define mpALIGN_SW     0x02
+/** Aligns label to south-east. For use with mpFXY. */
+#define mpALIGN_SE     0x03
+
+/*@}*/
+
+/** @name mpLayer implementations - functions
+@{*/
+
+/** Abstract base class providing plot and labeling functionality for functions F:X->Y.
+    Override mpFX::GetY to implement a function.
+    Optionally implement a constructor and pass a name (label) and a label alignment
+    to the constructor mpFX::mpFX. If the layer name is empty, no label will be plotted.
+*/
+class WXDLLIMPEXP_MATHPLOT mpFX : public mpLayer
+{
+public:
+    /** @param name  Label
+        @param flags Label alignment, pass one of #mpALIGN_RIGHT, #mpALIGN_CENTER, #mpALIGN_LEFT.
+    */
+    mpFX(wxString name = wxEmptyString, int flags = mpALIGN_RIGHT);
+
+    /** Get function value for argument.
+        Override this function in your implementation.
+        @param x Argument
+        @return Function value
+    */
+    virtual double GetY( double x ) = 0;
+
+    /** Layer plot handler.
+        This implementation will plot the function in the visible area and
+        put a label according to the aligment specified.
+    */
+    virtual void Plot(wxDC & dc, mpWindow & w);
+
+protected:
+    int m_flags; //!< Holds label alignment
+
+    DECLARE_DYNAMIC_CLASS(mpFX)
+};
+
+/** Abstract base class providing plot and labeling functionality for functions F:Y->X.
+    Override mpFY::GetX to implement a function.
+    Optionally implement a constructor and pass a name (label) and a label alignment
+    to the constructor mpFY::mpFY. If the layer name is empty, no label will be plotted.
+*/
+class WXDLLIMPEXP_MATHPLOT mpFY : public mpLayer
+{
+public:
+    /** @param name  Label
+        @param flags Label alignment, pass one of #mpALIGN_BOTTOM, #mpALIGN_CENTER, #mpALIGN_TOP.
+    */
+    mpFY(wxString name = wxEmptyString, int flags = mpALIGN_TOP);
+
+    /** Get function value for argument.
+        Override this function in your implementation.
+        @param y Argument
+        @return Function value
+    */
+    virtual double GetX( double y ) = 0;
+
+    /** Layer plot handler.
+        This implementation will plot the function in the visible area and
+        put a label according to the aligment specified.
+    */
+    virtual void Plot(wxDC & dc, mpWindow & w);
+
+protected:
+    int m_flags; //!< Holds label alignment
+
+    DECLARE_DYNAMIC_CLASS(mpFY)
+};
+
+/** Abstract base class providing plot and labeling functionality for a locus plot F:N->X,Y.
+    Locus argument N is assumed to be in range 0 .. MAX_N, and implicitly derived by enumerating
+    all locus values. Override mpFXY::Rewind and mpFXY::GetNextXY to implement a locus.
+    Optionally implement a constructor and pass a name (label) and a label alignment
+    to the constructor mpFXY::mpFXY. If the layer name is empty, no label will be plotted.
+*/
+class WXDLLIMPEXP_MATHPLOT mpFXY : public mpLayer
+{
+public:
+    /** @param name  Label
+        @param flags Label alignment, pass one of #mpALIGN_NE, #mpALIGN_NW, #mpALIGN_SW, #mpALIGN_SE.
+    */
+    mpFXY(wxString name = wxEmptyString, int flags = mpALIGN_NE);
+
+    /** Rewind value enumeration with mpFXY::GetNextXY.
+        Override this function in your implementation.
+    */
+    virtual void Rewind() = 0;
+
+    /** Get locus value for next N.
+        Override this function in your implementation.
+        @param x Returns X value
+        @param y Returns Y value
+    */
+    virtual bool GetNextXY(double & x, double & y) = 0;
+
+    /** Layer plot handler.
+        This implementation will plot the locus in the visible area and
+        put a label according to the alignment specified.
+    */
+    virtual void Plot(wxDC & dc, mpWindow & w);
+
+
+protected:
+    int m_flags; //!< Holds label alignment
+
+	// Data to calculate label positioning
+	wxCoord maxDrawX, minDrawX, maxDrawY, minDrawY;
+	//int drawnPoints;
+
+    /** Update label positioning data
+	    @param xnew New x coordinate
+		@param ynew New y coordinate
+	*/
+	void UpdateViewBoundary(wxCoord xnew, wxCoord ynew);
+
+    DECLARE_DYNAMIC_CLASS(mpFXY)
+};
+
+/** Abstract base class providing plot and labeling functionality for functions F:Y->X.
+    Override mpProfile::GetX to implement a function.
+    This class is similar to mpFY, but the Plot method is different. The plot is in fact represented by lines instead of points, which gives best rendering of rapidly-varying functions, and in general, data which are not so close one to another.
+    Optionally implement a constructor and pass a name (label) and a label alignment
+    to the constructor mpProfile::mpProfile. If the layer name is empty, no label will be plotted.
+*/
+class WXDLLIMPEXP_MATHPLOT mpProfile : public mpLayer
+{
+public:
+    /** @param name  Label
+        @param flags Label alignment, pass one of #mpALIGN_BOTTOM, #mpALIGN_CENTER, #mpALIGN_TOP.
+    */
+    mpProfile(wxString name = wxEmptyString, int flags = mpALIGN_TOP);
+
+    /** Get function value for argument.
+        Override this function in your implementation.
+        @param x Argument
+        @return Function value
+    */
+    virtual double GetY( double x ) = 0;
+
+    /** Layer plot handler.
+        This implementation will plot the function in the visible area and
+        put a label according to the aligment specified.
+    */
+    virtual void Plot(wxDC & dc, mpWindow & w);
+
+protected:
+    int m_flags; //!< Holds label alignment
+
+    DECLARE_DYNAMIC_CLASS(mpProfile)
+};
+
+/*@}*/
+
+//-----------------------------------------------------------------------------
+// mpLayer implementations - furniture (scales, ...)
+//-----------------------------------------------------------------------------
+
+/** @name mpLayer implementations - furniture (scales, ...)
+@{*/
+
+/** Plot layer implementing a x-scale ruler.
+    The ruler is fixed at Y=0 in the coordinate system. A label is plotted at
+    the bottom-right hand of the ruler. The scale numbering automatically
+    adjusts to view and zoom factor.
+*/
+class WXDLLIMPEXP_MATHPLOT mpScaleX : public mpLayer
+{
+public:
+    /** Full constructor.
+		@param name Label to plot by the ruler
+		@param flags Set the position of the scale with respect to the window.
+		@param ticks Select ticks or grid. Give TRUE (default) for drawing axis ticks, FALSE for drawing the grid.
+		@param type mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds. */
+    mpScaleX(wxString name = wxT("X"), int flags = mpALIGN_CENTER, bool ticks = true, unsigned int type = mpX_NORMAL);
+
+    /** Layer plot handler.
+        This implementation will plot the ruler adjusted to the visible area. */
+    virtual void Plot(wxDC & dc, mpWindow & w);
+
+    /** Check whether this layer has a bounding box.
+        This implementation returns \a FALSE thus making the ruler invisible
+        to the plot layer bounding box calculation by mpWindow. */
+    virtual bool HasBBox() { return FALSE; }
+
+    /** Set X axis alignment.
+        @param align alignment (choose between mpALIGN_BORDER_BOTTOM, mpALIGN_BOTTOM, mpALIGN_CENTER, mpALIGN_TOP, mpALIGN_BORDER_TOP */
+    void SetAlign(int align) { m_flags = align; };
+
+    /** Set X axis ticks or grid
+        @param ticks TRUE to plot axis ticks, FALSE to plot grid. */
+    void SetTicks(bool ticks) { m_ticks = ticks; };
+
+    /** Get X axis ticks or grid
+        @return TRUE if plot is drawing axis ticks, FALSE if the grid is active. */
+    bool GetTicks() { return m_ticks; };
+
+    /** Get X axis label view mode.
+        @return mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds. */
+    unsigned int GetLabelMode() { return m_labelType; };
+
+    /** Set X axis label view mode.
+        @param mode mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds. */
+    void SetLabelMode(unsigned int mode) { m_labelType = mode; };
+	
+	/** Set X axis Label format (used for mpX_NORMAL draw mode).
+	    @param format The format string */
+	void SetLabelFormat(const wxString& format) { m_labelFormat = format; };
+
+	/** Get X axis Label format (used for mpX_NORMAL draw mode).
+	@return The format string */
+	const wxString& SetLabelFormat() { return m_labelFormat; };
+	
+protected:
+    int m_flags; //!< Flag for axis alignment
+    bool m_ticks; //!< Flag to toggle between ticks or grid
+    unsigned int m_labelType; //!< Select labels mode: mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds
+	wxString m_labelFormat; //!< Format string used to print labels
+
+    DECLARE_DYNAMIC_CLASS(mpScaleX)
+};
+
+/** Plot layer implementing a y-scale ruler.
+    If align is set to mpALIGN_CENTER, the ruler is fixed at X=0 in the coordinate system. If the align is set to mpALIGN_TOP or mpALIGN_BOTTOM, the axis is always drawn respectively at top or bottom of the window. A label is plotted at
+    the top-right hand of the ruler. The scale numbering automatically
+    adjusts to view and zoom factor.
+*/
+class WXDLLIMPEXP_MATHPLOT mpScaleY : public mpLayer
+{
+public:
+    /** @param name Label to plot by the ruler
+        @param flags Set position of the scale respect to the window.
+        @param ticks Select ticks or grid. Give TRUE (default) for drawing axis ticks, FALSE for drawing the grid */
+    mpScaleY(wxString name = wxT("Y"), int flags = mpALIGN_CENTER, bool ticks = true);
+
+    /** Layer plot handler.
+        This implementation will plot the ruler adjusted to the visible area.
+    */
+    virtual void Plot(wxDC & dc, mpWindow & w);
+
+    /** Check whether this layer has a bounding box.
+        This implementation returns \a FALSE thus making the ruler invisible
+        to the plot layer bounding box calculation by mpWindow.
+    */
+    virtual bool HasBBox() { return FALSE; }
+
+    /** Set Y axis alignment.
+        @param align alignment (choose between mpALIGN_BORDER_LEFT, mpALIGN_LEFT, mpALIGN_CENTER, mpALIGN_RIGHT, mpALIGN_BORDER_RIGHT) */
+    void SetAlign(int align) { m_flags = align; };
+
+    /** Set Y axis ticks or grid
+        @param ticks TRUE to plot axis ticks, FALSE to plot grid. */
+    void SetTicks(bool ticks) { m_ticks = ticks; };
+
+    /** Get Y axis ticks or grid
+        @return TRUE if plot is drawing axis ticks, FALSE if the grid is active. */
+    bool GetTicks() { return m_ticks; };
+	
+	/** Set Y axis Label format.
+	@param format The format string */
+	void SetLabelFormat(const wxString& format) { m_labelFormat = format; };
+	
+	/** Get Y axis Label format.
+	@return The format string */
+	const wxString& SetLabelFormat() { return m_labelFormat; };
+
+protected:
+    int m_flags; //!< Flag for axis alignment
+    bool m_ticks; //!< Flag to toggle between ticks or grid
+	wxString m_labelFormat; //!< Format string used to print labels
+
+    DECLARE_DYNAMIC_CLASS(mpScaleY)
+};
+
+//-----------------------------------------------------------------------------
+// mpWindow
+//-----------------------------------------------------------------------------
+
+/** @name Constants defining mouse modes for mpWindow
+@{*/
+
+/** Mouse panning drags the view. Mouse mode for mpWindow. */
+#define mpMOUSEMODE_DRAG    0
+/** Mouse panning creates a zoom box. Mouse mode for mpWindow. */
+#define mpMOUSEMODE_ZOOMBOX 1
+
+/*@}*/
+/** Define the type for the list of layers inside mpWindow */
+//WX_DECLARE_HASH_MAP( int, mpLayer*, wxIntegerHash, wxIntegerEqual, wxLayerList );
+typedef std::deque<mpLayer*> wxLayerList;
+
+/** Canvas for plotting mpLayer implementations.
+
+    This class defines a zoomable and moveable 2D plot canvas. Any number
+    of mpLayer implementations (scale rulers, function plots, ...) can be
+    attached using mpWindow::AddLayer.
+
+    The canvas window provides a context menu with actions for navigating the view.
+    The context menu can be retrieved with mpWindow::GetPopupMenu, e.g. for extending it
+    externally.
+
+    Since wxMathPlot version 0.03, the mpWindow incorporates the following features:
+        - DoubleBuffering (Default=disabled): Can be set with EnableDoubleBuffer
+        - Mouse based pan/zoom (Default=enabled): Can be set with EnableMousePanZoom.
+
+    The mouse commands can be visualized by the user through the popup menu, and are:
+        - Mouse Move+CTRL: Pan (Move)
+        - Mouse Wheel: Vertical scroll
+        - Mouse Wheel+SHIFT: Horizontal scroll
+        - Mouse Wheel UP+CTRL: Zoom in
+        - Mouse Wheel DOWN+CTRL: Zoom out
+
+*/
+class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
+{
+public:
+    mpWindow() {}
+    mpWindow( wxWindow *parent, wxWindowID id,
+                     const wxPoint &pos = wxDefaultPosition,
+                     const wxSize &size = wxDefaultSize,
+                     long flags = 0);
+    ~mpWindow();
+
+    /** Get reference to context menu of the plot canvas.
+        @return Pointer to menu. The menu can be modified.
+    */
+    wxMenu* GetPopupMenu() { return &m_popmenu; }
+
+    /** Add a plot layer to the canvas.
+        @param layer Pointer to layer. The mpLayer object will get under control of mpWindow,
+                     i.e. it will be delete'd on mpWindow destruction
+        @param refreshDisplay States whether to refresh the display (UpdateAll) after adding the layer.
+        @retval TRUE Success
+        @retval FALSE Failure due to out of memory.
+    */
+    bool AddLayer( mpLayer* layer, bool refreshDisplay = true);
+
+    /** Remove a plot layer from the canvas.
+        @param layer Pointer to layer. The mpLayer object will be destructed using delete.
+        @param alsoDeleteObject If set to true, the mpLayer object will be also "deleted", not just removed from the internal list.
+        @param refreshDisplay States whether to refresh the display (UpdateAll) after removing the layer.
+        @return true if layer is deleted correctly
+
+        N.B. Only the layer reference in the mpWindow is deleted, the layer object still exists!
+    */
+    bool DelLayer( mpLayer* layer, bool alsoDeleteObject = false, bool refreshDisplay = true);
+
+    /** Remove all layers from the plot.
+        @param alsoDeleteObject If set to true, the mpLayer objects will be also "deleted", not just removed from the internal list.
+        @param refreshDisplay States whether to refresh the display (UpdateAll) after removing the layers.
+    */
+    void DelAllLayers( bool alsoDeleteObject, bool refreshDisplay = true);
+	
+	
+    /*! Get the layer in list position indicated.
+        N.B. You <i>must</i> know the index of the layer inside the list!
+        @param position position of the layer in the layers list
+        @return pointer to mpLayer
+    */
+    mpLayer* GetLayer(int position);
+
+    /*! Get the layer by its name (case sensitive).
+        @param name The name of the layer to retrieve
+        @return A pointer to the mpLayer object, or NULL if not found.
+    */
+    mpLayer* GetLayerByName( const wxString &name);
+
+    /** Get current view's X scale.
+        See @ref mpLayer::Plot "rules for coordinate transformation"
+        @return Scale
+    */
+    double GetXscl() { return m_scaleX; }
+    double GetScaleX(void) const{ return m_scaleX; }; // Schaling's method: maybe another method esists with the same name
+
+    /** Get current view's Y scale.
+        See @ref mpLayer::Plot "rules for coordinate transformation"
+        @return Scale
+    */
+    double GetYscl() const { return m_scaleY; }
+    double GetScaleY(void) const { return m_scaleY; } // Schaling's method: maybe another method exists with the same name
+
+    /** Get current view's X position.
+        See @ref mpLayer::Plot "rules for coordinate transformation"
+        @return X Position in layer coordinate system, that corresponds to the center point of the view.
+    */
+    double GetXpos() const { return m_posX; }
+    double GetPosX(void) const { return m_posX; }
+
+    /** Get current view's Y position.
+        See @ref mpLayer::Plot "rules for coordinate transformation"
+        @return Y Position in layer coordinate system, that corresponds to the center point of the view.
+    */
+    double GetYpos() const { return m_posY; }
+    double GetPosY(void) const { return m_posY; }
+
+    /** Get current view's X dimension in device context units.
+        Usually this is equal to wxDC::GetSize, but it might differ thus mpLayer
+        implementations should rely on the value returned by the function.
+        See @ref mpLayer::Plot "rules for coordinate transformation"
+        @return X dimension.
+    */
+    int GetScrX(void) const { return m_scrX; }
+    int GetXScreen(void) const { return m_scrX; }
+
+    /** Get current view's Y dimension in device context units.
+        Usually this is equal to wxDC::GetSize, but it might differ thus mpLayer
+        implementations should rely on the value returned by the function.
+        See @ref mpLayer::Plot "rules for coordinate transformation"
+        @return Y dimension.
+    */
+    int GetScrY(void) const { return m_scrY; }
+    int GetYScreen(void) const { return m_scrY; }
+
+    /** Set current view's X scale and refresh display.
+        @param scaleX New scale, must not be 0.
+    */
+    void SetScaleX(double scaleX);
+
+    /** Set current view's Y scale and refresh display.
+        @param scaleY New scale, must not be 0.
+    */
+    void SetScaleY(double scaleY) { if (scaleY!=0) m_scaleY=scaleY; UpdateAll(); }
+
+    /** Set current view's X position and refresh display.
+        @param posX New position that corresponds to the center point of the view.
+    */
+    void SetPosX(double posX) { m_posX=posX; UpdateAll(); }
+
+    /** Set current view's Y position and refresh display.
+        @param posY New position that corresponds to the center point of the view.
+    */
+    void SetPosY(double posY) { m_posY=posY; UpdateAll(); }
+
+    /** Set current view's X and Y position and refresh display.
+        @param posX New position that corresponds to the center point of the view.
+        @param posY New position that corresponds to the center point of the view.
+    */
+    void SetPos( double posX, double posY) { m_posX=posX; m_posY=posY; UpdateAll(); }
+
+    /** Set current view's dimensions in device context units.
+        Needed by plotting functions. It doesn't refresh display.
+        @param scrX New position that corresponds to the center point of the view.
+        @param scrY New position that corresponds to the center point of the view.
+    */
+    void SetScr( int scrX, int scrY) { m_scrX=scrX; m_scrY=scrY; }
+    
+    /** Converts mpWindow (screen) pixel coordinates into graph (floating point) coordinates, using current mpWindow position and scale.
+      * @sa p2y,x2p,y2p */
+//     double p2x(wxCoord pixelCoordX, bool drawOutside = true ); // { return m_posX + pixelCoordX/m_scaleX; }
+    inline double p2x(wxCoord pixelCoordX ) { return m_posX + pixelCoordX/m_scaleX; }
+
+    /** Converts mpWindow (screen) pixel coordinates into graph (floating point) coordinates, using current mpWindow position and scale.
+      * @sa p2x,x2p,y2p */
+//     double p2y(wxCoord pixelCoordY, bool drawOutside = true ); //{ return m_posY - pixelCoordY/m_scaleY; }
+    inline double p2y(wxCoord pixelCoordY ) { return m_posY - pixelCoordY/m_scaleY; }
+
+    /** Converts graph (floating point) coordinates into mpWindow (screen) pixel coordinates, using current mpWindow position and scale.
+      * @sa p2x,p2y,y2p */
+//     wxCoord x2p(double x, bool drawOutside = true); // { return (wxCoord) ( (x-m_posX) * m_scaleX); }
+    inline wxCoord x2p(double x) { return (wxCoord) ( (x-m_posX) * m_scaleX); }
+
+    /** Converts graph (floating point) coordinates into mpWindow (screen) pixel coordinates, using current mpWindow position and scale.
+      * @sa p2x,p2y,x2p */
+//     wxCoord y2p(double y, bool drawOutside = true); // { return (wxCoord) ( (m_posY-y) * m_scaleY); }
+    inline wxCoord y2p(double y) { return (wxCoord) ( (m_posY-y) * m_scaleY); }
+
+
+    /** Enable/disable the double-buffering of the window, eliminating the flicker (default=disabled).
+     */
+    void EnableDoubleBuffer( bool enabled ) { m_enableDoubleBuffer = enabled; }
+
+    /** Enable/disable the feature of pan/zoom with the mouse (default=enabled)
+     */
+    void EnableMousePanZoom( bool enabled ) { m_enableMouseNavigation = enabled; }
+
+    /** Enable or disable X/Y scale aspect locking for the view.
+        @note Explicit calls to mpWindow::SetScaleX and mpWindow::SetScaleY will set
+              an unlocked aspect, but any other action changing the view scale will
+              lock the aspect again.
+    */
+    void LockAspect(bool enable = TRUE);
+
+    /** Checks whether the X/Y scale aspect is locked.
+        @retval TRUE Locked
+        @retval FALSE Unlocked
+    */
+    inline bool IsAspectLocked() { return m_lockaspect; }
+
+    /** Set view to fit global bounding box of all plot layers and refresh display.
+        Scale and position will be set to show all attached mpLayers.
+        The X/Y scale aspect lock is taken into account.
+    */
+    void Fit();
+
+    /** Set view to fit a given bounding box and refresh display.
+        The X/Y scale aspect lock is taken into account.
+	If provided, the parameters printSizeX and printSizeY are taken as the DC size, and the 
+        pixel scales are computed accordingly. Also, in this case the passed borders are not saved 
+        as the "desired borders", since this use will be invoked only when printing.
+    */
+    void Fit(double xMin, double xMax, double yMin, double yMax,wxCoord *printSizeX=NULL,wxCoord *printSizeY=NULL);
+
+    /** Zoom into current view and refresh display 
+      * @param centerPoint The point (pixel coordinates) that will stay in the same position on the screen after the zoom (by default, the center of the mpWindow).
+      */
+    void ZoomIn( const wxPoint& centerPoint = wxDefaultPosition );
+
+    /** Zoom out current view and refresh display
+      * @param centerPoint The point (pixel coordinates) that will stay in the same position on the screen after the zoom (by default, the center of the mpWindow).
+      */
+    void ZoomOut( const wxPoint& centerPoint = wxDefaultPosition );
+
+    /** Zoom in current view along X and refresh display */
+    void ZoomInX();
+    /** Zoom out current view along X and refresh display */
+    void ZoomOutX();
+    /** Zoom in current view along Y and refresh display */
+    void ZoomInY();
+    /** Zoom out current view along Y and refresh display */
+    void ZoomOutY();
+
+    /** Zoom view fitting given coordinates to the window (p0 and p1 do not need to be in any specific order) */
+    void ZoomRect(wxPoint p0, wxPoint p1);
+
+    /** Refresh display */
+    void UpdateAll();
+
+    // Added methods by Davide Rondini
+
+    /** Counts the number of plot layers, excluding axes or text: this is to count only the layers which have a bounding box.
+    	\return The number of profiles plotted.
+    */
+    unsigned int CountLayers();
+    
+    /** Counts the number of plot layers, whether or not they have a bounding box.
+    	\return The number of layers in the mpWindow. */
+    unsigned int CountAllLayers() { return m_layers.size(); };
+
+    /** Draws the mpWindow on a page for printing
+        \param print the mpPrintout where to print the graph */
+    //void PrintGraph(mpPrintout *print);
+
+
+	/** Returns the left-border layer coordinate that the user wants the mpWindow to show (it may be not exactly the actual shown coordinate in the case of locked aspect ratio).
+	  * @sa Fit
+   	  */
+	double GetDesiredXmin() {return m_desiredXmin; }
+
+	/** Returns the right-border layer coordinate that the user wants the mpWindow to show (it may be not exactly the actual shown coordinate in the case of locked aspect ratio).
+	  * @sa Fit
+   	  */
+	double GetDesiredXmax() {return m_desiredXmax; }
+
+	/** Returns the bottom-border layer coordinate that the user wants the mpWindow to show (it may be not exactly the actual shown coordinate in the case of locked aspect ratio).
+	  * @sa Fit
+   	  */
+	double GetDesiredYmin() {return m_desiredYmin; }
+
+	/** Returns the top layer-border coordinate that the user wants the mpWindow to show (it may be not exactly the actual shown coordinate in the case of locked aspect ratio).
+	  * @sa Fit
+   	  */
+	double GetDesiredYmax() {return m_desiredYmax; }
+
+	/** Returns the bounding box coordinates
+		@param bbox Pointer to a 6-element double array where to store bounding box coordinates. */
+	void GetBoundingBox(double* bbox);
+	
+    /** Enable/disable scrollbars
+      @param status Set to true to show scrollbars */
+    void SetMPScrollbars(bool status);
+
+    /** Get scrollbars status.
+      @return true if scrollbars are visible */
+    bool GetMPScrollbars() {return m_enableScrollBars; };
+
+    /** Draw the window on a wxBitmap, then save it to a file.
+      @param filename File name where to save the screenshot
+      @param type image type to be saved: see wxImage output file types for flags
+	  @param imageSize Set a size for the output image. Default is the same as the screen size
+	  @param fit Decide whether to fit the plot into the size*/
+    bool SaveScreenshot(const wxString& filename, int type = wxBITMAP_TYPE_BMP, wxSize imageSize = wxDefaultSize, bool fit = false);
+
+    /** This value sets the zoom steps whenever the user clicks "Zoom in/out" or performs zoom with the mouse wheel.
+      *  It must be a number above unity. This number is used for zoom in, and its inverse for zoom out. Set to 1.5 by default. */
+    static double zoomIncrementalFactor;
+
+    /** Set window margins, creating a blank area where some kinds of layers cannot draw. This is useful for example to draw axes outside the area where the plots are drawn.
+        @param top Top border
+        @param right Right border
+        @param bottom Bottom border
+        @param left Left border */
+    void SetMargins(int top, int right, int bottom, int left);
+
+    /** Set the top margin. @param top Top Margin */
+    void SetMarginTop(int top) { m_marginTop = top; };
+    /** Set the right margin. @param right Right Margin */
+    void SetMarginRight(int right) { m_marginRight = right; };
+    /** Set the bottom margin. @param bottom Bottom Margin */
+    void SetMarginBottom(int bottom) { m_marginBottom = bottom; };
+    /** Set the left margin. @param left Left Margin */
+    void SetMarginLeft(int left) { m_marginLeft = left; };
+
+    /** Get the top margin. @param top Top Margin */
+    int GetMarginTop() { return m_marginTop; };
+    /** Get the right margin. @param right Right Margin */
+    int GetMarginRight() { return m_marginRight; };
+    /** Get the bottom margin. @param bottom Bottom Margin */
+    int GetMarginBottom() { return m_marginBottom; };
+    /** Get the left margin. @param left Left Margin */
+    int GetMarginLeft() { return m_marginLeft; };
+
+    /** Sets whether to show coordinate tooltip when mouse passes over the plot. \param value true for enable, false for disable */
+    // void EnableCoordTooltip(bool value = true);
+    /** Gets coordinate tooltip status. \return true for enable, false for disable */
+    // bool GetCoordTooltip() { return m_coordTooltip; };
+
+    /** Check if a given point is inside the area of a mpInfoLayer and eventually returns its pointer.
+        @param point The position to be checked 
+        @return If an info layer is found, returns its pointer, NULL otherwise */
+    mpInfoLayer* IsInsideInfoLayer(wxPoint& point);
+	
+	/** Sets the visibility of a layer by its name.
+		@param name The layer name to set visibility
+		@param viewable the view status to be set */
+	void SetLayerVisible(const wxString &name, bool viewable);
+	
+	/** Check whether a layer with given name is visible
+		@param name The layer name
+		@return layer visibility status */
+	bool IsLayerVisible(const wxString &name );
+	
+	/** Sets the visibility of a layer by its position in layer list.
+		@param position The layer position in layer list
+		@param viewable the view status to be set */
+	void SetLayerVisible(const unsigned int position, bool viewable);
+	
+	/** Check whether the layer at given position is visible
+		@param position The layer position in layer list
+		@return layer visibility status */
+	bool IsLayerVisible(const unsigned int position );
+
+	/** Set Color theme. Provide colours to set a new colour theme.
+	    @param bgColour Background colour
+		@param drawColour The colour used to draw all elements in foreground, axes excluded
+		@param axesColour The colour used to draw axes (but not their labels) */
+	void SetColourTheme(const wxColour& bgColour, const wxColour& drawColour, const wxColour& axesColour);
+	
+	/** Get axes draw colour
+		@return reference to axis colour used in theme */
+	const wxColour& GetAxesColour() { return m_axColour; };
+
+protected:
+    void OnPaint         (wxPaintEvent     &event); //!< Paint handler, will plot all attached layers
+    void OnSize          (wxSizeEvent      &event); //!< Size handler, will update scroll bar sizes
+    // void OnScroll2       (wxScrollWinEvent &event); //!< Scroll handler, will move canvas
+    void OnShowPopupMenu (wxMouseEvent     &event); //!< Mouse handler, will show context menu
+    void OnMouseRightDown(wxMouseEvent     &event); //!< Mouse handler, for detecting when the user drags with the right button or just "clicks" for the menu
+    void OnCenter        (wxCommandEvent   &event); //!< Context menu handler
+    void OnFit           (wxCommandEvent   &event); //!< Context menu handler
+    void OnZoomIn        (wxCommandEvent   &event); //!< Context menu handler
+    void OnZoomOut       (wxCommandEvent   &event); //!< Context menu handler
+    void OnLockAspect    (wxCommandEvent   &event); //!< Context menu handler
+    void OnMouseHelp     (wxCommandEvent   &event); //!< Context menu handler
+    void OnMouseWheel    (wxMouseEvent     &event); //!< Mouse handler for the wheel
+    void OnMouseMove     (wxMouseEvent     &event); //!< Mouse handler for mouse motion (for pan)
+    void OnMouseLeftDown (wxMouseEvent     &event); //!< Mouse left click (for rect zoom)
+    void OnMouseLeftRelease (wxMouseEvent  &event); //!< Mouse left click (for rect zoom)
+    void OnScrollThumbTrack (wxScrollWinEvent &event); //!< Scroll thumb on scroll bar moving
+    void OnScrollPageUp     (wxScrollWinEvent &event); //!< Scroll page up 
+    void OnScrollPageDown   (wxScrollWinEvent &event); //!< Scroll page down 
+    void OnScrollLineUp     (wxScrollWinEvent &event); //!< Scroll line up 
+    void OnScrollLineDown   (wxScrollWinEvent &event); //!< Scroll line down
+    void OnScrollTop        (wxScrollWinEvent &event); //!< Scroll to top 
+    void OnScrollBottom     (wxScrollWinEvent &event); //!< Scroll to bottom
+
+    void DoScrollCalc    (const int position, const int orientation);
+
+    void DoZoomInXCalc   (const int         staticXpixel);
+    void DoZoomInYCalc   (const int         staticYpixel);
+    void DoZoomOutXCalc  (const int         staticXpixel);
+    void DoZoomOutYCalc  (const int         staticYpixel);
+
+    /** Recalculate global layer bounding box, and save it in m_minX,...
+      * \return true if there is any valid BBox information.
+      */
+    virtual bool UpdateBBox();
+
+    //wxList m_layers;    //!< List of attached plot layers
+    wxLayerList m_layers; //!< List of attached plot layers
+    wxMenu m_popmenu;   //!< Canvas' context menu
+    bool   m_lockaspect;//!< Scale aspect is locked or not
+    // bool   m_coordTooltip; //!< Selects whether to show coordinate tooltip
+	wxColour m_bgColour;	//!< Background Colour
+	wxColour m_fgColour;	//!< Foreground Colour
+	wxColour m_axColour;	//!< Axes Colour
+
+    double m_minX;      //!< Global layer bounding box, left border incl.
+    double m_maxX;      //!< Global layer bounding box, right border incl.
+    double m_minY;      //!< Global layer bounding box, bottom border incl.
+    double m_maxY;      //!< Global layer bounding box, top border incl.
+    double m_scaleX;    //!< Current view's X scale
+    double m_scaleY;    //!< Current view's Y scale
+    double m_posX;      //!< Current view's X position
+    double m_posY;      //!< Current view's Y position
+    int    m_scrX;      //!< Current view's X dimension
+    int    m_scrY;      //!< Current view's Y dimension
+    int    m_clickedX;  //!< Last mouse click X position, for centering and zooming the view
+    int    m_clickedY;  //!< Last mouse click Y position, for centering and zooming the view
+
+    /** These are updated in Fit() only, and may be different from the real borders (layer coordinates) only if lock aspect ratio is true.
+      */
+    double m_desiredXmin,m_desiredXmax,m_desiredYmin,m_desiredYmax;
+
+    int m_marginTop, m_marginRight, m_marginBottom, m_marginLeft;
+
+    int         m_last_lx,m_last_ly;   //!< For double buffering
+    wxMemoryDC  m_buff_dc;             //!< For double buffering
+    wxBitmap    *m_buff_bmp;            //!< For double buffering
+    bool        m_enableDoubleBuffer;  //!< For double buffering
+    bool        m_enableMouseNavigation;  //!< For pan/zoom with the mouse.
+    bool        m_mouseMovedAfterRightClick;
+    long        m_mouseRClick_X,m_mouseRClick_Y; //!< For the right button "drag" feature
+    int         m_mouseLClick_X, m_mouseLClick_Y; //!< Starting coords for rectangular zoom selection
+    bool        m_enableScrollBars;
+    int         m_scrollX, m_scrollY;
+    mpInfoLayer* m_movingInfoLayer;      //!< For moving info layers over the window area
+
+    DECLARE_DYNAMIC_CLASS(mpWindow)
+    DECLARE_EVENT_TABLE()
+};
+
+//-----------------------------------------------------------------------------
+// mpFXYVector - provided by Jose Luis Blanco
+//-----------------------------------------------------------------------------
+
+/** A class providing graphs functionality for a 2D plot (either continuous or a set of points), from vectors of data.
+     This class can be used directly, the user does not need to derive any new class. Simply pass the data as two vectors
+     with the same length containing the X and Y coordinates to the method SetData.
+
+     To generate a graph with a set of points, call
+     \code
+     layerVar->SetContinuity(false)
+     \endcode
+
+     or
+
+     \code
+     layerVar->SetContinuity(true)
+     \endcode
+
+     to render the sequence of coordinates as a continuous line.
+
+     (Added: Jose Luis Blanco, AGO-2007)
+*/
+class WXDLLIMPEXP_MATHPLOT mpFXYVector : public mpFXY
+{
+public:
+    /** @param name  Label
+        @param flags Label alignment, pass one of #mpALIGN_NE, #mpALIGN_NW, #mpALIGN_SW, #mpALIGN_SE.
+    */
+    mpFXYVector(wxString name = wxEmptyString, int flags = mpALIGN_NE);
+
+    /** Changes the internal data: the set of points to draw.
+        Both vectors MUST be of the same length. This method DOES NOT refresh the mpWindow; do it manually.
+      * @sa Clear
+    */
+    void SetData( const std::vector<double> &xs,const std::vector<double> &ys);
+
+    /** Clears all the data, leaving the layer empty.
+      * @sa SetData
+      */
+    void Clear();
+
+protected:
+    /** The internal copy of the set of data to draw.
+      */
+    std::vector<double>  m_xs,m_ys;
+
+    /** The internal counter for the "GetNextXY" interface
+      */
+    size_t              m_index;
+
+    /** Loaded at SetData
+      */
+    double              m_minX,m_maxX,m_minY,m_maxY;
+
+    /** Rewind value enumeration with mpFXY::GetNextXY.
+        Overridden in this implementation.
+    */
+    void Rewind();
+
+    /** Get locus value for next N.
+        Overridden in this implementation.
+        @param x Returns X value
+        @param y Returns Y value
+    */
+    bool GetNextXY(double & x, double & y);
+
+    /** Returns the actual minimum X data (loaded in SetData).
+      */
+    double GetMinX() { return m_minX; }
+
+    /** Returns the actual minimum Y data (loaded in SetData).
+      */
+    double GetMinY() { return m_minY; }
+
+    /** Returns the actual maximum X data (loaded in SetData).
+      */
+    double GetMaxX() { return m_maxX; }
+
+    /** Returns the actual maximum Y data (loaded in SetData).
+      */
+    double GetMaxY() { return m_maxY; }
+
+    int     m_flags; //!< Holds label alignment
+
+    DECLARE_DYNAMIC_CLASS(mpFXYVector)
+};
+
+//-----------------------------------------------------------------------------
+// mpText - provided by Val Greene
+//-----------------------------------------------------------------------------
+
+/** Plot layer implementing a text string.
+The text is plotted using a percentage system 0-100%, so the actual
+coordinates for the location are not required, and the text stays
+on the plot reguardless of the other layers location and scaling
+factors.
+*/
+class WXDLLIMPEXP_MATHPLOT mpText : public mpLayer
+{
+public:
+    /** @param name text to be drawn in the plot
+        @param offsetx holds offset for the X location in percentage (0-100)
+        @param offsety holds offset for the Y location in percentage (0-100) */
+    mpText(wxString name = wxT("Title"), int offsetx = 5, int offsety = 50);
+
+    /** Text Layer plot handler.
+        This implementation will plot text adjusted to the visible area. */
+    virtual void Plot(wxDC & dc, mpWindow & w);
+
+    /** mpText should not be used for scaling decisions. */
+    virtual bool HasBBox() { return FALSE; }
+
+protected:
+    int m_offsetx; //!< Holds offset for X in percentage
+    int m_offsety; //!< Holds offset for Y in percentage
+
+    DECLARE_DYNAMIC_CLASS(mpText)
+};
+
+
+//-----------------------------------------------------------------------------
+// mpPrintout - provided by Davide Rondini
+//-----------------------------------------------------------------------------
+
+/** Printout class used by mpWindow to draw in the objects to be printed.
+    The object itself can then used by the default wxWidgets printing system
+    to print mppWindow objects.
+*/
+class WXDLLIMPEXP_MATHPLOT mpPrintout : public wxPrintout
+{
+public:
+    mpPrintout(mpWindow* drawWindow, const wxChar *title = _T("wxMathPlot print output"));
+    virtual ~mpPrintout() {};
+
+    void SetDrawState(bool drawState) {drawn = drawState;};
+    bool OnPrintPage(int page);
+    bool HasPage(int page);
+
+private:
+    bool drawn;
+    mpWindow *plotWindow;
+};
+
+
+//-----------------------------------------------------------------------------
+// mpMovableObject  - provided by Jose Luis Blanco
+//-----------------------------------------------------------------------------
+/** This virtual class represents objects that can be moved to an arbitrary 2D location+rotation.
+  *  The current transformation is set through SetCoordinateBase.
+  *  To ease the implementation of descendent classes, mpMovableObject will
+  *  be in charge of Bounding Box computation and layer rendering, assuming that
+  *  the object updates its shape in m_shape_xs & m_shape_ys.
+  */
+class WXDLLIMPEXP_MATHPLOT mpMovableObject : public mpLayer
+{
+public:
+    /** Default constructor (sets location and rotation to (0,0,0))
+      */
+    mpMovableObject( ) :
+        m_reference_x(0),
+        m_reference_y(0),
+        m_reference_phi(0),
+        m_shape_xs(0),
+        m_shape_ys(0)
+    {
+        m_type = mpLAYER_PLOT;
+    }
+
+    virtual ~mpMovableObject() {};
+
+    /** Get the current coordinate transformation.
+      */
+    void GetCoordinateBase( double &x, double &y, double &phi ) const
+    {
+        x = m_reference_x;
+        y = m_reference_y;
+        phi = m_reference_phi;
+    }
+
+    /** Set the coordinate transformation (phi in radians, 0 means no rotation).
+      */
+    void SetCoordinateBase( double x, double y, double phi = 0 )
+    {
+        m_reference_x = x;
+        m_reference_y = y;
+        m_reference_phi = phi;
+        m_flags  = mpALIGN_NE;
+        ShapeUpdated();
+    }
+
+    virtual bool HasBBox() { return m_trans_shape_xs.size()!=0; }
+
+    /** Get inclusive left border of bounding box.
+    */
+    virtual double GetMinX() { return m_bbox_min_x; }
+
+    /** Get inclusive right border of bounding box.
+    */
+    virtual double GetMaxX() { return  m_bbox_max_x; }
+
+    /** Get inclusive bottom border of bounding box.
+    */
+    virtual double GetMinY() { return m_bbox_min_y; }
+
+    /** Get inclusive top border of bounding box.
+    */
+    virtual double GetMaxY() { return m_bbox_max_y; }
+
+    virtual void   Plot(wxDC & dc, mpWindow & w);
+
+    /** Set label axis alignment.
+      *  @param align alignment (choose between mpALIGN_NE, mpALIGN_NW, mpALIGN_SW, mpALIGN_SE
+      */
+    void SetAlign(int align) { m_flags = align; };
+
+protected:
+    int m_flags; //!< Holds label alignment
+
+    /** The coordinates of the object (orientation "phi" is in radians).
+      */
+    double m_reference_x,m_reference_y,m_reference_phi;
+
+    /** A method for 2D translation and rotation, using the current transformation stored in m_reference_x,m_reference_y,m_reference_phi.
+      */
+    void TranslatePoint( double x,double y, double &out_x, double &out_y );
+
+    /** This contains the object points, in local coordinates (to be transformed by the current transformation).
+      */
+    std::vector<double>  m_shape_xs,m_shape_ys;
+
+    /** The buffer for the translated & rotated points (to avoid recomputing them with each mpWindow refresh).
+      *
+      */
+    std::vector<double>  m_trans_shape_xs,m_trans_shape_ys;
+
+    /** The precomputed bounding box:
+      * @sa ShapeUpdated
+      */
+    double  m_bbox_min_x,m_bbox_max_x,m_bbox_min_y,m_bbox_max_y;
+
+    /** Must be called by the descendent class after updating the shape (m_shape_xs/ys), or when the transformation changes.
+      *  This method updates the buffers m_trans_shape_xs/ys, and the precomputed bounding box.
+      */
+    void ShapeUpdated();
+
+};
+
+//-----------------------------------------------------------------------------
+// mpCovarianceEllipse  - provided by Jose Luis Blanco
+//-----------------------------------------------------------------------------
+/** A 2D ellipse, described by a 2x2 covariance matrix.
+  *  The relation between the multivariate Gaussian confidence interval and
+  *   the "quantiles" in this class is:
+  *     - 1 : 68.27% confidence interval
+  *     - 2 : 95.45%
+  *     - 3 : 99.73%
+  *     - 4 : 99.994%
+  * For example, see http://en.wikipedia.org/wiki/Normal_distribution#Standard_deviation_and_confidence_intervals
+  *
+  * The ellipse will be always centered at the origin. Use mpMovableObject::SetCoordinateBase to move it.
+  */
+class WXDLLIMPEXP_MATHPLOT mpCovarianceEllipse : public mpMovableObject
+{
+public:
+    /** Default constructor.
+      * Initializes to a unity diagonal covariance matrix, a 95% confidence interval (2 sigmas), 32 segments, and a continuous plot (m_continuous=true).
+      */
+    mpCovarianceEllipse(
+        double cov_00 = 1,
+        double cov_11 = 1,
+        double cov_01 = 0,
+        double quantiles = 2,
+        int    segments = 32,
+        const wxString & layerName = wxT("") ) :
+            m_cov_00(cov_00),
+            m_cov_11(cov_11),
+            m_cov_01(cov_01),
+            m_quantiles(quantiles),
+            m_segments(segments)
+    {
+        m_continuous = true;
+        m_name = layerName;
+        RecalculateShape();
+        m_type = mpLAYER_PLOT;
+    }
+
+    virtual ~mpCovarianceEllipse() {}
+
+    double GetQuantiles() const { return m_quantiles; }
+
+    /** Set how many "quantiles" to draw, that is, the confidence interval of the ellipse (see above).
+      */
+    void SetQuantiles(double q)
+    {
+        m_quantiles=q;
+        RecalculateShape();
+    }
+
+    void SetSegments( int segments ) { m_segments = segments; }
+    int GetSegments( ) const { return m_segments; }
+
+    /** Returns the elements of the current covariance matrix:
+      */
+    void GetCovarianceMatrix( double &cov_00,double &cov_01,double &cov_11 ) const
+    {
+        cov_00 = m_cov_00;
+        cov_01 = m_cov_01;
+        cov_11 = m_cov_11;
+    }
+
+    /** Changes the covariance matrix:
+      */
+    void SetCovarianceMatrix( double cov_00,double cov_01,double cov_11 )
+    {
+        m_cov_00 = cov_00;
+        m_cov_01 = cov_01;
+        m_cov_11 = cov_11;
+        RecalculateShape();
+    }
+
+protected:
+    /** The elements of the matrix (only 3 since cov(0,1)=cov(1,0) in any positive definite matrix).
+      */
+    double m_cov_00,m_cov_11,m_cov_01;
+    double m_quantiles;
+
+    /** The number of line segments that build up the ellipse.
+      */
+    int m_segments;
+
+    /** Called to update the m_shape_xs, m_shape_ys vectors, whenever a parameter changes.
+      */
+    void RecalculateShape();
+};
+
+//-----------------------------------------------------------------------------
+// mpPolygon - provided by Jose Luis Blanco
+//-----------------------------------------------------------------------------
+/** An arbitrary polygon, descendant of mpMovableObject.
+  *  Use "setPoints" to set the list of N points. This class also can draw non-closed polygons by
+  *   passing the appropriate parameters to "setPoints". To draw a point-cloud, call "SetContinuity(false)".
+  */
+class WXDLLIMPEXP_MATHPLOT mpPolygon : public mpMovableObject
+{
+public:
+    /** Default constructor.
+      */
+    mpPolygon( const wxString & layerName = wxT("") )
+    {
+        m_continuous = true;
+        m_name = layerName;
+    }
+
+    virtual ~mpPolygon() {}
+
+    /** Set the points in the polygon.
+      * @param points_xs  The X coordinates of the points.
+      * @param points_ys  The Y coordinates of the points.
+      * @param closedShape If set to true, an additional segment will be added from the last to the first point.
+      */
+    void setPoints(
+        const std::vector<double>&  points_xs,
+        const std::vector<double>&  points_ys,
+        bool                   closedShape=true );
+
+
+
+};
+
+//-----------------------------------------------------------------------------
+// mpMovableObject  - provided by Jose Luis Blanco
+//-----------------------------------------------------------------------------
+/** This virtual class represents objects that can be moved to an arbitrary 2D location+rotation.
+  *  The current transformation is set through SetCoordinateBase.
+  *  To ease the implementation of descendent classes, mpMovableObject will
+  *  be in charge of Bounding Box computation and layer render, assuming that
+  *  the object updates its shape in m_shape_xs & m_shape_ys.
+  */
+class WXDLLIMPEXP_MATHPLOT mpBitmapLayer : public mpLayer
+{
+public:
+    /** Default constructor.
+      */
+    mpBitmapLayer( )
+    {
+        m_min_x = m_max_x =
+        m_min_y = m_max_y = 0;
+        m_validImg = false;
+        m_type = mpLAYER_BITMAP;
+    }
+
+    virtual ~mpBitmapLayer() {};
+
+    /** Returns a copy of the current bitmap assigned to the layer.
+      */
+    void GetBitmapCopy( wxImage &outBmp ) const;
+
+    /** Change the bitmap associated with the layer (to update the screen, refresh the mpWindow).
+      *  @param inBmp The bitmap to associate. A copy is made, thus it can be released after calling this.
+      *  @param x The left corner X coordinate (in plot units).
+      *  @param y The top corner Y coordinate (in plot units).
+      *  @param lx The width in plot units.
+      *  @param ly The height in plot units.
+      */
+    void SetBitmap( const wxImage &inBmp, double x, double y, double lx, double ly );
+
+    virtual bool HasBBox() { return true; }
+
+    /** Get inclusive left border of bounding box.
+    */
+    virtual double GetMinX() { return m_min_x; }
+
+    /** Get inclusive right border of bounding box.
+    */
+    virtual double GetMaxX() { return  m_max_x; }
+
+    /** Get inclusive bottom border of bounding box.
+    */
+    virtual double GetMinY() { return m_min_y; }
+
+    /** Get inclusive top border of bounding box.
+    */
+    virtual double GetMaxY() { return m_max_y; }
+
+    virtual void   Plot(wxDC & dc, mpWindow & w);
+
+    /** Set label axis alignment.
+      *  @param align alignment (choose between mpALIGN_NE, mpALIGN_NW, mpALIGN_SW, mpALIGN_SE
+      */
+    void SetAlign(int align) { m_flags = align; };
+
+protected:
+    int m_flags; //!< Holds label alignment
+
+    /** The internal copy of the Bitmap:
+      */
+    wxImage      m_bitmap;
+    wxBitmap     m_scaledBitmap;
+    wxCoord      m_scaledBitmap_offset_x,m_scaledBitmap_offset_y;
+
+
+    bool            m_validImg;
+
+
+    /** The shape of the bitmap:
+      */
+    double  m_min_x,m_max_x,m_min_y,m_max_y;
+
+
+};
+
+
+
+/*@}*/
+
+#endif // _MP_MATHPLOT_H_

From 24bccb00d62420891153b5ab266878c3702aaf91 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:22 +0200
Subject: [PATCH 043/197] Menu event handlers for simulation plot frame

---
 eeschema/sim/sim_plot_frame.cpp      | 33 +++++++++++++
 eeschema/sim/sim_plot_frame.h        | 15 +++++-
 eeschema/sim/sim_plot_frame_base.cpp | 72 +++++++++++++++++-----------
 eeschema/sim/sim_plot_frame_base.fbp | 46 +++++++++---------
 eeschema/sim/sim_plot_frame_base.h   | 16 +++++--
 eeschema/sim/sim_plot_panel.cpp      | 15 ++++++
 eeschema/sim/sim_plot_panel.h        |  4 ++
 7 files changed, 145 insertions(+), 56 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index f2046ae0e6..3f54ecdf09 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -129,6 +129,7 @@ void SIM_PLOT_FRAME::StopSimulation()
 void SIM_PLOT_FRAME::NewPlotPanel()
 {
     SIM_PLOT_PANEL* plot = new SIM_PLOT_PANEL( this, wxID_ANY );
+
     m_plotNotebook->AddPage( plot,
             wxString::Format( wxT( "Plot%lu" ), m_plotNotebook->GetPageCount() + 1 ), true );
 }
@@ -183,6 +184,38 @@ int SIM_PLOT_FRAME::getNodeNumber( const wxString& aNetName )
 }
 
 
+void SIM_PLOT_FRAME::menuZoomIn( wxCommandEvent& event )
+{
+    currentPlot()->ZoomIn();
+}
+
+
+void SIM_PLOT_FRAME::menuZoomOut( wxCommandEvent& event )
+{
+    currentPlot()->ZoomOut();
+}
+
+
+void SIM_PLOT_FRAME::menuZoomFit( wxCommandEvent& event )
+{
+    currentPlot()->Fit();
+}
+
+
+void SIM_PLOT_FRAME::menuShowGrid( wxCommandEvent& event )
+{
+    currentPlot()->ShowGrid( !currentPlot()->IsGridShown() );
+}
+
+
+void SIM_PLOT_FRAME::menuShowGridState( wxUpdateUIEvent& event )
+{
+    SIM_PLOT_PANEL* plotPanel = currentPlot();
+
+    event.Check( plotPanel ? plotPanel->IsGridShown() : false );
+}
+
+
 void SIM_PLOT_FRAME::onSignalDblClick( wxCommandEvent& event )
 {
     int idx = m_signals->GetSelection();
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 65e8ce5009..b3c4197c43 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -80,11 +80,24 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
          */
         int getNodeNumber( const wxString& aNetName );
 
-        void onNewPlot( wxCommandEvent& aEvent ) override
+        // Menu handlers
+        void menuNewPlot( wxCommandEvent& aEvent ) override
         {
             NewPlotPanel();
         }
 
+        void menuExit( wxCommandEvent& event ) override
+        {
+            Close();
+        }
+
+        void menuZoomIn( wxCommandEvent& event ) override;
+        void menuZoomOut( wxCommandEvent& event ) override;
+        void menuZoomFit( wxCommandEvent& event ) override;
+        void menuShowGrid( wxCommandEvent& event ) override;
+        void menuShowGridState( wxUpdateUIEvent& event ) override;
+
+        // Event handlers
         void onSignalDblClick( wxCommandEvent& event ) override;
         void onSimulate( wxCommandEvent& event ) override;
         void onPlaceProbe( wxCommandEvent& event ) override;
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index 6eb3b205e7..e6e8f2193c 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -13,52 +13,52 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 	
-	m_menubar1 = new wxMenuBar( 0 );
-	m_menu1 = new wxMenu();
+	m_mainMenu = new wxMenuBar( 0 );
+	m_fileMenu = new wxMenu();
 	wxMenuItem* m_menuItem7;
-	m_menuItem7 = new wxMenuItem( m_menu1, wxID_ANY, wxString( _("New Plot") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu1->Append( m_menuItem7 );
+	m_menuItem7 = new wxMenuItem( m_fileMenu, wxID_NEW, wxString( _("New Plot") ) , wxEmptyString, wxITEM_NORMAL );
+	m_fileMenu->Append( m_menuItem7 );
 	
-	m_menu1->AppendSeparator();
+	m_fileMenu->AppendSeparator();
 	
 	wxMenuItem* m_menuItem8;
-	m_menuItem8 = new wxMenuItem( m_menu1, wxID_ANY, wxString( _("Open Workbook") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu1->Append( m_menuItem8 );
+	m_menuItem8 = new wxMenuItem( m_fileMenu, wxID_OPEN, wxString( _("Open Workbook") ) , wxEmptyString, wxITEM_NORMAL );
+	m_fileMenu->Append( m_menuItem8 );
 	
 	wxMenuItem* m_menuItem2;
-	m_menuItem2 = new wxMenuItem( m_menu1, wxID_ANY, wxString( _("Save Workbook") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu1->Append( m_menuItem2 );
+	m_menuItem2 = new wxMenuItem( m_fileMenu, wxID_SAVE, wxString( _("Save Workbook") ) , wxEmptyString, wxITEM_NORMAL );
+	m_fileMenu->Append( m_menuItem2 );
 	
-	m_menu1->AppendSeparator();
+	m_fileMenu->AppendSeparator();
 	
 	wxMenuItem* m_menuItem1;
-	m_menuItem1 = new wxMenuItem( m_menu1, wxID_ANY, wxString( _("Exit Simulation") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu1->Append( m_menuItem1 );
+	m_menuItem1 = new wxMenuItem( m_fileMenu, wxID_CLOSE, wxString( _("Exit Simulation") ) , wxEmptyString, wxITEM_NORMAL );
+	m_fileMenu->Append( m_menuItem1 );
 	
-	m_menubar1->Append( m_menu1, _("File") ); 
+	m_mainMenu->Append( m_fileMenu, _("File") ); 
 	
-	m_menu2 = new wxMenu();
+	m_viewMenu = new wxMenu();
 	wxMenuItem* m_menuItem3;
-	m_menuItem3 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _("Zoom In") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu2->Append( m_menuItem3 );
+	m_menuItem3 = new wxMenuItem( m_viewMenu, wxID_ZOOM_IN, wxString( _("Zoom In") ) , wxEmptyString, wxITEM_NORMAL );
+	m_viewMenu->Append( m_menuItem3 );
 	
 	wxMenuItem* m_menuItem4;
-	m_menuItem4 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _("Zoom Out") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu2->Append( m_menuItem4 );
+	m_menuItem4 = new wxMenuItem( m_viewMenu, wxID_ZOOM_OUT, wxString( _("Zoom Out") ) , wxEmptyString, wxITEM_NORMAL );
+	m_viewMenu->Append( m_menuItem4 );
 	
 	wxMenuItem* m_menuItem5;
-	m_menuItem5 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _("Fit on Screen") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu2->Append( m_menuItem5 );
+	m_menuItem5 = new wxMenuItem( m_viewMenu, wxID_ZOOM_FIT, wxString( _("Fit on Screen") ) , wxEmptyString, wxITEM_NORMAL );
+	m_viewMenu->Append( m_menuItem5 );
 	
-	m_menu2->AppendSeparator();
+	m_viewMenu->AppendSeparator();
 	
-	wxMenuItem* m_menuItem6;
-	m_menuItem6 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _("Show grid") ) , wxEmptyString, wxITEM_CHECK );
-	m_menu2->Append( m_menuItem6 );
+	wxMenuItem* m_menuShowGrid;
+	m_menuShowGrid = new wxMenuItem( m_viewMenu, wxID_ANY, wxString( _("Show grid") ) , wxEmptyString, wxITEM_CHECK );
+	m_viewMenu->Append( m_menuShowGrid );
 	
-	m_menubar1->Append( m_menu2, _("View") ); 
+	m_mainMenu->Append( m_viewMenu, _("View") ); 
 	
-	this->SetMenuBar( m_menubar1 );
+	this->SetMenuBar( m_mainMenu );
 	
 	wxBoxSizer* bSizer1;
 	bSizer1 = new wxBoxSizer( wxVERTICAL );
@@ -154,7 +154,15 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	this->Connect( m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onNewPlot ) );
+	this->Connect( m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuNewPlot ) );
+	this->Connect( m_menuItem8->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuOpenWorkbook ) );
+	this->Connect( m_menuItem2->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveWorkbook ) );
+	this->Connect( m_menuItem1->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) );
+	this->Connect( m_menuItem3->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomIn ) );
+	this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomOut ) );
+	this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ) );
+	this->Connect( m_menuShowGrid->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowGrid ) );
+	this->Connect( m_menuShowGrid->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridState ) );
 	m_signals->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
 	m_simulateBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
 	m_probeBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onPlaceProbe ), NULL, this );
@@ -164,7 +172,15 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
 {
 	// Disconnect Events
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onNewPlot ) );
+	this->Disconnect( wxID_NEW, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuNewPlot ) );
+	this->Disconnect( wxID_OPEN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuOpenWorkbook ) );
+	this->Disconnect( wxID_SAVE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveWorkbook ) );
+	this->Disconnect( wxID_CLOSE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) );
+	this->Disconnect( wxID_ZOOM_IN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomIn ) );
+	this->Disconnect( wxID_ZOOM_OUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomOut ) );
+	this->Disconnect( wxID_ZOOM_FIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowGrid ) );
+	this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridState ) );
 	m_signals->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
 	m_simulateBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
 	m_probeBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onPlaceProbe ), NULL, this );
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index 7679c9c661..100d9c50ca 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -88,7 +88,7 @@
             <event name="OnSetFocus"></event>
             <event name="OnSize"></event>
             <event name="OnUpdateUI"></event>
-            <object class="wxMenuBar" expanded="0">
+            <object class="wxMenuBar" expanded="1">
                 <property name="bg"></property>
                 <property name="context_help"></property>
                 <property name="context_menu">1</property>
@@ -100,7 +100,7 @@
                 <property name="label">MyMenuBar</property>
                 <property name="maximum_size"></property>
                 <property name="minimum_size"></property>
-                <property name="name">m_menubar1</property>
+                <property name="name">m_mainMenu</property>
                 <property name="permission">protected</property>
                 <property name="pos"></property>
                 <property name="size"></property>
@@ -133,23 +133,23 @@
                 <event name="OnSetFocus"></event>
                 <event name="OnSize"></event>
                 <event name="OnUpdateUI"></event>
-                <object class="wxMenu" expanded="0">
+                <object class="wxMenu" expanded="1">
                     <property name="label">File</property>
-                    <property name="name">m_menu1</property>
+                    <property name="name">m_fileMenu</property>
                     <property name="permission">protected</property>
                     <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
                         <property name="help"></property>
-                        <property name="id">wxID_ANY</property>
+                        <property name="id">wxID_NEW</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">New Plot</property>
                         <property name="name">m_menuItem7</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection">onNewPlot</event>
+                        <event name="OnMenuSelection">menuNewPlot</event>
                         <event name="OnUpdateUI"></event>
                     </object>
                     <object class="separator" expanded="0">
@@ -161,14 +161,14 @@
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
                         <property name="help"></property>
-                        <property name="id">wxID_ANY</property>
+                        <property name="id">wxID_OPEN</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Open Workbook</property>
                         <property name="name">m_menuItem8</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection"></event>
+                        <event name="OnMenuSelection">menuOpenWorkbook</event>
                         <event name="OnUpdateUI"></event>
                     </object>
                     <object class="wxMenuItem" expanded="0">
@@ -176,14 +176,14 @@
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
                         <property name="help"></property>
-                        <property name="id">wxID_ANY</property>
+                        <property name="id">wxID_SAVE</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Save Workbook</property>
                         <property name="name">m_menuItem2</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection"></event>
+                        <event name="OnMenuSelection">menuSaveWorkbook</event>
                         <event name="OnUpdateUI"></event>
                     </object>
                     <object class="separator" expanded="0">
@@ -195,34 +195,34 @@
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
                         <property name="help"></property>
-                        <property name="id">wxID_ANY</property>
+                        <property name="id">wxID_CLOSE</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Exit Simulation</property>
                         <property name="name">m_menuItem1</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection"></event>
+                        <event name="OnMenuSelection">menuExit</event>
                         <event name="OnUpdateUI"></event>
                     </object>
                 </object>
-                <object class="wxMenu" expanded="0">
+                <object class="wxMenu" expanded="1">
                     <property name="label">View</property>
-                    <property name="name">m_menu2</property>
+                    <property name="name">m_viewMenu</property>
                     <property name="permission">protected</property>
                     <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
                         <property name="help"></property>
-                        <property name="id">wxID_ANY</property>
+                        <property name="id">wxID_ZOOM_IN</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Zoom In</property>
                         <property name="name">m_menuItem3</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection"></event>
+                        <event name="OnMenuSelection">menuZoomIn</event>
                         <event name="OnUpdateUI"></event>
                     </object>
                     <object class="wxMenuItem" expanded="0">
@@ -230,14 +230,14 @@
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
                         <property name="help"></property>
-                        <property name="id">wxID_ANY</property>
+                        <property name="id">wxID_ZOOM_OUT</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Zoom Out</property>
                         <property name="name">m_menuItem4</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection"></event>
+                        <event name="OnMenuSelection">menuZoomOut</event>
                         <event name="OnUpdateUI"></event>
                     </object>
                     <object class="wxMenuItem" expanded="0">
@@ -245,14 +245,14 @@
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
                         <property name="help"></property>
-                        <property name="id">wxID_ANY</property>
+                        <property name="id">wxID_ZOOM_FIT</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Fit on Screen</property>
                         <property name="name">m_menuItem5</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection"></event>
+                        <event name="OnMenuSelection">menuZoomFit</event>
                         <event name="OnUpdateUI"></event>
                     </object>
                     <object class="separator" expanded="0">
@@ -267,12 +267,12 @@
                         <property name="id">wxID_ANY</property>
                         <property name="kind">wxITEM_CHECK</property>
                         <property name="label">Show grid</property>
-                        <property name="name">m_menuItem6</property>
+                        <property name="name">m_menuShowGrid</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection"></event>
-                        <event name="OnUpdateUI"></event>
+                        <event name="OnMenuSelection">menuShowGrid</event>
+                        <event name="OnUpdateUI">menuShowGridState</event>
                     </object>
                 </object>
             </object>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index 514f9e4ddf..f6e5873060 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -43,9 +43,9 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 	private:
 	
 	protected:
-		wxMenuBar* m_menubar1;
-		wxMenu* m_menu1;
-		wxMenu* m_menu2;
+		wxMenuBar* m_mainMenu;
+		wxMenu* m_fileMenu;
+		wxMenu* m_viewMenu;
 		wxPanel* m_panel31;
 		wxPanel* m_panel61;
 		wxAuiNotebook* m_plotNotebook;
@@ -61,7 +61,15 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxRichTextCtrl* m_simConsole;
 		
 		// Virtual event handlers, overide them in your derived class
-		virtual void onNewPlot( wxCommandEvent& event ) { event.Skip(); }
+		virtual void menuNewPlot( wxCommandEvent& event ) { event.Skip(); }
+		virtual void menuOpenWorkbook( wxCommandEvent& event ) { event.Skip(); }
+		virtual void menuSaveWorkbook( wxCommandEvent& event ) { event.Skip(); }
+		virtual void menuExit( wxCommandEvent& event ) { event.Skip(); }
+		virtual void menuZoomIn( wxCommandEvent& event ) { event.Skip(); }
+		virtual void menuZoomOut( wxCommandEvent& event ) { event.Skip(); }
+		virtual void menuZoomFit( wxCommandEvent& event ) { event.Skip(); }
+		virtual void menuShowGrid( wxCommandEvent& event ) { event.Skip(); }
+		virtual void menuShowGridState( wxUpdateUIEvent& event ) { event.Skip(); }
 		virtual void onSignalDblClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onSimulate( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onPlaceProbe( wxCommandEvent& event ) { event.Skip(); }
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index cd8ccaa3a6..0369e5800a 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -99,6 +99,21 @@ void SIM_PLOT_PANEL::DeleteTraces()
 }
 
 
+void SIM_PLOT_PANEL::ShowGrid( bool aEnable )
+{
+    m_axis_x->SetTicks( !aEnable );
+    m_axis_y->SetTicks( !aEnable );
+    UpdateAll();
+}
+
+
+bool SIM_PLOT_PANEL::IsGridShown() const
+{
+    assert( m_axis_x->GetTicks() == m_axis_y->GetTicks() );
+    return !m_axis_x->GetTicks();
+}
+
+
 wxColour SIM_PLOT_PANEL::generateColor()
 {
     /// @todo have a look at:
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index c3f7a568f4..b484d8ef0e 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -65,6 +65,10 @@ public:
         return m_traces;
     }
 
+    void ShowGrid( bool aEnable = true );
+
+    bool IsGridShown() const;
+
 private:
     wxColour generateColor();
 

From ba99dfdabfc30d6d47fb1d4565947bd384eee14f Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:22 +0200
Subject: [PATCH 044/197] CURSOR class for simulation plot

---
 eeschema/sim/sim_plot_panel.cpp | 61 ++++++++++++++++++++++
 eeschema/sim/sim_plot_panel.h   | 91 ++++++++++++++++++++++++++-------
 2 files changed, 133 insertions(+), 19 deletions(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 0369e5800a..e353730353 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -28,6 +28,67 @@
 #include <algorithm>
 #include <limits>
 
+
+void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
+{
+    if( !m_visible )
+        return;
+
+    const auto& dataX = m_trace->GetDataX();
+    const auto& dataY = m_trace->GetDataY();
+
+    if( dataX.size() <= 1 )
+        return;
+
+    if( m_moved )
+    {
+        m_coords.x = aWindow.p2x( m_dim.x );
+
+        // Find the closest point coordinates
+        auto maxXIt = std::upper_bound( dataX.begin(), dataX.end(), m_coords.x );
+        int maxIdx = maxXIt - dataX.begin();
+        int minIdx = maxIdx - 1;
+
+        // Out of bounds checks
+        if( minIdx < 0 )
+        {
+            minIdx = 0;
+            maxIdx = 1;
+            m_coords.x = dataX[0];
+        }
+        else if( maxIdx >= (int) dataX.size() )
+        {
+            maxIdx = dataX.size() - 1;
+            minIdx = maxIdx - 1;
+            m_coords.x = dataX[maxIdx];
+        }
+
+        const double leftX = dataX[minIdx];
+        const double rightX = dataX[maxIdx];
+        const double leftY = dataY[minIdx];
+        const double rightY = dataY[maxIdx];
+
+        m_coords.y = leftY + ( rightY - leftY ) / ( rightX - leftX ) * ( m_coords.x - leftX );
+        m_moved = false;
+    }
+    else
+    {
+        UpdateReference();
+    }
+
+    // Line length in horizontal and vertical dimensions
+    const int horLen = aWindow.GetScrX();
+    const int verLen = aWindow.GetScrY();
+
+    const wxPoint cursorPos( m_window->x2p( m_coords.x ), m_window->y2p( m_coords.y ) );
+
+    aDC.SetPen( wxPen( *wxBLACK, 1, m_continuous ? wxSOLID : wxLONG_DASH ) );
+
+    aDC.DrawLine( -horLen, cursorPos.y, horLen, cursorPos.y );
+    aDC.DrawLine( cursorPos.x, -verLen, cursorPos.x, verLen );
+}
+
+
 SIM_PLOT_PANEL::SIM_PLOT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint& pos,
                 const wxSize& size, long style, const wxString& name )
     : mpWindow( parent, id, pos, size, style ), m_colorIdx( 0 )
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index b484d8ef0e..0b73f44168 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -28,6 +28,78 @@
 
 #include <widgets/mathplot.h>
 
+class TRACE : public mpFXYVector
+{
+public:
+    TRACE( const wxString& aTitle, const wxString& aSpiceName )
+        : mpFXYVector( aTitle ), m_spiceName( aSpiceName )
+    {
+        SetContinuity( true );
+        ShowName( false );
+    }
+
+    const wxString& GetSpiceName() const
+    {
+        return m_spiceName;
+    }
+
+    const std::vector<double>& GetDataX() const
+    {
+        return m_xs;
+    }
+
+    const std::vector<double>& GetDataY() const
+    {
+        return m_ys;
+    }
+
+private:
+    wxString m_spiceName;
+};
+
+class CURSOR : public mpInfoLayer
+{
+public:
+    CURSOR( const TRACE* aTrace, mpWindow* aWindow )
+        : mpInfoLayer( wxRect( 0, 0, DRAG_MARGIN, DRAG_MARGIN ), wxTRANSPARENT_BRUSH ),
+        m_trace( aTrace ), m_moved( false ), m_coords( 0.0, 0.0 ), m_window( aWindow )
+    {
+    }
+
+    void Plot( wxDC& aDC, mpWindow& aWindow ) override;
+
+    bool Inside( wxPoint& aPoint )
+    {
+        return ( std::abs( aPoint.x - m_window->x2p( m_coords.x ) ) <= DRAG_MARGIN )
+            && ( std::abs( aPoint.y - m_window->y2p( m_coords.y ) ) <= DRAG_MARGIN );
+    }
+
+    void Move( wxPoint aDelta ) override
+    {
+        m_moved = true;
+        mpInfoLayer::Move( aDelta );
+    }
+
+    void UpdateReference()
+    {
+        m_reference.x = m_window->x2p( m_coords.x );
+        m_reference.y = m_window->y2p( m_coords.y );
+    }
+
+    const wxRealPoint& GetCoords() const
+    {
+        return m_coords;
+    }
+
+private:
+    const TRACE* m_trace;
+    bool m_moved;
+    wxRealPoint m_coords;
+    mpWindow* m_window;
+
+    const int DRAG_MARGIN = 10;
+};
+
 class SIM_PLOT_PANEL : public mpWindow
 {
 public:
@@ -41,25 +113,6 @@ public:
 
     void DeleteTraces();
 
-    class TRACE : public mpFXYVector
-    {
-    public:
-        TRACE( const wxString& aTitle, const wxString& aSpiceName )
-            : mpFXYVector( aTitle ), m_spiceName( aSpiceName )
-        {
-            SetContinuity( true );
-            ShowName( false );
-        }
-
-        const wxString& GetSpiceName() const
-        {
-            return m_spiceName;
-        }
-
-    private:
-        wxString m_spiceName;
-    };
-
     const std::vector<TRACE*>& GetTraces() const
     {
         return m_traces;

From 8b61bb4acc6f7ecc9595a2e59e6b53494a9aee73 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:24 +0200
Subject: [PATCH 045/197] Signals toggling in SIM_PLOT_PANEL

---
 eeschema/sim/sim_plot_frame.cpp | 17 ++++++++++-----
 eeschema/sim/sim_plot_frame.h   |  4 ++--
 eeschema/sim/sim_plot_panel.cpp | 38 ++++++++++++++++++++++++---------
 eeschema/sim/sim_plot_panel.h   | 20 +++++++++++------
 4 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 3f54ecdf09..7f92555bff 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -157,7 +157,7 @@ bool SIM_PLOT_FRAME::isSimulationRunning()
 }
 
 
-void SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aTitle, SIM_PLOT_PANEL* aPanel )
+void SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aName, SIM_PLOT_PANEL* aPanel )
 {
     auto data_y = m_simulator->GetPlot( (const char*) aSpiceName.c_str() );
     auto data_t = m_simulator->GetPlot( "time" );
@@ -165,7 +165,7 @@ void SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aTi
     if( data_y.empty() || data_t.empty() )
         return;
 
-    aPanel->AddTrace( aSpiceName, aTitle, data_t.size(), data_t.data(), data_y.data(), 0 );
+    aPanel->AddTrace( aSpiceName, aName, data_t.size(), data_t.data(), data_y.data(), 0 );
 }
 
 
@@ -219,11 +219,18 @@ void SIM_PLOT_FRAME::menuShowGridState( wxUpdateUIEvent& event )
 void SIM_PLOT_FRAME::onSignalDblClick( wxCommandEvent& event )
 {
     int idx = m_signals->GetSelection();
+    SIM_PLOT_PANEL* plot = currentPlot();
 
     if( idx != wxNOT_FOUND )
     {
-        AddVoltagePlot( m_signals->GetString( idx ) );
-        currentPlot()->Fit();
+        const wxString& netName = m_signals->GetString( idx );
+
+        if( plot->IsShown( netName ) )
+            plot->DeleteTrace( netName );
+        else
+            AddVoltagePlot( netName );
+
+        plot->Fit();
     }
 }
 
@@ -283,7 +290,7 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
         SIM_PLOT_PANEL* plotPanel = static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetPage( i ) );
 
         for( const auto& trace : plotPanel->GetTraces() )
-            updatePlot( trace->GetSpiceName(), trace->GetName(), plotPanel );
+            updatePlot( trace.second->GetSpiceName(), trace.second->GetName(), plotPanel );
     }
 }
 
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index b3c4197c43..f70fdb32a8 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -68,10 +68,10 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
          * the plot, it will be added.
          * @param aSpiceName is the plot name in the format accepted by the current simulator instance
          * (for NGSPICE it is e.g. "V(1)").
-         * @param aTitle is the name used in the legend.
+         * @param aName is the name used in the legend.
          * @param aPanel is the panel that should receive the update.
          */
-        void updatePlot( const wxString& aSpiceName, const wxString& aTitle, SIM_PLOT_PANEL* aPanel );
+        void updatePlot( const wxString& aSpiceName, const wxString& aName, SIM_PLOT_PANEL* aPanel );
 
         /**
          * @brief Returns node number for a given net.
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index e353730353..180cf043fc 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -118,21 +118,21 @@ SIM_PLOT_PANEL::~SIM_PLOT_PANEL()
 }
 
 
-void SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aTitle, int aPoints,
+bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName, int aPoints,
                                 const double* aT, const double* aY, int aFlags )
 {
     TRACE* t = NULL;
 
     // Find previous entry, if there is one
-    auto it = std::find_if( m_traces.begin(), m_traces.end(),
-            [&](const TRACE* t) { return t->GetName() == aTitle; });
+    auto prev = m_traces.find( aName );
+    bool addedNewEntry = ( prev == m_traces.end() );
 
-    if( it == m_traces.end() )
+    if( addedNewEntry )
     {
         // New entry
-        t = new TRACE( aTitle, aSpiceName );
+        t = new TRACE( aName, aSpiceName );
         t->SetPen( wxPen( generateColor(), 1, wxSOLID ) );
-        m_traces.push_back( t );
+        m_traces[aName] = t;
 
         // It is a trick to keep legend always on the top
         DelLayer( m_legend );
@@ -141,19 +141,37 @@ void SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aTitl
     }
     else
     {
-        t = *it;
+        t = prev->second;
     }
 
     t->SetData( std::vector<double>( aT, aT + aPoints ), std::vector<double>( aY, aY + aPoints ) );
     UpdateAll();
+
+    return addedNewEntry;
 }
 
 
-void SIM_PLOT_PANEL::DeleteTraces()
+bool SIM_PLOT_PANEL::DeleteTrace( const wxString& aName )
 {
-    for( TRACE* t : m_traces )
+    auto trace = m_traces.find( aName );
+
+    if( trace != m_traces.end() )
     {
-        DelLayer( t, true );
+        m_traces.erase( trace );
+        DelLayer( trace->second, true, true );
+
+        return true;
+    }
+
+    return false;
+}
+
+
+void SIM_PLOT_PANEL::DeleteAllTraces()
+{
+    for( auto& t : m_traces )
+    {
+        DelLayer( t.second, true );
     }
 
     m_traces.clear();
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 0b73f44168..2e55336792 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -27,12 +27,13 @@
 #define __SIM_PLOT_PANEL_H
 
 #include <widgets/mathplot.h>
+#include <map>
 
 class TRACE : public mpFXYVector
 {
 public:
-    TRACE( const wxString& aTitle, const wxString& aSpiceName )
-        : mpFXYVector( aTitle ), m_spiceName( aSpiceName )
+    TRACE( const wxString& aName, const wxString& aSpiceName )
+        : mpFXYVector( aName ), m_spiceName( aSpiceName )
     {
         SetContinuity( true );
         ShowName( false );
@@ -108,12 +109,19 @@ public:
 
     ~SIM_PLOT_PANEL();
 
-    void AddTrace( const wxString& aSpiceName, const wxString& aTitle, int aPoints,
+    bool AddTrace( const wxString& aSpiceName, const wxString& aName, int aPoints,
                     const double* aT, const double* aY, int aFlags );
 
-    void DeleteTraces();
+    bool DeleteTrace( const wxString& aName );
 
-    const std::vector<TRACE*>& GetTraces() const
+    bool IsShown( const wxString& aName ) const
+    {
+        return ( m_traces.count( aName ) != 0 );
+    }
+
+    void DeleteAllTraces();
+
+    const std::map<wxString, TRACE*>& GetTraces() const
     {
         return m_traces;
     }
@@ -128,7 +136,7 @@ private:
     unsigned int m_colorIdx;
 
     // Traces to be plotted
-    std::vector<TRACE*> m_traces;
+    std::map<wxString, TRACE*> m_traces;
 
     mpScaleX* m_axis_x;
     mpScaleY* m_axis_y;

From 0b0885f6cd5d3258786da3cc2669a40050e418be Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:24 +0200
Subject: [PATCH 046/197] Removed 'Parameters' listbox, expanded 'Signals' list

---
 eeschema/sim/sim_plot_frame_base.cpp |   9 +-
 eeschema/sim/sim_plot_frame_base.fbp | 205 +++------------------------
 eeschema/sim/sim_plot_frame_base.h   |   2 -
 3 files changed, 18 insertions(+), 198 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index e6e8f2193c..cfb4b4475d 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -94,14 +94,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	bSizer7->Add( m_staticText2, 0, wxALL|wxEXPAND, 5 );
 	
 	m_signals = new wxListBox( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_SORT ); 
-	bSizer7->Add( m_signals, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticText21 = new wxStaticText( m_panel7, wxID_ANY, _("Parameters"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText21->Wrap( -1 );
-	bSizer7->Add( m_staticText21, 0, wxALL|wxEXPAND, 5 );
-	
-	m_signals1 = new wxListBox( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_MULTIPLE|wxLB_SORT ); 
-	bSizer7->Add( m_signals1, 0, wxALL|wxEXPAND, 5 );
+	bSizer7->Add( m_signals, 1, wxALL|wxEXPAND, 5 );
 	
 	wxFlexGridSizer* fgSizer1;
 	fgSizer1 = new wxFlexGridSizer( 1, 0, 0, 0 );
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index 100d9c50ca..e837859bb3 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -133,7 +133,7 @@
                 <event name="OnSetFocus"></event>
                 <event name="OnSize"></event>
                 <event name="OnUpdateUI"></event>
-                <object class="wxMenu" expanded="1">
+                <object class="wxMenu" expanded="0">
                     <property name="label">File</property>
                     <property name="name">m_fileMenu</property>
                     <property name="permission">protected</property>
@@ -206,7 +206,7 @@
                         <event name="OnUpdateUI"></event>
                     </object>
                 </object>
-                <object class="wxMenu" expanded="1">
+                <object class="wxMenu" expanded="0">
                     <property name="label">View</property>
                     <property name="name">m_viewMenu</property>
                     <property name="permission">protected</property>
@@ -281,11 +281,11 @@
                 <property name="name">bSizer1</property>
                 <property name="orient">wxVERTICAL</property>
                 <property name="permission">none</property>
-                <object class="sizeritem" expanded="1">
+                <object class="sizeritem" expanded="0">
                     <property name="border">5</property>
                     <property name="flag">wxEXPAND | wxALL</property>
                     <property name="proportion">3</property>
-                    <object class="wxPanel" expanded="1">
+                    <object class="wxPanel" expanded="0">
                         <property name="BottomDockable">1</property>
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
@@ -359,16 +359,16 @@
                         <event name="OnSetFocus"></event>
                         <event name="OnSize"></event>
                         <event name="OnUpdateUI"></event>
-                        <object class="wxBoxSizer" expanded="1">
+                        <object class="wxBoxSizer" expanded="0">
                             <property name="minimum_size"></property>
                             <property name="name">bSizer5</property>
                             <property name="orient">wxHORIZONTAL</property>
                             <property name="permission">none</property>
-                            <object class="sizeritem" expanded="1">
+                            <object class="sizeritem" expanded="0">
                                 <property name="border">5</property>
                                 <property name="flag">wxEXPAND | wxALL</property>
                                 <property name="proportion">3</property>
-                                <object class="wxPanel" expanded="1">
+                                <object class="wxPanel" expanded="0">
                                     <property name="BottomDockable">1</property>
                                     <property name="LeftDockable">1</property>
                                     <property name="RightDockable">1</property>
@@ -542,11 +542,11 @@
                                     </object>
                                 </object>
                             </object>
-                            <object class="sizeritem" expanded="1">
+                            <object class="sizeritem" expanded="0">
                                 <property name="border">5</property>
                                 <property name="flag">wxEXPAND | wxALL</property>
                                 <property name="proportion">1</property>
-                                <object class="wxPanel" expanded="1">
+                                <object class="wxPanel" expanded="0">
                                     <property name="BottomDockable">1</property>
                                     <property name="LeftDockable">1</property>
                                     <property name="RightDockable">1</property>
@@ -620,7 +620,7 @@
                                     <event name="OnSetFocus"></event>
                                     <event name="OnSize"></event>
                                     <event name="OnUpdateUI"></event>
-                                    <object class="wxBoxSizer" expanded="1">
+                                    <object class="wxBoxSizer" expanded="0">
                                         <property name="minimum_size"></property>
                                         <property name="name">bSizer7</property>
                                         <property name="orient">wxVERTICAL</property>
@@ -711,7 +711,7 @@
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">0</property>
+                                            <property name="proportion">1</property>
                                             <object class="wxListBox" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
@@ -800,178 +800,7 @@
                                             <property name="border">5</property>
                                             <property name="flag">wxALL|wxEXPAND</property>
                                             <property name="proportion">0</property>
-                                            <object class="wxStaticText" expanded="0">
-                                                <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_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</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="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="label">Parameters</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">m_staticText21</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style">wxALIGN_CENTRE</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"></property>
-                                                <property name="wrap">-1</property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
-                                        <object class="sizeritem" expanded="0">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">0</property>
-                                            <object class="wxListBox" expanded="0">
-                                                <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_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</property>
-                                                <property name="center_pane">0</property>
-                                                <property name="choices"></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="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">m_signals1</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style">wxLB_MULTIPLE|wxLB_SORT</property>
-                                                <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>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnListBox"></event>
-                                                <event name="OnListBoxDClick"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
-                                        <object class="sizeritem" expanded="1">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">0</property>
-                                            <object class="wxFlexGridSizer" expanded="1">
+                                            <object class="wxFlexGridSizer" expanded="0">
                                                 <property name="cols">0</property>
                                                 <property name="flexible_direction">wxBOTH</property>
                                                 <property name="growablecols"></property>
@@ -983,11 +812,11 @@
                                                 <property name="permission">none</property>
                                                 <property name="rows">1</property>
                                                 <property name="vgap">0</property>
-                                                <object class="sizeritem" expanded="1">
+                                                <object class="sizeritem" expanded="0">
                                                     <property name="border">5</property>
                                                     <property name="flag">wxALL</property>
                                                     <property name="proportion">0</property>
-                                                    <object class="wxButton" expanded="1">
+                                                    <object class="wxButton" expanded="0">
                                                         <property name="BottomDockable">1</property>
                                                         <property name="LeftDockable">1</property>
                                                         <property name="RightDockable">1</property>
@@ -1255,11 +1084,11 @@
                         </object>
                     </object>
                 </object>
-                <object class="sizeritem" expanded="1">
+                <object class="sizeritem" expanded="0">
                     <property name="border">5</property>
                     <property name="flag">wxEXPAND | wxALL</property>
                     <property name="proportion">1</property>
-                    <object class="wxPanel" expanded="1">
+                    <object class="wxPanel" expanded="0">
                         <property name="BottomDockable">1</property>
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
@@ -1333,7 +1162,7 @@
                         <event name="OnSetFocus"></event>
                         <event name="OnSize"></event>
                         <event name="OnUpdateUI"></event>
-                        <object class="wxBoxSizer" expanded="1">
+                        <object class="wxBoxSizer" expanded="0">
                             <property name="minimum_size"></property>
                             <property name="name">bSizer3</property>
                             <property name="orient">wxVERTICAL</property>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index f6e5873060..9e76574943 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -52,8 +52,6 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxPanel* m_panel7;
 		wxStaticText* m_staticText2;
 		wxListBox* m_signals;
-		wxStaticText* m_staticText21;
-		wxListBox* m_signals1;
 		wxButton* m_simulateBtn;
 		wxButton* m_probeBtn;
 		wxButton* m_tuneBtn;

From cd25e620528a66b1c7147c1dcc3a62a2e9436a15 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:24 +0200
Subject: [PATCH 047/197] CURSOR does not take mpWindow* in constructor

---
 eeschema/sim/sim_plot_panel.cpp |  5 ++++-
 eeschema/sim/sim_plot_panel.h   | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 180cf043fc..a2d02e025b 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -31,6 +31,9 @@
 
 void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
 {
+    if( !m_window )
+        m_window = &aWindow;
+
     if( !m_visible )
         return;
 
@@ -80,7 +83,7 @@ void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
     const int horLen = aWindow.GetScrX();
     const int verLen = aWindow.GetScrY();
 
-    const wxPoint cursorPos( m_window->x2p( m_coords.x ), m_window->y2p( m_coords.y ) );
+    const wxPoint cursorPos( aWindow.x2p( m_coords.x ), aWindow.y2p( m_coords.y ) );
 
     aDC.SetPen( wxPen( *wxBLACK, 1, m_continuous ? wxSOLID : wxLONG_DASH ) );
 
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 2e55336792..d25896d755 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -61,9 +61,9 @@ private:
 class CURSOR : public mpInfoLayer
 {
 public:
-    CURSOR( const TRACE* aTrace, mpWindow* aWindow )
+    CURSOR( const TRACE* aTrace )
         : mpInfoLayer( wxRect( 0, 0, DRAG_MARGIN, DRAG_MARGIN ), wxTRANSPARENT_BRUSH ),
-        m_trace( aTrace ), m_moved( false ), m_coords( 0.0, 0.0 ), m_window( aWindow )
+        m_trace( aTrace ), m_moved( false ), m_coords( 0.0, 0.0 ), m_window( nullptr )
     {
     }
 
@@ -71,6 +71,9 @@ public:
 
     bool Inside( wxPoint& aPoint )
     {
+        if( !m_window )
+            return false;
+
         return ( std::abs( aPoint.x - m_window->x2p( m_coords.x ) ) <= DRAG_MARGIN )
             && ( std::abs( aPoint.y - m_window->y2p( m_coords.y ) ) <= DRAG_MARGIN );
     }
@@ -83,6 +86,9 @@ public:
 
     void UpdateReference()
     {
+        if( !m_window )
+            return;
+
         m_reference.x = m_window->x2p( m_coords.x );
         m_reference.y = m_window->y2p( m_coords.y );
     }

From 88adcc894a82d7346d99651ece7da28c6726791a Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:25 +0200
Subject: [PATCH 048/197] SIM_PLOT_FRAME::CurrentPlot() made public

---
 eeschema/sim/sim_plot_frame.cpp | 16 ++++++++--------
 eeschema/sim/sim_plot_frame.h   |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 7f92555bff..b459d69052 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -141,11 +141,11 @@ void SIM_PLOT_FRAME::AddVoltagePlot( const wxString& aNetName )
 
     if( nodeNumber >= -1 )
     {
-        updatePlot( wxString::Format( "V(%d)", nodeNumber ), aNetName, currentPlot() );
+        updatePlot( wxString::Format( "V(%d)", nodeNumber ), aNetName, CurrentPlot() );
     }
 }
 
-SIM_PLOT_PANEL* SIM_PLOT_FRAME::currentPlot() const
+SIM_PLOT_PANEL* SIM_PLOT_FRAME::CurrentPlot() const
 {
     return static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetCurrentPage() );
 }
@@ -186,31 +186,31 @@ int SIM_PLOT_FRAME::getNodeNumber( const wxString& aNetName )
 
 void SIM_PLOT_FRAME::menuZoomIn( wxCommandEvent& event )
 {
-    currentPlot()->ZoomIn();
+    CurrentPlot()->ZoomIn();
 }
 
 
 void SIM_PLOT_FRAME::menuZoomOut( wxCommandEvent& event )
 {
-    currentPlot()->ZoomOut();
+    CurrentPlot()->ZoomOut();
 }
 
 
 void SIM_PLOT_FRAME::menuZoomFit( wxCommandEvent& event )
 {
-    currentPlot()->Fit();
+    CurrentPlot()->Fit();
 }
 
 
 void SIM_PLOT_FRAME::menuShowGrid( wxCommandEvent& event )
 {
-    currentPlot()->ShowGrid( !currentPlot()->IsGridShown() );
+    CurrentPlot()->ShowGrid( !CurrentPlot()->IsGridShown() );
 }
 
 
 void SIM_PLOT_FRAME::menuShowGridState( wxUpdateUIEvent& event )
 {
-    SIM_PLOT_PANEL* plotPanel = currentPlot();
+    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
 
     event.Check( plotPanel ? plotPanel->IsGridShown() : false );
 }
@@ -219,7 +219,7 @@ void SIM_PLOT_FRAME::menuShowGridState( wxUpdateUIEvent& event )
 void SIM_PLOT_FRAME::onSignalDblClick( wxCommandEvent& event )
 {
     int idx = m_signals->GetSelection();
-    SIM_PLOT_PANEL* plot = currentPlot();
+    SIM_PLOT_PANEL* plot = CurrentPlot();
 
     if( idx != wxNOT_FOUND )
     {
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index f70fdb32a8..7ebd542f60 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -58,9 +58,9 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void NewPlotPanel();
         void AddVoltagePlot( const wxString& aNetName );
 
-    private:
-        SIM_PLOT_PANEL* currentPlot() const;
+        SIM_PLOT_PANEL* CurrentPlot() const;
 
+    private:
         bool isSimulationRunning();
 
         /**

From d5ce31dc8ed26149b1806a672a93a4a2e6536f8d Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:25 +0200
Subject: [PATCH 049/197] mathplot.h code formatting

---
 include/widgets/mathplot.h | 2342 ++++++++++++++++++------------------
 1 file changed, 1171 insertions(+), 1171 deletions(-)

diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index 42c42a35d2..bef38ede5a 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -15,47 +15,47 @@
 
 /** @file mathplot.h */
 /** @mainpage wxMathPlot
-    wxMathPlot is a framework for mathematical graph plotting in wxWindows.
+  wxMathPlot is a framework for mathematical graph plotting in wxWindows.
 
-    The framework is designed for convenience and ease of use.
+  The framework is designed for convenience and ease of use.
 
-    @section screenshots Screenshots
-    <a href="http://wxmathplot.sourceforge.net/screenshot.shtml">Go to the screenshots page.</a>
+  @section screenshots Screenshots
+  <a href="http://wxmathplot.sourceforge.net/screenshot.shtml">Go to the screenshots page.</a>
 
-    @section overview Overview
-    The heart of wxMathPlot is mpWindow, which is a 2D canvas for plot layers.
-    mpWindow can be embedded as subwindow in a wxPane, a wxFrame, or any other wxWindow.
-    mpWindow provides a zoomable and moveable view of the layers. The current view can
-    be controlled with the mouse, the scrollbars, and a context menu.
+  @section overview Overview
+  The heart of wxMathPlot is mpWindow, which is a 2D canvas for plot layers.
+  mpWindow can be embedded as subwindow in a wxPane, a wxFrame, or any other wxWindow.
+  mpWindow provides a zoomable and moveable view of the layers. The current view can
+  be controlled with the mouse, the scrollbars, and a context menu.
 
-    Plot layers are implementations of the abstract base class mpLayer. Those can
-    be function plots, scale rulers, or any other vector data visualisation. wxMathPlot provides two mpLayer implementations for plotting horizontal and vertical rulers: mpScaleX and mpScaleY.
-    For convenient function plotting a series of classes derived from mpLayer are provided, like mpFX, mpProfile, mpLegend and so on. These base classes already come with plot code, user's own functions can be implemented by overriding just one member for retrieving a function value.
+  Plot layers are implementations of the abstract base class mpLayer. Those can
+  be function plots, scale rulers, or any other vector data visualisation. wxMathPlot provides two mpLayer implementations for plotting horizontal and vertical rulers: mpScaleX and mpScaleY.
+  For convenient function plotting a series of classes derived from mpLayer are provided, like mpFX, mpProfile, mpLegend and so on. These base classes already come with plot code, user's own functions can be implemented by overriding just one member for retrieving a function value.
 
-    mpWindow has built-in support for mouse-based pan and zoom through intuitive combinations of buttons and the mouse wheel. It also incorporates an optional double buffering mechanism to avoid flicker. Plots can be easily sent to printer evices or exported in bitmap formats like PNG, BMP or JPEG.
+  mpWindow has built-in support for mouse-based pan and zoom through intuitive combinations of buttons and the mouse wheel. It also incorporates an optional double buffering mechanism to avoid flicker. Plots can be easily sent to printer evices or exported in bitmap formats like PNG, BMP or JPEG.
 
-    @section coding Coding conventions
-    wxMathPlot sticks to wxWindow's coding conventions. All entities defined by wxMathPlot have the prefix <i>mp</i>.
+  @section coding Coding conventions
+  wxMathPlot sticks to wxWindow's coding conventions. All entities defined by wxMathPlot have the prefix <i>mp</i>.
 
-    @section author Author and license
-    wxMathPlot is published under the terms of the wxWindow license.<br>
-    The original author is David Schalig <mrhill@users.sourceforge.net>.<br>
-    From June 2007 the project is maintained by Davide Rondini <cdron77@users.sourceforge.net>.<br>
-    Authors can be contacted via the wxMathPlot's homepage at
-    https://sourceforge.net/projects/wxmathplot<br>
-    Contributors:<br>
-    Jose Luis Blanco, Val Greene.<br>
+  @section author Author and license
+  wxMathPlot is published under the terms of the wxWindow license.<br>
+  The original author is David Schalig <mrhill@users.sourceforge.net>.<br>
+  From June 2007 the project is maintained by Davide Rondini <cdron77@users.sourceforge.net>.<br>
+  Authors can be contacted via the wxMathPlot's homepage at
+https://sourceforge.net/projects/wxmathplot<br>
+Contributors:<br>
+Jose Luis Blanco, Val Greene.<br>
 */
 
-//this definition uses windows dll to export function. 
-//WXDLLIMPEXP_MATHPLOT definition definition changed to WXDLLIMPEXP_MATHPLOT  
-//mathplot_EXPORTS will be defined by cmake 
-#ifdef mathplot_EXPORTS 
- #define WXDLLIMPEXP_MATHPLOT WXEXPORT 
- #define WXDLLIMPEXP_DATA_MATHPLOT(type) WXEXPORT type 
-#else // not making DLL 
- #define WXDLLIMPEXP_MATHPLOT 
- #define WXDLLIMPEXP_DATA_MATHPLOT(type) type 
+//this definition uses windows dll to export function.
+//WXDLLIMPEXP_MATHPLOT definition definition changed to WXDLLIMPEXP_MATHPLOT
+//mathplot_EXPORTS will be defined by cmake
+#ifdef mathplot_EXPORTS
+#define WXDLLIMPEXP_MATHPLOT WXEXPORT
+#define WXDLLIMPEXP_DATA_MATHPLOT(type) WXEXPORT type
+#else // not making DLL
+#define WXDLLIMPEXP_MATHPLOT
+#define WXDLLIMPEXP_DATA_MATHPLOT(type) type
 #endif
 
 #if defined(__GNUG__) && !defined(__APPLE__)
@@ -132,190 +132,190 @@ typedef enum __mp_Layer_Type {
 } mpLayerType;
 
 /** Plot layer, abstract base class.
-    Any number of mpLayer implementations can be attached to mpWindow.
-    Examples for mpLayer implementations are function graphs, or scale rulers.
+  Any number of mpLayer implementations can be attached to mpWindow.
+  Examples for mpLayer implementations are function graphs, or scale rulers.
 
-    For convenience mpLayer defines a name, a font (wxFont), a pen (wxPen),
-    and a continuity property (bool) as class members.
-    The default values at constructor are the default font, a black pen, and
-     continuity set to false (draw separate points).
-    These may or may not be used by implementations.
-*/
+  For convenience mpLayer defines a name, a font (wxFont), a pen (wxPen),
+  and a continuity property (bool) as class members.
+  The default values at constructor are the default font, a black pen, and
+  continuity set to false (draw separate points).
+  These may or may not be used by implementations.
+  */
 class WXDLLIMPEXP_MATHPLOT mpLayer : public wxObject
 {
-public:
-    mpLayer();
+    public:
+        mpLayer();
 
-    virtual ~mpLayer() {};
+        virtual ~mpLayer() {};
 
-    /** Check whether this layer has a bounding box.
-        The default implementation returns \a TRUE. Override and return
-        FALSE if your mpLayer implementation should be ignored by the calculation
-        of the global bounding box for all layers in a mpWindow.
-        @retval TRUE Has bounding box
-        @retval FALSE Has not bounding box
-    */
-    virtual bool   HasBBox() { return TRUE; }
+        /** Check whether this layer has a bounding box.
+          The default implementation returns \a TRUE. Override and return
+          FALSE if your mpLayer implementation should be ignored by the calculation
+          of the global bounding box for all layers in a mpWindow.
+          @retval TRUE Has bounding box
+          @retval FALSE Has not bounding box
+          */
+        virtual bool   HasBBox() { return TRUE; }
 
-    /** Check whether the layer is an info box.
-        The default implementation returns \a FALSE. It is overrided to \a TRUE for mpInfoLayer
-        class and its derivative. It is necessary to define mouse actions behaviour over
-        info boxes.
-        @return whether the layer is an info boxes
-        @sa mpInfoLayer::IsInfo */
-    virtual bool IsInfo() { return false; };
+        /** Check whether the layer is an info box.
+          The default implementation returns \a FALSE. It is overrided to \a TRUE for mpInfoLayer
+          class and its derivative. It is necessary to define mouse actions behaviour over
+          info boxes.
+          @return whether the layer is an info boxes
+          @sa mpInfoLayer::IsInfo */
+        virtual bool IsInfo() { return false; };
 
-    /** Get inclusive left border of bounding box.
-        @return Value
-    */
-    virtual double GetMinX() { return -1.0; }
+        /** Get inclusive left border of bounding box.
+          @return Value
+          */
+        virtual double GetMinX() { return -1.0; }
 
-    /** Get inclusive right border of bounding box.
-        @return Value
-    */
-    virtual double GetMaxX() { return  1.0; }
+        /** Get inclusive right border of bounding box.
+          @return Value
+          */
+        virtual double GetMaxX() { return  1.0; }
 
-    /** Get inclusive bottom border of bounding box.
-        @return Value
-    */
-    virtual double GetMinY() { return -1.0; }
+        /** Get inclusive bottom border of bounding box.
+          @return Value
+          */
+        virtual double GetMinY() { return -1.0; }
 
-    /** Get inclusive top border of bounding box.
-        @return Value
-    */
-    virtual double GetMaxY() { return  1.0; }
+        /** Get inclusive top border of bounding box.
+          @return Value
+          */
+        virtual double GetMaxY() { return  1.0; }
 
-    /** Plot given view of layer to the given device context.
-        An implementation of this function has to transform layer coordinates to
-        wxDC coordinates based on the view parameters retrievable from the mpWindow
-        passed in \a w. 
-	Note that the public methods of mpWindow: x2p,y2p and p2x,p2y are already provided 
-	which transform layer coordinates to DC pixel coordinates, and <b>user code should rely 
-	on them</b> for portability and future changes to be applied transparently, instead of
-	implementing the following formulas manually.
-	
-	The passed device context \a dc has its coordinate origin set to the top-left corner 
-	of the visible area (the default). The coordinate orientation is as shown in the
-        following picture:
-        <pre>
-        (wxDC origin 0,0)
-               x-------------> ascending X ----------------+
-               |                                           |
-               |                                           |
-               V ascending Y                               |
-	           |                                           |
-	           |                                           |
-	           |                                           |
-	           +-------------------------------------------+  <-- right-bottom corner of the mpWindow visible area.
-        </pre>
-        Note that Y ascends in downward direction, whereas the usual vertical orientation
-        for mathematical plots is vice versa. Thus Y-orientation will be swapped usually,
-        when transforming between wxDC and mpLayer coordinates. This change of coordinates 
-	is taken into account in the methods p2x,p2y,x2p,y2p.
+        /** Plot given view of layer to the given device context.
+          An implementation of this function has to transform layer coordinates to
+          wxDC coordinates based on the view parameters retrievable from the mpWindow
+          passed in \a w.
+          Note that the public methods of mpWindow: x2p,y2p and p2x,p2y are already provided
+          which transform layer coordinates to DC pixel coordinates, and <b>user code should rely
+          on them</b> for portability and future changes to be applied transparently, instead of
+          implementing the following formulas manually.
 
-        <b> Rules for transformation between mpLayer and wxDC coordinates </b>
-        @code
-        dc_X = (layer_X - mpWindow::GetPosX()) * mpWindow::GetScaleX()
-        dc_Y = (mpWindow::GetPosY() - layer_Y) * mpWindow::GetScaleY() // swapping Y-orientation
+          The passed device context \a dc has its coordinate origin set to the top-left corner
+          of the visible area (the default). The coordinate orientation is as shown in the
+          following picture:
+          <pre>
+          (wxDC origin 0,0)
+          x-------------> ascending X ----------------+
+          |                                           |
+          |                                           |
+          V ascending Y                               |
+          |                                           |
+          |                                           |
+          |                                           |
+          +-------------------------------------------+  <-- right-bottom corner of the mpWindow visible area.
+          </pre>
+          Note that Y ascends in downward direction, whereas the usual vertical orientation
+          for mathematical plots is vice versa. Thus Y-orientation will be swapped usually,
+          when transforming between wxDC and mpLayer coordinates. This change of coordinates
+          is taken into account in the methods p2x,p2y,x2p,y2p.
 
-        layer_X = (dc_X / mpWindow::GetScaleX()) + mpWindow::GetPosX() // scale guaranteed to be not 0
-        layer_Y = mpWindow::GetPosY() - (dc_Y / mpWindow::GetScaleY()) // swapping Y-orientation
-        @endcode
+          <b> Rules for transformation between mpLayer and wxDC coordinates </b>
+          @code
+          dc_X = (layer_X - mpWindow::GetPosX()) * mpWindow::GetScaleX()
+          dc_Y = (mpWindow::GetPosY() - layer_Y) * mpWindow::GetScaleY() // swapping Y-orientation
 
-        @param dc Device context to plot to.
-        @param w  View to plot. The visible area can be retrieved from this object.
-	@sa mpWindow::p2x,mpWindow::p2y,mpWindow::x2p,mpWindow::y2p
-    */
-    virtual void   Plot(wxDC & dc, mpWindow & w) = 0;
+          layer_X = (dc_X / mpWindow::GetScaleX()) + mpWindow::GetPosX() // scale guaranteed to be not 0
+          layer_Y = mpWindow::GetPosY() - (dc_Y / mpWindow::GetScaleY()) // swapping Y-orientation
+          @endcode
 
-    /** Get layer name.
-        @return Name
-    */
-    wxString       GetName() const { return m_name; }
+          @param dc Device context to plot to.
+          @param w  View to plot. The visible area can be retrieved from this object.
+          @sa mpWindow::p2x,mpWindow::p2y,mpWindow::x2p,mpWindow::y2p
+          */
+        virtual void   Plot(wxDC & dc, mpWindow & w) = 0;
 
-    /** Get font set for this layer.
-        @return Font
-    */
-    const wxFont&  GetFont() const { return m_font; }
+        /** Get layer name.
+          @return Name
+          */
+        wxString       GetName() const { return m_name; }
 
-    /** Get pen set for this layer.
-        @return Pen
-    */
-    const wxPen&   GetPen()  const { return m_pen;  }
+        /** Get font set for this layer.
+          @return Font
+          */
+        const wxFont&  GetFont() const { return m_font; }
 
-    /** Set the 'continuity' property of the layer (true:draws a continuous line, false:draws separate points).
-      * @sa GetContinuity
-      */
-    void SetContinuity(bool continuity) {m_continuous = continuity;}
+        /** Get pen set for this layer.
+          @return Pen
+          */
+        const wxPen&   GetPen()  const { return m_pen;  }
 
-    /** Gets the 'continuity' property of the layer.
-      * @sa SetContinuity
-      */
-    bool GetContinuity() const {return m_continuous;}
+        /** Set the 'continuity' property of the layer (true:draws a continuous line, false:draws separate points).
+         * @sa GetContinuity
+         */
+        void SetContinuity(bool continuity) {m_continuous = continuity;}
 
-    /** Shows or hides the text label with the name of the layer (default is visible).
-      */
-    void ShowName(bool show) { m_showName = show; };
+        /** Gets the 'continuity' property of the layer.
+         * @sa SetContinuity
+         */
+        bool GetContinuity() const {return m_continuous;}
 
-    /** Set layer name
-        @param name Name, will be copied to internal class member
-    */
-    void SetName(wxString name) { m_name = name; }
+        /** Shows or hides the text label with the name of the layer (default is visible).
+        */
+        void ShowName(bool show) { m_showName = show; };
 
-    /** Set layer font
-        @param font Font, will be copied to internal class member
-    */
-    void SetFont(wxFont& font)  { m_font = font; }
+        /** Set layer name
+          @param name Name, will be copied to internal class member
+          */
+        void SetName(wxString name) { m_name = name; }
 
-    /** Set layer pen
-        @param pen Pen, will be copied to internal class member
-    */
-    void SetPen(wxPen pen)     { m_pen  = pen;  }
+        /** Set layer font
+          @param font Font, will be copied to internal class member
+          */
+        void SetFont(wxFont& font)  { m_font = font; }
 
-    /** Set Draw mode: inside or outside margins. Default is outside, which allows the layer to draw up to the mpWindow border.
-        @param drawModeOutside The draw mode to be set */
-    void SetDrawOutsideMargins(bool drawModeOutside) { m_drawOutsideMargins = drawModeOutside; };
+        /** Set layer pen
+          @param pen Pen, will be copied to internal class member
+          */
+        void SetPen(wxPen pen)     { m_pen  = pen;  }
 
-    /** Get Draw mode: inside or outside margins.
-        @return The draw mode */
-    bool GetDrawOutsideMargins() { return m_drawOutsideMargins; };
+        /** Set Draw mode: inside or outside margins. Default is outside, which allows the layer to draw up to the mpWindow border.
+          @param drawModeOutside The draw mode to be set */
+        void SetDrawOutsideMargins(bool drawModeOutside) { m_drawOutsideMargins = drawModeOutside; };
 
-    /** Get a small square bitmap filled with the colour of the pen used in the layer. Useful to create legends or similar reference to the layers.
-        @param side side length in pixels
-        @return a wxBitmap filled with layer's colour */
-    wxBitmap GetColourSquare(int side = 16);
+        /** Get Draw mode: inside or outside margins.
+          @return The draw mode */
+        bool GetDrawOutsideMargins() { return m_drawOutsideMargins; };
 
-    /** Get layer type: a Layer can be of different types: plot lines, axis, info boxes, etc, this method returns the right value.
-        @return An integer indicating layer type */
-    mpLayerType GetLayerType() { return m_type; };
-	
-    /** Checks whether the layer is visible or not.
-        @return \a true if visible */
-    bool IsVisible() {return m_visible; };
+        /** Get a small square bitmap filled with the colour of the pen used in the layer. Useful to create legends or similar reference to the layers.
+          @param side side length in pixels
+          @return a wxBitmap filled with layer's colour */
+        wxBitmap GetColourSquare(int side = 16);
 
-    /** Sets layer visibility.
-        @param show visibility bool. */
-    void SetVisible(bool show) { m_visible = show; };
-	
-	/** Get brush set for this layer.
-		@return brush. */
-	const wxBrush&   GetBrush() const { return m_brush; };
-	
-	/** Set layer brush
-		@param brush brush, will be copied to internal class member	*/
-	void SetBrush(wxBrush brush) { m_brush = brush; };
+        /** Get layer type: a Layer can be of different types: plot lines, axis, info boxes, etc, this method returns the right value.
+          @return An integer indicating layer type */
+        mpLayerType GetLayerType() { return m_type; };
 
-protected:
-    wxFont   m_font;    //!< Layer's font
-    wxPen    m_pen;     //!< Layer's pen
-	wxBrush  m_brush;       //!< Layer's brush
-    wxString m_name;    //!< Layer's name
-    bool     m_continuous; //!< Specify if the layer will be plotted as a continuous line or a set of points.
-    bool     m_showName;  //!< States whether the name of the layer must be shown (default is true).
-    bool     m_drawOutsideMargins; //!< select if the layer should draw only inside margins or over all DC
-    mpLayerType m_type; //!< Define layer type, which is assigned by constructor
-	bool 	m_visible;	//!< Toggles layer visibility
-    DECLARE_DYNAMIC_CLASS(mpLayer)
+        /** Checks whether the layer is visible or not.
+          @return \a true if visible */
+        bool IsVisible() {return m_visible; };
+
+        /** Sets layer visibility.
+          @param show visibility bool. */
+        void SetVisible(bool show) { m_visible = show; };
+
+        /** Get brush set for this layer.
+          @return brush. */
+        const wxBrush&   GetBrush() const { return m_brush; };
+
+        /** Set layer brush
+          @param brush brush, will be copied to internal class member	*/
+        void SetBrush(wxBrush brush) { m_brush = brush; };
+
+    protected:
+        wxFont   m_font;    //!< Layer's font
+        wxPen    m_pen;     //!< Layer's pen
+        wxBrush  m_brush;       //!< Layer's brush
+        wxString m_name;    //!< Layer's name
+        bool     m_continuous; //!< Specify if the layer will be plotted as a continuous line or a set of points.
+        bool     m_showName;  //!< States whether the name of the layer must be shown (default is true).
+        bool     m_drawOutsideMargins; //!< select if the layer should draw only inside margins or over all DC
+        mpLayerType m_type; //!< Define layer type, which is assigned by constructor
+        bool 	m_visible;	//!< Toggles layer visibility
+        DECLARE_DYNAMIC_CLASS(mpLayer)
 };
 
 
@@ -324,139 +324,139 @@ protected:
 //-----------------------------------------------------------------------------
 
 /** @class mpInfoLayer
-    @brief Base class to create small rectangular info boxes
-    mpInfoLayer is the base class to create a small rectangular info box in transparent overlay over plot layers. It is used to implement objects like legends.
-*/
+  @brief Base class to create small rectangular info boxes
+  mpInfoLayer is the base class to create a small rectangular info box in transparent overlay over plot layers. It is used to implement objects like legends.
+  */
 class WXDLLIMPEXP_MATHPLOT mpInfoLayer : public mpLayer
 {
-public:
-    /** Default constructor. */
-    mpInfoLayer();
+    public:
+        /** Default constructor. */
+        mpInfoLayer();
 
-    /** Complete constructor.
-        @param rect Sets the initial size rectangle of the layer.
-        @param brush pointer to a fill brush. Default is transparent */
-    mpInfoLayer(wxRect rect, const wxBrush* brush = wxTRANSPARENT_BRUSH);
+        /** Complete constructor.
+          @param rect Sets the initial size rectangle of the layer.
+          @param brush pointer to a fill brush. Default is transparent */
+        mpInfoLayer(wxRect rect, const wxBrush* brush = wxTRANSPARENT_BRUSH);
 
-    /** Destructor */
-    virtual ~mpInfoLayer();
+        /** Destructor */
+        virtual ~mpInfoLayer();
 
-    /** Updates the content of the info box. Should be overidden by derived classes.
-        Update may behave in different ways according to the type of event which called it.
-        @param w parent mpWindow from which to obtain informations
-        @param event The event which called the update. */
-    virtual void UpdateInfo(mpWindow& w, wxEvent& event);
+        /** Updates the content of the info box. Should be overidden by derived classes.
+          Update may behave in different ways according to the type of event which called it.
+          @param w parent mpWindow from which to obtain informations
+          @param event The event which called the update. */
+        virtual void UpdateInfo(mpWindow& w, wxEvent& event);
 
-    /** mpInfoLayer has not bounding box. @sa mpLayer::HasBBox
-        @return always \a FALSE */
-    virtual bool HasBBox() { return false; };
+        /** mpInfoLayer has not bounding box. @sa mpLayer::HasBBox
+          @return always \a FALSE */
+        virtual bool HasBBox() { return false; };
 
-    /** Plot method. Can be overidden by derived classes.
-        @param dc the device content where to plot
-        @param w the window to plot
-        @sa mpLayer::Plot */
-    virtual void   Plot(wxDC & dc, mpWindow & w);
+        /** Plot method. Can be overidden by derived classes.
+          @param dc the device content where to plot
+          @param w the window to plot
+          @sa mpLayer::Plot */
+        virtual void   Plot(wxDC & dc, mpWindow & w);
 
-    /** Specifies that this is an Info box layer.
-        @return always \a TRUE
-        @sa mpLayer::IsInfo */
-    virtual bool IsInfo() { return true; };
+        /** Specifies that this is an Info box layer.
+          @return always \a TRUE
+          @sa mpLayer::IsInfo */
+        virtual bool IsInfo() { return true; };
 
-    /** Checks whether a point is inside the info box rectangle.
-        @param point The point to be checked
-        @return \a true if the point is inside the bounding box */
-    virtual bool Inside(wxPoint& point);
+        /** Checks whether a point is inside the info box rectangle.
+          @param point The point to be checked
+          @return \a true if the point is inside the bounding box */
+        virtual bool Inside(wxPoint& point);
 
-    /** Moves the layer rectangle of given pixel deltas.
-        @param delta The wxPoint container for delta coordinates along x and y. Units are in pixels. */
-    virtual void Move(wxPoint delta);
+        /** Moves the layer rectangle of given pixel deltas.
+          @param delta The wxPoint container for delta coordinates along x and y. Units are in pixels. */
+        virtual void Move(wxPoint delta);
 
-    /** Updates the rectangle reference point. Used by internal methods of mpWindow to correctly move mpInfoLayers. */
-    virtual void UpdateReference();
+        /** Updates the rectangle reference point. Used by internal methods of mpWindow to correctly move mpInfoLayers. */
+        virtual void UpdateReference();
 
-    /** Returns the position of the upper left corner of the box (in pixels)
-        @return The rectangle position */
-    wxPoint GetPosition();
+        /** Returns the position of the upper left corner of the box (in pixels)
+          @return The rectangle position */
+        wxPoint GetPosition();
 
-    /** Returns the size of the box (in pixels)
-        @return The rectangle size */
-    wxSize GetSize();
-	
-	/** Returns the current rectangle coordinates.
-	    @return The info layer rectangle */
-	const wxRect& GetRectangle() { return m_dim; };
+        /** Returns the size of the box (in pixels)
+          @return The rectangle size */
+        wxSize GetSize();
 
-protected:
-    wxRect m_dim;           //!< The bounding rectangle of the box. It may be resized dynamically by the Plot method.
-    wxPoint m_reference;    //!< Holds the reference point for movements
-    wxBrush m_brush;        //!< The brush to be used for the background
-    int m_winX, m_winY;     //!< Holds the mpWindow size. Used to rescale position when window is resized.
-    
-    DECLARE_DYNAMIC_CLASS(mpInfoLayer)
+        /** Returns the current rectangle coordinates.
+          @return The info layer rectangle */
+        const wxRect& GetRectangle() { return m_dim; };
+
+    protected:
+        wxRect m_dim;           //!< The bounding rectangle of the box. It may be resized dynamically by the Plot method.
+        wxPoint m_reference;    //!< Holds the reference point for movements
+        wxBrush m_brush;        //!< The brush to be used for the background
+        int m_winX, m_winY;     //!< Holds the mpWindow size. Used to rescale position when window is resized.
+
+        DECLARE_DYNAMIC_CLASS(mpInfoLayer)
 };
 
 /** @class mpInfoCoords
-    @brief Implements an overlay box which shows the mouse coordinates in plot units.
-    When an mpInfoCoords layer is activated, when mouse is moved over the mpWindow, its coordinates (in mpWindow units, not pixels) are continuously reported inside the layer box. */
+  @brief Implements an overlay box which shows the mouse coordinates in plot units.
+  When an mpInfoCoords layer is activated, when mouse is moved over the mpWindow, its coordinates (in mpWindow units, not pixels) are continuously reported inside the layer box. */
 class WXDLLIMPEXP_MATHPLOT mpInfoCoords : public mpInfoLayer
 {
-public:
-    /** Default constructor */
-    mpInfoCoords();
-    /** Complete constructor, setting initial rectangle and background brush.
-        @param rect The initial bounding rectangle.
-        @param brush The wxBrush to be used for box background: default is transparent */
-    mpInfoCoords(wxRect rect, const wxBrush* brush = wxTRANSPARENT_BRUSH);
+    public:
+        /** Default constructor */
+        mpInfoCoords();
+        /** Complete constructor, setting initial rectangle and background brush.
+          @param rect The initial bounding rectangle.
+          @param brush The wxBrush to be used for box background: default is transparent */
+        mpInfoCoords(wxRect rect, const wxBrush* brush = wxTRANSPARENT_BRUSH);
 
-    /** Default destructor */
-    ~mpInfoCoords();
+        /** Default destructor */
+        ~mpInfoCoords();
 
-    /** Updates the content of the info box. It is used to update coordinates.
-        @param w parent mpWindow from which to obtain information
-        @param event The event which called the update. */
-    virtual void UpdateInfo(mpWindow& w, wxEvent& event);
+        /** Updates the content of the info box. It is used to update coordinates.
+          @param w parent mpWindow from which to obtain information
+          @param event The event which called the update. */
+        virtual void UpdateInfo(mpWindow& w, wxEvent& event);
 
-    /** Plot method.
-        @param dc the device content where to plot
-        @param w the window to plot
-        @sa mpLayer::Plot */
-    virtual void   Plot(wxDC & dc, mpWindow & w);
+        /** Plot method.
+          @param dc the device content where to plot
+          @param w the window to plot
+          @sa mpLayer::Plot */
+        virtual void   Plot(wxDC & dc, mpWindow & w);
 
-protected:
-    wxString m_content; //!< string holding the coordinates to be drawn.
+    protected:
+        wxString m_content; //!< string holding the coordinates to be drawn.
 };
 
 /** @class mpInfoLegend
-    @brief Implements the legend to be added to the plot
-    This layer allows you to add a legend to describe the plots in the window. The legend uses the layer name as a label, and displays only layers of type mpLAYER_PLOT. */
+  @brief Implements the legend to be added to the plot
+  This layer allows you to add a legend to describe the plots in the window. The legend uses the layer name as a label, and displays only layers of type mpLAYER_PLOT. */
 class WXDLLIMPEXP_MATHPLOT mpInfoLegend : public mpInfoLayer
 {
-public:
-    /** Default constructor */
-    mpInfoLegend();
+    public:
+        /** Default constructor */
+        mpInfoLegend();
 
-    /** Complete constructor, setting initial rectangle and background brush.
-        @param rect The initial bounding rectangle.
-        @param brush The wxBrush to be used for box background: default is transparent
-        @sa mpInfoLayer::mpInfoLayer */
-    mpInfoLegend(wxRect rect, const wxBrush* brush = wxTRANSPARENT_BRUSH);
+        /** Complete constructor, setting initial rectangle and background brush.
+          @param rect The initial bounding rectangle.
+          @param brush The wxBrush to be used for box background: default is transparent
+          @sa mpInfoLayer::mpInfoLayer */
+        mpInfoLegend(wxRect rect, const wxBrush* brush = wxTRANSPARENT_BRUSH);
 
-    /**  Default destructor */
-    ~mpInfoLegend();
+        /**  Default destructor */
+        ~mpInfoLegend();
 
-    /** Updates the content of the info box. Unused in this class.
-        @param w parent mpWindow from which to obtain information
-        @param event The event which called the update. */
-    virtual void UpdateInfo(mpWindow& w, wxEvent& event);
+        /** Updates the content of the info box. Unused in this class.
+          @param w parent mpWindow from which to obtain information
+          @param event The event which called the update. */
+        virtual void UpdateInfo(mpWindow& w, wxEvent& event);
 
-    /** Plot method.
-        @param dc the device content where to plot
-        @param w the window to plot
-        @sa mpLayer::Plot */
-    virtual void   Plot(wxDC & dc, mpWindow & w);
+        /** Plot method.
+          @param dc the device content where to plot
+          @param w the window to plot
+          @sa mpLayer::Plot */
+        virtual void   Plot(wxDC & dc, mpWindow & w);
+
+    protected:
 
-protected:
-    
 };
 
 
@@ -465,7 +465,7 @@ protected:
 //-----------------------------------------------------------------------------
 
 /** @name Label alignment constants
-@{*/
+  @{*/
 
 /** @internal */
 #define mpALIGNMASK    0x03
@@ -509,152 +509,152 @@ protected:
 /*@}*/
 
 /** @name mpLayer implementations - functions
-@{*/
+  @{*/
 
 /** Abstract base class providing plot and labeling functionality for functions F:X->Y.
-    Override mpFX::GetY to implement a function.
-    Optionally implement a constructor and pass a name (label) and a label alignment
-    to the constructor mpFX::mpFX. If the layer name is empty, no label will be plotted.
-*/
+  Override mpFX::GetY to implement a function.
+  Optionally implement a constructor and pass a name (label) and a label alignment
+  to the constructor mpFX::mpFX. If the layer name is empty, no label will be plotted.
+  */
 class WXDLLIMPEXP_MATHPLOT mpFX : public mpLayer
 {
-public:
-    /** @param name  Label
-        @param flags Label alignment, pass one of #mpALIGN_RIGHT, #mpALIGN_CENTER, #mpALIGN_LEFT.
-    */
-    mpFX(wxString name = wxEmptyString, int flags = mpALIGN_RIGHT);
+    public:
+        /** @param name  Label
+          @param flags Label alignment, pass one of #mpALIGN_RIGHT, #mpALIGN_CENTER, #mpALIGN_LEFT.
+          */
+        mpFX(wxString name = wxEmptyString, int flags = mpALIGN_RIGHT);
 
-    /** Get function value for argument.
-        Override this function in your implementation.
-        @param x Argument
-        @return Function value
-    */
-    virtual double GetY( double x ) = 0;
+        /** Get function value for argument.
+          Override this function in your implementation.
+          @param x Argument
+          @return Function value
+          */
+        virtual double GetY( double x ) = 0;
 
-    /** Layer plot handler.
-        This implementation will plot the function in the visible area and
-        put a label according to the aligment specified.
-    */
-    virtual void Plot(wxDC & dc, mpWindow & w);
+        /** Layer plot handler.
+          This implementation will plot the function in the visible area and
+          put a label according to the aligment specified.
+          */
+        virtual void Plot(wxDC & dc, mpWindow & w);
 
-protected:
-    int m_flags; //!< Holds label alignment
+    protected:
+        int m_flags; //!< Holds label alignment
 
-    DECLARE_DYNAMIC_CLASS(mpFX)
+        DECLARE_DYNAMIC_CLASS(mpFX)
 };
 
 /** Abstract base class providing plot and labeling functionality for functions F:Y->X.
-    Override mpFY::GetX to implement a function.
-    Optionally implement a constructor and pass a name (label) and a label alignment
-    to the constructor mpFY::mpFY. If the layer name is empty, no label will be plotted.
-*/
+  Override mpFY::GetX to implement a function.
+  Optionally implement a constructor and pass a name (label) and a label alignment
+  to the constructor mpFY::mpFY. If the layer name is empty, no label will be plotted.
+  */
 class WXDLLIMPEXP_MATHPLOT mpFY : public mpLayer
 {
-public:
-    /** @param name  Label
-        @param flags Label alignment, pass one of #mpALIGN_BOTTOM, #mpALIGN_CENTER, #mpALIGN_TOP.
-    */
-    mpFY(wxString name = wxEmptyString, int flags = mpALIGN_TOP);
+    public:
+        /** @param name  Label
+          @param flags Label alignment, pass one of #mpALIGN_BOTTOM, #mpALIGN_CENTER, #mpALIGN_TOP.
+          */
+        mpFY(wxString name = wxEmptyString, int flags = mpALIGN_TOP);
 
-    /** Get function value for argument.
-        Override this function in your implementation.
-        @param y Argument
-        @return Function value
-    */
-    virtual double GetX( double y ) = 0;
+        /** Get function value for argument.
+          Override this function in your implementation.
+          @param y Argument
+          @return Function value
+          */
+        virtual double GetX( double y ) = 0;
 
-    /** Layer plot handler.
-        This implementation will plot the function in the visible area and
-        put a label according to the aligment specified.
-    */
-    virtual void Plot(wxDC & dc, mpWindow & w);
+        /** Layer plot handler.
+          This implementation will plot the function in the visible area and
+          put a label according to the aligment specified.
+          */
+        virtual void Plot(wxDC & dc, mpWindow & w);
 
-protected:
-    int m_flags; //!< Holds label alignment
+    protected:
+        int m_flags; //!< Holds label alignment
 
-    DECLARE_DYNAMIC_CLASS(mpFY)
+        DECLARE_DYNAMIC_CLASS(mpFY)
 };
 
 /** Abstract base class providing plot and labeling functionality for a locus plot F:N->X,Y.
-    Locus argument N is assumed to be in range 0 .. MAX_N, and implicitly derived by enumerating
-    all locus values. Override mpFXY::Rewind and mpFXY::GetNextXY to implement a locus.
-    Optionally implement a constructor and pass a name (label) and a label alignment
-    to the constructor mpFXY::mpFXY. If the layer name is empty, no label will be plotted.
-*/
+  Locus argument N is assumed to be in range 0 .. MAX_N, and implicitly derived by enumerating
+  all locus values. Override mpFXY::Rewind and mpFXY::GetNextXY to implement a locus.
+  Optionally implement a constructor and pass a name (label) and a label alignment
+  to the constructor mpFXY::mpFXY. If the layer name is empty, no label will be plotted.
+  */
 class WXDLLIMPEXP_MATHPLOT mpFXY : public mpLayer
 {
-public:
-    /** @param name  Label
-        @param flags Label alignment, pass one of #mpALIGN_NE, #mpALIGN_NW, #mpALIGN_SW, #mpALIGN_SE.
-    */
-    mpFXY(wxString name = wxEmptyString, int flags = mpALIGN_NE);
+    public:
+        /** @param name  Label
+          @param flags Label alignment, pass one of #mpALIGN_NE, #mpALIGN_NW, #mpALIGN_SW, #mpALIGN_SE.
+          */
+        mpFXY(wxString name = wxEmptyString, int flags = mpALIGN_NE);
 
-    /** Rewind value enumeration with mpFXY::GetNextXY.
-        Override this function in your implementation.
-    */
-    virtual void Rewind() = 0;
+        /** Rewind value enumeration with mpFXY::GetNextXY.
+          Override this function in your implementation.
+          */
+        virtual void Rewind() = 0;
 
-    /** Get locus value for next N.
-        Override this function in your implementation.
-        @param x Returns X value
-        @param y Returns Y value
-    */
-    virtual bool GetNextXY(double & x, double & y) = 0;
+        /** Get locus value for next N.
+          Override this function in your implementation.
+          @param x Returns X value
+          @param y Returns Y value
+          */
+        virtual bool GetNextXY(double & x, double & y) = 0;
 
-    /** Layer plot handler.
-        This implementation will plot the locus in the visible area and
-        put a label according to the alignment specified.
-    */
-    virtual void Plot(wxDC & dc, mpWindow & w);
+        /** Layer plot handler.
+          This implementation will plot the locus in the visible area and
+          put a label according to the alignment specified.
+          */
+        virtual void Plot(wxDC & dc, mpWindow & w);
 
 
-protected:
-    int m_flags; //!< Holds label alignment
+    protected:
+        int m_flags; //!< Holds label alignment
 
-	// Data to calculate label positioning
-	wxCoord maxDrawX, minDrawX, maxDrawY, minDrawY;
-	//int drawnPoints;
+        // Data to calculate label positioning
+        wxCoord maxDrawX, minDrawX, maxDrawY, minDrawY;
+        //int drawnPoints;
 
-    /** Update label positioning data
-	    @param xnew New x coordinate
-		@param ynew New y coordinate
-	*/
-	void UpdateViewBoundary(wxCoord xnew, wxCoord ynew);
+        /** Update label positioning data
+          @param xnew New x coordinate
+          @param ynew New y coordinate
+          */
+        void UpdateViewBoundary(wxCoord xnew, wxCoord ynew);
 
-    DECLARE_DYNAMIC_CLASS(mpFXY)
+        DECLARE_DYNAMIC_CLASS(mpFXY)
 };
 
 /** Abstract base class providing plot and labeling functionality for functions F:Y->X.
-    Override mpProfile::GetX to implement a function.
-    This class is similar to mpFY, but the Plot method is different. The plot is in fact represented by lines instead of points, which gives best rendering of rapidly-varying functions, and in general, data which are not so close one to another.
-    Optionally implement a constructor and pass a name (label) and a label alignment
-    to the constructor mpProfile::mpProfile. If the layer name is empty, no label will be plotted.
-*/
+  Override mpProfile::GetX to implement a function.
+  This class is similar to mpFY, but the Plot method is different. The plot is in fact represented by lines instead of points, which gives best rendering of rapidly-varying functions, and in general, data which are not so close one to another.
+  Optionally implement a constructor and pass a name (label) and a label alignment
+  to the constructor mpProfile::mpProfile. If the layer name is empty, no label will be plotted.
+  */
 class WXDLLIMPEXP_MATHPLOT mpProfile : public mpLayer
 {
-public:
-    /** @param name  Label
-        @param flags Label alignment, pass one of #mpALIGN_BOTTOM, #mpALIGN_CENTER, #mpALIGN_TOP.
-    */
-    mpProfile(wxString name = wxEmptyString, int flags = mpALIGN_TOP);
+    public:
+        /** @param name  Label
+          @param flags Label alignment, pass one of #mpALIGN_BOTTOM, #mpALIGN_CENTER, #mpALIGN_TOP.
+          */
+        mpProfile(wxString name = wxEmptyString, int flags = mpALIGN_TOP);
 
-    /** Get function value for argument.
-        Override this function in your implementation.
-        @param x Argument
-        @return Function value
-    */
-    virtual double GetY( double x ) = 0;
+        /** Get function value for argument.
+          Override this function in your implementation.
+          @param x Argument
+          @return Function value
+          */
+        virtual double GetY( double x ) = 0;
 
-    /** Layer plot handler.
-        This implementation will plot the function in the visible area and
-        put a label according to the aligment specified.
-    */
-    virtual void Plot(wxDC & dc, mpWindow & w);
+        /** Layer plot handler.
+          This implementation will plot the function in the visible area and
+          put a label according to the aligment specified.
+          */
+        virtual void Plot(wxDC & dc, mpWindow & w);
 
-protected:
-    int m_flags; //!< Holds label alignment
+    protected:
+        int m_flags; //!< Holds label alignment
 
-    DECLARE_DYNAMIC_CLASS(mpProfile)
+        DECLARE_DYNAMIC_CLASS(mpProfile)
 };
 
 /*@}*/
@@ -664,119 +664,119 @@ protected:
 //-----------------------------------------------------------------------------
 
 /** @name mpLayer implementations - furniture (scales, ...)
-@{*/
+  @{*/
 
 /** Plot layer implementing a x-scale ruler.
-    The ruler is fixed at Y=0 in the coordinate system. A label is plotted at
-    the bottom-right hand of the ruler. The scale numbering automatically
-    adjusts to view and zoom factor.
-*/
+  The ruler is fixed at Y=0 in the coordinate system. A label is plotted at
+  the bottom-right hand of the ruler. The scale numbering automatically
+  adjusts to view and zoom factor.
+  */
 class WXDLLIMPEXP_MATHPLOT mpScaleX : public mpLayer
 {
-public:
-    /** Full constructor.
-		@param name Label to plot by the ruler
-		@param flags Set the position of the scale with respect to the window.
-		@param ticks Select ticks or grid. Give TRUE (default) for drawing axis ticks, FALSE for drawing the grid.
-		@param type mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds. */
-    mpScaleX(wxString name = wxT("X"), int flags = mpALIGN_CENTER, bool ticks = true, unsigned int type = mpX_NORMAL);
+    public:
+        /** Full constructor.
+          @param name Label to plot by the ruler
+          @param flags Set the position of the scale with respect to the window.
+          @param ticks Select ticks or grid. Give TRUE (default) for drawing axis ticks, FALSE for drawing the grid.
+          @param type mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds. */
+        mpScaleX(wxString name = wxT("X"), int flags = mpALIGN_CENTER, bool ticks = true, unsigned int type = mpX_NORMAL);
 
-    /** Layer plot handler.
-        This implementation will plot the ruler adjusted to the visible area. */
-    virtual void Plot(wxDC & dc, mpWindow & w);
+        /** Layer plot handler.
+          This implementation will plot the ruler adjusted to the visible area. */
+        virtual void Plot(wxDC & dc, mpWindow & w);
 
-    /** Check whether this layer has a bounding box.
-        This implementation returns \a FALSE thus making the ruler invisible
-        to the plot layer bounding box calculation by mpWindow. */
-    virtual bool HasBBox() { return FALSE; }
+        /** Check whether this layer has a bounding box.
+          This implementation returns \a FALSE thus making the ruler invisible
+          to the plot layer bounding box calculation by mpWindow. */
+        virtual bool HasBBox() { return FALSE; }
 
-    /** Set X axis alignment.
-        @param align alignment (choose between mpALIGN_BORDER_BOTTOM, mpALIGN_BOTTOM, mpALIGN_CENTER, mpALIGN_TOP, mpALIGN_BORDER_TOP */
-    void SetAlign(int align) { m_flags = align; };
+        /** Set X axis alignment.
+          @param align alignment (choose between mpALIGN_BORDER_BOTTOM, mpALIGN_BOTTOM, mpALIGN_CENTER, mpALIGN_TOP, mpALIGN_BORDER_TOP */
+        void SetAlign(int align) { m_flags = align; };
 
-    /** Set X axis ticks or grid
-        @param ticks TRUE to plot axis ticks, FALSE to plot grid. */
-    void SetTicks(bool ticks) { m_ticks = ticks; };
+        /** Set X axis ticks or grid
+          @param ticks TRUE to plot axis ticks, FALSE to plot grid. */
+        void SetTicks(bool ticks) { m_ticks = ticks; };
 
-    /** Get X axis ticks or grid
-        @return TRUE if plot is drawing axis ticks, FALSE if the grid is active. */
-    bool GetTicks() { return m_ticks; };
+        /** Get X axis ticks or grid
+          @return TRUE if plot is drawing axis ticks, FALSE if the grid is active. */
+        bool GetTicks() { return m_ticks; };
 
-    /** Get X axis label view mode.
-        @return mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds. */
-    unsigned int GetLabelMode() { return m_labelType; };
+        /** Get X axis label view mode.
+          @return mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds. */
+        unsigned int GetLabelMode() { return m_labelType; };
 
-    /** Set X axis label view mode.
-        @param mode mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds. */
-    void SetLabelMode(unsigned int mode) { m_labelType = mode; };
-	
-	/** Set X axis Label format (used for mpX_NORMAL draw mode).
-	    @param format The format string */
-	void SetLabelFormat(const wxString& format) { m_labelFormat = format; };
+        /** Set X axis label view mode.
+          @param mode mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds. */
+        void SetLabelMode(unsigned int mode) { m_labelType = mode; };
 
-	/** Get X axis Label format (used for mpX_NORMAL draw mode).
-	@return The format string */
-	const wxString& SetLabelFormat() { return m_labelFormat; };
-	
-protected:
-    int m_flags; //!< Flag for axis alignment
-    bool m_ticks; //!< Flag to toggle between ticks or grid
-    unsigned int m_labelType; //!< Select labels mode: mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds
-	wxString m_labelFormat; //!< Format string used to print labels
+        /** Set X axis Label format (used for mpX_NORMAL draw mode).
+          @param format The format string */
+        void SetLabelFormat(const wxString& format) { m_labelFormat = format; };
 
-    DECLARE_DYNAMIC_CLASS(mpScaleX)
+        /** Get X axis Label format (used for mpX_NORMAL draw mode).
+          @return The format string */
+        const wxString& SetLabelFormat() { return m_labelFormat; };
+
+    protected:
+        int m_flags; //!< Flag for axis alignment
+        bool m_ticks; //!< Flag to toggle between ticks or grid
+        unsigned int m_labelType; //!< Select labels mode: mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds
+        wxString m_labelFormat; //!< Format string used to print labels
+
+        DECLARE_DYNAMIC_CLASS(mpScaleX)
 };
 
 /** Plot layer implementing a y-scale ruler.
-    If align is set to mpALIGN_CENTER, the ruler is fixed at X=0 in the coordinate system. If the align is set to mpALIGN_TOP or mpALIGN_BOTTOM, the axis is always drawn respectively at top or bottom of the window. A label is plotted at
-    the top-right hand of the ruler. The scale numbering automatically
-    adjusts to view and zoom factor.
-*/
+  If align is set to mpALIGN_CENTER, the ruler is fixed at X=0 in the coordinate system. If the align is set to mpALIGN_TOP or mpALIGN_BOTTOM, the axis is always drawn respectively at top or bottom of the window. A label is plotted at
+  the top-right hand of the ruler. The scale numbering automatically
+  adjusts to view and zoom factor.
+  */
 class WXDLLIMPEXP_MATHPLOT mpScaleY : public mpLayer
 {
-public:
-    /** @param name Label to plot by the ruler
-        @param flags Set position of the scale respect to the window.
-        @param ticks Select ticks or grid. Give TRUE (default) for drawing axis ticks, FALSE for drawing the grid */
-    mpScaleY(wxString name = wxT("Y"), int flags = mpALIGN_CENTER, bool ticks = true);
+    public:
+        /** @param name Label to plot by the ruler
+          @param flags Set position of the scale respect to the window.
+          @param ticks Select ticks or grid. Give TRUE (default) for drawing axis ticks, FALSE for drawing the grid */
+        mpScaleY(wxString name = wxT("Y"), int flags = mpALIGN_CENTER, bool ticks = true);
 
-    /** Layer plot handler.
-        This implementation will plot the ruler adjusted to the visible area.
-    */
-    virtual void Plot(wxDC & dc, mpWindow & w);
+        /** Layer plot handler.
+          This implementation will plot the ruler adjusted to the visible area.
+          */
+        virtual void Plot(wxDC & dc, mpWindow & w);
 
-    /** Check whether this layer has a bounding box.
-        This implementation returns \a FALSE thus making the ruler invisible
-        to the plot layer bounding box calculation by mpWindow.
-    */
-    virtual bool HasBBox() { return FALSE; }
+        /** Check whether this layer has a bounding box.
+          This implementation returns \a FALSE thus making the ruler invisible
+          to the plot layer bounding box calculation by mpWindow.
+          */
+        virtual bool HasBBox() { return FALSE; }
 
-    /** Set Y axis alignment.
-        @param align alignment (choose between mpALIGN_BORDER_LEFT, mpALIGN_LEFT, mpALIGN_CENTER, mpALIGN_RIGHT, mpALIGN_BORDER_RIGHT) */
-    void SetAlign(int align) { m_flags = align; };
+        /** Set Y axis alignment.
+          @param align alignment (choose between mpALIGN_BORDER_LEFT, mpALIGN_LEFT, mpALIGN_CENTER, mpALIGN_RIGHT, mpALIGN_BORDER_RIGHT) */
+        void SetAlign(int align) { m_flags = align; };
 
-    /** Set Y axis ticks or grid
-        @param ticks TRUE to plot axis ticks, FALSE to plot grid. */
-    void SetTicks(bool ticks) { m_ticks = ticks; };
+        /** Set Y axis ticks or grid
+          @param ticks TRUE to plot axis ticks, FALSE to plot grid. */
+        void SetTicks(bool ticks) { m_ticks = ticks; };
 
-    /** Get Y axis ticks or grid
-        @return TRUE if plot is drawing axis ticks, FALSE if the grid is active. */
-    bool GetTicks() { return m_ticks; };
-	
-	/** Set Y axis Label format.
-	@param format The format string */
-	void SetLabelFormat(const wxString& format) { m_labelFormat = format; };
-	
-	/** Get Y axis Label format.
-	@return The format string */
-	const wxString& SetLabelFormat() { return m_labelFormat; };
+        /** Get Y axis ticks or grid
+          @return TRUE if plot is drawing axis ticks, FALSE if the grid is active. */
+        bool GetTicks() { return m_ticks; };
 
-protected:
-    int m_flags; //!< Flag for axis alignment
-    bool m_ticks; //!< Flag to toggle between ticks or grid
-	wxString m_labelFormat; //!< Format string used to print labels
+        /** Set Y axis Label format.
+          @param format The format string */
+        void SetLabelFormat(const wxString& format) { m_labelFormat = format; };
 
-    DECLARE_DYNAMIC_CLASS(mpScaleY)
+        /** Get Y axis Label format.
+          @return The format string */
+        const wxString& SetLabelFormat() { return m_labelFormat; };
+
+    protected:
+        int m_flags; //!< Flag for axis alignment
+        bool m_ticks; //!< Flag to toggle between ticks or grid
+        wxString m_labelFormat; //!< Format string used to print labels
+
+        DECLARE_DYNAMIC_CLASS(mpScaleY)
 };
 
 //-----------------------------------------------------------------------------
@@ -784,7 +784,7 @@ protected:
 //-----------------------------------------------------------------------------
 
 /** @name Constants defining mouse modes for mpWindow
-@{*/
+  @{*/
 
 /** Mouse panning drags the view. Mouse mode for mpWindow. */
 #define mpMOUSEMODE_DRAG    0
@@ -798,442 +798,442 @@ typedef std::deque<mpLayer*> wxLayerList;
 
 /** Canvas for plotting mpLayer implementations.
 
-    This class defines a zoomable and moveable 2D plot canvas. Any number
-    of mpLayer implementations (scale rulers, function plots, ...) can be
-    attached using mpWindow::AddLayer.
+  This class defines a zoomable and moveable 2D plot canvas. Any number
+  of mpLayer implementations (scale rulers, function plots, ...) can be
+  attached using mpWindow::AddLayer.
 
-    The canvas window provides a context menu with actions for navigating the view.
-    The context menu can be retrieved with mpWindow::GetPopupMenu, e.g. for extending it
-    externally.
+  The canvas window provides a context menu with actions for navigating the view.
+  The context menu can be retrieved with mpWindow::GetPopupMenu, e.g. for extending it
+  externally.
 
-    Since wxMathPlot version 0.03, the mpWindow incorporates the following features:
-        - DoubleBuffering (Default=disabled): Can be set with EnableDoubleBuffer
-        - Mouse based pan/zoom (Default=enabled): Can be set with EnableMousePanZoom.
+  Since wxMathPlot version 0.03, the mpWindow incorporates the following features:
+  - DoubleBuffering (Default=disabled): Can be set with EnableDoubleBuffer
+  - Mouse based pan/zoom (Default=enabled): Can be set with EnableMousePanZoom.
 
-    The mouse commands can be visualized by the user through the popup menu, and are:
-        - Mouse Move+CTRL: Pan (Move)
-        - Mouse Wheel: Vertical scroll
-        - Mouse Wheel+SHIFT: Horizontal scroll
-        - Mouse Wheel UP+CTRL: Zoom in
-        - Mouse Wheel DOWN+CTRL: Zoom out
+  The mouse commands can be visualized by the user through the popup menu, and are:
+  - Mouse Move+CTRL: Pan (Move)
+  - Mouse Wheel: Vertical scroll
+  - Mouse Wheel+SHIFT: Horizontal scroll
+  - Mouse Wheel UP+CTRL: Zoom in
+  - Mouse Wheel DOWN+CTRL: Zoom out
 
 */
 class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
 {
-public:
-    mpWindow() {}
-    mpWindow( wxWindow *parent, wxWindowID id,
-                     const wxPoint &pos = wxDefaultPosition,
-                     const wxSize &size = wxDefaultSize,
-                     long flags = 0);
-    ~mpWindow();
+    public:
+        mpWindow() {}
+        mpWindow( wxWindow *parent, wxWindowID id,
+                const wxPoint &pos = wxDefaultPosition,
+                const wxSize &size = wxDefaultSize,
+                long flags = 0);
+        ~mpWindow();
 
-    /** Get reference to context menu of the plot canvas.
-        @return Pointer to menu. The menu can be modified.
-    */
-    wxMenu* GetPopupMenu() { return &m_popmenu; }
+        /** Get reference to context menu of the plot canvas.
+          @return Pointer to menu. The menu can be modified.
+          */
+        wxMenu* GetPopupMenu() { return &m_popmenu; }
 
-    /** Add a plot layer to the canvas.
-        @param layer Pointer to layer. The mpLayer object will get under control of mpWindow,
-                     i.e. it will be delete'd on mpWindow destruction
-        @param refreshDisplay States whether to refresh the display (UpdateAll) after adding the layer.
-        @retval TRUE Success
-        @retval FALSE Failure due to out of memory.
-    */
-    bool AddLayer( mpLayer* layer, bool refreshDisplay = true);
+        /** Add a plot layer to the canvas.
+          @param layer Pointer to layer. The mpLayer object will get under control of mpWindow,
+          i.e. it will be delete'd on mpWindow destruction
+          @param refreshDisplay States whether to refresh the display (UpdateAll) after adding the layer.
+          @retval TRUE Success
+          @retval FALSE Failure due to out of memory.
+          */
+        bool AddLayer( mpLayer* layer, bool refreshDisplay = true);
 
-    /** Remove a plot layer from the canvas.
-        @param layer Pointer to layer. The mpLayer object will be destructed using delete.
-        @param alsoDeleteObject If set to true, the mpLayer object will be also "deleted", not just removed from the internal list.
-        @param refreshDisplay States whether to refresh the display (UpdateAll) after removing the layer.
-        @return true if layer is deleted correctly
+        /** Remove a plot layer from the canvas.
+          @param layer Pointer to layer. The mpLayer object will be destructed using delete.
+          @param alsoDeleteObject If set to true, the mpLayer object will be also "deleted", not just removed from the internal list.
+          @param refreshDisplay States whether to refresh the display (UpdateAll) after removing the layer.
+          @return true if layer is deleted correctly
 
-        N.B. Only the layer reference in the mpWindow is deleted, the layer object still exists!
-    */
-    bool DelLayer( mpLayer* layer, bool alsoDeleteObject = false, bool refreshDisplay = true);
+          N.B. Only the layer reference in the mpWindow is deleted, the layer object still exists!
+          */
+        bool DelLayer( mpLayer* layer, bool alsoDeleteObject = false, bool refreshDisplay = true);
 
-    /** Remove all layers from the plot.
-        @param alsoDeleteObject If set to true, the mpLayer objects will be also "deleted", not just removed from the internal list.
-        @param refreshDisplay States whether to refresh the display (UpdateAll) after removing the layers.
-    */
-    void DelAllLayers( bool alsoDeleteObject, bool refreshDisplay = true);
-	
-	
-    /*! Get the layer in list position indicated.
-        N.B. You <i>must</i> know the index of the layer inside the list!
-        @param position position of the layer in the layers list
-        @return pointer to mpLayer
-    */
-    mpLayer* GetLayer(int position);
-
-    /*! Get the layer by its name (case sensitive).
-        @param name The name of the layer to retrieve
-        @return A pointer to the mpLayer object, or NULL if not found.
-    */
-    mpLayer* GetLayerByName( const wxString &name);
-
-    /** Get current view's X scale.
-        See @ref mpLayer::Plot "rules for coordinate transformation"
-        @return Scale
-    */
-    double GetXscl() { return m_scaleX; }
-    double GetScaleX(void) const{ return m_scaleX; }; // Schaling's method: maybe another method esists with the same name
-
-    /** Get current view's Y scale.
-        See @ref mpLayer::Plot "rules for coordinate transformation"
-        @return Scale
-    */
-    double GetYscl() const { return m_scaleY; }
-    double GetScaleY(void) const { return m_scaleY; } // Schaling's method: maybe another method exists with the same name
-
-    /** Get current view's X position.
-        See @ref mpLayer::Plot "rules for coordinate transformation"
-        @return X Position in layer coordinate system, that corresponds to the center point of the view.
-    */
-    double GetXpos() const { return m_posX; }
-    double GetPosX(void) const { return m_posX; }
-
-    /** Get current view's Y position.
-        See @ref mpLayer::Plot "rules for coordinate transformation"
-        @return Y Position in layer coordinate system, that corresponds to the center point of the view.
-    */
-    double GetYpos() const { return m_posY; }
-    double GetPosY(void) const { return m_posY; }
-
-    /** Get current view's X dimension in device context units.
-        Usually this is equal to wxDC::GetSize, but it might differ thus mpLayer
-        implementations should rely on the value returned by the function.
-        See @ref mpLayer::Plot "rules for coordinate transformation"
-        @return X dimension.
-    */
-    int GetScrX(void) const { return m_scrX; }
-    int GetXScreen(void) const { return m_scrX; }
-
-    /** Get current view's Y dimension in device context units.
-        Usually this is equal to wxDC::GetSize, but it might differ thus mpLayer
-        implementations should rely on the value returned by the function.
-        See @ref mpLayer::Plot "rules for coordinate transformation"
-        @return Y dimension.
-    */
-    int GetScrY(void) const { return m_scrY; }
-    int GetYScreen(void) const { return m_scrY; }
-
-    /** Set current view's X scale and refresh display.
-        @param scaleX New scale, must not be 0.
-    */
-    void SetScaleX(double scaleX);
-
-    /** Set current view's Y scale and refresh display.
-        @param scaleY New scale, must not be 0.
-    */
-    void SetScaleY(double scaleY) { if (scaleY!=0) m_scaleY=scaleY; UpdateAll(); }
-
-    /** Set current view's X position and refresh display.
-        @param posX New position that corresponds to the center point of the view.
-    */
-    void SetPosX(double posX) { m_posX=posX; UpdateAll(); }
-
-    /** Set current view's Y position and refresh display.
-        @param posY New position that corresponds to the center point of the view.
-    */
-    void SetPosY(double posY) { m_posY=posY; UpdateAll(); }
-
-    /** Set current view's X and Y position and refresh display.
-        @param posX New position that corresponds to the center point of the view.
-        @param posY New position that corresponds to the center point of the view.
-    */
-    void SetPos( double posX, double posY) { m_posX=posX; m_posY=posY; UpdateAll(); }
-
-    /** Set current view's dimensions in device context units.
-        Needed by plotting functions. It doesn't refresh display.
-        @param scrX New position that corresponds to the center point of the view.
-        @param scrY New position that corresponds to the center point of the view.
-    */
-    void SetScr( int scrX, int scrY) { m_scrX=scrX; m_scrY=scrY; }
-    
-    /** Converts mpWindow (screen) pixel coordinates into graph (floating point) coordinates, using current mpWindow position and scale.
-      * @sa p2y,x2p,y2p */
-//     double p2x(wxCoord pixelCoordX, bool drawOutside = true ); // { return m_posX + pixelCoordX/m_scaleX; }
-    inline double p2x(wxCoord pixelCoordX ) { return m_posX + pixelCoordX/m_scaleX; }
-
-    /** Converts mpWindow (screen) pixel coordinates into graph (floating point) coordinates, using current mpWindow position and scale.
-      * @sa p2x,x2p,y2p */
-//     double p2y(wxCoord pixelCoordY, bool drawOutside = true ); //{ return m_posY - pixelCoordY/m_scaleY; }
-    inline double p2y(wxCoord pixelCoordY ) { return m_posY - pixelCoordY/m_scaleY; }
-
-    /** Converts graph (floating point) coordinates into mpWindow (screen) pixel coordinates, using current mpWindow position and scale.
-      * @sa p2x,p2y,y2p */
-//     wxCoord x2p(double x, bool drawOutside = true); // { return (wxCoord) ( (x-m_posX) * m_scaleX); }
-    inline wxCoord x2p(double x) { return (wxCoord) ( (x-m_posX) * m_scaleX); }
-
-    /** Converts graph (floating point) coordinates into mpWindow (screen) pixel coordinates, using current mpWindow position and scale.
-      * @sa p2x,p2y,x2p */
-//     wxCoord y2p(double y, bool drawOutside = true); // { return (wxCoord) ( (m_posY-y) * m_scaleY); }
-    inline wxCoord y2p(double y) { return (wxCoord) ( (m_posY-y) * m_scaleY); }
+        /** Remove all layers from the plot.
+          @param alsoDeleteObject If set to true, the mpLayer objects will be also "deleted", not just removed from the internal list.
+          @param refreshDisplay States whether to refresh the display (UpdateAll) after removing the layers.
+          */
+        void DelAllLayers( bool alsoDeleteObject, bool refreshDisplay = true);
 
 
-    /** Enable/disable the double-buffering of the window, eliminating the flicker (default=disabled).
-     */
-    void EnableDoubleBuffer( bool enabled ) { m_enableDoubleBuffer = enabled; }
+        /*! Get the layer in list position indicated.
+          N.B. You <i>must</i> know the index of the layer inside the list!
+          @param position position of the layer in the layers list
+          @return pointer to mpLayer
+          */
+        mpLayer* GetLayer(int position);
 
-    /** Enable/disable the feature of pan/zoom with the mouse (default=enabled)
-     */
-    void EnableMousePanZoom( bool enabled ) { m_enableMouseNavigation = enabled; }
+        /*! Get the layer by its name (case sensitive).
+          @param name The name of the layer to retrieve
+          @return A pointer to the mpLayer object, or NULL if not found.
+          */
+        mpLayer* GetLayerByName( const wxString &name);
 
-    /** Enable or disable X/Y scale aspect locking for the view.
-        @note Explicit calls to mpWindow::SetScaleX and mpWindow::SetScaleY will set
-              an unlocked aspect, but any other action changing the view scale will
-              lock the aspect again.
-    */
-    void LockAspect(bool enable = TRUE);
+        /** Get current view's X scale.
+          See @ref mpLayer::Plot "rules for coordinate transformation"
+          @return Scale
+          */
+        double GetXscl() { return m_scaleX; }
+        double GetScaleX(void) const{ return m_scaleX; }; // Schaling's method: maybe another method esists with the same name
 
-    /** Checks whether the X/Y scale aspect is locked.
-        @retval TRUE Locked
-        @retval FALSE Unlocked
-    */
-    inline bool IsAspectLocked() { return m_lockaspect; }
+        /** Get current view's Y scale.
+          See @ref mpLayer::Plot "rules for coordinate transformation"
+          @return Scale
+          */
+        double GetYscl() const { return m_scaleY; }
+        double GetScaleY(void) const { return m_scaleY; } // Schaling's method: maybe another method exists with the same name
 
-    /** Set view to fit global bounding box of all plot layers and refresh display.
-        Scale and position will be set to show all attached mpLayers.
-        The X/Y scale aspect lock is taken into account.
-    */
-    void Fit();
+        /** Get current view's X position.
+          See @ref mpLayer::Plot "rules for coordinate transformation"
+          @return X Position in layer coordinate system, that corresponds to the center point of the view.
+          */
+        double GetXpos() const { return m_posX; }
+        double GetPosX(void) const { return m_posX; }
 
-    /** Set view to fit a given bounding box and refresh display.
-        The X/Y scale aspect lock is taken into account.
-	If provided, the parameters printSizeX and printSizeY are taken as the DC size, and the 
-        pixel scales are computed accordingly. Also, in this case the passed borders are not saved 
-        as the "desired borders", since this use will be invoked only when printing.
-    */
-    void Fit(double xMin, double xMax, double yMin, double yMax,wxCoord *printSizeX=NULL,wxCoord *printSizeY=NULL);
+        /** Get current view's Y position.
+          See @ref mpLayer::Plot "rules for coordinate transformation"
+          @return Y Position in layer coordinate system, that corresponds to the center point of the view.
+          */
+        double GetYpos() const { return m_posY; }
+        double GetPosY(void) const { return m_posY; }
 
-    /** Zoom into current view and refresh display 
-      * @param centerPoint The point (pixel coordinates) that will stay in the same position on the screen after the zoom (by default, the center of the mpWindow).
-      */
-    void ZoomIn( const wxPoint& centerPoint = wxDefaultPosition );
+        /** Get current view's X dimension in device context units.
+          Usually this is equal to wxDC::GetSize, but it might differ thus mpLayer
+          implementations should rely on the value returned by the function.
+          See @ref mpLayer::Plot "rules for coordinate transformation"
+          @return X dimension.
+          */
+        int GetScrX(void) const { return m_scrX; }
+        int GetXScreen(void) const { return m_scrX; }
 
-    /** Zoom out current view and refresh display
-      * @param centerPoint The point (pixel coordinates) that will stay in the same position on the screen after the zoom (by default, the center of the mpWindow).
-      */
-    void ZoomOut( const wxPoint& centerPoint = wxDefaultPosition );
+        /** Get current view's Y dimension in device context units.
+          Usually this is equal to wxDC::GetSize, but it might differ thus mpLayer
+          implementations should rely on the value returned by the function.
+          See @ref mpLayer::Plot "rules for coordinate transformation"
+          @return Y dimension.
+          */
+        int GetScrY(void) const { return m_scrY; }
+        int GetYScreen(void) const { return m_scrY; }
 
-    /** Zoom in current view along X and refresh display */
-    void ZoomInX();
-    /** Zoom out current view along X and refresh display */
-    void ZoomOutX();
-    /** Zoom in current view along Y and refresh display */
-    void ZoomInY();
-    /** Zoom out current view along Y and refresh display */
-    void ZoomOutY();
+        /** Set current view's X scale and refresh display.
+          @param scaleX New scale, must not be 0.
+          */
+        void SetScaleX(double scaleX);
 
-    /** Zoom view fitting given coordinates to the window (p0 and p1 do not need to be in any specific order) */
-    void ZoomRect(wxPoint p0, wxPoint p1);
+        /** Set current view's Y scale and refresh display.
+          @param scaleY New scale, must not be 0.
+          */
+        void SetScaleY(double scaleY) { if (scaleY!=0) m_scaleY=scaleY; UpdateAll(); }
 
-    /** Refresh display */
-    void UpdateAll();
+        /** Set current view's X position and refresh display.
+          @param posX New position that corresponds to the center point of the view.
+          */
+        void SetPosX(double posX) { m_posX=posX; UpdateAll(); }
 
-    // Added methods by Davide Rondini
+        /** Set current view's Y position and refresh display.
+          @param posY New position that corresponds to the center point of the view.
+          */
+        void SetPosY(double posY) { m_posY=posY; UpdateAll(); }
 
-    /** Counts the number of plot layers, excluding axes or text: this is to count only the layers which have a bounding box.
-    	\return The number of profiles plotted.
-    */
-    unsigned int CountLayers();
-    
-    /** Counts the number of plot layers, whether or not they have a bounding box.
-    	\return The number of layers in the mpWindow. */
-    unsigned int CountAllLayers() { return m_layers.size(); };
+        /** Set current view's X and Y position and refresh display.
+          @param posX New position that corresponds to the center point of the view.
+          @param posY New position that corresponds to the center point of the view.
+          */
+        void SetPos( double posX, double posY) { m_posX=posX; m_posY=posY; UpdateAll(); }
 
-    /** Draws the mpWindow on a page for printing
-        \param print the mpPrintout where to print the graph */
-    //void PrintGraph(mpPrintout *print);
+        /** Set current view's dimensions in device context units.
+          Needed by plotting functions. It doesn't refresh display.
+          @param scrX New position that corresponds to the center point of the view.
+          @param scrY New position that corresponds to the center point of the view.
+          */
+        void SetScr( int scrX, int scrY) { m_scrX=scrX; m_scrY=scrY; }
+
+        /** Converts mpWindow (screen) pixel coordinates into graph (floating point) coordinates, using current mpWindow position and scale.
+         * @sa p2y,x2p,y2p */
+        //     double p2x(wxCoord pixelCoordX, bool drawOutside = true ); // { return m_posX + pixelCoordX/m_scaleX; }
+        inline double p2x(wxCoord pixelCoordX ) { return m_posX + pixelCoordX/m_scaleX; }
+
+        /** Converts mpWindow (screen) pixel coordinates into graph (floating point) coordinates, using current mpWindow position and scale.
+         * @sa p2x,x2p,y2p */
+        //     double p2y(wxCoord pixelCoordY, bool drawOutside = true ); //{ return m_posY - pixelCoordY/m_scaleY; }
+        inline double p2y(wxCoord pixelCoordY ) { return m_posY - pixelCoordY/m_scaleY; }
+
+        /** Converts graph (floating point) coordinates into mpWindow (screen) pixel coordinates, using current mpWindow position and scale.
+         * @sa p2x,p2y,y2p */
+        //     wxCoord x2p(double x, bool drawOutside = true); // { return (wxCoord) ( (x-m_posX) * m_scaleX); }
+        inline wxCoord x2p(double x) { return (wxCoord) ( (x-m_posX) * m_scaleX); }
+
+        /** Converts graph (floating point) coordinates into mpWindow (screen) pixel coordinates, using current mpWindow position and scale.
+         * @sa p2x,p2y,x2p */
+        //     wxCoord y2p(double y, bool drawOutside = true); // { return (wxCoord) ( (m_posY-y) * m_scaleY); }
+        inline wxCoord y2p(double y) { return (wxCoord) ( (m_posY-y) * m_scaleY); }
 
 
-	/** Returns the left-border layer coordinate that the user wants the mpWindow to show (it may be not exactly the actual shown coordinate in the case of locked aspect ratio).
-	  * @sa Fit
-   	  */
-	double GetDesiredXmin() {return m_desiredXmin; }
+        /** Enable/disable the double-buffering of the window, eliminating the flicker (default=disabled).
+        */
+        void EnableDoubleBuffer( bool enabled ) { m_enableDoubleBuffer = enabled; }
 
-	/** Returns the right-border layer coordinate that the user wants the mpWindow to show (it may be not exactly the actual shown coordinate in the case of locked aspect ratio).
-	  * @sa Fit
-   	  */
-	double GetDesiredXmax() {return m_desiredXmax; }
+        /** Enable/disable the feature of pan/zoom with the mouse (default=enabled)
+        */
+        void EnableMousePanZoom( bool enabled ) { m_enableMouseNavigation = enabled; }
 
-	/** Returns the bottom-border layer coordinate that the user wants the mpWindow to show (it may be not exactly the actual shown coordinate in the case of locked aspect ratio).
-	  * @sa Fit
-   	  */
-	double GetDesiredYmin() {return m_desiredYmin; }
+        /** Enable or disable X/Y scale aspect locking for the view.
+          @note Explicit calls to mpWindow::SetScaleX and mpWindow::SetScaleY will set
+          an unlocked aspect, but any other action changing the view scale will
+          lock the aspect again.
+          */
+        void LockAspect(bool enable = TRUE);
 
-	/** Returns the top layer-border coordinate that the user wants the mpWindow to show (it may be not exactly the actual shown coordinate in the case of locked aspect ratio).
-	  * @sa Fit
-   	  */
-	double GetDesiredYmax() {return m_desiredYmax; }
+        /** Checks whether the X/Y scale aspect is locked.
+          @retval TRUE Locked
+          @retval FALSE Unlocked
+          */
+        inline bool IsAspectLocked() { return m_lockaspect; }
 
-	/** Returns the bounding box coordinates
-		@param bbox Pointer to a 6-element double array where to store bounding box coordinates. */
-	void GetBoundingBox(double* bbox);
-	
-    /** Enable/disable scrollbars
-      @param status Set to true to show scrollbars */
-    void SetMPScrollbars(bool status);
+        /** Set view to fit global bounding box of all plot layers and refresh display.
+          Scale and position will be set to show all attached mpLayers.
+          The X/Y scale aspect lock is taken into account.
+          */
+        void Fit();
 
-    /** Get scrollbars status.
-      @return true if scrollbars are visible */
-    bool GetMPScrollbars() {return m_enableScrollBars; };
+        /** Set view to fit a given bounding box and refresh display.
+          The X/Y scale aspect lock is taken into account.
+          If provided, the parameters printSizeX and printSizeY are taken as the DC size, and the
+          pixel scales are computed accordingly. Also, in this case the passed borders are not saved
+          as the "desired borders", since this use will be invoked only when printing.
+          */
+        void Fit(double xMin, double xMax, double yMin, double yMax,wxCoord *printSizeX=NULL,wxCoord *printSizeY=NULL);
 
-    /** Draw the window on a wxBitmap, then save it to a file.
-      @param filename File name where to save the screenshot
-      @param type image type to be saved: see wxImage output file types for flags
-	  @param imageSize Set a size for the output image. Default is the same as the screen size
-	  @param fit Decide whether to fit the plot into the size*/
-    bool SaveScreenshot(const wxString& filename, int type = wxBITMAP_TYPE_BMP, wxSize imageSize = wxDefaultSize, bool fit = false);
+        /** Zoom into current view and refresh display
+         * @param centerPoint The point (pixel coordinates) that will stay in the same position on the screen after the zoom (by default, the center of the mpWindow).
+         */
+        void ZoomIn( const wxPoint& centerPoint = wxDefaultPosition );
 
-    /** This value sets the zoom steps whenever the user clicks "Zoom in/out" or performs zoom with the mouse wheel.
-      *  It must be a number above unity. This number is used for zoom in, and its inverse for zoom out. Set to 1.5 by default. */
-    static double zoomIncrementalFactor;
+        /** Zoom out current view and refresh display
+         * @param centerPoint The point (pixel coordinates) that will stay in the same position on the screen after the zoom (by default, the center of the mpWindow).
+         */
+        void ZoomOut( const wxPoint& centerPoint = wxDefaultPosition );
 
-    /** Set window margins, creating a blank area where some kinds of layers cannot draw. This is useful for example to draw axes outside the area where the plots are drawn.
-        @param top Top border
-        @param right Right border
-        @param bottom Bottom border
-        @param left Left border */
-    void SetMargins(int top, int right, int bottom, int left);
+        /** Zoom in current view along X and refresh display */
+        void ZoomInX();
+        /** Zoom out current view along X and refresh display */
+        void ZoomOutX();
+        /** Zoom in current view along Y and refresh display */
+        void ZoomInY();
+        /** Zoom out current view along Y and refresh display */
+        void ZoomOutY();
 
-    /** Set the top margin. @param top Top Margin */
-    void SetMarginTop(int top) { m_marginTop = top; };
-    /** Set the right margin. @param right Right Margin */
-    void SetMarginRight(int right) { m_marginRight = right; };
-    /** Set the bottom margin. @param bottom Bottom Margin */
-    void SetMarginBottom(int bottom) { m_marginBottom = bottom; };
-    /** Set the left margin. @param left Left Margin */
-    void SetMarginLeft(int left) { m_marginLeft = left; };
+        /** Zoom view fitting given coordinates to the window (p0 and p1 do not need to be in any specific order) */
+        void ZoomRect(wxPoint p0, wxPoint p1);
 
-    /** Get the top margin. @param top Top Margin */
-    int GetMarginTop() { return m_marginTop; };
-    /** Get the right margin. @param right Right Margin */
-    int GetMarginRight() { return m_marginRight; };
-    /** Get the bottom margin. @param bottom Bottom Margin */
-    int GetMarginBottom() { return m_marginBottom; };
-    /** Get the left margin. @param left Left Margin */
-    int GetMarginLeft() { return m_marginLeft; };
+        /** Refresh display */
+        void UpdateAll();
 
-    /** Sets whether to show coordinate tooltip when mouse passes over the plot. \param value true for enable, false for disable */
-    // void EnableCoordTooltip(bool value = true);
-    /** Gets coordinate tooltip status. \return true for enable, false for disable */
-    // bool GetCoordTooltip() { return m_coordTooltip; };
+        // Added methods by Davide Rondini
 
-    /** Check if a given point is inside the area of a mpInfoLayer and eventually returns its pointer.
-        @param point The position to be checked 
-        @return If an info layer is found, returns its pointer, NULL otherwise */
-    mpInfoLayer* IsInsideInfoLayer(wxPoint& point);
-	
-	/** Sets the visibility of a layer by its name.
-		@param name The layer name to set visibility
-		@param viewable the view status to be set */
-	void SetLayerVisible(const wxString &name, bool viewable);
-	
-	/** Check whether a layer with given name is visible
-		@param name The layer name
-		@return layer visibility status */
-	bool IsLayerVisible(const wxString &name );
-	
-	/** Sets the visibility of a layer by its position in layer list.
-		@param position The layer position in layer list
-		@param viewable the view status to be set */
-	void SetLayerVisible(const unsigned int position, bool viewable);
-	
-	/** Check whether the layer at given position is visible
-		@param position The layer position in layer list
-		@return layer visibility status */
-	bool IsLayerVisible(const unsigned int position );
+        /** Counts the number of plot layers, excluding axes or text: this is to count only the layers which have a bounding box.
+          \return The number of profiles plotted.
+          */
+        unsigned int CountLayers();
 
-	/** Set Color theme. Provide colours to set a new colour theme.
-	    @param bgColour Background colour
-		@param drawColour The colour used to draw all elements in foreground, axes excluded
-		@param axesColour The colour used to draw axes (but not their labels) */
-	void SetColourTheme(const wxColour& bgColour, const wxColour& drawColour, const wxColour& axesColour);
-	
-	/** Get axes draw colour
-		@return reference to axis colour used in theme */
-	const wxColour& GetAxesColour() { return m_axColour; };
+        /** Counts the number of plot layers, whether or not they have a bounding box.
+          \return The number of layers in the mpWindow. */
+        unsigned int CountAllLayers() { return m_layers.size(); };
 
-protected:
-    void OnPaint         (wxPaintEvent     &event); //!< Paint handler, will plot all attached layers
-    void OnSize          (wxSizeEvent      &event); //!< Size handler, will update scroll bar sizes
-    // void OnScroll2       (wxScrollWinEvent &event); //!< Scroll handler, will move canvas
-    void OnShowPopupMenu (wxMouseEvent     &event); //!< Mouse handler, will show context menu
-    void OnMouseRightDown(wxMouseEvent     &event); //!< Mouse handler, for detecting when the user drags with the right button or just "clicks" for the menu
-    void OnCenter        (wxCommandEvent   &event); //!< Context menu handler
-    void OnFit           (wxCommandEvent   &event); //!< Context menu handler
-    void OnZoomIn        (wxCommandEvent   &event); //!< Context menu handler
-    void OnZoomOut       (wxCommandEvent   &event); //!< Context menu handler
-    void OnLockAspect    (wxCommandEvent   &event); //!< Context menu handler
-    void OnMouseHelp     (wxCommandEvent   &event); //!< Context menu handler
-    void OnMouseWheel    (wxMouseEvent     &event); //!< Mouse handler for the wheel
-    void OnMouseMove     (wxMouseEvent     &event); //!< Mouse handler for mouse motion (for pan)
-    void OnMouseLeftDown (wxMouseEvent     &event); //!< Mouse left click (for rect zoom)
-    void OnMouseLeftRelease (wxMouseEvent  &event); //!< Mouse left click (for rect zoom)
-    void OnScrollThumbTrack (wxScrollWinEvent &event); //!< Scroll thumb on scroll bar moving
-    void OnScrollPageUp     (wxScrollWinEvent &event); //!< Scroll page up 
-    void OnScrollPageDown   (wxScrollWinEvent &event); //!< Scroll page down 
-    void OnScrollLineUp     (wxScrollWinEvent &event); //!< Scroll line up 
-    void OnScrollLineDown   (wxScrollWinEvent &event); //!< Scroll line down
-    void OnScrollTop        (wxScrollWinEvent &event); //!< Scroll to top 
-    void OnScrollBottom     (wxScrollWinEvent &event); //!< Scroll to bottom
+        /** Draws the mpWindow on a page for printing
+          \param print the mpPrintout where to print the graph */
+        //void PrintGraph(mpPrintout *print);
 
-    void DoScrollCalc    (const int position, const int orientation);
 
-    void DoZoomInXCalc   (const int         staticXpixel);
-    void DoZoomInYCalc   (const int         staticYpixel);
-    void DoZoomOutXCalc  (const int         staticXpixel);
-    void DoZoomOutYCalc  (const int         staticYpixel);
+        /** Returns the left-border layer coordinate that the user wants the mpWindow to show (it may be not exactly the actual shown coordinate in the case of locked aspect ratio).
+         * @sa Fit
+         */
+        double GetDesiredXmin() {return m_desiredXmin; }
 
-    /** Recalculate global layer bounding box, and save it in m_minX,...
-      * \return true if there is any valid BBox information.
-      */
-    virtual bool UpdateBBox();
+        /** Returns the right-border layer coordinate that the user wants the mpWindow to show (it may be not exactly the actual shown coordinate in the case of locked aspect ratio).
+         * @sa Fit
+         */
+        double GetDesiredXmax() {return m_desiredXmax; }
 
-    //wxList m_layers;    //!< List of attached plot layers
-    wxLayerList m_layers; //!< List of attached plot layers
-    wxMenu m_popmenu;   //!< Canvas' context menu
-    bool   m_lockaspect;//!< Scale aspect is locked or not
-    // bool   m_coordTooltip; //!< Selects whether to show coordinate tooltip
-	wxColour m_bgColour;	//!< Background Colour
-	wxColour m_fgColour;	//!< Foreground Colour
-	wxColour m_axColour;	//!< Axes Colour
+        /** Returns the bottom-border layer coordinate that the user wants the mpWindow to show (it may be not exactly the actual shown coordinate in the case of locked aspect ratio).
+         * @sa Fit
+         */
+        double GetDesiredYmin() {return m_desiredYmin; }
 
-    double m_minX;      //!< Global layer bounding box, left border incl.
-    double m_maxX;      //!< Global layer bounding box, right border incl.
-    double m_minY;      //!< Global layer bounding box, bottom border incl.
-    double m_maxY;      //!< Global layer bounding box, top border incl.
-    double m_scaleX;    //!< Current view's X scale
-    double m_scaleY;    //!< Current view's Y scale
-    double m_posX;      //!< Current view's X position
-    double m_posY;      //!< Current view's Y position
-    int    m_scrX;      //!< Current view's X dimension
-    int    m_scrY;      //!< Current view's Y dimension
-    int    m_clickedX;  //!< Last mouse click X position, for centering and zooming the view
-    int    m_clickedY;  //!< Last mouse click Y position, for centering and zooming the view
+        /** Returns the top layer-border coordinate that the user wants the mpWindow to show (it may be not exactly the actual shown coordinate in the case of locked aspect ratio).
+         * @sa Fit
+         */
+        double GetDesiredYmax() {return m_desiredYmax; }
 
-    /** These are updated in Fit() only, and may be different from the real borders (layer coordinates) only if lock aspect ratio is true.
-      */
-    double m_desiredXmin,m_desiredXmax,m_desiredYmin,m_desiredYmax;
+        /** Returns the bounding box coordinates
+          @param bbox Pointer to a 6-element double array where to store bounding box coordinates. */
+        void GetBoundingBox(double* bbox);
 
-    int m_marginTop, m_marginRight, m_marginBottom, m_marginLeft;
+        /** Enable/disable scrollbars
+          @param status Set to true to show scrollbars */
+        void SetMPScrollbars(bool status);
 
-    int         m_last_lx,m_last_ly;   //!< For double buffering
-    wxMemoryDC  m_buff_dc;             //!< For double buffering
-    wxBitmap    *m_buff_bmp;            //!< For double buffering
-    bool        m_enableDoubleBuffer;  //!< For double buffering
-    bool        m_enableMouseNavigation;  //!< For pan/zoom with the mouse.
-    bool        m_mouseMovedAfterRightClick;
-    long        m_mouseRClick_X,m_mouseRClick_Y; //!< For the right button "drag" feature
-    int         m_mouseLClick_X, m_mouseLClick_Y; //!< Starting coords for rectangular zoom selection
-    bool        m_enableScrollBars;
-    int         m_scrollX, m_scrollY;
-    mpInfoLayer* m_movingInfoLayer;      //!< For moving info layers over the window area
+        /** Get scrollbars status.
+          @return true if scrollbars are visible */
+        bool GetMPScrollbars() {return m_enableScrollBars; };
 
-    DECLARE_DYNAMIC_CLASS(mpWindow)
-    DECLARE_EVENT_TABLE()
+        /** Draw the window on a wxBitmap, then save it to a file.
+          @param filename File name where to save the screenshot
+          @param type image type to be saved: see wxImage output file types for flags
+          @param imageSize Set a size for the output image. Default is the same as the screen size
+          @param fit Decide whether to fit the plot into the size*/
+        bool SaveScreenshot(const wxString& filename, int type = wxBITMAP_TYPE_BMP, wxSize imageSize = wxDefaultSize, bool fit = false);
+
+        /** This value sets the zoom steps whenever the user clicks "Zoom in/out" or performs zoom with the mouse wheel.
+         *  It must be a number above unity. This number is used for zoom in, and its inverse for zoom out. Set to 1.5 by default. */
+        static double zoomIncrementalFactor;
+
+        /** Set window margins, creating a blank area where some kinds of layers cannot draw. This is useful for example to draw axes outside the area where the plots are drawn.
+          @param top Top border
+          @param right Right border
+          @param bottom Bottom border
+          @param left Left border */
+        void SetMargins(int top, int right, int bottom, int left);
+
+        /** Set the top margin. @param top Top Margin */
+        void SetMarginTop(int top) { m_marginTop = top; };
+        /** Set the right margin. @param right Right Margin */
+        void SetMarginRight(int right) { m_marginRight = right; };
+        /** Set the bottom margin. @param bottom Bottom Margin */
+        void SetMarginBottom(int bottom) { m_marginBottom = bottom; };
+        /** Set the left margin. @param left Left Margin */
+        void SetMarginLeft(int left) { m_marginLeft = left; };
+
+        /** Get the top margin. @param top Top Margin */
+        int GetMarginTop() { return m_marginTop; };
+        /** Get the right margin. @param right Right Margin */
+        int GetMarginRight() { return m_marginRight; };
+        /** Get the bottom margin. @param bottom Bottom Margin */
+        int GetMarginBottom() { return m_marginBottom; };
+        /** Get the left margin. @param left Left Margin */
+        int GetMarginLeft() { return m_marginLeft; };
+
+        /** Sets whether to show coordinate tooltip when mouse passes over the plot. \param value true for enable, false for disable */
+        // void EnableCoordTooltip(bool value = true);
+        /** Gets coordinate tooltip status. \return true for enable, false for disable */
+        // bool GetCoordTooltip() { return m_coordTooltip; };
+
+        /** Check if a given point is inside the area of a mpInfoLayer and eventually returns its pointer.
+          @param point The position to be checked
+          @return If an info layer is found, returns its pointer, NULL otherwise */
+        mpInfoLayer* IsInsideInfoLayer(wxPoint& point);
+
+        /** Sets the visibility of a layer by its name.
+          @param name The layer name to set visibility
+          @param viewable the view status to be set */
+        void SetLayerVisible(const wxString &name, bool viewable);
+
+        /** Check whether a layer with given name is visible
+          @param name The layer name
+          @return layer visibility status */
+        bool IsLayerVisible(const wxString &name );
+
+        /** Sets the visibility of a layer by its position in layer list.
+          @param position The layer position in layer list
+          @param viewable the view status to be set */
+        void SetLayerVisible(const unsigned int position, bool viewable);
+
+        /** Check whether the layer at given position is visible
+          @param position The layer position in layer list
+          @return layer visibility status */
+        bool IsLayerVisible(const unsigned int position );
+
+        /** Set Color theme. Provide colours to set a new colour theme.
+          @param bgColour Background colour
+          @param drawColour The colour used to draw all elements in foreground, axes excluded
+          @param axesColour The colour used to draw axes (but not their labels) */
+        void SetColourTheme(const wxColour& bgColour, const wxColour& drawColour, const wxColour& axesColour);
+
+        /** Get axes draw colour
+          @return reference to axis colour used in theme */
+        const wxColour& GetAxesColour() { return m_axColour; };
+
+    protected:
+        void OnPaint         (wxPaintEvent     &event); //!< Paint handler, will plot all attached layers
+        void OnSize          (wxSizeEvent      &event); //!< Size handler, will update scroll bar sizes
+        // void OnScroll2       (wxScrollWinEvent &event); //!< Scroll handler, will move canvas
+        void OnShowPopupMenu (wxMouseEvent     &event); //!< Mouse handler, will show context menu
+        void OnMouseRightDown(wxMouseEvent     &event); //!< Mouse handler, for detecting when the user drags with the right button or just "clicks" for the menu
+        void OnCenter        (wxCommandEvent   &event); //!< Context menu handler
+        void OnFit           (wxCommandEvent   &event); //!< Context menu handler
+        void OnZoomIn        (wxCommandEvent   &event); //!< Context menu handler
+        void OnZoomOut       (wxCommandEvent   &event); //!< Context menu handler
+        void OnLockAspect    (wxCommandEvent   &event); //!< Context menu handler
+        void OnMouseHelp     (wxCommandEvent   &event); //!< Context menu handler
+        void OnMouseWheel    (wxMouseEvent     &event); //!< Mouse handler for the wheel
+        void OnMouseMove     (wxMouseEvent     &event); //!< Mouse handler for mouse motion (for pan)
+        void OnMouseLeftDown (wxMouseEvent     &event); //!< Mouse left click (for rect zoom)
+        void OnMouseLeftRelease (wxMouseEvent  &event); //!< Mouse left click (for rect zoom)
+        void OnScrollThumbTrack (wxScrollWinEvent &event); //!< Scroll thumb on scroll bar moving
+        void OnScrollPageUp     (wxScrollWinEvent &event); //!< Scroll page up
+        void OnScrollPageDown   (wxScrollWinEvent &event); //!< Scroll page down
+        void OnScrollLineUp     (wxScrollWinEvent &event); //!< Scroll line up
+        void OnScrollLineDown   (wxScrollWinEvent &event); //!< Scroll line down
+        void OnScrollTop        (wxScrollWinEvent &event); //!< Scroll to top
+        void OnScrollBottom     (wxScrollWinEvent &event); //!< Scroll to bottom
+
+        void DoScrollCalc    (const int position, const int orientation);
+
+        void DoZoomInXCalc   (const int         staticXpixel);
+        void DoZoomInYCalc   (const int         staticYpixel);
+        void DoZoomOutXCalc  (const int         staticXpixel);
+        void DoZoomOutYCalc  (const int         staticYpixel);
+
+        /** Recalculate global layer bounding box, and save it in m_minX,...
+         * \return true if there is any valid BBox information.
+         */
+        virtual bool UpdateBBox();
+
+        //wxList m_layers;    //!< List of attached plot layers
+        wxLayerList m_layers; //!< List of attached plot layers
+        wxMenu m_popmenu;   //!< Canvas' context menu
+        bool   m_lockaspect;//!< Scale aspect is locked or not
+        // bool   m_coordTooltip; //!< Selects whether to show coordinate tooltip
+        wxColour m_bgColour;	//!< Background Colour
+        wxColour m_fgColour;	//!< Foreground Colour
+        wxColour m_axColour;	//!< Axes Colour
+
+        double m_minX;      //!< Global layer bounding box, left border incl.
+        double m_maxX;      //!< Global layer bounding box, right border incl.
+        double m_minY;      //!< Global layer bounding box, bottom border incl.
+        double m_maxY;      //!< Global layer bounding box, top border incl.
+        double m_scaleX;    //!< Current view's X scale
+        double m_scaleY;    //!< Current view's Y scale
+        double m_posX;      //!< Current view's X position
+        double m_posY;      //!< Current view's Y position
+        int    m_scrX;      //!< Current view's X dimension
+        int    m_scrY;      //!< Current view's Y dimension
+        int    m_clickedX;  //!< Last mouse click X position, for centering and zooming the view
+        int    m_clickedY;  //!< Last mouse click Y position, for centering and zooming the view
+
+        /** These are updated in Fit() only, and may be different from the real borders (layer coordinates) only if lock aspect ratio is true.
+        */
+        double m_desiredXmin,m_desiredXmax,m_desiredYmin,m_desiredYmax;
+
+        int m_marginTop, m_marginRight, m_marginBottom, m_marginLeft;
+
+        int         m_last_lx,m_last_ly;   //!< For double buffering
+        wxMemoryDC  m_buff_dc;             //!< For double buffering
+        wxBitmap    *m_buff_bmp;            //!< For double buffering
+        bool        m_enableDoubleBuffer;  //!< For double buffering
+        bool        m_enableMouseNavigation;  //!< For pan/zoom with the mouse.
+        bool        m_mouseMovedAfterRightClick;
+        long        m_mouseRClick_X,m_mouseRClick_Y; //!< For the right button "drag" feature
+        int         m_mouseLClick_X, m_mouseLClick_Y; //!< Starting coords for rectangular zoom selection
+        bool        m_enableScrollBars;
+        int         m_scrollX, m_scrollY;
+        mpInfoLayer* m_movingInfoLayer;      //!< For moving info layers over the window area
+
+        DECLARE_DYNAMIC_CLASS(mpWindow)
+            DECLARE_EVENT_TABLE()
 };
 
 //-----------------------------------------------------------------------------
@@ -1241,87 +1241,87 @@ protected:
 //-----------------------------------------------------------------------------
 
 /** A class providing graphs functionality for a 2D plot (either continuous or a set of points), from vectors of data.
-     This class can be used directly, the user does not need to derive any new class. Simply pass the data as two vectors
-     with the same length containing the X and Y coordinates to the method SetData.
+  This class can be used directly, the user does not need to derive any new class. Simply pass the data as two vectors
+  with the same length containing the X and Y coordinates to the method SetData.
 
-     To generate a graph with a set of points, call
-     \code
-     layerVar->SetContinuity(false)
-     \endcode
+  To generate a graph with a set of points, call
+  \code
+  layerVar->SetContinuity(false)
+  \endcode
 
-     or
+  or
 
-     \code
-     layerVar->SetContinuity(true)
-     \endcode
+  \code
+  layerVar->SetContinuity(true)
+  \endcode
 
-     to render the sequence of coordinates as a continuous line.
+  to render the sequence of coordinates as a continuous line.
 
-     (Added: Jose Luis Blanco, AGO-2007)
-*/
+  (Added: Jose Luis Blanco, AGO-2007)
+  */
 class WXDLLIMPEXP_MATHPLOT mpFXYVector : public mpFXY
 {
-public:
-    /** @param name  Label
-        @param flags Label alignment, pass one of #mpALIGN_NE, #mpALIGN_NW, #mpALIGN_SW, #mpALIGN_SE.
-    */
-    mpFXYVector(wxString name = wxEmptyString, int flags = mpALIGN_NE);
+    public:
+        /** @param name  Label
+          @param flags Label alignment, pass one of #mpALIGN_NE, #mpALIGN_NW, #mpALIGN_SW, #mpALIGN_SE.
+          */
+        mpFXYVector(wxString name = wxEmptyString, int flags = mpALIGN_NE);
 
-    /** Changes the internal data: the set of points to draw.
-        Both vectors MUST be of the same length. This method DOES NOT refresh the mpWindow; do it manually.
-      * @sa Clear
-    */
-    void SetData( const std::vector<double> &xs,const std::vector<double> &ys);
+        /** Changes the internal data: the set of points to draw.
+          Both vectors MUST be of the same length. This method DOES NOT refresh the mpWindow; do it manually.
+         * @sa Clear
+         */
+        void SetData( const std::vector<double> &xs,const std::vector<double> &ys);
 
-    /** Clears all the data, leaving the layer empty.
-      * @sa SetData
-      */
-    void Clear();
+        /** Clears all the data, leaving the layer empty.
+         * @sa SetData
+         */
+        void Clear();
 
-protected:
-    /** The internal copy of the set of data to draw.
-      */
-    std::vector<double>  m_xs,m_ys;
+    protected:
+        /** The internal copy of the set of data to draw.
+        */
+        std::vector<double>  m_xs,m_ys;
 
-    /** The internal counter for the "GetNextXY" interface
-      */
-    size_t              m_index;
+        /** The internal counter for the "GetNextXY" interface
+        */
+        size_t              m_index;
 
-    /** Loaded at SetData
-      */
-    double              m_minX,m_maxX,m_minY,m_maxY;
+        /** Loaded at SetData
+        */
+        double              m_minX,m_maxX,m_minY,m_maxY;
 
-    /** Rewind value enumeration with mpFXY::GetNextXY.
-        Overridden in this implementation.
-    */
-    void Rewind();
+        /** Rewind value enumeration with mpFXY::GetNextXY.
+          Overridden in this implementation.
+          */
+        void Rewind();
 
-    /** Get locus value for next N.
-        Overridden in this implementation.
-        @param x Returns X value
-        @param y Returns Y value
-    */
-    bool GetNextXY(double & x, double & y);
+        /** Get locus value for next N.
+          Overridden in this implementation.
+          @param x Returns X value
+          @param y Returns Y value
+          */
+        bool GetNextXY(double & x, double & y);
 
-    /** Returns the actual minimum X data (loaded in SetData).
-      */
-    double GetMinX() { return m_minX; }
+        /** Returns the actual minimum X data (loaded in SetData).
+        */
+        double GetMinX() { return m_minX; }
 
-    /** Returns the actual minimum Y data (loaded in SetData).
-      */
-    double GetMinY() { return m_minY; }
+        /** Returns the actual minimum Y data (loaded in SetData).
+        */
+        double GetMinY() { return m_minY; }
 
-    /** Returns the actual maximum X data (loaded in SetData).
-      */
-    double GetMaxX() { return m_maxX; }
+        /** Returns the actual maximum X data (loaded in SetData).
+        */
+        double GetMaxX() { return m_maxX; }
 
-    /** Returns the actual maximum Y data (loaded in SetData).
-      */
-    double GetMaxY() { return m_maxY; }
+        /** Returns the actual maximum Y data (loaded in SetData).
+        */
+        double GetMaxY() { return m_maxY; }
 
-    int     m_flags; //!< Holds label alignment
+        int     m_flags; //!< Holds label alignment
 
-    DECLARE_DYNAMIC_CLASS(mpFXYVector)
+        DECLARE_DYNAMIC_CLASS(mpFXYVector)
 };
 
 //-----------------------------------------------------------------------------
@@ -1329,31 +1329,31 @@ protected:
 //-----------------------------------------------------------------------------
 
 /** Plot layer implementing a text string.
-The text is plotted using a percentage system 0-100%, so the actual
-coordinates for the location are not required, and the text stays
-on the plot reguardless of the other layers location and scaling
-factors.
-*/
+  The text is plotted using a percentage system 0-100%, so the actual
+  coordinates for the location are not required, and the text stays
+  on the plot reguardless of the other layers location and scaling
+  factors.
+  */
 class WXDLLIMPEXP_MATHPLOT mpText : public mpLayer
 {
-public:
-    /** @param name text to be drawn in the plot
-        @param offsetx holds offset for the X location in percentage (0-100)
-        @param offsety holds offset for the Y location in percentage (0-100) */
-    mpText(wxString name = wxT("Title"), int offsetx = 5, int offsety = 50);
+    public:
+        /** @param name text to be drawn in the plot
+          @param offsetx holds offset for the X location in percentage (0-100)
+          @param offsety holds offset for the Y location in percentage (0-100) */
+        mpText(wxString name = wxT("Title"), int offsetx = 5, int offsety = 50);
 
-    /** Text Layer plot handler.
-        This implementation will plot text adjusted to the visible area. */
-    virtual void Plot(wxDC & dc, mpWindow & w);
+        /** Text Layer plot handler.
+          This implementation will plot text adjusted to the visible area. */
+        virtual void Plot(wxDC & dc, mpWindow & w);
 
-    /** mpText should not be used for scaling decisions. */
-    virtual bool HasBBox() { return FALSE; }
+        /** mpText should not be used for scaling decisions. */
+        virtual bool HasBBox() { return FALSE; }
 
-protected:
-    int m_offsetx; //!< Holds offset for X in percentage
-    int m_offsety; //!< Holds offset for Y in percentage
+    protected:
+        int m_offsetx; //!< Holds offset for X in percentage
+        int m_offsety; //!< Holds offset for Y in percentage
 
-    DECLARE_DYNAMIC_CLASS(mpText)
+        DECLARE_DYNAMIC_CLASS(mpText)
 };
 
 
@@ -1362,22 +1362,22 @@ protected:
 //-----------------------------------------------------------------------------
 
 /** Printout class used by mpWindow to draw in the objects to be printed.
-    The object itself can then used by the default wxWidgets printing system
-    to print mppWindow objects.
-*/
+  The object itself can then used by the default wxWidgets printing system
+  to print mppWindow objects.
+  */
 class WXDLLIMPEXP_MATHPLOT mpPrintout : public wxPrintout
 {
-public:
-    mpPrintout(mpWindow* drawWindow, const wxChar *title = _T("wxMathPlot print output"));
-    virtual ~mpPrintout() {};
+    public:
+        mpPrintout(mpWindow* drawWindow, const wxChar *title = _T("wxMathPlot print output"));
+        virtual ~mpPrintout() {};
 
-    void SetDrawState(bool drawState) {drawn = drawState;};
-    bool OnPrintPage(int page);
-    bool HasPage(int page);
+        void SetDrawState(bool drawState) {drawn = drawState;};
+        bool OnPrintPage(int page);
+        bool HasPage(int page);
 
-private:
-    bool drawn;
-    mpWindow *plotWindow;
+    private:
+        bool drawn;
+        mpWindow *plotWindow;
 };
 
 
@@ -1385,102 +1385,102 @@ private:
 // mpMovableObject  - provided by Jose Luis Blanco
 //-----------------------------------------------------------------------------
 /** This virtual class represents objects that can be moved to an arbitrary 2D location+rotation.
-  *  The current transformation is set through SetCoordinateBase.
-  *  To ease the implementation of descendent classes, mpMovableObject will
-  *  be in charge of Bounding Box computation and layer rendering, assuming that
-  *  the object updates its shape in m_shape_xs & m_shape_ys.
-  */
+ *  The current transformation is set through SetCoordinateBase.
+ *  To ease the implementation of descendent classes, mpMovableObject will
+ *  be in charge of Bounding Box computation and layer rendering, assuming that
+ *  the object updates its shape in m_shape_xs & m_shape_ys.
+ */
 class WXDLLIMPEXP_MATHPLOT mpMovableObject : public mpLayer
 {
-public:
-    /** Default constructor (sets location and rotation to (0,0,0))
-      */
-    mpMovableObject( ) :
-        m_reference_x(0),
-        m_reference_y(0),
-        m_reference_phi(0),
-        m_shape_xs(0),
-        m_shape_ys(0)
+    public:
+        /** Default constructor (sets location and rotation to (0,0,0))
+        */
+        mpMovableObject( ) :
+            m_reference_x(0),
+            m_reference_y(0),
+            m_reference_phi(0),
+            m_shape_xs(0),
+            m_shape_ys(0)
     {
         m_type = mpLAYER_PLOT;
     }
 
-    virtual ~mpMovableObject() {};
+        virtual ~mpMovableObject() {};
 
-    /** Get the current coordinate transformation.
-      */
-    void GetCoordinateBase( double &x, double &y, double &phi ) const
-    {
-        x = m_reference_x;
-        y = m_reference_y;
-        phi = m_reference_phi;
-    }
+        /** Get the current coordinate transformation.
+        */
+        void GetCoordinateBase( double &x, double &y, double &phi ) const
+        {
+            x = m_reference_x;
+            y = m_reference_y;
+            phi = m_reference_phi;
+        }
 
-    /** Set the coordinate transformation (phi in radians, 0 means no rotation).
-      */
-    void SetCoordinateBase( double x, double y, double phi = 0 )
-    {
-        m_reference_x = x;
-        m_reference_y = y;
-        m_reference_phi = phi;
-        m_flags  = mpALIGN_NE;
-        ShapeUpdated();
-    }
+        /** Set the coordinate transformation (phi in radians, 0 means no rotation).
+        */
+        void SetCoordinateBase( double x, double y, double phi = 0 )
+        {
+            m_reference_x = x;
+            m_reference_y = y;
+            m_reference_phi = phi;
+            m_flags  = mpALIGN_NE;
+            ShapeUpdated();
+        }
 
-    virtual bool HasBBox() { return m_trans_shape_xs.size()!=0; }
+        virtual bool HasBBox() { return m_trans_shape_xs.size()!=0; }
 
-    /** Get inclusive left border of bounding box.
-    */
-    virtual double GetMinX() { return m_bbox_min_x; }
+        /** Get inclusive left border of bounding box.
+        */
+        virtual double GetMinX() { return m_bbox_min_x; }
 
-    /** Get inclusive right border of bounding box.
-    */
-    virtual double GetMaxX() { return  m_bbox_max_x; }
+        /** Get inclusive right border of bounding box.
+        */
+        virtual double GetMaxX() { return  m_bbox_max_x; }
 
-    /** Get inclusive bottom border of bounding box.
-    */
-    virtual double GetMinY() { return m_bbox_min_y; }
+        /** Get inclusive bottom border of bounding box.
+        */
+        virtual double GetMinY() { return m_bbox_min_y; }
 
-    /** Get inclusive top border of bounding box.
-    */
-    virtual double GetMaxY() { return m_bbox_max_y; }
+        /** Get inclusive top border of bounding box.
+        */
+        virtual double GetMaxY() { return m_bbox_max_y; }
 
-    virtual void   Plot(wxDC & dc, mpWindow & w);
+        virtual void   Plot(wxDC & dc, mpWindow & w);
 
-    /** Set label axis alignment.
-      *  @param align alignment (choose between mpALIGN_NE, mpALIGN_NW, mpALIGN_SW, mpALIGN_SE
-      */
-    void SetAlign(int align) { m_flags = align; };
+        /** Set label axis alignment.
+         *  @param align alignment (choose between mpALIGN_NE, mpALIGN_NW, mpALIGN_SW, mpALIGN_SE
+         */
+        void SetAlign(int align) { m_flags = align; };
 
-protected:
-    int m_flags; //!< Holds label alignment
+    protected:
+        int m_flags; //!< Holds label alignment
 
-    /** The coordinates of the object (orientation "phi" is in radians).
-      */
-    double m_reference_x,m_reference_y,m_reference_phi;
+        /** The coordinates of the object (orientation "phi" is in radians).
+        */
+        double m_reference_x,m_reference_y,m_reference_phi;
 
-    /** A method for 2D translation and rotation, using the current transformation stored in m_reference_x,m_reference_y,m_reference_phi.
-      */
-    void TranslatePoint( double x,double y, double &out_x, double &out_y );
+        /** A method for 2D translation and rotation, using the current transformation stored in m_reference_x,m_reference_y,m_reference_phi.
+        */
+        void TranslatePoint( double x,double y, double &out_x, double &out_y );
 
-    /** This contains the object points, in local coordinates (to be transformed by the current transformation).
-      */
-    std::vector<double>  m_shape_xs,m_shape_ys;
+        /** This contains the object points, in local coordinates (to be transformed by the current transformation).
+        */
+        std::vector<double>  m_shape_xs,m_shape_ys;
 
-    /** The buffer for the translated & rotated points (to avoid recomputing them with each mpWindow refresh).
-      *
-      */
-    std::vector<double>  m_trans_shape_xs,m_trans_shape_ys;
+        /** The buffer for the translated & rotated points (to avoid recomputing them with each mpWindow refresh).
+         *
+         */
+        std::vector<double>  m_trans_shape_xs,m_trans_shape_ys;
 
-    /** The precomputed bounding box:
-      * @sa ShapeUpdated
-      */
-    double  m_bbox_min_x,m_bbox_max_x,m_bbox_min_y,m_bbox_max_y;
+        /** The precomputed bounding box:
+         * @sa ShapeUpdated
+         */
+        double  m_bbox_min_x,m_bbox_max_x,m_bbox_min_y,m_bbox_max_y;
 
-    /** Must be called by the descendent class after updating the shape (m_shape_xs/ys), or when the transformation changes.
-      *  This method updates the buffers m_trans_shape_xs/ys, and the precomputed bounding box.
-      */
-    void ShapeUpdated();
+        /** Must be called by the descendent class after updating the shape (m_shape_xs/ys), or when the transformation changes.
+         *  This method updates the buffers m_trans_shape_xs/ys, and the precomputed bounding box.
+         */
+        void ShapeUpdated();
 
 };
 
@@ -1488,29 +1488,29 @@ protected:
 // mpCovarianceEllipse  - provided by Jose Luis Blanco
 //-----------------------------------------------------------------------------
 /** A 2D ellipse, described by a 2x2 covariance matrix.
-  *  The relation between the multivariate Gaussian confidence interval and
-  *   the "quantiles" in this class is:
-  *     - 1 : 68.27% confidence interval
-  *     - 2 : 95.45%
-  *     - 3 : 99.73%
-  *     - 4 : 99.994%
-  * For example, see http://en.wikipedia.org/wiki/Normal_distribution#Standard_deviation_and_confidence_intervals
-  *
-  * The ellipse will be always centered at the origin. Use mpMovableObject::SetCoordinateBase to move it.
-  */
+ *  The relation between the multivariate Gaussian confidence interval and
+ *   the "quantiles" in this class is:
+ *     - 1 : 68.27% confidence interval
+ *     - 2 : 95.45%
+ *     - 3 : 99.73%
+ *     - 4 : 99.994%
+ * For example, see http://en.wikipedia.org/wiki/Normal_distribution#Standard_deviation_and_confidence_intervals
+ *
+ * The ellipse will be always centered at the origin. Use mpMovableObject::SetCoordinateBase to move it.
+ */
 class WXDLLIMPEXP_MATHPLOT mpCovarianceEllipse : public mpMovableObject
 {
-public:
-    /** Default constructor.
-      * Initializes to a unity diagonal covariance matrix, a 95% confidence interval (2 sigmas), 32 segments, and a continuous plot (m_continuous=true).
-      */
-    mpCovarianceEllipse(
-        double cov_00 = 1,
-        double cov_11 = 1,
-        double cov_01 = 0,
-        double quantiles = 2,
-        int    segments = 32,
-        const wxString & layerName = wxT("") ) :
+    public:
+        /** Default constructor.
+         * Initializes to a unity diagonal covariance matrix, a 95% confidence interval (2 sigmas), 32 segments, and a continuous plot (m_continuous=true).
+         */
+        mpCovarianceEllipse(
+                double cov_00 = 1,
+                double cov_11 = 1,
+                double cov_01 = 0,
+                double quantiles = 2,
+                int    segments = 32,
+                const wxString & layerName = wxT("") ) :
             m_cov_00(cov_00),
             m_cov_11(cov_11),
             m_cov_01(cov_01),
@@ -1523,84 +1523,84 @@ public:
         m_type = mpLAYER_PLOT;
     }
 
-    virtual ~mpCovarianceEllipse() {}
+        virtual ~mpCovarianceEllipse() {}
 
-    double GetQuantiles() const { return m_quantiles; }
+        double GetQuantiles() const { return m_quantiles; }
 
-    /** Set how many "quantiles" to draw, that is, the confidence interval of the ellipse (see above).
-      */
-    void SetQuantiles(double q)
-    {
-        m_quantiles=q;
-        RecalculateShape();
-    }
+        /** Set how many "quantiles" to draw, that is, the confidence interval of the ellipse (see above).
+        */
+        void SetQuantiles(double q)
+        {
+            m_quantiles=q;
+            RecalculateShape();
+        }
 
-    void SetSegments( int segments ) { m_segments = segments; }
-    int GetSegments( ) const { return m_segments; }
+        void SetSegments( int segments ) { m_segments = segments; }
+        int GetSegments( ) const { return m_segments; }
 
-    /** Returns the elements of the current covariance matrix:
-      */
-    void GetCovarianceMatrix( double &cov_00,double &cov_01,double &cov_11 ) const
-    {
-        cov_00 = m_cov_00;
-        cov_01 = m_cov_01;
-        cov_11 = m_cov_11;
-    }
+        /** Returns the elements of the current covariance matrix:
+        */
+        void GetCovarianceMatrix( double &cov_00,double &cov_01,double &cov_11 ) const
+        {
+            cov_00 = m_cov_00;
+            cov_01 = m_cov_01;
+            cov_11 = m_cov_11;
+        }
 
-    /** Changes the covariance matrix:
-      */
-    void SetCovarianceMatrix( double cov_00,double cov_01,double cov_11 )
-    {
-        m_cov_00 = cov_00;
-        m_cov_01 = cov_01;
-        m_cov_11 = cov_11;
-        RecalculateShape();
-    }
+        /** Changes the covariance matrix:
+        */
+        void SetCovarianceMatrix( double cov_00,double cov_01,double cov_11 )
+        {
+            m_cov_00 = cov_00;
+            m_cov_01 = cov_01;
+            m_cov_11 = cov_11;
+            RecalculateShape();
+        }
 
-protected:
-    /** The elements of the matrix (only 3 since cov(0,1)=cov(1,0) in any positive definite matrix).
-      */
-    double m_cov_00,m_cov_11,m_cov_01;
-    double m_quantiles;
+    protected:
+        /** The elements of the matrix (only 3 since cov(0,1)=cov(1,0) in any positive definite matrix).
+        */
+        double m_cov_00,m_cov_11,m_cov_01;
+        double m_quantiles;
 
-    /** The number of line segments that build up the ellipse.
-      */
-    int m_segments;
+        /** The number of line segments that build up the ellipse.
+        */
+        int m_segments;
 
-    /** Called to update the m_shape_xs, m_shape_ys vectors, whenever a parameter changes.
-      */
-    void RecalculateShape();
+        /** Called to update the m_shape_xs, m_shape_ys vectors, whenever a parameter changes.
+        */
+        void RecalculateShape();
 };
 
 //-----------------------------------------------------------------------------
 // mpPolygon - provided by Jose Luis Blanco
 //-----------------------------------------------------------------------------
 /** An arbitrary polygon, descendant of mpMovableObject.
-  *  Use "setPoints" to set the list of N points. This class also can draw non-closed polygons by
-  *   passing the appropriate parameters to "setPoints". To draw a point-cloud, call "SetContinuity(false)".
-  */
+ *  Use "setPoints" to set the list of N points. This class also can draw non-closed polygons by
+ *   passing the appropriate parameters to "setPoints". To draw a point-cloud, call "SetContinuity(false)".
+ */
 class WXDLLIMPEXP_MATHPLOT mpPolygon : public mpMovableObject
 {
-public:
-    /** Default constructor.
-      */
-    mpPolygon( const wxString & layerName = wxT("") )
-    {
-        m_continuous = true;
-        m_name = layerName;
-    }
+    public:
+        /** Default constructor.
+        */
+        mpPolygon( const wxString & layerName = wxT("") )
+        {
+            m_continuous = true;
+            m_name = layerName;
+        }
 
-    virtual ~mpPolygon() {}
+        virtual ~mpPolygon() {}
 
-    /** Set the points in the polygon.
-      * @param points_xs  The X coordinates of the points.
-      * @param points_ys  The Y coordinates of the points.
-      * @param closedShape If set to true, an additional segment will be added from the last to the first point.
-      */
-    void setPoints(
-        const std::vector<double>&  points_xs,
-        const std::vector<double>&  points_ys,
-        bool                   closedShape=true );
+        /** Set the points in the polygon.
+         * @param points_xs  The X coordinates of the points.
+         * @param points_ys  The Y coordinates of the points.
+         * @param closedShape If set to true, an additional segment will be added from the last to the first point.
+         */
+        void setPoints(
+                const std::vector<double>&  points_xs,
+                const std::vector<double>&  points_ys,
+                bool                   closedShape=true );
 
 
 
@@ -1610,80 +1610,80 @@ public:
 // mpMovableObject  - provided by Jose Luis Blanco
 //-----------------------------------------------------------------------------
 /** This virtual class represents objects that can be moved to an arbitrary 2D location+rotation.
-  *  The current transformation is set through SetCoordinateBase.
-  *  To ease the implementation of descendent classes, mpMovableObject will
-  *  be in charge of Bounding Box computation and layer render, assuming that
-  *  the object updates its shape in m_shape_xs & m_shape_ys.
-  */
+ *  The current transformation is set through SetCoordinateBase.
+ *  To ease the implementation of descendent classes, mpMovableObject will
+ *  be in charge of Bounding Box computation and layer render, assuming that
+ *  the object updates its shape in m_shape_xs & m_shape_ys.
+ */
 class WXDLLIMPEXP_MATHPLOT mpBitmapLayer : public mpLayer
 {
-public:
-    /** Default constructor.
-      */
-    mpBitmapLayer( )
-    {
-        m_min_x = m_max_x =
-        m_min_y = m_max_y = 0;
-        m_validImg = false;
-        m_type = mpLAYER_BITMAP;
-    }
+    public:
+        /** Default constructor.
+        */
+        mpBitmapLayer( )
+        {
+            m_min_x = m_max_x =
+                m_min_y = m_max_y = 0;
+            m_validImg = false;
+            m_type = mpLAYER_BITMAP;
+        }
 
-    virtual ~mpBitmapLayer() {};
+        virtual ~mpBitmapLayer() {};
 
-    /** Returns a copy of the current bitmap assigned to the layer.
-      */
-    void GetBitmapCopy( wxImage &outBmp ) const;
+        /** Returns a copy of the current bitmap assigned to the layer.
+        */
+        void GetBitmapCopy( wxImage &outBmp ) const;
 
-    /** Change the bitmap associated with the layer (to update the screen, refresh the mpWindow).
-      *  @param inBmp The bitmap to associate. A copy is made, thus it can be released after calling this.
-      *  @param x The left corner X coordinate (in plot units).
-      *  @param y The top corner Y coordinate (in plot units).
-      *  @param lx The width in plot units.
-      *  @param ly The height in plot units.
-      */
-    void SetBitmap( const wxImage &inBmp, double x, double y, double lx, double ly );
+        /** Change the bitmap associated with the layer (to update the screen, refresh the mpWindow).
+         *  @param inBmp The bitmap to associate. A copy is made, thus it can be released after calling this.
+         *  @param x The left corner X coordinate (in plot units).
+         *  @param y The top corner Y coordinate (in plot units).
+         *  @param lx The width in plot units.
+         *  @param ly The height in plot units.
+         */
+        void SetBitmap( const wxImage &inBmp, double x, double y, double lx, double ly );
 
-    virtual bool HasBBox() { return true; }
+        virtual bool HasBBox() { return true; }
 
-    /** Get inclusive left border of bounding box.
-    */
-    virtual double GetMinX() { return m_min_x; }
+        /** Get inclusive left border of bounding box.
+        */
+        virtual double GetMinX() { return m_min_x; }
 
-    /** Get inclusive right border of bounding box.
-    */
-    virtual double GetMaxX() { return  m_max_x; }
+        /** Get inclusive right border of bounding box.
+        */
+        virtual double GetMaxX() { return  m_max_x; }
 
-    /** Get inclusive bottom border of bounding box.
-    */
-    virtual double GetMinY() { return m_min_y; }
+        /** Get inclusive bottom border of bounding box.
+        */
+        virtual double GetMinY() { return m_min_y; }
 
-    /** Get inclusive top border of bounding box.
-    */
-    virtual double GetMaxY() { return m_max_y; }
+        /** Get inclusive top border of bounding box.
+        */
+        virtual double GetMaxY() { return m_max_y; }
 
-    virtual void   Plot(wxDC & dc, mpWindow & w);
+        virtual void   Plot(wxDC & dc, mpWindow & w);
 
-    /** Set label axis alignment.
-      *  @param align alignment (choose between mpALIGN_NE, mpALIGN_NW, mpALIGN_SW, mpALIGN_SE
-      */
-    void SetAlign(int align) { m_flags = align; };
+        /** Set label axis alignment.
+         *  @param align alignment (choose between mpALIGN_NE, mpALIGN_NW, mpALIGN_SW, mpALIGN_SE
+         */
+        void SetAlign(int align) { m_flags = align; };
 
-protected:
-    int m_flags; //!< Holds label alignment
+    protected:
+        int m_flags; //!< Holds label alignment
 
-    /** The internal copy of the Bitmap:
-      */
-    wxImage      m_bitmap;
-    wxBitmap     m_scaledBitmap;
-    wxCoord      m_scaledBitmap_offset_x,m_scaledBitmap_offset_y;
+        /** The internal copy of the Bitmap:
+        */
+        wxImage      m_bitmap;
+        wxBitmap     m_scaledBitmap;
+        wxCoord      m_scaledBitmap_offset_x,m_scaledBitmap_offset_y;
 
 
-    bool            m_validImg;
+        bool            m_validImg;
 
 
-    /** The shape of the bitmap:
-      */
-    double  m_min_x,m_max_x,m_min_y,m_max_y;
+        /** The shape of the bitmap:
+        */
+        double  m_min_x,m_max_x,m_min_y,m_max_y;
 
 
 };

From f3fabeb9fbeea74f575376ffe1fb27162ed5831f Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:25 +0200
Subject: [PATCH 050/197] Right click context menu for signals (including
 adding cursors)

---
 eeschema/sim/sim_plot_frame.cpp      |  73 ++++++++++++++++++
 eeschema/sim/sim_plot_frame.h        |  22 ++++++
 eeschema/sim/sim_plot_frame_base.cpp |   2 +
 eeschema/sim/sim_plot_frame_base.fbp |   4 +-
 eeschema/sim/sim_plot_frame_base.h   |   1 +
 eeschema/sim/sim_plot_panel.cpp      |  49 ++++++++++--
 eeschema/sim/sim_plot_panel.h        | 110 +++++++++++++++++++--------
 include/widgets/mathplot.h           |   4 +-
 8 files changed, 222 insertions(+), 43 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index b459d69052..202804f3f1 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -235,6 +235,24 @@ void SIM_PLOT_FRAME::onSignalDblClick( wxCommandEvent& event )
 }
 
 
+void SIM_PLOT_FRAME::onSignalRClick( wxMouseEvent& event )
+{
+    int idx = m_signals->HitTest( event.GetPosition() );
+
+    if( idx != wxNOT_FOUND )
+        m_signals->SetSelection( idx );
+
+    idx = m_signals->GetSelection();
+
+    if( idx != wxNOT_FOUND )
+    {
+        const wxString& netName = m_signals->GetString( idx );
+        SIGNAL_CONTEXT_MENU ctxMenu( netName, this );
+        m_signals->PopupMenu( &ctxMenu );
+    }
+}
+
+
 void SIM_PLOT_FRAME::onSimulate( wxCommandEvent& event )
 {
     if( isSimulationRunning() )
@@ -291,6 +309,8 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
 
         for( const auto& trace : plotPanel->GetTraces() )
             updatePlot( trace.second->GetSpiceName(), trace.second->GetName(), plotPanel );
+
+        plotPanel->UpdateAll();
     }
 }
 
@@ -301,3 +321,56 @@ void SIM_PLOT_FRAME::onSimReport( wxCommandEvent& aEvent )
     m_simConsole->Newline();
     m_simConsole->MoveEnd();        /// @todo does not work..
 }
+
+
+SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::SIGNAL_CONTEXT_MENU( const wxString& aSignal,
+        SIM_PLOT_FRAME* aPlotFrame )
+    : m_signal( aSignal ), m_plotFrame( aPlotFrame )
+{
+    SIM_PLOT_PANEL* plot = m_plotFrame->CurrentPlot();
+
+    if( plot->IsShown( m_signal ) )
+    {
+        Append( HIDE_SIGNAL, wxT( "Hide signal" ) );
+
+        TRACE* trace = plot->GetTrace( m_signal );
+
+        if( trace->HasCursor() )
+            Append( HIDE_CURSOR, wxT( "Hide cursor" ) );
+        else
+            Append( SHOW_CURSOR, wxT( "Show cursor" ) );
+    }
+    else
+    {
+        Append( SHOW_SIGNAL, wxT( "Show signal" ) );
+    }
+
+    Connect( wxEVT_COMMAND_MENU_SELECTED, wxMenuEventHandler( SIGNAL_CONTEXT_MENU::onMenuEvent ), NULL, this );
+}
+
+
+void SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::onMenuEvent( wxMenuEvent& aEvent )
+{
+    SIM_PLOT_PANEL* plot = m_plotFrame->CurrentPlot();
+
+    switch( aEvent.GetId() )
+    {
+        case SHOW_SIGNAL:
+            m_plotFrame->AddVoltagePlot( m_signal );
+            break;
+
+            break;
+        case HIDE_SIGNAL:
+            plot->DeleteTrace( m_signal );
+            break;
+
+        case SHOW_CURSOR:
+            plot->EnableCursor( m_signal, true );
+            break;
+
+        case HIDE_CURSOR:
+            plot->EnableCursor( m_signal, false );
+            break;
+    }
+}
+
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 7ebd542f60..cc27d69cd7 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -99,6 +99,7 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
 
         // Event handlers
         void onSignalDblClick( wxCommandEvent& event ) override;
+        void onSignalRClick( wxMouseEvent& event ) override;
         void onSimulate( wxCommandEvent& event ) override;
         void onPlaceProbe( wxCommandEvent& event ) override;
 
@@ -111,6 +112,27 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         SCH_EDIT_FRAME* m_schematicFrame;
         NETLIST_EXPORTER_PSPICE* m_exporter;
         SPICE_SIMULATOR* m_simulator;
+
+        // Right click context menu for signals in the listbox
+        class SIGNAL_CONTEXT_MENU : public wxMenu
+        {
+            public:
+                SIGNAL_CONTEXT_MENU( const wxString& aSignal, SIM_PLOT_FRAME* aPlotFrame );
+
+            private:
+                void onMenuEvent( wxMenuEvent& aEvent );
+
+                const wxString& m_signal;
+                SIM_PLOT_FRAME* m_plotFrame;
+
+                enum SIGNAL_CONTEXT_MENU_EVENTS
+                {
+                    SHOW_SIGNAL,
+                    HIDE_SIGNAL,
+                    SHOW_CURSOR,
+                    HIDE_CURSOR
+                };
+        };
 };
 
 wxDEFINE_EVENT( wxEVT_SIM_REPORT, wxCommandEvent );
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index cfb4b4475d..2af6beee43 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -157,6 +157,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	this->Connect( m_menuShowGrid->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowGrid ) );
 	this->Connect( m_menuShowGrid->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridState ) );
 	m_signals->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
+	m_signals->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
 	m_simulateBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
 	m_probeBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onPlaceProbe ), NULL, this );
 	m_tuneBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onTune ), NULL, this );
@@ -175,6 +176,7 @@ SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowGrid ) );
 	this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridState ) );
 	m_signals->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
+	m_signals->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
 	m_simulateBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
 	m_probeBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onPlaceProbe ), NULL, this );
 	m_tuneBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onTune ), NULL, this );
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index e837859bb3..6113f943d7 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -206,7 +206,7 @@
                         <event name="OnUpdateUI"></event>
                     </object>
                 </object>
-                <object class="wxMenu" expanded="0">
+                <object class="wxMenu" expanded="1">
                     <property name="label">View</property>
                     <property name="name">m_viewMenu</property>
                     <property name="permission">protected</property>
@@ -790,7 +790,7 @@
                                                 <event name="OnPaint"></event>
                                                 <event name="OnRightDClick"></event>
                                                 <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
+                                                <event name="OnRightUp">onSignalRClick</event>
                                                 <event name="OnSetFocus"></event>
                                                 <event name="OnSize"></event>
                                                 <event name="OnUpdateUI"></event>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index 9e76574943..34d9556b10 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -69,6 +69,7 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		virtual void menuShowGrid( wxCommandEvent& event ) { event.Skip(); }
 		virtual void menuShowGridState( wxUpdateUIEvent& event ) { event.Skip(); }
 		virtual void onSignalDblClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSignalRClick( wxMouseEvent& event ) { event.Skip(); }
 		virtual void onSimulate( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onPlaceProbe( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onTune( wxCommandEvent& event ) { event.Skip(); }
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index a2d02e025b..c960615965 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -43,7 +43,7 @@ void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
     if( dataX.size() <= 1 )
         return;
 
-    if( m_moved )
+    if( m_updateRequired )
     {
         m_coords.x = aWindow.p2x( m_dim.x );
 
@@ -72,7 +72,7 @@ void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
         const double rightY = dataY[maxIdx];
 
         m_coords.y = leftY + ( rightY - leftY ) / ( rightX - leftX ) * ( m_coords.x - leftX );
-        m_moved = false;
+        m_updateRequired = false;
     }
     else
     {
@@ -156,12 +156,17 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
 
 bool SIM_PLOT_PANEL::DeleteTrace( const wxString& aName )
 {
-    auto trace = m_traces.find( aName );
+    auto it = m_traces.find( aName );
 
-    if( trace != m_traces.end() )
+    if( it != m_traces.end() )
     {
-        m_traces.erase( trace );
-        DelLayer( trace->second, true, true );
+        m_traces.erase( it );
+        TRACE* trace = it->second;
+
+        if( CURSOR* cursor = trace->GetCursor() )
+            DelLayer( cursor, true );
+
+        DelLayer( trace, true, true );
 
         return true;
     }
@@ -174,7 +179,7 @@ void SIM_PLOT_PANEL::DeleteAllTraces()
 {
     for( auto& t : m_traces )
     {
-        DelLayer( t.second, true );
+        DeleteTrace( t.first );
     }
 
     m_traces.clear();
@@ -196,6 +201,36 @@ bool SIM_PLOT_PANEL::IsGridShown() const
 }
 
 
+bool SIM_PLOT_PANEL::HasCursorEnabled( const wxString& aName ) const
+{
+    TRACE* t = GetTrace( aName );
+
+    return t ? t->HasCursor() : false;
+}
+
+
+void SIM_PLOT_PANEL::EnableCursor( const wxString& aName, bool aEnable )
+{
+    TRACE* t = GetTrace( aName );
+
+    if( t == nullptr || t->HasCursor() == aEnable )
+        return;
+
+    if( aEnable )
+    {
+        CURSOR* c = new CURSOR( t );
+        t->SetCursor( c );
+        AddLayer( c );
+    }
+    else
+    {
+        CURSOR* c = t->GetCursor();
+        t->SetCursor( NULL );
+        DelLayer( c, true );
+    }
+}
+
+
 wxColour SIM_PLOT_PANEL::generateColor()
 {
     /// @todo have a look at:
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index d25896d755..202a9fb5f2 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -29,46 +29,24 @@
 #include <widgets/mathplot.h>
 #include <map>
 
-class TRACE : public mpFXYVector
-{
-public:
-    TRACE( const wxString& aName, const wxString& aSpiceName )
-        : mpFXYVector( aName ), m_spiceName( aSpiceName )
-    {
-        SetContinuity( true );
-        ShowName( false );
-    }
-
-    const wxString& GetSpiceName() const
-    {
-        return m_spiceName;
-    }
-
-    const std::vector<double>& GetDataX() const
-    {
-        return m_xs;
-    }
-
-    const std::vector<double>& GetDataY() const
-    {
-        return m_ys;
-    }
-
-private:
-    wxString m_spiceName;
-};
+class TRACE;
 
 class CURSOR : public mpInfoLayer
 {
 public:
     CURSOR( const TRACE* aTrace )
         : mpInfoLayer( wxRect( 0, 0, DRAG_MARGIN, DRAG_MARGIN ), wxTRANSPARENT_BRUSH ),
-        m_trace( aTrace ), m_moved( false ), m_coords( 0.0, 0.0 ), m_window( nullptr )
+        m_trace( aTrace ), m_updateRequired( false ), m_coords( 0.0, 0.0 ), m_window( nullptr )
     {
     }
 
     void Plot( wxDC& aDC, mpWindow& aWindow ) override;
 
+    void Update()
+    {
+        m_updateRequired = true;
+    }
+
     bool Inside( wxPoint& aPoint )
     {
         if( !m_window )
@@ -80,7 +58,7 @@ public:
 
     void Move( wxPoint aDelta ) override
     {
-        m_moved = true;
+        Update();
         mpInfoLayer::Move( aDelta );
     }
 
@@ -100,13 +78,68 @@ public:
 
 private:
     const TRACE* m_trace;
-    bool m_moved;
+    bool m_updateRequired;
     wxRealPoint m_coords;
     mpWindow* m_window;
 
     const int DRAG_MARGIN = 10;
 };
 
+
+class TRACE : public mpFXYVector
+{
+public:
+    TRACE( const wxString& aName, const wxString& aSpiceName )
+        : mpFXYVector( aName ), m_spiceName( aSpiceName ), m_cursor( nullptr )
+    {
+        SetContinuity( true );
+        ShowName( false );
+    }
+
+    void SetData( const std::vector<double>& aXs, const std::vector<double>& aYs )
+    {
+        mpFXYVector::SetData( aXs, aYs );
+
+        if( m_cursor )
+            m_cursor->Update();
+    }
+
+    const wxString& GetSpiceName() const
+    {
+        return m_spiceName;
+    }
+
+    const std::vector<double>& GetDataX() const
+    {
+        return m_xs;
+    }
+
+    const std::vector<double>& GetDataY() const
+    {
+        return m_ys;
+    }
+
+    bool HasCursor() const
+    {
+        return m_cursor != nullptr;
+    }
+
+    void SetCursor( CURSOR* aCursor )
+    {
+        m_cursor = aCursor;
+    }
+
+    CURSOR* GetCursor() const
+    {
+        return m_cursor;
+    }
+
+private:
+    wxString m_spiceName;
+    CURSOR* m_cursor;
+};
+
+
 class SIM_PLOT_PANEL : public mpWindow
 {
 public:
@@ -120,22 +153,33 @@ public:
 
     bool DeleteTrace( const wxString& aName );
 
+    void DeleteAllTraces();
+
     bool IsShown( const wxString& aName ) const
     {
         return ( m_traces.count( aName ) != 0 );
     }
 
-    void DeleteAllTraces();
-
     const std::map<wxString, TRACE*>& GetTraces() const
     {
         return m_traces;
     }
 
+    TRACE* GetTrace( const wxString& aName ) const
+    {
+        auto trace = m_traces.find( aName );
+
+        return trace == m_traces.end() ? NULL : trace->second;
+    }
+
     void ShowGrid( bool aEnable = true );
 
     bool IsGridShown() const;
 
+    bool HasCursorEnabled( const wxString& aName ) const;
+
+    void EnableCursor( const wxString& aName, bool aEnable );
+
 private:
     wxColour generateColor();
 
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index bef38ede5a..430f4e7a9a 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -1267,11 +1267,13 @@ class WXDLLIMPEXP_MATHPLOT mpFXYVector : public mpFXY
           */
         mpFXYVector(wxString name = wxEmptyString, int flags = mpALIGN_NE);
 
+        virtual ~mpFXYVector() {}
+
         /** Changes the internal data: the set of points to draw.
           Both vectors MUST be of the same length. This method DOES NOT refresh the mpWindow; do it manually.
          * @sa Clear
          */
-        void SetData( const std::vector<double> &xs,const std::vector<double> &ys);
+        virtual void SetData( const std::vector<double> &xs,const std::vector<double> &ys);
 
         /** Clears all the data, leaving the layer empty.
          * @sa SetData

From 9c65d0d2819dad5f5d59f9080abdeffae1f08bdf Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:26 +0200
Subject: [PATCH 051/197] wxMathPlot: fixed crash when one of its dimensions ==
 0

---
 common/widgets/mathplot.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index 18fe939fc2..6ceb14f3fd 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -167,8 +167,10 @@ void   mpInfoLayer::Plot(wxDC & dc, mpWindow & w)
 #ifdef MATHPLOT_DO_LOGGING
             // wxLogMessage(_("mpInfoLayer::Plot() screen size has changed from %d x %d to %d x %d"), m_winX, m_winY, scrx, scry);
 #endif
-            if (m_winX != 1) m_dim.x = (int) floor((double)(m_dim.x*scrx/m_winX));
-            if (m_winY != 1) {
+            if (m_winX > 1)
+                m_dim.x = (int) floor((double)(m_dim.x*scrx/m_winX));
+
+            if (m_winY > 1) {
                 m_dim.y = (int) floor((double)(m_dim.y*scry/m_winY));
                 UpdateReference();
             }
@@ -236,8 +238,10 @@ void mpInfoCoords::Plot(wxDC & dc, mpWindow & w)
 #ifdef MATHPLOT_DO_LOGGING
             // wxLogMessage(_("mpInfoLayer::Plot() screen size has changed from %d x %d to %d x %d"), m_winX, m_winY, scrx, scry);
 #endif
-            if (m_winX != 1) m_dim.x = (int) floor((double)(m_dim.x*scrx/m_winX));
-            if (m_winY != 1) {
+            if (m_winX > 1)
+                m_dim.x = (int) floor((double)(m_dim.x*scrx/m_winX));
+
+            if (m_winY > 1) {
                 m_dim.y = (int) floor((double)(m_dim.y*scry/m_winY));
                 UpdateReference();
             }
@@ -290,8 +294,10 @@ void mpInfoLegend::Plot(wxDC & dc, mpWindow & w)
 #ifdef MATHPLOT_DO_LOGGING
             // wxLogMessage(_("mpInfoLayer::Plot() screen size has changed from %d x %d to %d x %d"), m_winX, m_winY, scrx, scry);
 #endif
-            if (m_winX != 1) m_dim.x = (int) floor((double)(m_dim.x*scrx/m_winX));
-            if (m_winY != 1) {
+            if (m_winX > 1)
+                m_dim.x = (int) floor((double)(m_dim.x*scrx/m_winX));
+
+            if (m_winY > 1) {
                 m_dim.y = (int) floor((double)(m_dim.y*scry/m_winY));
                 UpdateReference();
             }

From c4e67c088d213172892c2cb496475bbfd336ad53 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:26 +0200
Subject: [PATCH 052/197] wxMathPlot: Fixed a method name (Set->Get), GetName()
 returns a const reference

---
 include/widgets/mathplot.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index 430f4e7a9a..d03d8e99ef 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -231,7 +231,7 @@ class WXDLLIMPEXP_MATHPLOT mpLayer : public wxObject
         /** Get layer name.
           @return Name
           */
-        wxString       GetName() const { return m_name; }
+        const wxString& GetName() const { return m_name; }
 
         /** Get font set for this layer.
           @return Font
@@ -716,7 +716,7 @@ class WXDLLIMPEXP_MATHPLOT mpScaleX : public mpLayer
 
         /** Get X axis Label format (used for mpX_NORMAL draw mode).
           @return The format string */
-        const wxString& SetLabelFormat() { return m_labelFormat; };
+        const wxString& GetLabelFormat() { return m_labelFormat; };
 
     protected:
         int m_flags; //!< Flag for axis alignment
@@ -769,7 +769,7 @@ class WXDLLIMPEXP_MATHPLOT mpScaleY : public mpLayer
 
         /** Get Y axis Label format.
           @return The format string */
-        const wxString& SetLabelFormat() { return m_labelFormat; };
+        const wxString& GetLabelFormat() { return m_labelFormat; };
 
     protected:
         int m_flags; //!< Flag for axis alignment

From 433f934dc1143c774e26bb0b20a2f3ea721ab121 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:26 +0200
Subject: [PATCH 053/197] Simulation frame displays a list of cursors and their
 values

---
 eeschema/sim/sim_plot_frame.cpp      |  34 ++++-
 eeschema/sim/sim_plot_frame.h        |   2 +
 eeschema/sim/sim_plot_frame_base.cpp |  12 +-
 eeschema/sim/sim_plot_frame_base.fbp | 208 +++++++++++++++++++++++++--
 eeschema/sim/sim_plot_frame_base.h   |   4 +
 eeschema/sim/sim_plot_panel.h        |  10 ++
 6 files changed, 252 insertions(+), 18 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 202804f3f1..0641522d2c 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -253,6 +253,29 @@ void SIM_PLOT_FRAME::onSignalRClick( wxMouseEvent& event )
 }
 
 
+void SIM_PLOT_FRAME::onCursorsUpdate( wxUpdateUIEvent& event )
+{
+    wxSize size = m_cursors->GetClientSize();
+    m_cursors->ClearAll();
+
+    const long SIGNAL_COL = m_cursors->AppendColumn( wxT( "Signal" ), wxLIST_FORMAT_LEFT, size.x / 2 );
+    const long X_COL = m_cursors->AppendColumn( CurrentPlot()->GetLabelX(), wxLIST_FORMAT_LEFT, size.x / 4 );
+    const long Y_COL = m_cursors->AppendColumn( CurrentPlot()->GetLabelY(), wxLIST_FORMAT_LEFT, size.x / 4 );
+
+    // Update cursor values
+    for( const auto& trace : CurrentPlot()->GetTraces() )
+    {
+        if( CURSOR* cursor = trace.second->GetCursor() )
+        {
+            const wxRealPoint coords = cursor->GetCoords();
+            long idx = m_cursors->InsertItem( SIGNAL_COL, trace.first );
+            m_cursors->SetItem( idx, X_COL, wxString::Format( "%f", coords.x ) );
+            m_cursors->SetItem( idx, Y_COL, wxString::Format( "%f", coords.y ) );
+        }
+    }
+}
+
+
 void SIM_PLOT_FRAME::onSimulate( wxCommandEvent& event )
 {
     if( isSimulationRunning() )
@@ -303,15 +326,12 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
     }
 
     // If there are any signals plotted, update them
-    for( unsigned int i = 0; i < m_plotNotebook->GetPageCount(); ++i )
-    {
-        SIM_PLOT_PANEL* plotPanel = static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetPage( i ) );
+    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
 
-        for( const auto& trace : plotPanel->GetTraces() )
-            updatePlot( trace.second->GetSpiceName(), trace.second->GetName(), plotPanel );
+    for( const auto& trace : plotPanel->GetTraces() )
+        updatePlot( trace.second->GetSpiceName(), trace.second->GetName(), plotPanel );
 
-        plotPanel->UpdateAll();
-    }
+    plotPanel->UpdateAll();
 }
 
 
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index cc27d69cd7..d367172bde 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -100,6 +100,8 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         // Event handlers
         void onSignalDblClick( wxCommandEvent& event ) override;
         void onSignalRClick( wxMouseEvent& event ) override;
+        void onCursorsUpdate( wxUpdateUIEvent& event ) override;
+
         void onSimulate( wxCommandEvent& event ) override;
         void onPlaceProbe( wxCommandEvent& event ) override;
 
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index 2af6beee43..81440c668e 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -69,6 +69,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	
 	m_panel61 = new wxPanel( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	m_panel61->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel61->SetMinSize( wxSize( 300,-1 ) );
 	
 	wxBoxSizer* bSizer6;
 	bSizer6 = new wxBoxSizer( wxVERTICAL );
@@ -96,6 +97,13 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_signals = new wxListBox( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_SORT ); 
 	bSizer7->Add( m_signals, 1, wxALL|wxEXPAND, 5 );
 	
+	m_staticText21 = new wxStaticText( m_panel7, wxID_ANY, _("Cursors"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText21->Wrap( -1 );
+	bSizer7->Add( m_staticText21, 0, wxALL, 5 );
+	
+	m_cursors = new wxListCtrl( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL );
+	bSizer7->Add( m_cursors, 1, wxALL|wxEXPAND, 5 );
+	
 	wxFlexGridSizer* fgSizer1;
 	fgSizer1 = new wxFlexGridSizer( 1, 0, 0, 0 );
 	fgSizer1->SetFlexibleDirection( wxBOTH );
@@ -117,7 +125,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_panel7->SetSizer( bSizer7 );
 	m_panel7->Layout();
 	bSizer7->Fit( m_panel7 );
-	bSizer5->Add( m_panel7, 1, wxEXPAND | wxALL, 5 );
+	bSizer5->Add( m_panel7, 0, wxALL|wxEXPAND, 5 );
 	
 	
 	m_panel31->SetSizer( bSizer5 );
@@ -158,6 +166,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	this->Connect( m_menuShowGrid->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridState ) );
 	m_signals->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
 	m_signals->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
+	m_cursors->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::onCursorsUpdate ), NULL, this );
 	m_simulateBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
 	m_probeBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onPlaceProbe ), NULL, this );
 	m_tuneBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onTune ), NULL, this );
@@ -177,6 +186,7 @@ SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
 	this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridState ) );
 	m_signals->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
 	m_signals->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
+	m_cursors->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::onCursorsUpdate ), NULL, this );
 	m_simulateBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
 	m_probeBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onPlaceProbe ), NULL, this );
 	m_tuneBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onTune ), NULL, this );
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index 6113f943d7..5d610b7804 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -281,11 +281,11 @@
                 <property name="name">bSizer1</property>
                 <property name="orient">wxVERTICAL</property>
                 <property name="permission">none</property>
-                <object class="sizeritem" expanded="0">
+                <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
                     <property name="flag">wxEXPAND | wxALL</property>
                     <property name="proportion">3</property>
-                    <object class="wxPanel" expanded="0">
+                    <object class="wxPanel" expanded="1">
                         <property name="BottomDockable">1</property>
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
@@ -359,7 +359,7 @@
                         <event name="OnSetFocus"></event>
                         <event name="OnSize"></event>
                         <event name="OnUpdateUI"></event>
-                        <object class="wxBoxSizer" expanded="0">
+                        <object class="wxBoxSizer" expanded="1">
                             <property name="minimum_size"></property>
                             <property name="name">bSizer5</property>
                             <property name="orient">wxHORIZONTAL</property>
@@ -401,7 +401,7 @@
                                     <property name="maximum_size"></property>
                                     <property name="min_size"></property>
                                     <property name="minimize_button">0</property>
-                                    <property name="minimum_size"></property>
+                                    <property name="minimum_size">300,-1</property>
                                     <property name="moveable">1</property>
                                     <property name="name">m_panel61</property>
                                     <property name="pane_border">1</property>
@@ -542,11 +542,11 @@
                                     </object>
                                 </object>
                             </object>
-                            <object class="sizeritem" expanded="0">
+                            <object class="sizeritem" expanded="1">
                                 <property name="border">5</property>
-                                <property name="flag">wxEXPAND | wxALL</property>
-                                <property name="proportion">1</property>
-                                <object class="wxPanel" expanded="0">
+                                <property name="flag">wxALL|wxEXPAND</property>
+                                <property name="proportion">0</property>
+                                <object class="wxPanel" expanded="1">
                                     <property name="BottomDockable">1</property>
                                     <property name="LeftDockable">1</property>
                                     <property name="RightDockable">1</property>
@@ -620,7 +620,7 @@
                                     <event name="OnSetFocus"></event>
                                     <event name="OnSize"></event>
                                     <event name="OnUpdateUI"></event>
-                                    <object class="wxBoxSizer" expanded="0">
+                                    <object class="wxBoxSizer" expanded="1">
                                         <property name="minimum_size"></property>
                                         <property name="name">bSizer7</property>
                                         <property name="orient">wxVERTICAL</property>
@@ -796,6 +796,194 @@
                                                 <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxStaticText" expanded="0">
+                                                <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_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</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="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="label">Cursors</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">m_staticText21</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></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"></property>
+                                                <property name="wrap">-1</property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxListCtrl" expanded="0">
+                                                <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_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</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="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">m_cursors</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style">wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL</property>
+                                                <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>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnListBeginDrag"></event>
+                                                <event name="OnListBeginLabelEdit"></event>
+                                                <event name="OnListBeginRDrag"></event>
+                                                <event name="OnListCacheHint"></event>
+                                                <event name="OnListColBeginDrag"></event>
+                                                <event name="OnListColClick"></event>
+                                                <event name="OnListColDragging"></event>
+                                                <event name="OnListColEndDrag"></event>
+                                                <event name="OnListColRightClick"></event>
+                                                <event name="OnListDeleteAllItems"></event>
+                                                <event name="OnListDeleteItem"></event>
+                                                <event name="OnListEndLabelEdit"></event>
+                                                <event name="OnListInsertItem"></event>
+                                                <event name="OnListItemActivated"></event>
+                                                <event name="OnListItemDeselected"></event>
+                                                <event name="OnListItemFocused"></event>
+                                                <event name="OnListItemMiddleClick"></event>
+                                                <event name="OnListItemRightClick"></event>
+                                                <event name="OnListItemSelected"></event>
+                                                <event name="OnListKeyDown"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI">onCursorsUpdate</event>
+                                            </object>
+                                        </object>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALL|wxEXPAND</property>
@@ -1084,7 +1272,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="sizeritem" expanded="0">
+                <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
                     <property name="flag">wxEXPAND | wxALL</property>
                     <property name="proportion">1</property>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index 34d9556b10..99ccc930bb 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -28,6 +28,7 @@ class KIWAY_PLAYER;
 #include <wx/panel.h>
 #include <wx/stattext.h>
 #include <wx/listbox.h>
+#include <wx/listctrl.h>
 #include <wx/button.h>
 #include <wx/richtext/richtextctrl.h>
 #include <wx/frame.h>
@@ -52,6 +53,8 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxPanel* m_panel7;
 		wxStaticText* m_staticText2;
 		wxListBox* m_signals;
+		wxStaticText* m_staticText21;
+		wxListCtrl* m_cursors;
 		wxButton* m_simulateBtn;
 		wxButton* m_probeBtn;
 		wxButton* m_tuneBtn;
@@ -70,6 +73,7 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		virtual void menuShowGridState( wxUpdateUIEvent& event ) { event.Skip(); }
 		virtual void onSignalDblClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onSignalRClick( wxMouseEvent& event ) { event.Skip(); }
+		virtual void onCursorsUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
 		virtual void onSimulate( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onPlaceProbe( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onTune( wxCommandEvent& event ) { event.Skip(); }
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 202a9fb5f2..e7b0db256b 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -148,6 +148,16 @@ public:
 
     ~SIM_PLOT_PANEL();
 
+    const wxString& GetLabelX() const
+    {
+        return m_axis_x->GetName();
+    }
+
+    const wxString& GetLabelY() const
+    {
+        return m_axis_y->GetName();
+    }
+
     bool AddTrace( const wxString& aSpiceName, const wxString& aName, int aPoints,
                     const double* aT, const double* aY, int aFlags );
 

From fa4ba69661ee04d6bda55dbf2b906bac15e478c0 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:26 +0200
Subject: [PATCH 054/197] Simplified SIM_PLOT_FRAME layout Removed unnecessary
 panels & sizers, changed wxAuiNotebook to wxNotebook

---
 eeschema/sim/sim_plot_frame.cpp      |    2 +-
 eeschema/sim/sim_plot_frame_base.cpp |   63 +-
 eeschema/sim/sim_plot_frame_base.fbp | 1508 ++++++++++----------------
 eeschema/sim/sim_plot_frame_base.h   |   13 +-
 4 files changed, 609 insertions(+), 977 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 0641522d2c..ace59cdd95 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -128,7 +128,7 @@ void SIM_PLOT_FRAME::StopSimulation()
 
 void SIM_PLOT_FRAME::NewPlotPanel()
 {
-    SIM_PLOT_PANEL* plot = new SIM_PLOT_PANEL( this, wxID_ANY );
+    SIM_PLOT_PANEL* plot = new SIM_PLOT_PANEL( m_plotNotebook, wxID_ANY );
 
     m_plotNotebook->AddPage( plot,
             wxString::Format( wxT( "Plot%lu" ), m_plotNotebook->GetPageCount() + 1 ), true );
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index 81440c668e..d6f1aa2f28 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -63,45 +63,28 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	wxBoxSizer* bSizer1;
 	bSizer1 = new wxBoxSizer( wxVERTICAL );
 	
-	m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer5;
 	bSizer5 = new wxBoxSizer( wxHORIZONTAL );
 	
-	m_panel61 = new wxPanel( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel61->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_panel61->SetMinSize( wxSize( 300,-1 ) );
+	m_plotNotebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	
-	wxBoxSizer* bSizer6;
-	bSizer6 = new wxBoxSizer( wxVERTICAL );
+	bSizer5->Add( m_plotNotebook, 4, wxEXPAND | wxALL, 5 );
 	
-	m_plotNotebook = new wxAuiNotebook( m_panel61, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_DEFAULT_STYLE );
-	m_plotNotebook->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	
-	bSizer6->Add( m_plotNotebook, 1, wxEXPAND, 5 );
-	
-	
-	m_panel61->SetSizer( bSizer6 );
-	m_panel61->Layout();
-	bSizer6->Fit( m_panel61 );
-	bSizer5->Add( m_panel61, 3, wxEXPAND | wxALL, 5 );
-	
-	m_panel7 = new wxPanel( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer7;
 	bSizer7 = new wxBoxSizer( wxVERTICAL );
 	
-	m_staticText2 = new wxStaticText( m_panel7, wxID_ANY, _("Signals"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+	m_staticText2 = new wxStaticText( this, wxID_ANY, _("Signals"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
 	m_staticText2->Wrap( -1 );
 	bSizer7->Add( m_staticText2, 0, wxALL|wxEXPAND, 5 );
 	
-	m_signals = new wxListBox( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_SORT ); 
+	m_signals = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_SORT ); 
 	bSizer7->Add( m_signals, 1, wxALL|wxEXPAND, 5 );
 	
-	m_staticText21 = new wxStaticText( m_panel7, wxID_ANY, _("Cursors"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText21 = new wxStaticText( this, wxID_ANY, _("Cursors"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText21->Wrap( -1 );
 	bSizer7->Add( m_staticText21, 0, wxALL, 5 );
 	
-	m_cursors = new wxListCtrl( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL );
+	m_cursors = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL );
 	bSizer7->Add( m_cursors, 1, wxALL|wxEXPAND, 5 );
 	
 	wxFlexGridSizer* fgSizer1;
@@ -109,44 +92,28 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	fgSizer1->SetFlexibleDirection( wxBOTH );
 	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
-	m_simulateBtn = new wxButton( m_panel7, wxID_ANY, _("Simulate"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_simulateBtn = new wxButton( this, wxID_ANY, _("Simulate"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer1->Add( m_simulateBtn, 0, wxALL, 5 );
 	
-	m_probeBtn = new wxButton( m_panel7, wxID_ANY, _("Probe"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_probeBtn = new wxButton( this, wxID_ANY, _("Probe"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer1->Add( m_probeBtn, 0, wxALL|wxEXPAND, 5 );
 	
-	m_tuneBtn = new wxButton( m_panel7, wxID_ANY, _("Tune"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_tuneBtn = new wxButton( this, wxID_ANY, _("Tune"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer1->Add( m_tuneBtn, 0, wxALL|wxEXPAND, 5 );
 	
 	
 	bSizer7->Add( fgSizer1, 0, wxALL|wxEXPAND, 5 );
 	
 	
-	m_panel7->SetSizer( bSizer7 );
-	m_panel7->Layout();
-	bSizer7->Fit( m_panel7 );
-	bSizer5->Add( m_panel7, 0, wxALL|wxEXPAND, 5 );
+	bSizer5->Add( bSizer7, 1, wxEXPAND, 5 );
 	
 	
-	m_panel31->SetSizer( bSizer5 );
-	m_panel31->Layout();
-	bSizer5->Fit( m_panel31 );
-	bSizer1->Add( m_panel31, 3, wxEXPAND | wxALL, 5 );
+	bSizer1->Add( bSizer5, 3, wxEXPAND, 5 );
 	
-	m_panel3 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer3;
-	bSizer3 = new wxBoxSizer( wxVERTICAL );
-	
-	m_simConsole = new wxRichTextCtrl( m_panel3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS );
+	m_simConsole = new wxRichTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS );
 	m_simConsole->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 	
-	bSizer3->Add( m_simConsole, 1, wxEXPAND | wxALL, 5 );
-	
-	
-	m_panel3->SetSizer( bSizer3 );
-	m_panel3->Layout();
-	bSizer3->Fit( m_panel3 );
-	bSizer1->Add( m_panel3, 1, wxEXPAND | wxALL, 5 );
+	bSizer1->Add( m_simConsole, 1, wxEXPAND | wxALL, 5 );
 	
 	
 	this->SetSizer( bSizer1 );
@@ -164,9 +131,9 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ) );
 	this->Connect( m_menuShowGrid->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowGrid ) );
 	this->Connect( m_menuShowGrid->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridState ) );
+	m_plotNotebook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotChanged ), NULL, this );
 	m_signals->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
 	m_signals->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
-	m_cursors->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::onCursorsUpdate ), NULL, this );
 	m_simulateBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
 	m_probeBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onPlaceProbe ), NULL, this );
 	m_tuneBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onTune ), NULL, this );
@@ -184,9 +151,9 @@ SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
 	this->Disconnect( wxID_ZOOM_FIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ) );
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowGrid ) );
 	this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridState ) );
+	m_plotNotebook->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotChanged ), NULL, this );
 	m_signals->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
 	m_signals->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
-	m_cursors->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::onCursorsUpdate ), NULL, this );
 	m_simulateBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
 	m_probeBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onPlaceProbe ), NULL, this );
 	m_tuneBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onTune ), NULL, this );
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index 5d610b7804..384d95aa24 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -283,524 +283,486 @@
                 <property name="permission">none</property>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
-                    <property name="flag">wxEXPAND | wxALL</property>
+                    <property name="flag">wxEXPAND</property>
                     <property name="proportion">3</property>
-                    <object class="wxPanel" 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_name"></property>
-                        <property name="aui_position"></property>
-                        <property name="aui_row"></property>
-                        <property name="best_size"></property>
-                        <property name="bg"></property>
-                        <property name="caption"></property>
-                        <property name="caption_visible">1</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="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>
+                    <object class="wxBoxSizer" expanded="1">
                         <property name="minimum_size"></property>
-                        <property name="moveable">1</property>
-                        <property name="name">m_panel31</property>
-                        <property name="pane_border">1</property>
-                        <property name="pane_position"></property>
-                        <property name="pane_size"></property>
-                        <property name="permission">protected</property>
-                        <property name="pin_button">1</property>
-                        <property name="pos"></property>
-                        <property name="resize">Resizable</property>
-                        <property name="show">1</property>
-                        <property name="size"></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">wxTAB_TRAVERSAL</property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
-                        <object class="wxBoxSizer" expanded="1">
-                            <property name="minimum_size"></property>
-                            <property name="name">bSizer5</property>
-                            <property name="orient">wxHORIZONTAL</property>
-                            <property name="permission">none</property>
-                            <object class="sizeritem" expanded="0">
-                                <property name="border">5</property>
-                                <property name="flag">wxEXPAND | wxALL</property>
-                                <property name="proportion">3</property>
-                                <object class="wxPanel" expanded="0">
-                                    <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_name"></property>
-                                    <property name="aui_position"></property>
-                                    <property name="aui_row"></property>
-                                    <property name="best_size"></property>
-                                    <property name="bg">wxSYS_COLOUR_WINDOW</property>
-                                    <property name="caption"></property>
-                                    <property name="caption_visible">1</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="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">300,-1</property>
-                                    <property name="moveable">1</property>
-                                    <property name="name">m_panel61</property>
-                                    <property name="pane_border">1</property>
-                                    <property name="pane_position"></property>
-                                    <property name="pane_size"></property>
-                                    <property name="permission">protected</property>
-                                    <property name="pin_button">1</property>
-                                    <property name="pos"></property>
-                                    <property name="resize">Resizable</property>
-                                    <property name="show">1</property>
-                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                    <event name="OnChar"></event>
-                                    <event name="OnEnterWindow"></event>
-                                    <event name="OnEraseBackground"></event>
-                                    <event name="OnKeyDown"></event>
-                                    <event name="OnKeyUp"></event>
-                                    <event name="OnKillFocus"></event>
-                                    <event name="OnLeaveWindow"></event>
-                                    <event name="OnLeftDClick"></event>
-                                    <event name="OnLeftDown"></event>
-                                    <event name="OnLeftUp"></event>
-                                    <event name="OnMiddleDClick"></event>
-                                    <event name="OnMiddleDown"></event>
-                                    <event name="OnMiddleUp"></event>
-                                    <event name="OnMotion"></event>
-                                    <event name="OnMouseEvents"></event>
-                                    <event name="OnMouseWheel"></event>
-                                    <event name="OnPaint"></event>
-                                    <event name="OnRightDClick"></event>
-                                    <event name="OnRightDown"></event>
-                                    <event name="OnRightUp"></event>
-                                    <event name="OnSetFocus"></event>
-                                    <event name="OnSize"></event>
-                                    <event name="OnUpdateUI"></event>
-                                    <object class="wxBoxSizer" expanded="0">
+                        <property name="name">bSizer5</property>
+                        <property name="orient">wxHORIZONTAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxEXPAND | wxALL</property>
+                            <property name="proportion">4</property>
+                            <object class="wxNotebook" expanded="0">
+                                <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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="bitmapsize"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_plotNotebook</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="style"></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"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnNotebookPageChanged">onPlotChanged</event>
+                                <event name="OnNotebookPageChanging"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxEXPAND</property>
+                            <property name="proportion">1</property>
+                            <object class="wxBoxSizer" expanded="0">
+                                <property name="minimum_size"></property>
+                                <property name="name">bSizer7</property>
+                                <property name="orient">wxVERTICAL</property>
+                                <property name="permission">none</property>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALL|wxEXPAND</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxStaticText" expanded="0">
+                                        <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_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</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="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="label">Signals</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="name">bSizer6</property>
-                                        <property name="orient">wxVERTICAL</property>
-                                        <property name="permission">none</property>
-                                        <object class="sizeritem" expanded="0">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxEXPAND</property>
-                                            <property name="proportion">1</property>
-                                            <object class="wxAuiNotebook" expanded="0">
-                                                <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_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg">wxSYS_COLOUR_WINDOW</property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</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="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">m_plotNotebook</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style">wxAUI_NB_DEFAULT_STYLE</property>
-                                                <property name="subclass"></property>
-                                                <property name="tab_ctrl_height">-1</property>
-                                                <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
-                                                <property name="uniform_bitmap_size"></property>
-                                                <property name="window_extra_style"></property>
-                                                <property name="window_name"></property>
-                                                <property name="window_style"></property>
-                                                <event name="OnAuiNotebookAllowDND"></event>
-                                                <event name="OnAuiNotebookBeginDrag"></event>
-                                                <event name="OnAuiNotebookButton"></event>
-                                                <event name="OnAuiNotebookDragMotion"></event>
-                                                <event name="OnAuiNotebookEndDrag"></event>
-                                                <event name="OnAuiNotebookPageChanged"></event>
-                                                <event name="OnAuiNotebookPageChanging"></event>
-                                                <event name="OnAuiNotebookPageClose"></event>
-                                                <event name="OnAuiNotebookPageClosed"></event>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
+                                        <property name="moveable">1</property>
+                                        <property name="name">m_staticText2</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style">wxALIGN_CENTRE</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"></property>
+                                        <property name="wrap">-1</property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                            </object>
-                            <object class="sizeritem" expanded="1">
-                                <property name="border">5</property>
-                                <property name="flag">wxALL|wxEXPAND</property>
-                                <property name="proportion">0</property>
-                                <object class="wxPanel" 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_name"></property>
-                                    <property name="aui_position"></property>
-                                    <property name="aui_row"></property>
-                                    <property name="best_size"></property>
-                                    <property name="bg"></property>
-                                    <property name="caption"></property>
-                                    <property name="caption_visible">1</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="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">m_panel7</property>
-                                    <property name="pane_border">1</property>
-                                    <property name="pane_position"></property>
-                                    <property name="pane_size"></property>
-                                    <property name="permission">protected</property>
-                                    <property name="pin_button">1</property>
-                                    <property name="pos"></property>
-                                    <property name="resize">Resizable</property>
-                                    <property name="show">1</property>
-                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                    <event name="OnChar"></event>
-                                    <event name="OnEnterWindow"></event>
-                                    <event name="OnEraseBackground"></event>
-                                    <event name="OnKeyDown"></event>
-                                    <event name="OnKeyUp"></event>
-                                    <event name="OnKillFocus"></event>
-                                    <event name="OnLeaveWindow"></event>
-                                    <event name="OnLeftDClick"></event>
-                                    <event name="OnLeftDown"></event>
-                                    <event name="OnLeftUp"></event>
-                                    <event name="OnMiddleDClick"></event>
-                                    <event name="OnMiddleDown"></event>
-                                    <event name="OnMiddleUp"></event>
-                                    <event name="OnMotion"></event>
-                                    <event name="OnMouseEvents"></event>
-                                    <event name="OnMouseWheel"></event>
-                                    <event name="OnPaint"></event>
-                                    <event name="OnRightDClick"></event>
-                                    <event name="OnRightDown"></event>
-                                    <event name="OnRightUp"></event>
-                                    <event name="OnSetFocus"></event>
-                                    <event name="OnSize"></event>
-                                    <event name="OnUpdateUI"></event>
-                                    <object class="wxBoxSizer" expanded="1">
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALL|wxEXPAND</property>
+                                    <property name="proportion">1</property>
+                                    <object class="wxListBox" expanded="0">
+                                        <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_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</property>
+                                        <property name="center_pane">0</property>
+                                        <property name="choices"></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="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="name">bSizer7</property>
-                                        <property name="orient">wxVERTICAL</property>
+                                        <property name="moveable">1</property>
+                                        <property name="name">m_signals</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style">wxLB_SINGLE|wxLB_SORT</property>
+                                        <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>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnListBox"></event>
+                                        <event name="OnListBoxDClick">onSignalDblClick</event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp">onSignalRClick</event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALL</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxStaticText" expanded="0">
+                                        <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_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</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="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="label">Cursors</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">m_staticText21</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style"></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"></property>
+                                        <property name="wrap">-1</property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALL|wxEXPAND</property>
+                                    <property name="proportion">1</property>
+                                    <object class="wxListCtrl" expanded="0">
+                                        <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_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</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="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">m_cursors</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style">wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL</property>
+                                        <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>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnListBeginDrag"></event>
+                                        <event name="OnListBeginLabelEdit"></event>
+                                        <event name="OnListBeginRDrag"></event>
+                                        <event name="OnListCacheHint"></event>
+                                        <event name="OnListColBeginDrag"></event>
+                                        <event name="OnListColClick"></event>
+                                        <event name="OnListColDragging"></event>
+                                        <event name="OnListColEndDrag"></event>
+                                        <event name="OnListColRightClick"></event>
+                                        <event name="OnListDeleteAllItems"></event>
+                                        <event name="OnListDeleteItem"></event>
+                                        <event name="OnListEndLabelEdit"></event>
+                                        <event name="OnListInsertItem"></event>
+                                        <event name="OnListItemActivated"></event>
+                                        <event name="OnListItemDeselected"></event>
+                                        <event name="OnListItemFocused"></event>
+                                        <event name="OnListItemMiddleClick"></event>
+                                        <event name="OnListItemRightClick"></event>
+                                        <event name="OnListItemSelected"></event>
+                                        <event name="OnListKeyDown"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALL|wxEXPAND</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxFlexGridSizer" expanded="0">
+                                        <property name="cols">0</property>
+                                        <property name="flexible_direction">wxBOTH</property>
+                                        <property name="growablecols"></property>
+                                        <property name="growablerows"></property>
+                                        <property name="hgap">0</property>
+                                        <property name="minimum_size"></property>
+                                        <property name="name">fgSizer1</property>
+                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
                                         <property name="permission">none</property>
-                                        <object class="sizeritem" expanded="0">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">0</property>
-                                            <object class="wxStaticText" expanded="0">
-                                                <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_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</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="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="label">Signals</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">m_staticText2</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style">wxALIGN_CENTRE</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"></property>
-                                                <property name="wrap">-1</property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
-                                        <object class="sizeritem" expanded="0">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">1</property>
-                                            <object class="wxListBox" expanded="0">
-                                                <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_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</property>
-                                                <property name="center_pane">0</property>
-                                                <property name="choices"></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="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">m_signals</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style">wxLB_SINGLE|wxLB_SORT</property>
-                                                <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>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnListBox"></event>
-                                                <event name="OnListBoxDClick">onSignalDblClick</event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp">onSignalRClick</event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
+                                        <property name="rows">1</property>
+                                        <property name="vgap">0</property>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALL</property>
                                             <property name="proportion">0</property>
-                                            <object class="wxStaticText" expanded="0">
+                                            <object class="wxButton" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
@@ -817,6 +779,7 @@
                                                 <property name="close_button">1</property>
                                                 <property name="context_help"></property>
                                                 <property name="context_menu">1</property>
+                                                <property name="default">0</property>
                                                 <property name="default_pane">0</property>
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
@@ -828,7 +791,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">Cursors</property>
+                                                <property name="label">Simulate</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -836,7 +799,7 @@
                                                 <property name="minimize_button">0</property>
                                                 <property name="minimum_size"></property>
                                                 <property name="moveable">1</property>
-                                                <property name="name">m_staticText21</property>
+                                                <property name="name">m_simulateBtn</property>
                                                 <property name="pane_border">1</property>
                                                 <property name="pane_position"></property>
                                                 <property name="pane_size"></property>
@@ -850,10 +813,14 @@
                                                 <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>
-                                                <property name="wrap">-1</property>
+                                                <event name="OnButtonClick">onSimulate</event>
                                                 <event name="OnChar"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -882,8 +849,8 @@
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">1</property>
-                                            <object class="wxListCtrl" expanded="0">
+                                            <property name="proportion">0</property>
+                                            <object class="wxButton" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
@@ -900,6 +867,7 @@
                                                 <property name="close_button">1</property>
                                                 <property name="context_help"></property>
                                                 <property name="context_menu">1</property>
+                                                <property name="default">0</property>
                                                 <property name="default_pane">0</property>
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
@@ -911,6 +879,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
+                                                <property name="label">Probe</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -918,7 +887,7 @@
                                                 <property name="minimize_button">0</property>
                                                 <property name="minimum_size"></property>
                                                 <property name="moveable">1</property>
-                                                <property name="name">m_cursors</property>
+                                                <property name="name">m_probeBtn</property>
                                                 <property name="pane_border">1</property>
                                                 <property name="pane_position"></property>
                                                 <property name="pane_size"></property>
@@ -928,7 +897,7 @@
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
                                                 <property name="size"></property>
-                                                <property name="style">wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL</property>
+                                                <property name="style"></property>
                                                 <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
                                                 <property name="tooltip"></property>
@@ -939,6 +908,7 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
+                                                <event name="OnButtonClick">onPlaceProbe</event>
                                                 <event name="OnChar"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -949,26 +919,6 @@
                                                 <event name="OnLeftDClick"></event>
                                                 <event name="OnLeftDown"></event>
                                                 <event name="OnLeftUp"></event>
-                                                <event name="OnListBeginDrag"></event>
-                                                <event name="OnListBeginLabelEdit"></event>
-                                                <event name="OnListBeginRDrag"></event>
-                                                <event name="OnListCacheHint"></event>
-                                                <event name="OnListColBeginDrag"></event>
-                                                <event name="OnListColClick"></event>
-                                                <event name="OnListColDragging"></event>
-                                                <event name="OnListColEndDrag"></event>
-                                                <event name="OnListColRightClick"></event>
-                                                <event name="OnListDeleteAllItems"></event>
-                                                <event name="OnListDeleteItem"></event>
-                                                <event name="OnListEndLabelEdit"></event>
-                                                <event name="OnListInsertItem"></event>
-                                                <event name="OnListItemActivated"></event>
-                                                <event name="OnListItemDeselected"></event>
-                                                <event name="OnListItemFocused"></event>
-                                                <event name="OnListItemMiddleClick"></event>
-                                                <event name="OnListItemRightClick"></event>
-                                                <event name="OnListItemSelected"></event>
-                                                <event name="OnListKeyDown"></event>
                                                 <event name="OnMiddleDClick"></event>
                                                 <event name="OnMiddleDown"></event>
                                                 <event name="OnMiddleUp"></event>
@@ -981,289 +931,95 @@
                                                 <event name="OnRightUp"></event>
                                                 <event name="OnSetFocus"></event>
                                                 <event name="OnSize"></event>
-                                                <event name="OnUpdateUI">onCursorsUpdate</event>
+                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALL|wxEXPAND</property>
                                             <property name="proportion">0</property>
-                                            <object class="wxFlexGridSizer" expanded="0">
-                                                <property name="cols">0</property>
-                                                <property name="flexible_direction">wxBOTH</property>
-                                                <property name="growablecols"></property>
-                                                <property name="growablerows"></property>
-                                                <property name="hgap">0</property>
+                                            <object class="wxButton" expanded="0">
+                                                <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_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</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">0</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="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="label">Tune</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="name">fgSizer1</property>
-                                                <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
-                                                <property name="permission">none</property>
-                                                <property name="rows">1</property>
-                                                <property name="vgap">0</property>
-                                                <object class="sizeritem" expanded="0">
-                                                    <property name="border">5</property>
-                                                    <property name="flag">wxALL</property>
-                                                    <property name="proportion">0</property>
-                                                    <object class="wxButton" expanded="0">
-                                                        <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_name"></property>
-                                                        <property name="aui_position"></property>
-                                                        <property name="aui_row"></property>
-                                                        <property name="best_size"></property>
-                                                        <property name="bg"></property>
-                                                        <property name="caption"></property>
-                                                        <property name="caption_visible">1</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">0</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="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="label">Simulate</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">m_simulateBtn</property>
-                                                        <property name="pane_border">1</property>
-                                                        <property name="pane_position"></property>
-                                                        <property name="pane_size"></property>
-                                                        <property name="permission">protected</property>
-                                                        <property name="pin_button">1</property>
-                                                        <property name="pos"></property>
-                                                        <property name="resize">Resizable</property>
-                                                        <property name="show">1</property>
-                                                        <property name="size"></property>
-                                                        <property name="style"></property>
-                                                        <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>
-                                                        <event name="OnButtonClick">onSimulate</event>
-                                                        <event name="OnChar"></event>
-                                                        <event name="OnEnterWindow"></event>
-                                                        <event name="OnEraseBackground"></event>
-                                                        <event name="OnKeyDown"></event>
-                                                        <event name="OnKeyUp"></event>
-                                                        <event name="OnKillFocus"></event>
-                                                        <event name="OnLeaveWindow"></event>
-                                                        <event name="OnLeftDClick"></event>
-                                                        <event name="OnLeftDown"></event>
-                                                        <event name="OnLeftUp"></event>
-                                                        <event name="OnMiddleDClick"></event>
-                                                        <event name="OnMiddleDown"></event>
-                                                        <event name="OnMiddleUp"></event>
-                                                        <event name="OnMotion"></event>
-                                                        <event name="OnMouseEvents"></event>
-                                                        <event name="OnMouseWheel"></event>
-                                                        <event name="OnPaint"></event>
-                                                        <event name="OnRightDClick"></event>
-                                                        <event name="OnRightDown"></event>
-                                                        <event name="OnRightUp"></event>
-                                                        <event name="OnSetFocus"></event>
-                                                        <event name="OnSize"></event>
-                                                        <event name="OnUpdateUI"></event>
-                                                    </object>
-                                                </object>
-                                                <object class="sizeritem" expanded="0">
-                                                    <property name="border">5</property>
-                                                    <property name="flag">wxALL|wxEXPAND</property>
-                                                    <property name="proportion">0</property>
-                                                    <object class="wxButton" expanded="0">
-                                                        <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_name"></property>
-                                                        <property name="aui_position"></property>
-                                                        <property name="aui_row"></property>
-                                                        <property name="best_size"></property>
-                                                        <property name="bg"></property>
-                                                        <property name="caption"></property>
-                                                        <property name="caption_visible">1</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">0</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="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="label">Probe</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">m_probeBtn</property>
-                                                        <property name="pane_border">1</property>
-                                                        <property name="pane_position"></property>
-                                                        <property name="pane_size"></property>
-                                                        <property name="permission">protected</property>
-                                                        <property name="pin_button">1</property>
-                                                        <property name="pos"></property>
-                                                        <property name="resize">Resizable</property>
-                                                        <property name="show">1</property>
-                                                        <property name="size"></property>
-                                                        <property name="style"></property>
-                                                        <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>
-                                                        <event name="OnButtonClick">onPlaceProbe</event>
-                                                        <event name="OnChar"></event>
-                                                        <event name="OnEnterWindow"></event>
-                                                        <event name="OnEraseBackground"></event>
-                                                        <event name="OnKeyDown"></event>
-                                                        <event name="OnKeyUp"></event>
-                                                        <event name="OnKillFocus"></event>
-                                                        <event name="OnLeaveWindow"></event>
-                                                        <event name="OnLeftDClick"></event>
-                                                        <event name="OnLeftDown"></event>
-                                                        <event name="OnLeftUp"></event>
-                                                        <event name="OnMiddleDClick"></event>
-                                                        <event name="OnMiddleDown"></event>
-                                                        <event name="OnMiddleUp"></event>
-                                                        <event name="OnMotion"></event>
-                                                        <event name="OnMouseEvents"></event>
-                                                        <event name="OnMouseWheel"></event>
-                                                        <event name="OnPaint"></event>
-                                                        <event name="OnRightDClick"></event>
-                                                        <event name="OnRightDown"></event>
-                                                        <event name="OnRightUp"></event>
-                                                        <event name="OnSetFocus"></event>
-                                                        <event name="OnSize"></event>
-                                                        <event name="OnUpdateUI"></event>
-                                                    </object>
-                                                </object>
-                                                <object class="sizeritem" expanded="0">
-                                                    <property name="border">5</property>
-                                                    <property name="flag">wxALL|wxEXPAND</property>
-                                                    <property name="proportion">0</property>
-                                                    <object class="wxButton" expanded="0">
-                                                        <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_name"></property>
-                                                        <property name="aui_position"></property>
-                                                        <property name="aui_row"></property>
-                                                        <property name="best_size"></property>
-                                                        <property name="bg"></property>
-                                                        <property name="caption"></property>
-                                                        <property name="caption_visible">1</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">0</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="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="label">Tune</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">m_tuneBtn</property>
-                                                        <property name="pane_border">1</property>
-                                                        <property name="pane_position"></property>
-                                                        <property name="pane_size"></property>
-                                                        <property name="permission">protected</property>
-                                                        <property name="pin_button">1</property>
-                                                        <property name="pos"></property>
-                                                        <property name="resize">Resizable</property>
-                                                        <property name="show">1</property>
-                                                        <property name="size"></property>
-                                                        <property name="style"></property>
-                                                        <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>
-                                                        <event name="OnButtonClick">onTune</event>
-                                                        <event name="OnChar"></event>
-                                                        <event name="OnEnterWindow"></event>
-                                                        <event name="OnEraseBackground"></event>
-                                                        <event name="OnKeyDown"></event>
-                                                        <event name="OnKeyUp"></event>
-                                                        <event name="OnKillFocus"></event>
-                                                        <event name="OnLeaveWindow"></event>
-                                                        <event name="OnLeftDClick"></event>
-                                                        <event name="OnLeftDown"></event>
-                                                        <event name="OnLeftUp"></event>
-                                                        <event name="OnMiddleDClick"></event>
-                                                        <event name="OnMiddleDown"></event>
-                                                        <event name="OnMiddleUp"></event>
-                                                        <event name="OnMotion"></event>
-                                                        <event name="OnMouseEvents"></event>
-                                                        <event name="OnMouseWheel"></event>
-                                                        <event name="OnPaint"></event>
-                                                        <event name="OnRightDClick"></event>
-                                                        <event name="OnRightDown"></event>
-                                                        <event name="OnRightUp"></event>
-                                                        <event name="OnSetFocus"></event>
-                                                        <event name="OnSize"></event>
-                                                        <event name="OnUpdateUI"></event>
-                                                    </object>
-                                                </object>
+                                                <property name="moveable">1</property>
+                                                <property name="name">m_tuneBtn</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <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>
+                                                <event name="OnButtonClick">onTune</event>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                     </object>
@@ -1272,11 +1028,11 @@
                         </object>
                     </object>
                 </object>
-                <object class="sizeritem" expanded="1">
+                <object class="sizeritem" expanded="0">
                     <property name="border">5</property>
                     <property name="flag">wxEXPAND | wxALL</property>
                     <property name="proportion">1</property>
-                    <object class="wxPanel" expanded="0">
+                    <object class="wxRichTextCtrl" expanded="0">
                         <property name="BottomDockable">1</property>
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
@@ -1300,7 +1056,7 @@
                         <property name="enabled">1</property>
                         <property name="fg"></property>
                         <property name="floatable">1</property>
-                        <property name="font"></property>
+                        <property name="font">,90,90,-1,76,0</property>
                         <property name="gripper">0</property>
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
@@ -1311,7 +1067,7 @@
                         <property name="minimize_button">0</property>
                         <property name="minimum_size"></property>
                         <property name="moveable">1</property>
-                        <property name="name">m_panel3</property>
+                        <property name="name">m_simConsole</property>
                         <property name="pane_border">1</property>
                         <property name="pane_position"></property>
                         <property name="pane_size"></property>
@@ -1321,12 +1077,17 @@
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
                         <property name="size"></property>
+                        <property name="style">wxTE_READONLY</property>
                         <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">wxTAB_TRAVERSAL</property>
+                        <property name="window_style">wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS</property>
                         <event name="OnChar"></event>
                         <event name="OnEnterWindow"></event>
                         <event name="OnEraseBackground"></event>
@@ -1344,116 +1105,25 @@
                         <event name="OnMouseEvents"></event>
                         <event name="OnMouseWheel"></event>
                         <event name="OnPaint"></event>
+                        <event name="OnRichTextCharacter"></event>
+                        <event name="OnRichTextContentDeleted"></event>
+                        <event name="OnRichTextContentInserted"></event>
+                        <event name="OnRichTextDelete"></event>
+                        <event name="OnRichTextReturn"></event>
+                        <event name="OnRichTextStyleChanged"></event>
+                        <event name="OnRichTextStyleSheetChanged"></event>
+                        <event name="OnRichTextStyleSheetReplaced"></event>
+                        <event name="OnRichTextStyleSheetReplacing"></event>
                         <event name="OnRightDClick"></event>
                         <event name="OnRightDown"></event>
                         <event name="OnRightUp"></event>
                         <event name="OnSetFocus"></event>
                         <event name="OnSize"></event>
+                        <event name="OnText"></event>
+                        <event name="OnTextEnter"></event>
+                        <event name="OnTextMaxLen"></event>
+                        <event name="OnTextURL"></event>
                         <event name="OnUpdateUI"></event>
-                        <object class="wxBoxSizer" expanded="0">
-                            <property name="minimum_size"></property>
-                            <property name="name">bSizer3</property>
-                            <property name="orient">wxVERTICAL</property>
-                            <property name="permission">none</property>
-                            <object class="sizeritem" expanded="0">
-                                <property name="border">5</property>
-                                <property name="flag">wxEXPAND | wxALL</property>
-                                <property name="proportion">1</property>
-                                <object class="wxRichTextCtrl" expanded="0">
-                                    <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_name"></property>
-                                    <property name="aui_position"></property>
-                                    <property name="aui_row"></property>
-                                    <property name="best_size"></property>
-                                    <property name="bg"></property>
-                                    <property name="caption"></property>
-                                    <property name="caption_visible">1</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="fg"></property>
-                                    <property name="floatable">1</property>
-                                    <property name="font">,90,90,-1,76,0</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">m_simConsole</property>
-                                    <property name="pane_border">1</property>
-                                    <property name="pane_position"></property>
-                                    <property name="pane_size"></property>
-                                    <property name="permission">protected</property>
-                                    <property name="pin_button">1</property>
-                                    <property name="pos"></property>
-                                    <property name="resize">Resizable</property>
-                                    <property name="show">1</property>
-                                    <property name="size"></property>
-                                    <property name="style">wxTE_READONLY</property>
-                                    <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">wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS</property>
-                                    <event name="OnChar"></event>
-                                    <event name="OnEnterWindow"></event>
-                                    <event name="OnEraseBackground"></event>
-                                    <event name="OnKeyDown"></event>
-                                    <event name="OnKeyUp"></event>
-                                    <event name="OnKillFocus"></event>
-                                    <event name="OnLeaveWindow"></event>
-                                    <event name="OnLeftDClick"></event>
-                                    <event name="OnLeftDown"></event>
-                                    <event name="OnLeftUp"></event>
-                                    <event name="OnMiddleDClick"></event>
-                                    <event name="OnMiddleDown"></event>
-                                    <event name="OnMiddleUp"></event>
-                                    <event name="OnMotion"></event>
-                                    <event name="OnMouseEvents"></event>
-                                    <event name="OnMouseWheel"></event>
-                                    <event name="OnPaint"></event>
-                                    <event name="OnRichTextCharacter"></event>
-                                    <event name="OnRichTextContentDeleted"></event>
-                                    <event name="OnRichTextContentInserted"></event>
-                                    <event name="OnRichTextDelete"></event>
-                                    <event name="OnRichTextReturn"></event>
-                                    <event name="OnRichTextStyleChanged"></event>
-                                    <event name="OnRichTextStyleSheetChanged"></event>
-                                    <event name="OnRichTextStyleSheetReplaced"></event>
-                                    <event name="OnRichTextStyleSheetReplacing"></event>
-                                    <event name="OnRightDClick"></event>
-                                    <event name="OnRightDown"></event>
-                                    <event name="OnRightUp"></event>
-                                    <event name="OnSetFocus"></event>
-                                    <event name="OnSize"></event>
-                                    <event name="OnText"></event>
-                                    <event name="OnTextEnter"></event>
-                                    <event name="OnTextMaxLen"></event>
-                                    <event name="OnTextURL"></event>
-                                    <event name="OnUpdateUI"></event>
-                                </object>
-                            </object>
-                        </object>
                     </object>
                 </object>
             </object>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index 99ccc930bb..03dc4dd9b6 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -23,13 +23,12 @@ class KIWAY_PLAYER;
 #include <wx/font.h>
 #include <wx/colour.h>
 #include <wx/settings.h>
-#include <wx/aui/auibook.h>
-#include <wx/sizer.h>
-#include <wx/panel.h>
+#include <wx/notebook.h>
 #include <wx/stattext.h>
 #include <wx/listbox.h>
 #include <wx/listctrl.h>
 #include <wx/button.h>
+#include <wx/sizer.h>
 #include <wx/richtext/richtextctrl.h>
 #include <wx/frame.h>
 
@@ -47,10 +46,7 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxMenuBar* m_mainMenu;
 		wxMenu* m_fileMenu;
 		wxMenu* m_viewMenu;
-		wxPanel* m_panel31;
-		wxPanel* m_panel61;
-		wxAuiNotebook* m_plotNotebook;
-		wxPanel* m_panel7;
+		wxNotebook* m_plotNotebook;
 		wxStaticText* m_staticText2;
 		wxListBox* m_signals;
 		wxStaticText* m_staticText21;
@@ -58,7 +54,6 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxButton* m_simulateBtn;
 		wxButton* m_probeBtn;
 		wxButton* m_tuneBtn;
-		wxPanel* m_panel3;
 		wxRichTextCtrl* m_simConsole;
 		
 		// Virtual event handlers, overide them in your derived class
@@ -71,9 +66,9 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		virtual void menuZoomFit( wxCommandEvent& event ) { event.Skip(); }
 		virtual void menuShowGrid( wxCommandEvent& event ) { event.Skip(); }
 		virtual void menuShowGridState( wxUpdateUIEvent& event ) { event.Skip(); }
+		virtual void onPlotChanged( wxNotebookEvent& event ) { event.Skip(); }
 		virtual void onSignalDblClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onSignalRClick( wxMouseEvent& event ) { event.Skip(); }
-		virtual void onCursorsUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
 		virtual void onSimulate( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onPlaceProbe( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onTune( wxCommandEvent& event ) { event.Skip(); }

From e364cfdbac6619600f322a5e0025265954fe6908 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:27 +0200
Subject: [PATCH 055/197] Renamed wxEVT_SIM* events to EVT_SIM*

---
 eeschema/sim/sim_plot_frame.cpp | 15 +++++++++------
 eeschema/sim/sim_plot_frame.h   |  6 +++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index ace59cdd95..e67d591353 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -45,7 +45,7 @@ public:
 
     REPORTER& Report( const wxString& aText, SEVERITY aSeverity = RPT_UNDEFINED ) override
     {
-        wxCommandEvent* event = new wxCommandEvent( wxEVT_SIM_REPORT );
+        wxCommandEvent* event = new wxCommandEvent( EVT_SIM_REPORT );
         event->SetString( aText );
         wxQueueEvent( m_parent, event );
         return *this;
@@ -58,11 +58,11 @@ public:
         switch( aNewState )
         {
             case SIM_IDLE:
-                event = new wxCommandEvent( wxEVT_SIM_FINISHED );
+                event = new wxCommandEvent( EVT_SIM_FINISHED );
                 break;
 
             case SIM_RUNNING:
-                event = new wxCommandEvent( wxEVT_SIM_STARTED );
+                event = new wxCommandEvent( EVT_SIM_STARTED );
                 break;
         }
 
@@ -83,9 +83,9 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     m_simulator = NULL;
 
     Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SIM_PLOT_FRAME::onClose ), NULL, this );
-    Connect( wxEVT_SIM_REPORT, wxCommandEventHandler( SIM_PLOT_FRAME::onSimReport ), NULL, this );
-    Connect( wxEVT_SIM_STARTED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimStarted ), NULL, this );
-    Connect( wxEVT_SIM_FINISHED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
+    Connect( EVT_SIM_REPORT, wxCommandEventHandler( SIM_PLOT_FRAME::onSimReport ), NULL, this );
+    Connect( EVT_SIM_STARTED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimStarted ), NULL, this );
+    Connect( EVT_SIM_FINISHED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
 
     NewPlotPanel();
 }
@@ -394,3 +394,6 @@ void SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::onMenuEvent( wxMenuEvent& aEvent )
     }
 }
 
+wxDEFINE_EVENT( EVT_SIM_REPORT, wxCommandEvent );
+wxDEFINE_EVENT( EVT_SIM_STARTED, wxCommandEvent );
+wxDEFINE_EVENT( EVT_SIM_FINISHED, wxCommandEvent );
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index d367172bde..d934e930c4 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -137,8 +137,8 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         };
 };
 
-wxDEFINE_EVENT( wxEVT_SIM_REPORT, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_SIM_STARTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_SIM_FINISHED, wxCommandEvent );
+wxDECLARE_EVENT( EVT_SIM_REPORT, wxCommandEvent );
+wxDECLARE_EVENT( EVT_SIM_STARTED, wxCommandEvent );
+wxDECLARE_EVENT( EVT_SIM_FINISHED, wxCommandEvent );
 
 #endif // __sim_plot_frame__

From 8c138312fb658d559d669ea8652eddb5d7525934 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:27 +0200
Subject: [PATCH 056/197] Cursors are updated on request instead of using
 update UI events Previously CPU was busy updating the list of cursors even
 though nothing was changing.

---
 eeschema/sim/sim_plot_frame.cpp | 54 +++++++++++++++++++--------------
 eeschema/sim/sim_plot_frame.h   |  4 ++-
 eeschema/sim/sim_plot_panel.cpp |  8 +++++
 eeschema/sim/sim_plot_panel.h   |  2 ++
 4 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index e67d591353..bf1df67e2a 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -86,6 +86,7 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     Connect( EVT_SIM_REPORT, wxCommandEventHandler( SIM_PLOT_FRAME::onSimReport ), NULL, this );
     Connect( EVT_SIM_STARTED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimStarted ), NULL, this );
     Connect( EVT_SIM_FINISHED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
+    Connect( EVT_SIM_CURSOR_UPDATE, wxCommandEventHandler( SIM_PLOT_FRAME::onCursorUpdate ), NULL, this );
 
     NewPlotPanel();
 }
@@ -216,6 +217,12 @@ void SIM_PLOT_FRAME::menuShowGridState( wxUpdateUIEvent& event )
 }
 
 
+void SIM_PLOT_FRAME::onPlotChanged( wxNotebookEvent& event )
+{
+    wxQueueEvent( this, new wxCommandEvent( EVT_SIM_CURSOR_UPDATE ) );
+}
+
+
 void SIM_PLOT_FRAME::onSignalDblClick( wxCommandEvent& event )
 {
     int idx = m_signals->GetSelection();
@@ -253,29 +260,6 @@ void SIM_PLOT_FRAME::onSignalRClick( wxMouseEvent& event )
 }
 
 
-void SIM_PLOT_FRAME::onCursorsUpdate( wxUpdateUIEvent& event )
-{
-    wxSize size = m_cursors->GetClientSize();
-    m_cursors->ClearAll();
-
-    const long SIGNAL_COL = m_cursors->AppendColumn( wxT( "Signal" ), wxLIST_FORMAT_LEFT, size.x / 2 );
-    const long X_COL = m_cursors->AppendColumn( CurrentPlot()->GetLabelX(), wxLIST_FORMAT_LEFT, size.x / 4 );
-    const long Y_COL = m_cursors->AppendColumn( CurrentPlot()->GetLabelY(), wxLIST_FORMAT_LEFT, size.x / 4 );
-
-    // Update cursor values
-    for( const auto& trace : CurrentPlot()->GetTraces() )
-    {
-        if( CURSOR* cursor = trace.second->GetCursor() )
-        {
-            const wxRealPoint coords = cursor->GetCoords();
-            long idx = m_cursors->InsertItem( SIGNAL_COL, trace.first );
-            m_cursors->SetItem( idx, X_COL, wxString::Format( "%f", coords.x ) );
-            m_cursors->SetItem( idx, Y_COL, wxString::Format( "%f", coords.y ) );
-        }
-    }
-}
-
-
 void SIM_PLOT_FRAME::onSimulate( wxCommandEvent& event )
 {
     if( isSimulationRunning() )
@@ -304,6 +288,29 @@ void SIM_PLOT_FRAME::onClose( wxCloseEvent& aEvent )
 }
 
 
+void SIM_PLOT_FRAME::onCursorUpdate( wxCommandEvent& event )
+{
+    wxSize size = m_cursors->GetClientSize();
+    m_cursors->ClearAll();
+
+    const long SIGNAL_COL = m_cursors->AppendColumn( wxT( "Signal" ), wxLIST_FORMAT_LEFT, size.x / 2 );
+    const long X_COL = m_cursors->AppendColumn( CurrentPlot()->GetLabelX(), wxLIST_FORMAT_LEFT, size.x / 4 );
+    const long Y_COL = m_cursors->AppendColumn( CurrentPlot()->GetLabelY(), wxLIST_FORMAT_LEFT, size.x / 4 );
+
+    // Update cursor values
+    for( const auto& trace : CurrentPlot()->GetTraces() )
+    {
+        if( CURSOR* cursor = trace.second->GetCursor() )
+        {
+            const wxRealPoint coords = cursor->GetCoords();
+            long idx = m_cursors->InsertItem( SIGNAL_COL, trace.first );
+            m_cursors->SetItem( idx, X_COL, wxString::Format( "%f", coords.x ) );
+            m_cursors->SetItem( idx, Y_COL, wxString::Format( "%f", coords.y ) );
+        }
+    }
+}
+
+
 void SIM_PLOT_FRAME::onSimStarted( wxCommandEvent& aEvent )
 {
     m_simulateBtn->SetLabel( wxT( "Stop" ) );
@@ -377,6 +384,7 @@ void SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::onMenuEvent( wxMenuEvent& aEvent )
     {
         case SHOW_SIGNAL:
             m_plotFrame->AddVoltagePlot( m_signal );
+            plot->Fit();
             break;
 
             break;
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index d934e930c4..6fe74d97b5 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -98,15 +98,17 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void menuShowGridState( wxUpdateUIEvent& event ) override;
 
         // Event handlers
+        void onPlotChanged( wxNotebookEvent& event ) override;
+
         void onSignalDblClick( wxCommandEvent& event ) override;
         void onSignalRClick( wxMouseEvent& event ) override;
-        void onCursorsUpdate( wxUpdateUIEvent& event ) override;
 
         void onSimulate( wxCommandEvent& event ) override;
         void onPlaceProbe( wxCommandEvent& event ) override;
 
         void onClose( wxCloseEvent& aEvent );
 
+        void onCursorUpdate( wxCommandEvent& aEvent );
         void onSimStarted( wxCommandEvent& aEvent );
         void onSimFinished( wxCommandEvent& aEvent );
         void onSimReport( wxCommandEvent& aEvent );
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index c960615965..b433924a20 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -73,6 +73,9 @@ void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
 
         m_coords.y = leftY + ( rightY - leftY ) / ( rightX - leftX ) * ( m_coords.x - leftX );
         m_updateRequired = false;
+
+        // Notify the parent window about the changes
+        wxQueueEvent( aWindow.GetParent(), new wxCommandEvent( EVT_SIM_CURSOR_UPDATE ) );
     }
     else
     {
@@ -228,6 +231,9 @@ void SIM_PLOT_PANEL::EnableCursor( const wxString& aName, bool aEnable )
         t->SetCursor( NULL );
         DelLayer( c, true );
     }
+
+    // Notify the parent window about the changes
+    wxQueueEvent( GetParent(), new wxCommandEvent( EVT_SIM_CURSOR_UPDATE ) );
 }
 
 
@@ -252,3 +258,5 @@ wxColour SIM_PLOT_PANEL::generateColor()
     /// @todo generate shades to avoid repeating colors
     return wxColour( colors[m_colorIdx++ % colorCount] );
 }
+
+wxDEFINE_EVENT( EVT_SIM_CURSOR_UPDATE, wxCommandEvent );
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index e7b0db256b..07ea3c2f67 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -204,4 +204,6 @@ private:
     //mpInfoCoords* m_coords;
 };
 
+wxDECLARE_EVENT( EVT_SIM_CURSOR_UPDATE, wxCommandEvent );
+
 #endif

From a35e324c3ff6ab627b923592c3a3dfca9ed8a252 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:27 +0200
Subject: [PATCH 057/197] Mouse controls in simulation plot made coherent with
 the rest of KiCad

---
 common/widgets/mathplot.cpp | 151 ++++++++++++++++--------------------
 include/widgets/mathplot.h  |  10 +--
 2 files changed, 71 insertions(+), 90 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index 6ceb14f3fd..c8e3c6ad22 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -1122,15 +1122,14 @@ IMPLEMENT_DYNAMIC_CLASS(mpWindow, wxWindow)
     EVT_SCROLLWIN_LINEUP(mpWindow::OnScrollLineUp)
     EVT_SCROLLWIN_LINEDOWN(mpWindow::OnScrollLineDown)
     EVT_SCROLLWIN_TOP(mpWindow::OnScrollTop)
-EVT_SCROLLWIN_BOTTOM(mpWindow::OnScrollBottom)
+    EVT_SCROLLWIN_BOTTOM(mpWindow::OnScrollBottom)
 
-    EVT_MIDDLE_UP( mpWindow::OnShowPopupMenu)
-    EVT_RIGHT_DOWN( mpWindow::OnMouseRightDown) // JLB
-    EVT_RIGHT_UP ( mpWindow::OnShowPopupMenu)
-    EVT_MOUSEWHEEL( mpWindow::OnMouseWheel )   // JLB
-    EVT_MOTION( mpWindow::OnMouseMove )   // JLB
-    EVT_LEFT_DOWN( mpWindow::OnMouseLeftDown)
-EVT_LEFT_UP( mpWindow::OnMouseLeftRelease)
+    EVT_MIDDLE_DOWN(mpWindow::OnMouseMiddleDown) // JLB
+    EVT_RIGHT_UP(mpWindow::OnShowPopupMenu)
+    EVT_MOUSEWHEEL(mpWindow::OnMouseWheel )   // JLB
+    EVT_MOTION(mpWindow::OnMouseMove )   // JLB
+    EVT_LEFT_DOWN(mpWindow::OnMouseLeftDown)
+    EVT_LEFT_UP(mpWindow::OnMouseLeftRelease)
 
     EVT_MENU( mpID_CENTER,    mpWindow::OnCenter)
     EVT_MENU( mpID_FIT,       mpWindow::OnFit)
@@ -1154,7 +1153,6 @@ mpWindow::mpWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const w
     m_buff_bmp = NULL;
     m_enableDoubleBuffer        = FALSE;
     m_enableMouseNavigation     = TRUE;
-    m_mouseMovedAfterRightClick = FALSE;
     m_movingInfoLayer = NULL;
     // Set margins to 0
     m_marginTop = 0; m_marginRight = 0; m_marginBottom = 0; m_marginLeft = 0;
@@ -1167,7 +1165,7 @@ mpWindow::mpWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const w
     m_popmenu.Append( mpID_ZOOM_IN,    _("Zoom in"),     _("Zoom in plot view."));
     m_popmenu.Append( mpID_ZOOM_OUT,   _("Zoom out"),    _("Zoom out plot view."));
     m_popmenu.AppendCheckItem( mpID_LOCKASPECT, _("Lock aspect"), _("Lock horizontal and vertical zoom aspect."));
-    m_popmenu.Append( mpID_HELP_MOUSE,   _("Show mouse commands..."),    _("Show help about the mouse commands."));
+    //m_popmenu.Append( mpID_HELP_MOUSE,   _("Show mouse commands..."),    _("Show help about the mouse commands."));
 
     m_layers.clear();
     SetBackgroundColour( *wxWHITE );
@@ -1197,15 +1195,10 @@ mpWindow::~mpWindow()
 
 // Mouse handler, for detecting when the user drag with the right button or just "clicks" for the menu
 // JLB
-void mpWindow::OnMouseRightDown(wxMouseEvent     &event)
+void mpWindow::OnMouseMiddleDown(wxMouseEvent &event)
 {
-    m_mouseMovedAfterRightClick = FALSE;
-    m_mouseRClick_X = event.GetX();
-    m_mouseRClick_Y = event.GetY();
-    if (m_enableMouseNavigation)
-    {
-        SetCursor( *wxCROSS_CURSOR );
-    }
+    m_mouseMClick.x = event.GetX();
+    m_mouseMClick.y = event.GetY();
 }
 
 // Process mouse wheel events
@@ -1218,38 +1211,37 @@ void mpWindow::OnMouseWheel( wxMouseEvent &event )
         return;
     }
 
-    //     GetClientSize( &m_scrX,&m_scrY);
+    // Scroll vertically or horizontally (this is SHIFT is hold down).
+    int change = - event.GetWheelRotation(); // Opposite direction (More intuitive)!
+    double changeUnitsX = change / m_scaleX;
+    double changeUnitsY = change / m_scaleY;
 
     if (event.m_controlDown)
     {
-        wxPoint clickPt( event.GetX(),event.GetY() );
-        // CTRL key hold: Zoom in/out:
-        if (event.GetWheelRotation()>0)
-            ZoomIn( clickPt );
-        else    ZoomOut( clickPt );
+        // horizontal scroll
+        m_posX 		+= changeUnitsX;
+        m_desiredXmax 	+= changeUnitsX;
+        m_desiredXmin 	+= changeUnitsX;
+    }
+    else if(event.m_shiftDown)
+    {
+        // vertical scroll
+        m_posY 		-= changeUnitsY;
+        m_desiredYmax	-= changeUnitsY;
+        m_desiredYmax	-= changeUnitsY;
     }
     else
     {
-        // Scroll vertically or horizontally (this is SHIFT is hold down).
-        int change = - event.GetWheelRotation(); // Opposite direction (More intuitive)!
-        double changeUnitsX = change / m_scaleX;
-        double changeUnitsY = change / m_scaleY;
+        // zoom in/out
+        wxPoint clickPt( event.GetX(),event.GetY() );
 
-        if (event.m_shiftDown)
-        {
-            m_posX 		+= changeUnitsX;
-            m_desiredXmax 	+= changeUnitsX;
-            m_desiredXmin 	+= changeUnitsX;
-        }
+        if (event.GetWheelRotation() > 0)
+            ZoomIn( clickPt );
         else
-        {
-            m_posY 		-= changeUnitsY;
-            m_desiredYmax	-= changeUnitsY;
-            m_desiredYmax	-= changeUnitsY;
-        }
-
-        UpdateAll();
+            ZoomOut( clickPt );
     }
+
+    UpdateAll();
 }
 
 // If the user "drags" with the right buttom pressed, do "pan"
@@ -1262,17 +1254,15 @@ void mpWindow::OnMouseMove(wxMouseEvent     &event)
         return;
     }
 
-    if (event.m_rightDown)
+    if (event.m_middleDown)
     {
-        m_mouseMovedAfterRightClick = TRUE;  // Hides the popup menu after releasing the button!
-
         // The change:
-        int  Ax= m_mouseRClick_X - event.GetX();
-        int  Ay= m_mouseRClick_Y - event.GetY();
+        int  Ax= m_mouseMClick.x - event.GetX();
+        int  Ay= m_mouseMClick.y - event.GetY();
 
         // For the next event, use relative to this coordinates.
-        m_mouseRClick_X = event.GetX();
-        m_mouseRClick_Y = event.GetY();
+        m_mouseMClick.x = event.GetX();
+        m_mouseMClick.y = event.GetY();
 
         double   Ax_units = Ax / m_scaleX;
         double   Ay_units = -Ay / m_scaleY;
@@ -1296,9 +1286,9 @@ void mpWindow::OnMouseMove(wxMouseEvent     &event)
                 wxPen pen(*wxBLACK, 1, wxDOT);
                 dc.SetPen(pen);
                 dc.SetBrush(*wxTRANSPARENT_BRUSH);
-                dc.DrawRectangle(m_mouseLClick_X, m_mouseLClick_Y, event.GetX() - m_mouseLClick_X, event.GetY() - m_mouseLClick_Y);
+                dc.DrawRectangle(m_mouseLClick.x, m_mouseLClick.y, event.GetX() - m_mouseLClick.x, event.GetY() - m_mouseLClick.y);
             } else {
-                wxPoint moveVector(event.GetX() - m_mouseLClick_X, event.GetY() - m_mouseLClick_Y);
+                wxPoint moveVector(event.GetX() - m_mouseLClick.x, event.GetY() - m_mouseLClick.y);
                 m_movingInfoLayer->Move(moveVector);
             }
             UpdateAll();
@@ -1327,16 +1317,16 @@ void mpWindow::OnMouseMove(wxMouseEvent     &event)
 
 void mpWindow::OnMouseLeftDown (wxMouseEvent &event)
 {
-    m_mouseLClick_X = event.GetX();
-    m_mouseLClick_Y = event.GetY();
+    m_mouseLClick.x = event.GetX();
+    m_mouseLClick.y = event.GetY();
 #ifdef MATHPLOT_DO_LOGGING
-    wxLogMessage(_("mpWindow::OnMouseLeftDown() X = %d , Y = %d"), event.GetX(), event.GetY());/*m_mouseLClick_X, m_mouseLClick_Y);*/
+    wxLogMessage(_("mpWindow::OnMouseLeftDown() X = %d , Y = %d"), event.GetX(), event.GetY());/*m_mouseLClick.x, m_mouseLClick.y);*/
 #endif
     wxPoint pointClicked = event.GetPosition();
     m_movingInfoLayer = IsInsideInfoLayer(pointClicked);
     if (m_movingInfoLayer != NULL) {
 #ifdef MATHPLOT_DO_LOGGING
-        wxLogMessage(_("mpWindow::OnMouseLeftDown() started moving layer %lx"), (long int) m_movingInfoLayer);/*m_mouseLClick_X, m_mouseLClick_Y);*/
+        wxLogMessage(_("mpWindow::OnMouseLeftDown() started moving layer %lx"), (long int) m_movingInfoLayer);/*m_mouseLClick.x, m_mouseLClick.y);*/
 #endif
     }
     event.Skip();
@@ -1345,7 +1335,7 @@ void mpWindow::OnMouseLeftDown (wxMouseEvent &event)
 void mpWindow::OnMouseLeftRelease (wxMouseEvent &event)
 {
     wxPoint release(event.GetX(), event.GetY());
-    wxPoint press(m_mouseLClick_X, m_mouseLClick_Y);
+    wxPoint press(m_mouseLClick.x, m_mouseLClick.y);
     if (m_movingInfoLayer != NULL) {
         m_movingInfoLayer->UpdateReference();
         m_movingInfoLayer = NULL;
@@ -1617,18 +1607,9 @@ void mpWindow::LockAspect(bool enable)
 
 void mpWindow::OnShowPopupMenu(wxMouseEvent &event)
 {
-    // Only display menu if the user has not "dragged" the figure
-    if (m_enableMouseNavigation)
-    {
-        SetCursor( *wxSTANDARD_CURSOR );
-    }
-
-    if (!m_mouseMovedAfterRightClick)   // JLB
-    {
-        m_clickedX = event.GetX();
-        m_clickedY = event.GetY();
-        PopupMenu( &m_popmenu, event.GetX(), event.GetY());
-    }
+    m_clickedX = event.GetX();
+    m_clickedY = event.GetY();
+    PopupMenu( &m_popmenu, event.GetX(), event.GetY());
 }
 
 void mpWindow::OnLockAspect(wxCommandEvent& WXUNUSED(event))
@@ -1640,7 +1621,7 @@ void mpWindow::OnMouseHelp(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageBox(_("Supported Mouse commands:\n \
                 - Left button down + Mark area: Rectangular zoom\n \
-                - Right button down + Move: Pan (Move)\n \
+                - Middle button down + Move: Pan (Move)\n \
                 - Wheel: Vertical scroll\n \
                 - Wheel + SHIFT: Horizontal scroll\n \
                 - Wheel + CTRL: Zoom in/out"),_("wxMathPlot help"),wxOK,this);
@@ -1662,7 +1643,7 @@ void mpWindow::OnCenter(wxCommandEvent& WXUNUSED(event))
 
 void mpWindow::OnZoomIn(wxCommandEvent& WXUNUSED(event))
 {
-    ZoomIn( wxPoint(m_mouseRClick_X,m_mouseRClick_Y) );
+    ZoomIn( wxPoint(m_mouseMClick.x,m_mouseMClick.y) );
 }
 
 void mpWindow::OnZoomOut(wxCommandEvent& WXUNUSED(event))
@@ -1794,9 +1775,9 @@ void mpWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
           }*/
     // If scrollbars are enabled, refresh them
     if (m_enableScrollBars) {
-        /*       m_scrollX = (int) floor((m_posX - m_minX)*m_scaleX);
-                 m_scrollY = (int) floor((m_maxY - m_posY )*m_scaleY);
-                 Scroll(m_scrollX, m_scrollY);*/
+        /*       m_scroll.x = (int) floor((m_posX - m_minX)*m_scaleX);
+                 m_scroll.y = (int) floor((m_maxY - m_posY )*m_scaleY);
+                 Scroll(m_scroll.x, m_scroll.y);*/
         // Scroll(x2p(m_posX), y2p(m_posY));
         //             SetVirtualSize((int) ((m_maxX - m_minX)*m_scaleX), (int) ((m_maxY - m_minY)*m_scaleY));
         //         int centerX = (m_scrX - m_marginLeft - m_marginRight)/2; // + m_marginLeft; // c.x = m_scrX/2;
@@ -1816,18 +1797,18 @@ void mpWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 //         event.Skip();
 //         return;
 //     }
-// //     m_scrollX = (int) floor((m_posX - m_minX)*m_scaleX);
-// //     m_scrollY = (int) floor((m_maxY - m_posY /*- m_minY*/)*m_scaleY);
-// //     Scroll(m_scrollX, m_scrollY);
+// //     m_scroll.x = (int) floor((m_posX - m_minX)*m_scaleX);
+// //     m_scroll.y = (int) floor((m_maxY - m_posY /*- m_minY*/)*m_scaleY);
+// //     Scroll(m_scroll.x, m_scroll.y);
 //
 // //     GetClientSize( &m_scrX, &m_scrY);
 //     //Scroll(x2p(m_desiredXmin), y2p(m_desiredYmin));
 //     int pixelStep = 1;
 //     if (event.GetOrientation() == wxHORIZONTAL) {
-//         //m_desiredXmin -= (m_scrollX - event.GetPosition())/m_scaleX;
-//         //m_desiredXmax -= (m_scrollX - event.GetPosition())/m_scaleX;
-//         m_posX -= (m_scrollX - event.GetPosition())/m_scaleX;
-//         m_scrollX = event.GetPosition();
+//         //m_desiredXmin -= (m_scroll.x - event.GetPosition())/m_scaleX;
+//         //m_desiredXmax -= (m_scroll.x - event.GetPosition())/m_scaleX;
+//         m_posX -= (m_scroll.x - event.GetPosition())/m_scaleX;
+//         m_scroll.x = event.GetPosition();
 //     }
 //     Fit(m_desiredXmin, m_desiredXmax, m_desiredYmin, m_desiredYmax);
 // // /*    int pixelStep = 1;
@@ -1870,13 +1851,13 @@ void mpWindow::SetMPScrollbars(bool status)
     //     EnableScrolling(false, false);
     //     m_enableScrollBars = status;
     //     EnableScrolling(status, status);
-    /*    m_scrollX = (int) floor((m_posX - m_minX)*m_scaleX);
-          m_scrollY = (int) floor((m_posY - m_minY)*m_scaleY);*/
+    /*    m_scroll.x = (int) floor((m_posX - m_minX)*m_scaleX);
+          m_scroll.y = (int) floor((m_posY - m_minY)*m_scaleY);*/
     //     int scrollWidth = (int) floor((m_maxX - m_minX)*m_scaleX) - m_scrX;
     //     int scrollHeight = (int) floor((m_minY - m_maxY)*m_scaleY) - m_scrY;
 
-    // /*    m_scrollX = (int) floor((m_posX - m_minX)*m_scaleX);
-    //     m_scrollY = (int) floor((m_maxY - m_posY /*- m_minY*/)*m_scaleY);
+    // /*    m_scroll.x = (int) floor((m_posX - m_minX)*m_scaleX);
+    //     m_scroll.y = (int) floor((m_maxY - m_posY /*- m_minY*/)*m_scaleY);
     //     int scrollWidth = (int) floor(((m_maxX - m_minX) - (m_desiredXmax - m_desiredXmin))*m_scaleX);
     //     int scrollHeight = (int) floor(((m_maxY - m_minY) - (m_desiredYmax - m_desiredYmin))*m_scaleY);
     // #ifdef MATHPLOT_DO_LOGGING
@@ -1887,8 +1868,8 @@ void mpWindow::SetMPScrollbars(bool status)
     //                       1,
     //                       scrollWidth,
     //                       scrollHeight,
-    //                       m_scrollX,
-    //                       m_scrollY);
+    //                       m_scroll.x,
+    //                       m_scroll.y);
     // //         SetVirtualSize((int) (m_maxX - m_minX), (int) (m_maxY - m_minY));
     //     }
     //     Refresh(false);*/
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index d03d8e99ef..8407952a71 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -1161,7 +1161,8 @@ class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
         void OnSize          (wxSizeEvent      &event); //!< Size handler, will update scroll bar sizes
         // void OnScroll2       (wxScrollWinEvent &event); //!< Scroll handler, will move canvas
         void OnShowPopupMenu (wxMouseEvent     &event); //!< Mouse handler, will show context menu
-        void OnMouseRightDown(wxMouseEvent     &event); //!< Mouse handler, for detecting when the user drags with the right button or just "clicks" for the menu
+        void OnMouseMiddleDown(wxMouseEvent    &event); //!< Mouse handler, for detecting when the user
+                                                        //!< drags with the middle button or just "clicks" for the menu
         void OnCenter        (wxCommandEvent   &event); //!< Context menu handler
         void OnFit           (wxCommandEvent   &event); //!< Context menu handler
         void OnZoomIn        (wxCommandEvent   &event); //!< Context menu handler
@@ -1225,11 +1226,10 @@ class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
         wxBitmap    *m_buff_bmp;            //!< For double buffering
         bool        m_enableDoubleBuffer;  //!< For double buffering
         bool        m_enableMouseNavigation;  //!< For pan/zoom with the mouse.
-        bool        m_mouseMovedAfterRightClick;
-        long        m_mouseRClick_X,m_mouseRClick_Y; //!< For the right button "drag" feature
-        int         m_mouseLClick_X, m_mouseLClick_Y; //!< Starting coords for rectangular zoom selection
+        wxPoint     m_mouseMClick;          //!< For the middle button "drag" feature
+        wxPoint     m_mouseLClick;          //!< Starting coords for rectangular zoom selection
         bool        m_enableScrollBars;
-        int         m_scrollX, m_scrollY;
+        wxPoint     m_scroll;
         mpInfoLayer* m_movingInfoLayer;      //!< For moving info layers over the window area
 
         DECLARE_DYNAMIC_CLASS(mpWindow)

From 1d4fe279db23a9a263728c80435177d96d865238 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:27 +0200
Subject: [PATCH 058/197] Menu entries to toggle legend & coordinates

---
 eeschema/sim/sim_plot_frame.cpp      | 36 ++++++++++++++++--
 eeschema/sim/sim_plot_frame.h        |  8 +++-
 eeschema/sim/sim_plot_frame_base.cpp | 56 ++++++++++++++++++----------
 eeschema/sim/sim_plot_frame_base.fbp | 46 +++++++++++++++++++----
 eeschema/sim/sim_plot_frame_base.h   |  6 ++-
 eeschema/sim/sim_plot_panel.cpp      | 35 +++++++----------
 eeschema/sim/sim_plot_panel.h        | 39 +++++++++++++++++--
 7 files changed, 167 insertions(+), 59 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index bf1df67e2a..e73fce831b 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -205,15 +205,43 @@ void SIM_PLOT_FRAME::menuZoomFit( wxCommandEvent& event )
 
 void SIM_PLOT_FRAME::menuShowGrid( wxCommandEvent& event )
 {
-    CurrentPlot()->ShowGrid( !CurrentPlot()->IsGridShown() );
+    SIM_PLOT_PANEL* plot = CurrentPlot();
+    plot->ShowGrid( !plot->IsGridShown() );
 }
 
 
-void SIM_PLOT_FRAME::menuShowGridState( wxUpdateUIEvent& event )
+void SIM_PLOT_FRAME::menuShowGridUpdate( wxUpdateUIEvent& event )
 {
-    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
+    SIM_PLOT_PANEL* plot = CurrentPlot();
+    event.Check( plot ? plot->IsGridShown() : false );
+}
 
-    event.Check( plotPanel ? plotPanel->IsGridShown() : false );
+
+void SIM_PLOT_FRAME::menuShowLegend( wxCommandEvent& event )
+{
+    SIM_PLOT_PANEL* plot = CurrentPlot();
+    plot->ShowLegend( !plot->IsLegendShown() );
+}
+
+
+void SIM_PLOT_FRAME::menuShowLegendUpdate( wxUpdateUIEvent& event )
+{
+    SIM_PLOT_PANEL* plot = CurrentPlot();
+    event.Check( plot ? plot->IsLegendShown() : false );
+}
+
+
+void SIM_PLOT_FRAME::menuShowCoords( wxCommandEvent& event )
+{
+    SIM_PLOT_PANEL* plot = CurrentPlot();
+    plot->ShowCoords( !plot->IsCoordsShown() );
+}
+
+
+void SIM_PLOT_FRAME::menuShowCoordsUpdate( wxUpdateUIEvent& event )
+{
+    SIM_PLOT_PANEL* plot = CurrentPlot();
+    event.Check( plot ? plot->IsCoordsShown() : false );
 }
 
 
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 6fe74d97b5..be3a664256 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -91,13 +91,17 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
             Close();
         }
 
+        // Event handlers
         void menuZoomIn( wxCommandEvent& event ) override;
         void menuZoomOut( wxCommandEvent& event ) override;
         void menuZoomFit( wxCommandEvent& event ) override;
         void menuShowGrid( wxCommandEvent& event ) override;
-        void menuShowGridState( wxUpdateUIEvent& event ) override;
+        void menuShowGridUpdate( wxUpdateUIEvent& event ) override;
+        void menuShowLegend( wxCommandEvent& event ) override;
+        void menuShowLegendUpdate( wxUpdateUIEvent& event ) override;
+        void menuShowCoords( wxCommandEvent& event ) override;
+        void menuShowCoordsUpdate( wxUpdateUIEvent& event ) override;
 
-        // Event handlers
         void onPlotChanged( wxNotebookEvent& event ) override;
 
         void onSignalDblClick( wxCommandEvent& event ) override;
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index d6f1aa2f28..a13990e4b1 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -38,23 +38,31 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_mainMenu->Append( m_fileMenu, _("File") ); 
 	
 	m_viewMenu = new wxMenu();
-	wxMenuItem* m_menuItem3;
-	m_menuItem3 = new wxMenuItem( m_viewMenu, wxID_ZOOM_IN, wxString( _("Zoom In") ) , wxEmptyString, wxITEM_NORMAL );
-	m_viewMenu->Append( m_menuItem3 );
+	wxMenuItem* m_zoomIn;
+	m_zoomIn = new wxMenuItem( m_viewMenu, wxID_ZOOM_IN, wxString( _("Zoom In") ) , wxEmptyString, wxITEM_NORMAL );
+	m_viewMenu->Append( m_zoomIn );
 	
-	wxMenuItem* m_menuItem4;
-	m_menuItem4 = new wxMenuItem( m_viewMenu, wxID_ZOOM_OUT, wxString( _("Zoom Out") ) , wxEmptyString, wxITEM_NORMAL );
-	m_viewMenu->Append( m_menuItem4 );
+	wxMenuItem* m_zoomOut;
+	m_zoomOut = new wxMenuItem( m_viewMenu, wxID_ZOOM_OUT, wxString( _("Zoom Out") ) , wxEmptyString, wxITEM_NORMAL );
+	m_viewMenu->Append( m_zoomOut );
 	
-	wxMenuItem* m_menuItem5;
-	m_menuItem5 = new wxMenuItem( m_viewMenu, wxID_ZOOM_FIT, wxString( _("Fit on Screen") ) , wxEmptyString, wxITEM_NORMAL );
-	m_viewMenu->Append( m_menuItem5 );
+	wxMenuItem* m_zoomFit;
+	m_zoomFit = new wxMenuItem( m_viewMenu, wxID_ZOOM_FIT, wxString( _("Fit on Screen") ) , wxEmptyString, wxITEM_NORMAL );
+	m_viewMenu->Append( m_zoomFit );
 	
 	m_viewMenu->AppendSeparator();
 	
-	wxMenuItem* m_menuShowGrid;
-	m_menuShowGrid = new wxMenuItem( m_viewMenu, wxID_ANY, wxString( _("Show grid") ) , wxEmptyString, wxITEM_CHECK );
-	m_viewMenu->Append( m_menuShowGrid );
+	wxMenuItem* m_showGrid;
+	m_showGrid = new wxMenuItem( m_viewMenu, wxID_ANY, wxString( _("Show &grid") ) , wxEmptyString, wxITEM_CHECK );
+	m_viewMenu->Append( m_showGrid );
+	
+	wxMenuItem* m_showLegend;
+	m_showLegend = new wxMenuItem( m_viewMenu, wxID_ANY, wxString( _("Show &legend") ) , wxEmptyString, wxITEM_CHECK );
+	m_viewMenu->Append( m_showLegend );
+	
+	wxMenuItem* m_showCoords;
+	m_showCoords = new wxMenuItem( m_viewMenu, wxID_ANY, wxString( _("Show &coordinates") ) , wxEmptyString, wxITEM_CHECK );
+	m_viewMenu->Append( m_showCoords );
 	
 	m_mainMenu->Append( m_viewMenu, _("View") ); 
 	
@@ -67,8 +75,10 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	bSizer5 = new wxBoxSizer( wxHORIZONTAL );
 	
 	m_plotNotebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_plotNotebook->SetMinSize( wxSize( 400,-1 ) );
 	
-	bSizer5->Add( m_plotNotebook, 4, wxEXPAND | wxALL, 5 );
+	
+	bSizer5->Add( m_plotNotebook, 6, wxEXPAND | wxALL, 5 );
 	
 	wxBoxSizer* bSizer7;
 	bSizer7 = new wxBoxSizer( wxVERTICAL );
@@ -126,11 +136,15 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	this->Connect( m_menuItem8->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuOpenWorkbook ) );
 	this->Connect( m_menuItem2->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveWorkbook ) );
 	this->Connect( m_menuItem1->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) );
-	this->Connect( m_menuItem3->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomIn ) );
-	this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomOut ) );
-	this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ) );
-	this->Connect( m_menuShowGrid->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowGrid ) );
-	this->Connect( m_menuShowGrid->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridState ) );
+	this->Connect( m_zoomIn->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomIn ) );
+	this->Connect( m_zoomOut->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomOut ) );
+	this->Connect( m_zoomFit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ) );
+	this->Connect( m_showGrid->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowGrid ) );
+	this->Connect( m_showGrid->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridUpdate ) );
+	this->Connect( m_showLegend->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegend ) );
+	this->Connect( m_showLegend->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegendUpdate ) );
+	this->Connect( m_showCoords->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowCoords ) );
+	this->Connect( m_showCoords->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowCoordsUpdate ) );
 	m_plotNotebook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotChanged ), NULL, this );
 	m_signals->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
 	m_signals->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
@@ -150,7 +164,11 @@ SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
 	this->Disconnect( wxID_ZOOM_OUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomOut ) );
 	this->Disconnect( wxID_ZOOM_FIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ) );
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowGrid ) );
-	this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridState ) );
+	this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridUpdate ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegend ) );
+	this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegendUpdate ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowCoords ) );
+	this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowCoordsUpdate ) );
 	m_plotNotebook->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotChanged ), NULL, this );
 	m_signals->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
 	m_signals->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index 384d95aa24..9c941424c4 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -218,7 +218,7 @@
                         <property name="id">wxID_ZOOM_IN</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Zoom In</property>
-                        <property name="name">m_menuItem3</property>
+                        <property name="name">m_zoomIn</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
@@ -233,7 +233,7 @@
                         <property name="id">wxID_ZOOM_OUT</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Zoom Out</property>
-                        <property name="name">m_menuItem4</property>
+                        <property name="name">m_zoomOut</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
@@ -248,7 +248,7 @@
                         <property name="id">wxID_ZOOM_FIT</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Fit on Screen</property>
-                        <property name="name">m_menuItem5</property>
+                        <property name="name">m_zoomFit</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
@@ -266,13 +266,43 @@
                         <property name="help"></property>
                         <property name="id">wxID_ANY</property>
                         <property name="kind">wxITEM_CHECK</property>
-                        <property name="label">Show grid</property>
-                        <property name="name">m_menuShowGrid</property>
+                        <property name="label">Show &amp;grid</property>
+                        <property name="name">m_showGrid</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection">menuShowGrid</event>
-                        <event name="OnUpdateUI">menuShowGridState</event>
+                        <event name="OnUpdateUI">menuShowGridUpdate</event>
+                    </object>
+                    <object class="wxMenuItem" expanded="1">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="kind">wxITEM_CHECK</property>
+                        <property name="label">Show &amp;legend</property>
+                        <property name="name">m_showLegend</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection">menuShowLegend</event>
+                        <event name="OnUpdateUI">menuShowLegendUpdate</event>
+                    </object>
+                    <object class="wxMenuItem" expanded="1">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="kind">wxITEM_CHECK</property>
+                        <property name="label">Show &amp;coordinates</property>
+                        <property name="name">m_showCoords</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection">menuShowCoords</event>
+                        <event name="OnUpdateUI">menuShowCoordsUpdate</event>
                     </object>
                 </object>
             </object>
@@ -293,7 +323,7 @@
                         <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
                             <property name="flag">wxEXPAND | wxALL</property>
-                            <property name="proportion">4</property>
+                            <property name="proportion">6</property>
                             <object class="wxNotebook" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
@@ -328,7 +358,7 @@
                                 <property name="maximum_size"></property>
                                 <property name="min_size"></property>
                                 <property name="minimize_button">0</property>
-                                <property name="minimum_size"></property>
+                                <property name="minimum_size">400,-1</property>
                                 <property name="moveable">1</property>
                                 <property name="name">m_plotNotebook</property>
                                 <property name="pane_border">1</property>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index 03dc4dd9b6..2aba38d4e9 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -65,7 +65,11 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		virtual void menuZoomOut( wxCommandEvent& event ) { event.Skip(); }
 		virtual void menuZoomFit( wxCommandEvent& event ) { event.Skip(); }
 		virtual void menuShowGrid( wxCommandEvent& event ) { event.Skip(); }
-		virtual void menuShowGridState( wxUpdateUIEvent& event ) { event.Skip(); }
+		virtual void menuShowGridUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
+		virtual void menuShowLegend( wxCommandEvent& event ) { event.Skip(); }
+		virtual void menuShowLegendUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
+		virtual void menuShowCoords( wxCommandEvent& event ) { event.Skip(); }
+		virtual void menuShowCoordsUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
 		virtual void onPlotChanged( wxNotebookEvent& event ) { event.Skip(); }
 		virtual void onSignalDblClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onSignalRClick( wxMouseEvent& event ) { event.Skip(); }
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index b433924a20..428da31ccd 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -110,11 +110,13 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint&
     m_axis_y->SetTicks( false );
     AddLayer( m_axis_y );
 
-    m_legend = new mpInfoLegend( wxRect( 0, 0, 40, 40 ), wxWHITE_BRUSH );
-    AddLayer( m_legend );
+    m_coords = new mpInfoCoords( wxRect( 0, 0, 100, 40 ), wxWHITE_BRUSH );
+    AddLayer( m_coords );
+    m_topLevel.push_back( m_coords );
 
-    //m_coords = new mpInfoCoords( wxRect( 80, 20, 10, 10 ), wxWHITE_BRUSH );
-    //AddLayer( m_coords );
+    m_legend = new mpInfoLegend( wxRect( 0, 40, 40, 40 ), wxWHITE_BRUSH );
+    AddLayer( m_legend );
+    m_topLevel.push_back( m_legend );
 }
 
 
@@ -140,10 +142,14 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
         t->SetPen( wxPen( generateColor(), 1, wxSOLID ) );
         m_traces[aName] = t;
 
-        // It is a trick to keep legend always on the top
-        DelLayer( m_legend );
+        // It is a trick to keep legend & coords always on the top
+        for( mpLayer* l : m_topLevel )
+            DelLayer( l );
+
         AddLayer( t );
-        AddLayer( m_legend );
+
+        for( mpLayer* l : m_topLevel )
+            AddLayer( l );
     }
     else
     {
@@ -189,21 +195,6 @@ void SIM_PLOT_PANEL::DeleteAllTraces()
 }
 
 
-void SIM_PLOT_PANEL::ShowGrid( bool aEnable )
-{
-    m_axis_x->SetTicks( !aEnable );
-    m_axis_y->SetTicks( !aEnable );
-    UpdateAll();
-}
-
-
-bool SIM_PLOT_PANEL::IsGridShown() const
-{
-    assert( m_axis_x->GetTicks() == m_axis_y->GetTicks() );
-    return !m_axis_x->GetTicks();
-}
-
-
 bool SIM_PLOT_PANEL::HasCursorEnabled( const wxString& aName ) const
 {
     TRACE* t = GetTrace( aName );
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 07ea3c2f67..9ba09a32c4 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -182,9 +182,40 @@ public:
         return trace == m_traces.end() ? NULL : trace->second;
     }
 
-    void ShowGrid( bool aEnable = true );
+    void ShowGrid( bool aEnable )
+    {
+        m_axis_x->SetTicks( !aEnable );
+        m_axis_y->SetTicks( !aEnable );
+        UpdateAll();
+    }
 
-    bool IsGridShown() const;
+    bool IsGridShown() const
+    {
+        assert( m_axis_x->GetTicks() == m_axis_y->GetTicks() );
+        return !m_axis_x->GetTicks();
+    }
+
+    void ShowLegend( bool aEnable )
+    {
+        m_legend->SetVisible( aEnable );
+        UpdateAll();
+    }
+
+    bool IsLegendShown() const
+    {
+        return m_legend->IsVisible();
+    }
+
+    void ShowCoords( bool aEnable )
+    {
+        m_coords->SetVisible( aEnable );
+        UpdateAll();
+    }
+
+    bool IsCoordsShown() const
+    {
+        return m_coords->IsVisible();
+    }
 
     bool HasCursorEnabled( const wxString& aName ) const;
 
@@ -201,7 +232,9 @@ private:
     mpScaleX* m_axis_x;
     mpScaleY* m_axis_y;
     mpInfoLegend* m_legend;
-    //mpInfoCoords* m_coords;
+    mpInfoCoords* m_coords;
+
+    std::vector<mpLayer*> m_topLevel;
 };
 
 wxDECLARE_EVENT( EVT_SIM_CURSOR_UPDATE, wxCommandEvent );

From 17294aaf6a26f135d192688d2862091d3a8d487e Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:28 +0200
Subject: [PATCH 059/197] Simulation plot CSV & PNG export

---
 eeschema/sim/sim_plot_frame.cpp      | 52 ++++++++++++++++++++++++++++
 eeschema/sim/sim_plot_frame.h        |  2 ++
 eeschema/sim/sim_plot_frame_base.cpp | 46 +++++++++++++++---------
 eeschema/sim/sim_plot_frame_base.fbp | 48 +++++++++++++++++++++----
 eeschema/sim/sim_plot_frame_base.h   |  2 ++
 5 files changed, 127 insertions(+), 23 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index e73fce831b..f5c2836273 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -185,6 +185,58 @@ int SIM_PLOT_FRAME::getNodeNumber( const wxString& aNetName )
 }
 
 
+void SIM_PLOT_FRAME::menuSaveImage( wxCommandEvent& event )
+{
+    wxFileDialog saveDlg( this, wxT( "Save plot as image" ), "", "",
+                "PNG file (*.png)|*.png", wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+
+    if( saveDlg.ShowModal() == wxID_CANCEL )
+        return;
+
+    CurrentPlot()->SaveScreenshot( saveDlg.GetPath(), wxBITMAP_TYPE_PNG );
+}
+
+
+void SIM_PLOT_FRAME::menuSaveCsv( wxCommandEvent& event )
+{
+    const wxChar SEPARATOR = ';';
+
+    wxFileDialog saveDlg( this, wxT( "Save plot data" ), "", "",
+                "CSV file (*.csv)|*.csv", wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+
+    if( saveDlg.ShowModal() == wxID_CANCEL )
+        return;
+
+    wxFile out( saveDlg.GetPath(), wxFile::write );
+    bool timeWritten = false;
+
+    for( const auto& t : CurrentPlot()->GetTraces() )
+    {
+        const TRACE* trace = t.second;
+
+        if( !timeWritten )
+        {
+            out.Write( wxString::Format( "Time%c", SEPARATOR ) );
+
+            for( double v : trace->GetDataX() )
+                out.Write( wxString::Format( "%f%c", v, SEPARATOR ) );
+
+            out.Write( "\r\n" );
+            timeWritten = true;
+        }
+
+        out.Write( wxString::Format( "%s%c", t.first, SEPARATOR ) );
+
+        for( double v : trace->GetDataY() )
+            out.Write( wxString::Format( "%f%c", v, SEPARATOR ) );
+
+        out.Write( "\r\n" );
+    }
+
+    out.Close();
+}
+
+
 void SIM_PLOT_FRAME::menuZoomIn( wxCommandEvent& event )
 {
     CurrentPlot()->ZoomIn();
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index be3a664256..b46e556dda 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -92,6 +92,8 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         }
 
         // Event handlers
+        void menuSaveImage( wxCommandEvent& event ) override;
+        void menuSaveCsv( wxCommandEvent& event ) override;
         void menuZoomIn( wxCommandEvent& event ) override;
         void menuZoomOut( wxCommandEvent& event ) override;
         void menuZoomFit( wxCommandEvent& event ) override;
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index a13990e4b1..75a1544d48 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -15,25 +15,35 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	
 	m_mainMenu = new wxMenuBar( 0 );
 	m_fileMenu = new wxMenu();
-	wxMenuItem* m_menuItem7;
-	m_menuItem7 = new wxMenuItem( m_fileMenu, wxID_NEW, wxString( _("New Plot") ) , wxEmptyString, wxITEM_NORMAL );
-	m_fileMenu->Append( m_menuItem7 );
+	wxMenuItem* m_newPlot;
+	m_newPlot = new wxMenuItem( m_fileMenu, wxID_NEW, wxString( _("New Plot") ) , wxEmptyString, wxITEM_NORMAL );
+	m_fileMenu->Append( m_newPlot );
 	
 	m_fileMenu->AppendSeparator();
 	
-	wxMenuItem* m_menuItem8;
-	m_menuItem8 = new wxMenuItem( m_fileMenu, wxID_OPEN, wxString( _("Open Workbook") ) , wxEmptyString, wxITEM_NORMAL );
-	m_fileMenu->Append( m_menuItem8 );
+	wxMenuItem* m_openWorkbook;
+	m_openWorkbook = new wxMenuItem( m_fileMenu, wxID_OPEN, wxString( _("Open Workbook") ) , wxEmptyString, wxITEM_NORMAL );
+	m_fileMenu->Append( m_openWorkbook );
 	
-	wxMenuItem* m_menuItem2;
-	m_menuItem2 = new wxMenuItem( m_fileMenu, wxID_SAVE, wxString( _("Save Workbook") ) , wxEmptyString, wxITEM_NORMAL );
-	m_fileMenu->Append( m_menuItem2 );
+	wxMenuItem* m_saveWorkbook;
+	m_saveWorkbook = new wxMenuItem( m_fileMenu, wxID_SAVE, wxString( _("Save Workbook") ) , wxEmptyString, wxITEM_NORMAL );
+	m_fileMenu->Append( m_saveWorkbook );
 	
 	m_fileMenu->AppendSeparator();
 	
-	wxMenuItem* m_menuItem1;
-	m_menuItem1 = new wxMenuItem( m_fileMenu, wxID_CLOSE, wxString( _("Exit Simulation") ) , wxEmptyString, wxITEM_NORMAL );
-	m_fileMenu->Append( m_menuItem1 );
+	wxMenuItem* m_saveImage;
+	m_saveImage = new wxMenuItem( m_fileMenu, wxID_ANY, wxString( _("Save as image") ) , wxEmptyString, wxITEM_NORMAL );
+	m_fileMenu->Append( m_saveImage );
+	
+	wxMenuItem* m_saveCsv;
+	m_saveCsv = new wxMenuItem( m_fileMenu, wxID_ANY, wxString( _("Save as .csv file") ) , wxEmptyString, wxITEM_NORMAL );
+	m_fileMenu->Append( m_saveCsv );
+	
+	m_fileMenu->AppendSeparator();
+	
+	wxMenuItem* m_exitSim;
+	m_exitSim = new wxMenuItem( m_fileMenu, wxID_CLOSE, wxString( _("Exit Simulation") ) , wxEmptyString, wxITEM_NORMAL );
+	m_fileMenu->Append( m_exitSim );
 	
 	m_mainMenu->Append( m_fileMenu, _("File") ); 
 	
@@ -132,10 +142,12 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	this->Connect( m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuNewPlot ) );
-	this->Connect( m_menuItem8->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuOpenWorkbook ) );
-	this->Connect( m_menuItem2->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveWorkbook ) );
-	this->Connect( m_menuItem1->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) );
+	this->Connect( m_newPlot->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuNewPlot ) );
+	this->Connect( m_openWorkbook->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuOpenWorkbook ) );
+	this->Connect( m_saveWorkbook->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveWorkbook ) );
+	this->Connect( m_saveImage->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveImage ) );
+	this->Connect( m_saveCsv->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveCsv ) );
+	this->Connect( m_exitSim->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) );
 	this->Connect( m_zoomIn->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomIn ) );
 	this->Connect( m_zoomOut->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomOut ) );
 	this->Connect( m_zoomFit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ) );
@@ -159,6 +171,8 @@ SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
 	this->Disconnect( wxID_NEW, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuNewPlot ) );
 	this->Disconnect( wxID_OPEN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuOpenWorkbook ) );
 	this->Disconnect( wxID_SAVE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveWorkbook ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveImage ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveCsv ) );
 	this->Disconnect( wxID_CLOSE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) );
 	this->Disconnect( wxID_ZOOM_IN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomIn ) );
 	this->Disconnect( wxID_ZOOM_OUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomOut ) );
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index 9c941424c4..92a27ad63a 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -133,7 +133,7 @@
                 <event name="OnSetFocus"></event>
                 <event name="OnSize"></event>
                 <event name="OnUpdateUI"></event>
-                <object class="wxMenu" expanded="0">
+                <object class="wxMenu" expanded="1">
                     <property name="label">File</property>
                     <property name="name">m_fileMenu</property>
                     <property name="permission">protected</property>
@@ -145,7 +145,7 @@
                         <property name="id">wxID_NEW</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">New Plot</property>
-                        <property name="name">m_menuItem7</property>
+                        <property name="name">m_newPlot</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
@@ -164,7 +164,7 @@
                         <property name="id">wxID_OPEN</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Open Workbook</property>
-                        <property name="name">m_menuItem8</property>
+                        <property name="name">m_openWorkbook</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
@@ -179,7 +179,7 @@
                         <property name="id">wxID_SAVE</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Save Workbook</property>
-                        <property name="name">m_menuItem2</property>
+                        <property name="name">m_saveWorkbook</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
@@ -190,6 +190,40 @@
                         <property name="name">m_separator1</property>
                         <property name="permission">none</property>
                     </object>
+                    <object class="wxMenuItem" expanded="1">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Save as image</property>
+                        <property name="name">m_saveImage</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection">menuSaveImage</event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="wxMenuItem" expanded="1">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Save as .csv file</property>
+                        <property name="name">m_saveCsv</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection">menuSaveCsv</event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="separator" expanded="1">
+                        <property name="name">m_separator4</property>
+                        <property name="permission">none</property>
+                    </object>
                     <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
@@ -198,7 +232,7 @@
                         <property name="id">wxID_CLOSE</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Exit Simulation</property>
-                        <property name="name">m_menuItem1</property>
+                        <property name="name">m_exitSim</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
@@ -274,7 +308,7 @@
                         <event name="OnMenuSelection">menuShowGrid</event>
                         <event name="OnUpdateUI">menuShowGridUpdate</event>
                     </object>
-                    <object class="wxMenuItem" expanded="1">
+                    <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
@@ -289,7 +323,7 @@
                         <event name="OnMenuSelection">menuShowLegend</event>
                         <event name="OnUpdateUI">menuShowLegendUpdate</event>
                     </object>
-                    <object class="wxMenuItem" expanded="1">
+                    <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index 2aba38d4e9..ded6aa5aab 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -60,6 +60,8 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		virtual void menuNewPlot( wxCommandEvent& event ) { event.Skip(); }
 		virtual void menuOpenWorkbook( wxCommandEvent& event ) { event.Skip(); }
 		virtual void menuSaveWorkbook( wxCommandEvent& event ) { event.Skip(); }
+		virtual void menuSaveImage( wxCommandEvent& event ) { event.Skip(); }
+		virtual void menuSaveCsv( wxCommandEvent& event ) { event.Skip(); }
 		virtual void menuExit( wxCommandEvent& event ) { event.Skip(); }
 		virtual void menuZoomIn( wxCommandEvent& event ) { event.Skip(); }
 		virtual void menuZoomOut( wxCommandEvent& event ) { event.Skip(); }

From a2b16ae6404594a8761bbf31b9cd09f67785e702 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:29 +0200
Subject: [PATCH 060/197] Initial 'Simulation settings' dialog

---
 eeschema/CMakeLists.txt                       |    3 +
 eeschema/dialogs/dialog_sim_settings.cpp      |  162 +
 eeschema/dialogs/dialog_sim_settings.h        |   87 +
 eeschema/dialogs/dialog_sim_settings_base.cpp |  404 ++
 eeschema/dialogs/dialog_sim_settings_base.fbp | 5680 +++++++++++++++++
 eeschema/dialogs/dialog_sim_settings_base.h   |  121 +
 .../netlist_exporter_pspice.cpp               |  114 +-
 .../netlist_exporter_pspice.h                 |   25 +-
 eeschema/sim/sim_plot_frame.cpp               |   97 +-
 eeschema/sim/sim_plot_frame.h                 |   12 +-
 eeschema/sim/sim_plot_frame_base.cpp          |   19 +-
 eeschema/sim/sim_plot_frame_base.fbp          |  131 +-
 eeschema/sim/sim_plot_frame_base.h            |    2 +
 eeschema/sim/sim_plot_panel.cpp               |    3 -
 14 files changed, 6757 insertions(+), 103 deletions(-)
 create mode 100644 eeschema/dialogs/dialog_sim_settings.cpp
 create mode 100644 eeschema/dialogs/dialog_sim_settings.h
 create mode 100644 eeschema/dialogs/dialog_sim_settings_base.cpp
 create mode 100644 eeschema/dialogs/dialog_sim_settings_base.fbp
 create mode 100644 eeschema/dialogs/dialog_sim_settings_base.h

diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 995b684af2..228d2028d6 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -176,12 +176,15 @@ set( EESCHEMA_SRCS
     transform.cpp
     viewlib_frame.cpp
     viewlibs.cpp
+
     sim/simulate.cpp
     sim/sim_plot_frame_base.cpp
     sim/sim_plot_frame.cpp
     sim/sim_plot_panel.cpp
     sim/spice_simulator.cpp
     sim/ngspice.cpp
+    dialogs/dialog_sim_settings.cpp
+    dialogs/dialog_sim_settings_base.cpp
 
     netlist_exporters/netlist_exporter.cpp
     netlist_exporters/netlist_exporter_cadstar.cpp
diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
new file mode 100644
index 0000000000..8519dabf07
--- /dev/null
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -0,0 +1,162 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "dialog_sim_settings.h"
+#include <wx/log.h>
+
+/// @todo ngspice offers more types of analysis,
+//so there are a few tabs missing (e.g. pole-zero, distortion, sensitivity)
+
+DIALOG_SIM_SETTINGS::DIALOG_SIM_SETTINGS( wxWindow* aParent )
+    : DIALOG_SIM_SETTINGS_BASE( aParent ), m_exporter( nullptr )
+{
+    m_posFloatValidator.SetMin( 0 + std::numeric_limits<double>::epsilon() );
+    m_posFloatValidator.SetPrecision( 3 );
+    m_posIntValidator.SetMin( 1 );
+
+    m_acPointsNumber->SetValidator( m_posIntValidator );
+    m_acFreqStart->SetValidator( m_posFloatValidator );
+    m_acFreqStop->SetValidator( m_posFloatValidator );
+
+    m_dcStart1->SetValidator( m_posFloatValidator );
+    m_dcStop1->SetValidator( m_posFloatValidator );
+    m_dcIncr1->SetValidator( m_posFloatValidator );
+
+    m_dcStart2->SetValidator( m_posFloatValidator );
+    m_dcStop2->SetValidator( m_posFloatValidator );
+    m_dcIncr2->SetValidator( m_posFloatValidator );
+
+    m_noisePointsNumber->SetValidator( m_posIntValidator );
+    m_noiseFreqStart->SetValidator( m_posFloatValidator );
+    m_noiseFreqStop->SetValidator( m_posFloatValidator );
+
+    m_transStep->SetValidator( m_posFloatValidator );
+    m_transFinal->SetValidator( m_posFloatValidator );
+    m_transInitial->SetValidator( m_posFloatValidator );
+}
+
+
+bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
+{
+    if( !wxDialog::TransferDataFromWindow() )
+        return false;
+
+    wxWindow* page = m_simPages->GetCurrentPage();
+
+    // AC analysis
+    if( page == m_pgAC )
+    {
+        m_simCommand = wxString::Format( ".ac %s %s %s %s",
+            scaleToString( m_acScale->GetSelection() ),
+            m_acPointsNumber->GetValue(), m_acFreqStart->GetValue(), m_acFreqStop->GetValue() );
+    }
+
+
+    // DC transfer analysis
+    else if( page == m_pgDC )
+    {
+        // At least one source has to be enabled
+        if( !m_dcEnable1->IsChecked() && !m_dcEnable1->IsChecked() )
+            return false;
+
+        wxString simCmd = wxString( ".dc " );
+
+        if( m_dcEnable1->IsChecked() )
+        {
+            if( m_dcSource1->GetValue().IsEmpty() )
+                return false;
+
+            simCmd += wxString::Format( "%s %s %s %s",
+               m_dcSource1->GetValue(), m_dcStart1->GetValue(),
+               m_dcStop1->GetValue(), m_dcIncr1->GetValue() );
+        }
+
+        if( m_dcEnable2->IsChecked() )
+        {
+            if( m_dcSource2->GetValue().IsEmpty() )
+                return false;
+
+            simCmd += wxString::Format( "%s %s %s %s",
+               m_dcSource2->GetValue(), m_dcStart2->GetValue(),
+               m_dcStop2->GetValue(), m_dcIncr2->GetValue() );
+        }
+
+        m_simCommand = simCmd;
+    }
+
+
+    // Noise analysis
+    else if( page == m_pgNoise )
+    {
+        if( m_noiseMeas->GetValue().IsEmpty() || m_noiseSrc->GetValue().IsEmpty() )
+            return false;
+
+        // TODO missing node number
+        wxString ref = m_noiseRef->GetValue().IsEmpty() ? wxString() : wxString::Format( ", %d", 42 );
+        m_simCommand = wxString::Format( ".noise v(%d%s) %s %s %s %s %s",
+            42, ref, m_noiseSrc->GetValue(), scaleToString( m_noiseScale->GetSelection() ),
+            m_noisePointsNumber->GetValue(), m_noiseFreqStart->GetValue(), m_noiseFreqStop->GetValue() );
+    }
+
+
+    // DC operating point analysis
+    else if( page == m_pgOP )
+    {
+        m_simCommand = wxString( ".op" );
+    }
+
+
+    // Transient analysis
+    else if( page == m_pgTransient )
+    {
+        m_simCommand = wxString::Format( ".trans %s %s %s",
+            m_transStep->GetValue(), m_transFinal->GetValue(), m_transInitial->GetValue() );
+    }
+
+
+    // Custom directives
+    else if( page == m_pgCustom )
+    {
+        m_simCommand = m_customTxt->GetValue();
+    }
+
+    else
+    {
+        return false;
+    }
+
+    return true;
+}
+
+
+bool DIALOG_SIM_SETTINGS::TransferDataToWindow()
+{
+    /// @todo one day it could interpret the sim command and fill out appropriate fields..
+    return true;
+}
+
+
+void DIALOG_SIM_SETTINGS::onLoadDirectives( wxCommandEvent& event )
+{
+}
diff --git a/eeschema/dialogs/dialog_sim_settings.h b/eeschema/dialogs/dialog_sim_settings.h
new file mode 100644
index 0000000000..065d2e138b
--- /dev/null
+++ b/eeschema/dialogs/dialog_sim_settings.h
@@ -0,0 +1,87 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef DIALOG_SIM_SETTINGS_BASE_H
+#define DIALOG_SIM_SETTINGS_BASE_H
+
+#include "dialog_sim_settings_base.h"
+#include <wx/valnum.h>
+
+class NETLIST_EXPORTER_PSPICE_SIM;
+
+class DIALOG_SIM_SETTINGS : public DIALOG_SIM_SETTINGS_BASE
+{
+public:
+    DIALOG_SIM_SETTINGS( wxWindow* aParent );
+
+    const wxString& GetSimCommand() const
+    {
+        return m_simCommand;
+    }
+
+    void SetNetlistExporter( NETLIST_EXPORTER_PSPICE_SIM* aExporter )
+    {
+        m_exporter = aExporter;
+    }
+
+    bool TransferDataFromWindow() override;
+    bool TransferDataToWindow() override;
+
+private:
+    enum SCALE_TYPE
+    {
+        DECADE,
+        OCTAVE,
+        LINEAR
+    };
+
+    void onLoadDirectives( wxCommandEvent& event ) override;
+
+    static wxString scaleToString( int aOption )
+    {
+        switch( aOption )
+        {
+            case DECADE:
+                return wxString( "dec" );
+
+            case OCTAVE:
+                return wxString( "oct" );
+
+            case LINEAR:
+                return wxString( "lin" );
+        }
+
+        wxASSERT_MSG( false, "Unhandled scale type" );
+
+        return wxEmptyString;
+    }
+
+    wxString m_simCommand;
+    NETLIST_EXPORTER_PSPICE_SIM* m_exporter;
+
+    wxFloatingPointValidator<double> m_posFloatValidator;
+    wxIntegerValidator<int> m_posIntValidator;
+};
+
+#endif /* DIALOG_SIM_SETTINGS_BASE_H */
diff --git a/eeschema/dialogs/dialog_sim_settings_base.cpp b/eeschema/dialogs/dialog_sim_settings_base.cpp
new file mode 100644
index 0000000000..d08e53f430
--- /dev/null
+++ b/eeschema/dialogs/dialog_sim_settings_base.cpp
@@ -0,0 +1,404 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_sim_settings_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer1;
+	bSizer1 = new wxBoxSizer( wxVERTICAL );
+	
+	m_simPages = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_pgAC = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer3;
+	bSizer3 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer3->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	wxString m_acScaleChoices[] = { wxT("Decade"), wxT("Octave"), wxT("Linear") };
+	int m_acScaleNChoices = sizeof( m_acScaleChoices ) / sizeof( wxString );
+	m_acScale = new wxRadioBox( m_pgAC, wxID_ANY, wxT("Frequency scale"), wxDefaultPosition, wxDefaultSize, m_acScaleNChoices, m_acScaleChoices, 1, wxRA_SPECIFY_COLS );
+	m_acScale->SetSelection( 0 );
+	bSizer3->Add( m_acScale, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	
+	bSizer3->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	wxFlexGridSizer* fgSizer1;
+	fgSizer1 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer1->SetFlexibleDirection( wxBOTH );
+	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText1 = new wxStaticText( m_pgAC, wxID_ANY, wxT("Number of points"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1->Wrap( -1 );
+	fgSizer1->Add( m_staticText1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_acPointsNumber = new wxTextCtrl( m_pgAC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer1->Add( m_acPointsNumber, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText2 = new wxStaticText( m_pgAC, wxID_ANY, wxT("Start frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText2->Wrap( -1 );
+	fgSizer1->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_acFreqStart = new wxTextCtrl( m_pgAC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer1->Add( m_acFreqStart, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText3 = new wxStaticText( m_pgAC, wxID_ANY, wxT("Stop frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText3->Wrap( -1 );
+	fgSizer1->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_acFreqStop = new wxTextCtrl( m_pgAC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer1->Add( m_acFreqStop, 0, wxALL, 5 );
+	
+	
+	bSizer3->Add( fgSizer1, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer3->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	
+	m_pgAC->SetSizer( bSizer3 );
+	m_pgAC->Layout();
+	bSizer3->Fit( m_pgAC );
+	m_simPages->AddPage( m_pgAC, wxT("AC"), true );
+	m_pgDC = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer4;
+	bSizer4 = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbSizer21;
+	sbSizer21 = new wxStaticBoxSizer( new wxStaticBox( m_pgDC, wxID_ANY, wxT("DC sweep source 1") ), wxVERTICAL );
+	
+	m_dcEnable1 = new wxCheckBox( sbSizer21->GetStaticBox(), wxID_ANY, wxT("Enable"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizer21->Add( m_dcEnable1, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	wxFlexGridSizer* fgSizer21;
+	fgSizer21 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer21->SetFlexibleDirection( wxBOTH );
+	fgSizer21->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText41 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, wxT("DC source"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText41->Wrap( -1 );
+	fgSizer21->Add( m_staticText41, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_dcSource1 = new wxComboBox( sbSizer21->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	fgSizer21->Add( m_dcSource1, 0, wxALL, 5 );
+	
+	m_staticText51 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, wxT("Starting voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText51->Wrap( -1 );
+	fgSizer21->Add( m_staticText51, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_dcStart1 = new wxTextCtrl( sbSizer21->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer21->Add( m_dcStart1, 0, wxALL, 5 );
+	
+	m_staticText61 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, wxT("Final voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText61->Wrap( -1 );
+	fgSizer21->Add( m_staticText61, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_dcStop1 = new wxTextCtrl( sbSizer21->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer21->Add( m_dcStop1, 0, wxALL, 5 );
+	
+	m_staticText71 = new wxStaticText( sbSizer21->GetStaticBox(), wxID_ANY, wxT("Increment step [V]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText71->Wrap( -1 );
+	fgSizer21->Add( m_staticText71, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_dcIncr1 = new wxTextCtrl( sbSizer21->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer21->Add( m_dcIncr1, 0, wxALL, 5 );
+	
+	
+	sbSizer21->Add( fgSizer21, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer4->Add( sbSizer21, 1, wxEXPAND, 5 );
+	
+	wxStaticBoxSizer* sbSizer2;
+	sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_pgDC, wxID_ANY, wxT("DC sweep source 2") ), wxVERTICAL );
+	
+	m_dcEnable2 = new wxCheckBox( sbSizer2->GetStaticBox(), wxID_ANY, wxT("Enable"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizer2->Add( m_dcEnable2, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	wxFlexGridSizer* fgSizer2;
+	fgSizer2 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer2->SetFlexibleDirection( wxBOTH );
+	fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText4 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, wxT("DC source"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText4->Wrap( -1 );
+	fgSizer2->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_dcSource2 = new wxComboBox( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	fgSizer2->Add( m_dcSource2, 0, wxALL, 5 );
+	
+	m_staticText5 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, wxT("Starting voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText5->Wrap( -1 );
+	fgSizer2->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_dcStart2 = new wxTextCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer2->Add( m_dcStart2, 0, wxALL, 5 );
+	
+	m_staticText6 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, wxT("Final voltage [V]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText6->Wrap( -1 );
+	fgSizer2->Add( m_staticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_dcStop2 = new wxTextCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer2->Add( m_dcStop2, 0, wxALL, 5 );
+	
+	m_staticText7 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, wxT("Increment step [V]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText7->Wrap( -1 );
+	fgSizer2->Add( m_staticText7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_dcIncr2 = new wxTextCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer2->Add( m_dcIncr2, 0, wxALL, 5 );
+	
+	
+	sbSizer2->Add( fgSizer2, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer4->Add( sbSizer2, 1, wxEXPAND, 5 );
+	
+	
+	m_pgDC->SetSizer( bSizer4 );
+	m_pgDC->Layout();
+	bSizer4->Fit( m_pgDC );
+	m_simPages->AddPage( m_pgDC, wxT("DC Transfer"), false );
+	m_pgDistortion = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_pgDistortion->Hide();
+	
+	m_simPages->AddPage( m_pgDistortion, wxT("Distortion"), false );
+	m_pgNoise = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer15;
+	bSizer15 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer15->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	wxFlexGridSizer* fgSizer7;
+	fgSizer7 = new wxFlexGridSizer( 0, 3, 0, 0 );
+	fgSizer7->SetFlexibleDirection( wxBOTH );
+	fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText14 = new wxStaticText( m_pgNoise, wxID_ANY, wxT("Measured node"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText14->Wrap( -1 );
+	fgSizer7->Add( m_staticText14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_noiseMeas = new wxComboBox( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	fgSizer7->Add( m_noiseMeas, 0, wxALL, 5 );
+	
+	
+	fgSizer7->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticText15 = new wxStaticText( m_pgNoise, wxID_ANY, wxT("Reference node"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText15->Wrap( -1 );
+	fgSizer7->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_noiseRef = new wxComboBox( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	fgSizer7->Add( m_noiseRef, 0, wxALL, 5 );
+	
+	m_staticText23 = new wxStaticText( m_pgNoise, wxID_ANY, wxT("(optional; default GND)"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText23->Wrap( -1 );
+	fgSizer7->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_staticText16 = new wxStaticText( m_pgNoise, wxID_ANY, wxT("Noise source"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText16->Wrap( -1 );
+	fgSizer7->Add( m_staticText16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_noiseSrc = new wxComboBox( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	fgSizer7->Add( m_noiseSrc, 0, wxALL, 5 );
+	
+	
+	fgSizer7->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	
+	bSizer15->Add( fgSizer7, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer15->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	wxString m_noiseScaleChoices[] = { wxT("Decade"), wxT("Octave"), wxT("Linear") };
+	int m_noiseScaleNChoices = sizeof( m_noiseScaleChoices ) / sizeof( wxString );
+	m_noiseScale = new wxRadioBox( m_pgNoise, wxID_ANY, wxT("Frequency scale"), wxDefaultPosition, wxDefaultSize, m_noiseScaleNChoices, m_noiseScaleChoices, 1, wxRA_SPECIFY_COLS );
+	m_noiseScale->SetSelection( 0 );
+	bSizer15->Add( m_noiseScale, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	
+	bSizer15->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	wxFlexGridSizer* fgSizer11;
+	fgSizer11 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer11->SetFlexibleDirection( wxBOTH );
+	fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText11 = new wxStaticText( m_pgNoise, wxID_ANY, wxT("Number of points"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText11->Wrap( -1 );
+	fgSizer11->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_noisePointsNumber = new wxTextCtrl( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer11->Add( m_noisePointsNumber, 0, wxALL, 5 );
+	
+	m_staticText21 = new wxStaticText( m_pgNoise, wxID_ANY, wxT("Start frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText21->Wrap( -1 );
+	fgSizer11->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_noiseFreqStart = new wxTextCtrl( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer11->Add( m_noiseFreqStart, 0, wxALL, 5 );
+	
+	m_staticText31 = new wxStaticText( m_pgNoise, wxID_ANY, wxT("Stop frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText31->Wrap( -1 );
+	fgSizer11->Add( m_staticText31, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_noiseFreqStop = new wxTextCtrl( m_pgNoise, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer11->Add( m_noiseFreqStop, 0, wxALL, 5 );
+	
+	
+	bSizer15->Add( fgSizer11, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer15->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	
+	m_pgNoise->SetSizer( bSizer15 );
+	m_pgNoise->Layout();
+	bSizer15->Fit( m_pgNoise );
+	m_simPages->AddPage( m_pgNoise, wxT("Noise"), false );
+	m_pgOP = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer8;
+	bSizer8 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticText13 = new wxStaticText( m_pgOP, wxID_ANY, wxT("This tab has no settings"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText13->Wrap( -1 );
+	bSizer8->Add( m_staticText13, 0, wxALIGN_CENTER, 5 );
+	
+	
+	bSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	
+	m_pgOP->SetSizer( bSizer8 );
+	m_pgOP->Layout();
+	bSizer8->Fit( m_pgOP );
+	m_simPages->AddPage( m_pgOP, wxT("Operating Point"), false );
+	m_pgPoleZero = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_pgPoleZero->Hide();
+	
+	m_simPages->AddPage( m_pgPoleZero, wxT("Pole-Zero"), false );
+	m_pgSensitivity = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_pgSensitivity->Hide();
+	
+	m_simPages->AddPage( m_pgSensitivity, wxT("Sensitvity"), false );
+	m_pgTransferFunction = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_pgTransferFunction->Hide();
+	
+	m_simPages->AddPage( m_pgTransferFunction, wxT("Transfer Function"), false );
+	m_pgTransient = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer81;
+	bSizer81 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer81->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	wxFlexGridSizer* fgSizer6;
+	fgSizer6 = new wxFlexGridSizer( 0, 3, 0, 0 );
+	fgSizer6->SetFlexibleDirection( wxBOTH );
+	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText151 = new wxStaticText( m_pgTransient, wxID_ANY, wxT("Time step [s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText151->Wrap( -1 );
+	fgSizer6->Add( m_staticText151, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_transStep = new wxTextCtrl( m_pgTransient, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer6->Add( m_transStep, 0, wxALL, 5 );
+	
+	
+	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticText161 = new wxStaticText( m_pgTransient, wxID_ANY, wxT("Final time [s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText161->Wrap( -1 );
+	fgSizer6->Add( m_staticText161, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_transFinal = new wxTextCtrl( m_pgTransient, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer6->Add( m_transFinal, 0, wxALL, 5 );
+	
+	
+	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticText17 = new wxStaticText( m_pgTransient, wxID_ANY, wxT("Initial time [s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText17->Wrap( -1 );
+	fgSizer6->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_transInitial = new wxTextCtrl( m_pgTransient, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer6->Add( m_transInitial, 0, wxALL, 5 );
+	
+	m_staticText24 = new wxStaticText( m_pgTransient, wxID_ANY, wxT("(optional; default 0)"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText24->Wrap( -1 );
+	fgSizer6->Add( m_staticText24, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizer81->Add( fgSizer6, 1, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	
+	bSizer81->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	
+	m_pgTransient->SetSizer( bSizer81 );
+	m_pgTransient->Layout();
+	bSizer81->Fit( m_pgTransient );
+	m_simPages->AddPage( m_pgTransient, wxT("Transient"), false );
+	m_pgCustom = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer2;
+	bSizer2 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText18 = new wxStaticText( m_pgCustom, wxID_ANY, wxT("Spice directives:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText18->Wrap( -1 );
+	bSizer2->Add( m_staticText18, 0, wxALL, 5 );
+	
+	m_customTxt = new wxTextCtrl( m_pgCustom, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
+	m_customTxt->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	
+	bSizer2->Add( m_customTxt, 1, wxALL|wxEXPAND, 5 );
+	
+	m_loadDirectives = new wxButton( m_pgCustom, wxID_ANY, wxT("Load directives from schematic"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer2->Add( m_loadDirectives, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	m_pgCustom->SetSizer( bSizer2 );
+	m_pgCustom->Layout();
+	bSizer2->Fit( m_pgCustom );
+	m_simPages->AddPage( m_pgCustom, wxT("Custom"), false );
+	
+	bSizer1->Add( m_simPages, 1, wxEXPAND | wxALL, 5 );
+	
+	m_sdbSizer1 = new wxStdDialogButtonSizer();
+	m_sdbSizer1OK = new wxButton( this, wxID_OK );
+	m_sdbSizer1->AddButton( m_sdbSizer1OK );
+	m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
+	m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
+	m_sdbSizer1->Realize();
+	
+	bSizer1->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bSizer1 );
+	this->Layout();
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	m_loadDirectives->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SIM_SETTINGS_BASE::onLoadDirectives ), NULL, this );
+}
+
+DIALOG_SIM_SETTINGS_BASE::~DIALOG_SIM_SETTINGS_BASE()
+{
+	// Disconnect Events
+	m_loadDirectives->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SIM_SETTINGS_BASE::onLoadDirectives ), NULL, this );
+	
+}
diff --git a/eeschema/dialogs/dialog_sim_settings_base.fbp b/eeschema/dialogs/dialog_sim_settings_base.fbp
new file mode 100644
index 0000000000..773636a974
--- /dev/null
+++ b/eeschema/dialogs/dialog_sim_settings_base.fbp
@@ -0,0 +1,5680 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<wxFormBuilder_Project>
+    <FileVersion major="1" minor="13" />
+    <object class="Project" expanded="1">
+        <property name="class_decoration"></property>
+        <property name="code_generation">C++</property>
+        <property name="disconnect_events">1</property>
+        <property name="disconnect_mode">source_name</property>
+        <property name="disconnect_php_events">0</property>
+        <property name="disconnect_python_events">0</property>
+        <property name="embedded_files_path">res</property>
+        <property name="encoding">UTF-8</property>
+        <property name="event_generation">connect</property>
+        <property name="file">dialog_sim_settings_base</property>
+        <property name="first_id">1000</property>
+        <property name="help_provider">none</property>
+        <property name="internationalize">0</property>
+        <property name="name">DIALOG_SIM_SETTINGS_BASE</property>
+        <property name="namespace"></property>
+        <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="aui_managed">0</property>
+            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
+            <property name="bg"></property>
+            <property name="center">wxBOTH</property>
+            <property name="context_help"></property>
+            <property name="context_menu">1</property>
+            <property name="enabled">1</property>
+            <property name="event_handler">impl_virtual</property>
+            <property name="extra_style"></property>
+            <property name="fg"></property>
+            <property name="font"></property>
+            <property name="hidden">0</property>
+            <property name="id">wxID_ANY</property>
+            <property name="maximum_size"></property>
+            <property name="minimum_size"></property>
+            <property name="name">DIALOG_SIM_SETTINGS_BASE</property>
+            <property name="pos"></property>
+            <property name="size">439,534</property>
+            <property name="style">wxDEFAULT_DIALOG_STYLE</property>
+            <property name="subclass"></property>
+            <property name="title">Simulation settings</property>
+            <property name="tooltip"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style"></property>
+            <event name="OnActivate"></event>
+            <event name="OnActivateApp"></event>
+            <event name="OnAuiFindManager"></event>
+            <event name="OnAuiPaneButton"></event>
+            <event name="OnAuiPaneClose"></event>
+            <event name="OnAuiPaneMaximize"></event>
+            <event name="OnAuiPaneRestore"></event>
+            <event name="OnAuiRender"></event>
+            <event name="OnChar"></event>
+            <event name="OnClose"></event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnHibernate"></event>
+            <event name="OnIconize"></event>
+            <event name="OnIdle"></event>
+            <event name="OnInitDialog"></event>
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI"></event>
+            <object class="wxBoxSizer" expanded="1">
+                <property name="minimum_size"></property>
+                <property name="name">bSizer1</property>
+                <property name="orient">wxVERTICAL</property>
+                <property name="permission">none</property>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND | wxALL</property>
+                    <property name="proportion">1</property>
+                    <object class="wxNotebook" 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_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="bitmapsize"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</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="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">m_simPages</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="style"></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"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnNotebookPageChanged"></event>
+                        <event name="OnNotebookPageChanging"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                        <object class="notebookpage" expanded="1">
+                            <property name="bitmap"></property>
+                            <property name="label">AC</property>
+                            <property name="select">1</property>
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_pgAC</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxBoxSizer" expanded="1">
+                                    <property name="minimum_size"></property>
+                                    <property name="name">bSizer3</property>
+                                    <property name="orient">wxVERTICAL</property>
+                                    <property name="permission">none</property>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND</property>
+                                        <property name="proportion">1</property>
+                                        <object class="spacer" expanded="0">
+                                            <property name="height">0</property>
+                                            <property name="permission">protected</property>
+                                            <property name="width">0</property>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxRadioBox" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</property>
+                                            <property name="center_pane">0</property>
+                                            <property name="choices">&quot;Decade&quot; &quot;Octave&quot; &quot;Linear&quot;</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="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="label">Frequency scale</property>
+                                            <property name="majorDimension">1</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">m_acScale</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="selection">0</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style">wxRA_SPECIFY_COLS</property>
+                                            <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>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRadioBox"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND</property>
+                                        <property name="proportion">1</property>
+                                        <object class="spacer" expanded="0">
+                                            <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">wxALIGN_CENTER_HORIZONTAL</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxFlexGridSizer" expanded="1">
+                                            <property name="cols">2</property>
+                                            <property name="flexible_direction">wxBOTH</property>
+                                            <property name="growablecols"></property>
+                                            <property name="growablerows"></property>
+                                            <property name="hgap">0</property>
+                                            <property name="minimum_size"></property>
+                                            <property name="name">fgSizer1</property>
+                                            <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                            <property name="permission">none</property>
+                                            <property name="rows">0</property>
+                                            <property name="vgap">0</property>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxStaticText" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="label">Number of points</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">m_staticText1</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></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"></property>
+                                                    <property name="wrap">-1</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALL|wxEXPAND</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxTextCtrl" 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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="maxlength"></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">m_acPointsNumber</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></property>
+                                                    <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_NUMERIC</property>
+                                                    <property name="validator_type">wxTextValidator</property>
+                                                    <property name="validator_variable"></property>
+                                                    <property name="value"></property>
+                                                    <property name="window_extra_style"></property>
+                                                    <property name="window_name"></property>
+                                                    <property name="window_style"></property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnText"></event>
+                                                    <event name="OnTextEnter"></event>
+                                                    <event name="OnTextMaxLen"></event>
+                                                    <event name="OnTextURL"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxStaticText" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="label">Start frequency [Hz]</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">m_staticText2</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></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"></property>
+                                                    <property name="wrap">-1</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALL|wxEXPAND</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxTextCtrl" 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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="maxlength"></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">m_acFreqStart</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></property>
+                                                    <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_NUMERIC</property>
+                                                    <property name="validator_type">wxTextValidator</property>
+                                                    <property name="validator_variable"></property>
+                                                    <property name="value"></property>
+                                                    <property name="window_extra_style"></property>
+                                                    <property name="window_name"></property>
+                                                    <property name="window_style"></property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnText"></event>
+                                                    <event name="OnTextEnter"></event>
+                                                    <event name="OnTextMaxLen"></event>
+                                                    <event name="OnTextURL"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxStaticText" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="label">Stop frequency [Hz]</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">m_staticText3</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></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"></property>
+                                                    <property name="wrap">-1</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxTextCtrl" 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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="maxlength"></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">m_acFreqStop</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></property>
+                                                    <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_NUMERIC</property>
+                                                    <property name="validator_type">wxTextValidator</property>
+                                                    <property name="validator_variable"></property>
+                                                    <property name="value"></property>
+                                                    <property name="window_extra_style"></property>
+                                                    <property name="window_name"></property>
+                                                    <property name="window_style"></property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnText"></event>
+                                                    <event name="OnTextEnter"></event>
+                                                    <event name="OnTextMaxLen"></event>
+                                                    <event name="OnTextURL"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND</property>
+                                        <property name="proportion">1</property>
+                                        <object class="spacer" expanded="0">
+                                            <property name="height">0</property>
+                                            <property name="permission">protected</property>
+                                            <property name="width">0</property>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="notebookpage" expanded="1">
+                            <property name="bitmap"></property>
+                            <property name="label">DC Transfer</property>
+                            <property name="select">0</property>
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_pgDC</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxBoxSizer" expanded="1">
+                                    <property name="minimum_size"></property>
+                                    <property name="name">bSizer4</property>
+                                    <property name="orient">wxVERTICAL</property>
+                                    <property name="permission">none</property>
+                                    <object class="sizeritem" expanded="1">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxStaticBoxSizer" expanded="1">
+                                            <property name="id">wxID_ANY</property>
+                                            <property name="label">DC sweep source 1</property>
+                                            <property name="minimum_size"></property>
+                                            <property name="name">sbSizer21</property>
+                                            <property name="orient">wxVERTICAL</property>
+                                            <property name="parent">1</property>
+                                            <property name="permission">none</property>
+                                            <event name="OnUpdateUI"></event>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxCheckBox" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</property>
+                                                    <property name="center_pane">0</property>
+                                                    <property name="checked">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="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="label">Enable</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">m_dcEnable1</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></property>
+                                                    <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>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnCheckBox"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL</property>
+                                                <property name="proportion">1</property>
+                                                <object class="wxFlexGridSizer" expanded="1">
+                                                    <property name="cols">2</property>
+                                                    <property name="flexible_direction">wxBOTH</property>
+                                                    <property name="growablecols"></property>
+                                                    <property name="growablerows"></property>
+                                                    <property name="hgap">0</property>
+                                                    <property name="minimum_size"></property>
+                                                    <property name="name">fgSizer21</property>
+                                                    <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                                    <property name="permission">none</property>
+                                                    <property name="rows">0</property>
+                                                    <property name="vgap">0</property>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="label">DC source</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">m_staticText41</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></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"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxComboBox" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</property>
+                                                            <property name="center_pane">0</property>
+                                                            <property name="choices"></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="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">m_dcSource1</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="selection">-1</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></property>
+                                                            <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="value"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnCombobox"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnText"></event>
+                                                            <event name="OnTextEnter"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="label">Starting voltage [V]</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">m_staticText51</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></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"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="1">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxTextCtrl" 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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="maxlength"></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">m_dcStart1</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></property>
+                                                            <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_NUMERIC</property>
+                                                            <property name="validator_type">wxTextValidator</property>
+                                                            <property name="validator_variable"></property>
+                                                            <property name="value"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnText"></event>
+                                                            <event name="OnTextEnter"></event>
+                                                            <event name="OnTextMaxLen"></event>
+                                                            <event name="OnTextURL"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="label">Final voltage [V]</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">m_staticText61</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></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"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="1">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxTextCtrl" 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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="maxlength"></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">m_dcStop1</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></property>
+                                                            <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_NUMERIC</property>
+                                                            <property name="validator_type">wxTextValidator</property>
+                                                            <property name="validator_variable"></property>
+                                                            <property name="value"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnText"></event>
+                                                            <event name="OnTextEnter"></event>
+                                                            <event name="OnTextMaxLen"></event>
+                                                            <event name="OnTextURL"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="label">Increment step [V]</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">m_staticText71</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></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"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="1">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxTextCtrl" 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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="maxlength"></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">m_dcIncr1</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></property>
+                                                            <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_NUMERIC</property>
+                                                            <property name="validator_type">wxTextValidator</property>
+                                                            <property name="validator_variable"></property>
+                                                            <property name="value"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnText"></event>
+                                                            <event name="OnTextEnter"></event>
+                                                            <event name="OnTextMaxLen"></event>
+                                                            <event name="OnTextURL"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                </object>
+                                            </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="wxStaticBoxSizer" expanded="1">
+                                            <property name="id">wxID_ANY</property>
+                                            <property name="label">DC sweep source 2</property>
+                                            <property name="minimum_size"></property>
+                                            <property name="name">sbSizer2</property>
+                                            <property name="orient">wxVERTICAL</property>
+                                            <property name="parent">1</property>
+                                            <property name="permission">none</property>
+                                            <event name="OnUpdateUI"></event>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxCheckBox" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</property>
+                                                    <property name="center_pane">0</property>
+                                                    <property name="checked">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="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="label">Enable</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">m_dcEnable2</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></property>
+                                                    <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>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnCheckBox"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL</property>
+                                                <property name="proportion">1</property>
+                                                <object class="wxFlexGridSizer" expanded="1">
+                                                    <property name="cols">2</property>
+                                                    <property name="flexible_direction">wxBOTH</property>
+                                                    <property name="growablecols"></property>
+                                                    <property name="growablerows"></property>
+                                                    <property name="hgap">0</property>
+                                                    <property name="minimum_size"></property>
+                                                    <property name="name">fgSizer2</property>
+                                                    <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                                    <property name="permission">none</property>
+                                                    <property name="rows">0</property>
+                                                    <property name="vgap">0</property>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="label">DC source</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">m_staticText4</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></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"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxComboBox" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</property>
+                                                            <property name="center_pane">0</property>
+                                                            <property name="choices"></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="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">m_dcSource2</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="selection">-1</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></property>
+                                                            <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="value"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnCombobox"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnText"></event>
+                                                            <event name="OnTextEnter"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="label">Starting voltage [V]</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">m_staticText5</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></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"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="1">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxTextCtrl" 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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="maxlength"></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">m_dcStart2</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></property>
+                                                            <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_NUMERIC</property>
+                                                            <property name="validator_type">wxTextValidator</property>
+                                                            <property name="validator_variable"></property>
+                                                            <property name="value"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnText"></event>
+                                                            <event name="OnTextEnter"></event>
+                                                            <event name="OnTextMaxLen"></event>
+                                                            <event name="OnTextURL"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="label">Final voltage [V]</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">m_staticText6</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></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"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="1">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxTextCtrl" 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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="maxlength"></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">m_dcStop2</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></property>
+                                                            <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_NUMERIC</property>
+                                                            <property name="validator_type">wxTextValidator</property>
+                                                            <property name="validator_variable"></property>
+                                                            <property name="value"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnText"></event>
+                                                            <event name="OnTextEnter"></event>
+                                                            <event name="OnTextMaxLen"></event>
+                                                            <event name="OnTextURL"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="label">Increment step [V]</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">m_staticText7</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></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"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="1">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxTextCtrl" 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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="maxlength"></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">m_dcIncr2</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></property>
+                                                            <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_NUMERIC</property>
+                                                            <property name="validator_type">wxTextValidator</property>
+                                                            <property name="validator_variable"></property>
+                                                            <property name="value"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnText"></event>
+                                                            <event name="OnTextEnter"></event>
+                                                            <event name="OnTextMaxLen"></event>
+                                                            <event name="OnTextURL"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                </object>
+                                            </object>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="notebookpage" expanded="1">
+                            <property name="bitmap"></property>
+                            <property name="label">Distortion</property>
+                            <property name="select">0</property>
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">1</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">m_pgDistortion</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="notebookpage" expanded="1">
+                            <property name="bitmap"></property>
+                            <property name="label">Noise</property>
+                            <property name="select">0</property>
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_pgNoise</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxBoxSizer" expanded="1">
+                                    <property name="minimum_size"></property>
+                                    <property name="name">bSizer15</property>
+                                    <property name="orient">wxVERTICAL</property>
+                                    <property name="permission">none</property>
+                                    <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">wxALIGN_CENTER_HORIZONTAL</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxFlexGridSizer" expanded="1">
+                                            <property name="cols">3</property>
+                                            <property name="flexible_direction">wxBOTH</property>
+                                            <property name="growablecols"></property>
+                                            <property name="growablerows"></property>
+                                            <property name="hgap">0</property>
+                                            <property name="minimum_size"></property>
+                                            <property name="name">fgSizer7</property>
+                                            <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                            <property name="permission">none</property>
+                                            <property name="rows">0</property>
+                                            <property name="vgap">0</property>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxStaticText" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="label">Measured node</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">m_staticText14</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></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"></property>
+                                                    <property name="wrap">-1</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxComboBox" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</property>
+                                                    <property name="center_pane">0</property>
+                                                    <property name="choices"></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="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">m_noiseMeas</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="selection">-1</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></property>
+                                                    <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="value"></property>
+                                                    <property name="window_extra_style"></property>
+                                                    <property name="window_name"></property>
+                                                    <property name="window_style"></property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnCombobox"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnText"></event>
+                                                    <event name="OnTextEnter"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </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="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxStaticText" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="label">Reference node</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">m_staticText15</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></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"></property>
+                                                    <property name="wrap">-1</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxComboBox" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</property>
+                                                    <property name="center_pane">0</property>
+                                                    <property name="choices"></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="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">m_noiseRef</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="selection">-1</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></property>
+                                                    <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="value"></property>
+                                                    <property name="window_extra_style"></property>
+                                                    <property name="window_name"></property>
+                                                    <property name="window_style"></property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnCombobox"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnText"></event>
+                                                    <event name="OnTextEnter"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxStaticText" 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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="label">(optional; default GND)</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">m_staticText23</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></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"></property>
+                                                    <property name="wrap">-1</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxStaticText" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="label">Noise source</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">m_staticText16</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></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"></property>
+                                                    <property name="wrap">-1</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxComboBox" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</property>
+                                                    <property name="center_pane">0</property>
+                                                    <property name="choices"></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="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">m_noiseSrc</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="selection">-1</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></property>
+                                                    <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="value"></property>
+                                                    <property name="window_extra_style"></property>
+                                                    <property name="window_name"></property>
+                                                    <property name="window_style"></property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnCombobox"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnText"></event>
+                                                    <event name="OnTextEnter"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </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>
+                                    </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">wxALIGN_CENTER_HORIZONTAL|wxALL</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxRadioBox" 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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</property>
+                                            <property name="center_pane">0</property>
+                                            <property name="choices">&quot;Decade&quot; &quot;Octave&quot; &quot;Linear&quot;</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="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="label">Frequency scale</property>
+                                            <property name="majorDimension">1</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">m_noiseScale</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="selection">0</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style">wxRA_SPECIFY_COLS</property>
+                                            <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>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRadioBox"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </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">wxALIGN_CENTER_HORIZONTAL</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxFlexGridSizer" expanded="1">
+                                            <property name="cols">2</property>
+                                            <property name="flexible_direction">wxBOTH</property>
+                                            <property name="growablecols"></property>
+                                            <property name="growablerows"></property>
+                                            <property name="hgap">0</property>
+                                            <property name="minimum_size"></property>
+                                            <property name="name">fgSizer11</property>
+                                            <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                            <property name="permission">none</property>
+                                            <property name="rows">0</property>
+                                            <property name="vgap">0</property>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxStaticText" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="label">Number of points</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">m_staticText11</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></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"></property>
+                                                    <property name="wrap">-1</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxTextCtrl" 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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="maxlength"></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">m_noisePointsNumber</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></property>
+                                                    <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_NUMERIC</property>
+                                                    <property name="validator_type">wxTextValidator</property>
+                                                    <property name="validator_variable"></property>
+                                                    <property name="value"></property>
+                                                    <property name="window_extra_style"></property>
+                                                    <property name="window_name"></property>
+                                                    <property name="window_style"></property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnText"></event>
+                                                    <event name="OnTextEnter"></event>
+                                                    <event name="OnTextMaxLen"></event>
+                                                    <event name="OnTextURL"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxStaticText" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="label">Start frequency [Hz]</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">m_staticText21</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></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"></property>
+                                                    <property name="wrap">-1</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxTextCtrl" 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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="maxlength"></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">m_noiseFreqStart</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></property>
+                                                    <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_NUMERIC</property>
+                                                    <property name="validator_type">wxTextValidator</property>
+                                                    <property name="validator_variable"></property>
+                                                    <property name="value"></property>
+                                                    <property name="window_extra_style"></property>
+                                                    <property name="window_name"></property>
+                                                    <property name="window_style"></property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnText"></event>
+                                                    <event name="OnTextEnter"></event>
+                                                    <event name="OnTextMaxLen"></event>
+                                                    <event name="OnTextURL"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxStaticText" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="label">Stop frequency [Hz]</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">m_staticText31</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></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"></property>
+                                                    <property name="wrap">-1</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxTextCtrl" 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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="maxlength"></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">m_noiseFreqStop</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></property>
+                                                    <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_NUMERIC</property>
+                                                    <property name="validator_type">wxTextValidator</property>
+                                                    <property name="validator_variable"></property>
+                                                    <property name="value"></property>
+                                                    <property name="window_extra_style"></property>
+                                                    <property name="window_name"></property>
+                                                    <property name="window_style"></property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnText"></event>
+                                                    <event name="OnTextEnter"></event>
+                                                    <event name="OnTextMaxLen"></event>
+                                                    <event name="OnTextURL"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </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>
+                            </object>
+                        </object>
+                        <object class="notebookpage" expanded="1">
+                            <property name="bitmap"></property>
+                            <property name="label">Operating Point</property>
+                            <property name="select">0</property>
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_pgOP</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxBoxSizer" expanded="1">
+                                    <property name="minimum_size"></property>
+                                    <property name="name">bSizer8</property>
+                                    <property name="orient">wxVERTICAL</property>
+                                    <property name="permission">none</property>
+                                    <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="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALIGN_CENTER</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxStaticText" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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="label">This tab has no settings</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">m_staticText13</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></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"></property>
+                                            <property name="wrap">-1</property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </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>
+                            </object>
+                        </object>
+                        <object class="notebookpage" expanded="1">
+                            <property name="bitmap"></property>
+                            <property name="label">Pole-Zero</property>
+                            <property name="select">0</property>
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">1</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">m_pgPoleZero</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="notebookpage" expanded="1">
+                            <property name="bitmap"></property>
+                            <property name="label">Sensitvity</property>
+                            <property name="select">0</property>
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">1</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">m_pgSensitivity</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="notebookpage" expanded="1">
+                            <property name="bitmap"></property>
+                            <property name="label">Transfer Function</property>
+                            <property name="select">0</property>
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">1</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">m_pgTransferFunction</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="notebookpage" expanded="1">
+                            <property name="bitmap"></property>
+                            <property name="label">Transient</property>
+                            <property name="select">0</property>
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_pgTransient</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxBoxSizer" expanded="1">
+                                    <property name="minimum_size"></property>
+                                    <property name="name">bSizer81</property>
+                                    <property name="orient">wxVERTICAL</property>
+                                    <property name="permission">none</property>
+                                    <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">wxALIGN_CENTER_HORIZONTAL|wxALL</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxFlexGridSizer" expanded="1">
+                                            <property name="cols">3</property>
+                                            <property name="flexible_direction">wxBOTH</property>
+                                            <property name="growablecols"></property>
+                                            <property name="growablerows"></property>
+                                            <property name="hgap">0</property>
+                                            <property name="minimum_size"></property>
+                                            <property name="name">fgSizer6</property>
+                                            <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                            <property name="permission">none</property>
+                                            <property name="rows">0</property>
+                                            <property name="vgap">0</property>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxStaticText" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="label">Time step [s]</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">m_staticText151</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></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"></property>
+                                                    <property name="wrap">-1</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxTextCtrl" 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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="maxlength"></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">m_transStep</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></property>
+                                                    <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_NUMERIC</property>
+                                                    <property name="validator_type">wxTextValidator</property>
+                                                    <property name="validator_variable"></property>
+                                                    <property name="value"></property>
+                                                    <property name="window_extra_style"></property>
+                                                    <property name="window_name"></property>
+                                                    <property name="window_style"></property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnText"></event>
+                                                    <event name="OnTextEnter"></event>
+                                                    <event name="OnTextMaxLen"></event>
+                                                    <event name="OnTextURL"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </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="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxStaticText" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="label">Final time [s]</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">m_staticText161</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></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"></property>
+                                                    <property name="wrap">-1</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxTextCtrl" 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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="maxlength"></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">m_transFinal</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></property>
+                                                    <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_NUMERIC</property>
+                                                    <property name="validator_type">wxTextValidator</property>
+                                                    <property name="validator_variable"></property>
+                                                    <property name="value"></property>
+                                                    <property name="window_extra_style"></property>
+                                                    <property name="window_name"></property>
+                                                    <property name="window_style"></property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnText"></event>
+                                                    <event name="OnTextEnter"></event>
+                                                    <event name="OnTextMaxLen"></event>
+                                                    <event name="OnTextURL"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </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="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxStaticText" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="label">Initial time [s]</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">m_staticText17</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></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"></property>
+                                                    <property name="wrap">-1</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxTextCtrl" 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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="maxlength"></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">m_transInitial</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></property>
+                                                    <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_NUMERIC</property>
+                                                    <property name="validator_type">wxTextValidator</property>
+                                                    <property name="validator_variable"></property>
+                                                    <property name="value"></property>
+                                                    <property name="window_extra_style"></property>
+                                                    <property name="window_name"></property>
+                                                    <property name="window_style"></property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnText"></event>
+                                                    <event name="OnTextEnter"></event>
+                                                    <event name="OnTextMaxLen"></event>
+                                                    <event name="OnTextURL"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                <property name="proportion">0</property>
+                                                <object class="wxStaticText" 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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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="label">(optional; default 0)</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">m_staticText24</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style"></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"></property>
+                                                    <property name="wrap">-1</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </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>
+                            </object>
+                        </object>
+                        <object class="notebookpage" expanded="1">
+                            <property name="bitmap"></property>
+                            <property name="label">Custom</property>
+                            <property name="select">0</property>
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_pgCustom</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxBoxSizer" expanded="1">
+                                    <property name="minimum_size"></property>
+                                    <property name="name">bSizer2</property>
+                                    <property name="orient">wxVERTICAL</property>
+                                    <property name="permission">none</property>
+                                    <object class="sizeritem" expanded="1">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALL</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxStaticText" 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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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="label">Spice directives:</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">m_staticText18</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></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"></property>
+                                            <property name="wrap">-1</property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="1">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALL|wxEXPAND</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxTextCtrl" 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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="fg"></property>
+                                            <property name="floatable">1</property>
+                                            <property name="font">,90,90,-1,76,0</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="maxlength"></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">m_customTxt</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style">wxTE_MULTILINE</property>
+                                            <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="value"></property>
+                                            <property name="window_extra_style"></property>
+                                            <property name="window_name"></property>
+                                            <property name="window_style"></property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnText"></event>
+                                            <event name="OnTextEnter"></event>
+                                            <event name="OnTextMaxLen"></event>
+                                            <event name="OnTextURL"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="1">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALL|wxEXPAND</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxButton" 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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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">0</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="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="label">Load directives from schematic</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">m_loadDirectives</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></property>
+                                            <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>
+                                            <event name="OnButtonClick">onLoadDirectives</event>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL|wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="wxStdDialogButtonSizer" expanded="1">
+                        <property name="Apply">0</property>
+                        <property name="Cancel">1</property>
+                        <property name="ContextHelp">0</property>
+                        <property name="Help">0</property>
+                        <property name="No">0</property>
+                        <property name="OK">1</property>
+                        <property name="Save">0</property>
+                        <property name="Yes">0</property>
+                        <property name="minimum_size"></property>
+                        <property name="name">m_sdbSizer1</property>
+                        <property name="permission">protected</property>
+                        <event name="OnApplyButtonClick"></event>
+                        <event name="OnCancelButtonClick"></event>
+                        <event name="OnContextHelpButtonClick"></event>
+                        <event name="OnHelpButtonClick"></event>
+                        <event name="OnNoButtonClick"></event>
+                        <event name="OnOKButtonClick"></event>
+                        <event name="OnSaveButtonClick"></event>
+                        <event name="OnYesButtonClick"></event>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</wxFormBuilder_Project>
diff --git a/eeschema/dialogs/dialog_sim_settings_base.h b/eeschema/dialogs/dialog_sim_settings_base.h
new file mode 100644
index 0000000000..8c28b1d65d
--- /dev/null
+++ b/eeschema/dialogs/dialog_sim_settings_base.h
@@ -0,0 +1,121 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_SIM_SETTINGS_BASE_H__
+#define __DIALOG_SIM_SETTINGS_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/string.h>
+#include <wx/radiobox.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/valtext.h>
+#include <wx/sizer.h>
+#include <wx/panel.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/checkbox.h>
+#include <wx/combobox.h>
+#include <wx/statbox.h>
+#include <wx/button.h>
+#include <wx/notebook.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_SIM_SETTINGS_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_SIM_SETTINGS_BASE : public wxDialog 
+{
+	private:
+	
+	protected:
+		wxNotebook* m_simPages;
+		wxPanel* m_pgAC;
+		wxRadioBox* m_acScale;
+		wxStaticText* m_staticText1;
+		wxTextCtrl* m_acPointsNumber;
+		wxStaticText* m_staticText2;
+		wxTextCtrl* m_acFreqStart;
+		wxStaticText* m_staticText3;
+		wxTextCtrl* m_acFreqStop;
+		wxPanel* m_pgDC;
+		wxCheckBox* m_dcEnable1;
+		wxStaticText* m_staticText41;
+		wxComboBox* m_dcSource1;
+		wxStaticText* m_staticText51;
+		wxTextCtrl* m_dcStart1;
+		wxStaticText* m_staticText61;
+		wxTextCtrl* m_dcStop1;
+		wxStaticText* m_staticText71;
+		wxTextCtrl* m_dcIncr1;
+		wxCheckBox* m_dcEnable2;
+		wxStaticText* m_staticText4;
+		wxComboBox* m_dcSource2;
+		wxStaticText* m_staticText5;
+		wxTextCtrl* m_dcStart2;
+		wxStaticText* m_staticText6;
+		wxTextCtrl* m_dcStop2;
+		wxStaticText* m_staticText7;
+		wxTextCtrl* m_dcIncr2;
+		wxPanel* m_pgDistortion;
+		wxPanel* m_pgNoise;
+		wxStaticText* m_staticText14;
+		wxComboBox* m_noiseMeas;
+		wxStaticText* m_staticText15;
+		wxComboBox* m_noiseRef;
+		wxStaticText* m_staticText23;
+		wxStaticText* m_staticText16;
+		wxComboBox* m_noiseSrc;
+		wxRadioBox* m_noiseScale;
+		wxStaticText* m_staticText11;
+		wxTextCtrl* m_noisePointsNumber;
+		wxStaticText* m_staticText21;
+		wxTextCtrl* m_noiseFreqStart;
+		wxStaticText* m_staticText31;
+		wxTextCtrl* m_noiseFreqStop;
+		wxPanel* m_pgOP;
+		wxStaticText* m_staticText13;
+		wxPanel* m_pgPoleZero;
+		wxPanel* m_pgSensitivity;
+		wxPanel* m_pgTransferFunction;
+		wxPanel* m_pgTransient;
+		wxStaticText* m_staticText151;
+		wxTextCtrl* m_transStep;
+		wxStaticText* m_staticText161;
+		wxTextCtrl* m_transFinal;
+		wxStaticText* m_staticText17;
+		wxTextCtrl* m_transInitial;
+		wxStaticText* m_staticText24;
+		wxPanel* m_pgCustom;
+		wxStaticText* m_staticText18;
+		wxTextCtrl* m_customTxt;
+		wxButton* m_loadDirectives;
+		wxStdDialogButtonSizer* m_sdbSizer1;
+		wxButton* m_sdbSizer1OK;
+		wxButton* m_sdbSizer1Cancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void onLoadDirectives( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Simulation settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 439,534 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+		~DIALOG_SIM_SETTINGS_BASE();
+	
+};
+
+#endif //__DIALOG_SIM_SETTINGS_BASE_H__
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 1a71acba50..cf7dbf47bf 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -47,11 +47,12 @@ bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsign
 }
 
 
-bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
+bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* aFormatter, int aCtl )
 {
     std::vector<int>    pinSequence;                    // numeric indices into m_SortedComponentPinList
     wxArrayString       stdPinNameArray;                // Array containing Standard Pin Names
     const wxString      delimiters( "{:,; }" );
+    SCH_SHEET_LIST      sheetList( g_RootSheet );
 
     // Netlist options
     bool useNetcodeAsNetName = aCtl & NET_USE_NETCODES_AS_NETNAMES;
@@ -60,52 +61,14 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
     for( unsigned ii = 0; ii < m_masterList->size(); ii++ )
         m_masterList->GetItem( ii )->m_Flag = 0;
 
-    SCH_SHEET_LIST sheetList( g_RootSheet );
-    std::vector<wxString> directives;
-
-    formatter->Print( 0, ".title KiCad schematic\n" );
+    aFormatter->Print( 0, ".title KiCad schematic\n" );
 
     m_netMap.clear();
 
     // Ground net has to be always assigned to node 0
     m_netMap["GND"] = 0;
 
-    for( unsigned i = 0; i < sheetList.size(); i++ )
-    {
-        for( EDA_ITEM* item = sheetList[i].LastDrawList(); item; item = item->Next() )
-        {
-            if( item->Type() != SCH_TEXT_T )
-                continue;
-
-            wxString text = static_cast<SCH_TEXT*>( item )->GetText();
-
-            if( text.IsEmpty() )
-                continue;
-
-            if( text.GetChar( 0 ) == '.' )
-            {
-                wxStringTokenizer tokenizer( text, "\r\n" );
-
-                while( tokenizer.HasMoreTokens() )
-                {
-                    wxString directive( tokenizer.GetNextToken() );
-
-                    // Fix paths for .include directives
-                    if( aCtl & NET_ADJUST_INCLUDE_PATHS && m_paths && directive.StartsWith( ".inc" ) )
-                    {
-                        wxString file( directive.AfterFirst( ' ' ) );
-                        wxString path( m_paths->FindValidPath( file ) );
-                        directives.push_back( wxString( ".include " ) + path );
-                    }
-                    else
-                    {
-                        directives.push_back( directive );
-                    }
-                }
-            }
-        }
-    }
-
+    UpdateDirectives( aCtl );
     m_ReferencesAlreadyFound.Clear();
 
     int curNetIndex = 1;
@@ -192,7 +155,7 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
 
             int activePinIndex = 0;
 
-            formatter->Print( 0, "%s%s ", (const char*) primType.c_str(), (const char*) RefName.c_str() );
+            aFormatter->Print( 0, "%s%s ", (const char*) primType.c_str(), (const char*) RefName.c_str() );
 
             for( unsigned ii = 0; ii < m_SortedComponentPinList.size(); ii++ )
             {
@@ -244,7 +207,7 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
 
                 if( useNetcodeAsNetName )
                 {
-                    formatter->Print( 0, "%d ", netIdx );
+                    aFormatter->Print( 0, "%d ", netIdx );
                 }
                 else
                 {
@@ -257,21 +220,18 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* formatter, int aCtl )
                     if( netName.IsEmpty() )
                         netName = wxT( "?" );
 
-                    formatter->Print( 0, "%s ", TO_UTF8( netName ) );
+                    aFormatter->Print( 0, "%s ", TO_UTF8( netName ) );
                 }
             }
 
-            formatter->Print( 0, "%s\n", (const char*) model.c_str() );
+            aFormatter->Print( 0, "%s\n", (const char*) model.c_str() );
         }
     }
 
     // Print out all directives found in the text fields on the schematics
-    for( auto& dir : directives )
-    {
-        formatter->Print( 0, "%s\n", (const char*) dir.c_str() );
-    }
+    writeDirectives( aFormatter, aCtl );
 
-    formatter->Print( -1, ".end\n" );
+    aFormatter->Print( -1, ".end\n" );
 
     return true;
 }
@@ -349,6 +309,60 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
     return wxString( "<unknown>" );
 }
 
+
+void NETLIST_EXPORTER_PSPICE::UpdateDirectives( int aCtl )
+{
+    const SCH_SHEET_LIST& sheetList = g_RootSheet;
+
+    m_directives.clear();
+
+    for( unsigned i = 0; i < sheetList.size(); i++ )
+    {
+        for( EDA_ITEM* item = sheetList[i].LastDrawList(); item; item = item->Next() )
+        {
+            if( item->Type() != SCH_TEXT_T )
+                continue;
+
+            wxString text = static_cast<SCH_TEXT*>( item )->GetText();
+
+            if( text.IsEmpty() )
+                continue;
+
+            if( text.GetChar( 0 ) == '.' )
+            {
+                wxStringTokenizer tokenizer( text, "\r\n" );
+
+                while( tokenizer.HasMoreTokens() )
+                {
+                    wxString directive( tokenizer.GetNextToken() );
+
+                    // Fix paths for .include directives
+                    if( aCtl & NET_ADJUST_INCLUDE_PATHS && m_paths && directive.StartsWith( ".inc" ) )
+                    {
+                        wxString file( directive.AfterFirst( ' ' ) );
+                        wxString path( m_paths->FindValidPath( file ) );
+                        m_directives.push_back( wxString( ".include " ) + path );
+                    }
+                    else
+                    {
+                        m_directives.push_back( directive );
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+void NETLIST_EXPORTER_PSPICE::writeDirectives( OUTPUTFORMATTER* aFormatter, int aCtl ) const
+{
+    for( auto& dir : m_directives )
+    {
+        aFormatter->Print( 0, "%s\n", (const char*) dir.c_str() );
+    }
+}
+
+
 const std::vector<wxString> NETLIST_EXPORTER_PSPICE::m_spiceFields = {
     "Spice_Primitive",
     "Spice_Model",
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index b547c12476..1dd49c4073 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -48,11 +48,16 @@ enum SPICE_NETLIST_OPTIONS {
 class NETLIST_EXPORTER_PSPICE : public NETLIST_EXPORTER
 {
 public:
-    NETLIST_EXPORTER_PSPICE( NETLIST_OBJECT_LIST* aMasterList, PART_LIBS* aLibs, SEARCH_STACK* aPaths = NULL ) :
+    NETLIST_EXPORTER_PSPICE( NETLIST_OBJECT_LIST* aMasterList, PART_LIBS* aLibs,
+            SEARCH_STACK* aPaths = NULL ) :
         NETLIST_EXPORTER( aMasterList, aLibs ), m_paths( aPaths )
     {
     }
 
+    virtual ~NETLIST_EXPORTER_PSPICE()
+    {
+    }
+
     ///> Net name to node number mapping
     typedef std::map<wxString, int> NET_INDEX_MAP;
 
@@ -62,7 +67,7 @@ public:
      */
     bool WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions );
 
-    bool Format( OUTPUTFORMATTER* aOutputFormatter, int aCtl );
+    bool Format( OUTPUTFORMATTER* aFormatter, int aCtl );
 
     const NET_INDEX_MAP& GetNetIndexMap() const
     {
@@ -76,11 +81,25 @@ public:
 
     static wxString GetSpiceFieldDefVal( const wxString& aField, SCH_COMPONENT* aComponent, int aCtl );
 
+    void UpdateDirectives( int aCtl );
+
+    const std::vector<wxString> GetDirectives() const
+    {
+        return m_directives;
+    }
+
+protected:
+    virtual void writeDirectives( OUTPUTFORMATTER* aFormatter, int aCtl ) const;
+
 private:
+    // Spice directives found in the processed schematic sheet
+    std::vector<wxString> m_directives;
+
     NET_INDEX_MAP m_netMap;
+
     SEARCH_STACK* m_paths;
 
-    // Fields that are used during netlist export & simulation
+    // Component fields that are processed during netlist export & simulation
     static const std::vector<wxString> m_spiceFields;
 };
 
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index f5c2836273..69e3445c11 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -74,14 +74,78 @@ private:
 };
 
 
+/// Special netlist exporter flavor that allows to override simulation commands
+class NETLIST_EXPORTER_PSPICE_SIM : public NETLIST_EXPORTER_PSPICE
+{
+public:
+    NETLIST_EXPORTER_PSPICE_SIM( NETLIST_OBJECT_LIST* aMasterList, PART_LIBS* aLibs,
+            SEARCH_STACK* aPaths = NULL ) :
+        NETLIST_EXPORTER_PSPICE( aMasterList, aLibs, aPaths )
+    {
+    }
+
+    void SetSimCommand( const wxString& aCmd )
+    {
+        m_simCommand = aCmd;
+    }
+
+    const wxString& GetSimCommand() const
+    {
+        return m_simCommand;
+    }
+
+    void ClearSimCommand()
+    {
+        m_simCommand.Clear();
+    }
+
+protected:
+    virtual void writeDirectives( OUTPUTFORMATTER* aFormatter, int aCtl ) const
+    {
+        if( m_simCommand.IsEmpty() )
+        {
+            // Fallback to the default behavior
+            NETLIST_EXPORTER_PSPICE::writeDirectives( aFormatter, aCtl );
+        }
+
+        // Dump all directives, but simulation commands
+        for( const auto& dir : GetDirectives() )
+        {
+            if( !isSimCommand( dir ) )
+                aFormatter->Print( 0, "%s\n", (const char*) dir.c_str() );
+        }
+
+        // Finish with our custom simulation command
+        aFormatter->Print( 0, "%s\n", (const char*) m_simCommand.c_str() );
+    }
+
+private:
+    bool isSimCommand( const wxString& aCmd ) const
+    {
+        const std::vector<wxString> simCmds = {
+            ".ac", ".dc", ".disto", ".noise", ".op", ".pz", ".sens", ".tf", ".tran", ".pss"
+        };
+
+        wxString lcaseCmd = aCmd.Lower();
+
+        for( const auto& c : simCmds )
+        {
+            if( lcaseCmd.StartsWith( c ) )
+                return true;
+        }
+
+        return false;
+    }
+
+    wxString m_simCommand;
+};
+
+
 SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
-    : SIM_PLOT_FRAME_BASE( aParent )
+    : SIM_PLOT_FRAME_BASE( aParent ), m_settingsDlg( this )
 {
     SetKiway( this, aKiway );
 
-    m_exporter = NULL;
-    m_simulator = NULL;
-
     Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SIM_PLOT_FRAME::onClose ), NULL, this );
     Connect( EVT_SIM_REPORT, wxCommandEventHandler( SIM_PLOT_FRAME::onSimReport ), NULL, this );
     Connect( EVT_SIM_STARTED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimStarted ), NULL, this );
@@ -94,28 +158,28 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
 
 SIM_PLOT_FRAME::~SIM_PLOT_FRAME()
 {
-    delete m_exporter;
-    delete m_simulator;
 }
 
 
 void SIM_PLOT_FRAME::StartSimulation()
 {
-    delete m_exporter;
-    delete m_simulator;
-
     m_simConsole->Clear();
 
+    // TODO check if there is a valid simulation command
+
     /// @todo is it necessary to recreate simulator every time?
-    m_simulator = SPICE_SIMULATOR::CreateInstance( "ngspice" );
+    m_simulator.reset( SPICE_SIMULATOR::CreateInstance( "ngspice" ) );
     m_simulator->SetReporter( new SIM_THREAD_REPORTER( this ) );
     m_simulator->Init();
 
     NETLIST_OBJECT_LIST* net_atoms = m_schematicFrame->BuildNetListBase();
     STRING_FORMATTER formatter;
 
-    m_exporter = new NETLIST_EXPORTER_PSPICE( net_atoms, Prj().SchLibs(), Prj().SchSearchS() );
+    m_exporter.reset( new NETLIST_EXPORTER_PSPICE_SIM( net_atoms,
+                                                        Prj().SchLibs(), Prj().SchSearchS() ) );
+    m_exporter->SetSimCommand( m_simCommand );
     m_exporter->Format( &formatter, GNL_ALL );
+
     m_simulator->LoadNetlist( formatter.GetString() );
     m_simulator->Run();
 }
@@ -349,6 +413,17 @@ void SIM_PLOT_FRAME::onSimulate( wxCommandEvent& event )
 }
 
 
+void SIM_PLOT_FRAME::onSettings( wxCommandEvent& event )
+{
+    // TODO set exporter
+
+    if( m_settingsDlg.ShowModal() == wxID_OK )
+        m_simCommand = m_settingsDlg.GetSimCommand();
+
+    wxLogDebug( "sim command = %s", m_simCommand );     // TODO remove
+}
+
+
 void SIM_PLOT_FRAME::onPlaceProbe( wxCommandEvent& event )
 {
     if( m_schematicFrame == NULL )
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index b46e556dda..80148046bd 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -32,11 +32,12 @@
 #include "sim_plot_frame_base.h"
 #include "kiway_player.h"
 #include <netlist_exporters/netlist_exporter_pspice.h>
+#include <dialogs/dialog_sim_settings.h>
 
 #include <wx/event.h>
 
 class SPICE_SIMULATOR;
-class NETLIST_EXPORTER_PSPICE;
+class NETLIST_EXPORTER_PSPICE_SIM;
 class SIM_PLOT_PANEL;
 
 /** Implementing SIM_PLOT_FRAME_BASE */
@@ -110,6 +111,7 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void onSignalRClick( wxMouseEvent& event ) override;
 
         void onSimulate( wxCommandEvent& event ) override;
+        void onSettings( wxCommandEvent& event ) override;
         void onPlaceProbe( wxCommandEvent& event ) override;
 
         void onClose( wxCloseEvent& aEvent );
@@ -120,8 +122,12 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void onSimReport( wxCommandEvent& aEvent );
 
         SCH_EDIT_FRAME* m_schematicFrame;
-        NETLIST_EXPORTER_PSPICE* m_exporter;
-        SPICE_SIMULATOR* m_simulator;
+        std::unique_ptr<NETLIST_EXPORTER_PSPICE_SIM> m_exporter;
+        std::unique_ptr<SPICE_SIMULATOR> m_simulator;
+        wxString m_simCommand;
+
+        // Trick to preserve settings between runs
+        DIALOG_SIM_SETTINGS m_settingsDlg;
 
         // Right click context menu for signals in the listbox
         class SIGNAL_CONTEXT_MENU : public wxMenu
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index 75a1544d48..35414efe3a 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -107,22 +107,23 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_cursors = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL );
 	bSizer7->Add( m_cursors, 1, wxALL|wxEXPAND, 5 );
 	
-	wxFlexGridSizer* fgSizer1;
-	fgSizer1 = new wxFlexGridSizer( 1, 0, 0, 0 );
-	fgSizer1->SetFlexibleDirection( wxBOTH );
-	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	wxBoxSizer* bSizer4;
+	bSizer4 = new wxBoxSizer( wxHORIZONTAL );
 	
 	m_simulateBtn = new wxButton( this, wxID_ANY, _("Simulate"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer1->Add( m_simulateBtn, 0, wxALL, 5 );
+	bSizer4->Add( m_simulateBtn, 1, wxALL, 5 );
+	
+	m_settingsBtn = new wxButton( this, wxID_ANY, _("Settings"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer4->Add( m_settingsBtn, 1, wxALL, 5 );
 	
 	m_probeBtn = new wxButton( this, wxID_ANY, _("Probe"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer1->Add( m_probeBtn, 0, wxALL|wxEXPAND, 5 );
+	bSizer4->Add( m_probeBtn, 1, wxALL, 5 );
 	
 	m_tuneBtn = new wxButton( this, wxID_ANY, _("Tune"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer1->Add( m_tuneBtn, 0, wxALL|wxEXPAND, 5 );
+	bSizer4->Add( m_tuneBtn, 1, wxALL, 5 );
 	
 	
-	bSizer7->Add( fgSizer1, 0, wxALL|wxEXPAND, 5 );
+	bSizer7->Add( bSizer4, 0, 0, 5 );
 	
 	
 	bSizer5->Add( bSizer7, 1, wxEXPAND, 5 );
@@ -161,6 +162,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_signals->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
 	m_signals->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
 	m_simulateBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
+	m_settingsBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSettings ), NULL, this );
 	m_probeBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onPlaceProbe ), NULL, this );
 	m_tuneBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onTune ), NULL, this );
 }
@@ -187,6 +189,7 @@ SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
 	m_signals->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
 	m_signals->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
 	m_simulateBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
+	m_settingsBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSettings ), NULL, this );
 	m_probeBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onPlaceProbe ), NULL, this );
 	m_tuneBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onTune ), NULL, this );
 	
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index 92a27ad63a..b392f8e370 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -88,7 +88,7 @@
             <event name="OnSetFocus"></event>
             <event name="OnSize"></event>
             <event name="OnUpdateUI"></event>
-            <object class="wxMenuBar" expanded="1">
+            <object class="wxMenuBar" expanded="0">
                 <property name="bg"></property>
                 <property name="context_help"></property>
                 <property name="context_menu">1</property>
@@ -133,7 +133,7 @@
                 <event name="OnSetFocus"></event>
                 <event name="OnSize"></event>
                 <event name="OnUpdateUI"></event>
-                <object class="wxMenu" expanded="1">
+                <object class="wxMenu" expanded="0">
                     <property name="label">File</property>
                     <property name="name">m_fileMenu</property>
                     <property name="permission">protected</property>
@@ -190,7 +190,7 @@
                         <property name="name">m_separator1</property>
                         <property name="permission">none</property>
                     </object>
-                    <object class="wxMenuItem" expanded="1">
+                    <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
@@ -205,7 +205,7 @@
                         <event name="OnMenuSelection">menuSaveImage</event>
                         <event name="OnUpdateUI"></event>
                     </object>
-                    <object class="wxMenuItem" expanded="1">
+                    <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
@@ -220,7 +220,7 @@
                         <event name="OnMenuSelection">menuSaveCsv</event>
                         <event name="OnUpdateUI"></event>
                     </object>
-                    <object class="separator" expanded="1">
+                    <object class="separator" expanded="0">
                         <property name="name">m_separator4</property>
                         <property name="permission">none</property>
                     </object>
@@ -240,7 +240,7 @@
                         <event name="OnUpdateUI"></event>
                     </object>
                 </object>
-                <object class="wxMenu" expanded="1">
+                <object class="wxMenu" expanded="0">
                     <property name="label">View</property>
                     <property name="name">m_viewMenu</property>
                     <property name="permission">protected</property>
@@ -438,11 +438,11 @@
                                 <event name="OnUpdateUI"></event>
                             </object>
                         </object>
-                        <object class="sizeritem" expanded="0">
+                        <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
                             <property name="flag">wxEXPAND</property>
                             <property name="proportion">1</property>
-                            <object class="wxBoxSizer" expanded="0">
+                            <object class="wxBoxSizer" expanded="1">
                                 <property name="minimum_size"></property>
                                 <property name="name">bSizer7</property>
                                 <property name="orient">wxVERTICAL</property>
@@ -806,26 +806,19 @@
                                         <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="0">
+                                <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALL|wxEXPAND</property>
+                                    <property name="flag"></property>
                                     <property name="proportion">0</property>
-                                    <object class="wxFlexGridSizer" expanded="0">
-                                        <property name="cols">0</property>
-                                        <property name="flexible_direction">wxBOTH</property>
-                                        <property name="growablecols"></property>
-                                        <property name="growablerows"></property>
-                                        <property name="hgap">0</property>
+                                    <object class="wxBoxSizer" expanded="1">
                                         <property name="minimum_size"></property>
-                                        <property name="name">fgSizer1</property>
-                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                        <property name="name">bSizer4</property>
+                                        <property name="orient">wxHORIZONTAL</property>
                                         <property name="permission">none</property>
-                                        <property name="rows">1</property>
-                                        <property name="vgap">0</property>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALL</property>
-                                            <property name="proportion">0</property>
+                                            <property name="proportion">1</property>
                                             <object class="wxButton" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
@@ -910,10 +903,98 @@
                                                 <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxButton" 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_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</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">0</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="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="label">Settings</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">m_settingsBtn</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <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>
+                                                <event name="OnButtonClick">onSettings</event>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">0</property>
+                                            <property name="flag">wxALL</property>
+                                            <property name="proportion">1</property>
                                             <object class="wxButton" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
@@ -1000,8 +1081,8 @@
                                         </object>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">0</property>
+                                            <property name="flag">wxALL</property>
+                                            <property name="proportion">1</property>
                                             <object class="wxButton" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index ded6aa5aab..50bf654e6a 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -52,6 +52,7 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxStaticText* m_staticText21;
 		wxListCtrl* m_cursors;
 		wxButton* m_simulateBtn;
+		wxButton* m_settingsBtn;
 		wxButton* m_probeBtn;
 		wxButton* m_tuneBtn;
 		wxRichTextCtrl* m_simConsole;
@@ -76,6 +77,7 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		virtual void onSignalDblClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onSignalRClick( wxMouseEvent& event ) { event.Skip(); }
 		virtual void onSimulate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSettings( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onPlaceProbe( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onTune( wxCommandEvent& event ) { event.Skip(); }
 		
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 428da31ccd..61a6fe1454 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -99,9 +99,6 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint&
                 const wxSize& size, long style, const wxString& name )
     : mpWindow( parent, id, pos, size, style ), m_colorIdx( 0 )
 {
-    //SetMargins( 10, 10, 10, 10 );
-    LockAspect();
-
     m_axis_x = new mpScaleX( wxT( "T [s]" ) );
     m_axis_x->SetTicks( false );
     AddLayer( m_axis_x );

From 96dcee81fe1222ed0b8242556e17e5df46f8cae1 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:29 +0200
Subject: [PATCH 061/197] Modified Spice netlist exporter to run in two passes
 Now it creates a list of Spice items, so they can be used by other objects,
 instead of directly dumping them.

---
 .../netlist_exporter_pspice.cpp               | 327 +++++++++---------
 .../netlist_exporter_pspice.h                 |  37 +-
 2 files changed, 196 insertions(+), 168 deletions(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index cf7dbf47bf..49773c7cb6 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -47,185 +47,76 @@ bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsign
 }
 
 
-bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* aFormatter, int aCtl )
+bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* aFormatter, unsigned aCtl )
 {
-    std::vector<int>    pinSequence;                    // numeric indices into m_SortedComponentPinList
-    wxArrayString       stdPinNameArray;                // Array containing Standard Pin Names
-    const wxString      delimiters( "{:,; }" );
-    SCH_SHEET_LIST      sheetList( g_RootSheet );
-
     // Netlist options
-    bool useNetcodeAsNetName = aCtl & NET_USE_NETCODES_AS_NETNAMES;
+    const bool useNetcodeAsNetName = aCtl & NET_USE_NETCODES_AS_NETNAMES;
 
-    // Prepare list of nets generation (not used here, but...
-    for( unsigned ii = 0; ii < m_masterList->size(); ii++ )
-        m_masterList->GetItem( ii )->m_Flag = 0;
+    ProcessNetlist( aCtl );
 
     aFormatter->Print( 0, ".title KiCad schematic\n" );
 
-    m_netMap.clear();
-
-    // Ground net has to be always assigned to node 0
-    m_netMap["GND"] = 0;
-
-    UpdateDirectives( aCtl );
-    m_ReferencesAlreadyFound.Clear();
-
-    int curNetIndex = 1;
-
-    for( unsigned sheet_idx = 0; sheet_idx < sheetList.size(); sheet_idx++ )
+    for( const auto& item : m_spiceItems )
     {
-        // Process component attributes to find Spice directives
-        for( EDA_ITEM* item = sheetList[sheet_idx].LastDrawList(); item; item = item->Next() )
+        aFormatter->Print( 0, "%c%s ", item.m_primitive, (const char*) item.m_refName.c_str() );
+
+        // Pins to node mapping
+        int activePinIndex = 0;
+
+        for( unsigned ii = 0; ii < item.m_pins.size(); ii++ )
         {
-            SCH_COMPONENT* comp = findNextComponentAndCreatePinList( item, &sheetList[sheet_idx] );
-
-            if( !comp )
-                break;
-
-            item = comp;
-
-            // Reset NodeSeqIndex Count:
-            pinSequence.clear();
-
-            // Obtain Spice fields
-            SCH_FIELD* spicePrimitiveType = comp->FindField( wxT( "Spice_Primitive" ) );
-            SCH_FIELD* spiceModel = comp->FindField( wxT( "Spice_Model" ) );
-            SCH_FIELD* netlistEnabledField = comp->FindField( wxT( "Spice_Netlist_Enabled" ) );
-            SCH_FIELD* spiceSeqField = comp->FindField( wxT( "Spice_Node_Sequence" ) );
-
-            wxString model = spiceModel ? spiceModel->GetText()
-                : GetSpiceFieldDefVal( "Spice_Model", comp, aCtl );
-
-            wxString primType = spicePrimitiveType ? spicePrimitiveType->GetText()
-                : GetSpiceFieldDefVal( "Spice_Primitive", comp, aCtl );
-
-            const wxString& RefName = comp->GetRef( &sheetList[sheet_idx] );
-
-            // Check to see if component should be removed from Spice Netlist:
-            if( netlistEnabledField )
+            // Case of Alt Sequence definition with Unused/Invalid Node index:
+            // Valid used Node Indexes are in the set
+            // {0,1,2,...m_SortedComponentPinList.size()-1}
+            if( !item.m_pinSequence.empty() )
             {
-                wxString netlistEnabled = netlistEnabledField->GetText();
-
-                // Different ways of saying 'disabled' (no/false/0)
-                if( netlistEnabled.CmpNoCase( "N" ) == 0
-                        || netlistEnabled.CmpNoCase( "F" ) == 0
-                        || netlistEnabled == "0" )
+                // All Vector values must be less <= max package size
+                // And Total Vector size should be <= package size
+                if( ( (unsigned) item.m_pinSequence[ii] < m_SortedComponentPinList.size() )
+                    && ( ii < item.m_pinSequence.size() ) )
+                {
+                    // Case of Alt Pin Sequence in control good Index:
+                    activePinIndex = item.m_pinSequence[ii];
+                }
+                else
+                {
+                    // Case of Alt Pin Sequence in control Bad Index or not using all
+                    // pins for simulation:
+                    wxASSERT_MSG( false, "Used an invalid pin number in node sequence" );
                     continue;
+                }
             }
-
-            // Check if an alternative pin sequence is available:
-            if( spiceSeqField )
+            // Case of Standard Pin Sequence in control:
+            else
             {
-                // Get the string containing the sequence of nodes:
-                wxString nodeSeqIndexLineStr = spiceSeqField->GetText();
-
-                // Verify field exists and is not empty:
-                if( !nodeSeqIndexLineStr.IsEmpty() )
-                {
-                    // Create an array of standard pin names from part definition:
-                    stdPinNameArray.Clear();
-
-                    for( unsigned ii = 0; ii < m_SortedComponentPinList.size(); ii++ )
-                    {
-                        NETLIST_OBJECT* pin = m_SortedComponentPinList[ii];
-
-                        if( !pin )
-                            continue;
-
-                        stdPinNameArray.Add( pin->GetPinNumText() );
-                    }
-
-                    // Get Alt Pin Name Array From User:
-                    wxStringTokenizer tkz( nodeSeqIndexLineStr, delimiters );
-
-                    while( tkz.HasMoreTokens() )
-                    {
-                        wxString    pinIndex = tkz.GetNextToken();
-                        int         seq;
-
-                        // Find PinName In Standard List assign Standard List Index to Name:
-                        seq = stdPinNameArray.Index( pinIndex );
-
-                        if( seq != wxNOT_FOUND )
-                            pinSequence.push_back( seq );
-                    }
-                }
+                activePinIndex = ii;
             }
 
-            int activePinIndex = 0;
+            NETLIST_OBJECT* pin = item.m_pins[activePinIndex];
+            assert( pin );
+            wxString netName = pin->GetNetName();
 
-            aFormatter->Print( 0, "%s%s ", (const char*) primType.c_str(), (const char*) RefName.c_str() );
-
-            for( unsigned ii = 0; ii < m_SortedComponentPinList.size(); ii++ )
+            if( useNetcodeAsNetName )
             {
-                // Case of Alt Sequence definition with Unused/Invalid Node index:
-                // Valid used Node Indexes are in the set
-                // {0,1,2,...m_SortedComponentPinList.size()-1}
-                if( pinSequence.size() )
-                {
-                    // All Vector values must be less <= max package size
-                    // And Total Vector size should be <= package size
-                    if( ( (unsigned) pinSequence[ii] < m_SortedComponentPinList.size() )
-                      && ( ii < pinSequence.size() ) )
-                    {
-                        // Case of Alt Pin Sequence in control good Index:
-                        activePinIndex = pinSequence[ii];
-                    }
-                    else
-                    {
-                        // Case of Alt Pin Sequence in control Bad Index or not using all
-                        // pins for simulation:
-                        wxASSERT_MSG( false, "Used an invalid pin number in node sequence" );
-                        continue;
-                    }
-                }
-                // Case of Standard Pin Sequence in control:
-                else
-                {
-                    activePinIndex = ii;
-                }
-
-                NETLIST_OBJECT* pin = m_SortedComponentPinList[activePinIndex];
-
-                if( !pin )
-                    continue;
-
-                wxString netName = pin->GetNetName();
-                int netIdx;
-
-                // Assign a node number (associated with net)
-                if( m_netMap.find( netName ) == m_netMap.end() )
-                {
-                    netIdx = curNetIndex++;
-                    m_netMap[netName] = netIdx;
-                }
-                else
-                {
-                    netIdx = m_netMap[netName];
-                }
-
-                if( useNetcodeAsNetName )
-                {
-                    aFormatter->Print( 0, "%d ", netIdx );
-                }
-                else
-                {
-                    sprintPinNetName( netName , wxT( "N-%.6d" ), pin, useNetcodeAsNetName );
-
-                    //Replace parenthesis with underscore to prevent parse issues with simulators
-                    netName.Replace( wxT( "(" ), wxT( "_" ) );
-                    netName.Replace( wxT( ")" ), wxT( "_" ) );
-
-                    if( netName.IsEmpty() )
-                        netName = wxT( "?" );
-
-                    aFormatter->Print( 0, "%s ", TO_UTF8( netName ) );
-                }
+                assert( m_netMap.count( netName ) );
+                aFormatter->Print( 0, "%d ", m_netMap[netName] );
             }
+            else
+            {
+                sprintPinNetName( netName , wxT( "N-%.6d" ), pin, useNetcodeAsNetName );
 
-            aFormatter->Print( 0, "%s\n", (const char*) model.c_str() );
+                //Replace parenthesis with underscore to prevent parse issues with simulators
+                netName.Replace( wxT( "(" ), wxT( "_" ) );
+                netName.Replace( wxT( ")" ), wxT( "_" ) );
+
+                if( netName.IsEmpty() )
+                    netName = wxT( "?" );
+
+                aFormatter->Print( 0, "%s ", TO_UTF8( netName ) );
+            }
         }
+
+        aFormatter->Print( 0, "%s\n", (const char*) item.m_model.c_str() );
     }
 
     // Print out all directives found in the text fields on the schematics
@@ -238,7 +129,7 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* aFormatter, int aCtl )
 
 
 wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
-        SCH_COMPONENT* aComponent, int aCtl )
+        SCH_COMPONENT* aComponent, unsigned aCtl )
 {
     if( aField == "Spice_Primitive" )
     {
@@ -310,7 +201,117 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
 }
 
 
-void NETLIST_EXPORTER_PSPICE::UpdateDirectives( int aCtl )
+void NETLIST_EXPORTER_PSPICE::ProcessNetlist( unsigned aCtl )
+{
+    const wxString      delimiters( "{:,; }" );
+    SCH_SHEET_LIST      sheetList( g_RootSheet );
+
+    // Prepare list of nets generation (not used here, but...
+    for( unsigned ii = 0; ii < m_masterList->size(); ii++ )
+        m_masterList->GetItem( ii )->m_Flag = 0;
+
+    UpdateDirectives( aCtl );
+
+    m_netMap.clear();
+
+    // 0 is reserved for "GND"
+    m_netMap["GND"] = 0;
+    int netIdx = 1;
+
+    m_ReferencesAlreadyFound.Clear();
+
+    for( unsigned sheet_idx = 0; sheet_idx < sheetList.size(); sheet_idx++ )
+    {
+        // Process component attributes to find Spice directives
+        for( EDA_ITEM* item = sheetList[sheet_idx].LastDrawList(); item; item = item->Next() )
+        {
+            SCH_COMPONENT* comp = findNextComponentAndCreatePinList( item, &sheetList[sheet_idx] );
+
+            if( !comp )
+                break;
+
+            item = comp;
+
+            SPICE_ITEM spiceItem;
+            spiceItem.m_parent = comp;
+
+            // Obtain Spice fields
+            SCH_FIELD* fieldPrim = comp->FindField( wxT( "Spice_Primitive" ) );
+            SCH_FIELD* fieldModel = comp->FindField( wxT( "Spice_Model" ) );
+            SCH_FIELD* fieldEnabled = comp->FindField( wxT( "Spice_Netlist_Enabled" ) );
+            SCH_FIELD* fieldSeq = comp->FindField( wxT( "Spice_Node_Sequence" ) );
+
+            spiceItem.m_primitive = fieldPrim ? fieldPrim->GetText()[0]
+                : GetSpiceFieldDefVal( "Spice_Primitive", comp, aCtl )[0];
+
+            spiceItem.m_model = fieldModel ? fieldModel->GetText()
+                : GetSpiceFieldDefVal( "Spice_Model", comp, aCtl );
+
+            spiceItem.m_refName = comp->GetRef( &sheetList[sheet_idx] );
+
+            // Check to see if component should be removed from Spice Netlist:
+            spiceItem.m_enabled = true;     // assume yes and then verify
+
+            if( fieldEnabled )
+            {
+                wxString netlistEnabled = fieldEnabled->GetText();
+
+                // Different ways of saying 'disabled' (no/false/0)
+                if( netlistEnabled.CmpNoCase( "N" ) == 0
+                        || netlistEnabled.CmpNoCase( "F" ) == 0
+                        || netlistEnabled == "0" )
+                    spiceItem.m_enabled = false;
+            }
+
+            wxArrayString pinNames;
+
+            // Store pin information
+            for( unsigned ii = 0; ii < m_SortedComponentPinList.size(); ii++ )
+            {
+                NETLIST_OBJECT* pin = m_SortedComponentPinList[ii];
+                assert( pin );
+                spiceItem.m_pins.push_back( pin );
+                pinNames.Add( pin->GetPinNumText() );
+
+                // Create net mapping
+                const wxString& netName = pin->GetNetName();
+                if( m_netMap.count( netName ) == 0 )
+                    m_netMap[netName] = netIdx++;
+            }
+
+            // Check if an alternative pin sequence is available:
+            if( fieldSeq )
+            {
+                // Get the string containing the sequence of nodes:
+                wxString nodeSeqIndexLineStr = fieldSeq->GetText();
+
+                // Verify field exists and is not empty:
+                if( !nodeSeqIndexLineStr.IsEmpty() )
+                {
+                    // Get Alt Pin Name Array From User:
+                    wxStringTokenizer tkz( nodeSeqIndexLineStr, delimiters );
+
+                    while( tkz.HasMoreTokens() )
+                    {
+                        wxString    pinIndex = tkz.GetNextToken();
+                        int         seq;
+
+                        // Find PinName In Standard List assign Standard List Index to Name:
+                        seq = pinNames.Index( pinIndex );
+
+                        if( seq != wxNOT_FOUND )
+                            spiceItem.m_pinSequence.push_back( seq );
+                    }
+                }
+            }
+
+            m_spiceItems.push_back( spiceItem );
+        }
+    }
+}
+
+
+void NETLIST_EXPORTER_PSPICE::UpdateDirectives( unsigned aCtl )
 {
     const SCH_SHEET_LIST& sheetList = g_RootSheet;
 
@@ -354,7 +355,7 @@ void NETLIST_EXPORTER_PSPICE::UpdateDirectives( int aCtl )
 }
 
 
-void NETLIST_EXPORTER_PSPICE::writeDirectives( OUTPUTFORMATTER* aFormatter, int aCtl ) const
+void NETLIST_EXPORTER_PSPICE::writeDirectives( OUTPUTFORMATTER* aFormatter, unsigned aCtl ) const
 {
     for( auto& dir : m_directives )
     {
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index 1dd49c4073..74685c9400 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -36,7 +36,8 @@ enum SPICE_NETLIST_OPTIONS {
     NET_USE_X_PREFIX = 2,               // change "U" and "IC" reference prefix to "X"
     NET_USE_NETCODES_AS_NETNAMES = 4,   // use netcode numbers as netnames
     NET_ADJUST_INCLUDE_PATHS = 8,       // use full paths for included files (if they are in search path)
-    NET_ADJUST_PASSIVE_VALS = 16        // reformat passive component values (e.g. 1M -> 1Meg)
+    NET_ADJUST_PASSIVE_VALS = 16,       // reformat passive component values (e.g. 1M -> 1Meg)
+    NET_ALL_FLAGS = 0xffff
 };
 
 /// @todo add NET_ADJUST_INCLUDE_PATHS & NET_ADJUST_PASSIVE_VALS checkboxes in the netlist export dialog
@@ -58,16 +59,40 @@ public:
     {
     }
 
+    struct SPICE_ITEM
+    {
+        SCH_COMPONENT* m_parent;
+        wxChar m_primitive;
+        wxString m_model;
+        wxString m_refName;
+        bool m_enabled;
+
+        ///> Array containing Standard Pin Name
+        std::vector<NETLIST_OBJECT*> m_pins;
+
+        ///> Numeric indices into m_SortedComponentPinList
+        std::vector<int> m_pinSequence;
+    };
+
+    typedef std::list<SPICE_ITEM> SPICE_ITEM_LIST;
+
     ///> Net name to node number mapping
     typedef std::map<wxString, int> NET_INDEX_MAP;
 
+    const SPICE_ITEM_LIST& GetSpiceItems() const
+    {
+        return m_spiceItems;
+    }
+
     /**
      * Function WriteNetlist
      * writes to specified output file
      */
     bool WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions );
 
-    bool Format( OUTPUTFORMATTER* aFormatter, int aCtl );
+    bool Format( OUTPUTFORMATTER* aFormatter, unsigned aCtl );
+
+    void ProcessNetlist( unsigned aCtl );
 
     const NET_INDEX_MAP& GetNetIndexMap() const
     {
@@ -79,9 +104,9 @@ public:
         return m_spiceFields;
     }
 
-    static wxString GetSpiceFieldDefVal( const wxString& aField, SCH_COMPONENT* aComponent, int aCtl );
+    static wxString GetSpiceFieldDefVal( const wxString& aField, SCH_COMPONENT* aComponent, unsigned aCtl );
 
-    void UpdateDirectives( int aCtl );
+    void UpdateDirectives( unsigned aCtl );
 
     const std::vector<wxString> GetDirectives() const
     {
@@ -89,7 +114,7 @@ public:
     }
 
 protected:
-    virtual void writeDirectives( OUTPUTFORMATTER* aFormatter, int aCtl ) const;
+    virtual void writeDirectives( OUTPUTFORMATTER* aFormatter, unsigned aCtl ) const;
 
 private:
     // Spice directives found in the processed schematic sheet
@@ -97,6 +122,8 @@ private:
 
     NET_INDEX_MAP m_netMap;
 
+    SPICE_ITEM_LIST m_spiceItems;
+
     SEARCH_STACK* m_paths;
 
     // Component fields that are processed during netlist export & simulation

From 95ca3914ce0663fb1bb83523055b2404932753f6 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:29 +0200
Subject: [PATCH 062/197] Fields in simulation settings dialog are treated as
 invalid when empty

---
 eeschema/dialogs/dialog_sim_settings.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
index 8519dabf07..58ca543b13 100644
--- a/eeschema/dialogs/dialog_sim_settings.cpp
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -67,6 +67,9 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
     // AC analysis
     if( page == m_pgAC )
     {
+        if( m_acPointsNumber->IsEmpty() || m_acFreqStart->IsEmpty() || m_acFreqStop->IsEmpty() )
+            return false;
+
         m_simCommand = wxString::Format( ".ac %s %s %s %s",
             scaleToString( m_acScale->GetSelection() ),
             m_acPointsNumber->GetValue(), m_acFreqStart->GetValue(), m_acFreqStop->GetValue() );
@@ -84,7 +87,8 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
 
         if( m_dcEnable1->IsChecked() )
         {
-            if( m_dcSource1->GetValue().IsEmpty() )
+            if( m_dcSource1->GetValue().IsEmpty() || m_dcStart1->IsEmpty() ||
+                    m_dcStop1->IsEmpty() || m_dcIncr1->IsEmpty() )
                 return false;
 
             simCmd += wxString::Format( "%s %s %s %s",
@@ -94,7 +98,8 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
 
         if( m_dcEnable2->IsChecked() )
         {
-            if( m_dcSource2->GetValue().IsEmpty() )
+            if( m_dcSource2->GetValue().IsEmpty() || m_dcStart2->IsEmpty() ||
+                    m_dcStop2->IsEmpty() || m_dcIncr2->IsEmpty() )
                 return false;
 
             simCmd += wxString::Format( "%s %s %s %s",
@@ -109,7 +114,9 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
     // Noise analysis
     else if( page == m_pgNoise )
     {
-        if( m_noiseMeas->GetValue().IsEmpty() || m_noiseSrc->GetValue().IsEmpty() )
+        if( m_noiseMeas->GetValue().IsEmpty() || m_noiseSrc->GetValue().IsEmpty() ||
+                m_noisePointsNumber->IsEmpty() || m_noiseFreqStart->IsEmpty() ||
+                m_noiseFreqStop->IsEmpty() )
             return false;
 
         // TODO missing node number
@@ -130,6 +137,9 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
     // Transient analysis
     else if( page == m_pgTransient )
     {
+        if( m_transStep->IsEmpty() || m_transFinal->IsEmpty() )
+            return false;
+
         m_simCommand = wxString::Format( ".trans %s %s %s",
             m_transStep->GetValue(), m_transFinal->GetValue(), m_transInitial->GetValue() );
     }

From 2b1784cfc6d7da9021e4a6956de6daea67b5f8f4 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:30 +0200
Subject: [PATCH 063/197] Simulation settings combo boxes are filled with
 net/power source choices

---
 eeschema/CMakeLists.txt                      |  1 +
 eeschema/dialogs/dialog_sim_settings.cpp     | 64 ++++++++++++-
 eeschema/dialogs/dialog_sim_settings.h       |  2 +
 eeschema/sim/netlist_exporter_pspice_sim.cpp | 79 ++++++++++++++++
 eeschema/sim/netlist_exporter_pspice_sim.h   | 67 ++++++++++++++
 eeschema/sim/sim_plot_frame.cpp              | 94 ++++----------------
 eeschema/sim/sim_plot_frame.h                |  2 +
 7 files changed, 230 insertions(+), 79 deletions(-)
 create mode 100644 eeschema/sim/netlist_exporter_pspice_sim.cpp
 create mode 100644 eeschema/sim/netlist_exporter_pspice_sim.h

diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 228d2028d6..4014b4f374 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -183,6 +183,7 @@ set( EESCHEMA_SRCS
     sim/sim_plot_panel.cpp
     sim/spice_simulator.cpp
     sim/ngspice.cpp
+    sim/netlist_exporter_pspice_sim.cpp
     dialogs/dialog_sim_settings.cpp
     dialogs/dialog_sim_settings_base.cpp
 
diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
index 58ca543b13..c084cd3120 100644
--- a/eeschema/dialogs/dialog_sim_settings.cpp
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "dialog_sim_settings.h"
-#include <wx/log.h>
+#include <sim/netlist_exporter_pspice_sim.h>
 
 /// @todo ngspice offers more types of analysis,
 //so there are a few tabs missing (e.g. pole-zero, distortion, sensitivity)
@@ -167,6 +167,68 @@ bool DIALOG_SIM_SETTINGS::TransferDataToWindow()
 }
 
 
+int DIALOG_SIM_SETTINGS::ShowModal()
+{
+    // Fill out comboboxes that allow to select nets
+    // Map comoboxes to their current values
+    std::map<wxComboBox*, wxString> cmbNet = {
+        { m_noiseMeas, m_noiseMeas->GetStringSelection() },
+        { m_noiseRef, m_noiseRef->GetStringSelection() }
+    };
+
+    for( auto c : cmbNet )
+        c.first->Clear();
+
+    for( auto net : m_exporter->GetNetIndexMap() )
+    {
+        for( auto c : cmbNet )
+            c.first->Append( net.first );
+    }
+
+    // Try to restore the previous selection, if possible
+    for( auto c : cmbNet )
+    {
+        int idx = c.first->FindString( c.second );
+
+        if( idx != wxNOT_FOUND )
+                c.first->SetSelection( idx );
+    }
+
+
+    // Fill out comboboxes that allow to select power sources
+    std::map<wxComboBox*, wxString> cmbSrc = {
+        { m_dcSource1, m_dcSource1->GetStringSelection() },
+        { m_dcSource2, m_dcSource2->GetStringSelection() },
+        { m_noiseSrc, m_noiseSrc->GetStringSelection() },
+    };
+
+    for( auto c : cmbSrc )
+        c.first->Clear();
+
+    for( auto item : m_exporter->GetSpiceItems() )
+    {
+        if( item.m_primitive == 'V' )
+        {
+            for( auto c : cmbSrc )
+                c.first->Append( item.m_refName );
+        }
+    }
+
+    // Try to restore the previous selection, if possible
+    for( auto c : cmbSrc )
+    {
+        int idx = c.first->FindString( c.second );
+
+        if( idx != wxNOT_FOUND )
+                c.first->SetSelection( idx );
+    }
+
+    return DIALOG_SIM_SETTINGS_BASE::ShowModal();
+}
+
+
 void DIALOG_SIM_SETTINGS::onLoadDirectives( wxCommandEvent& event )
 {
+    if( m_exporter )
+        m_customTxt->SetValue( m_exporter->GetSheetSimCommand() );
 }
diff --git a/eeschema/dialogs/dialog_sim_settings.h b/eeschema/dialogs/dialog_sim_settings.h
index 065d2e138b..0ee2101446 100644
--- a/eeschema/dialogs/dialog_sim_settings.h
+++ b/eeschema/dialogs/dialog_sim_settings.h
@@ -48,6 +48,8 @@ public:
     bool TransferDataFromWindow() override;
     bool TransferDataToWindow() override;
 
+    int ShowModal() override;
+
 private:
     enum SCALE_TYPE
     {
diff --git a/eeschema/sim/netlist_exporter_pspice_sim.cpp b/eeschema/sim/netlist_exporter_pspice_sim.cpp
new file mode 100644
index 0000000000..23c39bba25
--- /dev/null
+++ b/eeschema/sim/netlist_exporter_pspice_sim.cpp
@@ -0,0 +1,79 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "netlist_exporter_pspice_sim.h"
+
+wxString NETLIST_EXPORTER_PSPICE_SIM::GetSheetSimCommand()
+{
+    wxString simCmd;
+
+    UpdateDirectives( NET_ALL_FLAGS );
+
+    for( const auto& dir : GetDirectives() )
+    {
+        if( isSimCommand( dir ) )
+            simCmd += wxString::Format( "%s\r\n", dir );
+    }
+
+    return simCmd;
+}
+
+
+void NETLIST_EXPORTER_PSPICE_SIM::writeDirectives( OUTPUTFORMATTER* aFormatter, unsigned aCtl ) const
+{
+    if( m_simCommand.IsEmpty() )
+    {
+        // Fallback to the default behavior and just write all directives
+        NETLIST_EXPORTER_PSPICE::writeDirectives( aFormatter, aCtl );
+    }
+
+    // Dump all directives, but simulation commands
+    for( const auto& dir : GetDirectives() )
+    {
+        if( !isSimCommand( dir ) )
+            aFormatter->Print( 0, "%s\n", (const char*) dir.c_str() );
+    }
+
+    // Finish with our custom simulation command
+    aFormatter->Print( 0, "%s\n", (const char*) m_simCommand.c_str() );
+}
+
+
+bool NETLIST_EXPORTER_PSPICE_SIM::isSimCommand( const wxString& aCmd )
+{
+    const std::vector<wxString> simCmds = {
+        ".ac", ".dc", ".disto", ".noise", ".op", ".pz", ".sens", ".tf", ".tran", ".pss"
+    };
+
+    wxString lcaseCmd = aCmd.Lower();
+
+    for( const auto& c : simCmds )
+    {
+        if( lcaseCmd.StartsWith( c ) )
+            return true;
+    }
+
+    return false;
+}
+
diff --git a/eeschema/sim/netlist_exporter_pspice_sim.h b/eeschema/sim/netlist_exporter_pspice_sim.h
new file mode 100644
index 0000000000..ae1943e558
--- /dev/null
+++ b/eeschema/sim/netlist_exporter_pspice_sim.h
@@ -0,0 +1,67 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef NETLIST_EXPORTER_PSPICE_SIM_H
+#define NETLIST_EXPORTER_PSPICE_SIM_H
+
+#include <netlist_exporters/netlist_exporter_pspice.h>
+
+/// Special netlist exporter flavor that allows to override simulation commands
+class NETLIST_EXPORTER_PSPICE_SIM : public NETLIST_EXPORTER_PSPICE
+{
+public:
+    NETLIST_EXPORTER_PSPICE_SIM( NETLIST_OBJECT_LIST* aMasterList, PART_LIBS* aLibs,
+            SEARCH_STACK* aPaths = NULL ) :
+        NETLIST_EXPORTER_PSPICE( aMasterList, aLibs, aPaths )
+    {
+    }
+
+    void SetSimCommand( const wxString& aCmd )
+    {
+        m_simCommand = aCmd;
+    }
+
+    const wxString& GetSimCommand() const
+    {
+        return m_simCommand;
+    }
+
+    void ClearSimCommand()
+    {
+        m_simCommand.Clear();
+    }
+
+    wxString GetSheetSimCommand();
+
+protected:
+    void writeDirectives( OUTPUTFORMATTER* aFormatter, unsigned aCtl ) const override;
+
+private:
+    static bool isSimCommand( const wxString& aCmd );
+
+    ///> Overridden simulation command
+    wxString m_simCommand;
+};
+
+#endif /* NETLIST_EXPORTER_PSPICE_SIM_H */
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 69e3445c11..4ca86031e8 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -27,8 +27,7 @@
 #include <eeschema_id.h>
 #include <kiway.h>
 
-#include <netlist_exporter_kicad.h>
-#include <netlist_exporters/netlist_exporter_pspice.h>
+#include "netlist_exporter_pspice_sim.h"
 
 #include "sim_plot_frame.h"
 #include "sim_plot_panel.h"
@@ -74,73 +73,6 @@ private:
 };
 
 
-/// Special netlist exporter flavor that allows to override simulation commands
-class NETLIST_EXPORTER_PSPICE_SIM : public NETLIST_EXPORTER_PSPICE
-{
-public:
-    NETLIST_EXPORTER_PSPICE_SIM( NETLIST_OBJECT_LIST* aMasterList, PART_LIBS* aLibs,
-            SEARCH_STACK* aPaths = NULL ) :
-        NETLIST_EXPORTER_PSPICE( aMasterList, aLibs, aPaths )
-    {
-    }
-
-    void SetSimCommand( const wxString& aCmd )
-    {
-        m_simCommand = aCmd;
-    }
-
-    const wxString& GetSimCommand() const
-    {
-        return m_simCommand;
-    }
-
-    void ClearSimCommand()
-    {
-        m_simCommand.Clear();
-    }
-
-protected:
-    virtual void writeDirectives( OUTPUTFORMATTER* aFormatter, int aCtl ) const
-    {
-        if( m_simCommand.IsEmpty() )
-        {
-            // Fallback to the default behavior
-            NETLIST_EXPORTER_PSPICE::writeDirectives( aFormatter, aCtl );
-        }
-
-        // Dump all directives, but simulation commands
-        for( const auto& dir : GetDirectives() )
-        {
-            if( !isSimCommand( dir ) )
-                aFormatter->Print( 0, "%s\n", (const char*) dir.c_str() );
-        }
-
-        // Finish with our custom simulation command
-        aFormatter->Print( 0, "%s\n", (const char*) m_simCommand.c_str() );
-    }
-
-private:
-    bool isSimCommand( const wxString& aCmd ) const
-    {
-        const std::vector<wxString> simCmds = {
-            ".ac", ".dc", ".disto", ".noise", ".op", ".pz", ".sens", ".tf", ".tran", ".pss"
-        };
-
-        wxString lcaseCmd = aCmd.Lower();
-
-        for( const auto& c : simCmds )
-        {
-            if( lcaseCmd.StartsWith( c ) )
-                return true;
-        }
-
-        return false;
-    }
-
-    wxString m_simCommand;
-};
-
-
 SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     : SIM_PLOT_FRAME_BASE( aParent ), m_settingsDlg( this )
 {
@@ -163,6 +95,8 @@ SIM_PLOT_FRAME::~SIM_PLOT_FRAME()
 
 void SIM_PLOT_FRAME::StartSimulation()
 {
+    STRING_FORMATTER formatter;
+
     m_simConsole->Clear();
 
     // TODO check if there is a valid simulation command
@@ -172,13 +106,9 @@ void SIM_PLOT_FRAME::StartSimulation()
     m_simulator->SetReporter( new SIM_THREAD_REPORTER( this ) );
     m_simulator->Init();
 
-    NETLIST_OBJECT_LIST* net_atoms = m_schematicFrame->BuildNetListBase();
-    STRING_FORMATTER formatter;
-
-    m_exporter.reset( new NETLIST_EXPORTER_PSPICE_SIM( net_atoms,
-                                                        Prj().SchLibs(), Prj().SchSearchS() ) );
+    updateNetlistExporter();
     m_exporter->SetSimCommand( m_simCommand );
-    m_exporter->Format( &formatter, GNL_ALL );
+    m_exporter->Format( &formatter, NET_ALL_FLAGS );
 
     m_simulator->LoadNetlist( formatter.GetString() );
     m_simulator->Run();
@@ -222,6 +152,13 @@ bool SIM_PLOT_FRAME::isSimulationRunning()
 }
 
 
+void SIM_PLOT_FRAME::updateNetlistExporter()
+{
+    m_exporter.reset( new NETLIST_EXPORTER_PSPICE_SIM( m_schematicFrame->BuildNetListBase(),
+        Prj().SchLibs(), Prj().SchSearchS() ) );
+}
+
+
 void SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aName, SIM_PLOT_PANEL* aPanel )
 {
     auto data_y = m_simulator->GetPlot( (const char*) aSpiceName.c_str() );
@@ -415,12 +352,13 @@ void SIM_PLOT_FRAME::onSimulate( wxCommandEvent& event )
 
 void SIM_PLOT_FRAME::onSettings( wxCommandEvent& event )
 {
-    // TODO set exporter
+    updateNetlistExporter();
+    m_exporter->ProcessNetlist( NET_ALL_FLAGS );
+
+    m_settingsDlg.SetNetlistExporter( m_exporter.get() );
 
     if( m_settingsDlg.ShowModal() == wxID_OK )
         m_simCommand = m_settingsDlg.GetSimCommand();
-
-    wxLogDebug( "sim command = %s", m_simCommand );     // TODO remove
 }
 
 
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 80148046bd..cf3f5f08f4 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -64,6 +64,8 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
     private:
         bool isSimulationRunning();
 
+        void updateNetlistExporter();
+
         /**
          * @brief Updates plot in a particular SIM_PLOT_PANEL. If the panel does not contain
          * the plot, it will be added.

From d055692cf39ab1611945b3ca46c3ae41d89b07f6 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:30 +0200
Subject: [PATCH 064/197] Renamed 'Simulate' to 'Simulator' in menu

---
 eeschema/menubar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index b0962d3350..0d9feb2ddb 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -497,7 +497,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
     // Simulator
     AddMenuItem( toolsMenu,
                  ID_SIM_SHOW,
-                 _("Simula&te"), _( "Simulate the circuit" ),
+                 _("Simula&tor"), _( "Simulate the circuit" ),
                  wxNullBitmap );
 
     // Help Menu:

From 3c909e2c32e4c2531790b5afe3f17f25623f657e Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:31 +0200
Subject: [PATCH 065/197] Allow typing zeroes in Simulation settings dialog

---
 eeschema/dialogs/dialog_sim_settings.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
index c084cd3120..ca8c3c67f4 100644
--- a/eeschema/dialogs/dialog_sim_settings.cpp
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -31,8 +31,8 @@
 DIALOG_SIM_SETTINGS::DIALOG_SIM_SETTINGS( wxWindow* aParent )
     : DIALOG_SIM_SETTINGS_BASE( aParent ), m_exporter( nullptr )
 {
-    m_posFloatValidator.SetMin( 0 + std::numeric_limits<double>::epsilon() );
-    m_posFloatValidator.SetPrecision( 3 );
+    m_posFloatValidator.SetMin( 0 );
+    m_posFloatValidator.SetPrecision( 6 );
     m_posIntValidator.SetMin( 1 );
 
     m_acPointsNumber->SetValidator( m_posIntValidator );

From c5227b72799854e83e4ff95c14a0fb1106512ae5 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:31 +0200
Subject: [PATCH 066/197] Fix: use correct node numbers in noise simulation
 directive

---
 eeschema/dialogs/dialog_sim_settings.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
index ca8c3c67f4..79294c6f32 100644
--- a/eeschema/dialogs/dialog_sim_settings.cpp
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -114,15 +114,19 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
     // Noise analysis
     else if( page == m_pgNoise )
     {
+        const NETLIST_EXPORTER_PSPICE::NET_INDEX_MAP& netMap = m_exporter->GetNetIndexMap();
+
         if( m_noiseMeas->GetValue().IsEmpty() || m_noiseSrc->GetValue().IsEmpty() ||
                 m_noisePointsNumber->IsEmpty() || m_noiseFreqStart->IsEmpty() ||
                 m_noiseFreqStop->IsEmpty() )
             return false;
 
-        // TODO missing node number
-        wxString ref = m_noiseRef->GetValue().IsEmpty() ? wxString() : wxString::Format( ", %d", 42 );
+        wxString ref = m_noiseRef->GetValue().IsEmpty() ? wxString()
+            : wxString::Format( ", %d", netMap.at( m_noiseRef->GetValue() ) );
+
         m_simCommand = wxString::Format( ".noise v(%d%s) %s %s %s %s %s",
-            42, ref, m_noiseSrc->GetValue(), scaleToString( m_noiseScale->GetSelection() ),
+            netMap.at( m_noiseMeas->GetValue() ), ref,
+            m_noiseSrc->GetValue(), scaleToString( m_noiseScale->GetSelection() ),
             m_noisePointsNumber->GetValue(), m_noiseFreqStart->GetValue(), m_noiseFreqStop->GetValue() );
     }
 

From 183fb24112893e6bebad767368e75aee216449ac Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:31 +0200
Subject: [PATCH 067/197] Fixed string for transient simulation directive

---
 eeschema/dialogs/dialog_sim_settings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
index 79294c6f32..33c7444d97 100644
--- a/eeschema/dialogs/dialog_sim_settings.cpp
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -144,7 +144,7 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
         if( m_transStep->IsEmpty() || m_transFinal->IsEmpty() )
             return false;
 
-        m_simCommand = wxString::Format( ".trans %s %s %s",
+        m_simCommand = wxString::Format( ".tran %s %s %s",
             m_transStep->GetValue(), m_transFinal->GetValue(), m_transInitial->GetValue() );
     }
 

From 0da13052dd97b89a7cc2f5d72c42625f8f525af2 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:31 +0200
Subject: [PATCH 068/197] SPICE_SIMULATOR interface allows to obtain different
 types of plots (mag, phase, real, imag)

---
 eeschema/sim/ngspice.cpp       | 128 +++++++++++++++++++++++++++++++--
 eeschema/sim/ngspice.h         |   7 +-
 eeschema/sim/spice_simulator.h |  17 +++--
 3 files changed, 135 insertions(+), 17 deletions(-)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index a918ca737d..6529b60bb6 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -62,18 +62,132 @@ void NGSPICE::Init()
 }
 
 
-const vector<double> NGSPICE::GetPlot( const string& aName, int aMaxLen )
+vector<COMPLEX> NGSPICE::GetPlot( const string& aName, int aMaxLen )
 {
-    vector<double> data;
-
+    vector<COMPLEX> data;
     vector_info* vi = m_ngGet_Vec_Info( (char*) aName.c_str() );
 
-    if( vi && vi->v_realdata )
+    if( vi )
     {
-        data.reserve( vi->v_length );
+        int length = aMaxLen < 0 ? vi->v_length : std::min( aMaxLen, vi->v_length );
+        data.reserve( length );
 
-        for( int i = 0; i < vi->v_length; i++ )
-            data.push_back( vi->v_realdata[i] );
+        if( vi->v_realdata )
+        {
+            for( int i = 0; i < length; i++ )
+                data.push_back( COMPLEX( vi->v_realdata[i], 0.0 ) );
+        }
+        else if( vi->v_compdata )
+        {
+            for( int i = 0; i < length; i++ )
+                data.push_back( COMPLEX( vi->v_compdata[i].cx_real, vi->v_compdata[i].cx_imag ) );
+        }
+    }
+
+    return data;
+}
+
+
+vector<double> NGSPICE::GetRealPlot( const string& aName, int aMaxLen )
+{
+    vector<double> data;
+    vector_info* vi = m_ngGet_Vec_Info( (char*) aName.c_str() );
+
+    if( vi )
+    {
+        int length = aMaxLen < 0 ? vi->v_length : std::min( aMaxLen, vi->v_length );
+        data.reserve( length );
+
+        if( vi->v_realdata )
+        {
+            for( int i = 0; i < length; i++ )
+            {
+                data.push_back( vi->v_realdata[i] );
+            }
+        }
+        else if( vi->v_compdata )
+        {
+            for( int i = 0; i < length; i++ )
+            {
+                assert( vi->v_compdata[i].cx_imag == 0.0 );
+                data.push_back( vi->v_compdata[i].cx_real );
+            }
+        }
+    }
+
+    return data;
+}
+
+
+vector<double> NGSPICE::GetImagPlot( const string& aName, int aMaxLen )
+{
+    vector<double> data;
+    vector_info* vi = m_ngGet_Vec_Info( (char*) aName.c_str() );
+
+    if( vi )
+    {
+        int length = aMaxLen < 0 ? vi->v_length : std::min( aMaxLen, vi->v_length );
+        data.reserve( length );
+
+        if( vi->v_compdata )
+        {
+            for( int i = 0; i < length; i++ )
+            {
+                data.push_back( vi->v_compdata[i].cx_imag );
+            }
+        }
+    }
+
+    return data;
+}
+
+
+vector<double> NGSPICE::GetMagPlot( const string& aName, int aMaxLen )
+{
+    vector<double> data;
+    vector_info* vi = m_ngGet_Vec_Info( (char*) aName.c_str() );
+
+    if( vi )
+    {
+        int length = aMaxLen < 0 ? vi->v_length : std::min( aMaxLen, vi->v_length );
+        data.reserve( length );
+
+        if( vi->v_realdata )
+        {
+            for( int i = 0; i < length; i++ )
+                data.push_back( vi->v_realdata[i] );
+        }
+        else if( vi->v_compdata )
+        {
+            for( int i = 0; i < length; i++ )
+                data.push_back( hypot( vi->v_compdata[i].cx_real, vi->v_compdata[i].cx_imag ) );
+        }
+    }
+
+    return data;
+}
+
+
+vector<double> NGSPICE::GetPhasePlot( const string& aName, int aMaxLen )
+{
+    vector<double> data;
+    vector_info* vi = m_ngGet_Vec_Info( (char*) aName.c_str() );
+
+    if( vi )
+    {
+        int length = aMaxLen < 0 ? vi->v_length : std::min( aMaxLen, vi->v_length );
+        data.reserve( length );
+
+        if( vi->v_realdata )
+        {
+            for( int i = 0; i < length; i++ )
+                data.push_back( 0.0 );      // well, that's life
+        }
+        else if( vi->v_compdata )
+        {
+            for( int i = 0; i < length; i++ )
+                data.push_back( atan2( vi->v_compdata[i].cx_imag, vi->v_compdata[i].cx_real ) );
+        }
     }
 
     return data;
diff --git a/eeschema/sim/ngspice.h b/eeschema/sim/ngspice.h
index 7decad324e..2460537aba 100644
--- a/eeschema/sim/ngspice.h
+++ b/eeschema/sim/ngspice.h
@@ -42,7 +42,12 @@ public:
     bool Stop() override;
     bool IsRunning() override;
     bool Command( const std::string& aCmd ) override;
-    const std::vector<double> GetPlot( const std::string& aName, int aMaxLen = -1 ) override;
+
+    std::vector<COMPLEX> GetPlot( const std::string& aName, int aMaxLen = -1 ) override;
+    std::vector<double> GetRealPlot( const std::string& aName, int aMaxLen = -1 ) override;
+    std::vector<double> GetImagPlot( const std::string& aName, int aMaxLen = -1 ) override;
+    std::vector<double> GetMagPlot( const std::string& aName, int aMaxLen = -1 ) override;
+    std::vector<double> GetPhasePlot( const std::string& aName, int aMaxLen = -1 ) override;
 
 private:
     typedef void (*ngSpice_Init)( SendChar*, SendStat*, ControlledExit*,
diff --git a/eeschema/sim/spice_simulator.h b/eeschema/sim/spice_simulator.h
index ead779e3c3..7b12163bd7 100644
--- a/eeschema/sim/spice_simulator.h
+++ b/eeschema/sim/spice_simulator.h
@@ -27,17 +27,11 @@
 
 #include <string>
 #include <vector>
+#include <complex>
 
 class SPICE_REPORTER;
 
-enum SIM_TRACE_TYPE
-{
-    SIM_AC_MAG = 0x1,
-    SIM_AC_PHASE = 0x2,
-    SIM_TR_VOLTAGE = 0x4,
-    SIM_TR_CURRENT = 0x8,
-    SIM_TR_FFT = 0x10
-};
+typedef std::complex<double> COMPLEX;
 
 class SPICE_SIMULATOR
 {
@@ -59,7 +53,12 @@ public:
         m_reporter = aReporter;
     }
 
-    virtual const std::vector<double> GetPlot( const std::string& aName, int aMaxLen = -1 ) = 0;
+    virtual std::vector<COMPLEX> GetPlot( const std::string& aName, int aMaxLen = -1 ) = 0;
+    virtual std::vector<double> GetRealPlot( const std::string& aName, int aMaxLen = -1 ) = 0;
+    virtual std::vector<double> GetImagPlot( const std::string& aName, int aMaxLen = -1 ) = 0;
+    virtual std::vector<double> GetMagPlot( const std::string& aName, int aMaxLen = -1 ) = 0;
+    virtual std::vector<double> GetPhasePlot( const std::string& aName, int aMaxLen = -1 ) = 0;
+
 
 protected:
     SPICE_REPORTER* m_reporter;

From ee1adcd92c417e96dee620bde424589464565204 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:32 +0200
Subject: [PATCH 069/197] Fix for noise directive generated by Simulation
 settings dialog

---
 eeschema/dialogs/dialog_sim_settings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
index 33c7444d97..8ac1b18654 100644
--- a/eeschema/dialogs/dialog_sim_settings.cpp
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -124,7 +124,7 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
         wxString ref = m_noiseRef->GetValue().IsEmpty() ? wxString()
             : wxString::Format( ", %d", netMap.at( m_noiseRef->GetValue() ) );
 
-        m_simCommand = wxString::Format( ".noise v(%d%s) %s %s %s %s %s",
+        m_simCommand = wxString::Format( ".noise v(%d%s) v%s %s %s %s %s",
             netMap.at( m_noiseMeas->GetValue() ), ref,
             m_noiseSrc->GetValue(), scaleToString( m_noiseScale->GetSelection() ),
             m_noisePointsNumber->GetValue(), m_noiseFreqStart->GetValue(), m_noiseFreqStop->GetValue() );

From ab8c88f10befa1ba9ad81da27a3de8f26c506298 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:34 +0200
Subject: [PATCH 070/197] SIM_TYPE enum

---
 eeschema/sim/netlist_exporter_pspice_sim.cpp | 49 +++++++++++---------
 eeschema/sim/netlist_exporter_pspice_sim.h   | 11 ++++-
 eeschema/sim/sim_types.h                     | 34 ++++++++++++++
 3 files changed, 72 insertions(+), 22 deletions(-)
 create mode 100644 eeschema/sim/sim_types.h

diff --git a/eeschema/sim/netlist_exporter_pspice_sim.cpp b/eeschema/sim/netlist_exporter_pspice_sim.cpp
index 23c39bba25..15071ac573 100644
--- a/eeschema/sim/netlist_exporter_pspice_sim.cpp
+++ b/eeschema/sim/netlist_exporter_pspice_sim.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "netlist_exporter_pspice_sim.h"
+#include "sim_types.h"
 
 wxString NETLIST_EXPORTER_PSPICE_SIM::GetSheetSimCommand()
 {
@@ -32,7 +33,7 @@ wxString NETLIST_EXPORTER_PSPICE_SIM::GetSheetSimCommand()
 
     for( const auto& dir : GetDirectives() )
     {
-        if( isSimCommand( dir ) )
+        if( IsSimCommand( dir ) )
             simCmd += wxString::Format( "%s\r\n", dir );
     }
 
@@ -40,6 +41,31 @@ wxString NETLIST_EXPORTER_PSPICE_SIM::GetSheetSimCommand()
 }
 
 
+SIM_TYPE NETLIST_EXPORTER_PSPICE_SIM::GetSimType()
+{
+    return CommandToSimType( m_simCommand.IsEmpty() ? GetSheetSimCommand() : m_simCommand );
+}
+
+
+SIM_TYPE NETLIST_EXPORTER_PSPICE_SIM::CommandToSimType( const wxString& aCmd )
+{
+    const std::map<wxString, SIM_TYPE> simCmds = {
+        { ".ac", ST_AC }, { ".dc", ST_DC }, { ".disto", ST_DISTORTION }, { ".noise", ST_NOISE },
+        { ".op", ST_OP }, { ".pz", ST_POLE_ZERO }, { ".sens", ST_SENSITIVITY }, { ".tf", ST_TRANS_FUNC },
+        { ".tran", ST_TRANSIENT }
+    };
+    wxString lcaseCmd = aCmd.Lower();
+
+    for( const auto& c : simCmds )
+    {
+        if( lcaseCmd.StartsWith( c.first ) )
+            return c.second;
+    }
+
+    return ST_UNKNOWN;
+}
+
+
 void NETLIST_EXPORTER_PSPICE_SIM::writeDirectives( OUTPUTFORMATTER* aFormatter, unsigned aCtl ) const
 {
     if( m_simCommand.IsEmpty() )
@@ -51,29 +77,10 @@ void NETLIST_EXPORTER_PSPICE_SIM::writeDirectives( OUTPUTFORMATTER* aFormatter,
     // Dump all directives, but simulation commands
     for( const auto& dir : GetDirectives() )
     {
-        if( !isSimCommand( dir ) )
+        if( !IsSimCommand( dir ) )
             aFormatter->Print( 0, "%s\n", (const char*) dir.c_str() );
     }
 
     // Finish with our custom simulation command
     aFormatter->Print( 0, "%s\n", (const char*) m_simCommand.c_str() );
 }
-
-
-bool NETLIST_EXPORTER_PSPICE_SIM::isSimCommand( const wxString& aCmd )
-{
-    const std::vector<wxString> simCmds = {
-        ".ac", ".dc", ".disto", ".noise", ".op", ".pz", ".sens", ".tf", ".tran", ".pss"
-    };
-
-    wxString lcaseCmd = aCmd.Lower();
-
-    for( const auto& c : simCmds )
-    {
-        if( lcaseCmd.StartsWith( c ) )
-            return true;
-    }
-
-    return false;
-}
-
diff --git a/eeschema/sim/netlist_exporter_pspice_sim.h b/eeschema/sim/netlist_exporter_pspice_sim.h
index ae1943e558..d939f56858 100644
--- a/eeschema/sim/netlist_exporter_pspice_sim.h
+++ b/eeschema/sim/netlist_exporter_pspice_sim.h
@@ -26,6 +26,7 @@
 #define NETLIST_EXPORTER_PSPICE_SIM_H
 
 #include <netlist_exporters/netlist_exporter_pspice.h>
+#include "sim_types.h"
 
 /// Special netlist exporter flavor that allows to override simulation commands
 class NETLIST_EXPORTER_PSPICE_SIM : public NETLIST_EXPORTER_PSPICE
@@ -52,13 +53,21 @@ public:
         m_simCommand.Clear();
     }
 
+    SIM_TYPE GetSimType();
+
     wxString GetSheetSimCommand();
 
+    static bool IsSimCommand( const wxString& aCmd )
+    {
+        return CommandToSimType( aCmd ) != ST_UNKNOWN;
+    }
+
+    static SIM_TYPE CommandToSimType( const wxString& aCmd );
+
 protected:
     void writeDirectives( OUTPUTFORMATTER* aFormatter, unsigned aCtl ) const override;
 
 private:
-    static bool isSimCommand( const wxString& aCmd );
 
     ///> Overridden simulation command
     wxString m_simCommand;
diff --git a/eeschema/sim/sim_types.h b/eeschema/sim/sim_types.h
new file mode 100644
index 0000000000..82291be205
--- /dev/null
+++ b/eeschema/sim/sim_types.h
@@ -0,0 +1,34 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef SIM_TYPES_H
+#define SIM_TYPES_H
+
+///> Possible simulation types
+enum SIM_TYPE {
+    ST_UNKNOWN, ST_AC, ST_DC, ST_DISTORTION, ST_NOISE, ST_OP,
+    ST_POLE_ZERO, ST_SENSITIVITY, ST_TRANS_FUNC, ST_TRANSIENT
+};
+
+#endif /* SIM_TYPES_H */

From fe92630f1695a038e991bfe74a2fd5d4b0cac523 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:34 +0200
Subject: [PATCH 071/197] Fixes for DC sweep directive generated by Simulator
 settings dialog

---
 eeschema/dialogs/dialog_sim_settings.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
index 8ac1b18654..4f6b81441b 100644
--- a/eeschema/dialogs/dialog_sim_settings.cpp
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -91,7 +91,7 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
                     m_dcStop1->IsEmpty() || m_dcIncr1->IsEmpty() )
                 return false;
 
-            simCmd += wxString::Format( "%s %s %s %s",
+            simCmd += wxString::Format( "v%s %s %s %s",
                m_dcSource1->GetValue(), m_dcStart1->GetValue(),
                m_dcStop1->GetValue(), m_dcIncr1->GetValue() );
         }
@@ -102,7 +102,7 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
                     m_dcStop2->IsEmpty() || m_dcIncr2->IsEmpty() )
                 return false;
 
-            simCmd += wxString::Format( "%s %s %s %s",
+            simCmd += wxString::Format( "v%s %s %s %s",
                m_dcSource2->GetValue(), m_dcStart2->GetValue(),
                m_dcStop2->GetValue(), m_dcIncr2->GetValue() );
         }

From e90fcaa6d9a6ca0eeeeac968df7ec6d946d800ec Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:35 +0200
Subject: [PATCH 072/197] New type of simulation opens a new plot

---
 eeschema/sim/sim_plot_frame.cpp | 125 ++++++++++++++++++++++++++++----
 eeschema/sim/sim_plot_frame.h   |  10 +--
 eeschema/sim/sim_plot_panel.cpp |  72 ++++++++++++++++--
 eeschema/sim/sim_plot_panel.h   |  33 +++++++--
 4 files changed, 203 insertions(+), 37 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 4ca86031e8..a9bcafc64e 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -83,8 +83,6 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     Connect( EVT_SIM_STARTED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimStarted ), NULL, this );
     Connect( EVT_SIM_FINISHED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
     Connect( EVT_SIM_CURSOR_UPDATE, wxCommandEventHandler( SIM_PLOT_FRAME::onCursorUpdate ), NULL, this );
-
-    NewPlotPanel();
 }
 
 
@@ -121,9 +119,9 @@ void SIM_PLOT_FRAME::StopSimulation()
 }
 
 
-void SIM_PLOT_FRAME::NewPlotPanel()
+void SIM_PLOT_FRAME::NewPlotPanel( SIM_TYPE aSimType )
 {
-    SIM_PLOT_PANEL* plot = new SIM_PLOT_PANEL( m_plotNotebook, wxID_ANY );
+    SIM_PLOT_PANEL* plot = new SIM_PLOT_PANEL( aSimType, m_plotNotebook, wxID_ANY );
 
     m_plotNotebook->AddPage( plot,
             wxString::Format( wxT( "Plot%lu" ), m_plotNotebook->GetPageCount() + 1 ), true );
@@ -140,6 +138,7 @@ void SIM_PLOT_FRAME::AddVoltagePlot( const wxString& aNetName )
     }
 }
 
+
 SIM_PLOT_PANEL* SIM_PLOT_FRAME::CurrentPlot() const
 {
     return static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetCurrentPage() );
@@ -161,13 +160,71 @@ void SIM_PLOT_FRAME::updateNetlistExporter()
 
 void SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aName, SIM_PLOT_PANEL* aPanel )
 {
-    auto data_y = m_simulator->GetPlot( (const char*) aSpiceName.c_str() );
-    auto data_t = m_simulator->GetPlot( "time" );
+    // First, handle the x axis
+    wxString xAxisName;
+    SIM_TYPE simType = m_exporter->GetSimType();
 
-    if( data_y.empty() || data_t.empty() )
+    if( !SIM_PLOT_PANEL::IsPlottable( simType ) )
+    {
+        // There is no plot to be shown
+        m_simulator->Command( wxString::Format( "print %s", aSpiceName ).ToStdString() );
+        return;
+    }
+
+    switch( simType )
+    {
+        /// @todo x axis names should be moved to simulator iface, so they are not hardcoded for ngspice
+        case ST_AC:
+        case ST_NOISE:
+            xAxisName = "frequency";
+            break;
+
+        case ST_DC:
+            xAxisName = "v-sweep";
+            break;
+
+        case ST_TRANSIENT:
+            xAxisName = "time";
+            break;
+
+        case ST_OP:
+            break;
+
+        default:
+            break;
+    }
+
+    auto data_x = m_simulator->GetMagPlot( (const char*) xAxisName.c_str() );
+    int size = data_x.size();
+
+    if( data_x.empty() )
         return;
 
-    aPanel->AddTrace( aSpiceName, aName, data_t.size(), data_t.data(), data_y.data(), 0 );
+    // Now, Y axis data
+    switch( m_exporter->GetSimType() )
+    {
+        /// @todo x axis names should be moved to simulator iface
+        case ST_AC:
+        {
+            auto data_mag = m_simulator->GetMagPlot( (const char*) aSpiceName.c_str() );
+            auto data_phase = m_simulator->GetPhasePlot( (const char*) aSpiceName.c_str() );
+            aPanel->AddTrace( aSpiceName, aName + " (mag)", size, data_x.data(), data_mag.data(), 0 );
+            aPanel->AddTrace( aSpiceName, aName + " (phase)", size, data_x.data(), data_phase.data(), 0 );
+        }
+        break;
+
+        case ST_NOISE:
+        case ST_DC:
+        case ST_TRANSIENT:
+        {
+            auto data_y = m_simulator->GetMagPlot( (const char*) aSpiceName.c_str() );
+            aPanel->AddTrace( aSpiceName, aName, size, data_x.data(), data_y.data(), 0 );
+        }
+        break;
+
+        default:
+            return;
+    }
 }
 
 
@@ -186,10 +243,22 @@ int SIM_PLOT_FRAME::getNodeNumber( const wxString& aNetName )
 }
 
 
+void SIM_PLOT_FRAME::menuNewPlot( wxCommandEvent& aEvent )
+{
+    if( m_exporter )
+    {
+        SIM_TYPE type = m_exporter->GetSimType();
+
+        if( SIM_PLOT_PANEL::IsPlottable( type ) )
+            NewPlotPanel( type );
+    }
+}
+
+
 void SIM_PLOT_FRAME::menuSaveImage( wxCommandEvent& event )
 {
     wxFileDialog saveDlg( this, wxT( "Save plot as image" ), "", "",
-                "PNG file (*.png)|*.png", wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+                "PNG file (*.png)|*.png", wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
 
     if( saveDlg.ShowModal() == wxID_CANCEL )
         return;
@@ -203,7 +272,7 @@ void SIM_PLOT_FRAME::menuSaveCsv( wxCommandEvent& event )
     const wxChar SEPARATOR = ';';
 
     wxFileDialog saveDlg( this, wxT( "Save plot data" ), "", "",
-                "CSV file (*.csv)|*.csv", wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+                "CSV file (*.csv)|*.csv", wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
 
     if( saveDlg.ShowModal() == wxID_CANCEL )
         return;
@@ -308,6 +377,14 @@ void SIM_PLOT_FRAME::onSignalDblClick( wxCommandEvent& event )
 {
     int idx = m_signals->GetSelection();
     SIM_PLOT_PANEL* plot = CurrentPlot();
+    SIM_TYPE simType = m_exporter->GetSimType();
+
+    // Create a new plot if the current one displays a different type
+    if( SIM_PLOT_PANEL::IsPlottable( simType ) && ( plot == nullptr || plot->GetType() != simType ) )
+    {
+        NewPlotPanel( simType );
+        plot = CurrentPlot();
+    }
 
     if( idx != wxNOT_FOUND )
     {
@@ -388,7 +465,7 @@ void SIM_PLOT_FRAME::onCursorUpdate( wxCommandEvent& event )
 
     const long SIGNAL_COL = m_cursors->AppendColumn( wxT( "Signal" ), wxLIST_FORMAT_LEFT, size.x / 2 );
     const long X_COL = m_cursors->AppendColumn( CurrentPlot()->GetLabelX(), wxLIST_FORMAT_LEFT, size.x / 4 );
-    const long Y_COL = m_cursors->AppendColumn( CurrentPlot()->GetLabelY(), wxLIST_FORMAT_LEFT, size.x / 4 );
+    const long Y_COL = m_cursors->AppendColumn( CurrentPlot()->GetLabelY1(), wxLIST_FORMAT_LEFT, size.x / 4 );
 
     // Update cursor values
     for( const auto& trace : CurrentPlot()->GetTraces() )
@@ -416,6 +493,8 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
     m_simulateBtn->SetLabel( wxT( "Simulate" ) );
     SetCursor( wxCURSOR_ARROW );
 
+    SIM_TYPE simType = m_exporter->GetSimType();
+
     // Fill the signals listbox
     m_signals->Clear();
 
@@ -426,12 +505,28 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
     }
 
     // If there are any signals plotted, update them
-    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
+    if( SIM_PLOT_PANEL::IsPlottable( simType ) )
+    {
+        SIM_PLOT_PANEL* plotPanel = CurrentPlot();
 
-    for( const auto& trace : plotPanel->GetTraces() )
-        updatePlot( trace.second->GetSpiceName(), trace.second->GetName(), plotPanel );
+        if( plotPanel == nullptr )
+            return;
 
-    plotPanel->UpdateAll();
+        for( const auto& trace : plotPanel->GetTraces() )
+            updatePlot( trace.second->GetSpiceName(), trace.second->GetName(), plotPanel );
+
+        plotPanel->UpdateAll();
+    }
+    else
+    {
+        /// @todo do not make it hardcoded for ngspice
+        for( const auto& net : m_exporter->GetNetIndexMap() )
+        {
+            int node = net.second;
+            if( node > 0 )
+                m_simulator->Command( wxString::Format( "print v(%d)", node ).ToStdString() );
+        }
+    }
 }
 
 
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index cf3f5f08f4..0c12db8562 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -30,6 +30,7 @@
 @file Subclass of SIM_PLOT_FRAME_BASE, which is generated by wxFormBuilder. */
 
 #include "sim_plot_frame_base.h"
+#include "sim_types.h"
 #include "kiway_player.h"
 #include <netlist_exporters/netlist_exporter_pspice.h>
 #include <dialogs/dialog_sim_settings.h>
@@ -56,7 +57,7 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void StartSimulation();
         void StopSimulation();
 
-        void NewPlotPanel();
+        void NewPlotPanel( SIM_TYPE aSimType );
         void AddVoltagePlot( const wxString& aNetName );
 
         SIM_PLOT_PANEL* CurrentPlot() const;
@@ -84,17 +85,13 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         int getNodeNumber( const wxString& aNetName );
 
         // Menu handlers
-        void menuNewPlot( wxCommandEvent& aEvent ) override
-        {
-            NewPlotPanel();
-        }
+        void menuNewPlot( wxCommandEvent& aEvent ) override;
 
         void menuExit( wxCommandEvent& event ) override
         {
             Close();
         }
 
-        // Event handlers
         void menuSaveImage( wxCommandEvent& event ) override;
         void menuSaveCsv( wxCommandEvent& event ) override;
         void menuZoomIn( wxCommandEvent& event ) override;
@@ -107,6 +104,7 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void menuShowCoords( wxCommandEvent& event ) override;
         void menuShowCoordsUpdate( wxUpdateUIEvent& event ) override;
 
+        // Event handlers
         void onPlotChanged( wxNotebookEvent& event ) override;
 
         void onSignalDblClick( wxCommandEvent& event ) override;
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 61a6fe1454..43a3dacb97 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -95,17 +95,58 @@ void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
 }
 
 
-SIM_PLOT_PANEL::SIM_PLOT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint& pos,
+SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id, const wxPoint& pos,
                 const wxSize& size, long style, const wxString& name )
-    : mpWindow( parent, id, pos, size, style ), m_colorIdx( 0 )
+    : mpWindow( parent, id, pos, size, style ), m_colorIdx( 0 ),
+        m_axis_x( nullptr ), m_axis_y1( nullptr ), m_axis_y2( nullptr ), m_type( aType )
 {
-    m_axis_x = new mpScaleX( wxT( "T [s]" ) );
-    m_axis_x->SetTicks( false );
-    AddLayer( m_axis_x );
+    SetMargins( 10, 10, 10, 10 );
 
-    m_axis_y = new mpScaleY( wxT( "U [V]" ) );
-    m_axis_y->SetTicks( false );
-    AddLayer( m_axis_y );
+    switch( m_type )
+    {
+        case ST_AC:
+            m_axis_x = new mpScaleX( wxT( "frequency [Hz]" ), mpALIGN_BORDER_BOTTOM );
+            m_axis_y1 = new mpScaleY( wxT( "magnitude [V]" ), mpALIGN_BORDER_LEFT );
+            m_axis_y2 = new mpScaleY( wxT( "phase [rad]" ), mpALIGN_BORDER_RIGHT );
+            break;
+
+        case ST_DC:
+            m_axis_x = new mpScaleX( wxT( "voltage [V]" ), mpALIGN_BORDER_BOTTOM );
+            m_axis_y1 = new mpScaleY( wxT( "voltage [V]" ), mpALIGN_BORDER_LEFT );
+            break;
+
+        case ST_NOISE:
+            m_axis_x = new mpScaleX( wxT( "frequency [Hz]" ), mpALIGN_BORDER_BOTTOM );
+            m_axis_y1 = new mpScaleY( wxT( "noise [(V or A)^2/Hz]" ), mpALIGN_BORDER_LEFT );
+            break;
+
+        case ST_TRANSIENT:
+            m_axis_x = new mpScaleX( wxT( "time [s]" ), mpALIGN_BORDER_BOTTOM );
+            m_axis_y1 = new mpScaleY( wxT( "voltage [V]" ), mpALIGN_BORDER_LEFT );
+            break;
+
+        default:
+            // suppress warnings
+            break;
+    }
+
+    if( m_axis_x )
+    {
+        m_axis_x->SetTicks( false );
+        AddLayer( m_axis_x );
+    }
+
+    if( m_axis_y1 )
+    {
+        m_axis_y1->SetTicks( false );
+        AddLayer( m_axis_y1 );
+    }
+
+    if( m_axis_y2 )
+    {
+        m_axis_y2->SetTicks( false );
+        AddLayer( m_axis_y2 );
+    }
 
     m_coords = new mpInfoCoords( wxRect( 0, 0, 100, 40 ), wxWHITE_BRUSH );
     AddLayer( m_coords );
@@ -123,6 +164,21 @@ SIM_PLOT_PANEL::~SIM_PLOT_PANEL()
 }
 
 
+bool SIM_PLOT_PANEL::IsPlottable( SIM_TYPE aSimType )
+{
+    switch( aSimType )
+    {
+        case ST_AC:
+        case ST_DC:
+        case ST_TRANSIENT:
+            return true;
+
+        default:
+            return false;
+    }
+}
+
+
 bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName, int aPoints,
                                 const double* aT, const double* aY, int aFlags )
 {
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 9ba09a32c4..1d87471386 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -28,6 +28,7 @@
 
 #include <widgets/mathplot.h>
 #include <map>
+#include "sim_types.h"
 
 class TRACE;
 
@@ -143,19 +144,31 @@ private:
 class SIM_PLOT_PANEL : public mpWindow
 {
 public:
-    SIM_PLOT_PANEL( wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition,
+    SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxPanelNameStr );
 
     ~SIM_PLOT_PANEL();
 
-    const wxString& GetLabelX() const
+    SIM_TYPE GetType() const
     {
-        return m_axis_x->GetName();
+        return m_type;
     }
 
-    const wxString& GetLabelY() const
+    static bool IsPlottable( SIM_TYPE aSimType );
+
+    wxString GetLabelX() const
     {
-        return m_axis_y->GetName();
+        return m_axis_x ? m_axis_x->GetName() : "";
+    }
+
+    wxString GetLabelY1() const
+    {
+        return m_axis_y1 ? m_axis_y1->GetName() : "";
+    }
+
+    wxString GetLabelY2() const
+    {
+        return m_axis_y2 ? m_axis_y2->GetName() : "";
     }
 
     bool AddTrace( const wxString& aSpiceName, const wxString& aName, int aPoints,
@@ -185,13 +198,14 @@ public:
     void ShowGrid( bool aEnable )
     {
         m_axis_x->SetTicks( !aEnable );
-        m_axis_y->SetTicks( !aEnable );
+        m_axis_y1->SetTicks( !aEnable );
+        m_axis_y2->SetTicks( !aEnable );
         UpdateAll();
     }
 
     bool IsGridShown() const
     {
-        assert( m_axis_x->GetTicks() == m_axis_y->GetTicks() );
+        assert( m_axis_x->GetTicks() == m_axis_y1->GetTicks() );
         return !m_axis_x->GetTicks();
     }
 
@@ -230,11 +244,14 @@ private:
     std::map<wxString, TRACE*> m_traces;
 
     mpScaleX* m_axis_x;
-    mpScaleY* m_axis_y;
+    mpScaleY* m_axis_y1;
+    mpScaleY* m_axis_y2;
     mpInfoLegend* m_legend;
     mpInfoCoords* m_coords;
 
     std::vector<mpLayer*> m_topLevel;
+
+    const SIM_TYPE m_type;
 };
 
 wxDECLARE_EVENT( EVT_SIM_CURSOR_UPDATE, wxCommandEvent );

From 90b6112c5de02b33b1545ab5ff76dd60a9381ee3 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:35 +0200
Subject: [PATCH 073/197] Rearranged SIM_PLOT_FRAME, changed console log from
 wxRichTextCtrl to wxTextCtrl

---
 eeschema/sim/sim_plot_frame.cpp      |   6 +-
 eeschema/sim/sim_plot_frame_base.cpp |  18 +-
 eeschema/sim/sim_plot_frame_base.fbp | 372 ++++++++++++++-------------
 eeschema/sim/sim_plot_frame_base.h   |   6 +-
 4 files changed, 206 insertions(+), 196 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index a9bcafc64e..77c2a962ed 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -532,9 +532,9 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
 
 void SIM_PLOT_FRAME::onSimReport( wxCommandEvent& aEvent )
 {
-    m_simConsole->AppendText( aEvent.GetString() );
-    m_simConsole->Newline();
-    m_simConsole->MoveEnd();        /// @todo does not work..
+    std::cout << aEvent.GetString() << std::endl;
+    m_simConsole->AppendText( aEvent.GetString() + "\n" );
+    m_simConsole->SetInsertionPointEnd();
 }
 
 
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index 35414efe3a..aed0f5f690 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -84,11 +84,22 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	wxBoxSizer* bSizer5;
 	bSizer5 = new wxBoxSizer( wxHORIZONTAL );
 	
+	wxBoxSizer* bSizer51;
+	bSizer51 = new wxBoxSizer( wxVERTICAL );
+	
 	m_plotNotebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	m_plotNotebook->SetMinSize( wxSize( 400,-1 ) );
 	
 	
-	bSizer5->Add( m_plotNotebook, 6, wxEXPAND | wxALL, 5 );
+	bSizer51->Add( m_plotNotebook, 3, wxEXPAND | wxALL, 5 );
+	
+	m_simConsole = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
+	m_simConsole->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	
+	bSizer51->Add( m_simConsole, 1, wxALL|wxEXPAND, 5 );
+	
+	
+	bSizer5->Add( bSizer51, 5, wxEXPAND, 5 );
 	
 	wxBoxSizer* bSizer7;
 	bSizer7 = new wxBoxSizer( wxVERTICAL );
@@ -131,11 +142,6 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	
 	bSizer1->Add( bSizer5, 3, wxEXPAND, 5 );
 	
-	m_simConsole = new wxRichTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS );
-	m_simConsole->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-	
-	bSizer1->Add( m_simConsole, 1, wxEXPAND | wxALL, 5 );
-	
 	
 	this->SetSizer( bSizer1 );
 	this->Layout();
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index b392f8e370..be23240983 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -354,95 +354,197 @@
                         <property name="name">bSizer5</property>
                         <property name="orient">wxHORIZONTAL</property>
                         <property name="permission">none</property>
-                        <object class="sizeritem" expanded="0">
+                        <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxEXPAND | wxALL</property>
-                            <property name="proportion">6</property>
-                            <object class="wxNotebook" expanded="0">
-                                <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_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="bitmapsize"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</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="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">400,-1</property>
-                                <property name="moveable">1</property>
-                                <property name="name">m_plotNotebook</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="show">1</property>
-                                <property name="size"></property>
-                                <property name="style"></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"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnNotebookPageChanged">onPlotChanged</event>
-                                <event name="OnNotebookPageChanging"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
+                            <property name="flag">wxEXPAND</property>
+                            <property name="proportion">5</property>
+                            <object class="wxBoxSizer" expanded="1">
+                                <property name="minimum_size"></property>
+                                <property name="name">bSizer51</property>
+                                <property name="orient">wxVERTICAL</property>
+                                <property name="permission">none</property>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxEXPAND | wxALL</property>
+                                    <property name="proportion">3</property>
+                                    <object class="wxNotebook" expanded="0">
+                                        <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_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="bitmapsize"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</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="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">400,-1</property>
+                                        <property name="moveable">1</property>
+                                        <property name="name">m_plotNotebook</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style"></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"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnNotebookPageChanged">onPlotChanged</event>
+                                        <event name="OnNotebookPageChanging"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALL|wxEXPAND</property>
+                                    <property name="proportion">1</property>
+                                    <object class="wxTextCtrl" expanded="0">
+                                        <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_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</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="fg"></property>
+                                        <property name="floatable">1</property>
+                                        <property name="font">,90,90,-1,76,0</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="maxlength"></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">m_simConsole</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style">wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY</property>
+                                        <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="value"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnText"></event>
+                                        <event name="OnTextEnter"></event>
+                                        <event name="OnTextMaxLen"></event>
+                                        <event name="OnTextURL"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </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="wxBoxSizer" expanded="1">
+                            <object class="wxBoxSizer" expanded="0">
                                 <property name="minimum_size"></property>
                                 <property name="name">bSizer7</property>
                                 <property name="orient">wxVERTICAL</property>
@@ -806,11 +908,11 @@
                                         <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
                                     <property name="flag"></property>
                                     <property name="proportion">0</property>
-                                    <object class="wxBoxSizer" expanded="1">
+                                    <object class="wxBoxSizer" expanded="0">
                                         <property name="minimum_size"></property>
                                         <property name="name">bSizer4</property>
                                         <property name="orient">wxHORIZONTAL</property>
@@ -903,11 +1005,11 @@
                                                 <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
-                                        <object class="sizeritem" expanded="1">
+                                        <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALL</property>
                                             <property name="proportion">1</property>
-                                            <object class="wxButton" expanded="1">
+                                            <object class="wxButton" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
@@ -1173,104 +1275,6 @@
                         </object>
                     </object>
                 </object>
-                <object class="sizeritem" expanded="0">
-                    <property name="border">5</property>
-                    <property name="flag">wxEXPAND | wxALL</property>
-                    <property name="proportion">1</property>
-                    <object class="wxRichTextCtrl" expanded="0">
-                        <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_name"></property>
-                        <property name="aui_position"></property>
-                        <property name="aui_row"></property>
-                        <property name="best_size"></property>
-                        <property name="bg"></property>
-                        <property name="caption"></property>
-                        <property name="caption_visible">1</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="fg"></property>
-                        <property name="floatable">1</property>
-                        <property name="font">,90,90,-1,76,0</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">m_simConsole</property>
-                        <property name="pane_border">1</property>
-                        <property name="pane_position"></property>
-                        <property name="pane_size"></property>
-                        <property name="permission">protected</property>
-                        <property name="pin_button">1</property>
-                        <property name="pos"></property>
-                        <property name="resize">Resizable</property>
-                        <property name="show">1</property>
-                        <property name="size"></property>
-                        <property name="style">wxTE_READONLY</property>
-                        <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">wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS</property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRichTextCharacter"></event>
-                        <event name="OnRichTextContentDeleted"></event>
-                        <event name="OnRichTextContentInserted"></event>
-                        <event name="OnRichTextDelete"></event>
-                        <event name="OnRichTextReturn"></event>
-                        <event name="OnRichTextStyleChanged"></event>
-                        <event name="OnRichTextStyleSheetChanged"></event>
-                        <event name="OnRichTextStyleSheetReplaced"></event>
-                        <event name="OnRichTextStyleSheetReplacing"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnText"></event>
-                        <event name="OnTextEnter"></event>
-                        <event name="OnTextMaxLen"></event>
-                        <event name="OnTextURL"></event>
-                        <event name="OnUpdateUI"></event>
-                    </object>
-                </object>
             </object>
         </object>
     </object>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index 50bf654e6a..1032993d93 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -24,12 +24,12 @@ class KIWAY_PLAYER;
 #include <wx/colour.h>
 #include <wx/settings.h>
 #include <wx/notebook.h>
+#include <wx/textctrl.h>
+#include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/listbox.h>
 #include <wx/listctrl.h>
 #include <wx/button.h>
-#include <wx/sizer.h>
-#include <wx/richtext/richtextctrl.h>
 #include <wx/frame.h>
 
 ///////////////////////////////////////////////////////////////////////////
@@ -47,6 +47,7 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxMenu* m_fileMenu;
 		wxMenu* m_viewMenu;
 		wxNotebook* m_plotNotebook;
+		wxTextCtrl* m_simConsole;
 		wxStaticText* m_staticText2;
 		wxListBox* m_signals;
 		wxStaticText* m_staticText21;
@@ -55,7 +56,6 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxButton* m_settingsBtn;
 		wxButton* m_probeBtn;
 		wxButton* m_tuneBtn;
-		wxRichTextCtrl* m_simConsole;
 		
 		// Virtual event handlers, overide them in your derived class
 		virtual void menuNewPlot( wxCommandEvent& event ) { event.Skip(); }

From 6580a355ab934831e2bfbe0fd3fc4db013eacaea Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:35 +0200
Subject: [PATCH 074/197] Strip 'stdout' & 'stderr' from ngspice log

---
 eeschema/sim/ngspice.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 6529b60bb6..51510ed24b 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -324,7 +324,14 @@ int NGSPICE::cbSendChar( char* what, int id, void* user )
     NGSPICE* sim = reinterpret_cast<NGSPICE*>( user );
 
     if( sim->m_reporter )
+    {
+        // strip stdout/stderr from the line
+        if( ( strncasecmp( what, "stdout ", 7 ) == 0 )
+                || ( strncasecmp( what, "stderr ", 7 ) == 0 ) )
+            what += 7;
+
         sim->m_reporter->Report( what );
+    }
 
     return 0;
 }

From 822f4362315cadc1673086dcab579e7701438e42 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:35 +0200
Subject: [PATCH 075/197] Removed unused DIALOG_SIMULATE_PLOT

---
 eeschema/dialogs/dialog_simulate_plot.cpp |  55 ---
 eeschema/dialogs/dialog_simulate_plot.fbp | 556 ----------------------
 eeschema/dialogs/dialog_simulate_plot.h   |  63 ---
 3 files changed, 674 deletions(-)
 delete mode 100644 eeschema/dialogs/dialog_simulate_plot.cpp
 delete mode 100644 eeschema/dialogs/dialog_simulate_plot.fbp
 delete mode 100644 eeschema/dialogs/dialog_simulate_plot.h

diff --git a/eeschema/dialogs/dialog_simulate_plot.cpp b/eeschema/dialogs/dialog_simulate_plot.cpp
deleted file mode 100644
index c4b1b9be71..0000000000
--- a/eeschema/dialogs/dialog_simulate_plot.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include "sim_plot_panel.h"
-
-#include "dialog_simulate_plot.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-SIM_PLOT_FRAME::SIM_PLOT_FRAME( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
-{
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer1;
-	bSizer1 = new wxBoxSizer( wxVERTICAL );
-	
-	m_auiToolBar1 = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); 
-	m_toolZoomIn = m_auiToolBar1->AddTool( wxID_ANY, wxT("Zoom In"), wxNullBitmap, wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); 
-	
-	m_auiToolBar1->Realize(); 
-	
-	bSizer1->Add( m_auiToolBar1, 0, wxALL, 5 );
-	
-	m_splitter1 = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
-	m_splitter1->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME::m_splitter1OnIdle ), NULL, this );
-	
-	m_plotPanel = new SIM_PLOT_PANEL( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel3 = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer3;
-	bSizer3 = new wxBoxSizer( wxVERTICAL );
-	
-	m_simConsole = new wxRichTextCtrl( m_panel3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0|wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS );
-	bSizer3->Add( m_simConsole, 1, wxEXPAND | wxALL, 5 );
-	
-	
-	m_panel3->SetSizer( bSizer3 );
-	m_panel3->Layout();
-	bSizer3->Fit( m_panel3 );
-	m_splitter1->SplitHorizontally( m_plotPanel, m_panel3, 0 );
-	bSizer1->Add( m_splitter1, 1, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer1 );
-	this->Layout();
-	
-	this->Centre( wxBOTH );
-}
-
-SIM_PLOT_FRAME::~SIM_PLOT_FRAME()
-{
-}
diff --git a/eeschema/dialogs/dialog_simulate_plot.fbp b/eeschema/dialogs/dialog_simulate_plot.fbp
deleted file mode 100644
index 6aecf4e088..0000000000
--- a/eeschema/dialogs/dialog_simulate_plot.fbp
+++ /dev/null
@@ -1,556 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<wxFormBuilder_Project>
-    <FileVersion major="1" minor="13" />
-    <object class="Project" expanded="1">
-        <property name="class_decoration"></property>
-        <property name="code_generation">C++</property>
-        <property name="disconnect_events">1</property>
-        <property name="disconnect_mode">source_name</property>
-        <property name="disconnect_php_events">0</property>
-        <property name="disconnect_python_events">0</property>
-        <property name="embedded_files_path">res</property>
-        <property name="encoding">UTF-8</property>
-        <property name="event_generation">connect</property>
-        <property name="file"></property>
-        <property name="first_id">1000</property>
-        <property name="help_provider">none</property>
-        <property name="internationalize">0</property>
-        <property name="name">SpiceWIndow</property>
-        <property name="namespace"></property>
-        <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="Frame" expanded="1">
-            <property name="aui_managed">0</property>
-            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
-            <property name="bg"></property>
-            <property name="center">wxBOTH</property>
-            <property name="context_help"></property>
-            <property name="context_menu">1</property>
-            <property name="enabled">1</property>
-            <property name="event_handler">impl_virtual</property>
-            <property name="extra_style"></property>
-            <property name="fg"></property>
-            <property name="font"></property>
-            <property name="hidden">0</property>
-            <property name="id">wxID_ANY</property>
-            <property name="maximum_size"></property>
-            <property name="minimum_size"></property>
-            <property name="name">SIM_PLOT_FRAME</property>
-            <property name="pos"></property>
-            <property name="size">548,434</property>
-            <property name="style">wxDEFAULT_FRAME_STYLE</property>
-            <property name="subclass"></property>
-            <property name="title">Spice Simulation</property>
-            <property name="tooltip"></property>
-            <property name="window_extra_style"></property>
-            <property name="window_name"></property>
-            <property name="window_style">wxTAB_TRAVERSAL</property>
-            <property name="xrc_skip_sizer">1</property>
-            <event name="OnActivate"></event>
-            <event name="OnActivateApp"></event>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnClose"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnHibernate"></event>
-            <event name="OnIconize"></event>
-            <event name="OnIdle"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
-            <object class="wxBoxSizer" expanded="1">
-                <property name="minimum_size"></property>
-                <property name="name">bSizer1</property>
-                <property name="orient">wxVERTICAL</property>
-                <property name="permission">none</property>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag">wxALL</property>
-                    <property name="proportion">0</property>
-                    <object class="wxAuiToolBar" 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_name"></property>
-                        <property name="aui_position"></property>
-                        <property name="aui_row"></property>
-                        <property name="best_size"></property>
-                        <property name="bg"></property>
-                        <property name="bitmapsize"></property>
-                        <property name="caption"></property>
-                        <property name="caption_visible">1</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="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="label_visible">0</property>
-                        <property name="margins"></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">m_auiToolBar1</property>
-                        <property name="packing">1</property>
-                        <property name="pane_border">1</property>
-                        <property name="pane_position"></property>
-                        <property name="pane_size"></property>
-                        <property name="permission">protected</property>
-                        <property name="pin_button">1</property>
-                        <property name="pos"></property>
-                        <property name="resize">Resizable</property>
-                        <property name="separation">5</property>
-                        <property name="show">1</property>
-                        <property name="size"></property>
-                        <property name="style">wxAUI_TB_HORZ_LAYOUT</property>
-                        <property name="subclass"></property>
-                        <property name="toolbar_label">label</property>
-                        <property name="toolbar_pane">0</property>
-                        <property name="tooltip"></property>
-                        <property name="use_explicit_ids">0</property>
-                        <property name="window_extra_style"></property>
-                        <property name="window_name"></property>
-                        <property name="window_style"></property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
-                        <object class="tool" expanded="1">
-                            <property name="bitmap">Load From File; </property>
-                            <property name="context_menu">0</property>
-                            <property name="id">wxID_ANY</property>
-                            <property name="kind">wxITEM_NORMAL</property>
-                            <property name="label">Zoom In</property>
-                            <property name="name">m_toolZoomIn</property>
-                            <property name="permission">protected</property>
-                            <property name="statusbar"></property>
-                            <property name="tooltip"></property>
-                            <event name="OnAuiToolBarBeginDrag"></event>
-                            <event name="OnAuiToolBarMiddleClick"></event>
-                            <event name="OnAuiToolBarOverflowClick"></event>
-                            <event name="OnAuiToolBarRightClick"></event>
-                            <event name="OnAuiToolBarToolDropDown"></event>
-                            <event name="OnMenuSelection"></event>
-                            <event name="OnToolClicked"></event>
-                            <event name="OnToolEnter"></event>
-                            <event name="OnToolRClicked"></event>
-                            <event name="OnUpdateUI"></event>
-                        </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="wxSplitterWindow" 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_name"></property>
-                        <property name="aui_position"></property>
-                        <property name="aui_row"></property>
-                        <property name="best_size"></property>
-                        <property name="bg"></property>
-                        <property name="caption"></property>
-                        <property name="caption_visible">1</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="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_pane_size">0</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">m_splitter1</property>
-                        <property name="pane_border">1</property>
-                        <property name="pane_position"></property>
-                        <property name="pane_size"></property>
-                        <property name="permission">protected</property>
-                        <property name="pin_button">1</property>
-                        <property name="pos"></property>
-                        <property name="resize">Resizable</property>
-                        <property name="sashgravity">0.0</property>
-                        <property name="sashpos">0</property>
-                        <property name="sashsize">-1</property>
-                        <property name="show">1</property>
-                        <property name="size"></property>
-                        <property name="splitmode">wxSPLIT_HORIZONTAL</property>
-                        <property name="style">wxSP_3D</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"></property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnSplitterDClick"></event>
-                        <event name="OnSplitterSashPosChanged"></event>
-                        <event name="OnSplitterSashPosChanging"></event>
-                        <event name="OnSplitterUnsplit"></event>
-                        <event name="OnUpdateUI"></event>
-                        <object class="splitteritem" expanded="1">
-                            <object class="wxPanel" 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_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</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="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">m_plotPanel</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="show">1</property>
-                                <property name="size"></property>
-                                <property name="subclass">SIM_PLOT_PANEL; sim_plot_panel.h</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">wxTAB_TRAVERSAL</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="splitteritem" expanded="1">
-                            <object class="wxPanel" 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_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</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="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">m_panel3</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="show">1</property>
-                                <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                                <object class="wxBoxSizer" expanded="1">
-                                    <property name="minimum_size"></property>
-                                    <property name="name">bSizer3</property>
-                                    <property name="orient">wxVERTICAL</property>
-                                    <property name="permission">none</property>
-                                    <object class="sizeritem" expanded="1">
-                                        <property name="border">5</property>
-                                        <property name="flag">wxEXPAND | wxALL</property>
-                                        <property name="proportion">1</property>
-                                        <object class="wxRichTextCtrl" 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_name"></property>
-                                            <property name="aui_position"></property>
-                                            <property name="aui_row"></property>
-                                            <property name="best_size"></property>
-                                            <property name="bg"></property>
-                                            <property name="caption"></property>
-                                            <property name="caption_visible">1</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="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">m_simConsole</property>
-                                            <property name="pane_border">1</property>
-                                            <property name="pane_position"></property>
-                                            <property name="pane_size"></property>
-                                            <property name="permission">protected</property>
-                                            <property name="pin_button">1</property>
-                                            <property name="pos"></property>
-                                            <property name="resize">Resizable</property>
-                                            <property name="show">1</property>
-                                            <property name="size"></property>
-                                            <property name="style"></property>
-                                            <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">wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS</property>
-                                            <event name="OnChar"></event>
-                                            <event name="OnEnterWindow"></event>
-                                            <event name="OnEraseBackground"></event>
-                                            <event name="OnKeyDown"></event>
-                                            <event name="OnKeyUp"></event>
-                                            <event name="OnKillFocus"></event>
-                                            <event name="OnLeaveWindow"></event>
-                                            <event name="OnLeftDClick"></event>
-                                            <event name="OnLeftDown"></event>
-                                            <event name="OnLeftUp"></event>
-                                            <event name="OnMiddleDClick"></event>
-                                            <event name="OnMiddleDown"></event>
-                                            <event name="OnMiddleUp"></event>
-                                            <event name="OnMotion"></event>
-                                            <event name="OnMouseEvents"></event>
-                                            <event name="OnMouseWheel"></event>
-                                            <event name="OnPaint"></event>
-                                            <event name="OnRichTextCharacter"></event>
-                                            <event name="OnRichTextContentDeleted"></event>
-                                            <event name="OnRichTextContentInserted"></event>
-                                            <event name="OnRichTextDelete"></event>
-                                            <event name="OnRichTextReturn"></event>
-                                            <event name="OnRichTextStyleChanged"></event>
-                                            <event name="OnRichTextStyleSheetChanged"></event>
-                                            <event name="OnRichTextStyleSheetReplaced"></event>
-                                            <event name="OnRichTextStyleSheetReplacing"></event>
-                                            <event name="OnRightDClick"></event>
-                                            <event name="OnRightDown"></event>
-                                            <event name="OnRightUp"></event>
-                                            <event name="OnSetFocus"></event>
-                                            <event name="OnSize"></event>
-                                            <event name="OnText"></event>
-                                            <event name="OnTextEnter"></event>
-                                            <event name="OnTextMaxLen"></event>
-                                            <event name="OnTextURL"></event>
-                                            <event name="OnUpdateUI"></event>
-                                        </object>
-                                    </object>
-                                </object>
-                            </object>
-                        </object>
-                    </object>
-                </object>
-            </object>
-        </object>
-    </object>
-</wxFormBuilder_Project>
diff --git a/eeschema/dialogs/dialog_simulate_plot.h b/eeschema/dialogs/dialog_simulate_plot.h
deleted file mode 100644
index d9a581c036..0000000000
--- a/eeschema/dialogs/dialog_simulate_plot.h
+++ /dev/null
@@ -1,63 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __DIALOG_SIMULATE_PLOT_H__
-#define __DIALOG_SIMULATE_PLOT_H__
-
-#include <wx/artprov.h>
-#include <wx/xrc/xmlres.h>
-class SIM_PLOT_PANEL;
-
-#include <wx/string.h>
-#include <wx/bitmap.h>
-#include <wx/image.h>
-#include <wx/icon.h>
-#include <wx/gdicmn.h>
-#include <wx/aui/aui.h>
-#include <wx/aui/auibar.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/panel.h>
-#include <wx/richtext/richtextctrl.h>
-#include <wx/sizer.h>
-#include <wx/splitter.h>
-#include <wx/frame.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class SIM_PLOT_FRAME
-///////////////////////////////////////////////////////////////////////////////
-class SIM_PLOT_FRAME : public wxFrame 
-{
-	private:
-	
-	protected:
-		wxAuiToolBar* m_auiToolBar1;
-		wxAuiToolBarItem* m_toolZoomIn; 
-		wxSplitterWindow* m_splitter1;
-		SIM_PLOT_PANEL* m_plotPanel;
-		wxPanel* m_panel3;
-		wxRichTextCtrl* m_simConsole;
-	
-	public:
-		
-		SIM_PLOT_FRAME( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Spice Simulation"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 548,434 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-		
-		~SIM_PLOT_FRAME();
-		
-		void m_splitter1OnIdle( wxIdleEvent& )
-		{
-			m_splitter1->SetSashPosition( 0 );
-			m_splitter1->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME::m_splitter1OnIdle ), NULL, this );
-		}
-	
-};
-
-#endif //__DIALOG_SIMULATE_PLOT_H__

From 78526ee91313be14ee91bf4661519be58af76dda Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:36 +0200
Subject: [PATCH 076/197] Additional options for netlist exporter (fix passive
 values, library include paths)

---
 eeschema/dialogs/dialog_sim_settings.cpp      |  16 +
 eeschema/dialogs/dialog_sim_settings.h        |   8 +
 eeschema/dialogs/dialog_sim_settings_base.cpp |   7 +
 eeschema/dialogs/dialog_sim_settings_base.fbp | 394 +++++++++++++-----
 eeschema/dialogs/dialog_sim_settings_base.h   |   2 +
 eeschema/sim/sim_plot_frame.cpp               |   9 +-
 eeschema/sim/sim_plot_frame.h                 |   1 -
 7 files changed, 321 insertions(+), 116 deletions(-)

diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
index 4f6b81441b..36b1b1d8cf 100644
--- a/eeschema/dialogs/dialog_sim_settings.cpp
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -54,6 +54,8 @@ DIALOG_SIM_SETTINGS::DIALOG_SIM_SETTINGS( wxWindow* aParent )
     m_transStep->SetValidator( m_posFloatValidator );
     m_transFinal->SetValidator( m_posFloatValidator );
     m_transInitial->SetValidator( m_posFloatValidator );
+
+    updateNetlistOpts();
 }
 
 
@@ -160,6 +162,8 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
         return false;
     }
 
+    updateNetlistOpts();
+
     return true;
 }
 
@@ -236,3 +240,15 @@ void DIALOG_SIM_SETTINGS::onLoadDirectives( wxCommandEvent& event )
     if( m_exporter )
         m_customTxt->SetValue( m_exporter->GetSheetSimCommand() );
 }
+
+
+void DIALOG_SIM_SETTINGS::updateNetlistOpts()
+{
+    m_netlistOpts = NET_ALL_FLAGS;
+
+    if( !m_fixPassiveVals->IsChecked() )
+        m_netlistOpts &= ~NET_ADJUST_PASSIVE_VALS;
+
+    if( !m_fixIncludePaths->IsChecked() )
+        m_netlistOpts &= ~NET_ADJUST_INCLUDE_PATHS;
+}
diff --git a/eeschema/dialogs/dialog_sim_settings.h b/eeschema/dialogs/dialog_sim_settings.h
index 0ee2101446..6c70baed1c 100644
--- a/eeschema/dialogs/dialog_sim_settings.h
+++ b/eeschema/dialogs/dialog_sim_settings.h
@@ -40,6 +40,11 @@ public:
         return m_simCommand;
     }
 
+    int GetNetlistOptions() const
+    {
+        return m_netlistOpts;
+    }
+
     void SetNetlistExporter( NETLIST_EXPORTER_PSPICE_SIM* aExporter )
     {
         m_exporter = aExporter;
@@ -79,7 +84,10 @@ private:
         return wxEmptyString;
     }
 
+    void updateNetlistOpts();
+
     wxString m_simCommand;
+    int m_netlistOpts;
     NETLIST_EXPORTER_PSPICE_SIM* m_exporter;
 
     wxFloatingPointValidator<double> m_posFloatValidator;
diff --git a/eeschema/dialogs/dialog_sim_settings_base.cpp b/eeschema/dialogs/dialog_sim_settings_base.cpp
index d08e53f430..b0821da179 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.cpp
+++ b/eeschema/dialogs/dialog_sim_settings_base.cpp
@@ -377,6 +377,13 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID
 	
 	bSizer1->Add( m_simPages, 1, wxEXPAND | wxALL, 5 );
 	
+	m_fixPassiveVals = new wxCheckBox( this, wxID_ANY, wxT("Adjust passive component values (e.g. M -> Meg; 100 nF -> 100n)"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer1->Add( m_fixPassiveVals, 0, wxALL, 5 );
+	
+	m_fixIncludePaths = new wxCheckBox( this, wxID_ANY, wxT("Add full path for .include library directives"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_fixIncludePaths->SetValue(true); 
+	bSizer1->Add( m_fixIncludePaths, 0, wxALL, 5 );
+	
 	m_sdbSizer1 = new wxStdDialogButtonSizer();
 	m_sdbSizer1OK = new wxButton( this, wxID_OK );
 	m_sdbSizer1->AddButton( m_sdbSizer1OK );
diff --git a/eeschema/dialogs/dialog_sim_settings_base.fbp b/eeschema/dialogs/dialog_sim_settings_base.fbp
index 773636a974..fa9be99fb1 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.fbp
+++ b/eeschema/dialogs/dialog_sim_settings_base.fbp
@@ -97,7 +97,7 @@
                     <property name="border">5</property>
                     <property name="flag">wxEXPAND | wxALL</property>
                     <property name="proportion">1</property>
-                    <object class="wxNotebook" expanded="1">
+                    <object class="wxNotebook" expanded="0">
                         <property name="BottomDockable">1</property>
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
@@ -175,11 +175,11 @@
                         <event name="OnSetFocus"></event>
                         <event name="OnSize"></event>
                         <event name="OnUpdateUI"></event>
-                        <object class="notebookpage" expanded="1">
+                        <object class="notebookpage" expanded="0">
                             <property name="bitmap"></property>
                             <property name="label">AC</property>
                             <property name="select">1</property>
-                            <object class="wxPanel" expanded="1">
+                            <object class="wxPanel" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -253,7 +253,7 @@
                                 <event name="OnSetFocus"></event>
                                 <event name="OnSize"></event>
                                 <event name="OnUpdateUI"></event>
-                                <object class="wxBoxSizer" expanded="1">
+                                <object class="wxBoxSizer" expanded="0">
                                     <property name="minimum_size"></property>
                                     <property name="name">bSizer3</property>
                                     <property name="orient">wxVERTICAL</property>
@@ -368,11 +368,11 @@
                                             <property name="width">0</property>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxALIGN_CENTER_HORIZONTAL</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxFlexGridSizer" expanded="1">
+                                        <object class="wxFlexGridSizer" expanded="0">
                                             <property name="cols">2</property>
                                             <property name="flexible_direction">wxBOTH</property>
                                             <property name="growablecols"></property>
@@ -467,11 +467,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxALL|wxEXPAND</property>
                                                 <property name="proportion">0</property>
-                                                <object class="wxTextCtrl" expanded="1">
+                                                <object class="wxTextCtrl" expanded="0">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -641,11 +641,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxALL|wxEXPAND</property>
                                                 <property name="proportion">0</property>
-                                                <object class="wxTextCtrl" expanded="1">
+                                                <object class="wxTextCtrl" expanded="0">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -815,11 +815,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxALL</property>
                                                 <property name="proportion">0</property>
-                                                <object class="wxTextCtrl" expanded="1">
+                                                <object class="wxTextCtrl" expanded="0">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -921,11 +921,11 @@
                                 </object>
                             </object>
                         </object>
-                        <object class="notebookpage" expanded="1">
+                        <object class="notebookpage" expanded="0">
                             <property name="bitmap"></property>
                             <property name="label">DC Transfer</property>
                             <property name="select">0</property>
-                            <object class="wxPanel" expanded="1">
+                            <object class="wxPanel" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -999,16 +999,16 @@
                                 <event name="OnSetFocus"></event>
                                 <event name="OnSize"></event>
                                 <event name="OnUpdateUI"></event>
-                                <object class="wxBoxSizer" expanded="1">
+                                <object class="wxBoxSizer" expanded="0">
                                     <property name="minimum_size"></property>
                                     <property name="name">bSizer4</property>
                                     <property name="orient">wxVERTICAL</property>
                                     <property name="permission">none</property>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxStaticBoxSizer" expanded="1">
+                                        <object class="wxStaticBoxSizer" expanded="0">
                                             <property name="id">wxID_ANY</property>
                                             <property name="label">DC sweep source 1</property>
                                             <property name="minimum_size"></property>
@@ -1105,11 +1105,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxALIGN_CENTER_HORIZONTAL</property>
                                                 <property name="proportion">1</property>
-                                                <object class="wxFlexGridSizer" expanded="1">
+                                                <object class="wxFlexGridSizer" expanded="0">
                                                     <property name="cols">2</property>
                                                     <property name="flexible_direction">wxBOTH</property>
                                                     <property name="growablecols"></property>
@@ -1378,11 +1378,11 @@
                                                             <event name="OnUpdateUI"></event>
                                                         </object>
                                                     </object>
-                                                    <object class="sizeritem" expanded="1">
+                                                    <object class="sizeritem" expanded="0">
                                                         <property name="border">5</property>
                                                         <property name="flag">wxALL</property>
                                                         <property name="proportion">0</property>
-                                                        <object class="wxTextCtrl" expanded="1">
+                                                        <object class="wxTextCtrl" expanded="0">
                                                             <property name="BottomDockable">1</property>
                                                             <property name="LeftDockable">1</property>
                                                             <property name="RightDockable">1</property>
@@ -1552,11 +1552,11 @@
                                                             <event name="OnUpdateUI"></event>
                                                         </object>
                                                     </object>
-                                                    <object class="sizeritem" expanded="1">
+                                                    <object class="sizeritem" expanded="0">
                                                         <property name="border">5</property>
                                                         <property name="flag">wxALL</property>
                                                         <property name="proportion">0</property>
-                                                        <object class="wxTextCtrl" expanded="1">
+                                                        <object class="wxTextCtrl" expanded="0">
                                                             <property name="BottomDockable">1</property>
                                                             <property name="LeftDockable">1</property>
                                                             <property name="RightDockable">1</property>
@@ -1726,11 +1726,11 @@
                                                             <event name="OnUpdateUI"></event>
                                                         </object>
                                                     </object>
-                                                    <object class="sizeritem" expanded="1">
+                                                    <object class="sizeritem" expanded="0">
                                                         <property name="border">5</property>
                                                         <property name="flag">wxALL</property>
                                                         <property name="proportion">0</property>
-                                                        <object class="wxTextCtrl" expanded="1">
+                                                        <object class="wxTextCtrl" expanded="0">
                                                             <property name="BottomDockable">1</property>
                                                             <property name="LeftDockable">1</property>
                                                             <property name="RightDockable">1</property>
@@ -1821,11 +1821,11 @@
                                             </object>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxStaticBoxSizer" expanded="1">
+                                        <object class="wxStaticBoxSizer" expanded="0">
                                             <property name="id">wxID_ANY</property>
                                             <property name="label">DC sweep source 2</property>
                                             <property name="minimum_size"></property>
@@ -1922,11 +1922,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxALIGN_CENTER_HORIZONTAL</property>
                                                 <property name="proportion">1</property>
-                                                <object class="wxFlexGridSizer" expanded="1">
+                                                <object class="wxFlexGridSizer" expanded="0">
                                                     <property name="cols">2</property>
                                                     <property name="flexible_direction">wxBOTH</property>
                                                     <property name="growablecols"></property>
@@ -2195,11 +2195,11 @@
                                                             <event name="OnUpdateUI"></event>
                                                         </object>
                                                     </object>
-                                                    <object class="sizeritem" expanded="1">
+                                                    <object class="sizeritem" expanded="0">
                                                         <property name="border">5</property>
                                                         <property name="flag">wxALL</property>
                                                         <property name="proportion">0</property>
-                                                        <object class="wxTextCtrl" expanded="1">
+                                                        <object class="wxTextCtrl" expanded="0">
                                                             <property name="BottomDockable">1</property>
                                                             <property name="LeftDockable">1</property>
                                                             <property name="RightDockable">1</property>
@@ -2369,11 +2369,11 @@
                                                             <event name="OnUpdateUI"></event>
                                                         </object>
                                                     </object>
-                                                    <object class="sizeritem" expanded="1">
+                                                    <object class="sizeritem" expanded="0">
                                                         <property name="border">5</property>
                                                         <property name="flag">wxALL</property>
                                                         <property name="proportion">0</property>
-                                                        <object class="wxTextCtrl" expanded="1">
+                                                        <object class="wxTextCtrl" expanded="0">
                                                             <property name="BottomDockable">1</property>
                                                             <property name="LeftDockable">1</property>
                                                             <property name="RightDockable">1</property>
@@ -2543,11 +2543,11 @@
                                                             <event name="OnUpdateUI"></event>
                                                         </object>
                                                     </object>
-                                                    <object class="sizeritem" expanded="1">
+                                                    <object class="sizeritem" expanded="0">
                                                         <property name="border">5</property>
                                                         <property name="flag">wxALL</property>
                                                         <property name="proportion">0</property>
-                                                        <object class="wxTextCtrl" expanded="1">
+                                                        <object class="wxTextCtrl" expanded="0">
                                                             <property name="BottomDockable">1</property>
                                                             <property name="LeftDockable">1</property>
                                                             <property name="RightDockable">1</property>
@@ -2641,11 +2641,11 @@
                                 </object>
                             </object>
                         </object>
-                        <object class="notebookpage" expanded="1">
+                        <object class="notebookpage" expanded="0">
                             <property name="bitmap"></property>
                             <property name="label">Distortion</property>
                             <property name="select">0</property>
-                            <object class="wxPanel" expanded="1">
+                            <object class="wxPanel" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -2721,11 +2721,11 @@
                                 <event name="OnUpdateUI"></event>
                             </object>
                         </object>
-                        <object class="notebookpage" expanded="1">
+                        <object class="notebookpage" expanded="0">
                             <property name="bitmap"></property>
                             <property name="label">Noise</property>
                             <property name="select">0</property>
-                            <object class="wxPanel" expanded="1">
+                            <object class="wxPanel" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -2799,26 +2799,26 @@
                                 <event name="OnSetFocus"></event>
                                 <event name="OnSize"></event>
                                 <event name="OnUpdateUI"></event>
-                                <object class="wxBoxSizer" expanded="1">
+                                <object class="wxBoxSizer" expanded="0">
                                     <property name="minimum_size"></property>
                                     <property name="name">bSizer15</property>
                                     <property name="orient">wxVERTICAL</property>
                                     <property name="permission">none</property>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="spacer" expanded="1">
+                                        <object class="spacer" expanded="0">
                                             <property name="height">0</property>
                                             <property name="permission">protected</property>
                                             <property name="width">0</property>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxALIGN_CENTER_HORIZONTAL</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxFlexGridSizer" expanded="1">
+                                        <object class="wxFlexGridSizer" expanded="0">
                                             <property name="cols">3</property>
                                             <property name="flexible_direction">wxBOTH</property>
                                             <property name="growablecols"></property>
@@ -3004,11 +3004,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxEXPAND</property>
                                                 <property name="proportion">1</property>
-                                                <object class="spacer" expanded="1">
+                                                <object class="spacer" expanded="0">
                                                     <property name="height">0</property>
                                                     <property name="permission">protected</property>
                                                     <property name="width">0</property>
@@ -3188,11 +3188,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
                                                 <property name="proportion">0</property>
-                                                <object class="wxStaticText" expanded="1">
+                                                <object class="wxStaticText" expanded="0">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -3445,11 +3445,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxEXPAND</property>
                                                 <property name="proportion">1</property>
-                                                <object class="spacer" expanded="1">
+                                                <object class="spacer" expanded="0">
                                                     <property name="height">0</property>
                                                     <property name="permission">protected</property>
                                                     <property name="width">0</property>
@@ -3457,21 +3457,21 @@
                                             </object>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="spacer" expanded="1">
+                                        <object class="spacer" expanded="0">
                                             <property name="height">0</property>
                                             <property name="permission">protected</property>
                                             <property name="width">0</property>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>
                                         <property name="proportion">0</property>
-                                        <object class="wxRadioBox" expanded="1">
+                                        <object class="wxRadioBox" expanded="0">
                                             <property name="BottomDockable">1</property>
                                             <property name="LeftDockable">1</property>
                                             <property name="RightDockable">1</property>
@@ -3557,21 +3557,21 @@
                                             <event name="OnUpdateUI"></event>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="spacer" expanded="1">
+                                        <object class="spacer" expanded="0">
                                             <property name="height">0</property>
                                             <property name="permission">protected</property>
                                             <property name="width">0</property>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxALIGN_CENTER_HORIZONTAL</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxFlexGridSizer" expanded="1">
+                                        <object class="wxFlexGridSizer" expanded="0">
                                             <property name="cols">2</property>
                                             <property name="flexible_direction">wxBOTH</property>
                                             <property name="growablecols"></property>
@@ -3666,11 +3666,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxALL</property>
                                                 <property name="proportion">0</property>
-                                                <object class="wxTextCtrl" expanded="1">
+                                                <object class="wxTextCtrl" expanded="0">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -3840,11 +3840,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxALL</property>
                                                 <property name="proportion">0</property>
-                                                <object class="wxTextCtrl" expanded="1">
+                                                <object class="wxTextCtrl" expanded="0">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -4014,11 +4014,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxALL</property>
                                                 <property name="proportion">0</property>
-                                                <object class="wxTextCtrl" expanded="1">
+                                                <object class="wxTextCtrl" expanded="0">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -4107,11 +4107,11 @@
                                             </object>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="spacer" expanded="1">
+                                        <object class="spacer" expanded="0">
                                             <property name="height">0</property>
                                             <property name="permission">protected</property>
                                             <property name="width">0</property>
@@ -4120,11 +4120,11 @@
                                 </object>
                             </object>
                         </object>
-                        <object class="notebookpage" expanded="1">
+                        <object class="notebookpage" expanded="0">
                             <property name="bitmap"></property>
                             <property name="label">Operating Point</property>
                             <property name="select">0</property>
-                            <object class="wxPanel" expanded="1">
+                            <object class="wxPanel" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -4198,16 +4198,16 @@
                                 <event name="OnSetFocus"></event>
                                 <event name="OnSize"></event>
                                 <event name="OnUpdateUI"></event>
-                                <object class="wxBoxSizer" expanded="1">
+                                <object class="wxBoxSizer" expanded="0">
                                     <property name="minimum_size"></property>
                                     <property name="name">bSizer8</property>
                                     <property name="orient">wxVERTICAL</property>
                                     <property name="permission">none</property>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="spacer" expanded="1">
+                                        <object class="spacer" expanded="0">
                                             <property name="height">0</property>
                                             <property name="permission">protected</property>
                                             <property name="width">0</property>
@@ -4296,11 +4296,11 @@
                                             <event name="OnUpdateUI"></event>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="spacer" expanded="1">
+                                        <object class="spacer" expanded="0">
                                             <property name="height">0</property>
                                             <property name="permission">protected</property>
                                             <property name="width">0</property>
@@ -4309,11 +4309,11 @@
                                 </object>
                             </object>
                         </object>
-                        <object class="notebookpage" expanded="1">
+                        <object class="notebookpage" expanded="0">
                             <property name="bitmap"></property>
                             <property name="label">Pole-Zero</property>
                             <property name="select">0</property>
-                            <object class="wxPanel" expanded="1">
+                            <object class="wxPanel" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -4389,11 +4389,11 @@
                                 <event name="OnUpdateUI"></event>
                             </object>
                         </object>
-                        <object class="notebookpage" expanded="1">
+                        <object class="notebookpage" expanded="0">
                             <property name="bitmap"></property>
                             <property name="label">Sensitvity</property>
                             <property name="select">0</property>
-                            <object class="wxPanel" expanded="1">
+                            <object class="wxPanel" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -4469,11 +4469,11 @@
                                 <event name="OnUpdateUI"></event>
                             </object>
                         </object>
-                        <object class="notebookpage" expanded="1">
+                        <object class="notebookpage" expanded="0">
                             <property name="bitmap"></property>
                             <property name="label">Transfer Function</property>
                             <property name="select">0</property>
-                            <object class="wxPanel" expanded="1">
+                            <object class="wxPanel" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -4549,11 +4549,11 @@
                                 <event name="OnUpdateUI"></event>
                             </object>
                         </object>
-                        <object class="notebookpage" expanded="1">
+                        <object class="notebookpage" expanded="0">
                             <property name="bitmap"></property>
                             <property name="label">Transient</property>
                             <property name="select">0</property>
-                            <object class="wxPanel" expanded="1">
+                            <object class="wxPanel" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -4627,26 +4627,26 @@
                                 <event name="OnSetFocus"></event>
                                 <event name="OnSize"></event>
                                 <event name="OnUpdateUI"></event>
-                                <object class="wxBoxSizer" expanded="1">
+                                <object class="wxBoxSizer" expanded="0">
                                     <property name="minimum_size"></property>
                                     <property name="name">bSizer81</property>
                                     <property name="orient">wxVERTICAL</property>
                                     <property name="permission">none</property>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="spacer" expanded="1">
+                                        <object class="spacer" expanded="0">
                                             <property name="height">0</property>
                                             <property name="permission">protected</property>
                                             <property name="width">0</property>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxFlexGridSizer" expanded="1">
+                                        <object class="wxFlexGridSizer" expanded="0">
                                             <property name="cols">3</property>
                                             <property name="flexible_direction">wxBOTH</property>
                                             <property name="growablecols"></property>
@@ -4741,11 +4741,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxALL</property>
                                                 <property name="proportion">0</property>
-                                                <object class="wxTextCtrl" expanded="1">
+                                                <object class="wxTextCtrl" expanded="0">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -4832,11 +4832,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxEXPAND</property>
                                                 <property name="proportion">1</property>
-                                                <object class="spacer" expanded="1">
+                                                <object class="spacer" expanded="0">
                                                     <property name="height">0</property>
                                                     <property name="permission">protected</property>
                                                     <property name="width">0</property>
@@ -4925,11 +4925,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxALL</property>
                                                 <property name="proportion">0</property>
-                                                <object class="wxTextCtrl" expanded="1">
+                                                <object class="wxTextCtrl" expanded="0">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -5016,11 +5016,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxEXPAND</property>
                                                 <property name="proportion">1</property>
-                                                <object class="spacer" expanded="1">
+                                                <object class="spacer" expanded="0">
                                                     <property name="height">0</property>
                                                     <property name="permission">protected</property>
                                                     <property name="width">0</property>
@@ -5109,11 +5109,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxALL</property>
                                                 <property name="proportion">0</property>
-                                                <object class="wxTextCtrl" expanded="1">
+                                                <object class="wxTextCtrl" expanded="0">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -5200,11 +5200,11 @@
                                                     <event name="OnUpdateUI"></event>
                                                 </object>
                                             </object>
-                                            <object class="sizeritem" expanded="1">
+                                            <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
                                                 <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
                                                 <property name="proportion">0</property>
-                                                <object class="wxStaticText" expanded="1">
+                                                <object class="wxStaticText" expanded="0">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -5285,11 +5285,11 @@
                                             </object>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="spacer" expanded="1">
+                                        <object class="spacer" expanded="0">
                                             <property name="height">0</property>
                                             <property name="permission">protected</property>
                                             <property name="width">0</property>
@@ -5298,11 +5298,11 @@
                                 </object>
                             </object>
                         </object>
-                        <object class="notebookpage" expanded="1">
+                        <object class="notebookpage" expanded="0">
                             <property name="bitmap"></property>
                             <property name="label">Custom</property>
                             <property name="select">0</property>
-                            <object class="wxPanel" expanded="1">
+                            <object class="wxPanel" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -5376,16 +5376,16 @@
                                 <event name="OnSetFocus"></event>
                                 <event name="OnSize"></event>
                                 <event name="OnUpdateUI"></event>
-                                <object class="wxBoxSizer" expanded="1">
+                                <object class="wxBoxSizer" expanded="0">
                                     <property name="minimum_size"></property>
                                     <property name="name">bSizer2</property>
                                     <property name="orient">wxVERTICAL</property>
                                     <property name="permission">none</property>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxALL</property>
                                         <property name="proportion">0</property>
-                                        <object class="wxStaticText" expanded="1">
+                                        <object class="wxStaticText" expanded="0">
                                             <property name="BottomDockable">1</property>
                                             <property name="LeftDockable">1</property>
                                             <property name="RightDockable">1</property>
@@ -5464,11 +5464,11 @@
                                             <event name="OnUpdateUI"></event>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxALL|wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxTextCtrl" expanded="1">
+                                        <object class="wxTextCtrl" expanded="0">
                                             <property name="BottomDockable">1</property>
                                             <property name="LeftDockable">1</property>
                                             <property name="RightDockable">1</property>
@@ -5555,11 +5555,11 @@
                                             <event name="OnUpdateUI"></event>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxALL|wxEXPAND</property>
                                         <property name="proportion">0</property>
-                                        <object class="wxButton" expanded="1">
+                                        <object class="wxButton" expanded="0">
                                             <property name="BottomDockable">1</property>
                                             <property name="LeftDockable">1</property>
                                             <property name="RightDockable">1</property>
@@ -5648,6 +5648,182 @@
                         </object>
                     </object>
                 </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL</property>
+                    <property name="proportion">0</property>
+                    <object class="wxCheckBox" 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_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</property>
+                        <property name="center_pane">0</property>
+                        <property name="checked">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="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="label">Adjust passive component values (e.g. M -&gt; Meg; 100 nF -&gt; 100n)</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">m_fixPassiveVals</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="style"></property>
+                        <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>
+                        <event name="OnChar"></event>
+                        <event name="OnCheckBox"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL</property>
+                    <property name="proportion">0</property>
+                    <object class="wxCheckBox" 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_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</property>
+                        <property name="center_pane">0</property>
+                        <property name="checked">1</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="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="label">Add full path for .include library directives</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">m_fixIncludePaths</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="style"></property>
+                        <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>
+                        <event name="OnChar"></event>
+                        <event name="OnCheckBox"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
                     <property name="flag">wxALL|wxEXPAND</property>
diff --git a/eeschema/dialogs/dialog_sim_settings_base.h b/eeschema/dialogs/dialog_sim_settings_base.h
index 8c28b1d65d..6f7afad2a0 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.h
+++ b/eeschema/dialogs/dialog_sim_settings_base.h
@@ -103,6 +103,8 @@ class DIALOG_SIM_SETTINGS_BASE : public wxDialog
 		wxStaticText* m_staticText18;
 		wxTextCtrl* m_customTxt;
 		wxButton* m_loadDirectives;
+		wxCheckBox* m_fixPassiveVals;
+		wxCheckBox* m_fixIncludePaths;
 		wxStdDialogButtonSizer* m_sdbSizer1;
 		wxButton* m_sdbSizer1OK;
 		wxButton* m_sdbSizer1Cancel;
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 77c2a962ed..0561a1e9d6 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -105,8 +105,8 @@ void SIM_PLOT_FRAME::StartSimulation()
     m_simulator->Init();
 
     updateNetlistExporter();
-    m_exporter->SetSimCommand( m_simCommand );
-    m_exporter->Format( &formatter, NET_ALL_FLAGS );
+    m_exporter->SetSimCommand( m_settingsDlg.GetSimCommand() );
+    m_exporter->Format( &formatter, m_settingsDlg.GetNetlistOptions() );
 
     m_simulator->LoadNetlist( formatter.GetString() );
     m_simulator->Run();
@@ -431,11 +431,8 @@ void SIM_PLOT_FRAME::onSettings( wxCommandEvent& event )
 {
     updateNetlistExporter();
     m_exporter->ProcessNetlist( NET_ALL_FLAGS );
-
     m_settingsDlg.SetNetlistExporter( m_exporter.get() );
-
-    if( m_settingsDlg.ShowModal() == wxID_OK )
-        m_simCommand = m_settingsDlg.GetSimCommand();
+    m_settingsDlg.ShowModal();
 }
 
 
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 0c12db8562..b0bbd86c58 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -124,7 +124,6 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         SCH_EDIT_FRAME* m_schematicFrame;
         std::unique_ptr<NETLIST_EXPORTER_PSPICE_SIM> m_exporter;
         std::unique_ptr<SPICE_SIMULATOR> m_simulator;
-        wxString m_simCommand;
 
         // Trick to preserve settings between runs
         DIALOG_SIM_SETTINGS m_settingsDlg;

From a83d4802f9cf558bce03d6c91d10cd14c7bb3396 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:36 +0200
Subject: [PATCH 077/197] Load Spice directives from schematics when Sim
 settings dialog is launched

---
 eeschema/dialogs/dialog_sim_settings.cpp | 5 ++++-
 eeschema/dialogs/dialog_sim_settings.h   | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
index 36b1b1d8cf..c79dbc7402 100644
--- a/eeschema/dialogs/dialog_sim_settings.cpp
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -171,6 +171,9 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
 bool DIALOG_SIM_SETTINGS::TransferDataToWindow()
 {
     /// @todo one day it could interpret the sim command and fill out appropriate fields..
+    if( m_customTxt->IsEmpty() )
+        loadDirectives();
+
     return true;
 }
 
@@ -235,7 +238,7 @@ int DIALOG_SIM_SETTINGS::ShowModal()
 }
 
 
-void DIALOG_SIM_SETTINGS::onLoadDirectives( wxCommandEvent& event )
+void DIALOG_SIM_SETTINGS::loadDirectives()
 {
     if( m_exporter )
         m_customTxt->SetValue( m_exporter->GetSheetSimCommand() );
diff --git a/eeschema/dialogs/dialog_sim_settings.h b/eeschema/dialogs/dialog_sim_settings.h
index 6c70baed1c..a60b88893d 100644
--- a/eeschema/dialogs/dialog_sim_settings.h
+++ b/eeschema/dialogs/dialog_sim_settings.h
@@ -63,7 +63,10 @@ private:
         LINEAR
     };
 
-    void onLoadDirectives( wxCommandEvent& event ) override;
+    void onLoadDirectives( wxCommandEvent& event ) override
+    {
+        loadDirectives();
+    }
 
     static wxString scaleToString( int aOption )
     {
@@ -84,6 +87,7 @@ private:
         return wxEmptyString;
     }
 
+    void loadDirectives();
     void updateNetlistOpts();
 
     wxString m_simCommand;

From fd08f45bd21421d88ff6648bfa3c2bae99722c4e Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:36 +0200
Subject: [PATCH 078/197] Corrected bounding box calculation in mpLayer

---
 common/widgets/mathplot.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index c8e3c6ad22..e0d3824cc1 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -2411,10 +2411,6 @@ void mpFXYVector::SetData( const std::vector<double> &xs,const std::vector<doubl
             if (*it<m_minY) m_minY=*it;
             if (*it>m_maxY) m_maxY=*it;
         }
-        m_minX-=0.5f;
-        m_minY-=0.5f;
-        m_maxX+=0.5f;
-        m_maxY+=0.5f;
     }
     else
     {

From f634cff2064298e36a2487ed43021bef4e38fef9 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:36 +0200
Subject: [PATCH 079/197] wxMathPlot: Removed mouse help related functions

---
 common/widgets/mathplot.cpp | 11 -----------
 include/widgets/mathplot.h  |  2 --
 2 files changed, 13 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index e0d3824cc1..8383c4e08e 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -1136,7 +1136,6 @@ IMPLEMENT_DYNAMIC_CLASS(mpWindow, wxWindow)
     EVT_MENU( mpID_ZOOM_IN,   mpWindow::OnZoomIn)
     EVT_MENU( mpID_ZOOM_OUT,  mpWindow::OnZoomOut)
     EVT_MENU( mpID_LOCKASPECT,mpWindow::OnLockAspect)
-    EVT_MENU( mpID_HELP_MOUSE,mpWindow::OnMouseHelp)
 END_EVENT_TABLE()
 
 mpWindow::mpWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long flag )
@@ -1617,16 +1616,6 @@ void mpWindow::OnLockAspect(wxCommandEvent& WXUNUSED(event))
     LockAspect( !m_lockaspect );
 }
 
-void mpWindow::OnMouseHelp(wxCommandEvent& WXUNUSED(event))
-{
-    wxMessageBox(_("Supported Mouse commands:\n \
-                - Left button down + Mark area: Rectangular zoom\n \
-                - Middle button down + Move: Pan (Move)\n \
-                - Wheel: Vertical scroll\n \
-                - Wheel + SHIFT: Horizontal scroll\n \
-                - Wheel + CTRL: Zoom in/out"),_("wxMathPlot help"),wxOK,this);
-}
-
 void mpWindow::OnFit(wxCommandEvent& WXUNUSED(event))
 {
     Fit();
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index 8407952a71..5dbebf580c 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -116,7 +116,6 @@ enum
     mpID_ZOOM_OUT,      //!< Zoom out
     mpID_CENTER,        //!< Center view on click position
     mpID_LOCKASPECT,    //!< Lock x/y scaling aspect
-    mpID_HELP_MOUSE     //!< Shows information about the mouse commands
 };
 
 //-----------------------------------------------------------------------------
@@ -1168,7 +1167,6 @@ class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
         void OnZoomIn        (wxCommandEvent   &event); //!< Context menu handler
         void OnZoomOut       (wxCommandEvent   &event); //!< Context menu handler
         void OnLockAspect    (wxCommandEvent   &event); //!< Context menu handler
-        void OnMouseHelp     (wxCommandEvent   &event); //!< Context menu handler
         void OnMouseWheel    (wxMouseEvent     &event); //!< Mouse handler for the wheel
         void OnMouseMove     (wxMouseEvent     &event); //!< Mouse handler for mouse motion (for pan)
         void OnMouseLeftDown (wxMouseEvent     &event); //!< Mouse left click (for rect zoom)

From 06463252d7093d005d83e492818c2727a51e04b2 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:37 +0200
Subject: [PATCH 080/197] wxMathPlot: Limited zooming and panning

---
 common/widgets/mathplot.cpp     | 69 ++++++++++++++++++++++++++-------
 eeschema/sim/sim_plot_panel.cpp |  1 +
 include/widgets/mathplot.h      | 17 ++++++++
 3 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index 8383c4e08e..9111668a05 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -1152,6 +1152,7 @@ mpWindow::mpWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const w
     m_buff_bmp = NULL;
     m_enableDoubleBuffer        = FALSE;
     m_enableMouseNavigation     = TRUE;
+    m_enableLimitedView         = FALSE;
     m_movingInfoLayer = NULL;
     // Set margins to 0
     m_marginTop = 0; m_marginRight = 0; m_marginBottom = 0; m_marginLeft = 0;
@@ -1218,16 +1219,12 @@ void mpWindow::OnMouseWheel( wxMouseEvent &event )
     if (event.m_controlDown)
     {
         // horizontal scroll
-        m_posX 		+= changeUnitsX;
-        m_desiredXmax 	+= changeUnitsX;
-        m_desiredXmin 	+= changeUnitsX;
+        SetXView(m_posX + changeUnitsX, m_desiredXmax + changeUnitsX, m_desiredXmin + changeUnitsX);
     }
     else if(event.m_shiftDown)
     {
         // vertical scroll
-        m_posY 		-= changeUnitsY;
-        m_desiredYmax	-= changeUnitsY;
-        m_desiredYmax	-= changeUnitsY;
+        SetYView(m_posY - changeUnitsY, m_desiredYmax - changeUnitsY, m_desiredYmin - changeUnitsY);
     }
     else
     {
@@ -1266,14 +1263,12 @@ void mpWindow::OnMouseMove(wxMouseEvent     &event)
         double   Ax_units = Ax / m_scaleX;
         double   Ay_units = -Ay / m_scaleY;
 
-        m_posX += Ax_units;
-        m_posY += Ay_units;
-        m_desiredXmax 	+= Ax_units;
-        m_desiredXmin 	+= Ax_units;
-        m_desiredYmax 	+= Ay_units;
-        m_desiredYmin 	+= Ay_units;
+        bool updateRequired = false;
+        updateRequired |= SetXView(m_posX + Ax_units, m_desiredXmax + Ax_units, m_desiredXmin + Ax_units);
+        updateRequired |= SetYView(m_posY + Ay_units, m_desiredYmax + Ay_units, m_desiredYmin + Ay_units);
 
-        UpdateAll();
+        if(updateRequired)
+            UpdateAll();
 
 #ifdef MATHPLOT_DO_LOGGING
         wxLogMessage(_("[mpWindow::OnMouseMove] Ax:%i Ay:%i m_posX:%f m_posY:%f"),Ax,Ay,m_posX,m_posY);
@@ -1482,6 +1477,32 @@ void mpWindow::DoZoomOutYCalc  (const int staticYpixel)
 }
 
 
+bool mpWindow::SetXView(double pos, double desiredMax, double desiredMin)
+{
+    if(m_enableLimitedView && (desiredMax > m_maxX || desiredMin < m_minX))
+        return false;
+
+    m_posX = pos;
+    m_desiredXmax = desiredMax;
+    m_desiredXmin = desiredMin;
+
+    return true;
+}
+
+
+bool mpWindow::SetYView(double pos, double desiredMax, double desiredMin)
+{
+    if(m_enableLimitedView && (desiredMax > m_maxY || desiredMin < m_minY))
+        return false;
+
+    m_posY = pos;
+    m_desiredYmax = desiredMax;
+    m_desiredYmin = desiredMin;
+
+    return true;
+}
+
+
 void mpWindow::ZoomIn(const wxPoint& centerPoint )
 {
     wxPoint	c(centerPoint);
@@ -1497,8 +1518,20 @@ void mpWindow::ZoomIn(const wxPoint& centerPoint )
     double prior_layer_y = p2y( c.y );
 
     // Zoom in:
-    m_scaleX = m_scaleX * zoomIncrementalFactor;
-    m_scaleY = m_scaleY * zoomIncrementalFactor;
+    const double MAX_SCALE = 1e6;
+    double newScaleX = m_scaleX * zoomIncrementalFactor;
+    double newScaleY = m_scaleY * zoomIncrementalFactor;
+
+    // Baaaaad things happen when you zoom in too much..
+    if(newScaleX <= MAX_SCALE && newScaleY <= MAX_SCALE)
+    {
+        m_scaleX = newScaleX;
+        m_scaleY = newScaleY;
+    }
+    else
+    {
+        return;
+    }
 
     // Adjust the new m_posx/y:
     m_posX = prior_layer_x - c.x / m_scaleX;
@@ -1544,6 +1577,12 @@ void mpWindow::ZoomOut(const wxPoint& centerPoint )
     m_desiredYmax = m_posY;
     m_desiredYmin = m_posY - (m_scrY - m_marginTop - m_marginBottom) / m_scaleY; // m_desiredYmin = m_posY - m_scrY / m_scaleY;
 
+    if(m_enableLimitedView && (m_desiredXmin < m_minX || m_desiredXmin < m_minX
+                            || m_desiredXmax > m_maxX || m_desiredXmax > m_maxX))
+    {
+        Fit();
+    }
+
 #ifdef MATHPLOT_DO_LOGGING
     wxLogMessage(_("mpWindow::ZoomOut() prior coords: (%f,%f), new coords: (%f,%f) SHOULD BE EQUAL!!"), prior_layer_x,prior_layer_y, p2x(c.x),p2y(c.y));
 #endif
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 43a3dacb97..71cf2b6534 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -101,6 +101,7 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
         m_axis_x( nullptr ), m_axis_y1( nullptr ), m_axis_y2( nullptr ), m_type( aType )
 {
     SetMargins( 10, 10, 10, 10 );
+    LimitView( true );
 
     switch( m_type )
     {
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index 5dbebf580c..a7bb6c488b 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -1155,6 +1155,12 @@ class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
           @return reference to axis colour used in theme */
         const wxColour& GetAxesColour() { return m_axColour; };
 
+        /** Limit zooming & panning to the area used by the plots */
+        void LimitView( bool aEnable )
+        {
+            m_enableLimitedView = aEnable;
+        }
+
     protected:
         void OnPaint         (wxPaintEvent     &event); //!< Paint handler, will plot all attached layers
         void OnSize          (wxSizeEvent      &event); //!< Size handler, will update scroll bar sizes
@@ -1191,6 +1197,16 @@ class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
          */
         virtual bool UpdateBBox();
 
+        /** Applies new X view coordinates depending on the settings
+         * \return true if the changes were applied
+         */
+        virtual bool SetXView( double pos, double desiredMax, double desiredMin );
+
+        /** Applies new Y view coordinates depending on the settings
+         * \return true if the changes were applied
+         */
+        virtual bool SetYView( double pos, double desiredMax, double desiredMin );
+
         //wxList m_layers;    //!< List of attached plot layers
         wxLayerList m_layers; //!< List of attached plot layers
         wxMenu m_popmenu;   //!< Canvas' context menu
@@ -1224,6 +1240,7 @@ class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
         wxBitmap    *m_buff_bmp;            //!< For double buffering
         bool        m_enableDoubleBuffer;  //!< For double buffering
         bool        m_enableMouseNavigation;  //!< For pan/zoom with the mouse.
+        bool        m_enableLimitedView;
         wxPoint     m_mouseMClick;          //!< For the middle button "drag" feature
         wxPoint     m_mouseLClick;          //!< Starting coords for rectangular zoom selection
         bool        m_enableScrollBars;

From 1c74e27366f0779a401b2889a4d57864193716c2 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:37 +0200
Subject: [PATCH 081/197] NETLIST_EXPORTER_PSPICE fix

---
 eeschema/netlist_exporters/netlist_exporter_pspice.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 49773c7cb6..fd805d4cf4 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -67,12 +67,12 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* aFormatter, unsigned aCtl
         {
             // Case of Alt Sequence definition with Unused/Invalid Node index:
             // Valid used Node Indexes are in the set
-            // {0,1,2,...m_SortedComponentPinList.size()-1}
+            // {0,1,2,...m_item.m_pin.size()-1}
             if( !item.m_pinSequence.empty() )
             {
                 // All Vector values must be less <= max package size
                 // And Total Vector size should be <= package size
-                if( ( (unsigned) item.m_pinSequence[ii] < m_SortedComponentPinList.size() )
+                if( ( (unsigned) item.m_pinSequence[ii] < item.m_pins.size() )
                     && ( ii < item.m_pinSequence.size() ) )
                 {
                     // Case of Alt Pin Sequence in control good Index:

From 01f40e258cfb77ca6c48fb4f63585be8168b6505 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:37 +0200
Subject: [PATCH 082/197] More elegant way for checking Spice_Netlist_Enabled
 value

---
 .../netlist_exporters/netlist_exporter_pspice.cpp | 15 ++-------------
 .../netlist_exporters/netlist_exporter_pspice.h   | 11 +++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index fd805d4cf4..c31647f25f 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -249,19 +249,8 @@ void NETLIST_EXPORTER_PSPICE::ProcessNetlist( unsigned aCtl )
 
             spiceItem.m_refName = comp->GetRef( &sheetList[sheet_idx] );
 
-            // Check to see if component should be removed from Spice Netlist:
-            spiceItem.m_enabled = true;     // assume yes and then verify
-
-            if( fieldEnabled )
-            {
-                wxString netlistEnabled = fieldEnabled->GetText();
-
-                // Different ways of saying 'disabled' (no/false/0)
-                if( netlistEnabled.CmpNoCase( "N" ) == 0
-                        || netlistEnabled.CmpNoCase( "F" ) == 0
-                        || netlistEnabled == "0" )
-                    spiceItem.m_enabled = false;
-            }
+            // Check to see if component should be removed from Spice netlist
+                spiceItem.m_enabled = fieldEnabled ? StringToBool( fieldEnabled->GetText() ) : true;
 
             wxArrayString pinNames;
 
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index 74685c9400..ad425c0ebd 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -113,6 +113,17 @@ public:
         return m_directives;
     }
 
+    static bool StringToBool( const wxString& aStr )
+    {
+        if( aStr.IsEmpty() )
+            return false;
+
+        char c = tolower( aStr[0] );
+
+        // Different ways of saying false (no/false/0)
+        return !( c == 'n' || c == 'f' || c == '0' );
+    }
+
 protected:
     virtual void writeDirectives( OUTPUTFORMATTER* aFormatter, unsigned aCtl ) const;
 

From 3a9dcca32fed6a3980ece90b16aec63fc206fe8f Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:38 +0200
Subject: [PATCH 083/197] Enum SPICE_FIELD

---
 .../netlist_exporter_pspice.cpp               | 39 ++++++++++++-------
 .../netlist_exporter_pspice.h                 | 15 ++++++-
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index c31647f25f..f1745cbb91 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -128,10 +128,12 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* aFormatter, unsigned aCtl
 }
 
 
-wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
+wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( SPICE_FIELD aField,
         SCH_COMPONENT* aComponent, unsigned aCtl )
 {
-    if( aField == "Spice_Primitive" )
+    switch( aField )
+    {
+    case SPICE_PRIMITIVE:
     {
         const wxString& refName = aComponent->GetField( REFERENCE )->GetText();
 
@@ -140,9 +142,10 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
             return wxString( "X" );
         else
             return refName.GetChar( 0 );
+        break;
     }
 
-    if( aField == "Spice_Model" )
+    case SPICE_MODEL:
     {
         wxChar prim = aComponent->GetField( REFERENCE )->GetText().GetChar( 0 );
         wxString value = aComponent->GetField( VALUE )->GetText();
@@ -173,14 +176,14 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
         }
 
         return value;
+        break;
     }
 
-    if( aField == "Spice_Netlist_Enabled" )
-    {
+    case SPICE_ENABLED:
         return wxString( "Y" );
-    }
+        break;
 
-    if( aField == "Spice_Node_Sequence" )
+    case SPICE_NODE_SEQUENCE:
     {
         wxString nodeSeq;
         std::vector<LIB_PIN*> pins;
@@ -193,9 +196,16 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( const wxString& aField,
         nodeSeq.Trim();
 
         return nodeSeq;
+        break;
     }
 
-    wxASSERT_MSG( "Missing default value definition for a Spice field: %s" , aField );
+    case SPICE_LIB_FILE:
+        // There is no default Spice library
+        return wxEmptyString;
+        break;
+    }
+
+    wxASSERT_MSG( false, "Missing default value definition for a Spice field" );
 
     return wxString( "<unknown>" );
 }
@@ -236,16 +246,16 @@ void NETLIST_EXPORTER_PSPICE::ProcessNetlist( unsigned aCtl )
             spiceItem.m_parent = comp;
 
             // Obtain Spice fields
-            SCH_FIELD* fieldPrim = comp->FindField( wxT( "Spice_Primitive" ) );
-            SCH_FIELD* fieldModel = comp->FindField( wxT( "Spice_Model" ) );
-            SCH_FIELD* fieldEnabled = comp->FindField( wxT( "Spice_Netlist_Enabled" ) );
-            SCH_FIELD* fieldSeq = comp->FindField( wxT( "Spice_Node_Sequence" ) );
+            SCH_FIELD* fieldPrim = comp->FindField( GetSpiceFieldName( SPICE_PRIMITIVE ) );
+            SCH_FIELD* fieldModel = comp->FindField( GetSpiceFieldName( SPICE_MODEL ) );
+            SCH_FIELD* fieldEnabled = comp->FindField( GetSpiceFieldName( SPICE_ENABLED ) );
+            SCH_FIELD* fieldSeq = comp->FindField( GetSpiceFieldName( SPICE_NODE_SEQUENCE ) );
 
             spiceItem.m_primitive = fieldPrim ? fieldPrim->GetText()[0]
-                : GetSpiceFieldDefVal( "Spice_Primitive", comp, aCtl )[0];
+                : GetSpiceFieldDefVal( SPICE_PRIMITIVE, comp, aCtl )[0];
 
             spiceItem.m_model = fieldModel ? fieldModel->GetText()
-                : GetSpiceFieldDefVal( "Spice_Model", comp, aCtl );
+                : GetSpiceFieldDefVal( SPICE_MODEL, comp, aCtl );
 
             spiceItem.m_refName = comp->GetRef( &sheetList[sheet_idx] );
 
@@ -353,6 +363,7 @@ void NETLIST_EXPORTER_PSPICE::writeDirectives( OUTPUTFORMATTER* aFormatter, unsi
 }
 
 
+// Entries in the vector below have to follow the order in SPICE_FIELD enum
 const std::vector<wxString> NETLIST_EXPORTER_PSPICE::m_spiceFields = {
     "Spice_Primitive",
     "Spice_Model",
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index ad425c0ebd..e4bb229e9e 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -40,6 +40,14 @@ enum SPICE_NETLIST_OPTIONS {
     NET_ALL_FLAGS = 0xffff
 };
 
+enum SPICE_FIELD {
+    SPICE_PRIMITIVE,
+    SPICE_MODEL,
+    SPICE_ENABLED,
+    SPICE_NODE_SEQUENCE,
+    SPICE_LIB_FILE
+};
+
 /// @todo add NET_ADJUST_INCLUDE_PATHS & NET_ADJUST_PASSIVE_VALS checkboxes in the netlist export dialog
 
 /**
@@ -104,7 +112,12 @@ public:
         return m_spiceFields;
     }
 
-    static wxString GetSpiceFieldDefVal( const wxString& aField, SCH_COMPONENT* aComponent, unsigned aCtl );
+    static const wxString& GetSpiceFieldName( SPICE_FIELD aField )
+    {
+        return m_spiceFields[(int) aField];
+    }
+
+    static wxString GetSpiceFieldDefVal( SPICE_FIELD aField, SCH_COMPONENT* aComponent, unsigned aCtl );
 
     void UpdateDirectives( unsigned aCtl );
 

From 63e8e17ccec35068e7a6de1612fc426dbc8bb5be Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:38 +0200
Subject: [PATCH 084/197] Added missing class declaration in sch_component.h

---
 eeschema/sch_component.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eeschema/sch_component.h b/eeschema/sch_component.h
index d2b87ae30d..c8055fa09a 100644
--- a/eeschema/sch_component.h
+++ b/eeschema/sch_component.h
@@ -39,6 +39,7 @@
 #include <vector>
 #include <lib_draw_item.h>
 
+class SCH_SCREEN;
 class SCH_SHEET_PATH;
 class LIB_ITEM;
 class LIB_PIN;

From 428e82ec1a9574a61e99c87b6935cd33edc72ca7 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:38 +0200
Subject: [PATCH 085/197] Removed TODO file

---
 TODO | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 TODO

diff --git a/TODO b/TODO
deleted file mode 100644
index 2e2bf5456c..0000000000
--- a/TODO
+++ /dev/null
@@ -1,36 +0,0 @@
-TEST: fix spice netlist exporter
-view controls (zoom, pan, fit to screen)
-simulation settings
-plot settings - axis range, colors
-check what happens when nets are changed/removed and simulation rerun
-check what happens when the simulator is closed while simulation is running
-cmake check for mathgl, ngspice; there is one in the mathgl repo
-check changes to cmakefiles for temporary & dirty hacks
-tuner
-parameters?
-
-
-optional:
-progress bar (using SendStat callback?)
-export png
-show .cir source?
-"include spice library" in menu? or on sim_plot_frame?
-
--- Installing: /usr/local/lib/python2.7/site-packages/pcbnew.py
--- Up-to-date: /usr/local/share/kicad/scripting/plugins
--- Installing: /usr/local/share/kicad/scripting/plugins/zip_wizard.py
--- Installing: /usr/local/share/kicad/scripting/plugins/sdip_wizard.py
--- Installing: /usr/local/share/kicad/scripting/plugins/PadArray.py
--- Installing: /usr/local/share/kicad/scripting/plugins/HelpfulFootprintWizardPlugin.py
--- Installing: /usr/local/share/kicad/scripting/plugins/touch_slider_wizard.py
--- Installing: /usr/local/share/kicad/scripting/plugins/FPC_(SMD_type)_footprintwizard.py
--- Installing: /usr/local/share/kicad/scripting/plugins/__init__.py
--- Installing: /usr/local/share/kicad/scripting/plugins/bga_wizard.py
--- Installing: /usr/local/share/kicad/scripting/plugins/qfp_wizard.py
--- Installing: /usr/local/share/kicad/scripting/plugins/circular_pad_array_wizard.py
--- Installing: /usr/local/share/kicad/scripting/plugins/FootprintWizardDrawingAids.py
--- Installing: /usr/local/share/kicad/scripting/plugins/uss39_barcode.py
--- Installing: /usr/local/share/kicad/scripting/plugins/qfn_wizard.py
--- Installing: /usr/local/share/kicad/scripting/kicad_pyshell
--- Installing: /usr/local/share/kicad/scripting/kicad_pyshell/__init__.py
--- Installing: /usr/local/lib/python2.7/site-packages/_pcbnew.so

From 4dc62e061bd27ac21532a075886d0fca10d71236 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:39 +0200
Subject: [PATCH 086/197] SPICE_VALUE class to handle Spice value expressions

---
 .../netlist_exporter_pspice.cpp               | 85 +++++++++++++++++++
 .../netlist_exporter_pspice.h                 | 37 ++++++++
 2 files changed, 122 insertions(+)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index f1745cbb91..466925f7d1 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -363,6 +363,91 @@ void NETLIST_EXPORTER_PSPICE::writeDirectives( OUTPUTFORMATTER* aFormatter, unsi
 }
 
 
+SPICE_VALUE::SPICE_VALUE( const wxString& aString )
+{
+    char buf[8] = { 0, };
+
+    if( sscanf( (const char*) aString.c_str(), "%lf%7s", &m_base, buf ) == 0 )
+        throw std::invalid_argument( "Invalid Spice value string" );
+
+    if( *buf == 0 )
+    {
+        m_prefix = PFX_NONE;
+        return;
+    }
+
+    for( char* bufPtr = buf; *bufPtr; ++bufPtr )
+        *bufPtr = tolower( *bufPtr );
+
+    if( !strcmp( buf, "meg" ) )
+    {
+        m_prefix = PFX_MEGA;
+    }
+    else
+    {
+        switch( buf[0] )
+        {
+            case 'f': m_prefix = PFX_FEMTO; break;
+            case 'p': m_prefix = PFX_PICO; break;
+            case 'n': m_prefix = PFX_NANO; break;
+            case 'u': m_prefix = PFX_MICRO; break;
+            case 'm': m_prefix = PFX_MILI; break;
+            case 'k': m_prefix = PFX_KILO; break;
+            case 'g': m_prefix = PFX_GIGA; break;
+            case 't': m_prefix = PFX_TERA; break;
+
+            default:
+                throw std::invalid_argument( "Invalid unit prefix" );
+        }
+    }
+}
+
+
+SPICE_VALUE::SPICE_VALUE( int aInt, UNIT_PREFIX aPrefix )
+    : m_base( aInt ), m_prefix( aPrefix )
+{
+}
+
+
+SPICE_VALUE::SPICE_VALUE( double aDouble, UNIT_PREFIX aPrefix )
+    : m_base( aDouble ), m_prefix( aPrefix )
+{
+}
+
+
+double SPICE_VALUE::ToDouble() const
+{
+    double res = m_base;
+
+    if( m_prefix != PFX_NONE )
+        res *= pow( 10, (int) m_prefix );
+
+    return res;
+}
+
+
+wxString SPICE_VALUE::ToSpiceString() const
+{
+    wxString res = wxString::Format( "%f", m_base );
+
+    switch( m_prefix )
+    {
+        case PFX_FEMTO: res += "f"; break;
+        case PFX_PICO:  res += "p"; break;
+        case PFX_NANO:  res += "n"; break;
+        case PFX_MICRO: res += "u"; break;
+        case PFX_MILI:  res += "m"; break;
+        case PFX_NONE:  break;
+        case PFX_KILO:  res += "k"; break;
+        case PFX_MEGA:  res += "Meg"; break;
+        case PFX_GIGA:  res += "G"; break;
+        case PFX_TERA:  res += "T"; break;
+    }
+
+    return res;
+}
+
+
 // Entries in the vector below have to follow the order in SPICE_FIELD enum
 const std::vector<wxString> NETLIST_EXPORTER_PSPICE::m_spiceFields = {
     "Spice_Primitive",
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index e4bb229e9e..3b9728e75f 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -154,4 +154,41 @@ private:
     static const std::vector<wxString> m_spiceFields;
 };
 
+
+// Helper class to handle Spice way of expressing values (e.g. 10.5m)
+class SPICE_VALUE
+{
+public:
+    enum UNIT_PREFIX
+    {
+        PFX_FEMTO   = -15,
+        PFX_PICO    = -12,
+        PFX_NANO    = -9,
+        PFX_MICRO   = -6,
+        PFX_MILI    = -3,
+        PFX_NONE    = 0,
+        PFX_KILO    = 3,
+        PFX_MEGA    = 6,
+        PFX_GIGA    = 9,
+        PFX_TERA    = 12
+    };
+
+    SPICE_VALUE( const wxString& aString );
+    SPICE_VALUE( int aInt, UNIT_PREFIX aPrefix = PFX_NONE );
+    SPICE_VALUE( double aDouble, UNIT_PREFIX aPrefix = PFX_NONE );
+
+    double ToDouble() const;
+
+    wxString ToSpiceString() const;
+
+    wxString ToString() const
+    {
+        return wxString::Format( "%f", ToDouble() );
+    }
+
+private:
+    double m_base;
+    UNIT_PREFIX m_prefix;
+};
+
 #endif

From 3e2061158e381ffb09c90ec7edd0d481a7302a40 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:39 +0200
Subject: [PATCH 087/197] SIM_PLOT_FRAME: Do not update plots if the just run a
 different type of simulation

---
 eeschema/sim/sim_plot_frame.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 0561a1e9d6..8fbc3c8a64 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -501,14 +501,14 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
             m_signals->Append( net.first );
     }
 
+    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
+
+    if( plotPanel == nullptr || plotPanel->GetType() != simType )
+        return;
+
     // If there are any signals plotted, update them
     if( SIM_PLOT_PANEL::IsPlottable( simType ) )
     {
-        SIM_PLOT_PANEL* plotPanel = CurrentPlot();
-
-        if( plotPanel == nullptr )
-            return;
-
         for( const auto& trace : plotPanel->GetTraces() )
             updatePlot( trace.second->GetSpiceName(), trace.second->GetName(), plotPanel );
 

From 246a43baf0681da61c064a8addcc26f68519b2cd Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:40 +0200
Subject: [PATCH 088/197] Spice model editor dialog

---
 eeschema/CMakeLists.txt                       |    2 +
 .../dialog_edit_component_in_schematic.cpp    |   31 +-
 ...dialog_edit_component_in_schematic_fbp.cpp |    7 +-
 ...dialog_edit_component_in_schematic_fbp.fbp |    4 +-
 .../dialog_edit_component_in_schematic_fbp.h  |    2 +-
 eeschema/dialogs/dialog_spice_model.cpp       |  611 ++
 eeschema/dialogs/dialog_spice_model.h         |   97 +
 eeschema/dialogs/dialog_spice_model_base.cpp  |  473 +
 eeschema/dialogs/dialog_spice_model_base.fbp  | 7616 +++++++++++++++++
 eeschema/dialogs/dialog_spice_model_base.h    |  148 +
 .../netlist_exporter_pspice.h                 |   15 +-
 11 files changed, 8974 insertions(+), 32 deletions(-)
 create mode 100644 eeschema/dialogs/dialog_spice_model.cpp
 create mode 100644 eeschema/dialogs/dialog_spice_model.h
 create mode 100644 eeschema/dialogs/dialog_spice_model_base.cpp
 create mode 100644 eeschema/dialogs/dialog_spice_model_base.fbp
 create mode 100644 eeschema/dialogs/dialog_spice_model_base.h

diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 4014b4f374..64e797eca4 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -186,6 +186,8 @@ set( EESCHEMA_SRCS
     sim/netlist_exporter_pspice_sim.cpp
     dialogs/dialog_sim_settings.cpp
     dialogs/dialog_sim_settings_base.cpp
+    dialogs/dialog_spice_model.cpp
+    dialogs/dialog_spice_model_base.cpp
 
     netlist_exporters/netlist_exporter.cpp
     netlist_exporters/netlist_exporter_cadstar.cpp
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
index e72882c719..6cbb0f77ba 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
@@ -46,6 +46,7 @@
 #include <sch_validators.h>
 
 #include <dialog_edit_component_in_schematic_fbp.h>
+#include <dialog_spice_model.h>
 #include <netlist_exporter_pspice.h>
 
 
@@ -135,7 +136,7 @@ private:
         FinishDialogSettings();
     }
 
-    void EditSpiceFields( wxCommandEvent& event );
+    void EditSpiceModel( wxCommandEvent& event ) override;
 
     SCH_FIELD* findField( const wxString& aFieldName );
 
@@ -287,31 +288,13 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnSelectChipName( wxCommandEvent& event
 }
 
 
-void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::EditSpiceFields( wxCommandEvent& event )
+void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::EditSpiceModel( wxCommandEvent& event )
 {
-    for( const auto& fieldName : NETLIST_EXPORTER_PSPICE::GetSpiceFields() )
-    {
-        SCH_FIELD* schField = findField( fieldName );
-        // @todo move everything to the bottom, so the fields are grouped and in the same order?
+    setSelectedFieldNdx( 0 );
+    DIALOG_SPICE_MODEL dialog( this, *m_cmp, m_FieldsBuf );
 
-        // Do not modify the existing value, just add missing fields with default values
-        if( schField == NULL )
-        {
-            unsigned fieldNdx = m_FieldsBuf.size();
-            SCH_FIELD newField( wxPoint(), fieldNdx, m_cmp, fieldName );
-            newField.SetOrientation( m_FieldsBuf[REFERENCE].GetOrientation() );
-            m_FieldsBuf.push_back( newField );
-            schField = &m_FieldsBuf.back();
-        }
-
-        if( schField->GetText().IsEmpty() )
-        {
-            schField->SetText( NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( fieldName, m_cmp,
-                NET_USE_X_PREFIX | NET_ADJUST_INCLUDE_PATHS | NET_ADJUST_PASSIVE_VALS ) );
-        }
-    }
-
-    updateDisplay();
+    if( dialog.ShowModal() == wxID_OK )
+        updateDisplay();
 }
 
 
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp
index 39fb52cd28..78fa9b8364 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp
@@ -100,8 +100,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
 
 	m_staticline1 = new wxStaticLine( optionsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
 	optionsSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
-
-	spiceFieldsButton = new wxButton( optionsSizer->GetStaticBox(), wxID_ANY, _("Add Spice fields"), wxDefaultPosition, wxDefaultSize, 0 );
+	spiceFieldsButton = new wxButton( optionsSizer->GetStaticBox(), wxID_ANY, _("Edit Spice model"), wxDefaultPosition, wxDefaultSize, 0 );
 	optionsSizer->Add( spiceFieldsButton, 0, wxALL|wxEXPAND, 5 );
 
 	defaultsButton = new wxButton( optionsSizer->GetStaticBox(), wxID_ANY, _("Reset to Library Defaults"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -296,7 +295,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
 	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnInitDlg ) );
 	m_buttonTestChipName->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnTestChipName ), NULL, this );
 	m_buttonSelectChipName->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnSelectChipName ), NULL, this );
-	spiceFieldsButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::EditSpiceFields ), NULL, this );
+	spiceFieldsButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::EditSpiceModel ), NULL, this );
 	defaultsButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::SetInitCmp ), NULL, this );
 	fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnListItemDeselected ), NULL, this );
 	fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnListItemSelected ), NULL, this );
@@ -315,7 +314,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::~DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
 	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnInitDlg ) );
 	m_buttonTestChipName->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnTestChipName ), NULL, this );
 	m_buttonSelectChipName->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnSelectChipName ), NULL, this );
-	spiceFieldsButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::EditSpiceFields ), NULL, this );
+	spiceFieldsButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::EditSpiceModel ), NULL, this );
 	defaultsButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::SetInitCmp ), NULL, this );
 	fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnListItemDeselected ), NULL, this );
 	fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnListItemSelected ), NULL, this );
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp
index 0bc9b0f873..767623ccef 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp
@@ -1312,7 +1312,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Add Spice fields</property>
+                                        <property name="label">Edit Spice model</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -1341,7 +1341,7 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
-                                        <event name="OnButtonClick">EditSpiceFields</event>
+                                        <event name="OnButtonClick">EditSpiceModel</event>
                                         <event name="OnChar"></event>
                                         <event name="OnEnterWindow"></event>
                                         <event name="OnEraseBackground"></event>
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h
index d2087a70cc..ae76c9476c 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h
@@ -89,7 +89,7 @@ class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP : public DIALOG_SHIM
 		virtual void OnInitDlg( wxInitDialogEvent& event ) { event.Skip(); }
 		virtual void OnTestChipName( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnSelectChipName( wxCommandEvent& event ) { event.Skip(); }
-		virtual void EditSpiceFields( wxCommandEvent& event ) { event.Skip(); }
+		virtual void EditSpiceModel( wxCommandEvent& event ) { event.Skip(); }
 		virtual void SetInitCmp( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
 		virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp
new file mode 100644
index 0000000000..e2c2ba201e
--- /dev/null
+++ b/eeschema/dialogs/dialog_spice_model.cpp
@@ -0,0 +1,611 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "dialog_spice_model.h"
+#include <netlist_exporters/netlist_exporter_pspice.h>
+
+#include <wx/tokenzr.h>
+
+// Helper function to shorten conditions
+static bool empty( const wxTextCtrl* aCtrl )
+{
+    return aCtrl->GetValue().IsEmpty();
+}
+
+
+// Function to sort PWL values list
+static int wxCALLBACK comparePwlValues( wxIntPtr aItem1, wxIntPtr aItem2, wxIntPtr WXUNUSED( aSortData ) )
+{
+    float* t1 = reinterpret_cast<float*>( &aItem1 );
+    float* t2 = reinterpret_cast<float*>( &aItem2 );
+
+    if( *t1 > *t2 )
+        return 1;
+
+    if( *t1 < *t2 )
+        return -1;
+
+    return 0;
+}
+
+
+DIALOG_SPICE_MODEL::DIALOG_SPICE_MODEL( wxWindow* aParent, SCH_COMPONENT& aComponent, SCH_FIELDS& aFields )
+    : DIALOG_SPICE_MODEL_BASE( aParent ), m_component( aComponent ), m_fields( aFields )
+{
+    m_pwlTimeCol = m_pwlValList->AppendColumn( "Time [s]", wxLIST_FORMAT_LEFT, 100 );
+    m_pwlValueCol = m_pwlValList->AppendColumn( "Value [V/A]", wxLIST_FORMAT_LEFT, 100 );
+
+    m_sdbSizerOK->SetDefault();
+}
+
+// TODO validators
+
+
+bool DIALOG_SPICE_MODEL::TransferDataFromWindow()
+{
+    if( !DIALOG_SPICE_MODEL_BASE::TransferDataFromWindow() )
+        return false;
+
+    wxWindow* page = m_notebook->GetCurrentPage();
+
+    // Passive
+    if( page == m_passive )
+    {
+        switch( m_pasType->GetSelection() )
+        {
+            case 0: m_fieldsTmp[SPICE_PRIMITIVE] = (char) SP_RESISTOR; break;
+            case 1: m_fieldsTmp[SPICE_PRIMITIVE] = (char) SP_CAPACITOR; break;
+            case 2: m_fieldsTmp[SPICE_PRIMITIVE] = (char) SP_INDUCTOR; break;
+
+            default:
+                wxASSERT_MSG( false, "Unhandled passive type" );
+                return false;
+                break;
+        }
+
+        m_fieldsTmp[SPICE_MODEL] = m_pasValue->GetValue();
+    }
+
+
+    // Semiconductor
+    else if( page == m_semiconductor )
+    {
+        switch( m_semiType->GetSelection() )
+        {
+            case 0: m_fieldsTmp[SPICE_PRIMITIVE] = (char) SP_DIODE; break;
+            case 1: m_fieldsTmp[SPICE_PRIMITIVE] = (char) SP_BJT; break;
+            case 2: m_fieldsTmp[SPICE_PRIMITIVE] = (char) SP_MOSFET; break;
+
+            default:
+                wxASSERT_MSG( false, "Unhandled semiconductor type" );
+                return false;
+                break;
+        }
+
+        m_fieldsTmp[SPICE_MODEL] = m_semiModel->GetValue();
+
+        if( !empty( m_semiLib ) )
+            m_fieldsTmp[SPICE_LIB_FILE] = m_semiLib->GetValue();
+    }
+
+
+    // Integrated circuit
+    else if( page == m_ic )
+    {
+        m_fieldsTmp[SPICE_PRIMITIVE] = (char) SP_SUBCKT;
+        m_fieldsTmp[SPICE_MODEL] = m_icModel->GetValue();
+
+        if( !empty( m_icLib ) )
+            m_fieldsTmp[SPICE_LIB_FILE] = m_icLib->GetValue();
+    }
+
+
+    // Power source
+    else if( page == m_power )
+    {
+        wxString model;
+
+        if( !generatePowerSource( model ) )
+            return false;
+
+        m_fieldsTmp[SPICE_PRIMITIVE] = (char)( m_pwrType->GetSelection() ? SP_ISOURCE : SP_VSOURCE );
+        m_fieldsTmp[SPICE_MODEL] = model;
+    }
+
+
+    else
+    {
+        wxASSERT_MSG( false, "Unhandled model type" );
+        return false;
+    }
+
+    m_fieldsTmp[SPICE_ENABLED] = !m_disabled->GetValue() ? "Y" : "N";        // note bool inversion
+    m_fieldsTmp[SPICE_NODE_SEQUENCE] = m_nodeSeqCheck->IsChecked() ? m_nodeSeqVal->GetValue() : "";
+
+    // Apply the settings
+    for( int i = 0; i < SPICE_FIELD_END; ++i )
+    {
+        if( m_fieldsTmp.count( (SPICE_FIELD) i ) > 0 && !m_fieldsTmp.at( i ).IsEmpty() )
+        {
+            getField( i ).SetText( m_fieldsTmp[i] );
+        }
+        else
+        {
+            // Erase empty fields (having empty fields causes a warning in the properties dialog)
+            const wxString& spiceField = NETLIST_EXPORTER_PSPICE::GetSpiceFieldName( (SPICE_FIELD) i );
+
+            auto fieldIt = std::find_if( m_fields.begin(), m_fields.end(), [&]( const SCH_FIELD& f ) {
+                return f.GetName() == spiceField;
+            } );
+
+            if( fieldIt != m_fields.end() )
+                m_fields.erase( fieldIt );
+        }
+    }
+
+    return true;
+}
+
+
+bool DIALOG_SPICE_MODEL::TransferDataToWindow()
+{
+    const auto& spiceFields = NETLIST_EXPORTER_PSPICE::GetSpiceFields();
+
+    // Fill out the working buffer
+    for( unsigned int idx = 0; idx < spiceFields.size(); ++idx )
+    {
+        const wxString& spiceField = spiceFields[idx];
+
+        auto fieldIt = std::find_if( m_fields.begin(), m_fields.end(), [&]( const SCH_FIELD& f ) {
+            return f.GetName() == spiceField;
+        } );
+
+        // Do not modify the existing value, just add missing fields with default values
+        if( fieldIt != m_fields.end() && !fieldIt->GetText().IsEmpty() )
+            m_fieldsTmp[idx] = fieldIt->GetText();
+        else
+            m_fieldsTmp[idx] = NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( (SPICE_FIELD) idx, &m_component,
+                NET_USE_X_PREFIX | NET_ADJUST_INCLUDE_PATHS | NET_ADJUST_PASSIVE_VALS );
+    }
+
+    // Analyze the component fields to fill out the dialog
+    char primitive = toupper( m_fieldsTmp[SPICE_PRIMITIVE][0] );
+
+    switch( primitive )
+    {
+        case SP_RESISTOR:
+        case SP_CAPACITOR:
+        case SP_INDUCTOR:
+            m_notebook->SetSelection( m_notebook->FindPage( m_passive ) );
+            m_pasType->SetSelection( primitive == SP_RESISTOR ? 0
+                    : primitive == SP_CAPACITOR ? 1
+                    : primitive == SP_INDUCTOR ? 2
+                    : -1 );
+            m_pasValue->SetValue( m_fieldsTmp[SPICE_MODEL] );
+            break;
+
+        case SP_DIODE:
+        case SP_BJT:
+        case SP_MOSFET:
+            m_notebook->SetSelection( m_notebook->FindPage( m_semiconductor ) );
+            m_semiType->SetSelection( primitive == SP_DIODE ? 0
+                    : primitive == SP_BJT ? 1
+                    : primitive == SP_MOSFET ? 2
+                    : -1 );
+            m_semiModel->SetValue( m_fieldsTmp[SPICE_MODEL] );
+            m_semiLib->SetValue( m_fieldsTmp[SPICE_LIB_FILE] );
+
+            if( !empty( m_semiLib ) )
+            {
+                const wxString& libFile = m_semiLib->GetValue();
+                m_fieldsTmp[SPICE_LIB_FILE] = libFile;
+                updateFromFile( m_semiModel, libFile, "model" );
+            }
+            break;
+
+        case SP_SUBCKT:
+            m_notebook->SetSelection( m_notebook->FindPage( m_ic ) );
+            m_icModel->SetValue( m_fieldsTmp[SPICE_MODEL] );
+            m_icLib->SetValue( m_fieldsTmp[SPICE_LIB_FILE] );
+
+            if( !empty( m_icLib ) )
+            {
+                const wxString& libFile = m_icLib->GetValue();
+                m_fieldsTmp[SPICE_LIB_FILE] = libFile;
+                updateFromFile( m_icModel, libFile, "subckt" );
+            }
+            break;
+
+        case SP_VSOURCE:
+        case SP_ISOURCE:
+            if( !parsePowerSource( m_fieldsTmp[SPICE_MODEL] ) )
+                return false;
+
+            m_notebook->SetSelection( m_notebook->FindPage( m_power ) );
+            m_pwrType->SetSelection( primitive == SP_ISOURCE ? 1 : 0 );
+            break;
+
+        default:
+            wxASSERT_MSG( false, "Unhandled Spice primitive type" );
+            break;
+    }
+
+    m_disabled->SetValue( !NETLIST_EXPORTER_PSPICE::StringToBool( m_fieldsTmp[SPICE_ENABLED] ) );
+
+    // Check if node sequence is different than the default one
+    if( m_fieldsTmp[SPICE_NODE_SEQUENCE]
+            != NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( SPICE_NODE_SEQUENCE, &m_component, 0 ) )
+    {
+        m_nodeSeqCheck->SetValue( true );
+        m_nodeSeqVal->SetValue( m_fieldsTmp[SPICE_NODE_SEQUENCE] );
+    }
+
+    return DIALOG_SPICE_MODEL_BASE::TransferDataToWindow();
+}
+
+
+bool DIALOG_SPICE_MODEL::parsePowerSource( const wxString& aModel )
+{
+    if( aModel.IsEmpty() )
+        return false;
+
+    // Variables used for generic values processing (filling out wxTextCtrls in sequence)
+    bool genericProcessing = false;
+    unsigned int genericReqParamsCount = 0;
+    std::vector<wxTextCtrl*> genericControls;
+
+    wxStringTokenizer tokenizer( aModel, " ()" );
+    wxString tkn = tokenizer.GetNextToken().Lower();
+
+    try
+    {
+        if( tkn == "dc" )
+        {
+            m_powerNotebook->SetSelection( m_powerNotebook->FindPage( m_pwrGeneric ) );
+            tkn = tokenizer.GetNextToken().Lower();
+
+            // it might be an optional "dc" or "trans" directive
+            if( tkn == "dc" || tkn == "trans" )
+                tkn = tokenizer.GetNextToken().Lower();
+
+            // DC value
+            m_genDc->SetValue( SPICE_VALUE( tkn ).ToString() );
+
+            if( !tokenizer.HasMoreTokens() )
+                return true;
+
+            tkn = tokenizer.GetNextToken().Lower();
+
+            if( tkn != "ac" )
+                return false;
+
+            // AC magnitude
+            tkn = tokenizer.GetNextToken().Lower();
+            m_genAcMag->SetValue( SPICE_VALUE( tkn ).ToString() );
+
+            // AC phase
+            tkn = tokenizer.GetNextToken().Lower();
+            m_genAcMag->SetValue( SPICE_VALUE( tkn ).ToString() );
+        }
+
+
+        else if( tkn == "pulse" )
+        {
+            m_powerNotebook->SetSelection( m_powerNotebook->FindPage( m_pwrPulse ) );
+
+            genericProcessing = true;
+            genericReqParamsCount = 2;
+            genericControls = { m_pulseInit, m_pulseNominal, m_pulseDelay,
+                m_pulseRise, m_pulseFall, m_pulseWidth, m_pulsePeriod };
+        }
+
+
+        else if( tkn == "sin" )
+        {
+            m_powerNotebook->SetSelection( m_powerNotebook->FindPage( m_pwrSin ) );
+
+            genericProcessing = true;
+            genericReqParamsCount = 2;
+            genericControls = { m_sinOffset, m_sinAmplitude, m_sinFreq, m_sinDelay, m_sinDampFactor };
+        }
+
+
+        else if( tkn == "exp" )
+        {
+            m_powerNotebook->SetSelection( m_powerNotebook->FindPage( m_pwrExp ) );
+
+            genericProcessing = true;
+            genericReqParamsCount = 2;
+            genericControls = { m_expInit, m_expPulsed,
+                m_expRiseDelay, m_expRiseConst, m_expFallDelay, m_expFallConst };
+        }
+
+
+        else if( tkn == "pwl" )
+        {
+            m_powerNotebook->SetSelection( m_powerNotebook->FindPage( m_pwrPwl ) );
+
+            while( tokenizer.HasMoreTokens() )
+            {
+                tkn = tokenizer.GetNextToken();
+                SPICE_VALUE time( tkn );
+
+                tkn = tokenizer.GetNextToken();
+                SPICE_VALUE value( tkn );
+
+                addPwlValue( time.ToString(), value.ToString() );
+            }
+        }
+
+
+        else
+        {
+            // Unhandled power source type
+            return false;
+        }
+
+
+        if( genericProcessing )
+        {
+            for( unsigned int i = 0; i < genericControls.size(); ++i )
+            {
+                // If there are no more tokens, let's check if we got at least required fields
+                if( !tokenizer.HasMoreTokens() )
+                    return ( i >= genericReqParamsCount );
+
+                tkn = tokenizer.GetNextToken().Lower();
+                genericControls[i]->SetValue( SPICE_VALUE( tkn ).ToString() );
+            }
+        }
+    }
+    catch( std::exception& e )
+    {
+        // Nothing, the dialog simply will not be filled
+        return false;
+    }
+
+    return true;
+}
+
+
+bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
+{
+    wxString res;
+    wxWindow* page = m_powerNotebook->GetCurrentPage();
+
+    // Variables for generic processing
+    bool genericProcessing = false;
+    unsigned int genericReqParamsCount = 0;
+    std::vector<wxTextCtrl*> genericControls;
+
+    if( page == m_pwrGeneric )
+    {
+        if( empty( m_genDc ) && empty( m_genAcMag ) )
+            return false;
+
+        if( !empty( m_genDc ) )
+            res += wxString::Format( "dc %s", m_genDc->GetValue() );
+
+        if( !empty( m_genAcMag ) )
+        {
+            res += wxString::Format( " ac %s", m_genAcMag->GetValue() );
+
+            if( !empty( m_genAcPhase ) )
+            res += wxString::Format( " %s", m_genAcPhase->GetValue() );
+        }
+    }
+
+
+    else if( page == m_pwrPulse )
+    {
+        genericProcessing = true;
+        res = "pulse";
+        genericReqParamsCount = 2;
+        genericControls = { m_pulseInit, m_pulseNominal, m_pulseDelay,
+            m_pulseRise, m_pulseFall, m_pulseWidth, m_pulsePeriod };
+    }
+
+
+    else if( page == m_pwrSin )
+    {
+        genericProcessing = true;
+        res = "sin";
+        genericReqParamsCount = 2;
+        genericControls = { m_sinOffset, m_sinAmplitude, m_sinFreq, m_sinDelay, m_sinDampFactor };
+    }
+
+
+    else if( page == m_pwrExp )
+    {
+        genericProcessing = true;
+        res = "exp";
+        genericReqParamsCount = 2;
+        genericControls = { m_expInit, m_expPulsed,
+            m_expRiseDelay, m_expRiseConst, m_expFallDelay, m_expFallConst };
+    }
+
+
+    else if( page == m_pwrPwl )
+    {
+        res = "pwl(";
+
+        for( int i = 0; i < m_pwlValList->GetItemCount(); ++i )
+        {
+            res += wxString::Format( "%s %s ", m_pwlValList->GetItemText( i, m_pwlTimeCol ),
+                                                m_pwlValList->GetItemText( i, m_pwlValueCol ) );
+        }
+
+        res += ")";
+    }
+
+    if( genericProcessing )
+    {
+        unsigned int paramCounter = 0;
+
+        res += "(";
+
+        for( auto textCtrl : genericControls )
+        {
+            if( empty( textCtrl ) )
+            {
+                if( paramCounter < genericReqParamsCount )
+                    return false;
+
+                break;
+            }
+
+            res += wxString::Format( "%s ", textCtrl->GetValue() );
+            ++paramCounter;
+        }
+
+        res += ")";
+    }
+
+    aTarget = res;
+
+    return true;
+}
+
+
+void DIALOG_SPICE_MODEL::updateFromFile( wxComboBox* aComboBox,
+        const wxString& aFilePath, const wxString& aKeyword )
+{
+    wxString curValue = aComboBox->GetValue();
+    const wxString keyword( aKeyword.Lower() );
+    wxTextFile file;
+
+    if( !file.Open( aFilePath ) )
+        return;
+
+    aComboBox->Clear();
+
+    // Process the file, looking for components
+    for( wxString line = file.GetFirstLine().Lower(); !file.Eof(); line = file.GetNextLine().Lower() )
+    {
+        int idx = line.Find( keyword );
+
+        if( idx != wxNOT_FOUND )
+        {
+            wxString data = line.Mid( idx );
+            data = data.AfterFirst( ' ' );
+            data = data.BeforeFirst( ' ' );
+            data = data.Trim();
+
+            if( !data.IsEmpty() )
+                aComboBox->Append( data );
+        }
+    }
+
+    // Restore the previous value
+    if( !curValue.IsEmpty() )
+        aComboBox->SetValue( curValue );
+    else if( aComboBox->GetCount() > 0 )
+        aComboBox->SetSelection( 0 );
+}
+
+
+SCH_FIELD& DIALOG_SPICE_MODEL::getField( int aFieldType )
+{
+    const wxString& spiceField = NETLIST_EXPORTER_PSPICE::GetSpiceFieldName( (SPICE_FIELD) aFieldType );
+
+    auto fieldIt = std::find_if( m_fields.begin(), m_fields.end(), [&]( const SCH_FIELD& f ) {
+        return f.GetName() == spiceField;
+    } );
+
+    // Found one, so return it
+    if( fieldIt != m_fields.end() )
+        return *fieldIt;
+
+    // Create a new field with requested name
+    m_fields.emplace_back( wxPoint(), m_fields.size(), &m_component, spiceField );
+    return m_fields.back();
+}
+
+
+bool DIALOG_SPICE_MODEL::addPwlValue( const wxString& aTime, const wxString& aValue )
+{
+    // TODO execute validators
+    if( aTime.IsEmpty() || aValue.IsEmpty() )
+        return false;
+
+    long idx = m_pwlValList->InsertItem( m_pwlTimeCol, aTime );
+    m_pwlValList->SetItem( idx, m_pwlValueCol, aValue );
+
+    // There is no wxString::ToFloat, but we need to guarantee it fits in 4 bytes
+    double timeD;
+    float timeF;
+    m_pwlTime->GetValue().ToDouble( &timeD );
+    timeF = timeD;
+
+    // Store the time value, so the entries can be sorted
+    m_pwlValList->SetItemData( idx, *reinterpret_cast<long*>( &timeF ) );
+
+    // Sort items by timestamp
+    m_pwlValList->SortItems( comparePwlValues, -1 );
+
+    return true;
+}
+
+
+void DIALOG_SPICE_MODEL::onSemiSelectLib( wxCommandEvent& event )
+{
+    wxFileDialog openDlg( this, wxT( "Select library" ),
+            wxFileName( m_semiLib->GetValue() ).GetPath(), "",
+            "Spice library file (*.lib)|*.lib;*.LIB|Any file|*",
+            wxFD_OPEN | wxFD_FILE_MUST_EXIST );
+
+    if( openDlg.ShowModal() == wxID_CANCEL )
+        return;
+
+    m_semiLib->SetValue( openDlg.GetPath() );
+    updateFromFile( m_semiModel, openDlg.GetPath(), "model" );
+}
+
+
+void DIALOG_SPICE_MODEL::onSelectIcLib( wxCommandEvent& event )
+{
+    wxFileDialog openDlg( this, wxT( "Select library" ),
+            wxFileName( m_icLib->GetValue() ).GetPath(), "",
+            "Spice library file (*.lib)|*.lib;*.LIB|Any file|*",
+            wxFD_OPEN | wxFD_FILE_MUST_EXIST );
+
+    if( openDlg.ShowModal() == wxID_CANCEL )
+        return;
+
+    m_icLib->SetValue( openDlg.GetPath() );
+    updateFromFile( m_icModel, openDlg.GetPath(), "subckt" );
+}
+
+
+void DIALOG_SPICE_MODEL::onPwlAdd( wxCommandEvent& event )
+{
+    addPwlValue( m_pwlTime->GetValue(), m_pwlValue->GetValue() );
+}
+
+
+void DIALOG_SPICE_MODEL::onPwlRemove( wxCommandEvent& event )
+{
+    long idx = m_pwlValList->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+    m_pwlValList->DeleteItem( idx );
+}
diff --git a/eeschema/dialogs/dialog_spice_model.h b/eeschema/dialogs/dialog_spice_model.h
new file mode 100644
index 0000000000..4323ce7e51
--- /dev/null
+++ b/eeschema/dialogs/dialog_spice_model.h
@@ -0,0 +1,97 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef DIALOG_SPICE_MODEL_H
+#define DIALOG_SPICE_MODEL_H
+
+#include "dialog_spice_model_base.h"
+#include <sch_component.h>
+
+class DIALOG_SPICE_MODEL : public DIALOG_SPICE_MODEL_BASE
+{
+public:
+    DIALOG_SPICE_MODEL( wxWindow* aParent, SCH_COMPONENT& aComponent, SCH_FIELDS& aSchFields );
+
+private:
+    /**
+     * Parse a string describing a power source, so appropriate settings are checked in the dialog
+     * @param aModel contains the string to be parse (e.g. sin(0 1 10k))
+     * @return True if the input string was parsed without errors.
+     */
+    bool parsePowerSource( const wxString& aModel );
+
+    /**
+     * Generates a string to describe power source parameters, basing on the current selection.
+     * If there are missing fields, it will not modify the target string.
+     * @param aTarget is the destination for the generated string.
+     * @return True if the string was saved successfully.
+     */
+    bool generatePowerSource( wxString& aTarget ) const;
+
+    /**
+     * Loads a list of components from a file and adds them to a combo box.
+     * @param aComboBox is the target combo box
+     * @param aFilePath is the file to be processed
+     * @param aKeyword is the keyword to select the type of components (e.g. "subckt" or "model")
+     */
+    void updateFromFile( wxComboBox* aComboBox, const wxString& aFilePath, const wxString& aKeyword );
+
+    /**
+     * Returns or creates a field in the edited schematic fields vector.
+     * @param aFieldType is an SPICE_FIELD enum value.
+     * @return Requested field.
+     */
+    SCH_FIELD& getField( int aFieldType );
+
+    /**
+     * Adds a value to the PWL values list.
+     * @param aTime is the time value.
+     * @param aValue is the source value at the given time.
+     * @return True if request has completed successfully, false if the data is invalid.
+     */
+    bool addPwlValue( const wxString& aTime, const wxString& aValue );
+
+    bool TransferDataFromWindow() override;
+    bool TransferDataToWindow() override;
+
+    // Event handlers
+    void onSemiSelectLib( wxCommandEvent& event ) override;
+    void onSelectIcLib( wxCommandEvent& event ) override;
+    void onPwlAdd( wxCommandEvent& event ) override;
+    void onPwlRemove( wxCommandEvent& event ) override;
+
+    ///> Edited component
+    SCH_COMPONENT& m_component;
+
+    ///> Fields from the component properties dialog
+    SCH_FIELDS& m_fields;
+
+    ///> Temporary field values
+    std::map<int, wxString> m_fieldsTmp;
+
+    ///> Column identifiers for PWL power source value list
+    long m_pwlTimeCol, m_pwlValueCol;
+};
+
+#endif /* DIALOG_SPICE_MODEL_H */
diff --git a/eeschema/dialogs/dialog_spice_model_base.cpp b/eeschema/dialogs/dialog_spice_model_base.cpp
new file mode 100644
index 0000000000..05b4633741
--- /dev/null
+++ b/eeschema/dialogs/dialog_spice_model_base.cpp
@@ -0,0 +1,473 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_spice_model_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer1;
+	bSizer1 = new wxBoxSizer( wxVERTICAL );
+	
+	m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_passive = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxFlexGridSizer* fgSizer1;
+	fgSizer1 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer1->AddGrowableCol( 0 );
+	fgSizer1->SetFlexibleDirection( wxBOTH );
+	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText2 = new wxStaticText( m_passive, wxID_ANY, _("Type"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText2->Wrap( -1 );
+	fgSizer1->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_pasType = new wxComboBox( m_passive, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY );
+	m_pasType->Append( _("Resistor") );
+	m_pasType->Append( _("Capacitor") );
+	m_pasType->Append( _("Inductor") );
+	fgSizer1->Add( m_pasType, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText3 = new wxStaticText( m_passive, wxID_ANY, _("Value"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText3->Wrap( -1 );
+	fgSizer1->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_pasValue = new wxTextCtrl( m_passive, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_pasValue->SetMinSize( wxSize( 200,-1 ) );
+	
+	fgSizer1->Add( m_pasValue, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	m_passive->SetSizer( fgSizer1 );
+	m_passive->Layout();
+	fgSizer1->Fit( m_passive );
+	m_notebook->AddPage( m_passive, _("Passive"), true );
+	m_semiconductor = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxFlexGridSizer* fgSizer3;
+	fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0 );
+	fgSizer3->AddGrowableCol( 0 );
+	fgSizer3->SetFlexibleDirection( wxBOTH );
+	fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText4 = new wxStaticText( m_semiconductor, wxID_ANY, _("Type"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText4->Wrap( -1 );
+	fgSizer3->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_semiType = new wxComboBox( m_semiconductor, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY );
+	m_semiType->Append( _("Diode") );
+	m_semiType->Append( _("Bipolar transistor (BJT)") );
+	m_semiType->Append( _("MOSFET") );
+	fgSizer3->Add( m_semiType, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticText5 = new wxStaticText( m_semiconductor, wxID_ANY, _("Model"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText5->Wrap( -1 );
+	fgSizer3->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_semiModel = new wxComboBox( m_semiconductor, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	fgSizer3->Add( m_semiModel, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticText7 = new wxStaticText( m_semiconductor, wxID_ANY, _("Library"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText7->Wrap( -1 );
+	fgSizer3->Add( m_staticText7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_semiLib = new wxTextCtrl( m_semiconductor, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
+	fgSizer3->Add( m_semiLib, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
+	
+	m_semiSelectLib = new wxButton( m_semiconductor, wxID_ANY, _("Select file..."), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer3->Add( m_semiSelectLib, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	m_semiconductor->SetSizer( fgSizer3 );
+	m_semiconductor->Layout();
+	fgSizer3->Fit( m_semiconductor );
+	m_notebook->AddPage( m_semiconductor, _("Semiconductor"), false );
+	m_ic = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxFlexGridSizer* fgSizer4;
+	fgSizer4 = new wxFlexGridSizer( 0, 3, 0, 0 );
+	fgSizer4->AddGrowableCol( 0 );
+	fgSizer4->SetFlexibleDirection( wxBOTH );
+	fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText8 = new wxStaticText( m_ic, wxID_ANY, _("Model"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText8->Wrap( -1 );
+	fgSizer4->Add( m_staticText8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_icModel = new wxComboBox( m_ic, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	m_icModel->SetMinSize( wxSize( 200,-1 ) );
+	
+	fgSizer4->Add( m_icModel, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	fgSizer4->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticText9 = new wxStaticText( m_ic, wxID_ANY, _("Library"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText9->Wrap( -1 );
+	fgSizer4->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_icLib = new wxTextCtrl( m_ic, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
+	fgSizer4->Add( m_icLib, 0, wxALL|wxEXPAND, 5 );
+	
+	m_icSelectLib = new wxButton( m_ic, wxID_ANY, _("Select file..."), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer4->Add( m_icSelectLib, 0, wxALL, 5 );
+	
+	
+	m_ic->SetSizer( fgSizer4 );
+	m_ic->Layout();
+	fgSizer4->Fit( m_ic );
+	m_notebook->AddPage( m_ic, _("Integrated circuit"), false );
+	m_power = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer4;
+	bSizer4 = new wxBoxSizer( wxVERTICAL );
+	
+	m_powerNotebook = new wxNotebook( m_power, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_pwrGeneric = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxFlexGridSizer* fgSizer6;
+	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer6->AddGrowableCol( 0 );
+	fgSizer6->SetFlexibleDirection( wxBOTH );
+	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText10 = new wxStaticText( m_pwrGeneric, wxID_ANY, _("DC [V/A]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText10->Wrap( -1 );
+	fgSizer6->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_genDc = new wxTextCtrl( m_pwrGeneric, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_genDc->SetMinSize( wxSize( 200,-1 ) );
+	
+	fgSizer6->Add( m_genDc, 0, wxALL, 5 );
+	
+	m_staticText11 = new wxStaticText( m_pwrGeneric, wxID_ANY, _("AC magnitude [V/A]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText11->Wrap( -1 );
+	fgSizer6->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_genAcMag = new wxTextCtrl( m_pwrGeneric, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer6->Add( m_genAcMag, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText12 = new wxStaticText( m_pwrGeneric, wxID_ANY, _("AC phase [rad]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText12->Wrap( -1 );
+	fgSizer6->Add( m_staticText12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_genAcPhase = new wxTextCtrl( m_pwrGeneric, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer6->Add( m_genAcPhase, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	m_pwrGeneric->SetSizer( fgSizer6 );
+	m_pwrGeneric->Layout();
+	fgSizer6->Fit( m_pwrGeneric );
+	m_powerNotebook->AddPage( m_pwrGeneric, _("Generic"), true );
+	m_pwrPulse = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxFlexGridSizer* fgSizer7;
+	fgSizer7 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer7->AddGrowableCol( 0 );
+	fgSizer7->SetFlexibleDirection( wxBOTH );
+	fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText13 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Initial value [V/A]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText13->Wrap( -1 );
+	fgSizer7->Add( m_staticText13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_pulseInit = new wxTextCtrl( m_pwrPulse, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_pulseInit->SetMinSize( wxSize( 200,-1 ) );
+	
+	fgSizer7->Add( m_pulseInit, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText14 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Pulsed value [V/A]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText14->Wrap( -1 );
+	fgSizer7->Add( m_staticText14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_pulseNominal = new wxTextCtrl( m_pwrPulse, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer7->Add( m_pulseNominal, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText15 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Delay time [s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText15->Wrap( -1 );
+	fgSizer7->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_pulseDelay = new wxTextCtrl( m_pwrPulse, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer7->Add( m_pulseDelay, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText16 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Rise time [s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText16->Wrap( -1 );
+	fgSizer7->Add( m_staticText16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_pulseRise = new wxTextCtrl( m_pwrPulse, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer7->Add( m_pulseRise, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText17 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Fall time [s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText17->Wrap( -1 );
+	fgSizer7->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_pulseFall = new wxTextCtrl( m_pwrPulse, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer7->Add( m_pulseFall, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText18 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Pulse width [s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText18->Wrap( -1 );
+	fgSizer7->Add( m_staticText18, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_pulseWidth = new wxTextCtrl( m_pwrPulse, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer7->Add( m_pulseWidth, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText20 = new wxStaticText( m_pwrPulse, wxID_ANY, _("Period [s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText20->Wrap( -1 );
+	fgSizer7->Add( m_staticText20, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_pulsePeriod = new wxTextCtrl( m_pwrPulse, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer7->Add( m_pulsePeriod, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	m_pwrPulse->SetSizer( fgSizer7 );
+	m_pwrPulse->Layout();
+	fgSizer7->Fit( m_pwrPulse );
+	m_powerNotebook->AddPage( m_pwrPulse, _("Pulse"), false );
+	m_pwrSin = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxFlexGridSizer* fgSizer8;
+	fgSizer8 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer8->AddGrowableCol( 0 );
+	fgSizer8->SetFlexibleDirection( wxBOTH );
+	fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText21 = new wxStaticText( m_pwrSin, wxID_ANY, _("DC offset [V/A]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText21->Wrap( -1 );
+	fgSizer8->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_sinOffset = new wxTextCtrl( m_pwrSin, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_sinOffset->SetMinSize( wxSize( 200,-1 ) );
+	
+	fgSizer8->Add( m_sinOffset, 0, wxALL, 5 );
+	
+	m_staticText22 = new wxStaticText( m_pwrSin, wxID_ANY, _("Amplitude [V/A]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText22->Wrap( -1 );
+	fgSizer8->Add( m_staticText22, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_sinAmplitude = new wxTextCtrl( m_pwrSin, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer8->Add( m_sinAmplitude, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText23 = new wxStaticText( m_pwrSin, wxID_ANY, _("Frequency [Hz]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText23->Wrap( -1 );
+	fgSizer8->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_sinFreq = new wxTextCtrl( m_pwrSin, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer8->Add( m_sinFreq, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText24 = new wxStaticText( m_pwrSin, wxID_ANY, _("Delay [s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText24->Wrap( -1 );
+	fgSizer8->Add( m_staticText24, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_sinDelay = new wxTextCtrl( m_pwrSin, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer8->Add( m_sinDelay, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText25 = new wxStaticText( m_pwrSin, wxID_ANY, _("Damping factor [1/s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText25->Wrap( -1 );
+	fgSizer8->Add( m_staticText25, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_sinDampFactor = new wxTextCtrl( m_pwrSin, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer8->Add( m_sinDampFactor, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	m_pwrSin->SetSizer( fgSizer8 );
+	m_pwrSin->Layout();
+	fgSizer8->Fit( m_pwrSin );
+	m_powerNotebook->AddPage( m_pwrSin, _("Sinusoidal"), false );
+	m_pwrExp = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxFlexGridSizer* fgSizer9;
+	fgSizer9 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer9->AddGrowableCol( 0 );
+	fgSizer9->SetFlexibleDirection( wxBOTH );
+	fgSizer9->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText26 = new wxStaticText( m_pwrExp, wxID_ANY, _("Initial value [V/A]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText26->Wrap( -1 );
+	fgSizer9->Add( m_staticText26, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_expInit = new wxTextCtrl( m_pwrExp, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_expInit->SetMinSize( wxSize( 200,-1 ) );
+	
+	fgSizer9->Add( m_expInit, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText27 = new wxStaticText( m_pwrExp, wxID_ANY, _("Pulsed value [V/A]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText27->Wrap( -1 );
+	fgSizer9->Add( m_staticText27, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_expPulsed = new wxTextCtrl( m_pwrExp, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer9->Add( m_expPulsed, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText28 = new wxStaticText( m_pwrExp, wxID_ANY, _("Rise delay time [s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText28->Wrap( -1 );
+	fgSizer9->Add( m_staticText28, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_expRiseDelay = new wxTextCtrl( m_pwrExp, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer9->Add( m_expRiseDelay, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText29 = new wxStaticText( m_pwrExp, wxID_ANY, _("Rise time constant [s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText29->Wrap( -1 );
+	fgSizer9->Add( m_staticText29, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_expRiseConst = new wxTextCtrl( m_pwrExp, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer9->Add( m_expRiseConst, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText30 = new wxStaticText( m_pwrExp, wxID_ANY, _("Fall delay time [s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText30->Wrap( -1 );
+	fgSizer9->Add( m_staticText30, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_expFallDelay = new wxTextCtrl( m_pwrExp, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer9->Add( m_expFallDelay, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText31 = new wxStaticText( m_pwrExp, wxID_ANY, _("Fall time constant [s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText31->Wrap( -1 );
+	fgSizer9->Add( m_staticText31, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_expFallConst = new wxTextCtrl( m_pwrExp, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer9->Add( m_expFallConst, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	m_pwrExp->SetSizer( fgSizer9 );
+	m_pwrExp->Layout();
+	fgSizer9->Fit( m_pwrExp );
+	m_powerNotebook->AddPage( m_pwrExp, _("Exponential"), false );
+	m_pwrPwl = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_pwrPwl->SetToolTip( _("Piece-wise linear") );
+	
+	wxFlexGridSizer* fgSizer15;
+	fgSizer15 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer15->AddGrowableCol( 0 );
+	fgSizer15->AddGrowableRow( 1 );
+	fgSizer15->SetFlexibleDirection( wxBOTH );
+	fgSizer15->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
+	
+	wxFlexGridSizer* fgSizer10;
+	fgSizer10 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer10->AddGrowableCol( 0 );
+	fgSizer10->SetFlexibleDirection( wxBOTH );
+	fgSizer10->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText34 = new wxStaticText( m_pwrPwl, wxID_ANY, _("Time [s]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText34->Wrap( -1 );
+	fgSizer10->Add( m_staticText34, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_pwlTime = new wxTextCtrl( m_pwrPwl, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_pwlTime->SetMinSize( wxSize( 200,-1 ) );
+	
+	fgSizer10->Add( m_pwlTime, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticText35 = new wxStaticText( m_pwrPwl, wxID_ANY, _("Value [V/A]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText35->Wrap( -1 );
+	fgSizer10->Add( m_staticText35, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_pwlValue = new wxTextCtrl( m_pwrPwl, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer10->Add( m_pwlValue, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	fgSizer15->Add( fgSizer10, 1, wxEXPAND, 5 );
+	
+	m_pwlAddButton = new wxButton( m_pwrPwl, wxID_ANY, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer15->Add( m_pwlAddButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_pwlValList = new wxListCtrl( m_pwrPwl, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL );
+	m_pwlValList->SetMinSize( wxSize( 200,-1 ) );
+	
+	fgSizer15->Add( m_pwlValList, 0, wxALL|wxEXPAND, 5 );
+	
+	m_pwlRemoveBtn = new wxButton( m_pwrPwl, wxID_ANY, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer15->Add( m_pwlRemoveBtn, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	m_pwrPwl->SetSizer( fgSizer15 );
+	m_pwrPwl->Layout();
+	fgSizer15->Fit( m_pwrPwl );
+	m_powerNotebook->AddPage( m_pwrPwl, _("PWL"), false );
+	m_pwrFm = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_pwrFm->Hide();
+	
+	m_powerNotebook->AddPage( m_pwrFm, _("FM"), false );
+	m_pwrAm = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_pwrAm->Hide();
+	
+	m_powerNotebook->AddPage( m_pwrAm, _("AM"), false );
+	m_pwrTransNoise = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_pwrTransNoise->Hide();
+	
+	m_powerNotebook->AddPage( m_pwrTransNoise, _("Transient noise"), false );
+	m_pwrRandom = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_pwrRandom->Hide();
+	
+	m_powerNotebook->AddPage( m_pwrRandom, _("Random"), false );
+	m_pwrExtData = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_pwrExtData->Hide();
+	
+	m_powerNotebook->AddPage( m_pwrExtData, _("External data"), false );
+	
+	bSizer4->Add( m_powerNotebook, 1, wxEXPAND | wxALL, 5 );
+	
+	wxString m_pwrTypeChoices[] = { _("Voltage"), _("Current") };
+	int m_pwrTypeNChoices = sizeof( m_pwrTypeChoices ) / sizeof( wxString );
+	m_pwrType = new wxRadioBox( m_power, wxID_ANY, _("Source type"), wxDefaultPosition, wxDefaultSize, m_pwrTypeNChoices, m_pwrTypeChoices, 1, wxRA_SPECIFY_ROWS );
+	m_pwrType->SetSelection( 0 );
+	bSizer4->Add( m_pwrType, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	m_power->SetSizer( bSizer4 );
+	m_power->Layout();
+	bSizer4->Fit( m_power );
+	m_notebook->AddPage( m_power, _("Power source"), false );
+	
+	bSizer1->Add( m_notebook, 1, wxEXPAND | wxALL, 5 );
+	
+	m_disabled = new wxCheckBox( this, wxID_ANY, _("Disable component for simulation"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer1->Add( m_disabled, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	wxBoxSizer* bSizer2;
+	bSizer2 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_nodeSeqCheck = new wxCheckBox( this, wxID_ANY, _("Alternate node sequence:"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer2->Add( m_nodeSeqCheck, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_nodeSeqVal = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_nodeSeqVal->SetMinSize( wxSize( 200,-1 ) );
+	
+	bSizer2->Add( m_nodeSeqVal, 0, wxALL, 5 );
+	
+	
+	bSizer1->Add( bSizer2, 0, wxEXPAND, 5 );
+	
+	m_sdbSizer = new wxStdDialogButtonSizer();
+	m_sdbSizerOK = new wxButton( this, wxID_OK );
+	m_sdbSizer->AddButton( m_sdbSizerOK );
+	m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
+	m_sdbSizer->AddButton( m_sdbSizerCancel );
+	m_sdbSizer->Realize();
+	
+	bSizer1->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bSizer1 );
+	this->Layout();
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	m_semiSelectLib->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SPICE_MODEL_BASE::onSemiSelectLib ), NULL, this );
+	m_icSelectLib->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SPICE_MODEL_BASE::onSelectIcLib ), NULL, this );
+	m_pwlAddButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SPICE_MODEL_BASE::onPwlAdd ), NULL, this );
+	m_pwlRemoveBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SPICE_MODEL_BASE::onPwlRemove ), NULL, this );
+}
+
+DIALOG_SPICE_MODEL_BASE::~DIALOG_SPICE_MODEL_BASE()
+{
+	// Disconnect Events
+	m_semiSelectLib->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SPICE_MODEL_BASE::onSemiSelectLib ), NULL, this );
+	m_icSelectLib->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SPICE_MODEL_BASE::onSelectIcLib ), NULL, this );
+	m_pwlAddButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SPICE_MODEL_BASE::onPwlAdd ), NULL, this );
+	m_pwlRemoveBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SPICE_MODEL_BASE::onPwlRemove ), NULL, this );
+	
+}
diff --git a/eeschema/dialogs/dialog_spice_model_base.fbp b/eeschema/dialogs/dialog_spice_model_base.fbp
new file mode 100644
index 0000000000..4753b063ef
--- /dev/null
+++ b/eeschema/dialogs/dialog_spice_model_base.fbp
@@ -0,0 +1,7616 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<wxFormBuilder_Project>
+    <FileVersion major="1" minor="13" />
+    <object class="Project" expanded="1">
+        <property name="class_decoration"></property>
+        <property name="code_generation">C++</property>
+        <property name="disconnect_events">1</property>
+        <property name="disconnect_mode">source_name</property>
+        <property name="disconnect_php_events">0</property>
+        <property name="disconnect_python_events">0</property>
+        <property name="embedded_files_path">res</property>
+        <property name="encoding">UTF-8</property>
+        <property name="event_generation">connect</property>
+        <property name="file">dialog_spice_model_base</property>
+        <property name="first_id">1000</property>
+        <property name="help_provider">none</property>
+        <property name="internationalize">1</property>
+        <property name="name">DIALOG_SPICE_MODEL_BASE</property>
+        <property name="namespace"></property>
+        <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="aui_managed">0</property>
+            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
+            <property name="bg"></property>
+            <property name="center">wxBOTH</property>
+            <property name="context_help"></property>
+            <property name="context_menu">1</property>
+            <property name="enabled">1</property>
+            <property name="event_handler">impl_virtual</property>
+            <property name="extra_style"></property>
+            <property name="fg"></property>
+            <property name="font"></property>
+            <property name="hidden">0</property>
+            <property name="id">wxID_ANY</property>
+            <property name="maximum_size"></property>
+            <property name="minimum_size"></property>
+            <property name="name">DIALOG_SPICE_MODEL_BASE</property>
+            <property name="pos"></property>
+            <property name="size">425,630</property>
+            <property name="style">wxDEFAULT_DIALOG_STYLE</property>
+            <property name="subclass"></property>
+            <property name="title"></property>
+            <property name="tooltip"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style"></property>
+            <event name="OnActivate"></event>
+            <event name="OnActivateApp"></event>
+            <event name="OnAuiFindManager"></event>
+            <event name="OnAuiPaneButton"></event>
+            <event name="OnAuiPaneClose"></event>
+            <event name="OnAuiPaneMaximize"></event>
+            <event name="OnAuiPaneRestore"></event>
+            <event name="OnAuiRender"></event>
+            <event name="OnChar"></event>
+            <event name="OnClose"></event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnHibernate"></event>
+            <event name="OnIconize"></event>
+            <event name="OnIdle"></event>
+            <event name="OnInitDialog"></event>
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI"></event>
+            <object class="wxBoxSizer" expanded="1">
+                <property name="minimum_size"></property>
+                <property name="name">bSizer1</property>
+                <property name="orient">wxVERTICAL</property>
+                <property name="permission">none</property>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND | wxALL</property>
+                    <property name="proportion">1</property>
+                    <object class="wxNotebook" 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_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="bitmapsize"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</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="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">m_notebook</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="style"></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"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnNotebookPageChanged"></event>
+                        <event name="OnNotebookPageChanging"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                        <object class="notebookpage" expanded="0">
+                            <property name="bitmap"></property>
+                            <property name="label">Passive</property>
+                            <property name="select">1</property>
+                            <object class="wxPanel" expanded="0">
+                                <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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_passive</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxFlexGridSizer" expanded="0">
+                                    <property name="cols">2</property>
+                                    <property name="flexible_direction">wxBOTH</property>
+                                    <property name="growablecols">0</property>
+                                    <property name="growablerows"></property>
+                                    <property name="hgap">0</property>
+                                    <property name="minimum_size"></property>
+                                    <property name="name">fgSizer1</property>
+                                    <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                    <property name="permission">none</property>
+                                    <property name="rows">0</property>
+                                    <property name="vgap">0</property>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxStaticText" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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="label">Type</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">m_staticText2</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></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"></property>
+                                            <property name="wrap">-1</property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALL|wxEXPAND</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxComboBox" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</property>
+                                            <property name="center_pane">0</property>
+                                            <property name="choices">&quot;Resistor&quot; &quot;Capacitor&quot; &quot;Inductor&quot;</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="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">m_pasType</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="selection">-1</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style">wxCB_READONLY</property>
+                                            <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="value"></property>
+                                            <property name="window_extra_style"></property>
+                                            <property name="window_name"></property>
+                                            <property name="window_style"></property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnCombobox"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnText"></event>
+                                            <event name="OnTextEnter"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxStaticText" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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="label">Value</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">m_staticText3</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></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"></property>
+                                            <property name="wrap">-1</property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALL|wxEXPAND</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxTextCtrl" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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="maxlength"></property>
+                                            <property name="min_size"></property>
+                                            <property name="minimize_button">0</property>
+                                            <property name="minimum_size">200,-1</property>
+                                            <property name="moveable">1</property>
+                                            <property name="name">m_pasValue</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></property>
+                                            <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="value"></property>
+                                            <property name="window_extra_style"></property>
+                                            <property name="window_name"></property>
+                                            <property name="window_style"></property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnText"></event>
+                                            <event name="OnTextEnter"></event>
+                                            <event name="OnTextMaxLen"></event>
+                                            <event name="OnTextURL"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="notebookpage" expanded="0">
+                            <property name="bitmap"></property>
+                            <property name="label">Semiconductor</property>
+                            <property name="select">0</property>
+                            <object class="wxPanel" expanded="0">
+                                <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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_semiconductor</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxFlexGridSizer" expanded="0">
+                                    <property name="cols">3</property>
+                                    <property name="flexible_direction">wxBOTH</property>
+                                    <property name="growablecols">0</property>
+                                    <property name="growablerows"></property>
+                                    <property name="hgap">0</property>
+                                    <property name="minimum_size"></property>
+                                    <property name="name">fgSizer3</property>
+                                    <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                    <property name="permission">none</property>
+                                    <property name="rows">0</property>
+                                    <property name="vgap">0</property>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxStaticText" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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="label">Type</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">m_staticText4</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></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"></property>
+                                            <property name="wrap">-1</property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALL|wxEXPAND</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxComboBox" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</property>
+                                            <property name="center_pane">0</property>
+                                            <property name="choices">&quot;Diode&quot; &quot;Bipolar transistor (BJT)&quot; &quot;MOSFET&quot;</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="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">m_semiType</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="selection">-1</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style">wxCB_READONLY</property>
+                                            <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="value"></property>
+                                            <property name="window_extra_style"></property>
+                                            <property name="window_name"></property>
+                                            <property name="window_style"></property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnCombobox"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnText"></event>
+                                            <event name="OnTextEnter"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND</property>
+                                        <property name="proportion">1</property>
+                                        <object class="spacer" expanded="0">
+                                            <property name="height">0</property>
+                                            <property name="permission">protected</property>
+                                            <property name="width">0</property>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxStaticText" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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="label">Model</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">m_staticText5</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></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"></property>
+                                            <property name="wrap">-1</property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="1">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALL|wxEXPAND</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxComboBox" 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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</property>
+                                            <property name="center_pane">0</property>
+                                            <property name="choices"></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="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">m_semiModel</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="selection">-1</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></property>
+                                            <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="value"></property>
+                                            <property name="window_extra_style"></property>
+                                            <property name="window_name"></property>
+                                            <property name="window_style"></property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnCombobox"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnText"></event>
+                                            <event name="OnTextEnter"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND</property>
+                                        <property name="proportion">1</property>
+                                        <object class="spacer" expanded="0">
+                                            <property name="height">0</property>
+                                            <property name="permission">protected</property>
+                                            <property name="width">0</property>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxStaticText" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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="label">Library</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">m_staticText7</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></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"></property>
+                                            <property name="wrap">-1</property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxTextCtrl" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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="maxlength"></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">m_semiLib</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style">wxTE_READONLY</property>
+                                            <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="value"></property>
+                                            <property name="window_extra_style"></property>
+                                            <property name="window_name"></property>
+                                            <property name="window_style"></property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnText"></event>
+                                            <event name="OnTextEnter"></event>
+                                            <event name="OnTextMaxLen"></event>
+                                            <event name="OnTextURL"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxButton" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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">0</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="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="label">Select file...</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">m_semiSelectLib</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></property>
+                                            <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>
+                                            <event name="OnButtonClick">onSemiSelectLib</event>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="notebookpage" expanded="1">
+                            <property name="bitmap"></property>
+                            <property name="label">Integrated circuit</property>
+                            <property name="select">0</property>
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_ic</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxFlexGridSizer" expanded="1">
+                                    <property name="cols">3</property>
+                                    <property name="flexible_direction">wxBOTH</property>
+                                    <property name="growablecols">0</property>
+                                    <property name="growablerows"></property>
+                                    <property name="hgap">0</property>
+                                    <property name="minimum_size"></property>
+                                    <property name="name">fgSizer4</property>
+                                    <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                    <property name="permission">none</property>
+                                    <property name="rows">0</property>
+                                    <property name="vgap">0</property>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxStaticText" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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="label">Model</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">m_staticText8</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></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"></property>
+                                            <property name="wrap">-1</property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="1">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALL|wxEXPAND</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxComboBox" 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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</property>
+                                            <property name="center_pane">0</property>
+                                            <property name="choices"></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="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">200,-1</property>
+                                            <property name="moveable">1</property>
+                                            <property name="name">m_icModel</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="selection">-1</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></property>
+                                            <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="value"></property>
+                                            <property name="window_extra_style"></property>
+                                            <property name="window_name"></property>
+                                            <property name="window_style"></property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnCombobox"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnText"></event>
+                                            <event name="OnTextEnter"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND</property>
+                                        <property name="proportion">1</property>
+                                        <object class="spacer" expanded="0">
+                                            <property name="height">0</property>
+                                            <property name="permission">protected</property>
+                                            <property name="width">0</property>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxStaticText" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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="label">Library</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">m_staticText9</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></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"></property>
+                                            <property name="wrap">-1</property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALL|wxEXPAND</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxTextCtrl" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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="maxlength"></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">m_icLib</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style">wxTE_READONLY</property>
+                                            <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="value"></property>
+                                            <property name="window_extra_style"></property>
+                                            <property name="window_name"></property>
+                                            <property name="window_style"></property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnText"></event>
+                                            <event name="OnTextEnter"></event>
+                                            <event name="OnTextMaxLen"></event>
+                                            <event name="OnTextURL"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALL</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxButton" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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">0</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="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="label">Select file...</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">m_icSelectLib</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></property>
+                                            <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>
+                                            <event name="OnButtonClick">onSelectIcLib</event>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="notebookpage" expanded="0">
+                            <property name="bitmap"></property>
+                            <property name="label">Power source</property>
+                            <property name="select">0</property>
+                            <object class="wxPanel" expanded="0">
+                                <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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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">m_power</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxBoxSizer" expanded="0">
+                                    <property name="minimum_size"></property>
+                                    <property name="name">bSizer4</property>
+                                    <property name="orient">wxVERTICAL</property>
+                                    <property name="permission">none</property>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND | wxALL</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxNotebook" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="bitmapsize"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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">m_powerNotebook</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></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"></property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnNotebookPageChanged"></event>
+                                            <event name="OnNotebookPageChanging"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                            <object class="notebookpage" expanded="0">
+                                                <property name="bitmap"></property>
+                                                <property name="label">Generic</property>
+                                                <property name="select">1</property>
+                                                <object class="wxPanel" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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">m_pwrGeneric</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                    <object class="wxFlexGridSizer" expanded="0">
+                                                        <property name="cols">2</property>
+                                                        <property name="flexible_direction">wxBOTH</property>
+                                                        <property name="growablecols">0</property>
+                                                        <property name="growablerows"></property>
+                                                        <property name="hgap">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="name">fgSizer6</property>
+                                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                                        <property name="permission">none</property>
+                                                        <property name="rows">0</property>
+                                                        <property name="vgap">0</property>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">DC [V/A]</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">m_staticText10</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></property>
+                                                                <property name="min_size"></property>
+                                                                <property name="minimize_button">0</property>
+                                                                <property name="minimum_size">200,-1</property>
+                                                                <property name="moveable">1</property>
+                                                                <property name="name">m_genDc</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">AC magnitude [V/A]</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">m_staticText11</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_genAcMag</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">AC phase [rad]</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">m_staticText12</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_genAcPhase</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                    </object>
+                                                </object>
+                                            </object>
+                                            <object class="notebookpage" expanded="0">
+                                                <property name="bitmap"></property>
+                                                <property name="label">Pulse</property>
+                                                <property name="select">0</property>
+                                                <object class="wxPanel" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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">m_pwrPulse</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                    <object class="wxFlexGridSizer" expanded="0">
+                                                        <property name="cols">2</property>
+                                                        <property name="flexible_direction">wxBOTH</property>
+                                                        <property name="growablecols">0</property>
+                                                        <property name="growablerows"></property>
+                                                        <property name="hgap">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="name">fgSizer7</property>
+                                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                                        <property name="permission">none</property>
+                                                        <property name="rows">0</property>
+                                                        <property name="vgap">0</property>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Initial value [V/A]</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">m_staticText13</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></property>
+                                                                <property name="min_size"></property>
+                                                                <property name="minimize_button">0</property>
+                                                                <property name="minimum_size">200,-1</property>
+                                                                <property name="moveable">1</property>
+                                                                <property name="name">m_pulseInit</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Pulsed value [V/A]</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">m_staticText14</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_pulseNominal</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Delay time [s]</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">m_staticText15</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_pulseDelay</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Rise time [s]</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">m_staticText16</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_pulseRise</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Fall time [s]</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">m_staticText17</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_pulseFall</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Pulse width [s]</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">m_staticText18</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_pulseWidth</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Period [s]</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">m_staticText20</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_pulsePeriod</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                    </object>
+                                                </object>
+                                            </object>
+                                            <object class="notebookpage" expanded="0">
+                                                <property name="bitmap"></property>
+                                                <property name="label">Sinusoidal</property>
+                                                <property name="select">0</property>
+                                                <object class="wxPanel" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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">m_pwrSin</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                    <object class="wxFlexGridSizer" expanded="0">
+                                                        <property name="cols">2</property>
+                                                        <property name="flexible_direction">wxBOTH</property>
+                                                        <property name="growablecols">0</property>
+                                                        <property name="growablerows"></property>
+                                                        <property name="hgap">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="name">fgSizer8</property>
+                                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                                        <property name="permission">none</property>
+                                                        <property name="rows">0</property>
+                                                        <property name="vgap">0</property>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">DC offset [V/A]</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">m_staticText21</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></property>
+                                                                <property name="min_size"></property>
+                                                                <property name="minimize_button">0</property>
+                                                                <property name="minimum_size">200,-1</property>
+                                                                <property name="moveable">1</property>
+                                                                <property name="name">m_sinOffset</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Amplitude [V/A]</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">m_staticText22</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_sinAmplitude</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Frequency [Hz]</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">m_staticText23</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_sinFreq</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Delay [s]</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">m_staticText24</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_sinDelay</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Damping factor [1/s]</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">m_staticText25</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_sinDampFactor</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                    </object>
+                                                </object>
+                                            </object>
+                                            <object class="notebookpage" expanded="0">
+                                                <property name="bitmap"></property>
+                                                <property name="label">Exponential</property>
+                                                <property name="select">0</property>
+                                                <object class="wxPanel" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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">m_pwrExp</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                    <object class="wxFlexGridSizer" expanded="0">
+                                                        <property name="cols">2</property>
+                                                        <property name="flexible_direction">wxBOTH</property>
+                                                        <property name="growablecols">0</property>
+                                                        <property name="growablerows"></property>
+                                                        <property name="hgap">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="name">fgSizer9</property>
+                                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                                        <property name="permission">none</property>
+                                                        <property name="rows">0</property>
+                                                        <property name="vgap">0</property>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Initial value [V/A]</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">m_staticText26</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></property>
+                                                                <property name="min_size"></property>
+                                                                <property name="minimize_button">0</property>
+                                                                <property name="minimum_size">200,-1</property>
+                                                                <property name="moveable">1</property>
+                                                                <property name="name">m_expInit</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Pulsed value [V/A]</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">m_staticText27</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_expPulsed</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Rise delay time [s]</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">m_staticText28</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_expRiseDelay</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Rise time constant [s]</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">m_staticText29</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_expRiseConst</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Fall delay time [s]</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">m_staticText30</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_expFallDelay</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxStaticText" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="label">Fall time constant [s]</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">m_staticText31</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <property name="wrap">-1</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_expFallConst</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                    </object>
+                                                </object>
+                                            </object>
+                                            <object class="notebookpage" expanded="0">
+                                                <property name="bitmap"></property>
+                                                <property name="label">PWL</property>
+                                                <property name="select">0</property>
+                                                <object class="wxPanel" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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">m_pwrPwl</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="subclass"></property>
+                                                    <property name="toolbar_pane">0</property>
+                                                    <property name="tooltip">Piece-wise linear</property>
+                                                    <property name="window_extra_style"></property>
+                                                    <property name="window_name"></property>
+                                                    <property name="window_style">wxTAB_TRAVERSAL</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                    <object class="wxFlexGridSizer" expanded="0">
+                                                        <property name="cols">2</property>
+                                                        <property name="flexible_direction">wxBOTH</property>
+                                                        <property name="growablecols">0</property>
+                                                        <property name="growablerows">1</property>
+                                                        <property name="hgap">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="name">fgSizer15</property>
+                                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_ALL</property>
+                                                        <property name="permission">none</property>
+                                                        <property name="rows">0</property>
+                                                        <property name="vgap">0</property>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxEXPAND</property>
+                                                            <property name="proportion">1</property>
+                                                            <object class="wxFlexGridSizer" expanded="0">
+                                                                <property name="cols">2</property>
+                                                                <property name="flexible_direction">wxBOTH</property>
+                                                                <property name="growablecols">0</property>
+                                                                <property name="growablerows"></property>
+                                                                <property name="hgap">0</property>
+                                                                <property name="minimum_size"></property>
+                                                                <property name="name">fgSizer10</property>
+                                                                <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                                                <property name="permission">none</property>
+                                                                <property name="rows">0</property>
+                                                                <property name="vgap">0</property>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Time [s]</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">m_staticText34</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></property>
+                                                                        <property name="min_size"></property>
+                                                                        <property name="minimize_button">0</property>
+                                                                        <property name="minimum_size">200,-1</property>
+                                                                        <property name="moveable">1</property>
+                                                                        <property name="name">m_pwlTime</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Value [V/A]</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">m_staticText35</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_pwlValue</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxButton" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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">0</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="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="label">Add</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">m_pwlAddButton</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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>
+                                                                <event name="OnButtonClick">onPwlAdd</event>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxListCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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">200,-1</property>
+                                                                <property name="moveable">1</property>
+                                                                <property name="name">m_pwlValList</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style">wxLC_REPORT|wxLC_SINGLE_SEL</property>
+                                                                <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>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnListBeginDrag"></event>
+                                                                <event name="OnListBeginLabelEdit"></event>
+                                                                <event name="OnListBeginRDrag"></event>
+                                                                <event name="OnListCacheHint"></event>
+                                                                <event name="OnListColBeginDrag"></event>
+                                                                <event name="OnListColClick"></event>
+                                                                <event name="OnListColDragging"></event>
+                                                                <event name="OnListColEndDrag"></event>
+                                                                <event name="OnListColRightClick"></event>
+                                                                <event name="OnListDeleteAllItems"></event>
+                                                                <event name="OnListDeleteItem"></event>
+                                                                <event name="OnListEndLabelEdit"></event>
+                                                                <event name="OnListInsertItem"></event>
+                                                                <event name="OnListItemActivated"></event>
+                                                                <event name="OnListItemDeselected"></event>
+                                                                <event name="OnListItemFocused"></event>
+                                                                <event name="OnListItemMiddleClick"></event>
+                                                                <event name="OnListItemRightClick"></event>
+                                                                <event name="OnListItemSelected"></event>
+                                                                <event name="OnListKeyDown"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                            <property name="proportion">0</property>
+                                                            <object class="wxButton" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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">0</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="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="label">Remove</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">m_pwlRemoveBtn</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></property>
+                                                                <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>
+                                                                <event name="OnButtonClick">onPwlRemove</event>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                    </object>
+                                                </object>
+                                            </object>
+                                            <object class="notebookpage" expanded="0">
+                                                <property name="bitmap"></property>
+                                                <property name="label">FM</property>
+                                                <property name="select">0</property>
+                                                <object class="wxPanel" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="fg"></property>
+                                                    <property name="floatable">1</property>
+                                                    <property name="font"></property>
+                                                    <property name="gripper">0</property>
+                                                    <property name="hidden">1</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">m_pwrFm</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="notebookpage" expanded="0">
+                                                <property name="bitmap"></property>
+                                                <property name="label">AM</property>
+                                                <property name="select">0</property>
+                                                <object class="wxPanel" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="fg"></property>
+                                                    <property name="floatable">1</property>
+                                                    <property name="font"></property>
+                                                    <property name="gripper">0</property>
+                                                    <property name="hidden">1</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">m_pwrAm</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="notebookpage" expanded="0">
+                                                <property name="bitmap"></property>
+                                                <property name="label">Transient noise</property>
+                                                <property name="select">0</property>
+                                                <object class="wxPanel" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="fg"></property>
+                                                    <property name="floatable">1</property>
+                                                    <property name="font"></property>
+                                                    <property name="gripper">0</property>
+                                                    <property name="hidden">1</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">m_pwrTransNoise</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="notebookpage" expanded="0">
+                                                <property name="bitmap"></property>
+                                                <property name="label">Random</property>
+                                                <property name="select">0</property>
+                                                <object class="wxPanel" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="fg"></property>
+                                                    <property name="floatable">1</property>
+                                                    <property name="font"></property>
+                                                    <property name="gripper">0</property>
+                                                    <property name="hidden">1</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">m_pwrRandom</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                            <object class="notebookpage" expanded="0">
+                                                <property name="bitmap"></property>
+                                                <property name="label">External data</property>
+                                                <property name="select">0</property>
+                                                <object class="wxPanel" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="fg"></property>
+                                                    <property name="floatable">1</property>
+                                                    <property name="font"></property>
+                                                    <property name="gripper">0</property>
+                                                    <property name="hidden">1</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">m_pwrExtData</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
+                                            </object>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALL|wxEXPAND</property>
+                                        <property name="proportion">0</property>
+                                        <object class="wxRadioBox" expanded="0">
+                                            <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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</property>
+                                            <property name="center_pane">0</property>
+                                            <property name="choices">&quot;Voltage&quot; &quot;Current&quot;</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="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="label">Source type</property>
+                                            <property name="majorDimension">1</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">m_pwrType</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="selection">0</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style">wxRA_SPECIFY_ROWS</property>
+                                            <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>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRadioBox"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnUpdateUI"></event>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                    <property name="proportion">0</property>
+                    <object class="wxCheckBox" 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_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</property>
+                        <property name="center_pane">0</property>
+                        <property name="checked">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="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="label">Disable component for simulation</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">m_disabled</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="style"></property>
+                        <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>
+                        <event name="OnChar"></event>
+                        <event name="OnCheckBox"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="wxBoxSizer" expanded="0">
+                        <property name="minimum_size"></property>
+                        <property name="name">bSizer2</property>
+                        <property name="orient">wxHORIZONTAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                            <property name="proportion">0</property>
+                            <object class="wxCheckBox" expanded="0">
+                                <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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</property>
+                                <property name="center_pane">0</property>
+                                <property name="checked">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="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="label">Alternate node sequence:</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">m_nodeSeqCheck</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <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>
+                                <event name="OnChar"></event>
+                                <event name="OnCheckBox"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL</property>
+                            <property name="proportion">0</property>
+                            <object class="wxTextCtrl" expanded="0">
+                                <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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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="maxlength"></property>
+                                <property name="min_size"></property>
+                                <property name="minimize_button">0</property>
+                                <property name="minimum_size">200,-1</property>
+                                <property name="moveable">1</property>
+                                <property name="name">m_nodeSeqVal</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <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="value"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnText"></event>
+                                <event name="OnTextEnter"></event>
+                                <event name="OnTextMaxLen"></event>
+                                <event name="OnTextURL"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL|wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="wxStdDialogButtonSizer" expanded="1">
+                        <property name="Apply">0</property>
+                        <property name="Cancel">1</property>
+                        <property name="ContextHelp">0</property>
+                        <property name="Help">0</property>
+                        <property name="No">0</property>
+                        <property name="OK">1</property>
+                        <property name="Save">0</property>
+                        <property name="Yes">0</property>
+                        <property name="minimum_size"></property>
+                        <property name="name">m_sdbSizer</property>
+                        <property name="permission">protected</property>
+                        <event name="OnApplyButtonClick"></event>
+                        <event name="OnCancelButtonClick"></event>
+                        <event name="OnContextHelpButtonClick"></event>
+                        <event name="OnHelpButtonClick"></event>
+                        <event name="OnNoButtonClick"></event>
+                        <event name="OnOKButtonClick"></event>
+                        <event name="OnSaveButtonClick"></event>
+                        <event name="OnYesButtonClick"></event>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</wxFormBuilder_Project>
diff --git a/eeschema/dialogs/dialog_spice_model_base.h b/eeschema/dialogs/dialog_spice_model_base.h
new file mode 100644
index 0000000000..e513d30bdd
--- /dev/null
+++ b/eeschema/dialogs/dialog_spice_model_base.h
@@ -0,0 +1,148 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_SPICE_MODEL_BASE_H__
+#define __DIALOG_SPICE_MODEL_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/combobox.h>
+#include <wx/textctrl.h>
+#include <wx/sizer.h>
+#include <wx/panel.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/button.h>
+#include <wx/listctrl.h>
+#include <wx/notebook.h>
+#include <wx/radiobox.h>
+#include <wx/checkbox.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_SPICE_MODEL_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_SPICE_MODEL_BASE : public wxDialog 
+{
+	private:
+	
+	protected:
+		wxNotebook* m_notebook;
+		wxPanel* m_passive;
+		wxStaticText* m_staticText2;
+		wxComboBox* m_pasType;
+		wxStaticText* m_staticText3;
+		wxTextCtrl* m_pasValue;
+		wxPanel* m_semiconductor;
+		wxStaticText* m_staticText4;
+		wxComboBox* m_semiType;
+		wxStaticText* m_staticText5;
+		wxComboBox* m_semiModel;
+		wxStaticText* m_staticText7;
+		wxTextCtrl* m_semiLib;
+		wxButton* m_semiSelectLib;
+		wxPanel* m_ic;
+		wxStaticText* m_staticText8;
+		wxComboBox* m_icModel;
+		wxStaticText* m_staticText9;
+		wxTextCtrl* m_icLib;
+		wxButton* m_icSelectLib;
+		wxPanel* m_power;
+		wxNotebook* m_powerNotebook;
+		wxPanel* m_pwrGeneric;
+		wxStaticText* m_staticText10;
+		wxTextCtrl* m_genDc;
+		wxStaticText* m_staticText11;
+		wxTextCtrl* m_genAcMag;
+		wxStaticText* m_staticText12;
+		wxTextCtrl* m_genAcPhase;
+		wxPanel* m_pwrPulse;
+		wxStaticText* m_staticText13;
+		wxTextCtrl* m_pulseInit;
+		wxStaticText* m_staticText14;
+		wxTextCtrl* m_pulseNominal;
+		wxStaticText* m_staticText15;
+		wxTextCtrl* m_pulseDelay;
+		wxStaticText* m_staticText16;
+		wxTextCtrl* m_pulseRise;
+		wxStaticText* m_staticText17;
+		wxTextCtrl* m_pulseFall;
+		wxStaticText* m_staticText18;
+		wxTextCtrl* m_pulseWidth;
+		wxStaticText* m_staticText20;
+		wxTextCtrl* m_pulsePeriod;
+		wxPanel* m_pwrSin;
+		wxStaticText* m_staticText21;
+		wxTextCtrl* m_sinOffset;
+		wxStaticText* m_staticText22;
+		wxTextCtrl* m_sinAmplitude;
+		wxStaticText* m_staticText23;
+		wxTextCtrl* m_sinFreq;
+		wxStaticText* m_staticText24;
+		wxTextCtrl* m_sinDelay;
+		wxStaticText* m_staticText25;
+		wxTextCtrl* m_sinDampFactor;
+		wxPanel* m_pwrExp;
+		wxStaticText* m_staticText26;
+		wxTextCtrl* m_expInit;
+		wxStaticText* m_staticText27;
+		wxTextCtrl* m_expPulsed;
+		wxStaticText* m_staticText28;
+		wxTextCtrl* m_expRiseDelay;
+		wxStaticText* m_staticText29;
+		wxTextCtrl* m_expRiseConst;
+		wxStaticText* m_staticText30;
+		wxTextCtrl* m_expFallDelay;
+		wxStaticText* m_staticText31;
+		wxTextCtrl* m_expFallConst;
+		wxPanel* m_pwrPwl;
+		wxStaticText* m_staticText34;
+		wxTextCtrl* m_pwlTime;
+		wxStaticText* m_staticText35;
+		wxTextCtrl* m_pwlValue;
+		wxButton* m_pwlAddButton;
+		wxListCtrl* m_pwlValList;
+		wxButton* m_pwlRemoveBtn;
+		wxPanel* m_pwrFm;
+		wxPanel* m_pwrAm;
+		wxPanel* m_pwrTransNoise;
+		wxPanel* m_pwrRandom;
+		wxPanel* m_pwrExtData;
+		wxRadioBox* m_pwrType;
+		wxCheckBox* m_disabled;
+		wxCheckBox* m_nodeSeqCheck;
+		wxTextCtrl* m_nodeSeqVal;
+		wxStdDialogButtonSizer* m_sdbSizer;
+		wxButton* m_sdbSizerOK;
+		wxButton* m_sdbSizerCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void onSemiSelectLib( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSelectIcLib( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onPwlAdd( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onPwlRemove( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 425,630 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+		~DIALOG_SPICE_MODEL_BASE();
+	
+};
+
+#endif //__DIALOG_SPICE_MODEL_BASE_H__
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index 3b9728e75f..fcb348bfca 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -45,7 +45,20 @@ enum SPICE_FIELD {
     SPICE_MODEL,
     SPICE_ENABLED,
     SPICE_NODE_SEQUENCE,
-    SPICE_LIB_FILE
+    SPICE_LIB_FILE,
+    SPICE_FIELD_END     // sentinel
+};
+
+enum SPICE_PRIMITIVE {
+    SP_RESISTOR     = 'R',
+    SP_CAPACITOR    = 'C',
+    SP_INDUCTOR     = 'L',
+    SP_DIODE        = 'D',
+    SP_BJT          = 'Q',
+    SP_MOSFET       = 'M',
+    SP_SUBCKT       = 'X',
+    SP_VSOURCE      = 'V',
+    SP_ISOURCE      = 'I'
 };
 
 /// @todo add NET_ADJUST_INCLUDE_PATHS & NET_ADJUST_PASSIVE_VALS checkboxes in the netlist export dialog

From 1a6e048afcb47d0dd04eddbe774192868dad9bfe Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:40 +0200
Subject: [PATCH 089/197] Pressing Enter accepts changes in Simulation settings
 dialog

---
 eeschema/dialogs/dialog_sim_settings.cpp      |  1 +
 eeschema/dialogs/dialog_sim_settings_base.cpp | 14 +++++++-------
 eeschema/dialogs/dialog_sim_settings_base.fbp |  2 +-
 eeschema/dialogs/dialog_sim_settings_base.h   |  6 +++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
index c79dbc7402..d0d8ca6b29 100644
--- a/eeschema/dialogs/dialog_sim_settings.cpp
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -55,6 +55,7 @@ DIALOG_SIM_SETTINGS::DIALOG_SIM_SETTINGS( wxWindow* aParent )
     m_transFinal->SetValidator( m_posFloatValidator );
     m_transInitial->SetValidator( m_posFloatValidator );
 
+    m_sdbSizerOK->SetDefault();
     updateNetlistOpts();
 }
 
diff --git a/eeschema/dialogs/dialog_sim_settings_base.cpp b/eeschema/dialogs/dialog_sim_settings_base.cpp
index b0821da179..e0854e15cd 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.cpp
+++ b/eeschema/dialogs/dialog_sim_settings_base.cpp
@@ -384,14 +384,14 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID
 	m_fixIncludePaths->SetValue(true); 
 	bSizer1->Add( m_fixIncludePaths, 0, wxALL, 5 );
 	
-	m_sdbSizer1 = new wxStdDialogButtonSizer();
-	m_sdbSizer1OK = new wxButton( this, wxID_OK );
-	m_sdbSizer1->AddButton( m_sdbSizer1OK );
-	m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
-	m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
-	m_sdbSizer1->Realize();
+	m_sdbSizer = new wxStdDialogButtonSizer();
+	m_sdbSizerOK = new wxButton( this, wxID_OK );
+	m_sdbSizer->AddButton( m_sdbSizerOK );
+	m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
+	m_sdbSizer->AddButton( m_sdbSizerCancel );
+	m_sdbSizer->Realize();
 	
-	bSizer1->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 );
+	bSizer1->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 );
 	
 	
 	this->SetSizer( bSizer1 );
diff --git a/eeschema/dialogs/dialog_sim_settings_base.fbp b/eeschema/dialogs/dialog_sim_settings_base.fbp
index fa9be99fb1..cc8fdb7c5f 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.fbp
+++ b/eeschema/dialogs/dialog_sim_settings_base.fbp
@@ -5838,7 +5838,7 @@
                         <property name="Save">0</property>
                         <property name="Yes">0</property>
                         <property name="minimum_size"></property>
-                        <property name="name">m_sdbSizer1</property>
+                        <property name="name">m_sdbSizer</property>
                         <property name="permission">protected</property>
                         <event name="OnApplyButtonClick"></event>
                         <event name="OnCancelButtonClick"></event>
diff --git a/eeschema/dialogs/dialog_sim_settings_base.h b/eeschema/dialogs/dialog_sim_settings_base.h
index 6f7afad2a0..0621099b35 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.h
+++ b/eeschema/dialogs/dialog_sim_settings_base.h
@@ -105,9 +105,9 @@ class DIALOG_SIM_SETTINGS_BASE : public wxDialog
 		wxButton* m_loadDirectives;
 		wxCheckBox* m_fixPassiveVals;
 		wxCheckBox* m_fixIncludePaths;
-		wxStdDialogButtonSizer* m_sdbSizer1;
-		wxButton* m_sdbSizer1OK;
-		wxButton* m_sdbSizer1Cancel;
+		wxStdDialogButtonSizer* m_sdbSizer;
+		wxButton* m_sdbSizerOK;
+		wxButton* m_sdbSizerCancel;
 		
 		// Virtual event handlers, overide them in your derived class
 		virtual void onLoadDirectives( wxCommandEvent& event ) { event.Skip(); }

From 9acdedcb8573a70572f5254d078a482c306120a8 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:40 +0200
Subject: [PATCH 090/197] Improved library management in simulator Now it also
 gathers information from Spice_Lib_File fields

---
 .../netlist_exporter_pspice.cpp               | 45 +++++++++++++------
 .../netlist_exporter_pspice.h                 |  5 ++-
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 466925f7d1..48c3251275 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -56,6 +56,18 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* aFormatter, unsigned aCtl
 
     aFormatter->Print( 0, ".title KiCad schematic\n" );
 
+    // Write .include directives
+    for( auto lib : m_libraries )
+    {
+        if( ( aCtl & NET_ADJUST_INCLUDE_PATHS ) && m_paths )
+        {
+            // Look for the library in known search locations
+            lib = m_paths->FindValidPath( lib );
+        }
+
+        aFormatter->Print( 0, ".include %s\n", (const char*) lib.c_str() );
+    }
+
     for( const auto& item : m_spiceItems )
     {
         aFormatter->Print( 0, "%c%s ", item.m_primitive, (const char*) item.m_refName.c_str() );
@@ -203,9 +215,12 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( SPICE_FIELD aField,
         // There is no default Spice library
         return wxEmptyString;
         break;
+
+    default:
+        wxASSERT_MSG( false, "Missing default value definition for a Spice field" );
+        break;
     }
 
-    wxASSERT_MSG( false, "Missing default value definition for a Spice field" );
 
     return wxString( "<unknown>" );
 }
@@ -220,16 +235,15 @@ void NETLIST_EXPORTER_PSPICE::ProcessNetlist( unsigned aCtl )
     for( unsigned ii = 0; ii < m_masterList->size(); ii++ )
         m_masterList->GetItem( ii )->m_Flag = 0;
 
-    UpdateDirectives( aCtl );
-
     m_netMap.clear();
-
-    // 0 is reserved for "GND"
-    m_netMap["GND"] = 0;
+    m_netMap["GND"] = 0;        // 0 is reserved for "GND"
     int netIdx = 1;
 
+    m_libraries.clear();
     m_ReferencesAlreadyFound.Clear();
 
+    UpdateDirectives( aCtl );
+
     for( unsigned sheet_idx = 0; sheet_idx < sheetList.size(); sheet_idx++ )
     {
         // Process component attributes to find Spice directives
@@ -249,6 +263,7 @@ void NETLIST_EXPORTER_PSPICE::ProcessNetlist( unsigned aCtl )
             SCH_FIELD* fieldPrim = comp->FindField( GetSpiceFieldName( SPICE_PRIMITIVE ) );
             SCH_FIELD* fieldModel = comp->FindField( GetSpiceFieldName( SPICE_MODEL ) );
             SCH_FIELD* fieldEnabled = comp->FindField( GetSpiceFieldName( SPICE_ENABLED ) );
+            SCH_FIELD* fieldLibFile = comp->FindField( GetSpiceFieldName( SPICE_LIB_FILE ) );
             SCH_FIELD* fieldSeq = comp->FindField( GetSpiceFieldName( SPICE_NODE_SEQUENCE ) );
 
             spiceItem.m_primitive = fieldPrim ? fieldPrim->GetText()[0]
@@ -260,7 +275,10 @@ void NETLIST_EXPORTER_PSPICE::ProcessNetlist( unsigned aCtl )
             spiceItem.m_refName = comp->GetRef( &sheetList[sheet_idx] );
 
             // Check to see if component should be removed from Spice netlist
-                spiceItem.m_enabled = fieldEnabled ? StringToBool( fieldEnabled->GetText() ) : true;
+            spiceItem.m_enabled = fieldEnabled ? StringToBool( fieldEnabled->GetText() ) : true;
+
+            if( fieldLibFile && !fieldLibFile->GetText().IsEmpty() )
+                m_libraries.insert( fieldLibFile->GetText() );
 
             wxArrayString pinNames;
 
@@ -336,12 +354,12 @@ void NETLIST_EXPORTER_PSPICE::UpdateDirectives( unsigned aCtl )
                 {
                     wxString directive( tokenizer.GetNextToken() );
 
-                    // Fix paths for .include directives
-                    if( aCtl & NET_ADJUST_INCLUDE_PATHS && m_paths && directive.StartsWith( ".inc" ) )
+                    if( directive.StartsWith( ".inc" ) )
                     {
-                        wxString file( directive.AfterFirst( ' ' ) );
-                        wxString path( m_paths->FindValidPath( file ) );
-                        m_directives.push_back( wxString( ".include " ) + path );
+                        wxString lib = directive.AfterFirst( ' ' );
+
+                        if( !lib.IsEmpty() )
+                            m_libraries.insert( lib );
                     }
                     else
                     {
@@ -453,5 +471,6 @@ const std::vector<wxString> NETLIST_EXPORTER_PSPICE::m_spiceFields = {
     "Spice_Primitive",
     "Spice_Model",
     "Spice_Netlist_Enabled",
-    "Spice_Node_Sequence"
+    "Spice_Node_Sequence",
+    "Spice_Lib_File"
 };
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index fcb348bfca..4c1ead2751 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -154,9 +154,12 @@ protected:
     virtual void writeDirectives( OUTPUTFORMATTER* aFormatter, unsigned aCtl ) const;
 
 private:
-    // Spice directives found in the processed schematic sheet
+    ///> Spice directives found in the processed schematic sheet
     std::vector<wxString> m_directives;
 
+    ///> Libraries used by the simulated circuit
+    std::set<wxString> m_libraries;
+
     NET_INDEX_MAP m_netMap;
 
     SPICE_ITEM_LIST m_spiceItems;

From 6bfe6342fcaa91b63b24cf218175cb9c23e31a8e Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:41 +0200
Subject: [PATCH 091/197] Simulator fixes for Windows

---
 eeschema/sim/ngspice.cpp        |  6 ++++--
 eeschema/sim/sim_plot_frame.cpp |  2 +-
 eeschema/sim/sim_plot_panel.cpp |  1 +
 eeschema/sim/simulate.cpp       | 29 ++++++++++++++++++++++++++++-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 51510ed24b..bafc6792c6 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -30,13 +30,15 @@
 #include <wx/log.h>
 #include <sstream>
 
-// TODO cmake modules to add include directory for ngspice
-
 using namespace std;
 
 NGSPICE::NGSPICE()
 {
+#ifdef __WINDOWS__
+    m_dll = new wxDynamicLibrary( "libngspice-0.dll" );
+#else
     m_dll = new wxDynamicLibrary( "libngspice.so" );
+#endif
     assert( m_dll );
 
     // Obtain function pointers
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 8fbc3c8a64..97889a5c05 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -124,7 +124,7 @@ void SIM_PLOT_FRAME::NewPlotPanel( SIM_TYPE aSimType )
     SIM_PLOT_PANEL* plot = new SIM_PLOT_PANEL( aSimType, m_plotNotebook, wxID_ANY );
 
     m_plotNotebook->AddPage( plot,
-            wxString::Format( wxT( "Plot%lu" ), m_plotNotebook->GetPageCount() + 1 ), true );
+            wxString::Format( wxT( "Plot%u" ), (unsigned int) m_plotNotebook->GetPageCount() + 1 ), true );
 }
 
 
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 71cf2b6534..3f9b36a611 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -100,6 +100,7 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
     : mpWindow( parent, id, pos, size, style ), m_colorIdx( 0 ),
         m_axis_x( nullptr ), m_axis_y1( nullptr ), m_axis_y2( nullptr ), m_type( aType )
 {
+    EnableDoubleBuffer( true );
     SetMargins( 10, 10, 10, 10 );
     LimitView( true );
 
diff --git a/eeschema/sim/simulate.cpp b/eeschema/sim/simulate.cpp
index 68d1ee5daf..7d0772687f 100644
--- a/eeschema/sim/simulate.cpp
+++ b/eeschema/sim/simulate.cpp
@@ -39,6 +39,8 @@ void SCH_EDIT_FRAME::OnSimulate( wxCommandEvent& event )
     simFrame->SetSchFrame( this );
 }
 
+// I apologize for the following lines, but this is more or less what wxWidgets
+// authors suggest (http://docs.wxwidgets.org/trunk/classwx_cursor.html)
 
 static const unsigned char cursor_probe[] = {
    0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x70,
@@ -66,4 +68,29 @@ static const unsigned char cursor_probe_mask[] {
    0x7c, 0x07, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
    0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 };
 
-const wxCursor SCH_EDIT_FRAME::CURSOR_PROBE( (const char*) cursor_probe, 31, 32, 0, 31, (const char*) cursor_probe_mask );
+#ifdef __WXMSW__
+struct CURSOR_PROBE_INIT
+{
+public:
+    static wxImage& GetProbeImage()
+    {
+        static wxImage* probe_image = NULL;
+
+        if( probe_image == NULL )
+        {
+            wxBitmap probe_bitmap( (const char*) cursor_probe, 32, 32 );
+            wxBitmap probe_mask_bitmap( (const char*) cursor_probe_mask, 32, 32 );
+            probe_bitmap.SetMask( new wxMask( probe_mask_bitmap ) );
+            probe_image = new wxImage( probe_bitmap.ConvertToImage() );
+            probe_image->SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_X, 0 );
+            probe_image->SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_Y, 31 );
+        }
+
+        return *probe_image;
+    }
+};
+
+const wxCursor SCH_EDIT_FRAME::CURSOR_PROBE( CURSOR_PROBE_INIT::GetProbeImage() );
+#elif defined(__WXGTK__) or defined(__WXMOTIF__)
+const wxCursor SCH_EDIT_FRAME::CURSOR_PROBE( (const char*) cursor_probe, 32, 32, 0, 31, (const char*) cursor_probe_mask );
+#endif

From 3999ff19736a0bfbf500f8b1080fada3de5e47f7 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:41 +0200
Subject: [PATCH 092/197] Resized DIALOG_SIM_SETTINGS

---
 eeschema/dialogs/dialog_sim_settings_base.fbp | 2 +-
 eeschema/dialogs/dialog_sim_settings_base.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eeschema/dialogs/dialog_sim_settings_base.fbp b/eeschema/dialogs/dialog_sim_settings_base.fbp
index cc8fdb7c5f..7318cc4666 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.fbp
+++ b/eeschema/dialogs/dialog_sim_settings_base.fbp
@@ -44,7 +44,7 @@
             <property name="minimum_size"></property>
             <property name="name">DIALOG_SIM_SETTINGS_BASE</property>
             <property name="pos"></property>
-            <property name="size">439,534</property>
+            <property name="size">445,677</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE</property>
             <property name="subclass"></property>
             <property name="title">Simulation settings</property>
diff --git a/eeschema/dialogs/dialog_sim_settings_base.h b/eeschema/dialogs/dialog_sim_settings_base.h
index 0621099b35..bf1d09b1de 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.h
+++ b/eeschema/dialogs/dialog_sim_settings_base.h
@@ -115,7 +115,7 @@ class DIALOG_SIM_SETTINGS_BASE : public wxDialog
 	
 	public:
 		
-		DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Simulation settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 439,534 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+		DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Simulation settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 445,677 ), long style = wxDEFAULT_DIALOG_STYLE ); 
 		~DIALOG_SIM_SETTINGS_BASE();
 	
 };

From b897af7eb9cc3cef24af0801c662e7a2dfbc2406 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:41 +0200
Subject: [PATCH 093/197] Added a few checks for SIM_PLOT_FRAME to improve
 robustness

---
 eeschema/sim/sim_plot_frame.cpp | 32 +++++++++++++++++++++++++++-----
 eeschema/sim/sim_plot_frame.h   | 15 +++++++--------
 eeschema/sim/simulate.cpp       |  1 -
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 97889a5c05..7cbe088cbe 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -78,6 +78,13 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
 {
     SetKiway( this, aKiway );
 
+    m_schematicFrame = (SCH_EDIT_FRAME*) Kiway().Player( FRAME_SCH, false );
+
+    if( m_schematicFrame == NULL )
+        throw std::runtime_error( "There is no schematic window" );
+
+    updateNetlistExporter();
+
     Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SIM_PLOT_FRAME::onClose ), NULL, this );
     Connect( EVT_SIM_REPORT, wxCommandEventHandler( SIM_PLOT_FRAME::onSimReport ), NULL, this );
     Connect( EVT_SIM_STARTED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimStarted ), NULL, this );
@@ -115,7 +122,8 @@ void SIM_PLOT_FRAME::StartSimulation()
 
 void SIM_PLOT_FRAME::StopSimulation()
 {
-    m_simulator->Stop();
+    if( m_simulator )
+        m_simulator->Stop();
 }
 
 
@@ -158,8 +166,11 @@ void SIM_PLOT_FRAME::updateNetlistExporter()
 }
 
 
-void SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aName, SIM_PLOT_PANEL* aPanel )
+bool SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aName, SIM_PLOT_PANEL* aPanel )
 {
+    if( !m_simulator )
+        return false;
+
     // First, handle the x axis
     wxString xAxisName;
     SIM_TYPE simType = m_exporter->GetSimType();
@@ -168,7 +179,7 @@ void SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aNa
     {
         // There is no plot to be shown
         m_simulator->Command( wxString::Format( "print %s", aSpiceName ).ToStdString() );
-        return;
+        return false;
     }
 
     switch( simType )
@@ -198,7 +209,7 @@ void SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aNa
     int size = data_x.size();
 
     if( data_x.empty() )
-        return;
+        return false;
 
     // Now, Y axis data
     switch( m_exporter->GetSimType() )
@@ -208,6 +219,10 @@ void SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aNa
         {
             auto data_mag = m_simulator->GetMagPlot( (const char*) aSpiceName.c_str() );
             auto data_phase = m_simulator->GetPhasePlot( (const char*) aSpiceName.c_str() );
+
+            if( data_mag.empty() || data_phase.empty() )
+                return false;
+
             aPanel->AddTrace( aSpiceName, aName + " (mag)", size, data_x.data(), data_mag.data(), 0 );
             aPanel->AddTrace( aSpiceName, aName + " (phase)", size, data_x.data(), data_phase.data(), 0 );
         }
@@ -218,13 +233,20 @@ void SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aNa
         case ST_TRANSIENT:
         {
             auto data_y = m_simulator->GetMagPlot( (const char*) aSpiceName.c_str() );
+
+            if( data_y.empty() )
+                return false;
+
             aPanel->AddTrace( aSpiceName, aName, size, data_x.data(), data_y.data(), 0 );
         }
         break;
 
         default:
-            return;
+            wxASSERT_MSG( false, "Unhandled plot type" );
+            return false;
     }
+
+    return true;
 }
 
 
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index b0bbd86c58..11b455da94 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -31,12 +31,14 @@
 
 #include "sim_plot_frame_base.h"
 #include "sim_types.h"
-#include "kiway_player.h"
-#include <netlist_exporters/netlist_exporter_pspice.h>
+
+#include <kiway_player.h>
 #include <dialogs/dialog_sim_settings.h>
 
 #include <wx/event.h>
+#include <memory>
 
+class SCH_EDIT_FRAME;
 class SPICE_SIMULATOR;
 class NETLIST_EXPORTER_PSPICE_SIM;
 class SIM_PLOT_PANEL;
@@ -49,11 +51,6 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent );
         ~SIM_PLOT_FRAME();
 
-        void SetSchFrame( SCH_EDIT_FRAME* aSchFrame )
-        {
-            m_schematicFrame = aSchFrame;
-        }
-
         void StartSimulation();
         void StopSimulation();
 
@@ -74,8 +71,10 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
          * (for NGSPICE it is e.g. "V(1)").
          * @param aName is the name used in the legend.
          * @param aPanel is the panel that should receive the update.
+         * @return True if a plot was successfully added/updated.
+         */
+        bool updatePlot( const wxString& aSpiceName, const wxString& aName, SIM_PLOT_PANEL* aPanel );
          */
-        void updatePlot( const wxString& aSpiceName, const wxString& aName, SIM_PLOT_PANEL* aPanel );
 
         /**
          * @brief Returns node number for a given net.
diff --git a/eeschema/sim/simulate.cpp b/eeschema/sim/simulate.cpp
index 7d0772687f..d3252ed54d 100644
--- a/eeschema/sim/simulate.cpp
+++ b/eeschema/sim/simulate.cpp
@@ -36,7 +36,6 @@ void SCH_EDIT_FRAME::OnSimulate( wxCommandEvent& event )
         simFrame->Iconize( false );
 
     simFrame->Raise();
-    simFrame->SetSchFrame( this );
 }
 
 // I apologize for the following lines, but this is more or less what wxWidgets

From 51f0564119191e51e98c6d9aa97183d84644662e Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:42 +0200
Subject: [PATCH 094/197] Signals are added using a separate dialog

---
 eeschema/CMakeLists.txt                      |   2 +
 eeschema/dialogs/dialog_signal_list.cpp      |  73 +++++++
 eeschema/dialogs/dialog_signal_list.h        |  53 +++++
 eeschema/dialogs/dialog_signal_list_base.cpp |  46 ++++
 eeschema/dialogs/dialog_signal_list_base.fbp | 213 +++++++++++++++++++
 eeschema/dialogs/dialog_signal_list_base.h   |  51 +++++
 eeschema/sim/sim_plot_frame.cpp              |  97 +++++----
 eeschema/sim/sim_plot_frame.h                |  16 +-
 eeschema/sim/sim_plot_frame_base.cpp         |  17 +-
 eeschema/sim/sim_plot_frame_base.fbp         |  98 ++++++++-
 eeschema/sim/sim_plot_frame_base.h           |   4 +-
 11 files changed, 615 insertions(+), 55 deletions(-)
 create mode 100644 eeschema/dialogs/dialog_signal_list.cpp
 create mode 100644 eeschema/dialogs/dialog_signal_list.h
 create mode 100644 eeschema/dialogs/dialog_signal_list_base.cpp
 create mode 100644 eeschema/dialogs/dialog_signal_list_base.fbp
 create mode 100644 eeschema/dialogs/dialog_signal_list_base.h

diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 64e797eca4..72f371c36f 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -184,6 +184,8 @@ set( EESCHEMA_SRCS
     sim/spice_simulator.cpp
     sim/ngspice.cpp
     sim/netlist_exporter_pspice_sim.cpp
+    dialogs/dialog_signal_list.cpp
+    dialogs/dialog_signal_list_base.cpp
     dialogs/dialog_sim_settings.cpp
     dialogs/dialog_sim_settings_base.cpp
     dialogs/dialog_spice_model.cpp
diff --git a/eeschema/dialogs/dialog_signal_list.cpp b/eeschema/dialogs/dialog_signal_list.cpp
new file mode 100644
index 0000000000..c9bc5a00c7
--- /dev/null
+++ b/eeschema/dialogs/dialog_signal_list.cpp
@@ -0,0 +1,73 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "dialog_signal_list.h"
+#include <sim/sim_plot_frame.h>
+
+#include <sim/netlist_exporter_pspice_sim.h>
+
+DIALOG_SIGNAL_LIST::DIALOG_SIGNAL_LIST( SIM_PLOT_FRAME* aParent, NETLIST_EXPORTER_PSPICE_SIM* aExporter )
+    : DIALOG_SIGNAL_LIST_BASE( aParent ), m_plotFrame( aParent ), m_exporter( aExporter )
+{
+}
+
+
+bool DIALOG_SIGNAL_LIST::TransferDataFromWindow()
+{
+    if( !DIALOG_SIGNAL_LIST_BASE::TransferDataFromWindow() )
+        return false;
+
+    addSelectionToPlotFrame();
+
+    return true;
+}
+
+
+bool DIALOG_SIGNAL_LIST::TransferDataToWindow()
+{
+    // Create a list of possible signals
+    // TODO switch( m_exporter->GetSimType() )
+    // {
+
+    if( m_exporter )
+    {
+        for( const auto& net : m_exporter->GetNetIndexMap() )
+        {
+            if( net.first != "GND" )
+                m_signals->Append( net.first );
+        }
+    }
+
+    return DIALOG_SIGNAL_LIST_BASE::TransferDataToWindow();
+}
+
+
+void DIALOG_SIGNAL_LIST::addSelectionToPlotFrame()
+{
+    for( unsigned int i = 0; i < m_signals->GetCount(); ++i )
+    {
+        if( m_signals->IsSelected( i ) )
+            m_plotFrame->AddVoltagePlot( m_signals->GetString( i ) );
+    }
+}
diff --git a/eeschema/dialogs/dialog_signal_list.h b/eeschema/dialogs/dialog_signal_list.h
new file mode 100644
index 0000000000..571d2509d1
--- /dev/null
+++ b/eeschema/dialogs/dialog_signal_list.h
@@ -0,0 +1,53 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef DIALOG_SIGNAL_LIST_H
+#define DIALOG_SIGNAL_LIST_H
+
+#include "dialog_signal_list_base.h"
+
+class SIM_PLOT_FRAME;
+class NETLIST_EXPORTER_PSPICE_SIM;
+
+class DIALOG_SIGNAL_LIST : public DIALOG_SIGNAL_LIST_BASE
+{
+public:
+    DIALOG_SIGNAL_LIST( SIM_PLOT_FRAME* aParent, NETLIST_EXPORTER_PSPICE_SIM* aExporter );
+
+    bool TransferDataFromWindow() override;
+    bool TransferDataToWindow() override;
+
+private:
+    void onSignalAdd( wxCommandEvent& event ) override
+    {
+        addSelectionToPlotFrame();
+    }
+
+    void addSelectionToPlotFrame();
+
+    SIM_PLOT_FRAME* m_plotFrame;
+    NETLIST_EXPORTER_PSPICE_SIM* m_exporter;
+};
+
+#endif /* DIALOG_SIGNAL_LIST_H */
diff --git a/eeschema/dialogs/dialog_signal_list_base.cpp b/eeschema/dialogs/dialog_signal_list_base.cpp
new file mode 100644
index 0000000000..d07cb0323c
--- /dev/null
+++ b/eeschema/dialogs/dialog_signal_list_base.cpp
@@ -0,0 +1,46 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_signal_list_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_SIGNAL_LIST_BASE::DIALOG_SIGNAL_LIST_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer6;
+	bSizer6 = new wxBoxSizer( wxVERTICAL );
+	
+	m_signals = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_MULTIPLE|wxLB_NEEDED_SB|wxLB_SORT ); 
+	bSizer6->Add( m_signals, 1, wxALL|wxEXPAND, 5 );
+	
+	m_sdbSizer = new wxStdDialogButtonSizer();
+	m_sdbSizerOK = new wxButton( this, wxID_OK );
+	m_sdbSizer->AddButton( m_sdbSizerOK );
+	m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
+	m_sdbSizer->AddButton( m_sdbSizerCancel );
+	m_sdbSizer->Realize();
+	
+	bSizer6->Add( m_sdbSizer, 0, wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bSizer6 );
+	this->Layout();
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	m_signals->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( DIALOG_SIGNAL_LIST_BASE::onSignalAdd ), NULL, this );
+}
+
+DIALOG_SIGNAL_LIST_BASE::~DIALOG_SIGNAL_LIST_BASE()
+{
+	// Disconnect Events
+	m_signals->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( DIALOG_SIGNAL_LIST_BASE::onSignalAdd ), NULL, this );
+	
+}
diff --git a/eeschema/dialogs/dialog_signal_list_base.fbp b/eeschema/dialogs/dialog_signal_list_base.fbp
new file mode 100644
index 0000000000..484ab18a7c
--- /dev/null
+++ b/eeschema/dialogs/dialog_signal_list_base.fbp
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<wxFormBuilder_Project>
+    <FileVersion major="1" minor="13" />
+    <object class="Project" expanded="1">
+        <property name="class_decoration"></property>
+        <property name="code_generation">C++</property>
+        <property name="disconnect_events">1</property>
+        <property name="disconnect_mode">source_name</property>
+        <property name="disconnect_php_events">0</property>
+        <property name="disconnect_python_events">0</property>
+        <property name="embedded_files_path">res</property>
+        <property name="encoding">UTF-8</property>
+        <property name="event_generation">connect</property>
+        <property name="file">dialog_signal_list_base</property>
+        <property name="first_id">1000</property>
+        <property name="help_provider">none</property>
+        <property name="internationalize">1</property>
+        <property name="name">DIALOG_SIGNAL_LIST_BASE</property>
+        <property name="namespace"></property>
+        <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="aui_managed">0</property>
+            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
+            <property name="bg"></property>
+            <property name="center">wxBOTH</property>
+            <property name="context_help"></property>
+            <property name="context_menu">1</property>
+            <property name="enabled">1</property>
+            <property name="event_handler">impl_virtual</property>
+            <property name="extra_style"></property>
+            <property name="fg"></property>
+            <property name="font"></property>
+            <property name="hidden">0</property>
+            <property name="id">wxID_ANY</property>
+            <property name="maximum_size"></property>
+            <property name="minimum_size"></property>
+            <property name="name">DIALOG_SIGNAL_LIST_BASE</property>
+            <property name="pos"></property>
+            <property name="size">424,535</property>
+            <property name="style">wxDEFAULT_DIALOG_STYLE</property>
+            <property name="subclass"></property>
+            <property name="title"></property>
+            <property name="tooltip"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style"></property>
+            <event name="OnActivate"></event>
+            <event name="OnActivateApp"></event>
+            <event name="OnAuiFindManager"></event>
+            <event name="OnAuiPaneButton"></event>
+            <event name="OnAuiPaneClose"></event>
+            <event name="OnAuiPaneMaximize"></event>
+            <event name="OnAuiPaneRestore"></event>
+            <event name="OnAuiRender"></event>
+            <event name="OnChar"></event>
+            <event name="OnClose"></event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnHibernate"></event>
+            <event name="OnIconize"></event>
+            <event name="OnIdle"></event>
+            <event name="OnInitDialog"></event>
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI"></event>
+            <object class="wxBoxSizer" expanded="1">
+                <property name="minimum_size"></property>
+                <property name="name">bSizer6</property>
+                <property name="orient">wxVERTICAL</property>
+                <property name="permission">none</property>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL|wxEXPAND</property>
+                    <property name="proportion">1</property>
+                    <object class="wxListBox" 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_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</property>
+                        <property name="center_pane">0</property>
+                        <property name="choices"></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="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">m_signals</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="style">wxLB_MULTIPLE|wxLB_NEEDED_SB|wxLB_SORT</property>
+                        <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>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnListBox"></event>
+                        <event name="OnListBoxDClick">onSignalAdd</event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="wxStdDialogButtonSizer" expanded="1">
+                        <property name="Apply">0</property>
+                        <property name="Cancel">1</property>
+                        <property name="ContextHelp">0</property>
+                        <property name="Help">0</property>
+                        <property name="No">0</property>
+                        <property name="OK">1</property>
+                        <property name="Save">0</property>
+                        <property name="Yes">0</property>
+                        <property name="minimum_size"></property>
+                        <property name="name">m_sdbSizer</property>
+                        <property name="permission">protected</property>
+                        <event name="OnApplyButtonClick"></event>
+                        <event name="OnCancelButtonClick"></event>
+                        <event name="OnContextHelpButtonClick"></event>
+                        <event name="OnHelpButtonClick"></event>
+                        <event name="OnNoButtonClick"></event>
+                        <event name="OnOKButtonClick"></event>
+                        <event name="OnSaveButtonClick"></event>
+                        <event name="OnYesButtonClick"></event>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</wxFormBuilder_Project>
diff --git a/eeschema/dialogs/dialog_signal_list_base.h b/eeschema/dialogs/dialog_signal_list_base.h
new file mode 100644
index 0000000000..e36730964d
--- /dev/null
+++ b/eeschema/dialogs/dialog_signal_list_base.h
@@ -0,0 +1,51 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_SIGNAL_LIST_BASE_H__
+#define __DIALOG_SIGNAL_LIST_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+#include <wx/string.h>
+#include <wx/listbox.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/sizer.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_SIGNAL_LIST_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_SIGNAL_LIST_BASE : public wxDialog 
+{
+	private:
+	
+	protected:
+		wxListBox* m_signals;
+		wxStdDialogButtonSizer* m_sdbSizer;
+		wxButton* m_sdbSizerOK;
+		wxButton* m_sdbSizerCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void onSignalAdd( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DIALOG_SIGNAL_LIST_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 424,535 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+		~DIALOG_SIGNAL_LIST_BASE();
+	
+};
+
+#endif //__DIALOG_SIGNAL_LIST_BASE_H__
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 7cbe088cbe..762c9fc2c7 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -27,6 +27,7 @@
 #include <eeschema_id.h>
 #include <kiway.h>
 
+#include <dialogs/dialog_signal_list.h>
 #include "netlist_exporter_pspice_sim.h"
 
 #include "sim_plot_frame.h"
@@ -127,22 +128,39 @@ void SIM_PLOT_FRAME::StopSimulation()
 }
 
 
-void SIM_PLOT_FRAME::NewPlotPanel( SIM_TYPE aSimType )
+SIM_PLOT_PANEL* SIM_PLOT_FRAME::NewPlotPanel( SIM_TYPE aSimType )
 {
     SIM_PLOT_PANEL* plot = new SIM_PLOT_PANEL( aSimType, m_plotNotebook, wxID_ANY );
 
-    m_plotNotebook->AddPage( plot,
-            wxString::Format( wxT( "Plot%u" ), (unsigned int) m_plotNotebook->GetPageCount() + 1 ), true );
+    m_plotNotebook->AddPage( plot, wxString::Format( wxT( "Plot%u" ),
+            (unsigned int) m_plotNotebook->GetPageCount() + 1 ), true );
+
+    return plot;
 }
 
 
 void SIM_PLOT_FRAME::AddVoltagePlot( const wxString& aNetName )
 {
+    SIM_TYPE simType = m_exporter->GetSimType();
+
+    if( !SIM_PLOT_PANEL::IsPlottable( simType ) )
+        return; // TODO else write out in console?
+
     int nodeNumber = getNodeNumber( aNetName );
 
     if( nodeNumber >= -1 )
     {
-        updatePlot( wxString::Format( "V(%d)", nodeNumber ), aNetName, CurrentPlot() );
+        // Create a new plot if the current one displays a different type
+        SIM_PLOT_PANEL* plotPanel = CurrentPlot();
+
+        if( plotPanel == nullptr || plotPanel->GetType() != simType )
+            plotPanel = NewPlotPanel( simType );
+
+        if( updatePlot( wxString::Format( "V(%d)", nodeNumber ), aNetName, plotPanel ) )
+        {
+            updateSignalList();
+            plotPanel->Fit();
+        }
     }
 }
 
@@ -250,11 +268,23 @@ bool SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aNa
 }
 
 
+void SIM_PLOT_FRAME::updateSignalList()
+{
+    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
+
+    if( !plotPanel )
+        return;
+
+    // Fill the signals listbox
+    m_signals->Clear();
+
+    for( const auto& trace : plotPanel->GetTraces() )
+        m_signals->Append( trace.second->GetName() );
+}
+
+
 int SIM_PLOT_FRAME::getNodeNumber( const wxString& aNetName )
 {
-    if( !m_exporter )
-        return -1;
-
     const auto& netMapping = m_exporter->GetNetIndexMap();
     auto it = netMapping.find( aNetName );
 
@@ -267,13 +297,10 @@ int SIM_PLOT_FRAME::getNodeNumber( const wxString& aNetName )
 
 void SIM_PLOT_FRAME::menuNewPlot( wxCommandEvent& aEvent )
 {
-    if( m_exporter )
-    {
-        SIM_TYPE type = m_exporter->GetSimType();
+    SIM_TYPE type = m_exporter->GetSimType();
 
-        if( SIM_PLOT_PANEL::IsPlottable( type ) )
-            NewPlotPanel( type );
-    }
+    if( SIM_PLOT_PANEL::IsPlottable( type ) )
+        NewPlotPanel( type );
 }
 
 
@@ -391,33 +418,25 @@ void SIM_PLOT_FRAME::menuShowCoordsUpdate( wxUpdateUIEvent& event )
 
 void SIM_PLOT_FRAME::onPlotChanged( wxNotebookEvent& event )
 {
+    updateSignalList();
+
+    // Update cursors
     wxQueueEvent( this, new wxCommandEvent( EVT_SIM_CURSOR_UPDATE ) );
 }
 
 
 void SIM_PLOT_FRAME::onSignalDblClick( wxCommandEvent& event )
 {
+    // Remove signal from the plot on double click
     int idx = m_signals->GetSelection();
     SIM_PLOT_PANEL* plot = CurrentPlot();
-    SIM_TYPE simType = m_exporter->GetSimType();
-
-    // Create a new plot if the current one displays a different type
-    if( SIM_PLOT_PANEL::IsPlottable( simType ) && ( plot == nullptr || plot->GetType() != simType ) )
-    {
-        NewPlotPanel( simType );
-        plot = CurrentPlot();
-    }
 
     if( idx != wxNOT_FOUND )
     {
         const wxString& netName = m_signals->GetString( idx );
-
-        if( plot->IsShown( netName ) )
-            plot->DeleteTrace( netName );
-        else
-            AddVoltagePlot( netName );
-
-        plot->Fit();
+        m_signals->Delete( idx );
+        wxASSERT( plot->IsShown( netName ) );
+        plot->DeleteTrace( netName );
     }
 }
 
@@ -458,7 +477,14 @@ void SIM_PLOT_FRAME::onSettings( wxCommandEvent& event )
 }
 
 
-void SIM_PLOT_FRAME::onPlaceProbe( wxCommandEvent& event )
+void SIM_PLOT_FRAME::onAddSignal( wxCommandEvent& event )
+{
+    DIALOG_SIGNAL_LIST dialog( this, m_exporter.get() );
+    dialog.ShowModal();
+}
+
+
+void SIM_PLOT_FRAME::onProbe( wxCommandEvent& event )
 {
     if( m_schematicFrame == NULL )
         return;
@@ -513,20 +539,10 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
     SetCursor( wxCURSOR_ARROW );
 
     SIM_TYPE simType = m_exporter->GetSimType();
-
-    // Fill the signals listbox
-    m_signals->Clear();
-
-    for( const auto& net : m_exporter->GetNetIndexMap() )
-    {
-        if( net.first != "GND" )
-            m_signals->Append( net.first );
-    }
-
     SIM_PLOT_PANEL* plotPanel = CurrentPlot();
 
     if( plotPanel == nullptr || plotPanel->GetType() != simType )
-        return;
+        plotPanel = NewPlotPanel( simType );
 
     // If there are any signals plotted, update them
     if( SIM_PLOT_PANEL::IsPlottable( simType ) )
@@ -591,7 +607,6 @@ void SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::onMenuEvent( wxMenuEvent& aEvent )
     {
         case SHOW_SIGNAL:
             m_plotFrame->AddVoltagePlot( m_signal );
-            plot->Fit();
             break;
 
             break;
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 11b455da94..49266a1758 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -54,7 +54,14 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void StartSimulation();
         void StopSimulation();
 
-        void NewPlotPanel( SIM_TYPE aSimType );
+        /**
+         * @brief Creates a new plot panel for a given simulation type and adds it to the main
+         * notebook.
+         * @param aSimType is requested simulation type.
+         * @return The new plot panel.
+         */
+        SIM_PLOT_PANEL* NewPlotPanel( SIM_TYPE aSimType );
+
         void AddVoltagePlot( const wxString& aNetName );
 
         SIM_PLOT_PANEL* CurrentPlot() const;
@@ -74,7 +81,11 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
          * @return True if a plot was successfully added/updated.
          */
         bool updatePlot( const wxString& aSpiceName, const wxString& aName, SIM_PLOT_PANEL* aPanel );
+
+        /**
+         * @brief Updates the list of currently plotted signals.
          */
+        void updateSignalList();
 
         /**
          * @brief Returns node number for a given net.
@@ -111,7 +122,8 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
 
         void onSimulate( wxCommandEvent& event ) override;
         void onSettings( wxCommandEvent& event ) override;
-        void onPlaceProbe( wxCommandEvent& event ) override;
+        void onAddSignal( wxCommandEvent& event ) override;
+        void onProbe( wxCommandEvent& event ) override;
 
         void onClose( wxCloseEvent& aEvent );
 
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index aed0f5f690..a105066b44 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -122,16 +122,19 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	bSizer4 = new wxBoxSizer( wxHORIZONTAL );
 	
 	m_simulateBtn = new wxButton( this, wxID_ANY, _("Simulate"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer4->Add( m_simulateBtn, 1, wxALL, 5 );
+	bSizer4->Add( m_simulateBtn, 1, wxALL|wxEXPAND, 5 );
 	
 	m_settingsBtn = new wxButton( this, wxID_ANY, _("Settings"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer4->Add( m_settingsBtn, 1, wxALL, 5 );
+	bSizer4->Add( m_settingsBtn, 1, wxALL|wxEXPAND, 5 );
+	
+	m_addSignal = new wxButton( this, wxID_ANY, _("Add signal"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer4->Add( m_addSignal, 0, wxALL|wxEXPAND, 5 );
 	
 	m_probeBtn = new wxButton( this, wxID_ANY, _("Probe"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer4->Add( m_probeBtn, 1, wxALL, 5 );
+	bSizer4->Add( m_probeBtn, 1, wxALL|wxEXPAND, 5 );
 	
 	m_tuneBtn = new wxButton( this, wxID_ANY, _("Tune"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer4->Add( m_tuneBtn, 1, wxALL, 5 );
+	bSizer4->Add( m_tuneBtn, 1, wxALL|wxEXPAND, 5 );
 	
 	
 	bSizer7->Add( bSizer4, 0, 0, 5 );
@@ -169,7 +172,8 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_signals->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
 	m_simulateBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
 	m_settingsBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSettings ), NULL, this );
-	m_probeBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onPlaceProbe ), NULL, this );
+	m_addSignal->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onAddSignal ), NULL, this );
+	m_probeBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onProbe ), NULL, this );
 	m_tuneBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onTune ), NULL, this );
 }
 
@@ -196,7 +200,8 @@ SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
 	m_signals->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
 	m_simulateBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
 	m_settingsBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSettings ), NULL, this );
-	m_probeBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onPlaceProbe ), NULL, this );
+	m_addSignal->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onAddSignal ), NULL, this );
+	m_probeBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onProbe ), NULL, this );
 	m_tuneBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onTune ), NULL, this );
 	
 }
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index be23240983..a52ded7398 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -919,7 +919,7 @@
                                         <property name="permission">none</property>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALL</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
                                             <property name="proportion">1</property>
                                             <object class="wxButton" expanded="0">
                                                 <property name="BottomDockable">1</property>
@@ -1007,7 +1007,7 @@
                                         </object>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALL</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
                                             <property name="proportion">1</property>
                                             <object class="wxButton" expanded="0">
                                                 <property name="BottomDockable">1</property>
@@ -1093,9 +1093,97 @@
                                                 <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxButton" 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_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</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">0</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="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="label">Add signal</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">m_addSignal</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <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>
+                                                <event name="OnButtonClick">onAddSignal</event>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALL</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
                                             <property name="proportion">1</property>
                                             <object class="wxButton" expanded="0">
                                                 <property name="BottomDockable">1</property>
@@ -1155,7 +1243,7 @@
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style"></property>
-                                                <event name="OnButtonClick">onPlaceProbe</event>
+                                                <event name="OnButtonClick">onProbe</event>
                                                 <event name="OnChar"></event>
                                                 <event name="OnEnterWindow"></event>
                                                 <event name="OnEraseBackground"></event>
@@ -1183,7 +1271,7 @@
                                         </object>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALL</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
                                             <property name="proportion">1</property>
                                             <object class="wxButton" expanded="0">
                                                 <property name="BottomDockable">1</property>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index 1032993d93..c4154d890f 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -54,6 +54,7 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxListCtrl* m_cursors;
 		wxButton* m_simulateBtn;
 		wxButton* m_settingsBtn;
+		wxButton* m_addSignal;
 		wxButton* m_probeBtn;
 		wxButton* m_tuneBtn;
 		
@@ -78,7 +79,8 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		virtual void onSignalRClick( wxMouseEvent& event ) { event.Skip(); }
 		virtual void onSimulate( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void onPlaceProbe( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onAddSignal( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onProbe( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onTune( wxCommandEvent& event ) { event.Skip(); }
 		
 	

From f62a6425a333259f4ad998394a83316b5c080385 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:43 +0200
Subject: [PATCH 095/197] Changed the simulator code license to GPLv3+

---
 eeschema/dialogs/dialog_signal_list.cpp      | 6 +++---
 eeschema/dialogs/dialog_signal_list.h        | 6 +++---
 eeschema/dialogs/dialog_sim_settings.cpp     | 6 +++---
 eeschema/dialogs/dialog_sim_settings.h       | 6 +++---
 eeschema/dialogs/dialog_spice_model.cpp      | 6 +++---
 eeschema/dialogs/dialog_spice_model.h        | 6 +++---
 eeschema/sim/netlist_exporter_pspice_sim.cpp | 6 +++---
 eeschema/sim/netlist_exporter_pspice_sim.h   | 6 +++---
 eeschema/sim/ngspice.cpp                     | 6 +++---
 eeschema/sim/ngspice.h                       | 6 +++---
 eeschema/sim/sim_plot_frame.cpp              | 6 +++---
 eeschema/sim/sim_plot_frame.h                | 6 +++---
 eeschema/sim/sim_plot_panel.cpp              | 6 +++---
 eeschema/sim/sim_plot_panel.h                | 6 +++---
 eeschema/sim/sim_types.h                     | 6 +++---
 eeschema/sim/simulate.cpp                    | 6 +++---
 eeschema/sim/spice_reporter.h                | 6 +++---
 eeschema/sim/spice_simulator.cpp             | 6 +++---
 eeschema/sim/spice_simulator.h               | 6 +++---
 19 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/eeschema/dialogs/dialog_signal_list.cpp b/eeschema/dialogs/dialog_signal_list.cpp
index c9bc5a00c7..6b1ff2cc02 100644
--- a/eeschema/dialogs/dialog_signal_list.cpp
+++ b/eeschema/dialogs/dialog_signal_list.cpp
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/dialogs/dialog_signal_list.h b/eeschema/dialogs/dialog_signal_list.h
index 571d2509d1..402f8b1888 100644
--- a/eeschema/dialogs/dialog_signal_list.h
+++ b/eeschema/dialogs/dialog_signal_list.h
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
index d0d8ca6b29..462cd5f125 100644
--- a/eeschema/dialogs/dialog_sim_settings.cpp
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/dialogs/dialog_sim_settings.h b/eeschema/dialogs/dialog_sim_settings.h
index a60b88893d..b757104de6 100644
--- a/eeschema/dialogs/dialog_sim_settings.h
+++ b/eeschema/dialogs/dialog_sim_settings.h
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp
index e2c2ba201e..6817d133ef 100644
--- a/eeschema/dialogs/dialog_spice_model.cpp
+++ b/eeschema/dialogs/dialog_spice_model.cpp
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/dialogs/dialog_spice_model.h b/eeschema/dialogs/dialog_spice_model.h
index 4323ce7e51..3f313483b5 100644
--- a/eeschema/dialogs/dialog_spice_model.h
+++ b/eeschema/dialogs/dialog_spice_model.h
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/sim/netlist_exporter_pspice_sim.cpp b/eeschema/sim/netlist_exporter_pspice_sim.cpp
index 15071ac573..a317fefe87 100644
--- a/eeschema/sim/netlist_exporter_pspice_sim.cpp
+++ b/eeschema/sim/netlist_exporter_pspice_sim.cpp
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/sim/netlist_exporter_pspice_sim.h b/eeschema/sim/netlist_exporter_pspice_sim.h
index d939f56858..27cb0e8369 100644
--- a/eeschema/sim/netlist_exporter_pspice_sim.h
+++ b/eeschema/sim/netlist_exporter_pspice_sim.h
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index bafc6792c6..de0b68a0d7 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -7,7 +7,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/sim/ngspice.h b/eeschema/sim/ngspice.h
index 2460537aba..975b62210d 100644
--- a/eeschema/sim/ngspice.h
+++ b/eeschema/sim/ngspice.h
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 762c9fc2c7..ffd6d08bb1 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -7,7 +7,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 49266a1758..a46e76c270 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -7,7 +7,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 3f9b36a611..4447628275 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -7,7 +7,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 1d87471386..a36c13ab3c 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -7,7 +7,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/sim/sim_types.h b/eeschema/sim/sim_types.h
index 82291be205..887eef887c 100644
--- a/eeschema/sim/sim_types.h
+++ b/eeschema/sim/sim_types.h
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/sim/simulate.cpp b/eeschema/sim/simulate.cpp
index d3252ed54d..6da2f5d43e 100644
--- a/eeschema/sim/simulate.cpp
+++ b/eeschema/sim/simulate.cpp
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/sim/spice_reporter.h b/eeschema/sim/spice_reporter.h
index 6b0e0b5bfc..a983d09bc4 100644
--- a/eeschema/sim/spice_reporter.h
+++ b/eeschema/sim/spice_reporter.h
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/sim/spice_simulator.cpp b/eeschema/sim/spice_simulator.cpp
index 7e47068796..f888c31a45 100644
--- a/eeschema/sim/spice_simulator.cpp
+++ b/eeschema/sim/spice_simulator.cpp
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
diff --git a/eeschema/sim/spice_simulator.h b/eeschema/sim/spice_simulator.h
index 7b12163bd7..611a954c23 100644
--- a/eeschema/sim/spice_simulator.h
+++ b/eeschema/sim/spice_simulator.h
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * as published by the Free Software Foundation; either version 3
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */

From 4f9a4186940d594a54fdabf44199601e3b4a7303 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:43 +0200
Subject: [PATCH 096/197] Moved SPICE_VALUE to a separate source file

---
 eeschema/CMakeLists.txt                       |   1 +
 eeschema/dialogs/dialog_spice_model.cpp       |   2 +
 .../netlist_exporter_pspice.cpp               |  85 -------
 .../netlist_exporter_pspice.h                 |  37 ---
 eeschema/sim/spice_value.cpp                  | 223 ++++++++++++++++++
 eeschema/sim/spice_value.h                    | 123 ++++++++++
 6 files changed, 349 insertions(+), 122 deletions(-)
 create mode 100644 eeschema/sim/spice_value.cpp
 create mode 100644 eeschema/sim/spice_value.h

diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 72f371c36f..8e8f02126b 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -182,6 +182,7 @@ set( EESCHEMA_SRCS
     sim/sim_plot_frame.cpp
     sim/sim_plot_panel.cpp
     sim/spice_simulator.cpp
+    sim/spice_value.cpp
     sim/ngspice.cpp
     sim/netlist_exporter_pspice_sim.cpp
     dialogs/dialog_signal_list.cpp
diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp
index 6817d133ef..7c5219d3b2 100644
--- a/eeschema/dialogs/dialog_spice_model.cpp
+++ b/eeschema/dialogs/dialog_spice_model.cpp
@@ -23,7 +23,9 @@
  */
 
 #include "dialog_spice_model.h"
+
 #include <netlist_exporters/netlist_exporter_pspice.h>
+#include <sim/spice_value.h>
 
 #include <wx/tokenzr.h>
 
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 48c3251275..c3fc92e780 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -381,91 +381,6 @@ void NETLIST_EXPORTER_PSPICE::writeDirectives( OUTPUTFORMATTER* aFormatter, unsi
 }
 
 
-SPICE_VALUE::SPICE_VALUE( const wxString& aString )
-{
-    char buf[8] = { 0, };
-
-    if( sscanf( (const char*) aString.c_str(), "%lf%7s", &m_base, buf ) == 0 )
-        throw std::invalid_argument( "Invalid Spice value string" );
-
-    if( *buf == 0 )
-    {
-        m_prefix = PFX_NONE;
-        return;
-    }
-
-    for( char* bufPtr = buf; *bufPtr; ++bufPtr )
-        *bufPtr = tolower( *bufPtr );
-
-    if( !strcmp( buf, "meg" ) )
-    {
-        m_prefix = PFX_MEGA;
-    }
-    else
-    {
-        switch( buf[0] )
-        {
-            case 'f': m_prefix = PFX_FEMTO; break;
-            case 'p': m_prefix = PFX_PICO; break;
-            case 'n': m_prefix = PFX_NANO; break;
-            case 'u': m_prefix = PFX_MICRO; break;
-            case 'm': m_prefix = PFX_MILI; break;
-            case 'k': m_prefix = PFX_KILO; break;
-            case 'g': m_prefix = PFX_GIGA; break;
-            case 't': m_prefix = PFX_TERA; break;
-
-            default:
-                throw std::invalid_argument( "Invalid unit prefix" );
-        }
-    }
-}
-
-
-SPICE_VALUE::SPICE_VALUE( int aInt, UNIT_PREFIX aPrefix )
-    : m_base( aInt ), m_prefix( aPrefix )
-{
-}
-
-
-SPICE_VALUE::SPICE_VALUE( double aDouble, UNIT_PREFIX aPrefix )
-    : m_base( aDouble ), m_prefix( aPrefix )
-{
-}
-
-
-double SPICE_VALUE::ToDouble() const
-{
-    double res = m_base;
-
-    if( m_prefix != PFX_NONE )
-        res *= pow( 10, (int) m_prefix );
-
-    return res;
-}
-
-
-wxString SPICE_VALUE::ToSpiceString() const
-{
-    wxString res = wxString::Format( "%f", m_base );
-
-    switch( m_prefix )
-    {
-        case PFX_FEMTO: res += "f"; break;
-        case PFX_PICO:  res += "p"; break;
-        case PFX_NANO:  res += "n"; break;
-        case PFX_MICRO: res += "u"; break;
-        case PFX_MILI:  res += "m"; break;
-        case PFX_NONE:  break;
-        case PFX_KILO:  res += "k"; break;
-        case PFX_MEGA:  res += "Meg"; break;
-        case PFX_GIGA:  res += "G"; break;
-        case PFX_TERA:  res += "T"; break;
-    }
-
-    return res;
-}
-
-
 // Entries in the vector below have to follow the order in SPICE_FIELD enum
 const std::vector<wxString> NETLIST_EXPORTER_PSPICE::m_spiceFields = {
     "Spice_Primitive",
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index 4c1ead2751..c45c4be425 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -170,41 +170,4 @@ private:
     static const std::vector<wxString> m_spiceFields;
 };
 
-
-// Helper class to handle Spice way of expressing values (e.g. 10.5m)
-class SPICE_VALUE
-{
-public:
-    enum UNIT_PREFIX
-    {
-        PFX_FEMTO   = -15,
-        PFX_PICO    = -12,
-        PFX_NANO    = -9,
-        PFX_MICRO   = -6,
-        PFX_MILI    = -3,
-        PFX_NONE    = 0,
-        PFX_KILO    = 3,
-        PFX_MEGA    = 6,
-        PFX_GIGA    = 9,
-        PFX_TERA    = 12
-    };
-
-    SPICE_VALUE( const wxString& aString );
-    SPICE_VALUE( int aInt, UNIT_PREFIX aPrefix = PFX_NONE );
-    SPICE_VALUE( double aDouble, UNIT_PREFIX aPrefix = PFX_NONE );
-
-    double ToDouble() const;
-
-    wxString ToSpiceString() const;
-
-    wxString ToString() const
-    {
-        return wxString::Format( "%f", ToDouble() );
-    }
-
-private:
-    double m_base;
-    UNIT_PREFIX m_prefix;
-};
-
 #endif
diff --git a/eeschema/sim/spice_value.cpp b/eeschema/sim/spice_value.cpp
new file mode 100644
index 0000000000..8c5b8f1464
--- /dev/null
+++ b/eeschema/sim/spice_value.cpp
@@ -0,0 +1,223 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "spice_value.h"
+
+#include <stdexcept>
+#include <cmath>
+
+SPICE_VALUE::SPICE_VALUE( const wxString& aString )
+{
+    char buf[8] = { 0, };
+
+    if( sscanf( (const char*) aString.c_str(), "%lf%7s", &m_base, buf ) == 0 )
+        throw std::invalid_argument( "Invalid Spice value string" );
+
+    if( *buf == 0 )
+    {
+        m_prefix = PFX_NONE;
+        m_spiceStr = false;
+        Normalize();
+        return;
+    }
+
+    m_spiceStr = true;
+
+    for( char* bufPtr = buf; *bufPtr; ++bufPtr )
+        *bufPtr = tolower( *bufPtr );
+
+    if( !strcmp( buf, "meg" ) )
+    {
+        m_prefix = PFX_MEGA;
+    }
+    else
+    {
+        switch( buf[0] )
+        {
+            case 'f': m_prefix = PFX_FEMTO; break;
+            case 'p': m_prefix = PFX_PICO; break;
+            case 'n': m_prefix = PFX_NANO; break;
+            case 'u': m_prefix = PFX_MICRO; break;
+            case 'm': m_prefix = PFX_MILI; break;
+            case 'k': m_prefix = PFX_KILO; break;
+            case 'g': m_prefix = PFX_GIGA; break;
+            case 't': m_prefix = PFX_TERA; break;
+
+            default:
+                throw std::invalid_argument( "Invalid unit prefix" );
+        }
+    }
+
+    Normalize();
+}
+
+
+void SPICE_VALUE::Normalize()
+{
+    while( std::fabs( m_base ) >= 1000.0 )
+    {
+        m_base *= 0.001;
+        m_prefix = (UNIT_PREFIX)( m_prefix + 3 );
+    }
+
+    while( m_base != 0.0 && std::fabs( m_base ) <= 0.001 )
+    {
+        m_base *= 1000.0;
+        m_prefix = (UNIT_PREFIX)( m_prefix - 3 );
+    }
+}
+
+
+double SPICE_VALUE::ToDouble() const
+{
+    double res = m_base;
+
+    if( m_prefix != PFX_NONE )
+        res *= std::pow( 10, (int) m_prefix );
+
+    return res;
+}
+
+wxString SPICE_VALUE::ToString() const
+{
+    wxString res( wxString::Format( "%.3f", ToDouble() ) );
+    stripZeros( res );
+
+    return res;
+}
+
+
+wxString SPICE_VALUE::ToSpiceString() const
+{
+    wxString res = wxString::Format( "%f", m_base );
+    stripZeros( res );
+
+    switch( m_prefix )
+    {
+        case PFX_FEMTO: res += "f"; break;
+        case PFX_PICO:  res += "p"; break;
+        case PFX_NANO:  res += "n"; break;
+        case PFX_MICRO: res += "u"; break;
+        case PFX_MILI:  res += "m"; break;
+        case PFX_NONE:  break;
+        case PFX_KILO:  res += "k"; break;
+        case PFX_MEGA:  res += "Meg"; break;
+        case PFX_GIGA:  res += "G"; break;
+        case PFX_TERA:  res += "T"; break;
+    }
+
+    return res;
+}
+
+
+SPICE_VALUE SPICE_VALUE::operator+( const SPICE_VALUE& aOther ) const
+{
+    int prefixDiff = m_prefix - aOther.m_prefix;
+    SPICE_VALUE res;
+    res.m_spiceStr = m_spiceStr || aOther.m_spiceStr;
+
+    // Convert both numbers to a common prefix
+    if( prefixDiff > 0 )
+    {
+        // Switch to the aOther prefix
+        res.m_base =  ( m_base * std::pow( 10, prefixDiff ) ) + aOther.m_base;
+        res.m_prefix = aOther.m_prefix;
+    }
+    else if( prefixDiff < 0 )
+    {
+        // Use the current prefix
+        res.m_base = m_base + ( aOther.m_base * std::pow( 10, -prefixDiff ) );
+        res.m_prefix = m_prefix;
+    }
+    else
+    {
+        res.m_base = m_base + aOther.m_base;
+        res.m_prefix = m_prefix; // == aOther.m_prefix
+    }
+
+    res.Normalize();
+
+    return res;
+}
+
+
+SPICE_VALUE SPICE_VALUE::operator-( const SPICE_VALUE& aOther ) const
+{
+    int prefixDiff = m_prefix - aOther.m_prefix;
+    SPICE_VALUE res;
+    res.m_spiceStr = m_spiceStr || aOther.m_spiceStr;
+
+    // Convert both numbers to a common prefix
+    if( prefixDiff > 0 )
+    {
+        // Switch to the aOther prefix
+        res.m_base = m_prefix * std::pow( 10, prefixDiff ) - aOther.m_prefix;
+        res.m_prefix = aOther.m_prefix;
+    }
+    else if( prefixDiff < 0 )
+    {
+        // Use the current prefix
+        res.m_base = m_prefix - aOther.m_prefix * std::pow( 10, -prefixDiff );
+        res.m_prefix = m_prefix;
+    }
+    else
+    {
+        res.m_base = m_base - aOther.m_base;
+        res.m_prefix = m_prefix; // == aOther.m_prefix
+    }
+
+    res.Normalize();
+
+    return res;
+}
+
+
+SPICE_VALUE SPICE_VALUE::operator*( const SPICE_VALUE& aOther ) const
+{
+    SPICE_VALUE res( m_base * aOther.m_base, (UNIT_PREFIX)( m_prefix + aOther.m_prefix ) );
+    res.m_spiceStr = m_spiceStr || aOther.m_spiceStr;
+    res.Normalize();
+
+    return res;
+}
+
+
+SPICE_VALUE SPICE_VALUE::operator/( const SPICE_VALUE& aOther ) const
+{
+    SPICE_VALUE res( m_base / aOther.m_base, (UNIT_PREFIX)( m_prefix - aOther.m_prefix ) );
+    res.m_spiceStr = m_spiceStr || aOther.m_spiceStr;
+    res.Normalize();
+
+    return res;
+}
+
+
+void SPICE_VALUE::stripZeros( wxString& aString )
+{
+    while( aString.EndsWith( '0' ) )
+        aString.RemoveLast();
+
+    if( aString.EndsWith( '.' ) )
+        aString.RemoveLast();
+}
diff --git a/eeschema/sim/spice_value.h b/eeschema/sim/spice_value.h
new file mode 100644
index 0000000000..c5d00a191e
--- /dev/null
+++ b/eeschema/sim/spice_value.h
@@ -0,0 +1,123 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef SPICE_VALUE_H
+#define SPICE_VALUE_H
+
+#include <wx/string.h>
+
+///> Helper class to handle Spice way of expressing values (e.g. 10.5 Meg)
+class SPICE_VALUE
+{
+public:
+    enum UNIT_PREFIX
+    {
+        PFX_FEMTO   = -15,
+        PFX_PICO    = -12,
+        PFX_NANO    = -9,
+        PFX_MICRO   = -6,
+        PFX_MILI    = -3,
+        PFX_NONE    = 0,
+        PFX_KILO    = 3,
+        PFX_MEGA    = 6,
+        PFX_GIGA    = 9,
+        PFX_TERA    = 12
+    };
+
+    SPICE_VALUE()
+        : m_base( 0 ), m_prefix( PFX_NONE )
+    {
+    }
+
+    SPICE_VALUE( const wxString& aString );
+
+    SPICE_VALUE( int aInt, UNIT_PREFIX aPrefix = PFX_NONE )
+        : m_base( aInt ), m_prefix( aPrefix ), m_spiceStr( false )
+    {
+    }
+
+    SPICE_VALUE( double aDouble, UNIT_PREFIX aPrefix = PFX_NONE )
+        : m_base( aDouble ), m_prefix( aPrefix ), m_spiceStr( false )
+    {
+    }
+
+    void Normalize();
+
+    double ToDouble() const;
+
+    wxString ToString() const;
+
+    wxString ToSpiceString() const;
+
+    wxString ToOrigString() const
+    {
+        return m_spiceStr ? ToSpiceString() : ToString();
+    }
+
+    bool IsSpiceString() const
+    {
+        return m_spiceStr;
+    }
+
+    bool operator==( const SPICE_VALUE& aOther ) const
+    {
+        return ( m_prefix == aOther.m_prefix && m_base == aOther.m_base );
+    }
+
+    bool operator>( const SPICE_VALUE& aOther ) const
+    {
+        return this->ToDouble() > aOther.ToDouble();
+    }
+
+    bool operator<( const SPICE_VALUE& aOther ) const
+    {
+        return this->ToDouble() < aOther.ToDouble();
+    }
+
+    bool operator>=( const SPICE_VALUE& aOther ) const
+    {
+        return ( *this == aOther || *this > aOther );
+    }
+
+    bool operator<=( const SPICE_VALUE& aOther ) const
+    {
+        return ( *this == aOther || *this < aOther );
+    }
+
+    SPICE_VALUE operator-( const SPICE_VALUE& aOther ) const;
+    SPICE_VALUE operator+( const SPICE_VALUE& aOther ) const;
+    SPICE_VALUE operator*( const SPICE_VALUE& aOther ) const;
+    SPICE_VALUE operator/( const SPICE_VALUE& aOther ) const;
+
+private:
+    double m_base;
+    UNIT_PREFIX m_prefix;
+
+    ///> Was the value defined using the Spice notation?
+    bool m_spiceStr;
+
+    static void stripZeros( wxString& aString );
+};
+
+#endif /* SPICE_VALUE_H */

From fead9ca831b46ba8f0462bec57b421f212fed567 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:44 +0200
Subject: [PATCH 097/197] TUNER_SLIDER widget

---
 eeschema/widgets/tuner_slider.cpp      | 198 +++++++
 eeschema/widgets/tuner_slider.h        |  99 ++++
 eeschema/widgets/tuner_slider_base.cpp | 108 ++++
 eeschema/widgets/tuner_slider_base.fbp | 776 +++++++++++++++++++++++++
 eeschema/widgets/tuner_slider_base.h   |  61 ++
 5 files changed, 1242 insertions(+)
 create mode 100644 eeschema/widgets/tuner_slider.cpp
 create mode 100644 eeschema/widgets/tuner_slider.h
 create mode 100644 eeschema/widgets/tuner_slider_base.cpp
 create mode 100644 eeschema/widgets/tuner_slider_base.fbp
 create mode 100644 eeschema/widgets/tuner_slider_base.h

diff --git a/eeschema/widgets/tuner_slider.cpp b/eeschema/widgets/tuner_slider.cpp
new file mode 100644
index 0000000000..276a910b46
--- /dev/null
+++ b/eeschema/widgets/tuner_slider.cpp
@@ -0,0 +1,198 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include "tuner_slider.h"
+
+#include <sim/sim_plot_frame.h>
+#include <sch_component.h>
+#include <template_fieldnames.h>
+#include <netlist_exporters/netlist_exporter_pspice.h>
+
+TUNER_SLIDER::TUNER_SLIDER( SIM_PLOT_FRAME* aParent, SCH_COMPONENT* aComponent )
+    : TUNER_SLIDER_BASE( aParent ), m_component( aComponent ),
+    m_min( 0.0 ), m_max( 0.0 ), m_value( 0.0 )
+{
+    const wxString compName = aComponent->GetField( REFERENCE )->GetText();
+    m_name->SetLabel( compName );
+    m_value = SPICE_VALUE( aComponent->GetField( VALUE )->GetText() );
+
+    // Generate Spice component name
+    SCH_FIELD* fieldPrim = aComponent->FindField( NETLIST_EXPORTER_PSPICE::GetSpiceFieldName( SPICE_PRIMITIVE ) );
+    char prim = fieldPrim ? fieldPrim->GetText()[0]
+        : NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( SPICE_PRIMITIVE, m_component, 0 )[0];
+    m_spiceName = wxString( prim + compName ).Lower();
+
+    // Call Set*() methods to update fields and slider
+    SetMax( SPICE_VALUE( 2.0 ) * m_value );
+    SetMin( SPICE_VALUE( 0.5 ) * m_value );
+    SetValue( m_value );
+
+    m_simTimer.SetOwner( this );
+    Connect( wxEVT_TIMER, wxTimerEventHandler( TUNER_SLIDER::onSimTimer ), NULL, this );
+}
+
+
+bool TUNER_SLIDER::SetValue( const SPICE_VALUE& aVal )
+{
+    // Get the value into the current range boundaries
+    if( aVal > m_max )
+        m_value = m_max;
+    else if( aVal < m_min )
+        m_value = m_min;
+    else
+        m_value = aVal;
+
+    updateValueText();
+    updateSlider();
+    updateComponentValue();
+
+    return true;
+}
+
+
+bool TUNER_SLIDER::SetMin( const SPICE_VALUE& aVal )
+{
+    if( aVal >= m_max )
+        return false;
+
+    m_min = aVal;
+
+    if( m_value < aVal )      // Limit the curent value
+        SetValue( aVal );
+
+    m_minText->SetValue( aVal.ToOrigString() );
+    updateSlider();
+
+    return true;
+}
+
+
+bool TUNER_SLIDER::SetMax( const SPICE_VALUE& aVal )
+{
+    if( aVal <= m_min )
+        return false;
+
+    m_max = aVal;
+
+    if( m_value > aVal )      // Limit the current value
+        SetValue( aVal );
+
+    m_maxText->SetValue( aVal.ToOrigString() );
+    updateSlider();
+
+    return true;
+}
+
+
+void TUNER_SLIDER::updateComponentValue()
+{
+    // Start simulation in 100 ms, if the value does not change meanwhile
+    m_simTimer.StartOnce( 100 );
+}
+
+
+void TUNER_SLIDER::updateSlider()
+{
+    assert( m_max >= m_value && m_value >= m_min );
+    m_slider->SetValue( ( ( m_value - m_min ) / ( m_max - m_min ) ).ToDouble() * 100 );
+}
+
+
+void TUNER_SLIDER::updateValueText()
+{
+    bool spiceString = m_min.IsSpiceString() || m_max.IsSpiceString();
+    m_valueText->SetValue( spiceString ? m_value.ToSpiceString() : m_value.ToString() );
+}
+
+
+void TUNER_SLIDER::onClose( wxCommandEvent& event )
+{
+    static_cast<SIM_PLOT_FRAME*>( GetParent() )->RemoveTuner( this );
+}
+
+
+void TUNER_SLIDER::onSave( wxCommandEvent& event )
+{
+    /// @todo it will crash when component is removed; completely remove m_component
+    m_component->GetField( VALUE )->SetText( m_value.ToOrigString() );
+}
+
+
+void TUNER_SLIDER::onSliderChanged( wxScrollEvent& event )
+{
+    m_value = m_min + ( m_max - m_min ) * SPICE_VALUE( m_slider->GetValue() / 100.0 );
+    updateValueText();
+    updateComponentValue();
+}
+
+
+void TUNER_SLIDER::onMaxTextEnter( wxCommandEvent& event )
+{
+    try
+    {
+        SPICE_VALUE newMax( m_maxText->GetValue() );
+        SetMax( newMax );
+    }
+    catch( std::exception& e )
+    {
+        // Restore the previous value
+        m_maxText->SetValue( m_max.ToOrigString() );
+    }
+}
+
+
+void TUNER_SLIDER::onValueTextEnter( wxCommandEvent& event )
+{
+    try
+    {
+        SPICE_VALUE newCur( m_valueText->GetValue() );
+        SetValue( newCur );
+    }
+    catch( std::exception& e )
+    {
+        // Restore the previous value
+        m_valueText->SetValue( m_value.ToOrigString() );
+    }
+}
+
+
+void TUNER_SLIDER::onMinTextEnter( wxCommandEvent& event )
+{
+    try
+    {
+        SPICE_VALUE newMin( m_minText->GetValue() );
+        SetMin( newMin );
+    }
+    catch( std::exception& e )
+    {
+        // Restore the previous value
+        m_minText->SetValue( m_min.ToOrigString() );
+    }
+}
+
+
+void TUNER_SLIDER::onSimTimer( wxTimerEvent& event )
+{
+    wxQueueEvent( GetParent(), new wxCommandEvent( EVT_SIM_UPDATE ) );
+}
diff --git a/eeschema/widgets/tuner_slider.h b/eeschema/widgets/tuner_slider.h
new file mode 100644
index 0000000000..05ae5e8b17
--- /dev/null
+++ b/eeschema/widgets/tuner_slider.h
@@ -0,0 +1,99 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2016 CERN
+ * @author Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ * or you may search the http://www.gnu.org website for the version 3 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef TUNER_SLIDER_H
+#define TUNER_SLIDER_H
+
+#include "tuner_slider_base.h"
+
+#include <sim/spice_value.h>
+
+#include <wx/timer.h>
+
+class SIM_PLOT_FRAME;
+class SCH_COMPONENT;
+
+/**
+ * @brief Custom widget to handle quick component values modification and simulation on the fly.
+ */
+class TUNER_SLIDER : public TUNER_SLIDER_BASE
+{
+public:
+    TUNER_SLIDER( SIM_PLOT_FRAME* aParent, SCH_COMPONENT* aComponent );
+
+    wxString GetComponentName() const
+    {
+        return m_name->GetLabel();
+    }
+
+    const wxString& GetSpiceName() const
+    {
+        return m_spiceName;
+    }
+
+    const SPICE_VALUE& GetValue() const
+    {
+        return m_value;
+    }
+
+    const SPICE_VALUE& GetMin() const
+    {
+        return m_min;
+    }
+
+    const SPICE_VALUE& GetMax() const
+    {
+        return m_max;
+    }
+
+    bool SetValue( const SPICE_VALUE& aVal );
+    bool SetMin( const SPICE_VALUE& aVal );
+    bool SetMax( const SPICE_VALUE& aVal );
+
+private:
+    void updateComponentValue();
+    void updateSlider();
+    void updateValueText();
+
+    void onClose( wxCommandEvent& event ) override;
+    void onSave( wxCommandEvent& event ) override;
+    void onSliderChanged( wxScrollEvent& event ) override;
+
+    void onMaxTextEnter( wxCommandEvent& event ) override;
+    void onValueTextEnter( wxCommandEvent& event ) override;
+    void onMinTextEnter( wxCommandEvent& event ) override;
+
+    void onSimTimer( wxTimerEvent& event );
+
+    wxString m_spiceName;
+
+    ///> Timer that restarts the simulation after the slider value has changed
+    wxTimer m_simTimer;
+
+    SCH_COMPONENT* m_component;
+
+    SPICE_VALUE m_min, m_max, m_value;
+};
+
+#endif /* TUNER_SLIDER_H */
diff --git a/eeschema/widgets/tuner_slider_base.cpp b/eeschema/widgets/tuner_slider_base.cpp
new file mode 100644
index 0000000000..079638b0ad
--- /dev/null
+++ b/eeschema/widgets/tuner_slider_base.cpp
@@ -0,0 +1,108 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "tuner_slider_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+TUNER_SLIDER_BASE::TUNER_SLIDER_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
+{
+	wxBoxSizer* bSizer1;
+	bSizer1 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer2;
+	bSizer2 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_name = new wxStaticText( this, wxID_ANY, _("Name"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_name->Wrap( -1 );
+	bSizer2->Add( m_name, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_closeBtn = new wxButton( this, wxID_ANY, _(" X "), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+	bSizer2->Add( m_closeBtn, 0, wxALL, 5 );
+	
+	
+	bSizer1->Add( bSizer2, 0, wxALL|wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer3;
+	bSizer3 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer4;
+	bSizer4 = new wxBoxSizer( wxVERTICAL );
+	
+	m_slider = new wxSlider( this, wxID_ANY, 50, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_INVERSE|wxSL_LEFT|wxSL_VERTICAL );
+	bSizer4->Add( m_slider, 1, 0, 5 );
+	
+	
+	bSizer3->Add( bSizer4, 0, wxEXPAND, 5 );
+	
+	wxGridSizer* gSizer1;
+	gSizer1 = new wxGridSizer( 0, 1, 0, 0 );
+	
+	m_maxText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
+	m_maxText->SetMinSize( wxSize( 70,-1 ) );
+	
+	gSizer1->Add( m_maxText, 0, wxALIGN_TOP|wxALL, 5 );
+	
+	m_valueText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
+	m_valueText->SetMinSize( wxSize( 70,-1 ) );
+	
+	gSizer1->Add( m_valueText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_minText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
+	m_minText->SetMinSize( wxSize( 70,-1 ) );
+	
+	gSizer1->Add( m_minText, 0, wxALIGN_BOTTOM|wxALL, 5 );
+	
+	
+	bSizer3->Add( gSizer1, 1, wxEXPAND, 5 );
+	
+	
+	bSizer1->Add( bSizer3, 1, wxEXPAND, 5 );
+	
+	m_saveBtn = new wxButton( this, wxID_ANY, _("Save"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer1->Add( m_saveBtn, 0, wxALL, 5 );
+	
+	
+	this->SetSizer( bSizer1 );
+	this->Layout();
+	
+	// Connect Events
+	m_closeBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TUNER_SLIDER_BASE::onClose ), NULL, this );
+	m_slider->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_maxText->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TUNER_SLIDER_BASE::onMaxTextEnter ), NULL, this );
+	m_valueText->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TUNER_SLIDER_BASE::onValueTextEnter ), NULL, this );
+	m_minText->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TUNER_SLIDER_BASE::onMinTextEnter ), NULL, this );
+	m_saveBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TUNER_SLIDER_BASE::onSave ), NULL, this );
+}
+
+TUNER_SLIDER_BASE::~TUNER_SLIDER_BASE()
+{
+	// Disconnect Events
+	m_closeBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TUNER_SLIDER_BASE::onClose ), NULL, this );
+	m_slider->Disconnect( wxEVT_SCROLL_TOP, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Disconnect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Disconnect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Disconnect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Disconnect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Disconnect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_slider->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this );
+	m_maxText->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TUNER_SLIDER_BASE::onMaxTextEnter ), NULL, this );
+	m_valueText->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TUNER_SLIDER_BASE::onValueTextEnter ), NULL, this );
+	m_minText->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TUNER_SLIDER_BASE::onMinTextEnter ), NULL, this );
+	m_saveBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TUNER_SLIDER_BASE::onSave ), NULL, this );
+	
+}
diff --git a/eeschema/widgets/tuner_slider_base.fbp b/eeschema/widgets/tuner_slider_base.fbp
new file mode 100644
index 0000000000..8c9df7f743
--- /dev/null
+++ b/eeschema/widgets/tuner_slider_base.fbp
@@ -0,0 +1,776 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<wxFormBuilder_Project>
+    <FileVersion major="1" minor="13" />
+    <object class="Project" expanded="1">
+        <property name="class_decoration"></property>
+        <property name="code_generation">C++</property>
+        <property name="disconnect_events">1</property>
+        <property name="disconnect_mode">source_name</property>
+        <property name="disconnect_php_events">0</property>
+        <property name="disconnect_python_events">0</property>
+        <property name="embedded_files_path">res</property>
+        <property name="encoding">UTF-8</property>
+        <property name="event_generation">connect</property>
+        <property name="file">tuner_slider_base</property>
+        <property name="first_id">1000</property>
+        <property name="help_provider">none</property>
+        <property name="internationalize">1</property>
+        <property name="name">TUNER_SLIDER_BASE</property>
+        <property name="namespace"></property>
+        <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="Panel" expanded="1">
+            <property name="aui_managed">0</property>
+            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
+            <property name="bg"></property>
+            <property name="context_help"></property>
+            <property name="context_menu">1</property>
+            <property name="enabled">1</property>
+            <property name="event_handler">impl_virtual</property>
+            <property name="fg"></property>
+            <property name="font"></property>
+            <property name="hidden">0</property>
+            <property name="id">wxID_ANY</property>
+            <property name="maximum_size"></property>
+            <property name="minimum_size"></property>
+            <property name="name">TUNER_SLIDER_BASE</property>
+            <property name="pos"></property>
+            <property name="size">97,283</property>
+            <property name="subclass"></property>
+            <property name="tooltip"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style">wxTAB_TRAVERSAL</property>
+            <event name="OnAuiFindManager"></event>
+            <event name="OnAuiPaneButton"></event>
+            <event name="OnAuiPaneClose"></event>
+            <event name="OnAuiPaneMaximize"></event>
+            <event name="OnAuiPaneRestore"></event>
+            <event name="OnAuiRender"></event>
+            <event name="OnChar"></event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnInitDialog"></event>
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI"></event>
+            <object class="wxBoxSizer" expanded="1">
+                <property name="minimum_size"></property>
+                <property name="name">bSizer1</property>
+                <property name="orient">wxVERTICAL</property>
+                <property name="permission">none</property>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL|wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="wxBoxSizer" expanded="0">
+                        <property name="minimum_size"></property>
+                        <property name="name">bSizer2</property>
+                        <property name="orient">wxHORIZONTAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                            <property name="proportion">1</property>
+                            <object class="wxStaticText" expanded="0">
+                                <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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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="label">Name</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">m_name</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="style"></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"></property>
+                                <property name="wrap">-1</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL</property>
+                            <property name="proportion">0</property>
+                            <object class="wxButton" expanded="0">
+                                <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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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">0</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="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="label"> X </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">m_closeBtn</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="style">wxBU_EXACTFIT</property>
+                                <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>
+                                <event name="OnButtonClick">onClose</event>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </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="wxBoxSizer" expanded="0">
+                        <property name="minimum_size"></property>
+                        <property name="name">bSizer3</property>
+                        <property name="orient">wxHORIZONTAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxEXPAND</property>
+                            <property name="proportion">0</property>
+                            <object class="wxBoxSizer" expanded="0">
+                                <property name="minimum_size"></property>
+                                <property name="name">bSizer4</property>
+                                <property name="orient">wxVERTICAL</property>
+                                <property name="permission">none</property>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag"></property>
+                                    <property name="proportion">1</property>
+                                    <object class="wxSlider" expanded="0">
+                                        <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_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</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="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="maxValue">100</property>
+                                        <property name="max_size"></property>
+                                        <property name="maximize_button">0</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="minValue">0</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">m_slider</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style">wxSL_AUTOTICKS|wxSL_INVERSE|wxSL_LEFT|wxSL_VERTICAL</property>
+                                        <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="value">50</property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnCommandScroll"></event>
+                                        <event name="OnCommandScrollBottom"></event>
+                                        <event name="OnCommandScrollChanged"></event>
+                                        <event name="OnCommandScrollLineDown"></event>
+                                        <event name="OnCommandScrollLineUp"></event>
+                                        <event name="OnCommandScrollPageDown"></event>
+                                        <event name="OnCommandScrollPageUp"></event>
+                                        <event name="OnCommandScrollThumbRelease"></event>
+                                        <event name="OnCommandScrollThumbTrack"></event>
+                                        <event name="OnCommandScrollTop"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnScroll">onSliderChanged</event>
+                                        <event name="OnScrollBottom"></event>
+                                        <event name="OnScrollChanged"></event>
+                                        <event name="OnScrollLineDown"></event>
+                                        <event name="OnScrollLineUp"></event>
+                                        <event name="OnScrollPageDown"></event>
+                                        <event name="OnScrollPageUp"></event>
+                                        <event name="OnScrollThumbRelease"></event>
+                                        <event name="OnScrollThumbTrack"></event>
+                                        <event name="OnScrollTop"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxEXPAND</property>
+                            <property name="proportion">1</property>
+                            <object class="wxGridSizer" expanded="0">
+                                <property name="cols">1</property>
+                                <property name="hgap">0</property>
+                                <property name="minimum_size"></property>
+                                <property name="name">gSizer1</property>
+                                <property name="permission">none</property>
+                                <property name="rows">0</property>
+                                <property name="vgap">0</property>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALIGN_TOP|wxALL</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxTextCtrl" expanded="0">
+                                        <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_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</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="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="maxlength"></property>
+                                        <property name="min_size"></property>
+                                        <property name="minimize_button">0</property>
+                                        <property name="minimum_size">70,-1</property>
+                                        <property name="moveable">1</property>
+                                        <property name="name">m_maxText</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style">wxTE_PROCESS_ENTER</property>
+                                        <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="value"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnText"></event>
+                                        <event name="OnTextEnter">onMaxTextEnter</event>
+                                        <event name="OnTextMaxLen"></event>
+                                        <event name="OnTextURL"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxTextCtrl" expanded="0">
+                                        <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_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</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="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="maxlength"></property>
+                                        <property name="min_size"></property>
+                                        <property name="minimize_button">0</property>
+                                        <property name="minimum_size">70,-1</property>
+                                        <property name="moveable">1</property>
+                                        <property name="name">m_valueText</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style">wxTE_PROCESS_ENTER</property>
+                                        <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="value"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnText"></event>
+                                        <event name="OnTextEnter">onValueTextEnter</event>
+                                        <event name="OnTextMaxLen"></event>
+                                        <event name="OnTextURL"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="0">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALIGN_BOTTOM|wxALL</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxTextCtrl" expanded="0">
+                                        <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_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</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="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="maxlength"></property>
+                                        <property name="min_size"></property>
+                                        <property name="minimize_button">0</property>
+                                        <property name="minimum_size">70,-1</property>
+                                        <property name="moveable">1</property>
+                                        <property name="name">m_minText</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style">wxTE_PROCESS_ENTER</property>
+                                        <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="value"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnText"></event>
+                                        <event name="OnTextEnter">onMinTextEnter</event>
+                                        <event name="OnTextMaxLen"></event>
+                                        <event name="OnTextURL"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL</property>
+                    <property name="proportion">0</property>
+                    <object class="wxButton" 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_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</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">0</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="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="label">Save</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">m_saveBtn</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="style"></property>
+                        <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>
+                        <event name="OnButtonClick">onSave</event>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</wxFormBuilder_Project>
diff --git a/eeschema/widgets/tuner_slider_base.h b/eeschema/widgets/tuner_slider_base.h
new file mode 100644
index 0000000000..f942912abe
--- /dev/null
+++ b/eeschema/widgets/tuner_slider_base.h
@@ -0,0 +1,61 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __TUNER_SLIDER_BASE_H__
+#define __TUNER_SLIDER_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/button.h>
+#include <wx/sizer.h>
+#include <wx/slider.h>
+#include <wx/textctrl.h>
+#include <wx/panel.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class TUNER_SLIDER_BASE
+///////////////////////////////////////////////////////////////////////////////
+class TUNER_SLIDER_BASE : public wxPanel 
+{
+	private:
+	
+	protected:
+		wxStaticText* m_name;
+		wxButton* m_closeBtn;
+		wxSlider* m_slider;
+		wxTextCtrl* m_maxText;
+		wxTextCtrl* m_valueText;
+		wxTextCtrl* m_minText;
+		wxButton* m_saveBtn;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void onClose( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSliderChanged( wxScrollEvent& event ) { event.Skip(); }
+		virtual void onMaxTextEnter( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onValueTextEnter( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onMinTextEnter( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSave( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		TUNER_SLIDER_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 97,283 ), long style = wxTAB_TRAVERSAL ); 
+		~TUNER_SLIDER_BASE();
+	
+};
+
+#endif //__TUNER_SLIDER_BASE_H__

From 92a3e405c213b4421091e8e96e9a16d7f354c849 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:45 +0200
Subject: [PATCH 098/197] Tuner tool.

---
 eeschema/CMakeLists.txt              |   2 +
 eeschema/eeschema_id.h               |   3 +-
 eeschema/onleftclick.cpp             |  25 +-
 eeschema/schedit.cpp                 |   7 +-
 eeschema/schframe.cpp                |   3 +-
 eeschema/schframe.h                  |   4 +
 eeschema/sim/sim_plot_frame.cpp      | 144 ++++++-
 eeschema/sim/sim_plot_frame.h        |  27 +-
 eeschema/sim/sim_plot_frame_base.cpp |  35 +-
 eeschema/sim/sim_plot_frame_base.fbp | 572 +++++++++++----------------
 eeschema/sim/sim_plot_frame_base.h   |   5 +-
 eeschema/sim/simulate.cpp            |  49 ++-
 12 files changed, 499 insertions(+), 377 deletions(-)

diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 8e8f02126b..3d32a8f3ff 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -191,6 +191,8 @@ set( EESCHEMA_SRCS
     dialogs/dialog_sim_settings_base.cpp
     dialogs/dialog_spice_model.cpp
     dialogs/dialog_spice_model_base.cpp
+    widgets/tuner_slider.cpp
+    widgets/tuner_slider_base.cpp
 
     netlist_exporters/netlist_exporter.cpp
     netlist_exporters/netlist_exporter_cadstar.cpp
diff --git a/eeschema/eeschema_id.h b/eeschema/eeschema_id.h
index 2e94e51e5a..94d764893a 100644
--- a/eeschema/eeschema_id.h
+++ b/eeschema/eeschema_id.h
@@ -257,7 +257,8 @@ enum id_eeschema_frm
     ID_UPDATE_SCH_FROM_PCB,
 
     ID_SIM_SHOW,
-    ID_SIM_ADD_PROBE
+    ID_SIM_PROBE,
+    ID_SIM_TUNE
 };
 
 
diff --git a/eeschema/onleftclick.cpp b/eeschema/onleftclick.cpp
index 114b2266e3..a35baab2d9 100644
--- a/eeschema/onleftclick.cpp
+++ b/eeschema/onleftclick.cpp
@@ -325,7 +325,7 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
         }
         break;
 
-    case ID_SIM_ADD_PROBE:
+    case ID_SIM_PROBE:
         {
             const KICAD_T wiresAndComponents[] = { SCH_LINE_T, SCH_COMPONENT_T, SCH_SHEET_PIN_T };
             item = LocateAndShowItem( aPosition, wiresAndComponents );
@@ -350,6 +350,29 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
         }
         break;
 
+    case ID_SIM_TUNE:
+        {
+            const KICAD_T fieldsAndComponents[] = { SCH_COMPONENT_T, SCH_FIELD_T };
+            item = LocateAndShowItem( aPosition, fieldsAndComponents );
+
+            if( !item )
+                return;
+
+            if( item->Type() != SCH_COMPONENT_T )
+            {
+                item = static_cast<SCH_ITEM*>( item->GetParent() );
+
+                if( item->Type() != SCH_COMPONENT_T )
+                    return;
+            }
+
+            SIM_PLOT_FRAME* simFrame = (SIM_PLOT_FRAME*) Kiway().Player( FRAME_SIMULATOR, false );
+
+            if( simFrame )
+                simFrame->AddTuner( static_cast<SCH_COMPONENT*>( item ) );
+        }
+        break;
+
     default:
         SetToolID( ID_NO_TOOL_SELECTED, m_canvas->GetDefaultCursor(), wxEmptyString );
         wxFAIL_MSG( wxT( "SCH_EDIT_FRAME::OnLeftClick invalid tool ID <" ) +
diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp
index aa9615a9f1..10917ff499 100644
--- a/eeschema/schedit.cpp
+++ b/eeschema/schedit.cpp
@@ -609,11 +609,16 @@ void SCH_EDIT_FRAME::OnSelectTool( wxCommandEvent& aEvent )
         SetToolID( id, wxCURSOR_BULLSEYE, _( "Delete item" ) );
         break;
 
-    case ID_SIM_ADD_PROBE:
+    case ID_SIM_PROBE:
         SetToolID( id, -1, _( "Add a simulator probe" ) );
         m_canvas->SetCursor( CURSOR_PROBE );
         break;
 
+    case ID_SIM_TUNE:
+        SetToolID( id, -1, _( "Select a value to be tuned" ) );
+        m_canvas->SetCursor( CURSOR_TUNE );
+        break;
+
     default:
         SetRepeatItem( NULL );
     }
diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp
index ccd1180859..cd26bf7051 100644
--- a/eeschema/schframe.cpp
+++ b/eeschema/schframe.cpp
@@ -281,7 +281,8 @@ BEGIN_EVENT_TABLE( SCH_EDIT_FRAME, EDA_DRAW_FRAME )
     EVT_TOOL_RANGE( ID_SCHEMATIC_VERTICAL_TOOLBAR_START, ID_SCHEMATIC_VERTICAL_TOOLBAR_END,
                     SCH_EDIT_FRAME::OnSelectTool )
 
-    EVT_TOOL( ID_SIM_ADD_PROBE, SCH_EDIT_FRAME::OnSelectTool )
+    EVT_TOOL( ID_SIM_PROBE, SCH_EDIT_FRAME::OnSelectTool )
+    EVT_TOOL( ID_SIM_TUNE, SCH_EDIT_FRAME::OnSelectTool )
 
     EVT_MENU( ID_CANCEL_CURRENT_COMMAND, SCH_EDIT_FRAME::OnCancelCurrentCommand )
     EVT_MENU( ID_SCH_DRAG_ITEM, SCH_EDIT_FRAME::OnDragItem )
diff --git a/eeschema/schframe.h b/eeschema/schframe.h
index 7c7938f65d..9c5c40b1b8 100644
--- a/eeschema/schframe.h
+++ b/eeschema/schframe.h
@@ -1381,8 +1381,12 @@ public:
 
     wxString GetNetListerCommand() const { return m_netListerCommand; }
 
+    ///> Probe cursor, used by circuit simulator
     const static wxCursor CURSOR_PROBE;
 
+    ///> Tuner cursor, used by circuit simulator
+    const static wxCursor CURSOR_TUNE;
+
     DECLARE_EVENT_TABLE()
 };
 
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index ffd6d08bb1..f0f2db250d 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -26,7 +26,9 @@
 #include <schframe.h>
 #include <eeschema_id.h>
 #include <kiway.h>
+#include <confirm.h>
 
+#include <widgets/tuner_slider.h>
 #include <dialogs/dialog_signal_list.h>
 #include "netlist_exporter_pspice_sim.h"
 
@@ -87,6 +89,7 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     updateNetlistExporter();
 
     Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SIM_PLOT_FRAME::onClose ), NULL, this );
+    Connect( EVT_SIM_UPDATE, wxCommandEventHandler( SIM_PLOT_FRAME::onSimUpdate ), NULL, this );
     Connect( EVT_SIM_REPORT, wxCommandEventHandler( SIM_PLOT_FRAME::onSimReport ), NULL, this );
     Connect( EVT_SIM_STARTED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimStarted ), NULL, this );
     Connect( EVT_SIM_FINISHED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
@@ -105,17 +108,20 @@ void SIM_PLOT_FRAME::StartSimulation()
 
     m_simConsole->Clear();
 
-    // TODO check if there is a valid simulation command
+    updateNetlistExporter();
+    m_exporter->SetSimCommand( m_settingsDlg.GetSimCommand() );
+    m_exporter->Format( &formatter, m_settingsDlg.GetNetlistOptions() );
+
+    if( m_exporter->GetSimType() == ST_UNKNOWN )
+    {
+        DisplayInfoMessage( this, wxT( "You need to select the simulation settings first" ) );
+        return;
+    }
 
     /// @todo is it necessary to recreate simulator every time?
     m_simulator.reset( SPICE_SIMULATOR::CreateInstance( "ngspice" ) );
     m_simulator->SetReporter( new SIM_THREAD_REPORTER( this ) );
     m_simulator->Init();
-
-    updateNetlistExporter();
-    m_exporter->SetSimCommand( m_settingsDlg.GetSimCommand() );
-    m_exporter->Format( &formatter, m_settingsDlg.GetNetlistOptions() );
-
     m_simulator->LoadNetlist( formatter.GetString() );
     m_simulator->Run();
 }
@@ -128,6 +134,12 @@ void SIM_PLOT_FRAME::StopSimulation()
 }
 
 
+bool SIM_PLOT_FRAME::IsSimulationRunning()
+{
+    return m_simulator ? m_simulator->IsRunning() : false;
+}
+
+
 SIM_PLOT_PANEL* SIM_PLOT_FRAME::NewPlotPanel( SIM_TYPE aSimType )
 {
     SIM_PLOT_PANEL* plot = new SIM_PLOT_PANEL( aSimType, m_plotNotebook, wxID_ANY );
@@ -165,15 +177,56 @@ void SIM_PLOT_FRAME::AddVoltagePlot( const wxString& aNetName )
 }
 
 
-SIM_PLOT_PANEL* SIM_PLOT_FRAME::CurrentPlot() const
+void SIM_PLOT_FRAME::AddTuner( SCH_COMPONENT* aComponent )
 {
-    return static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetCurrentPage() );
+    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
+
+    if( !plotPanel )
+        return;
+
+    const wxString& componentName = aComponent->GetField( REFERENCE )->GetText();
+    auto& tunerList = m_tuners[plotPanel];
+
+    // Do not add multiple instances for the same component
+    auto tunerIt = std::find_if( tunerList.begin(), tunerList.end(), [&]( const TUNER_SLIDER* t )
+        {
+            return t->GetComponentName() == componentName;
+        }
+    );
+
+    if( tunerIt != tunerList.end() )
+        return;     // We already have it
+
+    try
+    {
+        TUNER_SLIDER* tuner = new TUNER_SLIDER( this, aComponent );
+        m_tuneSizer->Add( tuner );
+        tunerList.push_back( tuner );
+        Layout();
+    }
+    catch( ... )
+    {
+        // Sorry, no bonus
+    }
 }
 
 
-bool SIM_PLOT_FRAME::isSimulationRunning()
+void SIM_PLOT_FRAME::RemoveTuner( TUNER_SLIDER* aTuner )
 {
-    return m_simulator ? m_simulator->IsRunning() : false;
+    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
+
+    if( !plotPanel )
+        return;
+
+    m_tuners[plotPanel].remove( aTuner );
+    aTuner->Destroy();
+    Layout();
+}
+
+
+SIM_PLOT_PANEL* SIM_PLOT_FRAME::CurrentPlot() const
+{
+    return static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetCurrentPage() );
 }
 
 
@@ -283,6 +336,28 @@ void SIM_PLOT_FRAME::updateSignalList()
 }
 
 
+void SIM_PLOT_FRAME::updateTuners()
+{
+    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
+
+    if( !plotPanel )
+        return;
+
+    for( unsigned int i = 0; i < m_tuneSizer->GetItemCount(); ++i )
+        m_tuneSizer->Hide( i );
+
+    m_tuneSizer->Clear();
+
+    for( auto tuner : m_tuners[plotPanel] )
+    {
+        m_tuneSizer->Add( tuner );
+        tuner->Show();
+    }
+
+    Layout();
+}
+
+
 int SIM_PLOT_FRAME::getNodeNumber( const wxString& aNetName )
 {
     const auto& netMapping = m_exporter->GetNetIndexMap();
@@ -419,6 +494,7 @@ void SIM_PLOT_FRAME::menuShowCoordsUpdate( wxUpdateUIEvent& event )
 void SIM_PLOT_FRAME::onPlotChanged( wxNotebookEvent& event )
 {
     updateSignalList();
+    updateTuners();
 
     // Update cursors
     wxQueueEvent( this, new wxCommandEvent( EVT_SIM_CURSOR_UPDATE ) );
@@ -461,7 +537,7 @@ void SIM_PLOT_FRAME::onSignalRClick( wxMouseEvent& event )
 
 void SIM_PLOT_FRAME::onSimulate( wxCommandEvent& event )
 {
-    if( isSimulationRunning() )
+    if( IsSimulationRunning() )
         StopSimulation();
     else
         StartSimulation();
@@ -489,14 +565,22 @@ void SIM_PLOT_FRAME::onProbe( wxCommandEvent& event )
     if( m_schematicFrame == NULL )
         return;
 
-    wxCommandEvent* placeProbe = new wxCommandEvent( wxEVT_TOOL, ID_SIM_ADD_PROBE );
-    wxQueueEvent( m_schematicFrame, placeProbe );
+    wxQueueEvent( m_schematicFrame, new wxCommandEvent( wxEVT_TOOL, ID_SIM_PROBE ) );
+}
+
+
+void SIM_PLOT_FRAME::onTune( wxCommandEvent& event )
+{
+    if( m_schematicFrame == NULL )
+        return;
+
+    wxQueueEvent( m_schematicFrame, new wxCommandEvent( wxEVT_TOOL, ID_SIM_TUNE ) );
 }
 
 
 void SIM_PLOT_FRAME::onClose( wxCloseEvent& aEvent )
 {
-    if( isSimulationRunning() )
+    if( IsSimulationRunning() )
         m_simulator->Stop();
 
     Destroy();
@@ -539,6 +623,10 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
     SetCursor( wxCURSOR_ARROW );
 
     SIM_TYPE simType = m_exporter->GetSimType();
+
+    if( simType == ST_UNKNOWN )
+        return;
+
     SIM_PLOT_PANEL* plotPanel = CurrentPlot();
 
     if( plotPanel == nullptr || plotPanel->GetType() != simType )
@@ -565,6 +653,32 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
 }
 
 
+void SIM_PLOT_FRAME::onSimUpdate( wxCommandEvent& aEvent )
+{
+    if( !m_simulator )
+        return;
+
+    if( IsSimulationRunning() )
+        StopSimulation();
+
+    m_simConsole->Clear();
+
+    // Apply tuned values
+    if( SIM_PLOT_PANEL* plotPanel = CurrentPlot() )
+    {
+        for( auto tuner : m_tuners[plotPanel] )
+        {
+            /// @todo no ngspice hardcoding
+            std::string command( "alter @" + tuner->GetSpiceName()
+                    + "=" + tuner->GetValue().ToSpiceString() );
+            m_simulator->Command( command );
+        }
+    }
+
+    m_simulator->Run();
+}
+
+
 void SIM_PLOT_FRAME::onSimReport( wxCommandEvent& aEvent )
 {
     std::cout << aEvent.GetString() << std::endl;
@@ -624,6 +738,8 @@ void SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::onMenuEvent( wxMenuEvent& aEvent )
     }
 }
 
+wxDEFINE_EVENT( EVT_SIM_UPDATE, wxCommandEvent );
 wxDEFINE_EVENT( EVT_SIM_REPORT, wxCommandEvent );
+
 wxDEFINE_EVENT( EVT_SIM_STARTED, wxCommandEvent );
 wxDEFINE_EVENT( EVT_SIM_FINISHED, wxCommandEvent );
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index a46e76c270..899a5d5bbe 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -36,12 +36,18 @@
 #include <dialogs/dialog_sim_settings.h>
 
 #include <wx/event.h>
+
+#include <list>
 #include <memory>
+#include <map>
 
 class SCH_EDIT_FRAME;
+class SCH_COMPONENT;
+
 class SPICE_SIMULATOR;
 class NETLIST_EXPORTER_PSPICE_SIM;
 class SIM_PLOT_PANEL;
+class TUNER_SLIDER;
 
 /** Implementing SIM_PLOT_FRAME_BASE */
 class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
@@ -53,6 +59,7 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
 
         void StartSimulation();
         void StopSimulation();
+        bool IsSimulationRunning();
 
         /**
          * @brief Creates a new plot panel for a given simulation type and adds it to the main
@@ -64,11 +71,13 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
 
         void AddVoltagePlot( const wxString& aNetName );
 
+        void AddTuner( SCH_COMPONENT* aComponent );
+
+        void RemoveTuner( TUNER_SLIDER* aTuner );
+
         SIM_PLOT_PANEL* CurrentPlot() const;
 
     private:
-        bool isSimulationRunning();
-
         void updateNetlistExporter();
 
         /**
@@ -87,6 +96,11 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
          */
         void updateSignalList();
 
+        /**
+         * @brief Fills the tuners area with the ones related to the current plot.
+         */
+        void updateTuners();
+
         /**
          * @brief Returns node number for a given net.
          * @param aNetName is the net number.
@@ -124,17 +138,20 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void onSettings( wxCommandEvent& event ) override;
         void onAddSignal( wxCommandEvent& event ) override;
         void onProbe( wxCommandEvent& event ) override;
+        void onTune( wxCommandEvent& event ) override;
 
         void onClose( wxCloseEvent& aEvent );
 
         void onCursorUpdate( wxCommandEvent& aEvent );
+        void onSimUpdate( wxCommandEvent& aEvent );
+        void onSimReport( wxCommandEvent& aEvent );
         void onSimStarted( wxCommandEvent& aEvent );
         void onSimFinished( wxCommandEvent& aEvent );
-        void onSimReport( wxCommandEvent& aEvent );
 
         SCH_EDIT_FRAME* m_schematicFrame;
         std::unique_ptr<NETLIST_EXPORTER_PSPICE_SIM> m_exporter;
         std::unique_ptr<SPICE_SIMULATOR> m_simulator;
+        std::map<SIM_PLOT_PANEL*, std::list<TUNER_SLIDER*> > m_tuners;
 
         // Trick to preserve settings between runs
         DIALOG_SIM_SETTINGS m_settingsDlg;
@@ -161,7 +178,11 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         };
 };
 
+// Commands
+wxDECLARE_EVENT( EVT_SIM_UPDATE, wxCommandEvent );
 wxDECLARE_EVENT( EVT_SIM_REPORT, wxCommandEvent );
+
+// Notifications
 wxDECLARE_EVENT( EVT_SIM_STARTED, wxCommandEvent );
 wxDECLARE_EVENT( EVT_SIM_FINISHED, wxCommandEvent );
 
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index a105066b44..b5c2429d0e 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -104,19 +104,34 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	wxBoxSizer* bSizer7;
 	bSizer7 = new wxBoxSizer( wxVERTICAL );
 	
-	m_staticText2 = new wxStaticText( this, wxID_ANY, _("Signals"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText2->Wrap( -1 );
-	bSizer7->Add( m_staticText2, 0, wxALL|wxEXPAND, 5 );
+	wxStaticBoxSizer* sbSizer1;
+	sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Signals") ), wxVERTICAL );
 	
-	m_signals = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_SORT ); 
-	bSizer7->Add( m_signals, 1, wxALL|wxEXPAND, 5 );
+	m_signals = new wxListBox( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_SORT ); 
+	sbSizer1->Add( m_signals, 1, wxALL|wxEXPAND, 5 );
 	
-	m_staticText21 = new wxStaticText( this, wxID_ANY, _("Cursors"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText21->Wrap( -1 );
-	bSizer7->Add( m_staticText21, 0, wxALL, 5 );
 	
-	m_cursors = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL );
-	bSizer7->Add( m_cursors, 1, wxALL|wxEXPAND, 5 );
+	bSizer7->Add( sbSizer1, 1, wxEXPAND, 5 );
+	
+	wxStaticBoxSizer* sbSizer3;
+	sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Cursors") ), wxVERTICAL );
+	
+	m_cursors = new wxListCtrl( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL );
+	sbSizer3->Add( m_cursors, 1, wxALL|wxEXPAND, 5 );
+	
+	
+	bSizer7->Add( sbSizer3, 1, wxEXPAND, 5 );
+	
+	wxStaticBoxSizer* sbSizer4;
+	sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Tune") ), wxVERTICAL );
+	
+	m_tuneSizer = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	sbSizer4->Add( m_tuneSizer, 1, wxEXPAND, 5 );
+	
+	
+	bSizer7->Add( sbSizer4, 1, wxEXPAND, 5 );
 	
 	wxBoxSizer* bSizer4;
 	bSizer4 = new wxBoxSizer( wxHORIZONTAL );
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index a52ded7398..ebd2282bd0 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -544,371 +544,261 @@
                             <property name="border">5</property>
                             <property name="flag">wxEXPAND</property>
                             <property name="proportion">1</property>
-                            <object class="wxBoxSizer" expanded="0">
+                            <object class="wxBoxSizer" expanded="1">
                                 <property name="minimum_size"></property>
                                 <property name="name">bSizer7</property>
                                 <property name="orient">wxVERTICAL</property>
                                 <property name="permission">none</property>
-                                <object class="sizeritem" expanded="0">
+                                <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALL|wxEXPAND</property>
-                                    <property name="proportion">0</property>
-                                    <object class="wxStaticText" expanded="0">
-                                        <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_name"></property>
-                                        <property name="aui_position"></property>
-                                        <property name="aui_row"></property>
-                                        <property name="best_size"></property>
-                                        <property name="bg"></property>
-                                        <property name="caption"></property>
-                                        <property name="caption_visible">1</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="fg"></property>
-                                        <property name="floatable">1</property>
-                                        <property name="font"></property>
-                                        <property name="gripper">0</property>
-                                        <property name="hidden">0</property>
+                                    <property name="flag">wxEXPAND</property>
+                                    <property name="proportion">1</property>
+                                    <object class="wxStaticBoxSizer" expanded="0">
                                         <property name="id">wxID_ANY</property>
                                         <property name="label">Signals</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">m_staticText2</property>
-                                        <property name="pane_border">1</property>
-                                        <property name="pane_position"></property>
-                                        <property name="pane_size"></property>
-                                        <property name="permission">protected</property>
-                                        <property name="pin_button">1</property>
-                                        <property name="pos"></property>
-                                        <property name="resize">Resizable</property>
-                                        <property name="show">1</property>
-                                        <property name="size"></property>
-                                        <property name="style">wxALIGN_CENTRE</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"></property>
-                                        <property name="wrap">-1</property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
+                                        <property name="name">sbSizer1</property>
+                                        <property name="orient">wxVERTICAL</property>
+                                        <property name="parent">1</property>
+                                        <property name="permission">none</property>
                                         <event name="OnUpdateUI"></event>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxListBox" expanded="0">
+                                                <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_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="choices"></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="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">m_signals</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style">wxLB_SINGLE|wxLB_SORT</property>
+                                                <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>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnListBox"></event>
+                                                <event name="OnListBoxDClick">onSignalDblClick</event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp">onSignalRClick</event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="0">
+                                <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALL|wxEXPAND</property>
+                                    <property name="flag">wxEXPAND</property>
                                     <property name="proportion">1</property>
-                                    <object class="wxListBox" expanded="0">
-                                        <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_name"></property>
-                                        <property name="aui_position"></property>
-                                        <property name="aui_row"></property>
-                                        <property name="best_size"></property>
-                                        <property name="bg"></property>
-                                        <property name="caption"></property>
-                                        <property name="caption_visible">1</property>
-                                        <property name="center_pane">0</property>
-                                        <property name="choices"></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="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">m_signals</property>
-                                        <property name="pane_border">1</property>
-                                        <property name="pane_position"></property>
-                                        <property name="pane_size"></property>
-                                        <property name="permission">protected</property>
-                                        <property name="pin_button">1</property>
-                                        <property name="pos"></property>
-                                        <property name="resize">Resizable</property>
-                                        <property name="show">1</property>
-                                        <property name="size"></property>
-                                        <property name="style">wxLB_SINGLE|wxLB_SORT</property>
-                                        <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>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnListBox"></event>
-                                        <event name="OnListBoxDClick">onSignalDblClick</event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp">onSignalRClick</event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
-                                    </object>
-                                </object>
-                                <object class="sizeritem" expanded="0">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxALL</property>
-                                    <property name="proportion">0</property>
-                                    <object class="wxStaticText" expanded="0">
-                                        <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_name"></property>
-                                        <property name="aui_position"></property>
-                                        <property name="aui_row"></property>
-                                        <property name="best_size"></property>
-                                        <property name="bg"></property>
-                                        <property name="caption"></property>
-                                        <property name="caption_visible">1</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="fg"></property>
-                                        <property name="floatable">1</property>
-                                        <property name="font"></property>
-                                        <property name="gripper">0</property>
-                                        <property name="hidden">0</property>
+                                    <object class="wxStaticBoxSizer" expanded="0">
                                         <property name="id">wxID_ANY</property>
                                         <property name="label">Cursors</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">m_staticText21</property>
-                                        <property name="pane_border">1</property>
-                                        <property name="pane_position"></property>
-                                        <property name="pane_size"></property>
-                                        <property name="permission">protected</property>
-                                        <property name="pin_button">1</property>
-                                        <property name="pos"></property>
-                                        <property name="resize">Resizable</property>
-                                        <property name="show">1</property>
-                                        <property name="size"></property>
-                                        <property name="style"></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"></property>
-                                        <property name="wrap">-1</property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
+                                        <property name="name">sbSizer3</property>
+                                        <property name="orient">wxVERTICAL</property>
+                                        <property name="parent">1</property>
+                                        <property name="permission">none</property>
                                         <event name="OnUpdateUI"></event>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxListCtrl" expanded="0">
+                                                <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_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</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="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">m_cursors</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style">wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL</property>
+                                                <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>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnListBeginDrag"></event>
+                                                <event name="OnListBeginLabelEdit"></event>
+                                                <event name="OnListBeginRDrag"></event>
+                                                <event name="OnListCacheHint"></event>
+                                                <event name="OnListColBeginDrag"></event>
+                                                <event name="OnListColClick"></event>
+                                                <event name="OnListColDragging"></event>
+                                                <event name="OnListColEndDrag"></event>
+                                                <event name="OnListColRightClick"></event>
+                                                <event name="OnListDeleteAllItems"></event>
+                                                <event name="OnListDeleteItem"></event>
+                                                <event name="OnListEndLabelEdit"></event>
+                                                <event name="OnListInsertItem"></event>
+                                                <event name="OnListItemActivated"></event>
+                                                <event name="OnListItemDeselected"></event>
+                                                <event name="OnListItemFocused"></event>
+                                                <event name="OnListItemMiddleClick"></event>
+                                                <event name="OnListItemRightClick"></event>
+                                                <event name="OnListItemSelected"></event>
+                                                <event name="OnListKeyDown"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="0">
+                                <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALL|wxEXPAND</property>
+                                    <property name="flag">wxEXPAND</property>
                                     <property name="proportion">1</property>
-                                    <object class="wxListCtrl" expanded="0">
-                                        <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_name"></property>
-                                        <property name="aui_position"></property>
-                                        <property name="aui_row"></property>
-                                        <property name="best_size"></property>
-                                        <property name="bg"></property>
-                                        <property name="caption"></property>
-                                        <property name="caption_visible">1</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="fg"></property>
-                                        <property name="floatable">1</property>
-                                        <property name="font"></property>
-                                        <property name="gripper">0</property>
-                                        <property name="hidden">0</property>
+                                    <object class="wxStaticBoxSizer" expanded="1">
                                         <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="label">Tune</property>
                                         <property name="minimum_size"></property>
-                                        <property name="moveable">1</property>
-                                        <property name="name">m_cursors</property>
-                                        <property name="pane_border">1</property>
-                                        <property name="pane_position"></property>
-                                        <property name="pane_size"></property>
-                                        <property name="permission">protected</property>
-                                        <property name="pin_button">1</property>
-                                        <property name="pos"></property>
-                                        <property name="resize">Resizable</property>
-                                        <property name="show">1</property>
-                                        <property name="size"></property>
-                                        <property name="style">wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL</property>
-                                        <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>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnListBeginDrag"></event>
-                                        <event name="OnListBeginLabelEdit"></event>
-                                        <event name="OnListBeginRDrag"></event>
-                                        <event name="OnListCacheHint"></event>
-                                        <event name="OnListColBeginDrag"></event>
-                                        <event name="OnListColClick"></event>
-                                        <event name="OnListColDragging"></event>
-                                        <event name="OnListColEndDrag"></event>
-                                        <event name="OnListColRightClick"></event>
-                                        <event name="OnListDeleteAllItems"></event>
-                                        <event name="OnListDeleteItem"></event>
-                                        <event name="OnListEndLabelEdit"></event>
-                                        <event name="OnListInsertItem"></event>
-                                        <event name="OnListItemActivated"></event>
-                                        <event name="OnListItemDeselected"></event>
-                                        <event name="OnListItemFocused"></event>
-                                        <event name="OnListItemMiddleClick"></event>
-                                        <event name="OnListItemRightClick"></event>
-                                        <event name="OnListItemSelected"></event>
-                                        <event name="OnListKeyDown"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
+                                        <property name="name">sbSizer4</property>
+                                        <property name="orient">wxVERTICAL</property>
+                                        <property name="parent">1</property>
+                                        <property name="permission">none</property>
                                         <event name="OnUpdateUI"></event>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxEXPAND</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxBoxSizer" expanded="1">
+                                                <property name="minimum_size"></property>
+                                                <property name="name">m_tuneSizer</property>
+                                                <property name="orient">wxHORIZONTAL</property>
+                                                <property name="permission">protected</property>
+                                            </object>
+                                        </object>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="0">
+                                <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
                                     <property name="flag"></property>
                                     <property name="proportion">0</property>
@@ -1093,11 +983,11 @@
                                                 <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
-                                        <object class="sizeritem" expanded="1">
+                                        <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALL|wxEXPAND</property>
                                             <property name="proportion">0</property>
-                                            <object class="wxButton" expanded="1">
+                                            <object class="wxButton" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index c4154d890f..b4859b9882 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -26,8 +26,8 @@ class KIWAY_PLAYER;
 #include <wx/notebook.h>
 #include <wx/textctrl.h>
 #include <wx/sizer.h>
-#include <wx/stattext.h>
 #include <wx/listbox.h>
+#include <wx/statbox.h>
 #include <wx/listctrl.h>
 #include <wx/button.h>
 #include <wx/frame.h>
@@ -48,10 +48,9 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxMenu* m_viewMenu;
 		wxNotebook* m_plotNotebook;
 		wxTextCtrl* m_simConsole;
-		wxStaticText* m_staticText2;
 		wxListBox* m_signals;
-		wxStaticText* m_staticText21;
 		wxListCtrl* m_cursors;
+		wxBoxSizer* m_tuneSizer;
 		wxButton* m_simulateBtn;
 		wxButton* m_settingsBtn;
 		wxButton* m_addSignal;
diff --git a/eeschema/sim/simulate.cpp b/eeschema/sim/simulate.cpp
index 6da2f5d43e..af151291c4 100644
--- a/eeschema/sim/simulate.cpp
+++ b/eeschema/sim/simulate.cpp
@@ -67,8 +67,34 @@ static const unsigned char cursor_probe_mask[] {
    0x7c, 0x07, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
    0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 };
 
+static const unsigned char cursor_tune[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0xc0, 0x0f,
+   0x00, 0x00, 0xe0, 0x1f, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00, 0xf8, 0x0f,
+   0x00, 0x00, 0xfc, 0x07, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, 0xff, 0x01,
+   0x00, 0x80, 0xff, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00, 0xe0, 0x3f, 0x00,
+   0x00, 0xe0, 0x1f, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0xfc, 0x07, 0x00,
+   0x00, 0xfc, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0xf4, 0x00, 0x00,
+   0x00, 0xea, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00,
+   0x40, 0x01, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00,
+   0x2c, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00,
+   0x0a, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 };
+
+static const unsigned char cursor_tune_mask[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0xc0, 0x0f,
+   0x00, 0x00, 0xe0, 0x1f, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00, 0xf8, 0x0f,
+   0x00, 0x00, 0xfc, 0x07, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, 0xff, 0x01,
+   0x00, 0x80, 0xff, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00, 0xe0, 0x3f, 0x00,
+   0x00, 0xe0, 0x1f, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0xfc, 0x07, 0x00,
+   0x00, 0xfc, 0x03, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00,
+   0x00, 0xee, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00,
+   0xc0, 0x01, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00,
+   0x3c, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
+   0x0e, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 };
+
 #ifdef __WXMSW__
-struct CURSOR_PROBE_INIT
+struct SIM_CURSORS_INIT
 {
 public:
     static wxImage& GetProbeImage()
@@ -87,9 +113,28 @@ public:
 
         return *probe_image;
     }
+
+    static wxImage& GetTuneImage()
+    {
+        static wxImage* tune_image = NULL;
+
+        if( tune_image == NULL )
+        {
+            wxBitmap tune_bitmap( (const char*) cursor_tune, 32, 32 );
+            wxBitmap tune_mask_bitmap( (const char*) cursor_tune_mask, 32, 32 );
+            tune_bitmap.SetMask( new wxMask( tune_mask_bitmap ) );
+            tune_image = new wxImage( tune_bitmap.ConvertToImage() );
+            tune_image->SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_X, 0 );
+            tune_image->SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_Y, 31 );
+        }
+
+        return *tune_image;
+    }
 };
 
-const wxCursor SCH_EDIT_FRAME::CURSOR_PROBE( CURSOR_PROBE_INIT::GetProbeImage() );
+const wxCursor SCH_EDIT_FRAME::CURSOR_PROBE( SIM_CURSORS_INIT::GetProbeImage() );
+const wxCursor SCH_EDIT_FRAME::CURSOR_TUNE( SIM_CURSORS_INIT::GetTuneImage() );
 #elif defined(__WXGTK__) or defined(__WXMOTIF__)
 const wxCursor SCH_EDIT_FRAME::CURSOR_PROBE( (const char*) cursor_probe, 32, 32, 0, 31, (const char*) cursor_probe_mask );
+const wxCursor SCH_EDIT_FRAME::CURSOR_TUNE( (const char*) cursor_tune, 32, 32, 1, 30, (const char*) cursor_tune_mask );
 #endif

From a717194b1ef5a1545cf4fcac7c46475f8249f3da Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:45 +0200
Subject: [PATCH 099/197] Enable tuner for RLC components only

---
 eeschema/netlist_exporters/netlist_exporter_pspice.cpp | 8 ++++++++
 eeschema/netlist_exporters/netlist_exporter_pspice.h   | 5 +++++
 eeschema/sim/sim_plot_frame.cpp                        | 6 ++++++
 eeschema/widgets/tuner_slider.cpp                      | 4 +---
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index c3fc92e780..2d3d5c4519 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -140,6 +140,14 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* aFormatter, unsigned aCtl
 }
 
 
+wxString NETLIST_EXPORTER_PSPICE::GetSpiceField( SPICE_FIELD aField,
+        SCH_COMPONENT* aComponent, unsigned aCtl )
+{
+    SCH_FIELD* field = aComponent->FindField( GetSpiceFieldName( aField ) );
+    return field ? field->GetText() : GetSpiceFieldDefVal( SPICE_PRIMITIVE, aComponent, aCtl );
+}
+
+
 wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( SPICE_FIELD aField,
         SCH_COMPONENT* aComponent, unsigned aCtl )
 {
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index c45c4be425..e678079d01 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -130,6 +130,11 @@ public:
         return m_spiceFields[(int) aField];
     }
 
+    /**
+     * @brief Retrieves either the requested field value or the default value.
+     */
+    static wxString GetSpiceField( SPICE_FIELD aField, SCH_COMPONENT* aComponent, unsigned aCtl );
+
     static wxString GetSpiceFieldDefVal( SPICE_FIELD aField, SCH_COMPONENT* aComponent, unsigned aCtl );
 
     void UpdateDirectives( unsigned aCtl );
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index f0f2db250d..174ae3403f 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -184,6 +184,12 @@ void SIM_PLOT_FRAME::AddTuner( SCH_COMPONENT* aComponent )
     if( !plotPanel )
         return;
 
+    // For now limit the tuner tool to RLC components
+    char primitiveType = NETLIST_EXPORTER_PSPICE::GetSpiceField( SPICE_PRIMITIVE, aComponent, 0 )[0];
+
+    if( primitiveType != SP_RESISTOR && primitiveType != SP_CAPACITOR && primitiveType != SP_INDUCTOR )
+        return;
+
     const wxString& componentName = aComponent->GetField( REFERENCE )->GetText();
     auto& tunerList = m_tuners[plotPanel];
 
diff --git a/eeschema/widgets/tuner_slider.cpp b/eeschema/widgets/tuner_slider.cpp
index 276a910b46..ee0e0cfc42 100644
--- a/eeschema/widgets/tuner_slider.cpp
+++ b/eeschema/widgets/tuner_slider.cpp
@@ -38,9 +38,7 @@ TUNER_SLIDER::TUNER_SLIDER( SIM_PLOT_FRAME* aParent, SCH_COMPONENT* aComponent )
     m_value = SPICE_VALUE( aComponent->GetField( VALUE )->GetText() );
 
     // Generate Spice component name
-    SCH_FIELD* fieldPrim = aComponent->FindField( NETLIST_EXPORTER_PSPICE::GetSpiceFieldName( SPICE_PRIMITIVE ) );
-    char prim = fieldPrim ? fieldPrim->GetText()[0]
-        : NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( SPICE_PRIMITIVE, m_component, 0 )[0];
+    char prim = NETLIST_EXPORTER_PSPICE::GetSpiceField( SPICE_PRIMITIVE, aComponent, 0 )[0];
     m_spiceName = wxString( prim + compName ).Lower();
 
     // Call Set*() methods to update fields and slider

From 132e30081bf50e610820c9782eccd5a7a9bd6f01 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:47 +0200
Subject: [PATCH 100/197] Disabled assert for unknown Spice primitives

---
 eeschema/dialogs/dialog_spice_model.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp
index 7c5219d3b2..6b3483b569 100644
--- a/eeschema/dialogs/dialog_spice_model.cpp
+++ b/eeschema/dialogs/dialog_spice_model.cpp
@@ -249,7 +249,7 @@ bool DIALOG_SPICE_MODEL::TransferDataToWindow()
             break;
 
         default:
-            wxASSERT_MSG( false, "Unhandled Spice primitive type" );
+            //wxASSERT_MSG( false, "Unhandled Spice primitive type" );
             break;
     }
 

From d869771f04ddf18d099a5e6031890ead068190a6 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:48 +0200
Subject: [PATCH 101/197] Display an error message if ngspice DLL is missing

---
 eeschema/sim/ngspice.cpp         |  4 +++-
 eeschema/sim/sim_plot_frame.cpp  |  4 ++++
 eeschema/sim/spice_simulator.cpp | 13 ++++++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index de0b68a0d7..f05d17a9dd 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -39,7 +39,9 @@ NGSPICE::NGSPICE()
 #else
     m_dll = new wxDynamicLibrary( "libngspice.so" );
 #endif
-    assert( m_dll );
+
+    if( !m_dll || !m_dll->IsLoaded() )
+        throw std::runtime_error( "Missing ngspice shared library" );
 
     // Obtain function pointers
     m_ngSpice_Init = (ngSpice_Init) m_dll->GetSymbol( "ngSpice_Init" );
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 174ae3403f..be57e88ae8 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -120,6 +120,10 @@ void SIM_PLOT_FRAME::StartSimulation()
 
     /// @todo is it necessary to recreate simulator every time?
     m_simulator.reset( SPICE_SIMULATOR::CreateInstance( "ngspice" ) );
+
+    if( !m_simulator )
+        return;
+
     m_simulator->SetReporter( new SIM_THREAD_REPORTER( this ) );
     m_simulator->Init();
     m_simulator->LoadNetlist( formatter.GetString() );
diff --git a/eeschema/sim/spice_simulator.cpp b/eeschema/sim/spice_simulator.cpp
index f888c31a45..22bab368bd 100644
--- a/eeschema/sim/spice_simulator.cpp
+++ b/eeschema/sim/spice_simulator.cpp
@@ -24,8 +24,19 @@
 
 #include "ngspice.h"
 
+#include <confirm.h>
+
 SPICE_SIMULATOR* SPICE_SIMULATOR::CreateInstance( const std::string& )
 {
-    return new NGSPICE;
+    try
+    {
+        return new NGSPICE;
+    }
+    catch( std::exception& e )
+    {
+        DisplayError( NULL, e.what() );
+    }
+
+    return NULL;
 }
 

From d2f4d5c2fb96ffde92a1f9b3f8a8d04ca264fb88 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:48 +0200
Subject: [PATCH 102/197] mathplot: various improvements, added log scale [wip]

---
 common/widgets/mathplot.cpp | 675 ++++++++++++++++++++++++++++--------
 include/widgets/mathplot.h  | 244 ++++++++++---
 2 files changed, 727 insertions(+), 192 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index 9111668a05..2f63372861 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -83,7 +83,7 @@ mpLayer::mpLayer() : m_type(mpLAYER_UNDEF)
     SetFont((wxFont&) *wxNORMAL_FONT);
     m_continuous = FALSE; // Default
     m_showName   = TRUE;  // Default
-    m_drawOutsideMargins = TRUE;
+    m_drawOutsideMargins = FALSE;
     m_visible = true;
 }
 
@@ -221,9 +221,9 @@ void mpInfoCoords::UpdateInfo(mpWindow& w, wxEvent& event)
            wxGTK instead works perfectly with it.
            Info on wxForum: http://wxforum.shadonet.com/viewtopic.php?t=3451&highlight=drawtext+eol */
 #ifdef _WINDOWS
-        m_content.Printf(wxT("x = %f y = %f"), w.p2x(mouseX), w.p2y(mouseY));
+        // FIXME m_content.Printf(wxT("x = %f y = %f"), XScale().P2x(w, mouseX), YScale().P2x(w, mouseY));
 #else
-        m_content.Printf(wxT("x = %f\ny = %f"), w.p2x(mouseX), w.p2y(mouseY));
+        // FIXME m_content.Printf(wxT("x = %f\ny = %f"), XScale().P2x(w, mouseX), YScale().P2x(w,    mouseY));
 #endif
     }
 }
@@ -360,6 +360,39 @@ void mpInfoLegend::Plot(wxDC & dc, mpWindow & w)
     }
 }
 
+#if 0
+double mpScaleXLog::X2p( mpWindow &w, double x )
+{
+    return ( x - w.GetPosX() ) * w.GetScaleX();
+}
+
+double mpScaleXLog::P2x( mpWindow &w, double x )
+{
+    return w.GetPosX() + x / w.GetScaleX();
+}
+
+
+double mpScaleX::X2p( mpWindow &w, double x )
+{
+    return ( x - w.GetPosX() ) * w.GetScaleX();
+}
+
+double mpScaleX::P2x( mpWindow &w, double x )
+{
+    return w.GetPosX() + x / w.GetScaleX();
+}
+
+double mpScaleY::X2p( mpWindow &w, double x )
+{
+    return ( w.GetPosY() - x ) * w.GetScaleY();
+}
+
+double mpScaleY::P2x( mpWindow &w, double x )
+{
+    return w.GetPosY() - x/w.GetScaleY();
+}
+#endif
+
 
 
 //-----------------------------------------------------------------------------
@@ -404,7 +437,7 @@ void mpFX::Plot(wxDC & dc, mpWindow & w)
                 // Draw the point only if you can draw outside margins or if the point is inside margins
                 if (m_drawOutsideMargins || ((iy >= minYpx) && (iy <= maxYpx)))
                     dc.DrawLine( i, iy, i, iy);
-                //             wxCoord c = w.y2p( GetY(w.p2x(i)) ); //(wxCoord) ((w.GetPosY() - GetY( (double)i / w.GetScaleX() + w.GetPosX()) ) * w.GetScaleY());
+                //             wxCoord c = YScale().X2p( GetY(XScale().P2x(i)) ); //(wxCoord) ((w.GetPosY() - GetY( (double)i / w.GetScaleX() + w.GetPosX()) ) * w.GetScaleY());
 
             }
         }
@@ -429,7 +462,7 @@ void mpFX::Plot(wxDC & dc, mpWindow & w)
                 tx = ((w.GetScrX() - w.GetMarginRight() - w.GetMarginLeft() - tx) / 2) + w.GetMarginLeft();
             else
                 tx = w.GetMarginLeft() + 8;
-            dc.DrawText( m_name, tx, w.y2p(GetY(w.p2x(tx))) ); // (wxCoord) ((w.GetPosY() - GetY( (double)tx / w.GetScaleX() + w.GetPosX())) * w.GetScaleY()) );
+            dc.DrawText( m_name, tx,  w.y2p(GetY(w.p2x(tx))) );
         }
     }
 }
@@ -469,9 +502,10 @@ void mpFY::Plot(wxDC & dc, mpWindow & w)
             for (i=0;i< w.GetScrY(); ++i)
             {
                 ix = w.x2p(GetX(w.p2y(i)));
+
                 if (m_drawOutsideMargins || ((ix >= startPx) && (ix <= endPx)))
                     dc.DrawLine(ix, i, ix, i);
-                //             wxCoord c =  w.x2p(GetX(w.p2y(i))); //(wxCoord) ((GetX( (double)i / w.GetScaleY() + w.GetPosY()) - w.GetPosX()) * w.GetScaleX());
+                //             wxCoord c =  XScale().X2p(GetX(YScale().P2x(i))); //(wxCoord) ((GetX( (double)i / w.GetScaleY() + w.GetPosY()) - w.GetPosX()) * w.GetScaleX());
                 //             dc.DrawLine(c, i, c, i);
             }
         }
@@ -541,8 +575,12 @@ void mpFXY::Plot(wxDC & dc, mpWindow & w)
             {
                 while (GetNextXY(x, y))
                 {
-                    ix = w.x2p(x);
-                    iy = w.y2p(y);
+                    double px = m_scaleX->TransformToPlot(x);
+                    double py = m_scaleY->TransformToPlot(y);
+
+                    ix = w.x2p(px);
+                    iy = w.y2p(py);
+
                     if (m_drawOutsideMargins || ((ix >= startPx) && (ix <= endPx) && (iy >= minYpx) && (iy <= maxYpx))) {
                         dc.DrawPoint(ix, iy);
                         UpdateViewBoundary(ix, iy);
@@ -553,8 +591,12 @@ void mpFXY::Plot(wxDC & dc, mpWindow & w)
             {
                 while (GetNextXY(x, y))
                 {
-                    ix = w.x2p(x);
-                    iy = w.y2p(y);
+                    double px = m_scaleX->TransformToPlot(x);
+                    double py = m_scaleY->TransformToPlot(y);
+
+                    ix = w.x2p(px);
+                    iy = w.y2p(py);
+
                     if (m_drawOutsideMargins || ((ix >= startPx) && (ix <= endPx) && (iy >= minYpx) && (iy <= maxYpx))) {
                         dc.DrawLine(ix, iy, ix, iy);
                         UpdateViewBoundary(ix, iy);
@@ -570,8 +612,17 @@ void mpFXY::Plot(wxDC & dc, mpWindow & w)
             bool    first = TRUE;
             while (GetNextXY(x, y))
             {
-                wxCoord x1 = w.x2p(x); // (wxCoord) ((x - w.GetPosX()) * w.GetScaleX());
-                wxCoord c1 = w.y2p(y); // (wxCoord) ((w.GetPosY() - y) * w.GetScaleY());
+                double px = m_scaleX->TransformToPlot(x);
+                double py = m_scaleY->TransformToPlot(y);
+
+                wxCoord x1 = w.x2p(px);
+                wxCoord c1 = w.y2p(py);
+
+                //printf("px %.10f py %.10f c1 %d\n", px, py, c1);
+
+                //wxCoord x1 = XScale().X2p(w,x); // (wxCoord) ((x - w.GetPosX()) * w.GetScaleX());
+                //wxCoord c1 = YScale().X2p(w,y); // (wxCoord) ((w.GetPosY() - y) * w.GetScaleY());
+
                 if (first)
                 {
                     first=FALSE;
@@ -688,22 +739,322 @@ void mpProfile::Plot(wxDC & dc, mpWindow & w)
 
 #define mpLN10 2.3025850929940456840179914546844
 
-IMPLEMENT_DYNAMIC_CLASS(mpScaleX, mpLayer)
+void mpScaleX::recalculateTicks ( wxDC & dc, mpWindow & w )
+{
+    const int extend = w.GetScrX(); //  /2;
 
-mpScaleX::mpScaleX(wxString name, int flags, bool ticks, unsigned int type)
+    dig  = floor( log( 128.0 / w.GetScaleX() ) / mpLN10 );
+    step = exp( mpLN10 * dig);
+    end  = w.GetPosX() + (double)extend / w.GetScaleX();
+
+    n0 = floor( (w.GetPosX() ) / step ) * step ;
+    printf("%.10f %.10f %.10f", n0, step, end);
+    computeLabelExtents( dc, w );
+
+    labelStep = ceil(((double) m_maxLabelWidth + mpMIN_X_AXIS_LABEL_SEPARATION)/(w.GetScaleX()*step))*step;
+}
+
+void mpScaleX::computeLabelExtents ( wxDC & dc, mpWindow & w )
+{
+    m_maxLabelHeight = 0;
+    m_maxLabelWidth = 0;
+    for (int n = 0; n < labelCount(); n++)
+    {
+        int tx, ty;
+        const wxString s = getLabel( n );
+
+        dc.GetTextExtent(s, &tx, &ty);
+        m_maxLabelHeight = std::max( ty, m_maxLabelHeight );
+        m_maxLabelWidth = std::max( tx, m_maxLabelWidth );
+    }
+}
+
+int mpScaleX::tickCount() const
+{
+    return (int) floor( ( end - n0 ) / step );
+}
+
+int mpScaleX::labelCount() const
+{
+    return (int) floor( ( end - n0 ) / labelStep );
+}
+
+const wxString mpScaleX::getLabel( int n )
+{
+        return wxT("L");
+}
+
+double mpScaleX::getTickPos( int n )
+{
+        return n0 + (double) n * step;
+}
+
+double mpScaleX::getLabelPos( int n )
+{
+    return n0 + (double) n * labelStep;
+}
+
+void mpScaleY::getVisibleDataRange ( mpWindow& w, double &minV, double& maxV)
+{
+    wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
+    wxCoord maxYpx  = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
+
+    double pymin = w.p2y(minYpx);
+    double pymax = w.p2y(maxYpx);
+
+    printf("PYmin %.3f PYmax %.3f\n", pymin, pymax);
+
+    minV = TransformFromPlot(pymax);
+    maxV = TransformFromPlot(pymin);
+}
+
+void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
+{
+    const int extend = w.GetScrX(); //  /2;
+
+
+    //dig  = floor( log( 128.0 / w.GetScaleY() ) / mpLN10 );
+    //step = exp( mpLN10 * dig);
+    //end  = w.GetPosX() + (double)extend / w.GetScaleY();
+    double minV, maxV, minVvis, maxVvis;
+    GetDataRange ( minV, maxV );
+    getVisibleDataRange ( w, minVvis, maxVvis );
+
+    m_tickValues.clear();
+    m_labeledTicks.clear();
+
+
+    double minErr = 1000000000000.0;
+    double bestStep;
+    int bestCount;
+        for(int i = 10; i <= 20; i+=2)
+        {
+            double step = fabs(maxVvis - minVvis) / (double) i;
+            double base = pow(10, floor(log10(step)));
+
+            //printf("base %.3f\n", base);
+
+            double stepInt = floor(step / base) * base;
+            double err = fabs(step - stepInt);
+
+            if(err< minErr)
+            {
+                minErr = err;
+                bestStep = stepInt;
+                bestCount = i;
+            }
+            //printf("step %d %.3f %.3f best %.3f\n",i, step, stepInt, bestStep);
+        }
+
+
+    double v = floor(minVvis / bestStep) * bestStep;
+
+
+    double zeroOffset = 100000000.0;
+    printf("maxVVis %.3f\n", maxVvis);
+
+    while ( v < maxVvis )
+    {
+        m_tickValues.push_back(v);
+
+        if (fabs(v) < zeroOffset)
+            zeroOffset = fabs(v);
+
+        printf("tick %.3f\n", v);
+        v+=bestStep;
+    }
+
+    if ( zeroOffset <= bestStep )
+    {
+        for( double& t: m_tickValues )
+            t -= zeroOffset;
+    }
+
+    for( double t: m_tickValues )
+        m_labeledTicks.push_back(t);
+
+    //n0 = floor(minVvis / bestStep) * bestStep;
+    //end = n0 +
+
+    //n0 = floor( (w.GetPosX() ) / step ) * step ;
+    printf("zeroOffset:%.3f tickjs : %d\n", zeroOffset, m_tickValues.size());
+    computeLabelExtents( dc, w );
+
+    //labelStep = ceil(((double) m_maxLabelWidth + mpMIN_X_AXIS_LABEL_SEPARATION)/(w.GetScaleX()*step))*step;
+}
+
+void mpScaleY::computeLabelExtents ( wxDC & dc, mpWindow & w )
+{
+    m_maxLabelHeight = 0;
+    m_maxLabelWidth = 0;
+    for (int n = 0; n < labelCount(); n++)
+    {
+        int tx, ty;
+
+        printf("***********GetLabel %d\n", n);
+
+        const wxString s = getLabel( n );
+
+        dc.GetTextExtent(s, &tx, &ty);
+        m_maxLabelHeight = std::max( ty, m_maxLabelHeight );
+        m_maxLabelWidth = std::max( tx, m_maxLabelWidth );
+    }
+}
+
+int mpScaleY::tickCount() const
+{
+    return m_tickValues.size();
+}
+
+int mpScaleY::labelCount() const
+{
+    return m_labeledTicks.size();
+}
+
+const wxString mpScaleY::getLabel( int n )
+{
+        return wxT("L");
+}
+
+double mpScaleY::getTickPos( int n )
+{
+        return m_tickValues[n];
+}
+
+double mpScaleY::getLabelPos( int n )
+{
+    return m_labeledTicks[n];
+}
+
+
+void mpScaleXBase::getVisibleDataRange ( mpWindow& w, double &minV, double& maxV)
+{
+    wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft();
+    wxCoord endPx   = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
+
+    //printf("getVisibleDataRange\n");
+
+    double pxmin = w.p2x(startPx);
+    double pxmax = w.p2x(endPx);
+
+    minV = TransformFromPlot(pxmin);
+    maxV = TransformFromPlot(pxmax);
+}
+
+void mpScaleXLog::recalculateTicks ( wxDC & dc, mpWindow & w )
+{
+    double minV, maxV, minVvis, maxVvis;
+    GetDataRange ( minV, maxV );
+    getVisibleDataRange ( w, minVvis, maxVvis );
+
+    double decades = log( maxV / minV ) / log(10);
+    double minDecade = pow(10, floor(log10(minV)));
+    double maxDecade = pow(10, ceil(log10(maxV)));
+
+
+    double visibleDecades =  log( maxVvis / minVvis ) / log(10);
+
+    printf("visibleD %.1f %.1f %.1f\n", visibleDecades, maxVvis, minVvis);
+    double d;
+
+    m_ticks.clear();
+    m_labeledTicks.clear();
+
+    for ( d= minDecade; d<=maxDecade; d *= 10.0)
+    {
+        printf("d %.1f\n",d );
+        m_labeledTicks.push_back( d );
+
+        for(double dd = d; dd < d * 10; dd += d)
+        {
+            if(visibleDecades < 2)
+                m_labeledTicks.push_back(dd);
+            //printf("dd %.1f\n",dd);
+            m_ticks.push_back(dd);
+        }
+    }
+
+    computeLabelExtents( dc, w );
+
+    printf("labeled ticks : %d\n", m_labeledTicks.size());
+
+    labelStep = ceil(((double) m_maxLabelWidth + mpMIN_X_AXIS_LABEL_SEPARATION)/(w.GetScaleX()*step))*step;
+}
+
+
+void mpScaleXLog::computeLabelExtents ( wxDC & dc, mpWindow & w )
+{
+    m_maxLabelHeight = 0;
+    m_maxLabelWidth = 0;
+    for (int n = 0; n < labelCount(); n++)
+    {
+        int tx, ty;
+        const wxString s = getLabel( n );
+
+        dc.GetTextExtent(s, &tx, &ty);
+        m_maxLabelHeight = std::max( ty, m_maxLabelHeight );
+        m_maxLabelWidth = std::max( tx, m_maxLabelWidth );
+    }
+}
+
+
+int mpScaleXLog::tickCount() const
+{
+    return m_ticks.size();
+}
+
+int mpScaleXLog::labelCount() const
+{
+    return m_labeledTicks.size();
+    //    return (int) floor( ( end - n0 ) / labelStep );
+}
+
+
+const wxString mpScaleXLog::getLabel( int n )
+{
+    return wxT("L");
+}
+
+double mpScaleXLog::getTickPos( int n )
+{
+    return m_ticks[n]; //n0 + (double) n * step;
+}
+
+double mpScaleXLog::getLabelPos( int n )
+{
+    return m_labeledTicks[n];
+}
+
+
+IMPLEMENT_ABSTRACT_CLASS(mpScaleXBase, mpLayer)
+IMPLEMENT_DYNAMIC_CLASS(mpScaleX, mpScaleXBase)
+IMPLEMENT_DYNAMIC_CLASS(mpScaleXLog, mpScaleXBase)
+
+mpScaleXBase::mpScaleXBase(wxString name, int flags, bool ticks, unsigned int type)
 {
     SetName(name);
     SetFont( (wxFont&) *wxSMALL_FONT);
     SetPen( (wxPen&) *wxGREY_PEN);
     m_flags = flags;
     m_ticks = ticks;
-    m_labelType = type;
+    //m_labelType = type;
     m_type = mpLAYER_AXIS;
-    m_labelFormat = wxT("");
+    //m_labelFormat = wxT("");
 }
 
-void mpScaleX::Plot(wxDC & dc, mpWindow & w)
+mpScaleX::mpScaleX(wxString name, int flags, bool ticks, unsigned int type) :
+    mpScaleXBase ( name, flags, ticks ,type ) {};
+
+
+mpScaleXLog::mpScaleXLog(wxString name, int flags, bool ticks, unsigned int type) :
+    mpScaleXBase ( name, flags, ticks ,type ) {};
+
+
+void mpScaleXBase::Plot(wxDC & dc, mpWindow & w)
 {
+    int tx, ty;
+    recalculateTicks( dc, w );
+
     if (m_visible) {
         dc.SetPen( m_pen);
         dc.SetFont( m_font);
@@ -711,7 +1062,7 @@ void mpScaleX::Plot(wxDC & dc, mpWindow & w)
 
         const int extend = w.GetScrX(); //  /2;
         if (m_flags == mpALIGN_CENTER)
-            orgy   = w.y2p(0); //(int)(w.GetPosY() * w.GetScaleY());
+            orgy   = w.y2p(0);  //(int)(w.GetPosY() * w.GetScaleY());
         if (m_flags == mpALIGN_TOP) {
             if (m_drawOutsideMargins)
                 orgy = X_BORDER_SEPARATION;
@@ -729,49 +1080,8 @@ void mpScaleX::Plot(wxDC & dc, mpWindow & w)
         if (m_flags == mpALIGN_BORDER_TOP )
             orgy = 1;//-dc.LogicalToDeviceY(0);
 
-        dc.DrawLine( 0, orgy, w.GetScrX(), orgy);
+    //    dc.DrawLine( 0, orgy, w.GetScrX(), orgy);
 
-        // To cut the axis line when draw outside margin is false, use this code
-        /*if (m_drawOutsideMargins == true)
-          dc.DrawLine( 0, orgy, w.GetScrX(), orgy);
-          else
-          dc.DrawLine( w.GetMarginLeft(), orgy, w.GetScrX() - w.GetMarginRight(), orgy); */
-
-        const double dig  = floor( log( 128.0 / w.GetScaleX() ) / mpLN10 );
-        const double step = exp( mpLN10 * dig);
-        const double end  = w.GetPosX() + (double)extend / w.GetScaleX();
-
-        wxCoord tx, ty;
-        wxString s;
-        wxString fmt;
-        int tmp = (int)dig;
-        if (m_labelType == mpX_NORMAL) {
-            if (!m_labelFormat.IsEmpty()) {
-                fmt = m_labelFormat;
-            } else {
-                if (tmp>=1) {
-                    fmt = wxT("%.f");
-                } else {
-                    tmp=8-tmp;
-                    fmt.Printf(wxT("%%.%df"), tmp >= -1 ? 2 : -tmp);
-                }
-            }
-        } else {
-            // Date and/or time axis representation
-            if (m_labelType == mpX_DATETIME) {
-                fmt = (wxT("%04.0f-%02.0f-%02.0fT%02.0f:%02.0f:%02.0f"));
-            } else if (m_labelType == mpX_DATE) {
-                fmt = (wxT("%04.0f-%02.0f-%02.0f"));
-            } else if ((m_labelType == mpX_TIME) && (end/60 < 2)) {
-                fmt = (wxT("%02.0f:%02.3f"));
-            } else {
-                fmt = (wxT("%02.0f:%02.0f:%02.0f"));
-            }
-        }
-
-        //double n = floor( (w.GetPosX() - (double)extend / w.GetScaleX()) / step ) * step ;
-        double n0 = floor( (w.GetPosX() /* - (double)(extend - w.GetMarginLeft() - w.GetMarginRight())/ w.GetScaleX() */) / step ) * step ;
-        double n = 0;
 #ifdef MATHPLOT_DO_LOGGING
         wxLogMessage(wxT("mpScaleX::Plot: dig: %f , step: %f, end: %f, n: %f"), dig, step, end, n0);
 #endif
@@ -780,11 +1090,23 @@ void mpScaleX::Plot(wxDC & dc, mpWindow & w)
         wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
         wxCoord maxYpx  = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
 
-        tmp=-65535;
-        int labelH = 0; // Control labels heigth to decide where to put axis name (below labels or on top of axis)
-        int maxExtent = 0;
-        for (n = n0; n < end; n += step) {
-            const int p = (int)((n - w.GetPosX()) * w.GetScaleX());
+        printf("StartPx %d endPx %d ordy %d maxy %d\n", startPx, endPx, orgy, maxYpx);
+
+        int tmp=-65535;
+        int labelH = m_maxLabelHeight; // Control labels heigth to decide where to put axis name (below labels or on top of axis)
+        //int maxExtent = tc.MaxLabelWidth();
+        printf("Ticks : %d\n",labelCount());
+        for (int n = 0; n < tickCount(); n++)
+        {
+            double tp = getTickPos(n);
+
+            //double xlogmin = log10 ( m_minV );
+            //double xlogmax = log10 ( m_maxV );
+
+            double px = TransformToPlot ( tp ); //( log10 ( tp ) - xlogmin) / (xlogmax - xlogmin);
+
+            const int p = (int)(( px - w.GetPosX()) * w.GetScaleX());
+
 #ifdef MATHPLOT_DO_LOGGING
             wxLogMessage(wxT("mpScaleX::Plot: n: %f -> p = %d"), n, p);
 #endif
@@ -798,89 +1120,54 @@ void mpScaleX::Plot(wxDC & dc, mpWindow & w)
                     m_pen.SetStyle(wxDOT);
                     dc.SetPen(m_pen);
                     if ((m_flags == mpALIGN_BOTTOM) && !m_drawOutsideMargins) {
+                        //printf("d1");
+                        m_pen.SetStyle(wxDOT);
+                        dc.SetPen(m_pen);
                         dc.DrawLine( p, orgy+4, p, minYpx );
+                        m_pen.SetStyle(wxSOLID);
+                        dc.SetPen(m_pen);
+                        dc.DrawLine( p, orgy+4, p, orgy-4 );
                     } else {
                         if ((m_flags == mpALIGN_TOP) && !m_drawOutsideMargins) {
+                            //printf("d2");
                             dc.DrawLine( p, orgy-4, p, maxYpx );
                         } else {
-                            dc.DrawLine( p, 0/*-w.GetScrY()*/, p, w.GetScrY() );
+                            //printf("d3");
+                            dc.DrawLine( p, minYpx, p, maxYpx ); //0/*-w.GetScrY()*/, p, w.GetScrY() );
                         }
                     }
                     m_pen.SetStyle(wxSOLID);
                     dc.SetPen(m_pen);
                 }
-                // Write ticks labels in s string
-                if (m_labelType == mpX_NORMAL)
-                    s.Printf(fmt, n);
-                else if (m_labelType == mpX_DATETIME) {
-                    time_t when = (time_t)n;
-                    struct tm tm = *localtime(&when);
-                    s.Printf(fmt, (double)tm.tm_year+1900, (double)tm.tm_mon+1, (double)tm.tm_mday, (double)tm.tm_hour, (double)tm.tm_min, (double)tm.tm_sec);
-                } else if (m_labelType == mpX_DATE) {
-                    time_t when = (time_t)n;
-                    struct tm tm = *localtime(&when);
-                    s.Printf(fmt, (double)tm.tm_year+1900, (double)tm.tm_mon+1, (double)tm.tm_mday);
-                } else if ((m_labelType == mpX_TIME) || (m_labelType == mpX_HOURS)) {
-                    double modulus = fabs(n);
-                    double sign = n/modulus;
-                    double hh = floor(modulus/3600);
-                    double mm = floor((modulus - hh*3600)/60);
-                    double ss = modulus - hh*3600 - mm*60;
-#ifdef MATHPLOT_DO_LOGGING
-                    wxLogMessage(wxT("%02.0f Hours, %02.0f minutes, %02.0f seconds"), sign*hh, mm, ss);
-#endif // MATHPLOT_DO_LOGGING
-                    if (fmt.Len() == 20) // Format with hours has 11 chars
-                        s.Printf(fmt, sign*hh, mm, floor(ss));
-                    else
-                        s.Printf(fmt, sign*mm, ss);
-                }
-                dc.GetTextExtent(s, &tx, &ty);
-                labelH = (labelH <= ty) ? ty : labelH;
-                /*				if ((p-tx/2-tmp) > 64) { // Problem about non-regular axis labels
-                                                if ((m_flags == mpALIGN_BORDER_BOTTOM) || (m_flags == mpALIGN_TOP)) {
-                                                dc.DrawText( s, p-tx/2, orgy-4-ty);
-                                                } else {
-                                                dc.DrawText( s, p-tx/2, orgy+4);
-                                                }
-                                                tmp=p+tx/2;
-                                                }
-                                                */
-                maxExtent = (tx > maxExtent) ? tx : maxExtent; // Keep in mind max label width
             }
         }
+
+        m_pen.SetStyle(wxSOLID);
+        dc.SetPen(m_pen);
+        dc.DrawLine( startPx, minYpx, endPx, minYpx );
+        dc.DrawLine( startPx, maxYpx, endPx, maxYpx );
+
+        printf("Labels : %d\n",labelCount());
         // Actually draw labels, taking care of not overlapping them, and distributing them regularly
-        double labelStep = ceil((maxExtent + mpMIN_X_AXIS_LABEL_SEPARATION)/(w.GetScaleX()*step))*step;
-        for (n = n0; n < end; n += labelStep) {
-            const int p = (int)((n - w.GetPosX()) * w.GetScaleX());
+        for (int n = 0; n < labelCount(); n++)
+        {
+            double tp = getLabelPos(n);
+
+            //double xlogmin = log10 ( m_minV );
+            //double xlogmax = log10 ( m_maxV );
+
+            double px = TransformToPlot ( tp ); //( log10 ( tp ) - xlogmin) / (xlogmax - xlogmin);
+
+            const int p = (int)((px- w.GetPosX()) * w.GetScaleX());
+
+            printf("p %d %.1f\n", p, px);
 #ifdef MATHPLOT_DO_LOGGING
             wxLogMessage(wxT("mpScaleX::Plot: n_label = %f -> p_label = %d"), n, p);
 #endif
             if ((p >= startPx) && (p <= endPx)) {
                 // Write ticks labels in s string
-                if (m_labelType == mpX_NORMAL)
-                    s.Printf(fmt, n);
-                else if (m_labelType == mpX_DATETIME) {
-                    time_t when = (time_t)n;
-                    struct tm tm = *localtime(&when);
-                    s.Printf(fmt, (double)tm.tm_year+1900, (double)tm.tm_mon+1, (double)tm.tm_mday, (double)tm.tm_hour, (double)tm.tm_min, (double)tm.tm_sec);
-                } else if (m_labelType == mpX_DATE) {
-                    time_t when = (time_t)n;
-                    struct tm tm = *localtime(&when);
-                    s.Printf(fmt, (double)tm.tm_year+1900, (double)tm.tm_mon+1, (double)tm.tm_mday);
-                } else if ((m_labelType == mpX_TIME) || (m_labelType == mpX_HOURS)) {
-                    double modulus = fabs(n);
-                    double sign = n/modulus;
-                    double hh = floor(modulus/3600);
-                    double mm = floor((modulus - hh*3600)/60);
-                    double ss = modulus - hh*3600 - mm*60;
-#ifdef MATHPLOT_DO_LOGGING
-                    wxLogMessage(wxT("%02.0f Hours, %02.0f minutes, %02.0f seconds"), sign*hh, mm, ss);
-#endif // MATHPLOT_DO_LOGGING
-                    if (fmt.Len() == 20) // Format with hours has 11 chars
-                        s.Printf(fmt, sign*hh, mm, floor(ss));
-                    else
-                        s.Printf(fmt, sign*mm, ss);
-                }
+                wxString s = getLabel ( n );
+
                 dc.GetTextExtent(s, &tx, &ty);
                 if ((m_flags == mpALIGN_BORDER_BOTTOM) || (m_flags == mpALIGN_TOP)) {
                     dc.DrawText( s, p-tx/2, orgy-4-ty);
@@ -930,6 +1217,9 @@ void mpScaleX::Plot(wxDC & dc, mpWindow & w)
           }; */
 }
 
+
+
+
 IMPLEMENT_DYNAMIC_CLASS(mpScaleY, mpLayer)
 
 mpScaleY::mpScaleY(wxString name, int flags, bool ticks)
@@ -940,11 +1230,14 @@ mpScaleY::mpScaleY(wxString name, int flags, bool ticks)
     m_flags = flags;
     m_ticks = ticks;
     m_type = mpLAYER_AXIS;
-    m_labelFormat = wxT("");
+    //m_labelFormat = wxT("");
 }
 
 void mpScaleY::Plot(wxDC & dc, mpWindow & w)
 {
+
+printf("Plot Y-scale\n");
+    recalculateTicks(dc, w);
     if (m_visible) {
         dc.SetPen( m_pen);
         dc.SetFont( m_font);
@@ -970,9 +1263,11 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
         if (m_flags == mpALIGN_BORDER_LEFT )
             orgx = 1; //-dc.LogicalToDeviceX(0);
 
-
+            wxCoord endPx   = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
+            wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
+            wxCoord maxYpx  = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
         // Draw line
-        dc.DrawLine( orgx, 0, orgx, extend);
+        dc.DrawLine( orgx, minYpx, orgx, maxYpx);
 
         // To cut the axis line when draw outside margin is false, use this code
         /* if (m_drawOutsideMargins == true)
@@ -991,14 +1286,14 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
         double maxScaleAbs = fabs(w.GetDesiredYmax());
         double minScaleAbs = fabs(w.GetDesiredYmin());
         double endscale = (maxScaleAbs > minScaleAbs) ? maxScaleAbs : minScaleAbs;
-        if (m_labelFormat.IsEmpty()) {
+    /*    if (m_labelFormat.IsEmpty()) {
             if ((endscale < 1e4) && (endscale > 1e-3))
                 fmt = wxT("%.2f");
             else
                 fmt = wxT("%.1e");
         } else {
             fmt = m_labelFormat;
-        }
+        }*/
         /*    if (tmp>=1)
               {*/
         //    fmt = wxT("%7.5g");
@@ -1009,12 +1304,11 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
         //         fmt.Printf(wxT("%%.%dg"), (tmp >= -1) ? 2 : -tmp);
         //     }
 
-        double n = floor( (w.GetPosY() - (double)(extend - w.GetMarginTop() - w.GetMarginBottom())/ w.GetScaleY()) / step ) * step ;
+        int n;
+//        double n = floor( (w.GetPosY() - (double)(extend - w.GetMarginTop() - w.GetMarginBottom())/ w.GetScaleY()) / step ) * step ;
 
         /* wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft(); */
-        wxCoord endPx   = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
-        wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
-        wxCoord maxYpx  = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
+
 
         tmp=65536;
         int labelW = 0;
@@ -1022,8 +1316,15 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
         int labelHeigth = 0;
         s.Printf(fmt,n);
         dc.GetTextExtent(s, &tx, &labelHeigth);
-        for (;n < end; n += step) {
-            const int p = (int)((w.GetPosY() - n) * w.GetScaleY());
+        for (n = 0; n < tickCount(); n++ ) {
+            printf("Tick %d\n", n);
+
+            double tp = getTickPos(n);
+
+            double py = TransformToPlot ( tp ); //( log10 ( tp ) - xlogmin) / (xlogmax - xlogmin);
+            const int p = (int)(( w.GetPosY() - py ) * w.GetScaleY());
+
+
             if ((p >= minYpx) && (p <= maxYpx)) {
                 if (m_ticks) { // Draw axis ticks
                     if (m_flags == mpALIGN_BORDER_LEFT) {
@@ -1047,7 +1348,8 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
                     dc.SetPen( m_pen);
                 }
                 // Print ticks labels
-                s.Printf(fmt, n);
+
+                s=getLabel(n);
                 dc.GetTextExtent(s, &tx, &ty);
 #ifdef MATHPLOT_DO_LOGGING
                 if (ty != labelHeigth) wxLogMessage(wxT("mpScaleY::Plot: ty(%f) and labelHeigth(%f) differ!"), ty, labelHeigth);
@@ -1141,6 +1443,7 @@ END_EVENT_TABLE()
 mpWindow::mpWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long flag )
     : wxWindow( parent, id, pos, size, flag, wxT("mathplot") )
 {
+    m_zooming = false;
     m_scaleX = m_scaleY = 1.0;
     m_posX   = m_posY   = 0;
     m_desiredXmin=m_desiredYmin=0;
@@ -1277,13 +1580,15 @@ void mpWindow::OnMouseMove(wxMouseEvent     &event)
         if (event.m_leftDown) {
             if (m_movingInfoLayer == NULL) {
                 wxClientDC dc(this);
-                wxPen pen(*wxBLACK, 1, wxDOT);
+                wxPen pen(m_fgColour, 1, wxDOT);
                 dc.SetPen(pen);
                 dc.SetBrush(*wxTRANSPARENT_BRUSH);
                 dc.DrawRectangle(m_mouseLClick.x, m_mouseLClick.y, event.GetX() - m_mouseLClick.x, event.GetY() - m_mouseLClick.y);
+                m_zooming = true;
             } else {
                 wxPoint moveVector(event.GetX() - m_mouseLClick.x, event.GetY() - m_mouseLClick.y);
                 m_movingInfoLayer->Move(moveVector);
+                m_zooming = false;
             }
             UpdateAll();
         } else {
@@ -1313,6 +1618,7 @@ void mpWindow::OnMouseLeftDown (wxMouseEvent &event)
 {
     m_mouseLClick.x = event.GetX();
     m_mouseLClick.y = event.GetY();
+    m_zooming = true;
 #ifdef MATHPLOT_DO_LOGGING
     wxLogMessage(_("mpWindow::OnMouseLeftDown() X = %d , Y = %d"), event.GetX(), event.GetY());/*m_mouseLClick.x, m_mouseLClick.y);*/
 #endif
@@ -1330,6 +1636,8 @@ void mpWindow::OnMouseLeftRelease (wxMouseEvent &event)
 {
     wxPoint release(event.GetX(), event.GetY());
     wxPoint press(m_mouseLClick.x, m_mouseLClick.y);
+
+    m_zooming = false;
     if (m_movingInfoLayer != NULL) {
         m_movingInfoLayer->UpdateReference();
         m_movingInfoLayer = NULL;
@@ -1357,9 +1665,22 @@ void mpWindow::Fit()
 // JL
 void mpWindow::Fit(double xMin, double xMax, double yMin, double yMax, wxCoord *printSizeX,wxCoord *printSizeY)
 {
+    double xExtra = fabs(xMax - xMin) * 0.00;
+    double yExtra = fabs(yMax - yMin) * 0.03;
+
+
+    xMin -= xExtra;
+    xMax += xExtra;
+    yMin -= yExtra;
+    yMax += yExtra;
+
+    //printf("                          ******************Fit: %.3f %.3f", xMin, xMax);
+
+
     // Save desired borders:
     m_desiredXmin=xMin; m_desiredXmax=xMax;
     m_desiredYmin=yMin; m_desiredYmax=yMax;
+//    printf("minx %.1f miny %.1f maxx %.1f maxy %.1f\n", xMin, yMin, xMax, yMax);
 
     if (printSizeX!=NULL && printSizeY!=NULL)
     {
@@ -1577,9 +1898,13 @@ void mpWindow::ZoomOut(const wxPoint& centerPoint )
     m_desiredYmax = m_posY;
     m_desiredYmin = m_posY - (m_scrY - m_marginTop - m_marginBottom) / m_scaleY; // m_desiredYmin = m_posY - m_scrY / m_scaleY;
 
+    //printf("desired xmin %.1f ymin %.1f xmax %.1f ymax %.1f l %d\n", m_desiredXmin, m_desiredYmin, m_desiredXmax, m_desiredYmax, !!m_enableLimitedView);
+    //printf("current xmin %.1f ymin %.1f xmax %.1f ymax %.1f\n", m_minX, m_minY, m_maxX, m_maxY);
+
     if(m_enableLimitedView && (m_desiredXmin < m_minX || m_desiredXmin < m_minX
                             || m_desiredXmax > m_maxX || m_desiredXmax > m_maxX))
     {
+        //printf("call fit()\n");
         Fit();
     }
 
@@ -1907,6 +2232,16 @@ bool mpWindow::UpdateBBox()
 {
     bool first = TRUE;
 
+
+    m_minX = 0.0;
+    m_maxX = 1.0;
+    m_minY = 0.0;
+    m_maxY = 1.0;
+
+    return true;
+
+    #if 0
+
     for (wxLayerList::iterator li = m_layers.begin(); li != m_layers.end(); li++)
     {
         mpLayer* f = *li;
@@ -1936,6 +2271,9 @@ bool mpWindow::UpdateBBox()
         }
         //node = node->GetNext();
     }
+
+    #endif
+
 #ifdef MATHPLOT_DO_LOGGING
     wxLogDebug(wxT("[mpWindow::UpdateBBox] Bounding box: Xmin = %f, Xmax = %f, Ymin = %f, YMax = %f"), m_minX, m_maxX, m_minY, m_maxY);
 #endif // MATHPLOT_DO_LOGGING
@@ -2384,6 +2722,57 @@ mpFXYVector::mpFXYVector(wxString name, int flags ) : mpFXY(name,flags)
     m_type = mpLAYER_PLOT;
 }
 
+double mpScaleX::TransformToPlot ( double x )
+{
+    return (x - m_minV) / (m_maxV - m_minV);
+}
+
+double mpScaleX::TransformFromPlot ( double xplot )
+{
+    return  xplot * (m_maxV - m_minV) + m_minV;
+}
+
+double mpScaleY::TransformToPlot ( double x )
+{
+    return (x - m_minV) / (m_maxV - m_minV);
+}
+
+double mpScaleY::TransformFromPlot ( double xplot )
+{
+    return  xplot * (m_maxV - m_minV) + m_minV;
+}
+
+
+
+double mpScaleXLog::TransformToPlot ( double x )
+{
+    double xlogmin = log10 ( m_minV );
+    double xlogmax = log10 ( m_maxV );
+
+    return ( log10 ( x ) - xlogmin) / (xlogmax - xlogmin);
+}
+
+double mpScaleXLog::TransformFromPlot ( double xplot )
+{
+    double xlogmin = log10 ( m_minV );
+    double xlogmax = log10 ( m_maxV );
+
+    return pow(10.0, xplot * (xlogmax - xlogmin) + xlogmin );
+}
+
+double log10( double x)
+{
+    return log(x)/log(10.0);
+}
+
+mpFSemiLogXVector::mpFSemiLogXVector(wxString name, int flags ) :
+mpFXYVector ( name, flags )
+{}
+
+
+IMPLEMENT_DYNAMIC_CLASS(mpFSemiLogXVector, mpFXYVector)
+
+
 void mpFXYVector::Rewind()
 {
     m_index = 0;
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index a7bb6c488b..089912de75 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -140,6 +140,8 @@ typedef enum __mp_Layer_Type {
   continuity set to false (draw separate points).
   These may or may not be used by implementations.
   */
+class mpScaleBase;
+
 class WXDLLIMPEXP_MATHPLOT mpLayer : public wxObject
 {
     public:
@@ -305,6 +307,7 @@ class WXDLLIMPEXP_MATHPLOT mpLayer : public wxObject
         void SetBrush(wxBrush brush) { m_brush = brush; };
 
     protected:
+
         wxFont   m_font;    //!< Layer's font
         wxPen    m_pen;     //!< Layer's pen
         wxBrush  m_brush;       //!< Layer's brush
@@ -580,6 +583,8 @@ class WXDLLIMPEXP_MATHPLOT mpFY : public mpLayer
   Optionally implement a constructor and pass a name (label) and a label alignment
   to the constructor mpFXY::mpFXY. If the layer name is empty, no label will be plotted.
   */
+class mpScaleBase;
+
 class WXDLLIMPEXP_MATHPLOT mpFXY : public mpLayer
 {
     public:
@@ -606,6 +611,12 @@ class WXDLLIMPEXP_MATHPLOT mpFXY : public mpLayer
           */
         virtual void Plot(wxDC & dc, mpWindow & w);
 
+        virtual void SetScale ( mpScaleBase *scaleX, mpScaleBase *scaleY )
+        {
+            m_scaleX = scaleX;
+            m_scaleY = scaleY;
+        }
+
 
     protected:
         int m_flags; //!< Holds label alignment
@@ -613,6 +624,7 @@ class WXDLLIMPEXP_MATHPLOT mpFXY : public mpLayer
         // Data to calculate label positioning
         wxCoord maxDrawX, minDrawX, maxDrawY, minDrawY;
         //int drawnPoints;
+        mpScaleBase *m_scaleX, *m_scaleY;
 
         /** Update label positioning data
           @param xnew New x coordinate
@@ -670,7 +682,90 @@ class WXDLLIMPEXP_MATHPLOT mpProfile : public mpLayer
   the bottom-right hand of the ruler. The scale numbering automatically
   adjusts to view and zoom factor.
   */
-class WXDLLIMPEXP_MATHPLOT mpScaleX : public mpLayer
+
+
+class WXDLLIMPEXP_MATHPLOT mpScaleBase : public mpLayer
+{
+public:
+    mpScaleBase () {};
+    virtual ~mpScaleBase () {};
+
+    bool HasBBox() { return FALSE; }
+
+    /** Set X axis alignment.
+      @param align alignment (choose between mpALIGN_BORDER_BOTTOM, mpALIGN_BOTTOM, mpALIGN_CENTER, mpALIGN_TOP, mpALIGN_BORDER_TOP */
+    void SetAlign(int align) { m_flags = align; };
+
+    /** Set X axis ticks or grid
+      @param ticks TRUE to plot axis ticks, FALSE to plot grid. */
+    void SetTicks(bool enable) { m_ticks = enable; };
+
+    /** Get X axis ticks or grid
+      @return TRUE if plot is drawing axis ticks, FALSE if the grid is active. */
+    bool GetTicks() { return m_ticks; };
+
+
+    //virtual double X2p( mpWindow &w, double x ) = 0;
+    //virtual double P2x( mpWindow &w, double x ) = 0;
+
+    void SetDataRange ( double minV, double maxV )
+    {
+        m_minV = minV;
+        m_maxV = maxV;
+    }
+
+    void GetDataRange ( double &minV, double& maxV)
+    {
+        minV = m_minV;
+        maxV = m_maxV;
+    }
+
+    virtual double TransformToPlot ( double x ) { return 0.0; };
+    virtual double TransformFromPlot (double xplot ){ return 0.0; };
+
+protected:
+
+    virtual void getVisibleDataRange ( mpWindow& w, double &minV, double& maxV) {};
+    virtual void recalculateTicks ( wxDC & dc, mpWindow & w ) {};
+    virtual int tickCount() const { return 0; }
+    virtual int labelCount() const { return 0; }
+    virtual const wxString getLabel( int n ) { return wxT(""); }
+    virtual double getTickPos( int n ) { return 0.0; }
+    virtual double getLabelPos( int n ) { return 0.0; }
+
+    int m_flags; //!< Flag for axis alignment
+    bool m_ticks; //!< Flag to toggle between ticks or grid
+    double m_minV, m_maxV;
+    int m_maxLabelHeight;
+    int m_maxLabelWidth;
+
+};
+
+class WXDLLIMPEXP_MATHPLOT mpScaleXBase : public mpScaleBase
+{
+    public:
+        /** Full constructor.
+          @param name Label to plot by the ruler
+          @param flags Set the position of the scale with respect to the window.
+          @param ticks Select ticks or grid. Give TRUE (default) for drawing axis ticks, FALSE for drawing the grid.
+          @param type mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds. */
+        mpScaleXBase(wxString name = wxT("X"), int flags = mpALIGN_CENTER, bool ticks = true, unsigned int type = mpX_NORMAL);
+        virtual ~mpScaleXBase () {};
+
+        /** Layer plot handler.
+          This implementation will plot the ruler adjusted to the visible area. */
+        virtual void Plot(wxDC & dc, mpWindow & w);
+
+        virtual void getVisibleDataRange ( mpWindow& w, double &minV, double& maxV);
+
+//        unsigned int m_labelType; //!< Select labels mode: mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds
+//        wxString m_labelFormat; //!< Format string used to print labels
+
+        DECLARE_DYNAMIC_CLASS(mpScaleXBase)
+};
+
+
+class WXDLLIMPEXP_MATHPLOT mpScaleX : public mpScaleXBase
 {
     public:
         /** Full constructor.
@@ -682,56 +777,73 @@ class WXDLLIMPEXP_MATHPLOT mpScaleX : public mpLayer
 
         /** Layer plot handler.
           This implementation will plot the ruler adjusted to the visible area. */
-        virtual void Plot(wxDC & dc, mpWindow & w);
-
-        /** Check whether this layer has a bounding box.
-          This implementation returns \a FALSE thus making the ruler invisible
-          to the plot layer bounding box calculation by mpWindow. */
-        virtual bool HasBBox() { return FALSE; }
-
-        /** Set X axis alignment.
-          @param align alignment (choose between mpALIGN_BORDER_BOTTOM, mpALIGN_BOTTOM, mpALIGN_CENTER, mpALIGN_TOP, mpALIGN_BORDER_TOP */
-        void SetAlign(int align) { m_flags = align; };
-
-        /** Set X axis ticks or grid
-          @param ticks TRUE to plot axis ticks, FALSE to plot grid. */
-        void SetTicks(bool ticks) { m_ticks = ticks; };
-
-        /** Get X axis ticks or grid
-          @return TRUE if plot is drawing axis ticks, FALSE if the grid is active. */
-        bool GetTicks() { return m_ticks; };
-
-        /** Get X axis label view mode.
-          @return mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds. */
-        unsigned int GetLabelMode() { return m_labelType; };
-
-        /** Set X axis label view mode.
-          @param mode mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds. */
-        void SetLabelMode(unsigned int mode) { m_labelType = mode; };
-
-        /** Set X axis Label format (used for mpX_NORMAL draw mode).
-          @param format The format string */
-        void SetLabelFormat(const wxString& format) { m_labelFormat = format; };
-
-        /** Get X axis Label format (used for mpX_NORMAL draw mode).
-          @return The format string */
-        const wxString& GetLabelFormat() { return m_labelFormat; };
+        //virtual void Plot(wxDC & dc, mpWindow & w);
 
+        //virtual double X2p( mpWindow &w, double x );
+        //virtual double P2x( mpWindow &w, double x );
+        virtual double TransformToPlot ( double x );
+        virtual double TransformFromPlot (double xplot );
     protected:
-        int m_flags; //!< Flag for axis alignment
-        bool m_ticks; //!< Flag to toggle between ticks or grid
-        unsigned int m_labelType; //!< Select labels mode: mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds
-        wxString m_labelFormat; //!< Format string used to print labels
+        void computeLabelExtents ( wxDC & dc, mpWindow & w );
+
+        virtual void recalculateTicks ( wxDC & dc, mpWindow & w );
+        virtual int tickCount() const;
+        virtual int labelCount() const;
+        virtual const wxString getLabel( int n );
+        virtual double getTickPos( int n );
+        virtual double getLabelPos( int n );
+
+
+        double n0, dig, step, labelStep, end;
 
         DECLARE_DYNAMIC_CLASS(mpScaleX)
 };
 
+
+class WXDLLIMPEXP_MATHPLOT mpScaleXLog : public mpScaleXBase
+{
+    public:
+        /** Full constructor.
+          @param name Label to plot by the ruler
+          @param flags Set the position of the scale with respect to the window.
+          @param ticks Select ticks or grid. Give TRUE (default) for drawing axis ticks, FALSE for drawing the grid.
+          @param type mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds. */
+        mpScaleXLog(wxString name = wxT("log(X)"), int flags = mpALIGN_CENTER, bool ticks = true, unsigned int type = mpX_NORMAL);
+
+        virtual double TransformToPlot ( double x );
+        virtual double TransformFromPlot (double xplot );
+        /** Layer plot handler.
+          This implementation will plot the ruler adjusted to the visible area. */
+        //virtual double X2p( mpWindow &w, double x );
+        //virtual double P2x( mpWindow &w, double x );
+    protected:
+
+        void recalculateTicks ( wxDC & dc, mpWindow & w );
+        int tickCount() const;
+        int labelCount() const;
+        const wxString getLabel( int n );
+        double getTickPos( int n );
+        double getLabelPos( int n );
+
+
+        void computeLabelExtents ( wxDC & dc, mpWindow & w );
+
+        std::vector<double> m_ticks;
+        std::vector<double> m_labeledTicks;
+
+        double dig, step, end, n0, labelStep;
+
+        DECLARE_DYNAMIC_CLASS(mpScaleXLog)
+};
+
+
+
 /** Plot layer implementing a y-scale ruler.
   If align is set to mpALIGN_CENTER, the ruler is fixed at X=0 in the coordinate system. If the align is set to mpALIGN_TOP or mpALIGN_BOTTOM, the axis is always drawn respectively at top or bottom of the window. A label is plotted at
   the top-right hand of the ruler. The scale numbering automatically
   adjusts to view and zoom factor.
   */
-class WXDLLIMPEXP_MATHPLOT mpScaleY : public mpLayer
+class WXDLLIMPEXP_MATHPLOT mpScaleY : public mpScaleBase
 {
     public:
         /** @param name Label to plot by the ruler
@@ -762,18 +874,29 @@ class WXDLLIMPEXP_MATHPLOT mpScaleY : public mpLayer
           @return TRUE if plot is drawing axis ticks, FALSE if the grid is active. */
         bool GetTicks() { return m_ticks; };
 
-        /** Set Y axis Label format.
-          @param format The format string */
-        void SetLabelFormat(const wxString& format) { m_labelFormat = format; };
-
-        /** Get Y axis Label format.
-          @return The format string */
-        const wxString& GetLabelFormat() { return m_labelFormat; };
+        virtual double TransformToPlot ( double x );
+        virtual double TransformFromPlot (double xplot );
 
     protected:
+        virtual void getVisibleDataRange ( mpWindow& w, double &minV, double& maxV);
+        virtual void recalculateTicks ( wxDC & dc, mpWindow & w );
+        virtual int tickCount() const;
+        virtual int labelCount() const;
+        virtual const wxString getLabel( int n );
+        virtual double getTickPos( int n );
+        virtual double getLabelPos( int n );
+        void computeLabelExtents ( wxDC & dc, mpWindow & w );
+
+//        double m_minV, m_maxV;
+        int m_maxLabelHeight;
+        int m_maxLabelWidth;
+        std::vector<double> m_tickValues;
+        std::vector<double> m_labeledTicks;
+
         int m_flags; //!< Flag for axis alignment
         bool m_ticks; //!< Flag to toggle between ticks or grid
-        wxString m_labelFormat; //!< Format string used to print labels
+        //wxString m_labelFormat; //!< Format string used to print labels
+        double dig, step, end, n0, labelStep;
 
         DECLARE_DYNAMIC_CLASS(mpScaleY)
 };
@@ -971,6 +1094,8 @@ class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
         inline wxCoord y2p(double y) { return (wxCoord) ( (m_posY-y) * m_scaleY); }
 
 
+
+
         /** Enable/disable the double-buffering of the window, eliminating the flicker (default=disabled).
         */
         void EnableDoubleBuffer( bool enabled ) { m_enableDoubleBuffer = enabled; }
@@ -1246,7 +1371,7 @@ class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
         bool        m_enableScrollBars;
         wxPoint     m_scroll;
         mpInfoLayer* m_movingInfoLayer;      //!< For moving info layers over the window area
-
+        bool        m_zooming;
         DECLARE_DYNAMIC_CLASS(mpWindow)
             DECLARE_EVENT_TABLE()
 };
@@ -1320,6 +1445,7 @@ class WXDLLIMPEXP_MATHPLOT mpFXYVector : public mpFXY
           */
         bool GetNextXY(double & x, double & y);
 
+public:
         /** Returns the actual minimum X data (loaded in SetData).
         */
         double GetMinX() { return m_minX; }
@@ -1336,11 +1462,31 @@ class WXDLLIMPEXP_MATHPLOT mpFXYVector : public mpFXY
         */
         double GetMaxY() { return m_maxY; }
 
+protected:
         int     m_flags; //!< Holds label alignment
 
         DECLARE_DYNAMIC_CLASS(mpFXYVector)
 };
 
+
+class WXDLLIMPEXP_MATHPLOT mpFSemiLogXVector : public mpFXYVector
+{
+    public:
+        /** @param name  Label
+          @param flags Label alignment, pass one of #mpALIGN_NE, #mpALIGN_NW, #mpALIGN_SW, #mpALIGN_SE.
+          */
+        mpFSemiLogXVector(wxString name = wxEmptyString, int flags = mpALIGN_NE);
+
+        virtual ~mpFSemiLogXVector() {}
+
+        /** Changes the internal data: the set of points to draw.
+          Both vectors MUST be of the same length. This method DOES NOT refresh the mpWindow; do it manually.
+         * @sa Clear
+         */
+
+        DECLARE_DYNAMIC_CLASS(mpFSemiLogXVector)
+};
+
 //-----------------------------------------------------------------------------
 // mpText - provided by Val Greene
 //-----------------------------------------------------------------------------

From 30c87527da2299e014c37d6ec918e0007a5066f8 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:48 +0200
Subject: [PATCH 103/197] mathplot: slave scale locking [wip]

---
 common/widgets/mathplot.cpp | 120 ++++++++++++++++++++++++++++++------
 include/widgets/mathplot.h  |  10 +++
 2 files changed, 112 insertions(+), 18 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index 2f63372861..9b5e1d2e0d 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -748,7 +748,7 @@ void mpScaleX::recalculateTicks ( wxDC & dc, mpWindow & w )
     end  = w.GetPosX() + (double)extend / w.GetScaleX();
 
     n0 = floor( (w.GetPosX() ) / step ) * step ;
-    printf("%.10f %.10f %.10f", n0, step, end);
+    //printf("%.10f %.10f %.10f", n0, step, end);
     computeLabelExtents( dc, w );
 
     labelStep = ceil(((double) m_maxLabelWidth + mpMIN_X_AXIS_LABEL_SEPARATION)/(w.GetScaleX()*step))*step;
@@ -802,17 +802,95 @@ void mpScaleY::getVisibleDataRange ( mpWindow& w, double &minV, double& maxV)
     double pymin = w.p2y(minYpx);
     double pymax = w.p2y(maxYpx);
 
-    printf("PYmin %.3f PYmax %.3f\n", pymin, pymax);
+    //printf("PYmin %.3f PYmax %.3f\n", pymin, pymax);
 
     minV = TransformFromPlot(pymax);
     maxV = TransformFromPlot(pymin);
 }
 
+
+void mpScaleY::computeSlaveTicks( mpWindow& w )
+{
+        double extend;
+
+        double bestErr = 100000000.0;
+
+        double alpha, beta;
+
+
+        //for(alpha = 1.0; alpha < 1.03; alpha += 0.001)
+        //    for(beta = -0.05; beta < 0.05; beta += 0.001)
+            {
+        //        for ( double t: m_masterScale->m_tickValues )
+        //        {
+                    double p0 = m_masterScale->TransformToPlot(m_masterScale->m_tickValues[0]);
+                    double p1 = m_masterScale->TransformToPlot(m_masterScale->m_tickValues[1]);
+
+                    m_scale = 1.0 / ( m_maxV - m_minV );
+                    m_offset = -m_minV;
+
+                    double y_slave0 =  p0 / m_scale;
+                    double y_slave1 =  p1 / m_scale;
+
+                    double dy_slave = (y_slave1 - y_slave0);
+                    double dy_scaled = ceil( 2.0*(y_slave1 - y_slave0)) / 2.0;
+
+                    double minvv, maxvv;
+
+                    getVisibleDataRange( w,minvv, maxvv);
+
+                    minvv = floor(minvv / dy_scaled) * dy_scaled;
+
+                    m_scale = 1.0 / ( m_maxV - m_minV );
+                    m_scale *= dy_slave / dy_scaled;
+
+                    printf("dy %.1f %.1f minV %.1f maxV %.1f\n", dy_slave, dy_scaled, m_minV, m_maxV);
+
+
+                    //minvv = (p0 / m_scale - m_offset);
+
+                    m_offset = p0 / m_scale - minvv;
+
+                    //m_offset =
+                    //double y0_offset = floor ( (p0 / m_scale ) / dy_scaled) * dy_scaled;
+
+                    printf("P0 %.10f minvv %.10f\n", (p0 / m_scale) - m_offset, minvv);
+
+
+                    m_tickValues.clear();
+                    m_labeledTicks.clear();
+
+                    double m;
+
+                    for (int i = 0; i < m_masterScale->m_tickValues.size(); i++)
+                    {
+                        m = TransformFromPlot ( m_masterScale->TransformToPlot(m_masterScale->m_tickValues[i]) );
+                        printf("m %.10f\n", m);
+                        m_tickValues.push_back(m);
+                        m_labeledTicks.push_back(m);
+                        //m += dy_scaled;
+                    }
+
+
+                //double py = TransformToPlot
+
+                //    printf("p %.1f %.1f\n", t, y_slave);
+            //    }
+            }
+}
+
 void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
 {
     const int extend = w.GetScrX(); //  /2;
 
 
+    if ( m_masterScale )
+    {
+        computeSlaveTicks( w );
+        computeLabelExtents( dc, w );
+        return;
+    }
+
     //dig  = floor( log( 128.0 / w.GetScaleY() ) / mpLN10 );
     //step = exp( mpLN10 * dig);
     //end  = w.GetPosX() + (double)extend / w.GetScaleY();
@@ -849,9 +927,8 @@ void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
 
     double v = floor(minVvis / bestStep) * bestStep;
 
-
     double zeroOffset = 100000000.0;
-    printf("maxVVis %.3f\n", maxVvis);
+    //printf("maxVVis %.3f\n", maxVvis);
 
     while ( v < maxVvis )
     {
@@ -860,7 +937,7 @@ void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
         if (fabs(v) < zeroOffset)
             zeroOffset = fabs(v);
 
-        printf("tick %.3f\n", v);
+        //printf("tick %.3f\n", v);
         v+=bestStep;
     }
 
@@ -877,12 +954,14 @@ void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
     //end = n0 +
 
     //n0 = floor( (w.GetPosX() ) / step ) * step ;
-    printf("zeroOffset:%.3f tickjs : %d\n", zeroOffset, m_tickValues.size());
+    //printf("zeroOffset:%.3f tickjs : %d\n", zeroOffset, m_tickValues.size());
     computeLabelExtents( dc, w );
 
     //labelStep = ceil(((double) m_maxLabelWidth + mpMIN_X_AXIS_LABEL_SEPARATION)/(w.GetScaleX()*step))*step;
 }
 
+
+
 void mpScaleY::computeLabelExtents ( wxDC & dc, mpWindow & w )
 {
     m_maxLabelHeight = 0;
@@ -891,7 +970,7 @@ void mpScaleY::computeLabelExtents ( wxDC & dc, mpWindow & w )
     {
         int tx, ty;
 
-        printf("***********GetLabel %d\n", n);
+        //printf("***********GetLabel %d\n", n);
 
         const wxString s = getLabel( n );
 
@@ -954,7 +1033,7 @@ void mpScaleXLog::recalculateTicks ( wxDC & dc, mpWindow & w )
 
     double visibleDecades =  log( maxVvis / minVvis ) / log(10);
 
-    printf("visibleD %.1f %.1f %.1f\n", visibleDecades, maxVvis, minVvis);
+    //printf("visibleD %.1f %.1f %.1f\n", visibleDecades, maxVvis, minVvis);
     double d;
 
     m_ticks.clear();
@@ -962,7 +1041,7 @@ void mpScaleXLog::recalculateTicks ( wxDC & dc, mpWindow & w )
 
     for ( d= minDecade; d<=maxDecade; d *= 10.0)
     {
-        printf("d %.1f\n",d );
+        //printf("d %.1f\n",d );
         m_labeledTicks.push_back( d );
 
         for(double dd = d; dd < d * 10; dd += d)
@@ -976,7 +1055,7 @@ void mpScaleXLog::recalculateTicks ( wxDC & dc, mpWindow & w )
 
     computeLabelExtents( dc, w );
 
-    printf("labeled ticks : %d\n", m_labeledTicks.size());
+    //printf("labeled ticks : %d\n", m_labeledTicks.size());
 
     labelStep = ceil(((double) m_maxLabelWidth + mpMIN_X_AXIS_LABEL_SEPARATION)/(w.GetScaleX()*step))*step;
 }
@@ -1090,12 +1169,12 @@ void mpScaleXBase::Plot(wxDC & dc, mpWindow & w)
         wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
         wxCoord maxYpx  = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
 
-        printf("StartPx %d endPx %d ordy %d maxy %d\n", startPx, endPx, orgy, maxYpx);
+        //printf("StartPx %d endPx %d ordy %d maxy %d\n", startPx, endPx, orgy, maxYpx);
 
         int tmp=-65535;
         int labelH = m_maxLabelHeight; // Control labels heigth to decide where to put axis name (below labels or on top of axis)
         //int maxExtent = tc.MaxLabelWidth();
-        printf("Ticks : %d\n",labelCount());
+        //printf("Ticks : %d\n",labelCount());
         for (int n = 0; n < tickCount(); n++)
         {
             double tp = getTickPos(n);
@@ -1147,7 +1226,7 @@ void mpScaleXBase::Plot(wxDC & dc, mpWindow & w)
         dc.DrawLine( startPx, minYpx, endPx, minYpx );
         dc.DrawLine( startPx, maxYpx, endPx, maxYpx );
 
-        printf("Labels : %d\n",labelCount());
+        //printf("Labels : %d\n",labelCount());
         // Actually draw labels, taking care of not overlapping them, and distributing them regularly
         for (int n = 0; n < labelCount(); n++)
         {
@@ -1160,7 +1239,7 @@ void mpScaleXBase::Plot(wxDC & dc, mpWindow & w)
 
             const int p = (int)((px- w.GetPosX()) * w.GetScaleX());
 
-            printf("p %d %.1f\n", p, px);
+            //printf("p %d %.1f\n", p, px);
 #ifdef MATHPLOT_DO_LOGGING
             wxLogMessage(wxT("mpScaleX::Plot: n_label = %f -> p_label = %d"), n, p);
 #endif
@@ -1230,13 +1309,16 @@ mpScaleY::mpScaleY(wxString name, int flags, bool ticks)
     m_flags = flags;
     m_ticks = ticks;
     m_type = mpLAYER_AXIS;
+    m_masterScale = NULL;
     //m_labelFormat = wxT("");
 }
 
 void mpScaleY::Plot(wxDC & dc, mpWindow & w)
 {
+    m_offset = -m_minV;
+    m_scale = 1.0 / ( m_maxV - m_minV );
 
-printf("Plot Y-scale\n");
+//printf("Plot Y-scale\n");
     recalculateTicks(dc, w);
     if (m_visible) {
         dc.SetPen( m_pen);
@@ -1317,7 +1399,7 @@ printf("Plot Y-scale\n");
         s.Printf(fmt,n);
         dc.GetTextExtent(s, &tx, &labelHeigth);
         for (n = 0; n < tickCount(); n++ ) {
-            printf("Tick %d\n", n);
+            //printf("Tick %d\n", n);
 
             double tp = getTickPos(n);
 
@@ -2732,14 +2814,16 @@ double mpScaleX::TransformFromPlot ( double xplot )
     return  xplot * (m_maxV - m_minV) + m_minV;
 }
 
+
+
 double mpScaleY::TransformToPlot ( double x )
 {
-    return (x - m_minV) / (m_maxV - m_minV);
+    return (x + m_offset) * m_scale;
 }
 
 double mpScaleY::TransformFromPlot ( double xplot )
 {
-    return  xplot * (m_maxV - m_minV) + m_minV;
+    return  xplot / m_scale - m_offset;
 }
 
 
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index 089912de75..bc4141214f 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -877,6 +877,12 @@ class WXDLLIMPEXP_MATHPLOT mpScaleY : public mpScaleBase
         virtual double TransformToPlot ( double x );
         virtual double TransformFromPlot (double xplot );
 
+
+        void SetMasterScale( mpScaleY *masterScale )
+        {
+            m_masterScale = masterScale;
+        }
+
     protected:
         virtual void getVisibleDataRange ( mpWindow& w, double &minV, double& maxV);
         virtual void recalculateTicks ( wxDC & dc, mpWindow & w );
@@ -886,6 +892,8 @@ class WXDLLIMPEXP_MATHPLOT mpScaleY : public mpScaleBase
         virtual double getTickPos( int n );
         virtual double getLabelPos( int n );
         void computeLabelExtents ( wxDC & dc, mpWindow & w );
+        void computeSlaveTicks ( mpWindow& w );
+        mpScaleY * m_masterScale;
 
 //        double m_minV, m_maxV;
         int m_maxLabelHeight;
@@ -893,6 +901,8 @@ class WXDLLIMPEXP_MATHPLOT mpScaleY : public mpScaleBase
         std::vector<double> m_tickValues;
         std::vector<double> m_labeledTicks;
 
+        double m_offset, m_scale;
+
         int m_flags; //!< Flag for axis alignment
         bool m_ticks; //!< Flag to toggle between ticks or grid
         //wxString m_labelFormat; //!< Format string used to print labels

From b9e31f6d3a5936de1dc17b77151d77bd82c5fc7b Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:49 +0200
Subject: [PATCH 104/197] mathplot: further improvements for simulator [wip]

---
 common/widgets/mathplot.cpp | 164 ++++++++++++++++++++++++++++++------
 include/widgets/mathplot.h  |  44 +++++++---
 2 files changed, 174 insertions(+), 34 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index 9b5e1d2e0d..ef9299e96a 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -553,6 +553,7 @@ void mpFXY::Plot(wxDC & dc, mpWindow & w)
     if (m_visible) {
         dc.SetPen( m_pen);
 
+
         double x, y;
         // Do this to reset the counters to evaluate bounding box for label positioning
         Rewind(); GetNextXY(x, y);
@@ -565,6 +566,8 @@ void mpFXY::Plot(wxDC & dc, mpWindow & w)
         wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
         wxCoord maxYpx  = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
 
+        dc.SetClippingRegion (startPx, minYpx, endPx - startPx + 1, maxYpx - minYpx + 1);
+
         wxCoord ix = 0, iy = 0;
 
         if (!m_continuous)
@@ -607,6 +610,7 @@ void mpFXY::Plot(wxDC & dc, mpWindow & w)
         }
         else
         {
+            int n =0 ;
             // Old code
             wxCoord x0=0,c0=0;
             bool    first = TRUE;
@@ -615,6 +619,9 @@ void mpFXY::Plot(wxDC & dc, mpWindow & w)
                 double px = m_scaleX->TransformToPlot(x);
                 double py = m_scaleY->TransformToPlot(y);
 
+                if(py >= 0.0 && py <= 1.0) n++;
+                //printf("py %.1f\n", py);
+
                 wxCoord x1 = w.x2p(px);
                 wxCoord c1 = w.y2p(py);
 
@@ -634,11 +641,12 @@ void mpFXY::Plot(wxDC & dc, mpWindow & w)
                     outUp = (c0 < minYpx) && (c1 < minYpx);
                     if ( !outUp && !outDown ) {
                         dc.DrawLine(x0, c0, x1, c1);
-                        UpdateViewBoundary(x1, c1);
+            //            UpdateViewBoundary(x1, c1);
                     }
                 }
                 x0=x1; c0=c1;
             }
+            //printf("n %s %d\n", (const char *) m_name.c_str(), n);
         }
 
         if (!m_name.IsEmpty() && m_showName)
@@ -678,6 +686,8 @@ void mpFXY::Plot(wxDC & dc, mpWindow & w)
             dc.DrawText( m_name, tx, ty);
         }
     }
+
+    dc.DestroyClippingRegion();
 }
 
 //-----------------------------------------------------------------------------
@@ -741,17 +751,71 @@ void mpProfile::Plot(wxDC & dc, mpWindow & w)
 
 void mpScaleX::recalculateTicks ( wxDC & dc, mpWindow & w )
 {
-    const int extend = w.GetScrX(); //  /2;
+    double minV, maxV, minVvis, maxVvis;
+    GetDataRange ( minV, maxV );
+    getVisibleDataRange ( w, minVvis, maxVvis );
 
-    dig  = floor( log( 128.0 / w.GetScaleX() ) / mpLN10 );
-    step = exp( mpLN10 * dig);
-    end  = w.GetPosX() + (double)extend / w.GetScaleX();
+    m_absVisibleMaxV = std::max(std::abs(minVvis), std::abs(maxVvis));
 
-    n0 = floor( (w.GetPosX() ) / step ) * step ;
-    //printf("%.10f %.10f %.10f", n0, step, end);
+    //printf("minV %.10f maxV %.10f %.10f %.10f\n", minV, maxV, minVvis, maxVvis);
+
+    m_tickValues.clear();
+    m_labeledTicks.clear();
+
+    double minErr = 1000000000000.0;
+    double bestStep;
+    int bestCount;
+        for(int i = 10; i <= 20; i+=2)
+        {
+            double step = fabs(maxVvis - minVvis) / (double) i;
+            double base = pow(10, floor(log10(step)));
+
+            //printf("base %.3f\n", base);
+
+            double stepInt = floor(step / base) * base;
+            double err = fabs(step - stepInt);
+
+            if(err< minErr)
+            {
+                minErr = err;
+                bestStep = stepInt;
+                bestCount = i;
+            }
+            //printf("step %d %.3f %.3f best %.3f\n",i, step, stepInt, bestStep);
+        }
+
+
+    double v = floor(minVvis / bestStep) * bestStep;
+
+    double zeroOffset = 100000000.0;
+    //printf("maxVVis %.3f\n", maxVvis);
+
+    while ( v < maxVvis )
+    {
+        m_tickValues.push_back(v);
+
+        if (fabs(v) < zeroOffset)
+            zeroOffset = fabs(v);
+
+        //printf("tick %.3f\n", v);
+        v+=bestStep;
+    }
+
+    if ( zeroOffset <= bestStep )
+    {
+        for( double& t: m_tickValues )
+            t -= zeroOffset;
+    }
+
+    for( double t: m_tickValues )
+        m_labeledTicks.push_back(t);
+
+    //n0 = floor(minVvis / bestStep) * bestStep;
+    //end = n0 +
+
+    //n0 = floor( (w.GetPosX() ) / step ) * step ;
+    //printf("zeroOffset:%.3f tickjs : %d\n", zeroOffset, m_tickValues.size());
     computeLabelExtents( dc, w );
-
-    labelStep = ceil(((double) m_maxLabelWidth + mpMIN_X_AXIS_LABEL_SEPARATION)/(w.GetScaleX()*step))*step;
 }
 
 void mpScaleX::computeLabelExtents ( wxDC & dc, mpWindow & w )
@@ -771,12 +835,12 @@ void mpScaleX::computeLabelExtents ( wxDC & dc, mpWindow & w )
 
 int mpScaleX::tickCount() const
 {
-    return (int) floor( ( end - n0 ) / step );
+    return m_tickValues.size();
 }
 
 int mpScaleX::labelCount() const
 {
-    return (int) floor( ( end - n0 ) / labelStep );
+    return m_labeledTicks.size();
 }
 
 const wxString mpScaleX::getLabel( int n )
@@ -786,12 +850,12 @@ const wxString mpScaleX::getLabel( int n )
 
 double mpScaleX::getTickPos( int n )
 {
-        return n0 + (double) n * step;
+        return m_tickValues[n];
 }
 
 double mpScaleX::getLabelPos( int n )
 {
-    return n0 + (double) n * labelStep;
+    return m_labeledTicks[n];
 }
 
 void mpScaleY::getVisibleDataRange ( mpWindow& w, double &minV, double& maxV)
@@ -818,11 +882,18 @@ void mpScaleY::computeSlaveTicks( mpWindow& w )
         double alpha, beta;
 
 
+        //printf("ComputeSlaveTicks!\n");
+
         //for(alpha = 1.0; alpha < 1.03; alpha += 0.001)
         //    for(beta = -0.05; beta < 0.05; beta += 0.001)
             {
         //        for ( double t: m_masterScale->m_tickValues )
         //        {
+
+        if( m_masterScale->m_tickValues.size() == 0)
+            return;
+
+//                    printf("NTicks %d\n", m_masterScale->m_tickValues.size());
                     double p0 = m_masterScale->TransformToPlot(m_masterScale->m_tickValues[0]);
                     double p1 = m_masterScale->TransformToPlot(m_masterScale->m_tickValues[1]);
 
@@ -833,7 +904,10 @@ void mpScaleY::computeSlaveTicks( mpWindow& w )
                     double y_slave1 =  p1 / m_scale;
 
                     double dy_slave = (y_slave1 - y_slave0);
-                    double dy_scaled = ceil( 2.0*(y_slave1 - y_slave0)) / 2.0;
+                    double exponent = floor(log10(dy_slave));
+                    double base = dy_slave/ pow(10.0, exponent);
+
+                    double dy_scaled = ceil( 2.0* base ) / 2.0 * pow (10.0, exponent );
 
                     double minvv, maxvv;
 
@@ -844,7 +918,7 @@ void mpScaleY::computeSlaveTicks( mpWindow& w )
                     m_scale = 1.0 / ( m_maxV - m_minV );
                     m_scale *= dy_slave / dy_scaled;
 
-                    printf("dy %.1f %.1f minV %.1f maxV %.1f\n", dy_slave, dy_scaled, m_minV, m_maxV);
+//                    printf("dy %.10f %.10f minV %.1f maxV %.1f\n", dy_slave, dy_scaled, m_minV, m_maxV);
 
 
                     //minvv = (p0 / m_scale - m_offset);
@@ -854,7 +928,7 @@ void mpScaleY::computeSlaveTicks( mpWindow& w )
                     //m_offset =
                     //double y0_offset = floor ( (p0 / m_scale ) / dy_scaled) * dy_scaled;
 
-                    printf("P0 %.10f minvv %.10f\n", (p0 / m_scale) - m_offset, minvv);
+                    //printf("P0 %.10f minvv %.10f\n", (p0 / m_scale) - m_offset, minvv);
 
 
                     m_tickValues.clear();
@@ -865,7 +939,7 @@ void mpScaleY::computeSlaveTicks( mpWindow& w )
                     for (int i = 0; i < m_masterScale->m_tickValues.size(); i++)
                     {
                         m = TransformFromPlot ( m_masterScale->TransformToPlot(m_masterScale->m_tickValues[i]) );
-                        printf("m %.10f\n", m);
+                    //    printf("m %.10f\n", m);
                         m_tickValues.push_back(m);
                         m_labeledTicks.push_back(m);
                         //m += dy_scaled;
@@ -881,8 +955,8 @@ void mpScaleY::computeSlaveTicks( mpWindow& w )
 
 void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
 {
-    const int extend = w.GetScrX(); //  /2;
 
+//    printf("this %p master %p\n", this, m_masterScale);
 
     if ( m_masterScale )
     {
@@ -897,6 +971,9 @@ void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
     double minV, maxV, minVvis, maxVvis;
     GetDataRange ( minV, maxV );
     getVisibleDataRange ( w, minVvis, maxVvis );
+    //printf("vdr %.10f %.10f\n", minVvis, maxVvis);
+
+    m_absVisibleMaxV = std::max(std::abs(minVvis), std::abs(maxVvis));
 
     m_tickValues.clear();
     m_labeledTicks.clear();
@@ -1036,7 +1113,7 @@ void mpScaleXLog::recalculateTicks ( wxDC & dc, mpWindow & w )
     //printf("visibleD %.1f %.1f %.1f\n", visibleDecades, maxVvis, minVvis);
     double d;
 
-    m_ticks.clear();
+    m_tickValues.clear();
     m_labeledTicks.clear();
 
     for ( d= minDecade; d<=maxDecade; d *= 10.0)
@@ -1049,7 +1126,7 @@ void mpScaleXLog::recalculateTicks ( wxDC & dc, mpWindow & w )
             if(visibleDecades < 2)
                 m_labeledTicks.push_back(dd);
             //printf("dd %.1f\n",dd);
-            m_ticks.push_back(dd);
+            m_tickValues.push_back(dd);
         }
     }
 
@@ -1079,7 +1156,7 @@ void mpScaleXLog::computeLabelExtents ( wxDC & dc, mpWindow & w )
 
 int mpScaleXLog::tickCount() const
 {
-    return m_ticks.size();
+    return m_tickValues.size();
 }
 
 int mpScaleXLog::labelCount() const
@@ -1096,7 +1173,7 @@ const wxString mpScaleXLog::getLabel( int n )
 
 double mpScaleXLog::getTickPos( int n )
 {
-    return m_ticks[n]; //n0 + (double) n * step;
+    return m_tickValues[n]; //n0 + (double) n * step;
 }
 
 double mpScaleXLog::getLabelPos( int n )
@@ -1132,6 +1209,10 @@ mpScaleXLog::mpScaleXLog(wxString name, int flags, bool ticks, unsigned int type
 void mpScaleXBase::Plot(wxDC & dc, mpWindow & w)
 {
     int tx, ty;
+
+    m_offset = -m_minV;
+    m_scale = 1.0 / ( m_maxV - m_minV );
+
     recalculateTicks( dc, w );
 
     if (m_visible) {
@@ -1667,6 +1748,11 @@ void mpWindow::OnMouseMove(wxMouseEvent     &event)
                 dc.SetBrush(*wxTRANSPARENT_BRUSH);
                 dc.DrawRectangle(m_mouseLClick.x, m_mouseLClick.y, event.GetX() - m_mouseLClick.x, event.GetY() - m_mouseLClick.y);
                 m_zooming = true;
+                m_zoomRect.x = m_mouseLClick.x;
+                m_zoomRect.y = m_mouseLClick.y;
+                m_zoomRect.width =  event.GetX() - m_mouseLClick.x;
+                m_zoomRect.height =  event.GetY() - m_mouseLClick.y;
+
             } else {
                 wxPoint moveVector(event.GetX() - m_mouseLClick.x, event.GetY() - m_mouseLClick.y);
                 m_movingInfoLayer->Move(moveVector);
@@ -2194,6 +2280,14 @@ void mpWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
         (*li)->Plot(*trgDc, *this);
     };
 
+    if(m_zooming)
+    {
+        wxPen pen(m_fgColour, 1, wxDOT);
+        trgDc->SetPen(pen);
+        trgDc->SetBrush(*wxTRANSPARENT_BRUSH);
+        trgDc->DrawRectangle(m_zoomRect);
+    }
+
     // If doublebuffer, draw now to the window:
     if (m_enableDoubleBuffer)
     {
@@ -2797,6 +2891,7 @@ IMPLEMENT_DYNAMIC_CLASS(mpFXYVector, mpFXY)
 mpFXYVector::mpFXYVector(wxString name, int flags ) : mpFXY(name,flags)
 {
     m_index = 0;
+//printf("FXYVector::FXYVector!\n");
     m_minX  = -1;
     m_maxX  = 1;
     m_minY  = -1;
@@ -2806,12 +2901,12 @@ mpFXYVector::mpFXYVector(wxString name, int flags ) : mpFXY(name,flags)
 
 double mpScaleX::TransformToPlot ( double x )
 {
-    return (x - m_minV) / (m_maxV - m_minV);
+    return (x + m_offset) * m_scale;
 }
 
 double mpScaleX::TransformFromPlot ( double xplot )
 {
-    return  xplot * (m_maxV - m_minV) + m_minV;
+    return  xplot / m_scale - m_offset;
 }
 
 
@@ -2891,6 +2986,7 @@ void mpFXYVector::SetData( const std::vector<double> &xs,const std::vector<doubl
     m_xs = xs;
     m_ys = ys;
 
+    //printf("FXYVector::setData %d %d\n", xs.size(), ys.size());
 
     // Update internal variables for the bounding box.
     if (xs.size()>0)
@@ -2912,6 +3008,9 @@ void mpFXYVector::SetData( const std::vector<double> &xs,const std::vector<doubl
             if (*it<m_minY) m_minY=*it;
             if (*it>m_maxY) m_maxY=*it;
         }
+        //printf("minX %.10f maxX %.10f\n ", m_minX, m_maxX );
+        //printf("minY %.10f maxY %.10f\n ", m_minY, m_maxY );
+
     }
     else
     {
@@ -3483,3 +3582,20 @@ that correspond to the window point (dx0,dy0) within the image "m_bitmap", and
         dc.DrawText( m_name, tx, ty);
     }
 }
+
+void mpFXY::SetScale ( mpScaleBase *scaleX, mpScaleBase *scaleY )
+{
+    m_scaleX = scaleX;
+    m_scaleY = scaleY;
+
+    //printf("SetScales : %p %p\n", scaleX, scaleY);
+
+    if(m_scaleX)
+    {
+        m_scaleX->ExtendDataRange(GetMinX(), GetMaxX());
+    }
+    if(m_scaleY)
+    {
+        m_scaleY->ExtendDataRange(GetMinY(), GetMaxY());
+    }
+}
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index bc4141214f..dc08853270 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -611,11 +611,7 @@ class WXDLLIMPEXP_MATHPLOT mpFXY : public mpLayer
           */
         virtual void Plot(wxDC & dc, mpWindow & w);
 
-        virtual void SetScale ( mpScaleBase *scaleX, mpScaleBase *scaleY )
-        {
-            m_scaleX = scaleX;
-            m_scaleY = scaleY;
-        }
+        virtual void SetScale ( mpScaleBase *scaleX, mpScaleBase *scaleY );
 
 
     protected:
@@ -687,7 +683,7 @@ class WXDLLIMPEXP_MATHPLOT mpProfile : public mpLayer
 class WXDLLIMPEXP_MATHPLOT mpScaleBase : public mpLayer
 {
 public:
-    mpScaleBase () {};
+    mpScaleBase () { m_rangeSet = false; };
     virtual ~mpScaleBase () {};
 
     bool HasBBox() { return FALSE; }
@@ -710,6 +706,7 @@ public:
 
     void SetDataRange ( double minV, double maxV )
     {
+        m_rangeSet = true;
         m_minV = minV;
         m_maxV = maxV;
     }
@@ -720,11 +717,35 @@ public:
         maxV = m_maxV;
     }
 
+    void ExtendDataRange ( double minV, double maxV )
+    {
+        if(!m_rangeSet)
+        {
+            m_minV = minV;
+            m_maxV = maxV;
+            m_rangeSet = true;
+        } else {
+            m_minV = std::min(minV, m_minV);
+            m_maxV = std::max(maxV, m_maxV);
+        }
+    }
+
+    double AbsMaxValue() const
+    {
+        return std::max(std::abs(m_maxV), std::abs(m_minV));
+    }
+
+    double AbsVisibleMaxValue() const
+    {
+            return m_absVisibleMaxV;
+    }
+
     virtual double TransformToPlot ( double x ) { return 0.0; };
     virtual double TransformFromPlot (double xplot ){ return 0.0; };
 
 protected:
 
+
     virtual void getVisibleDataRange ( mpWindow& w, double &minV, double& maxV) {};
     virtual void recalculateTicks ( wxDC & dc, mpWindow & w ) {};
     virtual int tickCount() const { return 0; }
@@ -733,9 +754,15 @@ protected:
     virtual double getTickPos( int n ) { return 0.0; }
     virtual double getLabelPos( int n ) { return 0.0; }
 
+    std::vector<double> m_tickValues;
+    std::vector<double> m_labeledTicks;
+
+    double m_offset, m_scale;
+    double m_absVisibleMaxV;
     int m_flags; //!< Flag for axis alignment
     bool m_ticks; //!< Flag to toggle between ticks or grid
     double m_minV, m_maxV;
+    double m_rangeSet;
     int m_maxLabelHeight;
     int m_maxLabelWidth;
 
@@ -828,8 +855,6 @@ class WXDLLIMPEXP_MATHPLOT mpScaleXLog : public mpScaleXBase
 
         void computeLabelExtents ( wxDC & dc, mpWindow & w );
 
-        std::vector<double> m_ticks;
-        std::vector<double> m_labeledTicks;
 
         double dig, step, end, n0, labelStep;
 
@@ -901,8 +926,6 @@ class WXDLLIMPEXP_MATHPLOT mpScaleY : public mpScaleBase
         std::vector<double> m_tickValues;
         std::vector<double> m_labeledTicks;
 
-        double m_offset, m_scale;
-
         int m_flags; //!< Flag for axis alignment
         bool m_ticks; //!< Flag to toggle between ticks or grid
         //wxString m_labelFormat; //!< Format string used to print labels
@@ -1382,6 +1405,7 @@ class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
         wxPoint     m_scroll;
         mpInfoLayer* m_movingInfoLayer;      //!< For moving info layers over the window area
         bool        m_zooming;
+        wxRect m_zoomRect;
         DECLARE_DYNAMIC_CLASS(mpWindow)
             DECLARE_EVENT_TABLE()
 };

From e5bf70996b3750e2b864a46583a8e5c62428a095 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:49 +0200
Subject: [PATCH 105/197] eeschema: migrate SIM_PLOT_PANEL to improved
 wxMathPlot [wip]

---
 eeschema/sim/sim_plot_panel.cpp | 201 +++++++++++++++++++++++++++++---
 eeschema/sim/sim_plot_panel.h   |  48 +++++---
 2 files changed, 217 insertions(+), 32 deletions(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 4447628275..d8d83ab684 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -28,6 +28,147 @@
 #include <algorithm>
 #include <limits>
 
+static wxString formatFloat (double x, int nDigits)
+{
+    wxString rv, fmt;
+
+    if(nDigits)
+    {
+        fmt = wxT("%.0Nf");
+        fmt[3] = '0' + nDigits;
+    } else {
+        fmt = wxT("%.0f");
+    }
+
+    rv.Printf(fmt, x);
+
+    return rv;
+}
+
+static wxString formatSI ( double x, const wxString& unit, int decimalDigits, double maxValue = 0.0, bool lockSuffix = false, char suffix = 0 )
+{
+    const int n_powers = 11;
+    const struct { double exponent; char suffix; } powers[] = {
+        {-18,'a'},
+        {-15,'f'},
+        {-12,'p'},
+        {-9,'n'},
+        {-6,'u'},
+        {-3,'m'},
+        {0, 0},
+        {3, 'k'},
+        {6, 'M'},
+        {9, 'G'},
+        {12, 'T'},
+        {15, 'P'}
+    };
+
+    if ( x== 0.0)
+    {
+        return wxT("0") + unit;
+    }
+
+    for ( int i = 0; i <n_powers - 1;i++)
+    {
+        double r_cur = pow(10, powers[i].exponent);
+        bool rangeHit;
+
+        if (maxValue != 0.0)
+           rangeHit = fabs(maxValue) >= r_cur && fabs(maxValue) < r_cur * 1000.0 ;
+       else
+           rangeHit = fabs(x) >= maxValue && fabs(x) < maxValue * 1000.0 ;
+
+        if( (!lockSuffix && rangeHit) || (lockSuffix && suffix == powers[i].suffix ) )
+        {
+            double v = x / r_cur;
+            wxString rv;
+
+            rv = formatFloat ( v, decimalDigits );
+
+            if(powers[i].suffix)
+                rv += powers[i].suffix;
+            rv += unit;
+
+            return rv;
+        }
+    }
+
+    return wxT("?");
+}
+
+
+class FREQUENCY_SCALE : public mpScaleXLog
+{
+public:
+    FREQUENCY_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
+        mpScaleXLog ( name, flags, ticks ,type ) {};
+
+    const wxString getLabel( int n )
+    {
+        return formatSI ( m_labeledTicks[n], wxT("Hz"), 2 );
+    }
+};
+
+
+class TIME_SCALE : public mpScaleX
+{
+public:
+    TIME_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
+        mpScaleX ( name, flags, ticks ,type ) {};
+
+    const wxString getLabel( int n )
+    {
+        return formatSI ( m_labeledTicks[n], wxT("s"), 3, AbsVisibleMaxValue() );
+    }
+};
+
+class GAIN_SCALE : public mpScaleY
+{
+public:
+    GAIN_SCALE(wxString name, int flags,  bool ticks = false, unsigned int type = 0) :
+        mpScaleY ( name, flags, ticks ) {};
+
+    const wxString getLabel( int n )
+    {
+        return formatSI ( m_labeledTicks[n], wxT("dB"), 1, AbsVisibleMaxValue(), true, 0 );
+    }
+};
+
+class PHASE_SCALE : public mpScaleY
+{
+public:
+    PHASE_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
+        mpScaleY ( name, flags, ticks ) {};
+
+    const wxString getLabel( int n )
+    {
+        return formatSI ( m_labeledTicks[n], wxT("\u00B0"), 1, AbsVisibleMaxValue(), true, 0 );
+    }
+};
+
+class VOLTAGE_SCALE : public mpScaleY
+{
+public:
+    VOLTAGE_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
+        mpScaleY ( name, flags, ticks ) {};
+
+    const wxString getLabel( int n )
+    {
+        return formatSI ( m_labeledTicks[n], wxT("V"), 3, AbsVisibleMaxValue() );
+    }
+};
+
+class CURRENT_SCALE : public mpScaleY
+{
+public:
+    CURRENT_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
+        mpScaleY ( name, flags, ticks ) {};
+
+    const wxString getLabel( int n )
+    {
+        return formatSI ( m_labeledTicks[n], wxT("A"), 3, AbsVisibleMaxValue() );
+    }
+};
 
 void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
 {
@@ -100,17 +241,24 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
     : mpWindow( parent, id, pos, size, style ), m_colorIdx( 0 ),
         m_axis_x( nullptr ), m_axis_y1( nullptr ), m_axis_y2( nullptr ), m_type( aType )
 {
-    EnableDoubleBuffer( true );
-    SetMargins( 10, 10, 10, 10 );
     LimitView( true );
+    SetMargins(50, 80, 50, 80);
+
+    wxColour grey(96, 96, 96);
+	SetColourTheme(*wxBLACK, *wxWHITE, grey);
+    EnableDoubleBuffer(true);
+    UpdateAll();
 
     switch( m_type )
     {
         case ST_AC:
-            m_axis_x = new mpScaleX( wxT( "frequency [Hz]" ), mpALIGN_BORDER_BOTTOM );
-            m_axis_y1 = new mpScaleY( wxT( "magnitude [V]" ), mpALIGN_BORDER_LEFT );
-            m_axis_y2 = new mpScaleY( wxT( "phase [rad]" ), mpALIGN_BORDER_RIGHT );
+            m_axis_x = new FREQUENCY_SCALE( wxT( "Frequency" ), mpALIGN_BOTTOM );
+            m_axis_y1 = new GAIN_SCALE( wxT( "Gain" ), mpALIGN_LEFT );
+            m_axis_y2 = new PHASE_SCALE( wxT( "Phase" ), mpALIGN_RIGHT );
+            m_axis_y2->SetMasterScale(m_axis_y1);
+
             break;
+            #if 0
 
         case ST_DC:
             m_axis_x = new mpScaleX( wxT( "voltage [V]" ), mpALIGN_BORDER_BOTTOM );
@@ -122,9 +270,13 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
             m_axis_y1 = new mpScaleY( wxT( "noise [(V or A)^2/Hz]" ), mpALIGN_BORDER_LEFT );
             break;
 
+#endif
+
         case ST_TRANSIENT:
-            m_axis_x = new mpScaleX( wxT( "time [s]" ), mpALIGN_BORDER_BOTTOM );
-            m_axis_y1 = new mpScaleY( wxT( "voltage [V]" ), mpALIGN_BORDER_LEFT );
+            m_axis_x = new TIME_SCALE( wxT( "Time" ), mpALIGN_BOTTOM );
+            m_axis_y1 = new VOLTAGE_SCALE( wxT( "Voltage" ), mpALIGN_LEFT );
+            m_axis_y2 = new CURRENT_SCALE( wxT( "Current" ), mpALIGN_RIGHT );
+            m_axis_y2->SetMasterScale(m_axis_y1);
             break;
 
         default:
@@ -150,13 +302,15 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
         AddLayer( m_axis_y2 );
     }
 
-    m_coords = new mpInfoCoords( wxRect( 0, 0, 100, 40 ), wxWHITE_BRUSH );
-    AddLayer( m_coords );
-    m_topLevel.push_back( m_coords );
+    m_legend = new mpInfoLegend( wxRect( 0, 40, 200, 40 ), wxTRANSPARENT_BRUSH );
 
-    m_legend = new mpInfoLegend( wxRect( 0, 40, 40, 40 ), wxWHITE_BRUSH );
     AddLayer( m_legend );
     m_topLevel.push_back( m_legend );
+    SetColourTheme(*wxBLACK, *wxWHITE, grey);
+
+    EnableDoubleBuffer(true);
+    UpdateAll();
+
 }
 
 
@@ -193,15 +347,31 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
     if( addedNewEntry )
     {
         // New entry
-        t = new TRACE( aName, aSpiceName );
-        t->SetPen( wxPen( generateColor(), 1, wxSOLID ) );
+        switch ( m_type )
+        {
+            case ST_TRANSIENT:
+                t = new TRACE_TRANSIENT( aName, aSpiceName );
+                break;
+            case ST_AC:
+                t = new TRACE_FREQ_RESPONSE( aName, aSpiceName );
+                break;
+            default:
+                assert(false);
+        }
+
+        assert(m_axis_x);
+        assert(m_axis_y1);
+
+        t->SetData( std::vector<double>( aT, aT + aPoints ), std::vector<double>( aY, aY + aPoints ) );
+        t->SetScale ( m_axis_x, m_axis_y1 );
+        t->SetPen( wxPen( generateColor(), 2, wxSOLID ) );
         m_traces[aName] = t;
 
         // It is a trick to keep legend & coords always on the top
         for( mpLayer* l : m_topLevel )
             DelLayer( l );
 
-        AddLayer( t );
+        AddLayer( (mpLayer *) t );
 
         for( mpLayer* l : m_topLevel )
             AddLayer( l );
@@ -211,7 +381,6 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
         t = prev->second;
     }
 
-    t->SetData( std::vector<double>( aT, aT + aPoints ), std::vector<double>( aY, aY + aPoints ) );
     UpdateAll();
 
     return addedNewEntry;
@@ -289,7 +458,7 @@ wxColour SIM_PLOT_PANEL::generateColor()
     /// http://stanford.edu/~mwaskom/software/seaborn/tutorial/color_palettes.html
     /// https://github.com/Gnuplotting/gnuplot-palettes
 
-    const unsigned long colors[] = { 0x000080, 0x008000, 0x800000, 0x008080, 0x800080, 0x808000, 0x808080 };
+    const unsigned long colors[] = { 0x0000ff, 0x00ff00, 0xff0000, 0x00ffff, 0xff00ff, 0xffff000, 0xffffff };
 
     //const unsigned long colors[] = { 0xe3cea6, 0xb4781f, 0x8adfb2, 0x2ca033, 0x999afb, 0x1c1ae3, 0x6fbffd, 0x007fff, 0xd6b2ca, 0x9a3d6a };
 
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index a36c13ab3c..64921055ea 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -90,20 +90,8 @@ private:
 class TRACE : public mpFXYVector
 {
 public:
-    TRACE( const wxString& aName, const wxString& aSpiceName )
-        : mpFXYVector( aName ), m_spiceName( aSpiceName ), m_cursor( nullptr )
-    {
-        SetContinuity( true );
-        ShowName( false );
-    }
-
-    void SetData( const std::vector<double>& aXs, const std::vector<double>& aYs )
-    {
-        mpFXYVector::SetData( aXs, aYs );
-
-        if( m_cursor )
-            m_cursor->Update();
-    }
+    TRACE( const wxString& aSpiceName ) :
+        m_spiceName( aSpiceName ), m_cursor( nullptr ) {};
 
     const wxString& GetSpiceName() const
     {
@@ -135,11 +123,39 @@ public:
         return m_cursor;
     }
 
-private:
+protected:
     wxString m_spiceName;
     CURSOR* m_cursor;
 };
 
+class TRACE_FREQ_RESPONSE : public TRACE, public mpFSemiLogXVector
+{
+public:
+    TRACE_FREQ_RESPONSE( const wxString& aName, const wxString& aSpiceName )
+        : mpFSemiLogXVector( aName ), TRACE( aSpiceName )
+    {
+        mpFSemiLogXVector::SetContinuity( true );
+        mpFSemiLogXVector::SetDrawOutsideMargins( false );
+        mpFSemiLogXVector::ShowName( false );
+    }
+
+};
+
+class TRACE_TRANSIENT : public TRACE
+{
+public:
+    TRACE_TRANSIENT( const wxString& aName, const wxString& aSpiceName ) : 
+        TRACE( aSpiceName )
+    {
+        mpFXYVector::SetName ( aName ); // hack
+        SetContinuity( true );
+        SetDrawOutsideMargins( false );
+        ShowName( false );
+    }
+
+};
+
+
 
 class SIM_PLOT_PANEL : public mpWindow
 {
@@ -243,7 +259,7 @@ private:
     // Traces to be plotted
     std::map<wxString, TRACE*> m_traces;
 
-    mpScaleX* m_axis_x;
+    mpScaleXBase* m_axis_x;
     mpScaleY* m_axis_y1;
     mpScaleY* m_axis_y2;
     mpInfoLegend* m_legend;

From e8d6a42e1a6ff3dddcf423df23416321bfe6cbb3 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:49 +0200
Subject: [PATCH 106/197] simulator: working on magnitude/phase plots

---
 common/widgets/mathplot.cpp       |  9 +++++++--
 eeschema/sim/sim_plot_frame.cpp   |  6 +++++-
 eeschema/sim/sim_plot_panel.cpp   | 33 +++++++++++++++++++++++++------
 eeschema/sim/sim_plot_panel.h     | 32 ++++++++++++++++--------------
 eeschema/widgets/tuner_slider.cpp | 10 +++++++++-
 eeschema/widgets/tuner_slider.h   |  1 +
 include/widgets/mathplot.h        | 12 +++++++++++
 7 files changed, 78 insertions(+), 25 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index ef9299e96a..e9ec1c0f4a 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -1110,12 +1110,16 @@ void mpScaleXLog::recalculateTicks ( wxDC & dc, mpWindow & w )
 
     double visibleDecades =  log( maxVvis / minVvis ) / log(10);
 
-    //printf("visibleD %.1f %.1f %.1f\n", visibleDecades, maxVvis, minVvis);
+    printf("visibleD %f %f\n", minDecade, maxDecade);
     double d;
 
     m_tickValues.clear();
     m_labeledTicks.clear();
 
+    if ( minDecade == 0.0 )
+        return;
+
+
     for ( d= minDecade; d<=maxDecade; d *= 10.0)
     {
         //printf("d %.1f\n",d );
@@ -2944,13 +2948,14 @@ double log10( double x)
     return log(x)/log(10.0);
 }
 
+#if 0
 mpFSemiLogXVector::mpFSemiLogXVector(wxString name, int flags ) :
 mpFXYVector ( name, flags )
 {}
 
 
 IMPLEMENT_DYNAMIC_CLASS(mpFSemiLogXVector, mpFXYVector)
-
+#endif
 
 void mpFXYVector::Rewind()
 {
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index be57e88ae8..100c14b52d 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -305,7 +305,7 @@ bool SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aNa
                 return false;
 
             aPanel->AddTrace( aSpiceName, aName + " (mag)", size, data_x.data(), data_mag.data(), 0 );
-            aPanel->AddTrace( aSpiceName, aName + " (phase)", size, data_x.data(), data_phase.data(), 0 );
+            aPanel->AddTrace( aSpiceName, aName + " (phase)", size, data_x.data(), data_phase.data(), SPF_AC_PHASE );
         }
         break;
 
@@ -668,11 +668,15 @@ void SIM_PLOT_FRAME::onSimUpdate( wxCommandEvent& aEvent )
     if( !m_simulator )
         return;
 
+        aEvent.Discard();
+        
     if( IsSimulationRunning() )
         StopSimulation();
 
     m_simConsole->Clear();
 
+    printf("SimUpdate\n");
+
     // Apply tuned values
     if( SIM_PLOT_PANEL* plotPanel = CurrentPlot() )
     {
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index d8d83ab684..5ae68acad0 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -76,7 +76,7 @@ static wxString formatSI ( double x, const wxString& unit, int decimalDigits, do
         if (maxValue != 0.0)
            rangeHit = fabs(maxValue) >= r_cur && fabs(maxValue) < r_cur * 1000.0 ;
        else
-           rangeHit = fabs(x) >= maxValue && fabs(x) < maxValue * 1000.0 ;
+           rangeHit = fabs(x) >= r_cur && fabs(x) < r_cur * 1000.0 ;
 
         if( (!lockSuffix && rangeHit) || (lockSuffix && suffix == powers[i].suffix ) )
         {
@@ -105,6 +105,7 @@ public:
 
     const wxString getLabel( int n )
     {
+        printf("%.10f\n", m_labeledTicks[n] );
         return formatSI ( m_labeledTicks[n], wxT("Hz"), 2 );
     }
 };
@@ -270,7 +271,7 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
             m_axis_y1 = new mpScaleY( wxT( "noise [(V or A)^2/Hz]" ), mpALIGN_BORDER_LEFT );
             break;
 
-#endif
+            #endif
 
         case ST_TRANSIENT:
             m_axis_x = new TIME_SCALE( wxT( "Time" ), mpALIGN_BOTTOM );
@@ -340,6 +341,7 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
 {
     TRACE* t = NULL;
 
+
     // Find previous entry, if there is one
     auto prev = m_traces.find( aName );
     bool addedNewEntry = ( prev == m_traces.end() );
@@ -353,17 +355,36 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
                 t = new TRACE_TRANSIENT( aName, aSpiceName );
                 break;
             case ST_AC:
+                //printf("makeFreqResp!\n");
                 t = new TRACE_FREQ_RESPONSE( aName, aSpiceName );
                 break;
             default:
                 assert(false);
         }
 
-        assert(m_axis_x);
-        assert(m_axis_y1);
+        printf("points : %d\n", aPoints );
+
+        std::vector<double> tmp(aY, aY + aPoints);
+
+        if( m_type == ST_AC )
+        {
+            if( aFlags & SPF_AC_PHASE)
+            {
+                for(int i = 0; i < aPoints; i++ )
+                    tmp[i] = tmp[i] * 180.0 / M_PI;
+            } else {
+                for(int i = 0; i < aPoints; i++ )
+                    tmp[i] = 20 * log( tmp[i] ) / log(10.0);
+            }
+        }
+
+        t->SetData( std::vector<double>( aT, aT + aPoints ), tmp );
+
+        if( aFlags & SPF_AC_PHASE )
+            t->SetScale ( m_axis_x, m_axis_y2 );
+        else
+            t->SetScale ( m_axis_x, m_axis_y1 );
 
-        t->SetData( std::vector<double>( aT, aT + aPoints ), std::vector<double>( aY, aY + aPoints ) );
-        t->SetScale ( m_axis_x, m_axis_y1 );
         t->SetPen( wxPen( generateColor(), 2, wxSOLID ) );
         m_traces[aName] = t;
 
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 64921055ea..4eb44bc2fc 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -90,8 +90,14 @@ private:
 class TRACE : public mpFXYVector
 {
 public:
-    TRACE( const wxString& aSpiceName ) :
-        m_spiceName( aSpiceName ), m_cursor( nullptr ) {};
+    TRACE( const wxString& aName, const wxString& aSpiceName ) :
+        mpFXYVector ( aName ), m_spiceName( aSpiceName ), m_cursor( nullptr )
+        {
+            SetContinuity( true );
+            SetDrawOutsideMargins( false );
+            ShowName( false );
+
+        }
 
     const wxString& GetSpiceName() const
     {
@@ -128,15 +134,13 @@ protected:
     CURSOR* m_cursor;
 };
 
-class TRACE_FREQ_RESPONSE : public TRACE, public mpFSemiLogXVector
+class TRACE_FREQ_RESPONSE : public TRACE
 {
 public:
-    TRACE_FREQ_RESPONSE( const wxString& aName, const wxString& aSpiceName )
-        : mpFSemiLogXVector( aName ), TRACE( aSpiceName )
+    TRACE_FREQ_RESPONSE( const wxString& aName, const wxString& aSpiceName ) :
+        TRACE( aName, aSpiceName )
     {
-        mpFSemiLogXVector::SetContinuity( true );
-        mpFSemiLogXVector::SetDrawOutsideMargins( false );
-        mpFSemiLogXVector::ShowName( false );
+        printf("makeFreqResponse!\n");
     }
 
 };
@@ -144,18 +148,16 @@ public:
 class TRACE_TRANSIENT : public TRACE
 {
 public:
-    TRACE_TRANSIENT( const wxString& aName, const wxString& aSpiceName ) : 
-        TRACE( aSpiceName )
+    TRACE_TRANSIENT( const wxString& aName, const wxString& aSpiceName ) :
+        TRACE( aName, aSpiceName )
     {
-        mpFXYVector::SetName ( aName ); // hack
-        SetContinuity( true );
-        SetDrawOutsideMargins( false );
-        ShowName( false );
     }
 
 };
 
-
+enum SIM_PLOT_FLAGS {
+    SPF_AC_PHASE = 0x1
+};
 
 class SIM_PLOT_PANEL : public mpWindow
 {
diff --git a/eeschema/widgets/tuner_slider.cpp b/eeschema/widgets/tuner_slider.cpp
index ee0e0cfc42..cdfdc3d357 100644
--- a/eeschema/widgets/tuner_slider.cpp
+++ b/eeschema/widgets/tuner_slider.cpp
@@ -36,6 +36,7 @@ TUNER_SLIDER::TUNER_SLIDER( SIM_PLOT_FRAME* aParent, SCH_COMPONENT* aComponent )
     const wxString compName = aComponent->GetField( REFERENCE )->GetText();
     m_name->SetLabel( compName );
     m_value = SPICE_VALUE( aComponent->GetField( VALUE )->GetText() );
+    m_changed = false;
 
     // Generate Spice component name
     char prim = NETLIST_EXPORTER_PSPICE::GetSpiceField( SPICE_PRIMITIVE, aComponent, 0 )[0];
@@ -142,6 +143,7 @@ void TUNER_SLIDER::onSliderChanged( wxScrollEvent& event )
     m_value = m_min + ( m_max - m_min ) * SPICE_VALUE( m_slider->GetValue() / 100.0 );
     updateValueText();
     updateComponentValue();
+    m_changed = true;
 }
 
 
@@ -166,6 +168,7 @@ void TUNER_SLIDER::onValueTextEnter( wxCommandEvent& event )
     {
         SPICE_VALUE newCur( m_valueText->GetValue() );
         SetValue( newCur );
+        m_changed = true;
     }
     catch( std::exception& e )
     {
@@ -192,5 +195,10 @@ void TUNER_SLIDER::onMinTextEnter( wxCommandEvent& event )
 
 void TUNER_SLIDER::onSimTimer( wxTimerEvent& event )
 {
-    wxQueueEvent( GetParent(), new wxCommandEvent( EVT_SIM_UPDATE ) );
+    if(m_changed)
+    {
+        printf("Slider Ch\n");
+        wxQueueEvent( GetParent(), new wxCommandEvent( EVT_SIM_UPDATE ) );
+        m_changed = false;
+    }
 }
diff --git a/eeschema/widgets/tuner_slider.h b/eeschema/widgets/tuner_slider.h
index 05ae5e8b17..ecdc6185a3 100644
--- a/eeschema/widgets/tuner_slider.h
+++ b/eeschema/widgets/tuner_slider.h
@@ -94,6 +94,7 @@ private:
     SCH_COMPONENT* m_component;
 
     SPICE_VALUE m_min, m_max, m_value;
+    bool m_changed;
 };
 
 #endif /* TUNER_SLIDER_H */
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index dc08853270..c19fb485ba 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -728,7 +728,16 @@ public:
             m_minV = std::min(minV, m_minV);
             m_maxV = std::max(maxV, m_maxV);
         }
+
+        printf("Extend min %.10f max %.10f\n", m_minV, m_maxV);
+
+        if (m_minV == m_maxV)
+        {
+            m_minV = -1.0;
+            m_maxV = 1.0;
     }
+    }
+
 
     double AbsMaxValue() const
     {
@@ -1503,6 +1512,8 @@ protected:
 };
 
 
+#if 0
+
 class WXDLLIMPEXP_MATHPLOT mpFSemiLogXVector : public mpFXYVector
 {
     public:
@@ -1520,6 +1531,7 @@ class WXDLLIMPEXP_MATHPLOT mpFSemiLogXVector : public mpFXYVector
 
         DECLARE_DYNAMIC_CLASS(mpFSemiLogXVector)
 };
+#endif
 
 //-----------------------------------------------------------------------------
 // mpText - provided by Val Greene

From ef45cd696d0c2538f6561245f75da583a3dd4392 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:50 +0200
Subject: [PATCH 107/197] Refresh plots after simulation is relaunched

---
 demos/sim/sim_test.sch          | 35 +++++++++++++----------
 eeschema/sim/sim_plot_frame.cpp |  4 ---
 eeschema/sim/sim_plot_panel.cpp | 49 ++++++++++++++++-----------------
 3 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/demos/sim/sim_test.sch b/demos/sim/sim_test.sch
index d884ed6ad4..01afdb89f2 100644
--- a/demos/sim/sim_test.sch
+++ b/demos/sim/sim_test.sch
@@ -49,14 +49,12 @@ L VSOURCE V1
 U 1 1 57336052
 P 4400 4050
 F 0 "V1" H 4528 4096 50  0000 L CNN
-F 1 "0.2 AC 1 SIN(0 1 2)" H 4528 4005 50  0000 L CNN
+F 1 "5V" H 4528 4005 50  0000 L CNN
 F 2 "" H 4400 4050 50  0000 C CNN
 F 3 "" H 4400 4050 50  0000 C CNN
 F 4 "Value" H 4400 4050 60  0001 C CNN "Fieldname"
-F 5 "V" H 4400 4050 60  0001 C CNN "SpicePrimitive"
-F 6 "1 2" H 4100 4250 60  0001 C CNN "SpicePinMapping"
 	1    4400 4050
-	1    0    0    -1  
+	-1   0    0    1   
 $EndComp
 $Comp
 L GND #PWR1
@@ -82,8 +80,6 @@ F 0 "R1" V 4443 3700 50  0000 C CNN
 F 1 "10k" V 4534 3700 50  0000 C CNN
 F 2 "" V 4580 3700 50  0000 C CNN
 F 3 "" H 4650 3700 50  0000 C CNN
-F 4 "1 2" H 4650 3700 60  0001 C CNN "SpiceMapping"
-F 5 "R" V 4650 3700 60  0001 C CNN "SpicePrimitive"
 	1    4650 3700
 	0    1    1    0   
 $EndComp
@@ -101,8 +97,10 @@ F 0 "D1" H 5100 3485 50  0000 C CNN
 F 1 "1N4148" H 5100 3576 50  0000 C CNN
 F 2 "" H 5100 3700 50  0000 C CNN
 F 3 "" H 5100 3700 50  0000 C CNN
-F 4 "D" H 5100 3700 60  0001 C CNN "SpicePrimitive"
-F 5 "1 2" H 5100 3700 60  0001 C CNN "SpiceMapping"
+F 4 "D" H 5100 3700 60  0001 C CNN "Spice_Primitive"
+F 5 "1n914" H 5100 3700 60  0001 C CNN "Spice_Model"
+F 6 "Y" H 5100 3700 60  0001 C CNN "Spice_Netlist_Enabled"
+F 7 "/home/orson/workspace/kicad/demos/sim/diodes.lib" H 5100 3700 60  0001 C CNN "Spice_Lib_File"
 	1    5100 3700
 	-1   0    0    1   
 $EndComp
@@ -114,8 +112,6 @@ F 0 "C1" H 5515 4046 50  0000 L CNN
 F 1 "100n" H 5515 3955 50  0000 L CNN
 F 2 "" H 5438 3850 50  0000 C CNN
 F 3 "" H 5400 4000 50  0000 C CNN
-F 4 "C" H 5400 4000 60  0001 C CNN "SpicePrimitive"
-F 5 "1 2" H 5400 4000 60  0001 C CNN "SpiceMapping"
 	1    5400 4000
 	1    0    0    -1  
 $EndComp
@@ -124,11 +120,9 @@ L R R2
 U 1 1 573362F7
 P 5750 4000
 F 0 "R2" H 5680 3954 50  0000 R CNN
-F 1 "100k" H 5680 4045 50  0000 R CNN
+F 1 "1Meg" H 5680 4045 50  0000 R CNN
 F 2 "" V 5680 4000 50  0000 C CNN
 F 3 "" H 5750 4000 50  0000 C CNN
-F 4 "1 2" H 5750 4000 60  0001 C CNN "SpiceMapping"
-F 5 "R" V 5750 4000 60  0001 C CNN "SpicePrimitive"
 	1    5750 4000
 	-1   0    0    1   
 $EndComp
@@ -144,6 +138,17 @@ Wire Wire Line
 Wire Wire Line
 	5750 4300 5750 4150
 Connection ~ 5400 4300
-Text Notes 4500 3200 0    60   ~ 0
-.include diodes.lib\n.tran 1m 1000m 1m 10m
+Text Notes 4300 3150 0    60   ~ 0
+.op
+$Comp
+L +12V #PWR?
+U 1 1 5787B2A9
+P 6650 3300
+F 0 "#PWR?" H 6650 3150 50  0001 C CNN
+F 1 "+12V" H 6665 3473 50  0000 C CNN
+F 2 "" H 6650 3300 50  0000 C CNN
+F 3 "" H 6650 3300 50  0000 C CNN
+	1    6650 3300
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 100c14b52d..b205d28ff6 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -668,15 +668,11 @@ void SIM_PLOT_FRAME::onSimUpdate( wxCommandEvent& aEvent )
     if( !m_simulator )
         return;
 
-        aEvent.Discard();
-        
     if( IsSimulationRunning() )
         StopSimulation();
 
     m_simConsole->Clear();
 
-    printf("SimUpdate\n");
-
     // Apply tuned values
     if( SIM_PLOT_PANEL* plotPanel = CurrentPlot() )
     {
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 5ae68acad0..342f8d90fd 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -341,7 +341,6 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
 {
     TRACE* t = NULL;
 
-
     // Find previous entry, if there is one
     auto prev = m_traces.find( aName );
     bool addedNewEntry = ( prev == m_traces.end() );
@@ -362,29 +361,6 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
                 assert(false);
         }
 
-        printf("points : %d\n", aPoints );
-
-        std::vector<double> tmp(aY, aY + aPoints);
-
-        if( m_type == ST_AC )
-        {
-            if( aFlags & SPF_AC_PHASE)
-            {
-                for(int i = 0; i < aPoints; i++ )
-                    tmp[i] = tmp[i] * 180.0 / M_PI;
-            } else {
-                for(int i = 0; i < aPoints; i++ )
-                    tmp[i] = 20 * log( tmp[i] ) / log(10.0);
-            }
-        }
-
-        t->SetData( std::vector<double>( aT, aT + aPoints ), tmp );
-
-        if( aFlags & SPF_AC_PHASE )
-            t->SetScale ( m_axis_x, m_axis_y2 );
-        else
-            t->SetScale ( m_axis_x, m_axis_y1 );
-
         t->SetPen( wxPen( generateColor(), 2, wxSOLID ) );
         m_traces[aName] = t;
 
@@ -392,7 +368,7 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
         for( mpLayer* l : m_topLevel )
             DelLayer( l );
 
-        AddLayer( (mpLayer *) t );
+        AddLayer( (mpLayer*) t );
 
         for( mpLayer* l : m_topLevel )
             AddLayer( l );
@@ -402,6 +378,29 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
         t = prev->second;
     }
 
+    std::vector<double> tmp( aY, aY + aPoints );
+
+    if( m_type == ST_AC )
+    {
+        if( aFlags & SPF_AC_PHASE )
+        {
+            for(int i = 0; i < aPoints; i++ )
+                tmp[i] = tmp[i] * 180.0 / M_PI;
+        }
+        else
+        {
+            for(int i = 0; i < aPoints; i++ )
+                tmp[i] = 20 * log( tmp[i] ) / log( 10.0 );
+        }
+    }
+
+    t->SetData( std::vector<double>( aT, aT + aPoints ), tmp );
+
+    if( aFlags & SPF_AC_PHASE )
+        t->SetScale( m_axis_x, m_axis_y2 );
+    else
+        t->SetScale( m_axis_x, m_axis_y1 );
+
     UpdateAll();
 
     return addedNewEntry;

From e5604fee1c805322e2d58db3c7952cdbc5a0d010 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:50 +0200
Subject: [PATCH 108/197] SPICE_VALUE bugfix

---
 eeschema/sim/spice_value.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eeschema/sim/spice_value.cpp b/eeschema/sim/spice_value.cpp
index 8c5b8f1464..0d4cd25289 100644
--- a/eeschema/sim/spice_value.cpp
+++ b/eeschema/sim/spice_value.cpp
@@ -172,13 +172,13 @@ SPICE_VALUE SPICE_VALUE::operator-( const SPICE_VALUE& aOther ) const
     if( prefixDiff > 0 )
     {
         // Switch to the aOther prefix
-        res.m_base = m_prefix * std::pow( 10, prefixDiff ) - aOther.m_prefix;
+        res.m_base = m_base * std::pow( 10, prefixDiff ) - aOther.m_base;
         res.m_prefix = aOther.m_prefix;
     }
     else if( prefixDiff < 0 )
     {
         // Use the current prefix
-        res.m_base = m_prefix - aOther.m_prefix * std::pow( 10, -prefixDiff );
+        res.m_base = m_base - aOther.m_base * std::pow( 10, -prefixDiff );
         res.m_prefix = m_prefix;
     }
     else

From cf28e843ba2562d9e3e2641d6929580e982ac641 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:50 +0200
Subject: [PATCH 109/197] Fix for crash when AC simulation is relaunched

---
 eeschema/sim/sim_plot_frame.cpp | 10 +++---
 eeschema/sim/sim_plot_panel.cpp | 57 +++++++++++++++++++++++++++++----
 eeschema/sim/sim_plot_panel.h   | 47 +++++++++++++++++++++++----
 3 files changed, 97 insertions(+), 17 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index b205d28ff6..d605c50278 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -304,8 +304,8 @@ bool SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aNa
             if( data_mag.empty() || data_phase.empty() )
                 return false;
 
-            aPanel->AddTrace( aSpiceName, aName + " (mag)", size, data_x.data(), data_mag.data(), 0 );
-            aPanel->AddTrace( aSpiceName, aName + " (phase)", size, data_x.data(), data_phase.data(), SPF_AC_PHASE );
+            aPanel->AddTrace( aSpiceName, aName, size, data_x.data(), data_mag.data(), SPF_AC_MAG );
+            aPanel->AddTrace( aSpiceName, aName, size, data_x.data(), data_phase.data(), SPF_AC_PHASE );
         }
         break;
 
@@ -429,7 +429,7 @@ void SIM_PLOT_FRAME::menuSaveCsv( wxCommandEvent& event )
             timeWritten = true;
         }
 
-        out.Write( wxString::Format( "%s%c", t.first, SEPARATOR ) );
+        out.Write( wxString::Format( "%s%c", t.first.GetDescription(), SEPARATOR ) );
 
         for( double v : trace->GetDataY() )
             out.Write( wxString::Format( "%f%c", v, SEPARATOR ) );
@@ -612,7 +612,7 @@ void SIM_PLOT_FRAME::onCursorUpdate( wxCommandEvent& event )
         if( CURSOR* cursor = trace.second->GetCursor() )
         {
             const wxRealPoint coords = cursor->GetCoords();
-            long idx = m_cursors->InsertItem( SIGNAL_COL, trace.first );
+            long idx = m_cursors->InsertItem( SIGNAL_COL, trace.first.GetDescription() );
             m_cursors->SetItem( idx, X_COL, wxString::Format( "%f", coords.x ) );
             m_cursors->SetItem( idx, Y_COL, wxString::Format( "%f", coords.y ) );
         }
@@ -646,7 +646,7 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
     if( SIM_PLOT_PANEL::IsPlottable( simType ) )
     {
         for( const auto& trace : plotPanel->GetTraces() )
-            updatePlot( trace.second->GetSpiceName(), trace.second->GetName(), plotPanel );
+            updatePlot( trace.second->GetSpiceName(), trace.first.GetName(), plotPanel );
 
         plotPanel->UpdateAll();
     }
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 342f8d90fd..2c9cecd8df 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -237,6 +237,44 @@ void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
 }
 
 
+TRACE_DESC::TRACE_DESC( const wxString& aDescription )
+    : m_name( aDescription )
+{
+    for( const auto& desc : m_descMap )
+    {
+        if( m_name.EndsWith( desc.second ) )
+        {
+            m_type = desc.first;
+            m_name.Replace( desc.second, "" );
+        }
+    }
+}
+
+
+wxString TRACE_DESC::GetDescription() const
+{
+    wxString res( m_name );
+
+    for( const auto& desc : m_descMap )
+    {
+        if( m_type == desc.first )
+        {
+            res += desc.second;
+            break;
+        }
+    }
+
+    return res;
+}
+
+
+const std::map<SIM_PLOT_FLAGS, wxString> TRACE_DESC::m_descMap =
+{
+    { SPF_AC_PHASE, wxT( " (phase)" ) },
+    { SPF_AC_MAG, wxT( " (mag)" ) }
+};
+
+
 SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id, const wxPoint& pos,
                 const wxSize& size, long style, const wxString& name )
     : mpWindow( parent, id, pos, size, style ), m_colorIdx( 0 ),
@@ -341,8 +379,15 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
 {
     TRACE* t = NULL;
 
+    wxString name( aName );
+
+    if( aFlags == SPF_AC_MAG )
+        name += " (mag)";
+    else if( aFlags == SPF_AC_PHASE )
+        name += " (phase)";
+
     // Find previous entry, if there is one
-    auto prev = m_traces.find( aName );
+    auto prev = m_traces.find( TRACE_DESC( aName, (SIM_PLOT_FLAGS) aFlags ) );
     bool addedNewEntry = ( prev == m_traces.end() );
 
     if( addedNewEntry )
@@ -351,18 +396,18 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
         switch ( m_type )
         {
             case ST_TRANSIENT:
-                t = new TRACE_TRANSIENT( aName, aSpiceName );
+                t = new TRACE_TRANSIENT( name, aSpiceName );
                 break;
             case ST_AC:
                 //printf("makeFreqResp!\n");
-                t = new TRACE_FREQ_RESPONSE( aName, aSpiceName );
+                t = new TRACE_FREQ_RESPONSE( name, aSpiceName );
                 break;
             default:
                 assert(false);
         }
 
         t->SetPen( wxPen( generateColor(), 2, wxSOLID ) );
-        m_traces[aName] = t;
+        m_traces[TRACE_DESC( aName, (SIM_PLOT_FLAGS) aFlags )] = t;
 
         // It is a trick to keep legend & coords always on the top
         for( mpLayer* l : m_topLevel )
@@ -409,7 +454,7 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
 
 bool SIM_PLOT_PANEL::DeleteTrace( const wxString& aName )
 {
-    auto it = m_traces.find( aName );
+    auto it = m_traces.find( TRACE_DESC( aName ) );
 
     if( it != m_traces.end() )
     {
@@ -432,7 +477,7 @@ void SIM_PLOT_PANEL::DeleteAllTraces()
 {
     for( auto& t : m_traces )
     {
-        DeleteTrace( t.first );
+        DeleteTrace( t.first.GetDescription() );
     }
 
     m_traces.clear();
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 4eb44bc2fc..a4394f4c5c 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -91,7 +91,7 @@ class TRACE : public mpFXYVector
 {
 public:
     TRACE( const wxString& aName, const wxString& aSpiceName ) :
-        mpFXYVector ( aName ), m_spiceName( aSpiceName ), m_cursor( nullptr )
+        mpFXYVector( aName ), m_spiceName( aSpiceName ), m_cursor( nullptr )
         {
             SetContinuity( true );
             SetDrawOutsideMargins( false );
@@ -156,7 +156,42 @@ public:
 };
 
 enum SIM_PLOT_FLAGS {
-    SPF_AC_PHASE = 0x1
+    SPF_AC_PHASE = 0x01,
+    SPF_AC_MAG   = 0x02
+};
+
+class TRACE_DESC
+{
+public:
+    TRACE_DESC( const wxString& aName, SIM_PLOT_FLAGS aType )
+        : m_name( aName ), m_type( aType )
+    {
+    }
+
+    TRACE_DESC( const wxString& aDescription );
+
+    wxString GetDescription() const;
+
+    const wxString& GetName() const
+    {
+        return m_name;
+    }
+
+    SIM_PLOT_FLAGS GetType() const
+    {
+        return m_type;
+    }
+
+    bool operator<( const TRACE_DESC& aOther ) const
+    {
+        return ( m_name < aOther.m_name ) || ( m_name == aOther.m_name && m_type < aOther.m_type );
+    }
+
+private:
+    wxString m_name;
+    SIM_PLOT_FLAGS m_type;
+
+    static const std::map<SIM_PLOT_FLAGS, wxString> m_descMap;
 };
 
 class SIM_PLOT_PANEL : public mpWindow
@@ -198,17 +233,17 @@ public:
 
     bool IsShown( const wxString& aName ) const
     {
-        return ( m_traces.count( aName ) != 0 );
+        return m_traces.count( TRACE_DESC( aName ) ) > 0;
     }
 
-    const std::map<wxString, TRACE*>& GetTraces() const
+    const std::map<TRACE_DESC, TRACE*>& GetTraces() const
     {
         return m_traces;
     }
 
     TRACE* GetTrace( const wxString& aName ) const
     {
-        auto trace = m_traces.find( aName );
+        auto trace = m_traces.find( TRACE_DESC( aName ) );
 
         return trace == m_traces.end() ? NULL : trace->second;
     }
@@ -259,7 +294,7 @@ private:
     unsigned int m_colorIdx;
 
     // Traces to be plotted
-    std::map<wxString, TRACE*> m_traces;
+    std::map<TRACE_DESC, TRACE*> m_traces;
 
     mpScaleXBase* m_axis_x;
     mpScaleY* m_axis_y1;

From 3ebc2494a7a3cd9581c3dc37cd7c067456074d19 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:51 +0200
Subject: [PATCH 110/197] Minor fix in NETLIST_EXPOTER_PSPICE

---
 eeschema/netlist_exporters/netlist_exporter_pspice.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 2d3d5c4519..8c5198f7bb 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -134,7 +134,7 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* aFormatter, unsigned aCtl
     // Print out all directives found in the text fields on the schematics
     writeDirectives( aFormatter, aCtl );
 
-    aFormatter->Print( -1, ".end\n" );
+    aFormatter->Print( 0, ".end\n" );
 
     return true;
 }

From 27a7a9b1a5eb82fa911d1d68304efea33b15aa5c Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:51 +0200
Subject: [PATCH 111/197] Spice fields enum values renamed from SPICE_* to SF_*

---
 eeschema/dialogs/dialog_spice_model.cpp       | 60 +++++++++----------
 .../netlist_exporter_pspice.cpp               | 29 ++++-----
 .../netlist_exporter_pspice.h                 | 12 ++--
 eeschema/sim/sim_plot_frame.cpp               |  4 +-
 eeschema/widgets/tuner_slider.cpp             |  2 +-
 5 files changed, 50 insertions(+), 57 deletions(-)

diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp
index 6b3483b569..e2692334d1 100644
--- a/eeschema/dialogs/dialog_spice_model.cpp
+++ b/eeschema/dialogs/dialog_spice_model.cpp
@@ -76,9 +76,9 @@ bool DIALOG_SPICE_MODEL::TransferDataFromWindow()
     {
         switch( m_pasType->GetSelection() )
         {
-            case 0: m_fieldsTmp[SPICE_PRIMITIVE] = (char) SP_RESISTOR; break;
-            case 1: m_fieldsTmp[SPICE_PRIMITIVE] = (char) SP_CAPACITOR; break;
-            case 2: m_fieldsTmp[SPICE_PRIMITIVE] = (char) SP_INDUCTOR; break;
+            case 0: m_fieldsTmp[SF_PRIMITIVE] = (char) SP_RESISTOR; break;
+            case 1: m_fieldsTmp[SF_PRIMITIVE] = (char) SP_CAPACITOR; break;
+            case 2: m_fieldsTmp[SF_PRIMITIVE] = (char) SP_INDUCTOR; break;
 
             default:
                 wxASSERT_MSG( false, "Unhandled passive type" );
@@ -86,7 +86,7 @@ bool DIALOG_SPICE_MODEL::TransferDataFromWindow()
                 break;
         }
 
-        m_fieldsTmp[SPICE_MODEL] = m_pasValue->GetValue();
+        m_fieldsTmp[SF_MODEL] = m_pasValue->GetValue();
     }
 
 
@@ -95,9 +95,9 @@ bool DIALOG_SPICE_MODEL::TransferDataFromWindow()
     {
         switch( m_semiType->GetSelection() )
         {
-            case 0: m_fieldsTmp[SPICE_PRIMITIVE] = (char) SP_DIODE; break;
-            case 1: m_fieldsTmp[SPICE_PRIMITIVE] = (char) SP_BJT; break;
-            case 2: m_fieldsTmp[SPICE_PRIMITIVE] = (char) SP_MOSFET; break;
+            case 0: m_fieldsTmp[SF_PRIMITIVE] = (char) SP_DIODE; break;
+            case 1: m_fieldsTmp[SF_PRIMITIVE] = (char) SP_BJT; break;
+            case 2: m_fieldsTmp[SF_PRIMITIVE] = (char) SP_MOSFET; break;
 
             default:
                 wxASSERT_MSG( false, "Unhandled semiconductor type" );
@@ -105,21 +105,21 @@ bool DIALOG_SPICE_MODEL::TransferDataFromWindow()
                 break;
         }
 
-        m_fieldsTmp[SPICE_MODEL] = m_semiModel->GetValue();
+        m_fieldsTmp[SF_MODEL] = m_semiModel->GetValue();
 
         if( !empty( m_semiLib ) )
-            m_fieldsTmp[SPICE_LIB_FILE] = m_semiLib->GetValue();
+            m_fieldsTmp[SF_LIB_FILE] = m_semiLib->GetValue();
     }
 
 
     // Integrated circuit
     else if( page == m_ic )
     {
-        m_fieldsTmp[SPICE_PRIMITIVE] = (char) SP_SUBCKT;
-        m_fieldsTmp[SPICE_MODEL] = m_icModel->GetValue();
+        m_fieldsTmp[SF_PRIMITIVE] = (char) SP_SUBCKT;
+        m_fieldsTmp[SF_MODEL] = m_icModel->GetValue();
 
         if( !empty( m_icLib ) )
-            m_fieldsTmp[SPICE_LIB_FILE] = m_icLib->GetValue();
+            m_fieldsTmp[SF_LIB_FILE] = m_icLib->GetValue();
     }
 
 
@@ -131,8 +131,8 @@ bool DIALOG_SPICE_MODEL::TransferDataFromWindow()
         if( !generatePowerSource( model ) )
             return false;
 
-        m_fieldsTmp[SPICE_PRIMITIVE] = (char)( m_pwrType->GetSelection() ? SP_ISOURCE : SP_VSOURCE );
-        m_fieldsTmp[SPICE_MODEL] = model;
+        m_fieldsTmp[SF_PRIMITIVE] = (char)( m_pwrType->GetSelection() ? SP_ISOURCE : SP_VSOURCE );
+        m_fieldsTmp[SF_MODEL] = model;
     }
 
 
@@ -142,11 +142,11 @@ bool DIALOG_SPICE_MODEL::TransferDataFromWindow()
         return false;
     }
 
-    m_fieldsTmp[SPICE_ENABLED] = !m_disabled->GetValue() ? "Y" : "N";        // note bool inversion
-    m_fieldsTmp[SPICE_NODE_SEQUENCE] = m_nodeSeqCheck->IsChecked() ? m_nodeSeqVal->GetValue() : "";
+    m_fieldsTmp[SF_ENABLED] = !m_disabled->GetValue() ? "Y" : "N";        // note bool inversion
+    m_fieldsTmp[SF_NODE_SEQUENCE] = m_nodeSeqCheck->IsChecked() ? m_nodeSeqVal->GetValue() : "";
 
     // Apply the settings
-    for( int i = 0; i < SPICE_FIELD_END; ++i )
+    for( int i = 0; i < SF_END; ++i )
     {
         if( m_fieldsTmp.count( (SPICE_FIELD) i ) > 0 && !m_fieldsTmp.at( i ).IsEmpty() )
         {
@@ -192,7 +192,7 @@ bool DIALOG_SPICE_MODEL::TransferDataToWindow()
     }
 
     // Analyze the component fields to fill out the dialog
-    char primitive = toupper( m_fieldsTmp[SPICE_PRIMITIVE][0] );
+    char primitive = toupper( m_fieldsTmp[SF_PRIMITIVE][0] );
 
     switch( primitive )
     {
@@ -204,7 +204,7 @@ bool DIALOG_SPICE_MODEL::TransferDataToWindow()
                     : primitive == SP_CAPACITOR ? 1
                     : primitive == SP_INDUCTOR ? 2
                     : -1 );
-            m_pasValue->SetValue( m_fieldsTmp[SPICE_MODEL] );
+            m_pasValue->SetValue( m_fieldsTmp[SF_MODEL] );
             break;
 
         case SP_DIODE:
@@ -215,33 +215,33 @@ bool DIALOG_SPICE_MODEL::TransferDataToWindow()
                     : primitive == SP_BJT ? 1
                     : primitive == SP_MOSFET ? 2
                     : -1 );
-            m_semiModel->SetValue( m_fieldsTmp[SPICE_MODEL] );
-            m_semiLib->SetValue( m_fieldsTmp[SPICE_LIB_FILE] );
+            m_semiModel->SetValue( m_fieldsTmp[SF_MODEL] );
+            m_semiLib->SetValue( m_fieldsTmp[SF_LIB_FILE] );
 
             if( !empty( m_semiLib ) )
             {
                 const wxString& libFile = m_semiLib->GetValue();
-                m_fieldsTmp[SPICE_LIB_FILE] = libFile;
+                m_fieldsTmp[SF_LIB_FILE] = libFile;
                 updateFromFile( m_semiModel, libFile, "model" );
             }
             break;
 
         case SP_SUBCKT:
             m_notebook->SetSelection( m_notebook->FindPage( m_ic ) );
-            m_icModel->SetValue( m_fieldsTmp[SPICE_MODEL] );
-            m_icLib->SetValue( m_fieldsTmp[SPICE_LIB_FILE] );
+            m_icModel->SetValue( m_fieldsTmp[SF_MODEL] );
+            m_icLib->SetValue( m_fieldsTmp[SF_LIB_FILE] );
 
             if( !empty( m_icLib ) )
             {
                 const wxString& libFile = m_icLib->GetValue();
-                m_fieldsTmp[SPICE_LIB_FILE] = libFile;
+                m_fieldsTmp[SF_LIB_FILE] = libFile;
                 updateFromFile( m_icModel, libFile, "subckt" );
             }
             break;
 
         case SP_VSOURCE:
         case SP_ISOURCE:
-            if( !parsePowerSource( m_fieldsTmp[SPICE_MODEL] ) )
+            if( !parsePowerSource( m_fieldsTmp[SF_MODEL] ) )
                 return false;
 
             m_notebook->SetSelection( m_notebook->FindPage( m_power ) );
@@ -253,14 +253,14 @@ bool DIALOG_SPICE_MODEL::TransferDataToWindow()
             break;
     }
 
-    m_disabled->SetValue( !NETLIST_EXPORTER_PSPICE::StringToBool( m_fieldsTmp[SPICE_ENABLED] ) );
+    m_disabled->SetValue( !NETLIST_EXPORTER_PSPICE::StringToBool( m_fieldsTmp[SF_ENABLED] ) );
 
     // Check if node sequence is different than the default one
-    if( m_fieldsTmp[SPICE_NODE_SEQUENCE]
-            != NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( SPICE_NODE_SEQUENCE, &m_component, 0 ) )
+    if( m_fieldsTmp[SF_NODE_SEQUENCE]
+            != NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( SF_NODE_SEQUENCE, &m_component, 0 ) )
     {
         m_nodeSeqCheck->SetValue( true );
-        m_nodeSeqVal->SetValue( m_fieldsTmp[SPICE_NODE_SEQUENCE] );
+        m_nodeSeqVal->SetValue( m_fieldsTmp[SF_NODE_SEQUENCE] );
     }
 
     return DIALOG_SPICE_MODEL_BASE::TransferDataToWindow();
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 8c5198f7bb..0965658443 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -144,7 +144,7 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceField( SPICE_FIELD aField,
         SCH_COMPONENT* aComponent, unsigned aCtl )
 {
     SCH_FIELD* field = aComponent->FindField( GetSpiceFieldName( aField ) );
-    return field ? field->GetText() : GetSpiceFieldDefVal( SPICE_PRIMITIVE, aComponent, aCtl );
+    return field ? field->GetText() : GetSpiceFieldDefVal( SF_PRIMITIVE, aComponent, aCtl );
 }
 
 
@@ -153,7 +153,7 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( SPICE_FIELD aField,
 {
     switch( aField )
     {
-    case SPICE_PRIMITIVE:
+    case SF_PRIMITIVE:
     {
         const wxString& refName = aComponent->GetField( REFERENCE )->GetText();
 
@@ -165,7 +165,7 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( SPICE_FIELD aField,
         break;
     }
 
-    case SPICE_MODEL:
+    case SF_MODEL:
     {
         wxChar prim = aComponent->GetField( REFERENCE )->GetText().GetChar( 0 );
         wxString value = aComponent->GetField( VALUE )->GetText();
@@ -199,11 +199,11 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( SPICE_FIELD aField,
         break;
     }
 
-    case SPICE_ENABLED:
+    case SF_ENABLED:
         return wxString( "Y" );
         break;
 
-    case SPICE_NODE_SEQUENCE:
+    case SF_NODE_SEQUENCE:
     {
         wxString nodeSeq;
         std::vector<LIB_PIN*> pins;
@@ -219,7 +219,7 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( SPICE_FIELD aField,
         break;
     }
 
-    case SPICE_LIB_FILE:
+    case SF_LIB_FILE:
         // There is no default Spice library
         return wxEmptyString;
         break;
@@ -268,22 +268,15 @@ void NETLIST_EXPORTER_PSPICE::ProcessNetlist( unsigned aCtl )
             spiceItem.m_parent = comp;
 
             // Obtain Spice fields
-            SCH_FIELD* fieldPrim = comp->FindField( GetSpiceFieldName( SPICE_PRIMITIVE ) );
-            SCH_FIELD* fieldModel = comp->FindField( GetSpiceFieldName( SPICE_MODEL ) );
-            SCH_FIELD* fieldEnabled = comp->FindField( GetSpiceFieldName( SPICE_ENABLED ) );
-            SCH_FIELD* fieldLibFile = comp->FindField( GetSpiceFieldName( SPICE_LIB_FILE ) );
-            SCH_FIELD* fieldSeq = comp->FindField( GetSpiceFieldName( SPICE_NODE_SEQUENCE ) );
-
-            spiceItem.m_primitive = fieldPrim ? fieldPrim->GetText()[0]
-                : GetSpiceFieldDefVal( SPICE_PRIMITIVE, comp, aCtl )[0];
-
-            spiceItem.m_model = fieldModel ? fieldModel->GetText()
-                : GetSpiceFieldDefVal( SPICE_MODEL, comp, aCtl );
+            SCH_FIELD* fieldLibFile = comp->FindField( GetSpiceFieldName( SF_LIB_FILE ) );
+            SCH_FIELD* fieldSeq = comp->FindField( GetSpiceFieldName( SF_NODE_SEQUENCE ) );
 
+            spiceItem.m_primitive = GetSpiceField( SF_PRIMITIVE, comp, aCtl )[0];
+            spiceItem.m_model = GetSpiceField( SF_MODEL, comp, aCtl );
             spiceItem.m_refName = comp->GetRef( &sheetList[sheet_idx] );
 
             // Check to see if component should be removed from Spice netlist
-            spiceItem.m_enabled = fieldEnabled ? StringToBool( fieldEnabled->GetText() ) : true;
+            spiceItem.m_enabled = StringToBool( GetSpiceField( SF_ENABLED, comp, aCtl ) );
 
             if( fieldLibFile && !fieldLibFile->GetText().IsEmpty() )
                 m_libraries.insert( fieldLibFile->GetText() );
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index e678079d01..d0407912fc 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -41,12 +41,12 @@ enum SPICE_NETLIST_OPTIONS {
 };
 
 enum SPICE_FIELD {
-    SPICE_PRIMITIVE,
-    SPICE_MODEL,
-    SPICE_ENABLED,
-    SPICE_NODE_SEQUENCE,
-    SPICE_LIB_FILE,
-    SPICE_FIELD_END     // sentinel
+    SF_PRIMITIVE,
+    SF_MODEL,
+    SF_ENABLED,
+    SF_NODE_SEQUENCE,
+    SF_LIB_FILE,
+    SF_END     // sentinel
 };
 
 enum SPICE_PRIMITIVE {
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index d605c50278..15d5ec9ecf 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -189,7 +189,7 @@ void SIM_PLOT_FRAME::AddTuner( SCH_COMPONENT* aComponent )
         return;
 
     // For now limit the tuner tool to RLC components
-    char primitiveType = NETLIST_EXPORTER_PSPICE::GetSpiceField( SPICE_PRIMITIVE, aComponent, 0 )[0];
+    char primitiveType = NETLIST_EXPORTER_PSPICE::GetSpiceField( SF_PRIMITIVE, aComponent, 0 )[0];
 
     if( primitiveType != SP_RESISTOR && primitiveType != SP_CAPACITOR && primitiveType != SP_INDUCTOR )
         return;
@@ -247,7 +247,7 @@ void SIM_PLOT_FRAME::updateNetlistExporter()
 }
 
 
-bool SIM_PLOT_FRAME::updatePlot( const wxString& aSpiceName, const wxString& aName, SIM_PLOT_PANEL* aPanel )
+bool SIM_PLOT_FRAME::updatePlot( const wxString& aName, SIM_PLOT_TYPE aType, SIM_PLOT_PANEL* aPanel )
 {
     if( !m_simulator )
         return false;
diff --git a/eeschema/widgets/tuner_slider.cpp b/eeschema/widgets/tuner_slider.cpp
index cdfdc3d357..d177d5b791 100644
--- a/eeschema/widgets/tuner_slider.cpp
+++ b/eeschema/widgets/tuner_slider.cpp
@@ -39,7 +39,7 @@ TUNER_SLIDER::TUNER_SLIDER( SIM_PLOT_FRAME* aParent, SCH_COMPONENT* aComponent )
     m_changed = false;
 
     // Generate Spice component name
-    char prim = NETLIST_EXPORTER_PSPICE::GetSpiceField( SPICE_PRIMITIVE, aComponent, 0 )[0];
+    char prim = NETLIST_EXPORTER_PSPICE::GetSpiceField( SF_PRIMITIVE, aComponent, 0 )[0];
     m_spiceName = wxString( prim + compName ).Lower();
 
     // Call Set*() methods to update fields and slider

From caef84d62219c8f8bb93c59bce3aba23b35703b0 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:51 +0200
Subject: [PATCH 112/197] SPICE_SIMULATOR::GetXAxis()

---
 eeschema/sim/ngspice.cpp       | 25 +++++++++++++++++++++++++
 eeschema/sim/ngspice.h         |  1 +
 eeschema/sim/sim_types.h       | 13 +++++++++++++
 eeschema/sim/spice_simulator.h |  5 +++++
 4 files changed, 44 insertions(+)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index f05d17a9dd..6ca4f8c118 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -248,6 +248,31 @@ bool NGSPICE::Command( const string& aCmd )
 }
 
 
+string NGSPICE::GetXAxis( SIM_TYPE aType ) const
+{
+    switch( aType )
+    {
+        case ST_AC:
+        case ST_NOISE:
+            return string( "frequency" );
+            break;
+
+        case ST_DC:
+            return string( "v-sweep" );
+            break;
+
+        case ST_TRANSIENT:
+            return string( "time" );
+            break;
+
+        default:
+            break;
+    }
+
+    return string( "" );
+}
+
+
 void NGSPICE::dump()
 {
 //    m_ngSpice_Command("run\n");
diff --git a/eeschema/sim/ngspice.h b/eeschema/sim/ngspice.h
index 975b62210d..0a38e25931 100644
--- a/eeschema/sim/ngspice.h
+++ b/eeschema/sim/ngspice.h
@@ -42,6 +42,7 @@ public:
     bool Stop() override;
     bool IsRunning() override;
     bool Command( const std::string& aCmd ) override;
+    std::string GetXAxis( SIM_TYPE aType ) const override;
 
     std::vector<COMPLEX> GetPlot( const std::string& aName, int aMaxLen = -1 ) override;
     std::vector<double> GetRealPlot( const std::string& aName, int aMaxLen = -1 ) override;
diff --git a/eeschema/sim/sim_types.h b/eeschema/sim/sim_types.h
index 887eef887c..5a37278623 100644
--- a/eeschema/sim/sim_types.h
+++ b/eeschema/sim/sim_types.h
@@ -31,4 +31,17 @@ enum SIM_TYPE {
     ST_POLE_ZERO, ST_SENSITIVITY, ST_TRANS_FUNC, ST_TRANSIENT
 };
 
+///> Possible plot types
+enum SIM_PLOT_TYPE {
+    // Y axis
+    SPT_VOLTAGE     = 0x01,
+    SPT_CURRENT     = 0x02,
+    SPT_AC_PHASE    = 0x04,
+    SPT_AC_MAG      = 0x08,
+
+    SPT_TIME        = 0x10,
+    SPT_FREQUENCY   = 0x20,
+    SPT_SWEEP       = 0x40
+};
+
 #endif /* SIM_TYPES_H */
diff --git a/eeschema/sim/spice_simulator.h b/eeschema/sim/spice_simulator.h
index 611a954c23..1231e042e1 100644
--- a/eeschema/sim/spice_simulator.h
+++ b/eeschema/sim/spice_simulator.h
@@ -25,6 +25,8 @@
 #ifndef SPICE_SIMULATOR_H
 #define SPICE_SIMULATOR_H
 
+#include "sim_types.h"
+
 #include <string>
 #include <vector>
 #include <complex>
@@ -48,6 +50,9 @@ public:
     virtual bool IsRunning() = 0;
     virtual bool Command( const std::string& aCmd ) = 0;
 
+    ///> Returns X axis name for a given simulation type
+    virtual std::string GetXAxis( SIM_TYPE aType ) const = 0;
+
     virtual void SetReporter( SPICE_REPORTER* aReporter )
     {
         m_reporter = aReporter;

From 6e05d1656b897681475585318f337c7d6df44d21 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:51 +0200
Subject: [PATCH 113/197] Bugfix for NETLIST_EXPORTER_PSPICE::GetSpiceField()

---
 eeschema/netlist_exporters/netlist_exporter_pspice.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 0965658443..d8f96d097a 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -144,7 +144,7 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceField( SPICE_FIELD aField,
         SCH_COMPONENT* aComponent, unsigned aCtl )
 {
     SCH_FIELD* field = aComponent->FindField( GetSpiceFieldName( aField ) );
-    return field ? field->GetText() : GetSpiceFieldDefVal( SF_PRIMITIVE, aComponent, aCtl );
+    return field ? field->GetText() : GetSpiceFieldDefVal( aField, aComponent, aCtl );
 }
 
 

From 0f993ba98cbd2076de1089081a6688b4ed0c4884 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:52 +0200
Subject: [PATCH 114/197] Current probing

---
 eeschema/dialogs/dialog_signal_list.cpp      |  33 ++-
 eeschema/sim/netlist_exporter_pspice_sim.cpp | 117 ++++++++-
 eeschema/sim/netlist_exporter_pspice_sim.h   |  26 ++
 eeschema/sim/sim_plot_frame.cpp              | 243 +++++++++++--------
 eeschema/sim/sim_plot_frame.h                |  91 ++++++-
 eeschema/sim/sim_plot_panel.cpp              |  67 +----
 eeschema/sim/sim_plot_panel.h                |  69 +-----
 7 files changed, 414 insertions(+), 232 deletions(-)

diff --git a/eeschema/dialogs/dialog_signal_list.cpp b/eeschema/dialogs/dialog_signal_list.cpp
index 6b1ff2cc02..90d7b8d9b0 100644
--- a/eeschema/dialogs/dialog_signal_list.cpp
+++ b/eeschema/dialogs/dialog_signal_list.cpp
@@ -52,10 +52,21 @@ bool DIALOG_SIGNAL_LIST::TransferDataToWindow()
 
     if( m_exporter )
     {
+        // Voltage list
         for( const auto& net : m_exporter->GetNetIndexMap() )
         {
             if( net.first != "GND" )
-                m_signals->Append( net.first );
+                m_signals->Append( wxString::Format( "V(%s)", net.first ) );
+        }
+
+        for( const auto& item : m_exporter->GetSpiceItems() )
+        {
+            // Add all possible currents for the primitive
+            for( const auto& current :
+                    NETLIST_EXPORTER_PSPICE_SIM::GetCurrents( (SPICE_PRIMITIVE) item.m_primitive ) )
+            {
+                m_signals->Append( wxString::Format( "%s(%s)", current, item.m_refName ) );
+            }
         }
     }
 
@@ -68,6 +79,24 @@ void DIALOG_SIGNAL_LIST::addSelectionToPlotFrame()
     for( unsigned int i = 0; i < m_signals->GetCount(); ++i )
     {
         if( m_signals->IsSelected( i ) )
-            m_plotFrame->AddVoltagePlot( m_signals->GetString( i ) );
+        {
+            const wxString& plotName = m_signals->GetString( i );
+
+            // Get the part in the parentheses
+            wxString name = plotName.AfterFirst( '(' ).BeforeLast( ')' );
+
+            if( plotName[0] == 'V' )
+            {
+                m_plotFrame->AddVoltagePlot( name );
+            }
+            else if( plotName[0] == 'I' )
+            {
+                m_plotFrame->AddCurrentPlot( name, plotName.BeforeFirst( '(' ) );
+            }
+            else
+            {
+                wxASSERT_MSG( false, "Unhandled plot type" );
+            }
+        }
     }
 }
diff --git a/eeschema/sim/netlist_exporter_pspice_sim.cpp b/eeschema/sim/netlist_exporter_pspice_sim.cpp
index a317fefe87..e75f9edb94 100644
--- a/eeschema/sim/netlist_exporter_pspice_sim.cpp
+++ b/eeschema/sim/netlist_exporter_pspice_sim.cpp
@@ -23,7 +23,84 @@
  */
 
 #include "netlist_exporter_pspice_sim.h"
-#include "sim_types.h"
+
+wxString NETLIST_EXPORTER_PSPICE_SIM::GetSpiceVector( const wxString& aName, SIM_PLOT_TYPE aType,
+        const wxString& aParam ) const
+{
+    wxString res;
+
+    // Some of the flags should exclude mutually
+    assert( ( ( aType & SPT_VOLTAGE ) == 0 ) != ( ( aType & SPT_CURRENT ) == 0 ) );
+    assert( ( ( aType & SPT_AC_PHASE ) == 0 ) || ( ( aType & SPT_AC_MAG ) == 0 ) );
+
+    if( aType & SPT_VOLTAGE )
+    {
+        const auto& netMapping = GetNetIndexMap();
+        auto it = netMapping.find( aName );
+
+        if( it == netMapping.end() )
+            return "";
+
+        return wxString::Format( "v(%d)", it->second );
+    }
+
+
+    /// @todo check is Lower() is required
+    else if( aType & SPT_CURRENT )
+    {
+        return wxString::Format( "@%s[%s]", GetSpiceDevice( aName ).Lower(),
+                aParam.IsEmpty() ? "i" : aParam.Lower() );
+    }
+
+    return res;
+}
+
+
+const std::vector<wxString>& NETLIST_EXPORTER_PSPICE_SIM::GetCurrents( SPICE_PRIMITIVE aPrimitive )
+{
+    static const std::vector<wxString> passive = { "I" };
+    static const std::vector<wxString> diode = { "Id" };
+    static const std::vector<wxString> bjt = { "Ib", "Ic", "Ie" };
+    static const std::vector<wxString> mos = { "Ig", "Id", "Is" };
+    static const std::vector<wxString> empty;
+
+    switch( aPrimitive )
+    {
+        case SP_RESISTOR:
+        case SP_CAPACITOR:
+        case SP_INDUCTOR:
+        case SP_VSOURCE:
+            return passive;
+
+        case SP_DIODE:
+            return diode;
+
+        case SP_BJT:
+            return bjt;
+
+        case SP_MOSFET:
+            return mos;
+
+        default:
+            return empty;
+    }
+}
+
+
+wxString NETLIST_EXPORTER_PSPICE_SIM::GetSpiceDevice( const wxString& aComponent ) const
+{
+    const auto& spiceItems = GetSpiceItems();
+
+    auto it = std::find_if( spiceItems.begin(), spiceItems.end(), [&]( const SPICE_ITEM& item ) {
+        return item.m_refName == aComponent;
+    } );
+
+    if( it == spiceItems.end() )
+        return wxEmptyString;
+
+    return wxString( it->m_primitive + it->m_refName );
+}
+
 
 wxString NETLIST_EXPORTER_PSPICE_SIM::GetSheetSimCommand()
 {
@@ -68,19 +145,43 @@ SIM_TYPE NETLIST_EXPORTER_PSPICE_SIM::CommandToSimType( const wxString& aCmd )
 
 void NETLIST_EXPORTER_PSPICE_SIM::writeDirectives( OUTPUTFORMATTER* aFormatter, unsigned aCtl ) const
 {
+    // Add a directive to obtain currents
+    //aFormatter->Print( 0, ".options savecurrents\n" );        // does not work :(
+
+    for( const auto& item : GetSpiceItems() )
+    {
+        for( const auto& current :
+                NETLIST_EXPORTER_PSPICE_SIM::GetCurrents( (SPICE_PRIMITIVE) item.m_primitive ) )
+        {
+            /// @todo is it required to switch to lowercase
+            aFormatter->Print( 0, ".save %s\n",
+                    (const char*) GetSpiceVector( item.m_refName, SPT_CURRENT, current ).c_str() );
+        }
+    }
+
+    // If we print out .save directives for currents, then it needs to be done for voltages as well
+    for( const auto& netMap : GetNetIndexMap() )
+    {
+        aFormatter->Print( 0, ".save %s\n",
+                (const char*) GetSpiceVector( netMap.first, SPT_VOLTAGE ).c_str() );
+    }
+
     if( m_simCommand.IsEmpty() )
     {
         // Fallback to the default behavior and just write all directives
         NETLIST_EXPORTER_PSPICE::writeDirectives( aFormatter, aCtl );
     }
-
-    // Dump all directives, but simulation commands
-    for( const auto& dir : GetDirectives() )
+    else
     {
-        if( !IsSimCommand( dir ) )
-            aFormatter->Print( 0, "%s\n", (const char*) dir.c_str() );
+        // Dump all directives but simulation commands
+        for( const auto& dir : GetDirectives() )
+        {
+            if( !IsSimCommand( dir ) )
+                aFormatter->Print( 0, "%s\n", (const char*) dir.c_str() );
+        }
+
+        // Finish with our custom simulation command
+        aFormatter->Print( 0, "%s\n", (const char*) m_simCommand.c_str() );
     }
 
-    // Finish with our custom simulation command
-    aFormatter->Print( 0, "%s\n", (const char*) m_simCommand.c_str() );
 }
diff --git a/eeschema/sim/netlist_exporter_pspice_sim.h b/eeschema/sim/netlist_exporter_pspice_sim.h
index 27cb0e8369..6cd76c81d7 100644
--- a/eeschema/sim/netlist_exporter_pspice_sim.h
+++ b/eeschema/sim/netlist_exporter_pspice_sim.h
@@ -26,6 +26,8 @@
 #define NETLIST_EXPORTER_PSPICE_SIM_H
 
 #include <netlist_exporters/netlist_exporter_pspice.h>
+#include <vector>
+
 #include "sim_types.h"
 
 /// Special netlist exporter flavor that allows to override simulation commands
@@ -38,6 +40,30 @@ public:
     {
     }
 
+    /**
+     * @brief Returns name of Spice dataset for a specific plot.
+     * @param aName is name of the measured net or device
+     * @param aType describes the type of expected plot
+     * @param aParam is an optional parameter for devices, if absent it will return current (only
+     * for passive devices).
+     * @return Empty string if query is invalid, otherwise a plot name that
+     * can be requested from the simulator.
+     */
+    wxString GetSpiceVector( const wxString& aName, SIM_PLOT_TYPE aType,
+            const wxString& aParam = wxEmptyString ) const;
+
+    /**
+     * @brief Returns name of Spice device corresponding to a schematic component.
+     * @param aComponent is the component reference.
+     * @return Spice device name or empty string if there is no such component in the netlist.
+     */
+    wxString GetSpiceDevice( const wxString& aComponent ) const;
+
+    /**
+     * @brief Returns a list of currents that can be probed in a Spice primitive.
+     */
+    static const std::vector<wxString>& GetCurrents( SPICE_PRIMITIVE aPrimitive );
+
     void SetSimCommand( const wxString& aCmd )
     {
         m_simCommand = aCmd;
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 15d5ec9ecf..fd9646ee21 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -37,6 +37,13 @@
 #include "spice_simulator.h"
 #include "spice_reporter.h"
 
+SIM_PLOT_TYPE operator|( SIM_PLOT_TYPE aFirst, SIM_PLOT_TYPE aSecond )
+{
+    int res = (int) aFirst | (int) aSecond;
+
+    return (SIM_PLOT_TYPE) res;
+}
+
 class SIM_THREAD_REPORTER : public SPICE_REPORTER
 {
 public:
@@ -76,6 +83,23 @@ private:
 };
 
 
+TRACE_DESC::TRACE_DESC( const NETLIST_EXPORTER_PSPICE_SIM& aExporter, const wxString& aName,
+        SIM_PLOT_TYPE aType, const wxString& aParam )
+    : m_name( aName ), m_type( aType ), m_param( aParam )
+{
+    // Spice vector generation
+    m_spiceVector = aExporter.GetSpiceVector( aName, aType, aParam );
+
+    // Title generation
+    m_title = wxString::Format( "%s(%s)", aParam, aName );
+
+    if( aType & SPT_AC_MAG )
+        m_title += " (mag)";
+    else if( aType & SPT_AC_PHASE )
+        m_title += " (phase)";
+}
+
+
 SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     : SIM_PLOT_FRAME_BASE( aParent ), m_settingsDlg( this )
 {
@@ -157,27 +181,13 @@ SIM_PLOT_PANEL* SIM_PLOT_FRAME::NewPlotPanel( SIM_TYPE aSimType )
 
 void SIM_PLOT_FRAME::AddVoltagePlot( const wxString& aNetName )
 {
-    SIM_TYPE simType = m_exporter->GetSimType();
+    addPlot( aNetName, SPT_VOLTAGE, "V" );
+}
 
-    if( !SIM_PLOT_PANEL::IsPlottable( simType ) )
-        return; // TODO else write out in console?
 
-    int nodeNumber = getNodeNumber( aNetName );
-
-    if( nodeNumber >= -1 )
-    {
-        // Create a new plot if the current one displays a different type
-        SIM_PLOT_PANEL* plotPanel = CurrentPlot();
-
-        if( plotPanel == nullptr || plotPanel->GetType() != simType )
-            plotPanel = NewPlotPanel( simType );
-
-        if( updatePlot( wxString::Format( "V(%d)", nodeNumber ), aNetName, plotPanel ) )
-        {
-            updateSignalList();
-            plotPanel->Fit();
-        }
-    }
+void SIM_PLOT_FRAME::AddCurrentPlot( const wxString& aDeviceName, const wxString& aParam )
+{
+    addPlot( aDeviceName, SPT_CURRENT, aParam );
 }
 
 
@@ -195,7 +205,7 @@ void SIM_PLOT_FRAME::AddTuner( SCH_COMPONENT* aComponent )
         return;
 
     const wxString& componentName = aComponent->GetField( REFERENCE )->GetText();
-    auto& tunerList = m_tuners[plotPanel];
+    auto& tunerList = m_plots[plotPanel].m_tuners;
 
     // Do not add multiple instances for the same component
     auto tunerIt = std::find_if( tunerList.begin(), tunerList.end(), [&]( const TUNER_SLIDER* t )
@@ -228,7 +238,7 @@ void SIM_PLOT_FRAME::RemoveTuner( TUNER_SLIDER* aTuner )
     if( !plotPanel )
         return;
 
-    m_tuners[plotPanel].remove( aTuner );
+    m_plots[plotPanel].m_tuners.remove( aTuner );
     aTuner->Destroy();
     Layout();
 }
@@ -240,6 +250,45 @@ SIM_PLOT_PANEL* SIM_PLOT_FRAME::CurrentPlot() const
 }
 
 
+void SIM_PLOT_FRAME::addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const wxString& aParam )
+{
+    SIM_TYPE simType = m_exporter->GetSimType();
+
+    if( !SIM_PLOT_PANEL::IsPlottable( simType ) )
+        return; // TODO else write out in console?
+
+    // Create a new plot if the current one displays a different type
+    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
+
+    if( plotPanel == nullptr || plotPanel->GetType() != simType )
+        plotPanel = NewPlotPanel( simType );
+
+    TRACE_DESC descriptor( *m_exporter, aName, aType, aParam );
+
+    bool updated = false;
+
+    if( GetXAxisType( simType ) == SPT_FREQUENCY )
+    {
+        // Add two plots: magnitude & phase
+        TRACE_DESC mag_desc( *m_exporter, descriptor, descriptor.GetType() | SPT_AC_MAG );
+        TRACE_DESC phase_desc( *m_exporter, descriptor, descriptor.GetType() | SPT_AC_PHASE );
+
+        updated |= updatePlot( mag_desc, plotPanel );
+        updated |= updatePlot( phase_desc, plotPanel );
+    }
+    else
+    {
+        updated = updatePlot( descriptor, plotPanel );
+    }
+
+    if( updated )
+    {
+        updateSignalList();
+        plotPanel->Fit();
+    }
+}
+
+
 void SIM_PLOT_FRAME::updateNetlistExporter()
 {
     m_exporter.reset( new NETLIST_EXPORTER_PSPICE_SIM( m_schematicFrame->BuildNetListBase(),
@@ -247,65 +296,51 @@ void SIM_PLOT_FRAME::updateNetlistExporter()
 }
 
 
-bool SIM_PLOT_FRAME::updatePlot( const wxString& aName, SIM_PLOT_TYPE aType, SIM_PLOT_PANEL* aPanel )
+bool SIM_PLOT_FRAME::updatePlot( const TRACE_DESC& aDescriptor, SIM_PLOT_PANEL* aPanel )
 {
     if( !m_simulator )
         return false;
 
-    // First, handle the x axis
-    wxString xAxisName;
     SIM_TYPE simType = m_exporter->GetSimType();
+    wxString spiceVector = aDescriptor.GetSpiceVector();
 
     if( !SIM_PLOT_PANEL::IsPlottable( simType ) )
     {
         // There is no plot to be shown
-        m_simulator->Command( wxString::Format( "print %s", aSpiceName ).ToStdString() );
+        m_simulator->Command( wxString::Format( "print %s", spiceVector ).ToStdString() );
+
         return false;
     }
 
-    switch( simType )
-    {
-        /// @todo x axis names should be moved to simulator iface, so they are not hardcoded for ngspice
-        case ST_AC:
-        case ST_NOISE:
-            xAxisName = "frequency";
-            break;
+    // First, handle the x axis
+    wxString xAxisName( m_simulator->GetXAxis( simType ) );
 
-        case ST_DC:
-            xAxisName = "v-sweep";
-            break;
-
-        case ST_TRANSIENT:
-            xAxisName = "time";
-            break;
-
-        case ST_OP:
-            break;
-
-        default:
-            break;
-    }
+    if( xAxisName.IsEmpty() )
+        return false;
 
     auto data_x = m_simulator->GetMagPlot( (const char*) xAxisName.c_str() );
-    int size = data_x.size();
+    unsigned int size = data_x.size();
 
     if( data_x.empty() )
         return false;
 
+    SIM_PLOT_TYPE plotType = aDescriptor.GetType();
+    std::vector<double> data_y;
+
     // Now, Y axis data
     switch( m_exporter->GetSimType() )
     {
-        /// @todo x axis names should be moved to simulator iface
         case ST_AC:
         {
-            auto data_mag = m_simulator->GetMagPlot( (const char*) aSpiceName.c_str() );
-            auto data_phase = m_simulator->GetPhasePlot( (const char*) aSpiceName.c_str() );
+            wxASSERT_MSG( !( ( plotType & SPT_AC_MAG ) && ( plotType & SPT_AC_PHASE ) ),
+                    "Cannot set both AC_PHASE and AC_MAG bits" );
 
-            if( data_mag.empty() || data_phase.empty() )
-                return false;
-
-            aPanel->AddTrace( aSpiceName, aName, size, data_x.data(), data_mag.data(), SPF_AC_MAG );
-            aPanel->AddTrace( aSpiceName, aName, size, data_x.data(), data_phase.data(), SPF_AC_PHASE );
+            if( plotType & SPT_AC_MAG )
+                data_y = m_simulator->GetMagPlot( (const char*) spiceVector.c_str() );
+            else if( plotType & SPT_AC_PHASE )
+                data_y = m_simulator->GetPhasePlot( (const char*) spiceVector.c_str() );
+            else
+                wxASSERT_MSG( false, "Plot type missing AC_PHASE or AC_MAG bit" );
         }
         break;
 
@@ -313,12 +348,7 @@ bool SIM_PLOT_FRAME::updatePlot( const wxString& aName, SIM_PLOT_TYPE aType, SIM
         case ST_DC:
         case ST_TRANSIENT:
         {
-            auto data_y = m_simulator->GetMagPlot( (const char*) aSpiceName.c_str() );
-
-            if( data_y.empty() )
-                return false;
-
-            aPanel->AddTrace( aSpiceName, aName, size, data_x.data(), data_y.data(), 0 );
+            data_y = m_simulator->GetMagPlot( (const char*) spiceVector.c_str() );
         }
         break;
 
@@ -327,6 +357,15 @@ bool SIM_PLOT_FRAME::updatePlot( const wxString& aName, SIM_PLOT_TYPE aType, SIM
             return false;
     }
 
+    if( data_y.size() != size )
+        return false;
+
+    if( aPanel->AddTrace( aDescriptor.GetTitle(), size,
+                data_x.data(), data_y.data(), aDescriptor.GetType() ) )
+    {
+        m_plots[aPanel].m_traces.insert( std::make_pair( aDescriptor.GetTitle(), aDescriptor ) );
+    }
+
     return true;
 }
 
@@ -341,8 +380,8 @@ void SIM_PLOT_FRAME::updateSignalList()
     // Fill the signals listbox
     m_signals->Clear();
 
-    for( const auto& trace : plotPanel->GetTraces() )
-        m_signals->Append( trace.second->GetName() );
+    for( const auto& trace : m_plots[plotPanel].m_traces )
+        m_signals->Append( trace.first );
 }
 
 
@@ -358,7 +397,7 @@ void SIM_PLOT_FRAME::updateTuners()
 
     m_tuneSizer->Clear();
 
-    for( auto tuner : m_tuners[plotPanel] )
+    for( auto tuner : m_plots[plotPanel].m_tuners )
     {
         m_tuneSizer->Add( tuner );
         tuner->Show();
@@ -368,15 +407,23 @@ void SIM_PLOT_FRAME::updateTuners()
 }
 
 
-int SIM_PLOT_FRAME::getNodeNumber( const wxString& aNetName )
+SIM_PLOT_TYPE SIM_PLOT_FRAME::GetXAxisType( SIM_TYPE aType ) const
 {
-    const auto& netMapping = m_exporter->GetNetIndexMap();
-    auto it = netMapping.find( aNetName );
+    switch( aType )
+    {
+        case ST_AC:
+            return SPT_FREQUENCY;
 
-    if( it == netMapping.end() )
-        return -1;
+        case ST_DC:
+            return SPT_SWEEP;
 
-    return it->second;
+        case ST_TRANSIENT:
+            return SPT_TIME;
+
+        default:
+            wxASSERT_MSG( false, "Unhandled simulation type" );
+            return (SIM_PLOT_TYPE) 0;
+    }
 }
 
 
@@ -429,7 +476,7 @@ void SIM_PLOT_FRAME::menuSaveCsv( wxCommandEvent& event )
             timeWritten = true;
         }
 
-        out.Write( wxString::Format( "%s%c", t.first.GetDescription(), SEPARATOR ) );
+        out.Write( wxString::Format( "%s%c", t.first, SEPARATOR ) );
 
         for( double v : trace->GetDataY() )
             out.Write( wxString::Format( "%f%c", v, SEPARATOR ) );
@@ -515,14 +562,22 @@ void SIM_PLOT_FRAME::onSignalDblClick( wxCommandEvent& event )
 {
     // Remove signal from the plot on double click
     int idx = m_signals->GetSelection();
-    SIM_PLOT_PANEL* plot = CurrentPlot();
+    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
 
     if( idx != wxNOT_FOUND )
     {
-        const wxString& netName = m_signals->GetString( idx );
+        const wxString& plotName = m_signals->GetString( idx );
+        auto& traceMap = m_plots[plotPanel].m_traces;
+
+        auto traceIt = traceMap.find( plotName );
+        wxASSERT( traceIt != traceMap.end() );
+        traceMap.erase( traceIt );
+
+        wxASSERT( plotPanel->IsShown( plotName ) );
+        plotPanel->DeleteTrace( plotName );
+        plotPanel->Fit();
+
         m_signals->Delete( idx );
-        wxASSERT( plot->IsShown( netName ) );
-        plot->DeleteTrace( netName );
     }
 }
 
@@ -565,6 +620,14 @@ void SIM_PLOT_FRAME::onSettings( wxCommandEvent& event )
 
 void SIM_PLOT_FRAME::onAddSignal( wxCommandEvent& event )
 {
+    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
+
+    if( !plotPanel || !m_exporter || plotPanel->GetType() != m_exporter->GetSimType() )
+    {
+        DisplayInfoMessage( this, wxT( "You need to run simulation first" ) );
+        return;
+    }
+
     DIALOG_SIGNAL_LIST dialog( this, m_exporter.get() );
     dialog.ShowModal();
 }
@@ -612,7 +675,7 @@ void SIM_PLOT_FRAME::onCursorUpdate( wxCommandEvent& event )
         if( CURSOR* cursor = trace.second->GetCursor() )
         {
             const wxRealPoint coords = cursor->GetCoords();
-            long idx = m_cursors->InsertItem( SIGNAL_COL, trace.first.GetDescription() );
+            long idx = m_cursors->InsertItem( SIGNAL_COL, trace.first );
             m_cursors->SetItem( idx, X_COL, wxString::Format( "%f", coords.x ) );
             m_cursors->SetItem( idx, Y_COL, wxString::Format( "%f", coords.y ) );
         }
@@ -645,8 +708,8 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
     // If there are any signals plotted, update them
     if( SIM_PLOT_PANEL::IsPlottable( simType ) )
     {
-        for( const auto& trace : plotPanel->GetTraces() )
-            updatePlot( trace.second->GetSpiceName(), trace.first.GetName(), plotPanel );
+        for( const auto& trace : m_plots[plotPanel].m_traces )
+            updatePlot( trace.second, plotPanel );
 
         plotPanel->UpdateAll();
     }
@@ -676,7 +739,7 @@ void SIM_PLOT_FRAME::onSimUpdate( wxCommandEvent& aEvent )
     // Apply tuned values
     if( SIM_PLOT_PANEL* plotPanel = CurrentPlot() )
     {
-        for( auto tuner : m_tuners[plotPanel] )
+        for( auto tuner : m_plots[plotPanel].m_tuners )
         {
             /// @todo no ngspice hardcoding
             std::string command( "alter @" + tuner->GetSpiceName()
@@ -703,21 +766,14 @@ SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::SIGNAL_CONTEXT_MENU( const wxString& aSigna
 {
     SIM_PLOT_PANEL* plot = m_plotFrame->CurrentPlot();
 
-    if( plot->IsShown( m_signal ) )
-    {
-        Append( HIDE_SIGNAL, wxT( "Hide signal" ) );
+    Append( HIDE_SIGNAL, wxT( "Hide signal" ) );
 
-        TRACE* trace = plot->GetTrace( m_signal );
+    TRACE* trace = plot->GetTrace( m_signal );
 
-        if( trace->HasCursor() )
-            Append( HIDE_CURSOR, wxT( "Hide cursor" ) );
-        else
-            Append( SHOW_CURSOR, wxT( "Show cursor" ) );
-    }
+    if( trace->HasCursor() )
+        Append( HIDE_CURSOR, wxT( "Hide cursor" ) );
     else
-    {
-        Append( SHOW_SIGNAL, wxT( "Show signal" ) );
-    }
+        Append( SHOW_CURSOR, wxT( "Show cursor" ) );
 
     Connect( wxEVT_COMMAND_MENU_SELECTED, wxMenuEventHandler( SIGNAL_CONTEXT_MENU::onMenuEvent ), NULL, this );
 }
@@ -729,11 +785,6 @@ void SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::onMenuEvent( wxMenuEvent& aEvent )
 
     switch( aEvent.GetId() )
     {
-        case SHOW_SIGNAL:
-            m_plotFrame->AddVoltagePlot( m_signal );
-            break;
-
-            break;
         case HIDE_SIGNAL:
             plot->DeleteTrace( m_signal );
             break;
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 899a5d5bbe..7a2786ae92 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -49,6 +49,64 @@ class NETLIST_EXPORTER_PSPICE_SIM;
 class SIM_PLOT_PANEL;
 class TUNER_SLIDER;
 
+/// @todo description
+class TRACE_DESC
+{
+public:
+    TRACE_DESC( const NETLIST_EXPORTER_PSPICE_SIM& aExporter, const wxString& aName,
+            SIM_PLOT_TYPE aType, const wxString& aParam );
+
+    ///> Modifies an existing TRACE_DESC simulation type
+    TRACE_DESC( const NETLIST_EXPORTER_PSPICE_SIM& aExporter,
+            const TRACE_DESC& aDescription, SIM_PLOT_TYPE aNewType )
+        : TRACE_DESC( aExporter, aDescription.GetName(), aNewType, aDescription.GetParam() )
+    {
+    }
+
+    const wxString& GetTitle() const
+    {
+        return m_title;
+    }
+
+    const wxString& GetName() const
+    {
+        return m_name;
+    }
+
+    const wxString& GetParam() const
+    {
+        return m_param;
+    }
+
+    SIM_PLOT_TYPE GetType() const
+    {
+        return m_type;
+    }
+
+    const wxString& GetSpiceVector() const
+    {
+        return m_spiceVector;
+    }
+
+private:
+    // Three basic parameters
+    ///> Name of the measured net/device
+    wxString m_name;
+
+    ///> Type of the signal
+    SIM_PLOT_TYPE m_type;
+
+    ///> Name of the signal parameter
+    wxString m_param;
+
+    // Generated data
+    ///> Title displayed in the signal list/plot legend
+    wxString m_title;
+
+    ///> Spice vector name
+    wxString m_spiceVector;
+};
+
 /** Implementing SIM_PLOT_FRAME_BASE */
 class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
 {
@@ -70,26 +128,28 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         SIM_PLOT_PANEL* NewPlotPanel( SIM_TYPE aSimType );
 
         void AddVoltagePlot( const wxString& aNetName );
+        void AddCurrentPlot( const wxString& aDeviceName, const wxString& aParam );
 
         void AddTuner( SCH_COMPONENT* aComponent );
-
         void RemoveTuner( TUNER_SLIDER* aTuner );
 
         SIM_PLOT_PANEL* CurrentPlot() const;
 
     private:
+        void addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const wxString& aParam );
+
         void updateNetlistExporter();
 
         /**
          * @brief Updates plot in a particular SIM_PLOT_PANEL. If the panel does not contain
          * the plot, it will be added.
-         * @param aSpiceName is the plot name in the format accepted by the current simulator instance
-         * (for NGSPICE it is e.g. "V(1)").
-         * @param aName is the name used in the legend.
+         * @param aName is the net/device name.
+         * @param aType is the plot type (@see SIM_PLOT_TYPES).
          * @param aPanel is the panel that should receive the update.
          * @return True if a plot was successfully added/updated.
+         * TODO update description
          */
-        bool updatePlot( const wxString& aSpiceName, const wxString& aName, SIM_PLOT_PANEL* aPanel );
+        bool updatePlot( const TRACE_DESC& aDescriptor, SIM_PLOT_PANEL* aPanel );
 
         /**
          * @brief Updates the list of currently plotted signals.
@@ -101,12 +161,7 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
          */
         void updateTuners();
 
-        /**
-         * @brief Returns node number for a given net.
-         * @param aNetName is the net number.
-         * @return Corresponding net number or -1 if there is no such net.
-         */
-        int getNodeNumber( const wxString& aNetName );
+        SIM_PLOT_TYPE GetXAxisType( SIM_TYPE aType ) const;
 
         // Menu handlers
         void menuNewPlot( wxCommandEvent& aEvent ) override;
@@ -151,7 +206,17 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         SCH_EDIT_FRAME* m_schematicFrame;
         std::unique_ptr<NETLIST_EXPORTER_PSPICE_SIM> m_exporter;
         std::unique_ptr<SPICE_SIMULATOR> m_simulator;
-        std::map<SIM_PLOT_PANEL*, std::list<TUNER_SLIDER*> > m_tuners;
+
+        typedef std::map<wxString, TRACE_DESC> TRACE_MAP;
+        typedef std::list<TUNER_SLIDER*> TUNER_LIST;
+
+        struct PLOT_INFO
+        {
+            TUNER_LIST m_tuners;
+            TRACE_MAP m_traces;
+        };
+
+        std::map<SIM_PLOT_PANEL*, PLOT_INFO> m_plots;
 
         // Trick to preserve settings between runs
         DIALOG_SIM_SETTINGS m_settingsDlg;
@@ -170,12 +235,12 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
 
                 enum SIGNAL_CONTEXT_MENU_EVENTS
                 {
-                    SHOW_SIGNAL,
                     HIDE_SIGNAL,
                     SHOW_CURSOR,
                     HIDE_CURSOR
                 };
         };
+
 };
 
 // Commands
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 2c9cecd8df..df41726190 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -237,44 +237,6 @@ void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
 }
 
 
-TRACE_DESC::TRACE_DESC( const wxString& aDescription )
-    : m_name( aDescription )
-{
-    for( const auto& desc : m_descMap )
-    {
-        if( m_name.EndsWith( desc.second ) )
-        {
-            m_type = desc.first;
-            m_name.Replace( desc.second, "" );
-        }
-    }
-}
-
-
-wxString TRACE_DESC::GetDescription() const
-{
-    wxString res( m_name );
-
-    for( const auto& desc : m_descMap )
-    {
-        if( m_type == desc.first )
-        {
-            res += desc.second;
-            break;
-        }
-    }
-
-    return res;
-}
-
-
-const std::map<SIM_PLOT_FLAGS, wxString> TRACE_DESC::m_descMap =
-{
-    { SPF_AC_PHASE, wxT( " (phase)" ) },
-    { SPF_AC_MAG, wxT( " (mag)" ) }
-};
-
-
 SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id, const wxPoint& pos,
                 const wxSize& size, long style, const wxString& name )
     : mpWindow( parent, id, pos, size, style ), m_colorIdx( 0 ),
@@ -374,20 +336,13 @@ bool SIM_PLOT_PANEL::IsPlottable( SIM_TYPE aSimType )
 }
 
 
-bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName, int aPoints,
-                                const double* aT, const double* aY, int aFlags )
+bool SIM_PLOT_PANEL::AddTrace( const wxString& aName, int aPoints,
+        const double* aX, const double* aY, SIM_PLOT_TYPE aFlags )
 {
     TRACE* t = NULL;
 
-    wxString name( aName );
-
-    if( aFlags == SPF_AC_MAG )
-        name += " (mag)";
-    else if( aFlags == SPF_AC_PHASE )
-        name += " (phase)";
-
     // Find previous entry, if there is one
-    auto prev = m_traces.find( TRACE_DESC( aName, (SIM_PLOT_FLAGS) aFlags ) );
+    auto prev = m_traces.find( aName );
     bool addedNewEntry = ( prev == m_traces.end() );
 
     if( addedNewEntry )
@@ -396,18 +351,18 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
         switch ( m_type )
         {
             case ST_TRANSIENT:
-                t = new TRACE_TRANSIENT( name, aSpiceName );
+                t = new TRACE_TRANSIENT( aName );
                 break;
             case ST_AC:
                 //printf("makeFreqResp!\n");
-                t = new TRACE_FREQ_RESPONSE( name, aSpiceName );
+                t = new TRACE_FREQ_RESPONSE( aName );
                 break;
             default:
                 assert(false);
         }
 
         t->SetPen( wxPen( generateColor(), 2, wxSOLID ) );
-        m_traces[TRACE_DESC( aName, (SIM_PLOT_FLAGS) aFlags )] = t;
+        m_traces[aName] = t;
 
         // It is a trick to keep legend & coords always on the top
         for( mpLayer* l : m_topLevel )
@@ -427,7 +382,7 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
 
     if( m_type == ST_AC )
     {
-        if( aFlags & SPF_AC_PHASE )
+        if( aFlags & SPT_AC_PHASE )
         {
             for(int i = 0; i < aPoints; i++ )
                 tmp[i] = tmp[i] * 180.0 / M_PI;
@@ -439,9 +394,9 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
         }
     }
 
-    t->SetData( std::vector<double>( aT, aT + aPoints ), tmp );
+    t->SetData( std::vector<double>( aX, aX + aPoints ), tmp );
 
-    if( aFlags & SPF_AC_PHASE )
+    if( aFlags & SPT_AC_PHASE )
         t->SetScale( m_axis_x, m_axis_y2 );
     else
         t->SetScale( m_axis_x, m_axis_y1 );
@@ -454,7 +409,7 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aSpiceName, const wxString& aName
 
 bool SIM_PLOT_PANEL::DeleteTrace( const wxString& aName )
 {
-    auto it = m_traces.find( TRACE_DESC( aName ) );
+    auto it = m_traces.find( aName );
 
     if( it != m_traces.end() )
     {
@@ -477,7 +432,7 @@ void SIM_PLOT_PANEL::DeleteAllTraces()
 {
     for( auto& t : m_traces )
     {
-        DeleteTrace( t.first.GetDescription() );
+        DeleteTrace( t.first );
     }
 
     m_traces.clear();
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index a4394f4c5c..27d1981cf2 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -90,8 +90,8 @@ private:
 class TRACE : public mpFXYVector
 {
 public:
-    TRACE( const wxString& aName, const wxString& aSpiceName ) :
-        mpFXYVector( aName ), m_spiceName( aSpiceName ), m_cursor( nullptr )
+    TRACE( const wxString& aName ) :
+        mpFXYVector( aName ), m_cursor( nullptr )
         {
             SetContinuity( true );
             SetDrawOutsideMargins( false );
@@ -99,11 +99,6 @@ public:
 
         }
 
-    const wxString& GetSpiceName() const
-    {
-        return m_spiceName;
-    }
-
     const std::vector<double>& GetDataX() const
     {
         return m_xs;
@@ -130,15 +125,14 @@ public:
     }
 
 protected:
-    wxString m_spiceName;
     CURSOR* m_cursor;
 };
 
 class TRACE_FREQ_RESPONSE : public TRACE
 {
 public:
-    TRACE_FREQ_RESPONSE( const wxString& aName, const wxString& aSpiceName ) :
-        TRACE( aName, aSpiceName )
+    TRACE_FREQ_RESPONSE( const wxString& aName ) :
+        TRACE( aName )
     {
         printf("makeFreqResponse!\n");
     }
@@ -148,52 +142,13 @@ public:
 class TRACE_TRANSIENT : public TRACE
 {
 public:
-    TRACE_TRANSIENT( const wxString& aName, const wxString& aSpiceName ) :
-        TRACE( aName, aSpiceName )
+    TRACE_TRANSIENT( const wxString& aName ) :
+        TRACE( aName )
     {
     }
 
 };
 
-enum SIM_PLOT_FLAGS {
-    SPF_AC_PHASE = 0x01,
-    SPF_AC_MAG   = 0x02
-};
-
-class TRACE_DESC
-{
-public:
-    TRACE_DESC( const wxString& aName, SIM_PLOT_FLAGS aType )
-        : m_name( aName ), m_type( aType )
-    {
-    }
-
-    TRACE_DESC( const wxString& aDescription );
-
-    wxString GetDescription() const;
-
-    const wxString& GetName() const
-    {
-        return m_name;
-    }
-
-    SIM_PLOT_FLAGS GetType() const
-    {
-        return m_type;
-    }
-
-    bool operator<( const TRACE_DESC& aOther ) const
-    {
-        return ( m_name < aOther.m_name ) || ( m_name == aOther.m_name && m_type < aOther.m_type );
-    }
-
-private:
-    wxString m_name;
-    SIM_PLOT_FLAGS m_type;
-
-    static const std::map<SIM_PLOT_FLAGS, wxString> m_descMap;
-};
-
 class SIM_PLOT_PANEL : public mpWindow
 {
 public:
@@ -224,8 +179,8 @@ public:
         return m_axis_y2 ? m_axis_y2->GetName() : "";
     }
 
-    bool AddTrace( const wxString& aSpiceName, const wxString& aName, int aPoints,
-                    const double* aT, const double* aY, int aFlags );
+    bool AddTrace( const wxString& aName, int aPoints,
+            const double* aX, const double* aY, SIM_PLOT_TYPE aFlags );
 
     bool DeleteTrace( const wxString& aName );
 
@@ -233,17 +188,17 @@ public:
 
     bool IsShown( const wxString& aName ) const
     {
-        return m_traces.count( TRACE_DESC( aName ) ) > 0;
+        return m_traces.count( aName ) > 0;
     }
 
-    const std::map<TRACE_DESC, TRACE*>& GetTraces() const
+    const std::map<wxString, TRACE*>& GetTraces() const
     {
         return m_traces;
     }
 
     TRACE* GetTrace( const wxString& aName ) const
     {
-        auto trace = m_traces.find( TRACE_DESC( aName ) );
+        auto trace = m_traces.find( aName );
 
         return trace == m_traces.end() ? NULL : trace->second;
     }
@@ -294,7 +249,7 @@ private:
     unsigned int m_colorIdx;
 
     // Traces to be plotted
-    std::map<TRACE_DESC, TRACE*> m_traces;
+    std::map<wxString, TRACE*> m_traces;
 
     mpScaleXBase* m_axis_x;
     mpScaleY* m_axis_y1;

From 324d27711a1a991688d766363c622a009d9b004f Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:52 +0200
Subject: [PATCH 115/197] Hide OP & noise analysis, scale settings for AC in
 settings dialog

---
 eeschema/dialogs/dialog_sim_settings_base.cpp |  8 +++++++-
 eeschema/dialogs/dialog_sim_settings_base.fbp | 10 +++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/eeschema/dialogs/dialog_sim_settings_base.cpp b/eeschema/dialogs/dialog_sim_settings_base.cpp
index e0854e15cd..c33376441e 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.cpp
+++ b/eeschema/dialogs/dialog_sim_settings_base.cpp
@@ -27,7 +27,9 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID
 	wxString m_acScaleChoices[] = { wxT("Decade"), wxT("Octave"), wxT("Linear") };
 	int m_acScaleNChoices = sizeof( m_acScaleChoices ) / sizeof( wxString );
 	m_acScale = new wxRadioBox( m_pgAC, wxID_ANY, wxT("Frequency scale"), wxDefaultPosition, wxDefaultSize, m_acScaleNChoices, m_acScaleChoices, 1, wxRA_SPECIFY_COLS );
-	m_acScale->SetSelection( 0 );
+	m_acScale->SetSelection( 2 );
+	m_acScale->Hide();
+	
 	bSizer3->Add( m_acScale, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 	
 	
@@ -174,6 +176,8 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID
 	
 	m_simPages->AddPage( m_pgDistortion, wxT("Distortion"), false );
 	m_pgNoise = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_pgNoise->Hide();
+	
 	wxBoxSizer* bSizer15;
 	bSizer15 = new wxBoxSizer( wxVERTICAL );
 	
@@ -269,6 +273,8 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID
 	bSizer15->Fit( m_pgNoise );
 	m_simPages->AddPage( m_pgNoise, wxT("Noise"), false );
 	m_pgOP = new wxPanel( m_simPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_pgOP->Hide();
+	
 	wxBoxSizer* bSizer8;
 	bSizer8 = new wxBoxSizer( wxVERTICAL );
 	
diff --git a/eeschema/dialogs/dialog_sim_settings_base.fbp b/eeschema/dialogs/dialog_sim_settings_base.fbp
index 7318cc4666..00194907df 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.fbp
+++ b/eeschema/dialogs/dialog_sim_settings_base.fbp
@@ -97,7 +97,7 @@
                     <property name="border">5</property>
                     <property name="flag">wxEXPAND | wxALL</property>
                     <property name="proportion">1</property>
-                    <object class="wxNotebook" expanded="0">
+                    <object class="wxNotebook" expanded="1">
                         <property name="BottomDockable">1</property>
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
@@ -299,7 +299,7 @@
                                             <property name="floatable">1</property>
                                             <property name="font"></property>
                                             <property name="gripper">0</property>
-                                            <property name="hidden">0</property>
+                                            <property name="hidden">1</property>
                                             <property name="id">wxID_ANY</property>
                                             <property name="label">Frequency scale</property>
                                             <property name="majorDimension">1</property>
@@ -318,7 +318,7 @@
                                             <property name="pin_button">1</property>
                                             <property name="pos"></property>
                                             <property name="resize">Resizable</property>
-                                            <property name="selection">0</property>
+                                            <property name="selection">2</property>
                                             <property name="show">1</property>
                                             <property name="size"></property>
                                             <property name="style">wxRA_SPECIFY_COLS</property>
@@ -2751,7 +2751,7 @@
                                 <property name="floatable">1</property>
                                 <property name="font"></property>
                                 <property name="gripper">0</property>
-                                <property name="hidden">0</property>
+                                <property name="hidden">1</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
@@ -4150,7 +4150,7 @@
                                 <property name="floatable">1</property>
                                 <property name="font"></property>
                                 <property name="gripper">0</property>
-                                <property name="hidden">0</property>
+                                <property name="hidden">1</property>
                                 <property name="id">wxID_ANY</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>

From 5fdc32b79a8727894aa942ad226cf0d22bfa9433 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:52 +0200
Subject: [PATCH 116/197] AC analysis plots using linear frequency scale

---
 eeschema/sim/sim_plot_frame.cpp |  6 ++++--
 eeschema/sim/sim_plot_panel.cpp | 26 ++++++++++++++++++++------
 eeschema/sim/sim_types.h        | 15 ++++++++-------
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index fd9646ee21..1c7c24d4ce 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -266,8 +266,9 @@ void SIM_PLOT_FRAME::addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const
     TRACE_DESC descriptor( *m_exporter, aName, aType, aParam );
 
     bool updated = false;
+    SIM_PLOT_TYPE xAxisType = GetXAxisType( simType );
 
-    if( GetXAxisType( simType ) == SPT_FREQUENCY )
+    if( xAxisType == SPT_LIN_FREQUENCY || xAxisType == SPT_LOG_FREQUENCY )
     {
         // Add two plots: magnitude & phase
         TRACE_DESC mag_desc( *m_exporter, descriptor, descriptor.GetType() | SPT_AC_MAG );
@@ -412,7 +413,8 @@ SIM_PLOT_TYPE SIM_PLOT_FRAME::GetXAxisType( SIM_TYPE aType ) const
     switch( aType )
     {
         case ST_AC:
-            return SPT_FREQUENCY;
+            return SPT_LIN_FREQUENCY;
+            /// @todo SPT_LOG_FREQUENCY
 
         case ST_DC:
             return SPT_SWEEP;
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index df41726190..9c2891ddca 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -97,11 +97,25 @@ static wxString formatSI ( double x, const wxString& unit, int decimalDigits, do
 }
 
 
-class FREQUENCY_SCALE : public mpScaleXLog
+class FREQUENCY_LIN_SCALE : public mpScaleX
 {
 public:
-    FREQUENCY_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
-        mpScaleXLog ( name, flags, ticks ,type ) {};
+    FREQUENCY_LIN_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
+        mpScaleX( name, flags, ticks ,type ) {};
+
+    const wxString getLabel( int n )
+    {
+        printf("%.10f\n", m_labeledTicks[n] );
+        return formatSI ( m_labeledTicks[n], wxT("Hz"), 2 );
+    }
+};
+
+
+class FREQUENCY_LOG_SCALE : public mpScaleXLog
+{
+public:
+    FREQUENCY_LOG_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
+        mpScaleXLog( name, flags, ticks ,type ) {};
 
     const wxString getLabel( int n )
     {
@@ -253,7 +267,7 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
     switch( m_type )
     {
         case ST_AC:
-            m_axis_x = new FREQUENCY_SCALE( wxT( "Frequency" ), mpALIGN_BOTTOM );
+            m_axis_x = new FREQUENCY_LIN_SCALE( wxT( "Frequency" ), mpALIGN_BOTTOM );
             m_axis_y1 = new GAIN_SCALE( wxT( "Gain" ), mpALIGN_LEFT );
             m_axis_y2 = new PHASE_SCALE( wxT( "Phase" ), mpALIGN_RIGHT );
             m_axis_y2->SetMasterScale(m_axis_y1);
@@ -385,12 +399,12 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aName, int aPoints,
         if( aFlags & SPT_AC_PHASE )
         {
             for(int i = 0; i < aPoints; i++ )
-                tmp[i] = tmp[i] * 180.0 / M_PI;
+                tmp[i] = tmp[i] * 180.0 / M_PI;                 // convert to degrees
         }
         else
         {
             for(int i = 0; i < aPoints; i++ )
-                tmp[i] = 20 * log( tmp[i] ) / log( 10.0 );
+                tmp[i] = 20 * log( tmp[i] ) / log( 10.0 );      // convert to dB
         }
     }
 
diff --git a/eeschema/sim/sim_types.h b/eeschema/sim/sim_types.h
index 5a37278623..ac2ab0beac 100644
--- a/eeschema/sim/sim_types.h
+++ b/eeschema/sim/sim_types.h
@@ -34,14 +34,15 @@ enum SIM_TYPE {
 ///> Possible plot types
 enum SIM_PLOT_TYPE {
     // Y axis
-    SPT_VOLTAGE     = 0x01,
-    SPT_CURRENT     = 0x02,
-    SPT_AC_PHASE    = 0x04,
-    SPT_AC_MAG      = 0x08,
+    SPT_VOLTAGE         = 0x01,
+    SPT_CURRENT         = 0x02,
+    SPT_AC_PHASE        = 0x04,
+    SPT_AC_MAG          = 0x08,
 
-    SPT_TIME        = 0x10,
-    SPT_FREQUENCY   = 0x20,
-    SPT_SWEEP       = 0x40
+    SPT_TIME            = 0x10,
+    SPT_LIN_FREQUENCY   = 0x20,
+    SPT_LOG_FREQUENCY   = 0x20,
+    SPT_SWEEP           = 0x40
 };
 
 #endif /* SIM_TYPES_H */

From 114e3638e709fe09bdefceae91aac36d30f61143 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:52 +0200
Subject: [PATCH 117/197] Renamed tabs in Spice model dialog

---
 eeschema/dialogs/dialog_spice_model_base.cpp |  4 ++--
 eeschema/dialogs/dialog_spice_model_base.fbp | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eeschema/dialogs/dialog_spice_model_base.cpp b/eeschema/dialogs/dialog_spice_model_base.cpp
index 05b4633741..ff9a8f5dfd 100644
--- a/eeschema/dialogs/dialog_spice_model_base.cpp
+++ b/eeschema/dialogs/dialog_spice_model_base.cpp
@@ -166,7 +166,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i
 	m_pwrGeneric->SetSizer( fgSizer6 );
 	m_pwrGeneric->Layout();
 	fgSizer6->Fit( m_pwrGeneric );
-	m_powerNotebook->AddPage( m_pwrGeneric, _("Generic"), true );
+	m_powerNotebook->AddPage( m_pwrGeneric, _("DC/AC"), true );
 	m_pwrPulse = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxFlexGridSizer* fgSizer7;
 	fgSizer7 = new wxFlexGridSizer( 0, 2, 0, 0 );
@@ -419,7 +419,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i
 	m_power->SetSizer( bSizer4 );
 	m_power->Layout();
 	bSizer4->Fit( m_power );
-	m_notebook->AddPage( m_power, _("Power source"), false );
+	m_notebook->AddPage( m_power, _("Source"), false );
 	
 	bSizer1->Add( m_notebook, 1, wxEXPAND | wxALL, 5 );
 	
diff --git a/eeschema/dialogs/dialog_spice_model_base.fbp b/eeschema/dialogs/dialog_spice_model_base.fbp
index 4753b063ef..36fb42ec6c 100644
--- a/eeschema/dialogs/dialog_spice_model_base.fbp
+++ b/eeschema/dialogs/dialog_spice_model_base.fbp
@@ -1878,11 +1878,11 @@
                                 </object>
                             </object>
                         </object>
-                        <object class="notebookpage" expanded="0">
+                        <object class="notebookpage" expanded="1">
                             <property name="bitmap"></property>
-                            <property name="label">Power source</property>
+                            <property name="label">Source</property>
                             <property name="select">0</property>
-                            <object class="wxPanel" expanded="0">
+                            <object class="wxPanel" expanded="1">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -1956,16 +1956,16 @@
                                 <event name="OnSetFocus"></event>
                                 <event name="OnSize"></event>
                                 <event name="OnUpdateUI"></event>
-                                <object class="wxBoxSizer" expanded="0">
+                                <object class="wxBoxSizer" expanded="1">
                                     <property name="minimum_size"></property>
                                     <property name="name">bSizer4</property>
                                     <property name="orient">wxVERTICAL</property>
                                     <property name="permission">none</property>
-                                    <object class="sizeritem" expanded="0">
+                                    <object class="sizeritem" expanded="1">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND | wxALL</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxNotebook" expanded="0">
+                                        <object class="wxNotebook" expanded="1">
                                             <property name="BottomDockable">1</property>
                                             <property name="LeftDockable">1</property>
                                             <property name="RightDockable">1</property>
@@ -2045,7 +2045,7 @@
                                             <event name="OnUpdateUI"></event>
                                             <object class="notebookpage" expanded="0">
                                                 <property name="bitmap"></property>
-                                                <property name="label">Generic</property>
+                                                <property name="label">DC/AC</property>
                                                 <property name="select">1</property>
                                                 <object class="wxPanel" expanded="0">
                                                     <property name="BottomDockable">1</property>

From 806b862a5e3f29eedf828f8ec43c363fc4a5d55b Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:53 +0200
Subject: [PATCH 118/197] Corrected Spice vector name for voltages

---
 eeschema/sim/netlist_exporter_pspice_sim.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eeschema/sim/netlist_exporter_pspice_sim.cpp b/eeschema/sim/netlist_exporter_pspice_sim.cpp
index e75f9edb94..1e5ca02435 100644
--- a/eeschema/sim/netlist_exporter_pspice_sim.cpp
+++ b/eeschema/sim/netlist_exporter_pspice_sim.cpp
@@ -41,7 +41,7 @@ wxString NETLIST_EXPORTER_PSPICE_SIM::GetSpiceVector( const wxString& aName, SIM
         if( it == netMapping.end() )
             return "";
 
-        return wxString::Format( "v(%d)", it->second );
+        return wxString::Format( "V(%d)", it->second );
     }
 
 

From dfeb5385f3e44ca94f743b901deb17e50832031a Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:53 +0200
Subject: [PATCH 119/197] Disable current signals in all analyses but transient

---
 eeschema/dialogs/dialog_signal_list.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/eeschema/dialogs/dialog_signal_list.cpp b/eeschema/dialogs/dialog_signal_list.cpp
index 90d7b8d9b0..a0a5104b1e 100644
--- a/eeschema/dialogs/dialog_signal_list.cpp
+++ b/eeschema/dialogs/dialog_signal_list.cpp
@@ -47,9 +47,7 @@ bool DIALOG_SIGNAL_LIST::TransferDataFromWindow()
 bool DIALOG_SIGNAL_LIST::TransferDataToWindow()
 {
     // Create a list of possible signals
-    // TODO switch( m_exporter->GetSimType() )
-    // {
-
+    /// @todo it could include separated mag & phase for AC analysis
     if( m_exporter )
     {
         // Voltage list
@@ -59,13 +57,17 @@ bool DIALOG_SIGNAL_LIST::TransferDataToWindow()
                 m_signals->Append( wxString::Format( "V(%s)", net.first ) );
         }
 
-        for( const auto& item : m_exporter->GetSpiceItems() )
+        // For some reason, it is not possible to plot currents in any but transient analysis
+        if( m_exporter->GetSimType() == ST_TRANSIENT )
         {
-            // Add all possible currents for the primitive
-            for( const auto& current :
-                    NETLIST_EXPORTER_PSPICE_SIM::GetCurrents( (SPICE_PRIMITIVE) item.m_primitive ) )
+            for( const auto& item : m_exporter->GetSpiceItems() )
             {
-                m_signals->Append( wxString::Format( "%s(%s)", current, item.m_refName ) );
+                // Add all possible currents for the primitive
+                for( const auto& current :
+                        NETLIST_EXPORTER_PSPICE_SIM::GetCurrents( (SPICE_PRIMITIVE) item.m_primitive ) )
+                {
+                    m_signals->Append( wxString::Format( "%s(%s)", current, item.m_refName ) );
+                }
             }
         }
     }

From 38810930ec474466323c94293b5718862755c532 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:53 +0200
Subject: [PATCH 120/197] Removed redundant TRACE_* classes

---
 eeschema/sim/sim_plot_panel.cpp | 14 +-------------
 eeschema/sim/sim_plot_panel.h   | 20 --------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 9c2891ddca..7e278a26f6 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -362,19 +362,7 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aName, int aPoints,
     if( addedNewEntry )
     {
         // New entry
-        switch ( m_type )
-        {
-            case ST_TRANSIENT:
-                t = new TRACE_TRANSIENT( aName );
-                break;
-            case ST_AC:
-                //printf("makeFreqResp!\n");
-                t = new TRACE_FREQ_RESPONSE( aName );
-                break;
-            default:
-                assert(false);
-        }
-
+        t = new TRACE( aName );
         t->SetPen( wxPen( generateColor(), 2, wxSOLID ) );
         m_traces[aName] = t;
 
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 27d1981cf2..e07aa15286 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -128,26 +128,6 @@ protected:
     CURSOR* m_cursor;
 };
 
-class TRACE_FREQ_RESPONSE : public TRACE
-{
-public:
-    TRACE_FREQ_RESPONSE( const wxString& aName ) :
-        TRACE( aName )
-    {
-        printf("makeFreqResponse!\n");
-    }
-
-};
-
-class TRACE_TRANSIENT : public TRACE
-{
-public:
-    TRACE_TRANSIENT( const wxString& aName ) :
-        TRACE( aName )
-    {
-    }
-
-};
 
 class SIM_PLOT_PANEL : public mpWindow
 {

From 920cf09ac1bacaf05f658cbb41a7483f31f2ec9f Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:53 +0200
Subject: [PATCH 121/197] Fixed plot for DC sweep analysis

---
 eeschema/sim/sim_plot_panel.cpp | 38 ++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 7e278a26f6..04999fd291 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -137,6 +137,18 @@ public:
     }
 };
 
+class VOLTAGE_SCALE_X : public mpScaleX
+{
+public:
+    VOLTAGE_SCALE_X(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
+        mpScaleX ( name, flags, ticks, type ) {};
+
+    const wxString getLabel( int n )
+    {
+        return formatSI ( m_labeledTicks[n], wxT("V"), 3, AbsVisibleMaxValue() );
+    }
+};
+
 class GAIN_SCALE : public mpScaleY
 {
 public:
@@ -161,10 +173,10 @@ public:
     }
 };
 
-class VOLTAGE_SCALE : public mpScaleY
+class VOLTAGE_SCALE_Y : public mpScaleY
 {
 public:
-    VOLTAGE_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
+    VOLTAGE_SCALE_Y(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
         mpScaleY ( name, flags, ticks ) {};
 
     const wxString getLabel( int n )
@@ -257,11 +269,11 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
         m_axis_x( nullptr ), m_axis_y1( nullptr ), m_axis_y2( nullptr ), m_type( aType )
 {
     LimitView( true );
-    SetMargins(50, 80, 50, 80);
+    SetMargins( 50, 80, 50, 80 );
 
-    wxColour grey(96, 96, 96);
-	SetColourTheme(*wxBLACK, *wxWHITE, grey);
-    EnableDoubleBuffer(true);
+    wxColour grey( 96, 96, 96 );
+    SetColourTheme( *wxBLACK, *wxWHITE, grey );
+    EnableDoubleBuffer( true );
     UpdateAll();
 
     switch( m_type )
@@ -271,13 +283,11 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
             m_axis_y1 = new GAIN_SCALE( wxT( "Gain" ), mpALIGN_LEFT );
             m_axis_y2 = new PHASE_SCALE( wxT( "Phase" ), mpALIGN_RIGHT );
             m_axis_y2->SetMasterScale(m_axis_y1);
-
             break;
-            #if 0
 
         case ST_DC:
-            m_axis_x = new mpScaleX( wxT( "voltage [V]" ), mpALIGN_BORDER_BOTTOM );
-            m_axis_y1 = new mpScaleY( wxT( "voltage [V]" ), mpALIGN_BORDER_LEFT );
+            m_axis_x = new VOLTAGE_SCALE_X( wxT( "Voltage (sweeped)" ), mpALIGN_BORDER_BOTTOM );
+            m_axis_y1 = new VOLTAGE_SCALE_Y( wxT( "Voltage (measured)" ), mpALIGN_BORDER_LEFT );
             break;
 
         case ST_NOISE:
@@ -285,11 +295,9 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
             m_axis_y1 = new mpScaleY( wxT( "noise [(V or A)^2/Hz]" ), mpALIGN_BORDER_LEFT );
             break;
 
-            #endif
-
         case ST_TRANSIENT:
             m_axis_x = new TIME_SCALE( wxT( "Time" ), mpALIGN_BOTTOM );
-            m_axis_y1 = new VOLTAGE_SCALE( wxT( "Voltage" ), mpALIGN_LEFT );
+            m_axis_y1 = new VOLTAGE_SCALE_Y( wxT( "Voltage" ), mpALIGN_LEFT );
             m_axis_y2 = new CURRENT_SCALE( wxT( "Current" ), mpALIGN_RIGHT );
             m_axis_y2->SetMasterScale(m_axis_y1);
             break;
@@ -318,14 +326,10 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
     }
 
     m_legend = new mpInfoLegend( wxRect( 0, 40, 200, 40 ), wxTRANSPARENT_BRUSH );
-
     AddLayer( m_legend );
     m_topLevel.push_back( m_legend );
-    SetColourTheme(*wxBLACK, *wxWHITE, grey);
 
-    EnableDoubleBuffer(true);
     UpdateAll();
-
 }
 
 

From 16fec4d73e3e4b97258ff7b8f169feacb462eec5 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:54 +0200
Subject: [PATCH 122/197] Strip comas from a Spice value

---
 eeschema/sim/spice_value.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eeschema/sim/spice_value.cpp b/eeschema/sim/spice_value.cpp
index 0d4cd25289..b4f1d9130c 100644
--- a/eeschema/sim/spice_value.cpp
+++ b/eeschema/sim/spice_value.cpp
@@ -218,6 +218,6 @@ void SPICE_VALUE::stripZeros( wxString& aString )
     while( aString.EndsWith( '0' ) )
         aString.RemoveLast();
 
-    if( aString.EndsWith( '.' ) )
+    if( aString.EndsWith( '.' ) || aString.EndsWith( ',' ) )
         aString.RemoveLast();
 }

From 65c7520544426f434581b295093411334a1a0675 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:54 +0200
Subject: [PATCH 123/197] Bulletproof Simulation settings dialog

---
 eeschema/dialogs/dialog_sim_settings.cpp | 107 ++++++++++++++++-------
 eeschema/dialogs/dialog_sim_settings.h   |   5 +-
 eeschema/sim/spice_value.cpp             |  39 +++++++++
 eeschema/sim/spice_value.h               |  22 +++++
 4 files changed, 141 insertions(+), 32 deletions(-)

diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
index 462cd5f125..813f76b80a 100644
--- a/eeschema/dialogs/dialog_sim_settings.cpp
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -24,36 +24,35 @@
 
 #include "dialog_sim_settings.h"
 #include <sim/netlist_exporter_pspice_sim.h>
+#include <confirm.h>
 
 /// @todo ngspice offers more types of analysis,
 //so there are a few tabs missing (e.g. pole-zero, distortion, sensitivity)
 
 DIALOG_SIM_SETTINGS::DIALOG_SIM_SETTINGS( wxWindow* aParent )
-    : DIALOG_SIM_SETTINGS_BASE( aParent ), m_exporter( nullptr )
+    : DIALOG_SIM_SETTINGS_BASE( aParent ), m_exporter( nullptr ), m_spiceEmptyValidator( true )
 {
-    m_posFloatValidator.SetMin( 0 );
-    m_posFloatValidator.SetPrecision( 6 );
     m_posIntValidator.SetMin( 1 );
 
     m_acPointsNumber->SetValidator( m_posIntValidator );
-    m_acFreqStart->SetValidator( m_posFloatValidator );
-    m_acFreqStop->SetValidator( m_posFloatValidator );
+    m_acFreqStart->SetValidator( m_spiceValidator );
+    m_acFreqStop->SetValidator( m_spiceValidator );
 
-    m_dcStart1->SetValidator( m_posFloatValidator );
-    m_dcStop1->SetValidator( m_posFloatValidator );
-    m_dcIncr1->SetValidator( m_posFloatValidator );
+    m_dcStart1->SetValidator( m_spiceValidator );
+    m_dcStop1->SetValidator( m_spiceValidator );
+    m_dcIncr1->SetValidator( m_spiceValidator );
 
-    m_dcStart2->SetValidator( m_posFloatValidator );
-    m_dcStop2->SetValidator( m_posFloatValidator );
-    m_dcIncr2->SetValidator( m_posFloatValidator );
+    m_dcStart2->SetValidator( m_spiceValidator );
+    m_dcStop2->SetValidator( m_spiceValidator );
+    m_dcIncr2->SetValidator( m_spiceValidator );
 
     m_noisePointsNumber->SetValidator( m_posIntValidator );
-    m_noiseFreqStart->SetValidator( m_posFloatValidator );
-    m_noiseFreqStop->SetValidator( m_posFloatValidator );
+    m_noiseFreqStart->SetValidator( m_spiceValidator );
+    m_noiseFreqStop->SetValidator( m_spiceValidator );
 
-    m_transStep->SetValidator( m_posFloatValidator );
-    m_transFinal->SetValidator( m_posFloatValidator );
-    m_transInitial->SetValidator( m_posFloatValidator );
+    m_transStep->SetValidator( m_spiceValidator );
+    m_transFinal->SetValidator( m_spiceValidator );
+    m_transInitial->SetValidator( m_spiceEmptyValidator );
 
     m_sdbSizerOK->SetDefault();
     updateNetlistOpts();
@@ -70,12 +69,14 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
     // AC analysis
     if( page == m_pgAC )
     {
-        if( m_acPointsNumber->IsEmpty() || m_acFreqStart->IsEmpty() || m_acFreqStop->IsEmpty() )
+        if( !m_pgAC->Validate() )
             return false;
 
         m_simCommand = wxString::Format( ".ac %s %s %s %s",
             scaleToString( m_acScale->GetSelection() ),
-            m_acPointsNumber->GetValue(), m_acFreqStart->GetValue(), m_acFreqStop->GetValue() );
+            m_acPointsNumber->GetValue(),
+            SPICE_VALUE( m_acFreqStart->GetValue() ).ToSpiceString(),
+            SPICE_VALUE( m_acFreqStop->GetValue() ).ToSpiceString() );
     }
 
 
@@ -84,30 +85,67 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
     {
         // At least one source has to be enabled
         if( !m_dcEnable1->IsChecked() && !m_dcEnable1->IsChecked() )
+        {
+            DisplayError( this, wxT( "You need to enable at least one source" ) );
             return false;
+        }
 
         wxString simCmd = wxString( ".dc " );
 
         if( m_dcEnable1->IsChecked() )
         {
-            if( m_dcSource1->GetValue().IsEmpty() || m_dcStart1->IsEmpty() ||
-                    m_dcStop1->IsEmpty() || m_dcIncr1->IsEmpty() )
+            if( m_dcSource1->GetValue().IsEmpty() )
+            {
+                DisplayError( this, wxT( "You need to select DC source (sweep 1)" ) );
+                return false;
+            }
+
+            /// @todo for some reason it does not trigger the assigned SPICE_VALIDATOR,
+            // hence try..catch below
+            if( !m_dcStart1->Validate() || !m_dcStop1->Validate() || !m_dcIncr1->Validate() )
                 return false;
 
-            simCmd += wxString::Format( "v%s %s %s %s",
-               m_dcSource1->GetValue(), m_dcStart1->GetValue(),
-               m_dcStop1->GetValue(), m_dcIncr1->GetValue() );
+            try
+            {
+                simCmd += wxString::Format( "v%s %s %s %s",
+                    m_dcSource1->GetValue(),
+                    SPICE_VALUE( m_dcStart1->GetValue() ).ToSpiceString(),
+                    SPICE_VALUE( m_dcStop1->GetValue() ).ToSpiceString(),
+                    SPICE_VALUE( m_dcIncr1->GetValue() ).ToSpiceString() );
+            }
+            catch( std::exception& e )
+            {
+                DisplayError( this, e.what() );
+                return false;
+            }
         }
 
         if( m_dcEnable2->IsChecked() )
         {
-            if( m_dcSource2->GetValue().IsEmpty() || m_dcStart2->IsEmpty() ||
-                    m_dcStop2->IsEmpty() || m_dcIncr2->IsEmpty() )
+            if( m_dcSource2->GetValue().IsEmpty() )
+            {
+                DisplayError( this, wxT( "You need to select DC source (sweep 2)" ) );
+                return false;
+            }
+
+            /// @todo for some reason it does not trigger the assigned SPICE_VALIDATOR,
+            // hence try..catch below
+            if( !m_dcStart2->Validate() || !m_dcStop2->Validate() || !m_dcIncr2->Validate() )
                 return false;
 
-            simCmd += wxString::Format( "v%s %s %s %s",
-               m_dcSource2->GetValue(), m_dcStart2->GetValue(),
-               m_dcStop2->GetValue(), m_dcIncr2->GetValue() );
+            try
+            {
+                simCmd += wxString::Format( "v%s %s %s %s",
+                    m_dcSource2->GetValue(),
+                    SPICE_VALUE( m_dcStart2->GetValue() ).ToSpiceString(),
+                    SPICE_VALUE( m_dcStop2->GetValue() ).ToSpiceString(),
+                    SPICE_VALUE( m_dcIncr2->GetValue() ).ToSpiceString() );
+            }
+            catch( std::exception& e )
+            {
+                DisplayError( this, e.what() );
+                return false;
+            }
         }
 
         m_simCommand = simCmd;
@@ -130,7 +168,9 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
         m_simCommand = wxString::Format( ".noise v(%d%s) v%s %s %s %s %s",
             netMap.at( m_noiseMeas->GetValue() ), ref,
             m_noiseSrc->GetValue(), scaleToString( m_noiseScale->GetSelection() ),
-            m_noisePointsNumber->GetValue(), m_noiseFreqStart->GetValue(), m_noiseFreqStop->GetValue() );
+            m_noisePointsNumber->GetValue(),
+            SPICE_VALUE( m_noiseFreqStart->GetValue() ).ToSpiceString(),
+            SPICE_VALUE( m_noiseFreqStop->GetValue() ).ToSpiceString() );
     }
 
 
@@ -144,11 +184,16 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
     // Transient analysis
     else if( page == m_pgTransient )
     {
-        if( m_transStep->IsEmpty() || m_transFinal->IsEmpty() )
+        if( !m_pgTransient->Validate() )
             return false;
 
+        wxString initial =
+            m_transInitial->IsEmpty() ? "" : SPICE_VALUE( m_transInitial->GetValue() ).ToSpiceString();
+
         m_simCommand = wxString::Format( ".tran %s %s %s",
-            m_transStep->GetValue(), m_transFinal->GetValue(), m_transInitial->GetValue() );
+            SPICE_VALUE( m_transStep->GetValue() ).ToSpiceString(),
+            SPICE_VALUE( m_transFinal->GetValue() ).ToSpiceString(),
+            initial );
     }
 
 
diff --git a/eeschema/dialogs/dialog_sim_settings.h b/eeschema/dialogs/dialog_sim_settings.h
index b757104de6..9ac8829ce4 100644
--- a/eeschema/dialogs/dialog_sim_settings.h
+++ b/eeschema/dialogs/dialog_sim_settings.h
@@ -26,6 +26,8 @@
 #define DIALOG_SIM_SETTINGS_BASE_H
 
 #include "dialog_sim_settings_base.h"
+#include <sim/spice_value.h>
+
 #include <wx/valnum.h>
 
 class NETLIST_EXPORTER_PSPICE_SIM;
@@ -94,7 +96,8 @@ private:
     int m_netlistOpts;
     NETLIST_EXPORTER_PSPICE_SIM* m_exporter;
 
-    wxFloatingPointValidator<double> m_posFloatValidator;
+    SPICE_VALIDATOR m_spiceValidator;
+    SPICE_VALIDATOR m_spiceEmptyValidator;
     wxIntegerValidator<int> m_posIntValidator;
 };
 
diff --git a/eeschema/sim/spice_value.cpp b/eeschema/sim/spice_value.cpp
index b4f1d9130c..dadb4be3de 100644
--- a/eeschema/sim/spice_value.cpp
+++ b/eeschema/sim/spice_value.cpp
@@ -27,10 +27,16 @@
 #include <stdexcept>
 #include <cmath>
 
+#include <wx/textentry.h>
+#include <confirm.h>
+
 SPICE_VALUE::SPICE_VALUE( const wxString& aString )
 {
     char buf[8] = { 0, };
 
+    if( aString.IsEmpty() )
+        throw std::invalid_argument( "Spice value cannot be empty" );
+
     if( sscanf( (const char*) aString.c_str(), "%lf%7s", &m_base, buf ) == 0 )
         throw std::invalid_argument( "Invalid Spice value string" );
 
@@ -221,3 +227,36 @@ void SPICE_VALUE::stripZeros( wxString& aString )
     if( aString.EndsWith( '.' ) || aString.EndsWith( ',' ) )
         aString.RemoveLast();
 }
+
+
+bool SPICE_VALIDATOR::Validate( wxWindow* aParent )
+{
+    wxTextEntry* const text = GetTextEntry();
+
+    if( !text )
+        return false;
+
+    if( text->IsEmpty() )
+    {
+        if( m_emptyAllowed )
+            return true;
+
+        DisplayError( aParent, wxString::Format( wxT( "Fill required fields" ) ) );
+        return false;
+    }
+
+    try
+    {
+        // If SPICE_VALUE can be constructed, then it is a valid Spice value
+        SPICE_VALUE val( text->GetValue() );
+    }
+    catch( ... )
+    {
+        DisplayError( aParent,
+                wxString::Format( wxT( "'%s' is not a valid Spice value" ), text->GetValue() ) );
+
+        return false;
+    }
+
+    return true;
+}
diff --git a/eeschema/sim/spice_value.h b/eeschema/sim/spice_value.h
index c5d00a191e..b6d47da857 100644
--- a/eeschema/sim/spice_value.h
+++ b/eeschema/sim/spice_value.h
@@ -26,6 +26,7 @@
 #define SPICE_VALUE_H
 
 #include <wx/string.h>
+#include <wx/valtext.h>
 
 ///> Helper class to handle Spice way of expressing values (e.g. 10.5 Meg)
 class SPICE_VALUE
@@ -120,4 +121,25 @@ private:
     static void stripZeros( wxString& aString );
 };
 
+
+///> Helper class to recognize Spice formatted values
+class SPICE_VALIDATOR : public wxTextValidator
+{
+public:
+    SPICE_VALIDATOR( bool aEmptyAllowed = false )
+        : m_emptyAllowed( aEmptyAllowed )
+    {
+    }
+
+    wxObject* Clone() const override
+    {
+        return new SPICE_VALIDATOR( *this );
+    }
+
+    bool Validate( wxWindow* aParent ) override;
+
+private:
+    bool m_emptyAllowed;
+};
+
 #endif /* SPICE_VALUE_H */

From 65a0327e8510a24a5d2b379dc2e673abc2cd19c7 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:55 +0200
Subject: [PATCH 124/197] Better normalization rules for SPICE_VALUE

---
 eeschema/sim/spice_value.cpp | 2 +-
 eeschema/sim/spice_value.h   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/eeschema/sim/spice_value.cpp b/eeschema/sim/spice_value.cpp
index dadb4be3de..2d6c4a733f 100644
--- a/eeschema/sim/spice_value.cpp
+++ b/eeschema/sim/spice_value.cpp
@@ -87,7 +87,7 @@ void SPICE_VALUE::Normalize()
         m_prefix = (UNIT_PREFIX)( m_prefix + 3 );
     }
 
-    while( m_base != 0.0 && std::fabs( m_base ) <= 0.001 )
+    while( m_base != 0.0 && std::fabs( m_base ) <= 1.000 )
     {
         m_base *= 1000.0;
         m_prefix = (UNIT_PREFIX)( m_prefix - 3 );
diff --git a/eeschema/sim/spice_value.h b/eeschema/sim/spice_value.h
index b6d47da857..571acdd7f4 100644
--- a/eeschema/sim/spice_value.h
+++ b/eeschema/sim/spice_value.h
@@ -56,11 +56,13 @@ public:
     SPICE_VALUE( int aInt, UNIT_PREFIX aPrefix = PFX_NONE )
         : m_base( aInt ), m_prefix( aPrefix ), m_spiceStr( false )
     {
+        Normalize();
     }
 
     SPICE_VALUE( double aDouble, UNIT_PREFIX aPrefix = PFX_NONE )
         : m_base( aDouble ), m_prefix( aPrefix ), m_spiceStr( false )
     {
+        Normalize();
     }
 
     void Normalize();

From b25781814df142dd42f8e805e4202c8ead4d95f9 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:55 +0200
Subject: [PATCH 125/197] Fixed cursors

---
 common/widgets/mathplot.cpp     | 25 +++++++++++++++++++++++++
 eeschema/sim/sim_plot_frame.cpp |  4 ++--
 eeschema/sim/sim_plot_panel.cpp | 31 +++++++++++++++++++++++++------
 eeschema/sim/sim_plot_panel.h   | 20 +++-----------------
 include/widgets/mathplot.h      |  8 ++++++--
 5 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index e9ec1c0f4a..3ff858e92b 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -3604,3 +3604,28 @@ void mpFXY::SetScale ( mpScaleBase *scaleX, mpScaleBase *scaleY )
         m_scaleY->ExtendDataRange(GetMinY(), GetMaxY());
     }
 }
+
+
+double mpFXY::s2x(double plotCoordX) const
+{
+    return m_scaleX->TransformFromPlot( plotCoordX );
+}
+
+
+double mpFXY::s2y(double plotCoordY) const
+{
+    return m_scaleY->TransformFromPlot( plotCoordY );
+}
+
+
+double mpFXY::x2s(double x) const
+{
+    return m_scaleX->TransformToPlot( x );
+}
+
+
+double mpFXY::y2s(double y) const
+{
+    return m_scaleY->TransformToPlot( y );
+}
+
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 1c7c24d4ce..dcbd344343 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -678,8 +678,8 @@ void SIM_PLOT_FRAME::onCursorUpdate( wxCommandEvent& event )
         {
             const wxRealPoint coords = cursor->GetCoords();
             long idx = m_cursors->InsertItem( SIGNAL_COL, trace.first );
-            m_cursors->SetItem( idx, X_COL, wxString::Format( "%f", coords.x ) );
-            m_cursors->SetItem( idx, Y_COL, wxString::Format( "%f", coords.y ) );
+            m_cursors->SetItem( idx, X_COL, SPICE_VALUE( coords.x ).ToSpiceString() );
+            m_cursors->SetItem( idx, Y_COL, SPICE_VALUE( coords.y ).ToSpiceString() );
         }
     }
 }
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 04999fd291..5d5227db19 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -196,7 +196,6 @@ public:
         return formatSI ( m_labeledTicks[n], wxT("A"), 3, AbsVisibleMaxValue() );
     }
 };
-
 void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
 {
     if( !m_window )
@@ -213,7 +212,7 @@ void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
 
     if( m_updateRequired )
     {
-        m_coords.x = aWindow.p2x( m_dim.x );
+        m_coords.x = m_trace->s2x( aWindow.p2x( m_dim.x ) );
 
         // Find the closest point coordinates
         auto maxXIt = std::upper_bound( dataX.begin(), dataX.end(), m_coords.x );
@@ -239,6 +238,7 @@ void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
         const double leftY = dataY[minIdx];
         const double rightY = dataY[maxIdx];
 
+        // Linear interpolation
         m_coords.y = leftY + ( rightY - leftY ) / ( rightX - leftX ) * ( m_coords.x - leftX );
         m_updateRequired = false;
 
@@ -254,15 +254,34 @@ void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
     const int horLen = aWindow.GetScrX();
     const int verLen = aWindow.GetScrY();
 
-    const wxPoint cursorPos( aWindow.x2p( m_coords.x ), aWindow.y2p( m_coords.y ) );
-
-    aDC.SetPen( wxPen( *wxBLACK, 1, m_continuous ? wxSOLID : wxLONG_DASH ) );
-
+    const wxPoint cursorPos( aWindow.x2p( m_trace->x2s( m_coords.x ) ),
+                             aWindow.y2p( m_trace->y2s( m_coords.y ) ) );
+    aDC.SetPen( wxPen( *wxWHITE, 1, m_continuous ? wxSOLID : wxLONG_DASH ) );
     aDC.DrawLine( -horLen, cursorPos.y, horLen, cursorPos.y );
     aDC.DrawLine( cursorPos.x, -verLen, cursorPos.x, verLen );
 }
 
 
+bool CURSOR::Inside( wxPoint& aPoint )
+{
+    if( !m_window )
+        return false;
+
+    return ( std::abs( aPoint.x - m_window->x2p( m_trace->x2s( m_coords.x ) ) ) <= DRAG_MARGIN )
+        && ( std::abs( aPoint.y - m_window->y2p( m_trace->y2s( m_coords.y ) ) ) <= DRAG_MARGIN );
+}
+
+
+void CURSOR::UpdateReference()
+{
+    if( !m_window )
+        return;
+
+    m_reference.x = m_window->x2p( m_trace->x2s( m_coords.x ) );
+    m_reference.y = m_window->y2p( m_trace->y2s( m_coords.y ) );
+}
+
+
 SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id, const wxPoint& pos,
                 const wxSize& size, long style, const wxString& name )
     : mpWindow( parent, id, pos, size, style ), m_colorIdx( 0 ),
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index e07aa15286..371fe9ae82 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -37,7 +37,7 @@ class CURSOR : public mpInfoLayer
 public:
     CURSOR( const TRACE* aTrace )
         : mpInfoLayer( wxRect( 0, 0, DRAG_MARGIN, DRAG_MARGIN ), wxTRANSPARENT_BRUSH ),
-        m_trace( aTrace ), m_updateRequired( false ), m_coords( 0.0, 0.0 ), m_window( nullptr )
+        m_trace( aTrace ), m_updateRequired( true ), m_coords( 0.0, 0.0 ), m_window( nullptr )
     {
     }
 
@@ -48,14 +48,7 @@ public:
         m_updateRequired = true;
     }
 
-    bool Inside( wxPoint& aPoint )
-    {
-        if( !m_window )
-            return false;
-
-        return ( std::abs( aPoint.x - m_window->x2p( m_coords.x ) ) <= DRAG_MARGIN )
-            && ( std::abs( aPoint.y - m_window->y2p( m_coords.y ) ) <= DRAG_MARGIN );
-    }
+    bool Inside( wxPoint& aPoint ) override;
 
     void Move( wxPoint aDelta ) override
     {
@@ -63,14 +56,7 @@ public:
         mpInfoLayer::Move( aDelta );
     }
 
-    void UpdateReference()
-    {
-        if( !m_window )
-            return;
-
-        m_reference.x = m_window->x2p( m_coords.x );
-        m_reference.y = m_window->y2p( m_coords.y );
-    }
+    void UpdateReference();
 
     const wxRealPoint& GetCoords() const
     {
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index c19fb485ba..ae085834f4 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -583,7 +583,6 @@ class WXDLLIMPEXP_MATHPLOT mpFY : public mpLayer
   Optionally implement a constructor and pass a name (label) and a label alignment
   to the constructor mpFXY::mpFXY. If the layer name is empty, no label will be plotted.
   */
-class mpScaleBase;
 
 class WXDLLIMPEXP_MATHPLOT mpFXY : public mpLayer
 {
@@ -611,8 +610,13 @@ class WXDLLIMPEXP_MATHPLOT mpFXY : public mpLayer
           */
         virtual void Plot(wxDC & dc, mpWindow & w);
 
-        virtual void SetScale ( mpScaleBase *scaleX, mpScaleBase *scaleY );
+        virtual void SetScale(mpScaleBase *scaleX, mpScaleBase *scaleY);
 
+        double s2x(double plotCoordX) const;
+        double s2y(double plotCoordY) const;
+
+        double x2s(double x) const;
+        double y2s(double y) const;
 
     protected:
         int m_flags; //!< Holds label alignment

From cdf758b17368eb60fb7f6dab14018623f9e115e4 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:55 +0200
Subject: [PATCH 126/197] Automatically update cursor coordinates

---
 eeschema/sim/sim_plot_panel.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 371fe9ae82..59eaabcc69 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -39,6 +39,7 @@ public:
         : mpInfoLayer( wxRect( 0, 0, DRAG_MARGIN, DRAG_MARGIN ), wxTRANSPARENT_BRUSH ),
         m_trace( aTrace ), m_updateRequired( true ), m_coords( 0.0, 0.0 ), m_window( nullptr )
     {
+        SetDrawOutsideMargins( false );
     }
 
     void Plot( wxDC& aDC, mpWindow& aWindow ) override;
@@ -85,6 +86,14 @@ public:
 
         }
 
+    void SetData( const std::vector<double>& aX, const std::vector<double>& aY ) override
+    {
+        if( m_cursor )
+            m_cursor->Update();
+
+        mpFXYVector::SetData( aX, aY );
+    }
+
     const std::vector<double>& GetDataX() const
     {
         return m_xs;

From 07b451f4b118c9c4a5a55a9d2cc7793a7fd45fb4 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:55 +0200
Subject: [PATCH 127/197] Do not draw cursors outside margins

---
 eeschema/sim/sim_plot_panel.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 5d5227db19..b94475ba25 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -251,14 +251,21 @@ void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
     }
 
     // Line length in horizontal and vertical dimensions
-    const int horLen = aWindow.GetScrX();
-    const int verLen = aWindow.GetScrY();
-
     const wxPoint cursorPos( aWindow.x2p( m_trace->x2s( m_coords.x ) ),
                              aWindow.y2p( m_trace->y2s( m_coords.y ) ) );
+
+    wxCoord leftPx   = m_drawOutsideMargins ? 0 : aWindow.GetMarginLeft();
+    wxCoord rightPx  = m_drawOutsideMargins ? aWindow.GetScrX() : aWindow.GetScrX() - aWindow.GetMarginRight();
+    wxCoord topPx    = m_drawOutsideMargins ? 0 : aWindow.GetMarginTop();
+    wxCoord bottomPx = m_drawOutsideMargins ? aWindow.GetScrY() : aWindow.GetScrY() - aWindow.GetMarginBottom();
+
     aDC.SetPen( wxPen( *wxWHITE, 1, m_continuous ? wxSOLID : wxLONG_DASH ) );
-    aDC.DrawLine( -horLen, cursorPos.y, horLen, cursorPos.y );
-    aDC.DrawLine( cursorPos.x, -verLen, cursorPos.x, verLen );
+
+    if( topPx < cursorPos.y && cursorPos.y < bottomPx )
+        aDC.DrawLine( leftPx, cursorPos.y, rightPx, cursorPos.y );
+
+    if( leftPx < cursorPos.x && cursorPos.x < rightPx )
+        aDC.DrawLine( cursorPos.x, topPx, cursorPos.x, bottomPx );
 }
 
 

From 973a3d7bcbc311f2254d262c47808b364eb775c1 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:56 +0200
Subject: [PATCH 128/197] Fixed a crash when a signal was removed

---
 eeschema/sim/sim_plot_frame.cpp | 48 +++++++++++++++++++--------------
 eeschema/sim/sim_plot_frame.h   | 21 ++++++++++++---
 2 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index dcbd344343..354ffd8dc5 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -290,6 +290,24 @@ void SIM_PLOT_FRAME::addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const
 }
 
 
+void SIM_PLOT_FRAME::removePlot( const wxString& aPlotName )
+{
+    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
+    auto& traceMap = m_plots[plotPanel].m_traces;
+    auto traceIt = traceMap.find( aPlotName );
+
+    wxASSERT( traceIt != traceMap.end() );
+    traceMap.erase( traceIt );
+
+    wxASSERT( plotPanel->IsShown( aPlotName ) );
+    plotPanel->DeleteTrace( aPlotName );
+    plotPanel->Fit();
+
+    updateSignalList();
+    updateCursors();
+}
+
+
 void SIM_PLOT_FRAME::updateNetlistExporter()
 {
     m_exporter.reset( new NETLIST_EXPORTER_PSPICE_SIM( m_schematicFrame->BuildNetListBase(),
@@ -408,6 +426,12 @@ void SIM_PLOT_FRAME::updateTuners()
 }
 
 
+void SIM_PLOT_FRAME::updateCursors()
+{
+    wxQueueEvent( this, new wxCommandEvent( EVT_SIM_CURSOR_UPDATE ) );
+}
+
+
 SIM_PLOT_TYPE SIM_PLOT_FRAME::GetXAxisType( SIM_TYPE aType ) const
 {
     switch( aType )
@@ -554,33 +578,17 @@ void SIM_PLOT_FRAME::onPlotChanged( wxNotebookEvent& event )
 {
     updateSignalList();
     updateTuners();
-
-    // Update cursors
-    wxQueueEvent( this, new wxCommandEvent( EVT_SIM_CURSOR_UPDATE ) );
+    updateCursors();
 }
 
 
 void SIM_PLOT_FRAME::onSignalDblClick( wxCommandEvent& event )
 {
-    // Remove signal from the plot on double click
+    // Remove signal from the plot panel when double clicked
     int idx = m_signals->GetSelection();
-    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
 
     if( idx != wxNOT_FOUND )
-    {
-        const wxString& plotName = m_signals->GetString( idx );
-        auto& traceMap = m_plots[plotPanel].m_traces;
-
-        auto traceIt = traceMap.find( plotName );
-        wxASSERT( traceIt != traceMap.end() );
-        traceMap.erase( traceIt );
-
-        wxASSERT( plotPanel->IsShown( plotName ) );
-        plotPanel->DeleteTrace( plotName );
-        plotPanel->Fit();
-
-        m_signals->Delete( idx );
-    }
+        removePlot( m_signals->GetString( idx ) );
 }
 
 
@@ -788,7 +796,7 @@ void SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::onMenuEvent( wxMenuEvent& aEvent )
     switch( aEvent.GetId() )
     {
         case HIDE_SIGNAL:
-            plot->DeleteTrace( m_signal );
+            m_plotFrame->removePlot( m_signal );
             break;
 
         case SHOW_CURSOR:
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 7a2786ae92..7fc751a0f0 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -136,18 +136,28 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         SIM_PLOT_PANEL* CurrentPlot() const;
 
     private:
+        /**
+         * @brief Adds a new plot to the current panel.
+         * @param aName is the device/net name.
+         * @param aType describes the type of plot.
+         * @param aParam is the parameter for the device/net (e.g. I, Id, V).
+         */
         void addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const wxString& aParam );
 
+        /**
+         * @brief Removes a plot with a specific title.
+         * @param aPlotName is the full plot title (e.g. I(Net-C1-Pad1)).
+         */
+        void removePlot( const wxString& aPlotName );
+
         void updateNetlistExporter();
 
         /**
          * @brief Updates plot in a particular SIM_PLOT_PANEL. If the panel does not contain
          * the plot, it will be added.
-         * @param aName is the net/device name.
-         * @param aType is the plot type (@see SIM_PLOT_TYPES).
+         * @param aDescriptor contains the plot description.
          * @param aPanel is the panel that should receive the update.
          * @return True if a plot was successfully added/updated.
-         * TODO update description
          */
         bool updatePlot( const TRACE_DESC& aDescriptor, SIM_PLOT_PANEL* aPanel );
 
@@ -161,6 +171,11 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
          */
         void updateTuners();
 
+        /**
+         * @brief Updates the cursor values list.
+         */
+        void updateCursors();
+
         SIM_PLOT_TYPE GetXAxisType( SIM_TYPE aType ) const;
 
         // Menu handlers

From 6c53aba6800ba6e27776f5dc4c3884cd9b0f7f7a Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:56 +0200
Subject: [PATCH 129/197] Validators for Spice model dialog

---
 eeschema/dialogs/dialog_spice_model.cpp | 100 +++++++++++++++++++++---
 eeschema/dialogs/dialog_spice_model.h   |   8 ++
 2 files changed, 95 insertions(+), 13 deletions(-)

diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp
index e2692334d1..bfc088a65e 100644
--- a/eeschema/dialogs/dialog_spice_model.cpp
+++ b/eeschema/dialogs/dialog_spice_model.cpp
@@ -26,6 +26,7 @@
 
 #include <netlist_exporters/netlist_exporter_pspice.h>
 #include <sim/spice_value.h>
+#include <confirm.h>
 
 #include <wx/tokenzr.h>
 
@@ -53,16 +54,47 @@ static int wxCALLBACK comparePwlValues( wxIntPtr aItem1, wxIntPtr aItem2, wxIntP
 
 
 DIALOG_SPICE_MODEL::DIALOG_SPICE_MODEL( wxWindow* aParent, SCH_COMPONENT& aComponent, SCH_FIELDS& aFields )
-    : DIALOG_SPICE_MODEL_BASE( aParent ), m_component( aComponent ), m_fields( aFields )
+    : DIALOG_SPICE_MODEL_BASE( aParent ), m_component( aComponent ), m_fields( aFields ),
+    m_spiceEmptyValidator( true ), m_notEmptyValidator( wxFILTER_EMPTY )
 {
+    m_pasValue->SetValidator( m_spiceValidator );
+
+    m_semiType->SetValidator( m_notEmptyValidator );
+    m_semiModel->SetValidator( m_notEmptyValidator );
+
+    m_icModel->SetValidator( m_notEmptyValidator );
+
+    m_genDc->SetValidator( m_spiceEmptyValidator );
+    m_genAcMag->SetValidator( m_spiceEmptyValidator );
+    m_genAcPhase->SetValidator( m_spiceEmptyValidator );
+
+    m_pulseInit->SetValidator( m_spiceValidator );
+    m_pulseNominal->SetValidator( m_spiceValidator );
+    m_pulseDelay->SetValidator( m_spiceEmptyValidator );
+    m_pulseRise->SetValidator( m_spiceEmptyValidator );
+    m_pulseFall->SetValidator( m_spiceEmptyValidator );
+    m_pulseWidth->SetValidator( m_spiceEmptyValidator );
+    m_pulsePeriod->SetValidator( m_spiceEmptyValidator );
+
+    m_sinOffset->SetValidator( m_spiceValidator );
+    m_sinAmplitude->SetValidator( m_spiceValidator );
+    m_sinFreq->SetValidator( m_spiceEmptyValidator );
+    m_sinDelay->SetValidator( m_spiceEmptyValidator );
+    m_sinDampFactor->SetValidator( m_spiceEmptyValidator );
+
+    m_expInit->SetValidator( m_spiceValidator );
+    m_expPulsed->SetValidator( m_spiceValidator );
+    m_expRiseDelay->SetValidator( m_spiceEmptyValidator );
+    m_expRiseConst->SetValidator( m_spiceEmptyValidator );
+    m_expFallDelay->SetValidator( m_spiceEmptyValidator );
+    m_expFallConst->SetValidator( m_spiceEmptyValidator );
+
     m_pwlTimeCol = m_pwlValList->AppendColumn( "Time [s]", wxLIST_FORMAT_LEFT, 100 );
     m_pwlValueCol = m_pwlValList->AppendColumn( "Value [V/A]", wxLIST_FORMAT_LEFT, 100 );
 
     m_sdbSizerOK->SetDefault();
 }
 
-// TODO validators
-
 
 bool DIALOG_SPICE_MODEL::TransferDataFromWindow()
 {
@@ -74,6 +106,9 @@ bool DIALOG_SPICE_MODEL::TransferDataFromWindow()
     // Passive
     if( page == m_passive )
     {
+        if( !m_passive->Validate() )
+            return false;
+
         switch( m_pasType->GetSelection() )
         {
             case 0: m_fieldsTmp[SF_PRIMITIVE] = (char) SP_RESISTOR; break;
@@ -93,6 +128,9 @@ bool DIALOG_SPICE_MODEL::TransferDataFromWindow()
     // Semiconductor
     else if( page == m_semiconductor )
     {
+        if( !m_semiconductor->Validate() )
+            return false;
+
         switch( m_semiType->GetSelection() )
         {
             case 0: m_fieldsTmp[SF_PRIMITIVE] = (char) SP_DIODE; break;
@@ -115,6 +153,9 @@ bool DIALOG_SPICE_MODEL::TransferDataFromWindow()
     // Integrated circuit
     else if( page == m_ic )
     {
+        if( !m_ic->Validate() )
+            return false;
+
         m_fieldsTmp[SF_PRIMITIVE] = (char) SP_SUBCKT;
         m_fieldsTmp[SF_MODEL] = m_icModel->GetValue();
 
@@ -292,7 +333,7 @@ bool DIALOG_SPICE_MODEL::parsePowerSource( const wxString& aModel )
                 tkn = tokenizer.GetNextToken().Lower();
 
             // DC value
-            m_genDc->SetValue( SPICE_VALUE( tkn ).ToString() );
+            m_genDc->SetValue( SPICE_VALUE( tkn ).ToSpiceString() );
 
             if( !tokenizer.HasMoreTokens() )
                 return true;
@@ -304,11 +345,11 @@ bool DIALOG_SPICE_MODEL::parsePowerSource( const wxString& aModel )
 
             // AC magnitude
             tkn = tokenizer.GetNextToken().Lower();
-            m_genAcMag->SetValue( SPICE_VALUE( tkn ).ToString() );
+            m_genAcMag->SetValue( SPICE_VALUE( tkn ).ToSpiceString() );
 
             // AC phase
             tkn = tokenizer.GetNextToken().Lower();
-            m_genAcMag->SetValue( SPICE_VALUE( tkn ).ToString() );
+            m_genAcMag->SetValue( SPICE_VALUE( tkn ).ToSpiceString() );
         }
 
 
@@ -356,7 +397,7 @@ bool DIALOG_SPICE_MODEL::parsePowerSource( const wxString& aModel )
                 tkn = tokenizer.GetNextToken();
                 SPICE_VALUE value( tkn );
 
-                addPwlValue( time.ToString(), value.ToString() );
+                addPwlValue( time.ToSpiceString(), value.ToSpiceString() );
             }
         }
 
@@ -377,7 +418,7 @@ bool DIALOG_SPICE_MODEL::parsePowerSource( const wxString& aModel )
                     return ( i >= genericReqParamsCount );
 
                 tkn = tokenizer.GetNextToken().Lower();
-                genericControls[i]->SetValue( SPICE_VALUE( tkn ).ToString() );
+                genericControls[i]->SetValue( SPICE_VALUE( tkn ).ToSpiceString() );
             }
         }
     }
@@ -403,9 +444,15 @@ bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
 
     if( page == m_pwrGeneric )
     {
-        if( empty( m_genDc ) && empty( m_genAcMag ) )
+        if( !m_pwrGeneric->Validate() )
             return false;
 
+        if( empty( m_genDc ) && empty( m_genAcMag ) )
+        {
+            DisplayError( NULL, wxT( "You have to specify DC or/and AC value" ) );
+            return false;
+        }
+
         if( !empty( m_genDc ) )
             res += wxString::Format( "dc %s", m_genDc->GetValue() );
 
@@ -414,13 +461,16 @@ bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
             res += wxString::Format( " ac %s", m_genAcMag->GetValue() );
 
             if( !empty( m_genAcPhase ) )
-            res += wxString::Format( " %s", m_genAcPhase->GetValue() );
+                res += wxString::Format( " %s", m_genAcPhase->GetValue() );
         }
     }
 
 
     else if( page == m_pwrPulse )
     {
+        if( !m_pwrPulse->Validate() )
+            return false;
+
         genericProcessing = true;
         res = "pulse";
         genericReqParamsCount = 2;
@@ -431,6 +481,9 @@ bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
 
     else if( page == m_pwrSin )
     {
+        if( !m_pwrSin->Validate() )
+            return false;
+
         genericProcessing = true;
         res = "sin";
         genericReqParamsCount = 2;
@@ -440,6 +493,9 @@ bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
 
     else if( page == m_pwrExp )
     {
+        if( !m_pwrExp->Validate() )
+            return false;
+
         genericProcessing = true;
         res = "exp";
         genericReqParamsCount = 2;
@@ -450,6 +506,12 @@ bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
 
     else if( page == m_pwrPwl )
     {
+        if( m_pwlValList->GetItemCount() == 0 )
+        {
+            DisplayError( NULL, wxT( "You have to specify at least one value" ) );
+            return false;
+        }
+
         res = "pwl(";
 
         for( int i = 0; i < m_pwlValList->GetItemCount(); ++i )
@@ -463,6 +525,7 @@ bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
 
     if( genericProcessing )
     {
+        bool finished = false;
         unsigned int paramCounter = 0;
 
         res += "(";
@@ -471,10 +534,21 @@ bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
         {
             if( empty( textCtrl ) )
             {
-                if( paramCounter < genericReqParamsCount )
-                    return false;
+                finished = true;
 
-                break;
+                if( paramCounter < genericReqParamsCount )
+                {
+                    DisplayError( NULL,
+                            wxString::Format( wxT( "You need to specify at least the first %d parameters" ),
+                            genericReqParamsCount ) );
+
+                    return false;
+                }
+            }
+            else if( finished )
+            {
+                DisplayError( NULL, wxT( "You cannot leave interleaved blank spaces" ) );
+                return false;
             }
 
             res += wxString::Format( "%s ", textCtrl->GetValue() );
diff --git a/eeschema/dialogs/dialog_spice_model.h b/eeschema/dialogs/dialog_spice_model.h
index 3f313483b5..7e2e6df438 100644
--- a/eeschema/dialogs/dialog_spice_model.h
+++ b/eeschema/dialogs/dialog_spice_model.h
@@ -26,8 +26,12 @@
 #define DIALOG_SPICE_MODEL_H
 
 #include "dialog_spice_model_base.h"
+
+#include <sim/spice_value.h>
 #include <sch_component.h>
 
+#include <wx/valnum.h>
+
 class DIALOG_SPICE_MODEL : public DIALOG_SPICE_MODEL_BASE
 {
 public:
@@ -92,6 +96,10 @@ private:
 
     ///> Column identifiers for PWL power source value list
     long m_pwlTimeCol, m_pwlValueCol;
+
+    SPICE_VALIDATOR m_spiceValidator;
+    SPICE_VALIDATOR m_spiceEmptyValidator;
+    wxTextValidator m_notEmptyValidator;
 };
 
 #endif /* DIALOG_SPICE_MODEL_H */

From ce59b282d37b48de9d4fd69ade0d564fff1d6ac6 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:56 +0200
Subject: [PATCH 130/197] Display both axis names in the cursor list

---
 eeschema/sim/sim_plot_frame.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 354ffd8dc5..108da7ccfc 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -677,7 +677,17 @@ void SIM_PLOT_FRAME::onCursorUpdate( wxCommandEvent& event )
 
     const long SIGNAL_COL = m_cursors->AppendColumn( wxT( "Signal" ), wxLIST_FORMAT_LEFT, size.x / 2 );
     const long X_COL = m_cursors->AppendColumn( CurrentPlot()->GetLabelX(), wxLIST_FORMAT_LEFT, size.x / 4 );
-    const long Y_COL = m_cursors->AppendColumn( CurrentPlot()->GetLabelY1(), wxLIST_FORMAT_LEFT, size.x / 4 );
+
+    wxString labelY1 = CurrentPlot()->GetLabelY1();
+    wxString labelY2 = CurrentPlot()->GetLabelY2();
+    wxString labelY;
+
+    if( !labelY2.IsEmpty() )
+        labelY = labelY1 + " / " + labelY2;
+    else
+        labelY = labelY1;
+
+    const long Y_COL = m_cursors->AppendColumn( labelY, wxLIST_FORMAT_LEFT, size.x / 4 );
 
     // Update cursor values
     for( const auto& trace : CurrentPlot()->GetTraces() )

From 5c32e35d2765b231a130afa778710342f9db1bf4 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:56 +0200
Subject: [PATCH 131/197] Minor fixes to wxMathPlot

---
 common/widgets/mathplot.cpp | 6 ++----
 include/widgets/mathplot.h  | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index 3ff858e92b..a4cf48f4a9 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -536,6 +536,8 @@ mpFXY::mpFXY(wxString name, int flags)
     SetName(name);
     m_flags = flags;
     m_type = mpLAYER_PLOT;
+    m_scaleX = NULL;
+    m_scaleY = NULL;
 }
 
 void mpFXY::UpdateViewBoundary(wxCoord xnew, wxCoord ynew)
@@ -764,7 +766,6 @@ void mpScaleX::recalculateTicks ( wxDC & dc, mpWindow & w )
 
     double minErr = 1000000000000.0;
     double bestStep;
-    int bestCount;
         for(int i = 10; i <= 20; i+=2)
         {
             double step = fabs(maxVvis - minVvis) / (double) i;
@@ -779,7 +780,6 @@ void mpScaleX::recalculateTicks ( wxDC & dc, mpWindow & w )
             {
                 minErr = err;
                 bestStep = stepInt;
-                bestCount = i;
             }
             //printf("step %d %.3f %.3f best %.3f\n",i, step, stepInt, bestStep);
         }
@@ -981,7 +981,6 @@ void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
 
     double minErr = 1000000000000.0;
     double bestStep;
-    int bestCount;
         for(int i = 10; i <= 20; i+=2)
         {
             double step = fabs(maxVvis - minVvis) / (double) i;
@@ -996,7 +995,6 @@ void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
             {
                 minErr = err;
                 bestStep = stepInt;
-                bestCount = i;
             }
             //printf("step %d %.3f %.3f best %.3f\n",i, step, stepInt, bestStep);
         }
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index ae085834f4..081cc06fea 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -775,7 +775,7 @@ protected:
     int m_flags; //!< Flag for axis alignment
     bool m_ticks; //!< Flag to toggle between ticks or grid
     double m_minV, m_maxV;
-    double m_rangeSet;
+    bool m_rangeSet;
     int m_maxLabelHeight;
     int m_maxLabelWidth;
 

From 7406aad8eafc6d6996b1d47b99b49bd3555d4ff9 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:57 +0200
Subject: [PATCH 132/197] Display current plots using the current axis

---
 eeschema/sim/sim_plot_panel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index b94475ba25..f2cfec4e77 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -428,7 +428,7 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aName, int aPoints,
 
     t->SetData( std::vector<double>( aX, aX + aPoints ), tmp );
 
-    if( aFlags & SPT_AC_PHASE )
+    if( aFlags & SPT_AC_PHASE || aFlags & SPT_CURRENT )
         t->SetScale( m_axis_x, m_axis_y2 );
     else
         t->SetScale( m_axis_x, m_axis_y1 );

From ec1b8be528c34e46d50719eb35e2d77a6a11e311 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:41:58 +0200
Subject: [PATCH 133/197] sim: fixed build errors & locale issues

---
 eeschema/sim/ngspice.cpp     | 1 +
 eeschema/sim/spice_value.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 6ca4f8c118..7e13c92415 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -29,6 +29,7 @@
 #include <wx/dynlib.h>
 #include <wx/log.h>
 #include <sstream>
+#include <stdexcept>
 
 using namespace std;
 
diff --git a/eeschema/sim/spice_value.cpp b/eeschema/sim/spice_value.cpp
index 2d6c4a733f..f773bc9e3c 100644
--- a/eeschema/sim/spice_value.cpp
+++ b/eeschema/sim/spice_value.cpp
@@ -116,7 +116,7 @@ wxString SPICE_VALUE::ToString() const
 
 wxString SPICE_VALUE::ToSpiceString() const
 {
-    wxString res = wxString::Format( "%f", m_base );
+    wxString res = wxString::FromCDouble( m_base );
     stripZeros( res );
 
     switch( m_prefix )

From 8c14f2f6b1209bea2c2e5c7d336e1eecc0d01d94 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:00 +0200
Subject: [PATCH 134/197] sim: working on UX

---
 bitmaps_png/CMakeLists.txt             |    6 +
 bitmaps_png/cpp_26/sim_add_signal.cpp  |   52 +
 bitmaps_png/cpp_26/sim_probe.cpp       |   58 +
 bitmaps_png/cpp_26/sim_run.cpp         |   39 +
 bitmaps_png/cpp_26/sim_settings.cpp    |   40 +
 bitmaps_png/cpp_26/sim_stop.cpp        |   23 +
 bitmaps_png/cpp_26/sim_tune.cpp        |   44 +
 bitmaps_png/sources/sim_add_signal.svg |  874 ++++++++++
 bitmaps_png/sources/sim_probe.svg      |  140 ++
 bitmaps_png/sources/sim_run.svg        |   83 +
 bitmaps_png/sources/sim_settings.svg   |   72 +
 bitmaps_png/sources/sim_stop.svg       |   92 +
 bitmaps_png/sources/sim_tune.svg       |  103 ++
 eeschema/eeschema_id.h                 |   12 +-
 eeschema/sim/sim_plot_frame.cpp        |   43 +-
 eeschema/sim/sim_plot_frame.h          |   20 +-
 eeschema/sim/sim_plot_frame_base.cpp   |  181 +-
 eeschema/sim/sim_plot_frame_base.fbp   | 2205 ++++++++++++++----------
 eeschema/sim/sim_plot_frame_base.h     |   43 +-
 include/bitmaps.h                      |    6 +
 20 files changed, 3148 insertions(+), 988 deletions(-)
 create mode 100644 bitmaps_png/cpp_26/sim_add_signal.cpp
 create mode 100644 bitmaps_png/cpp_26/sim_probe.cpp
 create mode 100644 bitmaps_png/cpp_26/sim_run.cpp
 create mode 100644 bitmaps_png/cpp_26/sim_settings.cpp
 create mode 100644 bitmaps_png/cpp_26/sim_stop.cpp
 create mode 100644 bitmaps_png/cpp_26/sim_tune.cpp
 create mode 100644 bitmaps_png/sources/sim_add_signal.svg
 create mode 100644 bitmaps_png/sources/sim_probe.svg
 create mode 100644 bitmaps_png/sources/sim_run.svg
 create mode 100644 bitmaps_png/sources/sim_settings.svg
 create mode 100644 bitmaps_png/sources/sim_stop.svg
 create mode 100644 bitmaps_png/sources/sim_tune.svg

diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index 3e98564a76..d27cc21898 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -512,6 +512,12 @@ set( BMAPS_MID
     select_w_layer
     shape_3d
     sheetset
+    sim_run
+    sim_stop
+    sim_tune
+    sim_probe
+    sim_add_signal
+    sim_settings
     setcolor_3d_bg
     setcolor_silkscreen
     setcolor_soldermask
diff --git a/bitmaps_png/cpp_26/sim_add_signal.cpp b/bitmaps_png/cpp_26/sim_add_signal.cpp
new file mode 100644
index 0000000000..bc27be5e0a
--- /dev/null
+++ b/bitmaps_png/cpp_26/sim_add_signal.cpp
@@ -0,0 +1,52 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
+ 0xce, 0x00, 0x00, 0x02, 0x31, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xf8, 0xff, 0xff, 0x3f,
+ 0x03, 0x3d, 0x30, 0xc3, 0xf0, 0xb5, 0x48, 0x53, 0x3c, 0x3f, 0x59, 0x43, 0xa2, 0x40, 0x81, 0xa6,
+ 0x16, 0xa9, 0x08, 0xe5, 0xf2, 0x69, 0x88, 0xe5, 0xbf, 0xd2, 0x10, 0xcb, 0x5b, 0x42, 0x53, 0x8b,
+ 0x34, 0x44, 0xf3, 0x5b, 0x81, 0x16, 0xfd, 0x07, 0xe2, 0x7f, 0x5a, 0xa2, 0xb9, 0x86, 0x34, 0xb1,
+ 0x88, 0x81, 0xa1, 0x81, 0x09, 0x68, 0x41, 0x1d, 0x10, 0x1f, 0x57, 0x17, 0x2b, 0x58, 0xa4, 0x21,
+ 0x56, 0x10, 0x44, 0xd3, 0x38, 0x52, 0x17, 0xcf, 0xef, 0xd0, 0x14, 0xcf, 0xb5, 0xa0, 0x79, 0x62,
+ 0x18, 0xf4, 0x16, 0x81, 0x83, 0x5e, 0xa4, 0x48, 0x4d, 0x5d, 0xa4, 0x8c, 0x57, 0x45, 0x25, 0x97,
+ 0x5d, 0x4d, 0xa2, 0xd0, 0x8c, 0x6a, 0x16, 0xa9, 0x8b, 0x16, 0x84, 0x40, 0x52, 0x6a, 0x9e, 0x95,
+ 0x86, 0x78, 0x41, 0x24, 0x84, 0x5d, 0xd0, 0xa0, 0x21, 0x5e, 0xa8, 0x0b, 0x32, 0x43, 0x43, 0x24,
+ 0xcf, 0x98, 0x2a, 0x16, 0x69, 0x8a, 0xe5, 0xbb, 0xaa, 0x89, 0xe6, 0xdb, 0x80, 0x30, 0x30, 0x01,
+ 0x35, 0x41, 0xf4, 0xe7, 0xe5, 0x2b, 0x28, 0x24, 0x70, 0x68, 0x8b, 0x66, 0x49, 0x68, 0x8a, 0xe5,
+ 0x95, 0x51, 0xc5, 0x22, 0x20, 0x60, 0x04, 0xa5, 0x50, 0x63, 0xa9, 0x34, 0x2e, 0xa0, 0xaf, 0xea,
+ 0xc1, 0x96, 0x8b, 0x16, 0x64, 0xab, 0x8b, 0xe7, 0x28, 0xea, 0x48, 0x15, 0xc9, 0x82, 0x7c, 0x4c,
+ 0xb5, 0x38, 0xd2, 0x11, 0xcb, 0x17, 0x07, 0xd1, 0xda, 0xa2, 0x05, 0x06, 0xa0, 0x38, 0x32, 0x10,
+ 0x28, 0x10, 0x00, 0x59, 0x02, 0xf2, 0xa5, 0x92, 0x60, 0x39, 0x3f, 0x5e, 0x8b, 0x80, 0x79, 0xa9,
+ 0x18, 0x84, 0x65, 0x64, 0x0a, 0x39, 0x61, 0xe2, 0xa0, 0xe0, 0x30, 0x66, 0x48, 0x63, 0x45, 0xd7,
+ 0x08, 0x8a, 0x78, 0x18, 0x5b, 0x5b, 0x2a, 0x5f, 0x0e, 0xe2, 0x53, 0x07, 0x16, 0x60, 0xd0, 0xf1,
+ 0xe0, 0x4b, 0x0c, 0xd6, 0x65, 0xb9, 0x4b, 0x56, 0x03, 0x2d, 0x79, 0x03, 0x2e, 0x21, 0x44, 0xf3,
+ 0x97, 0x83, 0x83, 0x43, 0xa4, 0x40, 0x12, 0xc8, 0x3e, 0x05, 0x8c, 0xe8, 0x07, 0xda, 0x12, 0xb9,
+ 0x5a, 0x60, 0x0b, 0x24, 0x72, 0x45, 0x81, 0x6a, 0x96, 0xaa, 0x8b, 0xe5, 0xbf, 0xd7, 0x10, 0xcf,
+ 0x4b, 0x03, 0x89, 0xe9, 0xf2, 0x67, 0x0a, 0x42, 0xd4, 0xe5, 0xff, 0xd0, 0x14, 0x2f, 0x74, 0xc1,
+ 0x67, 0x51, 0xd3, 0xd2, 0x79, 0x87, 0x5f, 0x03, 0x15, 0xfe, 0x04, 0x1a, 0x30, 0x15, 0x64, 0x19,
+ 0x30, 0x0e, 0xa2, 0x81, 0xf4, 0x3d, 0xb0, 0x81, 0x62, 0xf9, 0x6f, 0x81, 0x78, 0x8d, 0xba, 0x78,
+ 0x81, 0x13, 0xd4, 0x31, 0x5f, 0x35, 0xc4, 0xf3, 0xcf, 0x00, 0xe9, 0x6f, 0x5a, 0xe2, 0xf9, 0xe6,
+ 0x30, 0xb6, 0xa6, 0x68, 0xfe, 0x35, 0x20, 0xfd, 0x41, 0x53, 0x34, 0x4f, 0x15, 0xab, 0x45, 0x7f,
+ 0xff, 0xfe, 0x6f, 0x5e, 0xbe, 0xe0, 0xc8, 0x0b, 0xa0, 0x0b, 0x27, 0x39, 0x30, 0x34, 0xb0, 0x00,
+ 0x15, 0x5f, 0x02, 0xfb, 0x4c, 0x3c, 0xff, 0x9d, 0x9a, 0x58, 0xae, 0x3e, 0x30, 0xc2, 0x4b, 0xa0,
+ 0x65, 0xe1, 0x6f, 0x20, 0xbe, 0x0c, 0x8a, 0x74, 0x50, 0x70, 0x81, 0x7c, 0x00, 0x53, 0xa7, 0x25,
+ 0x9e, 0xe7, 0x0c, 0x0e, 0x01, 0xb1, 0x82, 0x6e, 0x6c, 0x41, 0x0d, 0x63, 0xc4, 0xcf, 0x9d, 0xba,
+ 0x6f, 0x3b, 0x2c, 0x31, 0x80, 0xaa, 0x0b, 0x70, 0x9c, 0x41, 0xf3, 0x83, 0xb6, 0x76, 0x03, 0x1b,
+ 0x30, 0x49, 0x4f, 0x07, 0xe2, 0x69, 0xa0, 0x8c, 0x89, 0xc8, 0x4f, 0x79, 0x1e, 0xa0, 0x02, 0x19,
+ 0x64, 0xf1, 0xf0, 0x2e, 0xeb, 0x40, 0x25, 0x05, 0x5d, 0x2c, 0x02, 0xa5, 0x52, 0x60, 0xc2, 0x28,
+ 0x07, 0x65, 0x0d, 0x5c, 0xf9, 0xe8, 0x38, 0x10, 0xef, 0xa0, 0x02, 0xfe, 0x0d, 0x4e, 0xb9, 0xa2,
+ 0xf9, 0x8f, 0x34, 0xc5, 0xf3, 0x74, 0x50, 0x2c, 0x02, 0xa5, 0x36, 0x90, 0x0b, 0xa8, 0x81, 0x41,
+ 0x49, 0x1c, 0x94, 0xaf, 0x80, 0xbe, 0xb2, 0xa3, 0x69, 0x2b, 0x48, 0x53, 0xac, 0x20, 0x00, 0x54,
+ 0x1e, 0x0e, 0x48, 0x73, 0x0b, 0x00, 0x1a, 0x04, 0x6e, 0x5e, 0xc4, 0x63, 0x0b, 0x12, 0x00, 0x00,
+ 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE sim_add_signal_xpm[1] = {{ png, sizeof( png ), "sim_add_signal_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/cpp_26/sim_probe.cpp b/bitmaps_png/cpp_26/sim_probe.cpp
new file mode 100644
index 0000000000..c5600c8ee7
--- /dev/null
+++ b/bitmaps_png/cpp_26/sim_probe.cpp
@@ -0,0 +1,58 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
+ 0xce, 0x00, 0x00, 0x02, 0x96, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0xcd, 0x6b, 0x13,
+ 0x41, 0x18, 0xc6, 0xd7, 0x4f, 0xaa, 0x48, 0x09, 0x69, 0x66, 0x66, 0x5d, 0xa3, 0x46, 0x12, 0xb2,
+ 0xb3, 0xd9, 0xa2, 0x42, 0x0f, 0x45, 0x2d, 0xb4, 0xe0, 0x45, 0x10, 0x24, 0x1e, 0xc4, 0xab, 0xa8,
+ 0xf4, 0x90, 0x76, 0x77, 0x26, 0x49, 0x55, 0x44, 0x0f, 0xf1, 0xa2, 0x28, 0xe8, 0xcd, 0x93, 0x50,
+ 0x0f, 0x8a, 0x8a, 0x5a, 0x15, 0x05, 0xbd, 0x09, 0xfe, 0x01, 0x7a, 0xf0, 0x20, 0x88, 0x78, 0x53,
+ 0x14, 0x0f, 0x5a, 0xbc, 0x28, 0x55, 0x59, 0x9f, 0xa9, 0xa6, 0xdd, 0xd9, 0x24, 0xed, 0x36, 0x4d,
+ 0x0e, 0x7b, 0xd8, 0x61, 0xf6, 0xfd, 0xbd, 0xef, 0xf3, 0x7e, 0xad, 0x11, 0x04, 0x81, 0xd1, 0x8d,
+ 0xc7, 0x30, 0x6a, 0x2b, 0xb5, 0xf7, 0x4e, 0x03, 0x38, 0x95, 0x15, 0x87, 0xca, 0x47, 0x0e, 0x15,
+ 0x4f, 0x39, 0xf5, 0x2f, 0x0f, 0x58, 0xa3, 0xeb, 0x3b, 0x0a, 0x72, 0x89, 0xbf, 0xcf, 0x66, 0xe2,
+ 0x8d, 0x43, 0xfc, 0xb1, 0xfa, 0x99, 0x4d, 0xc5, 0x09, 0x9e, 0xf2, 0x86, 0x3b, 0x02, 0x72, 0x88,
+ 0x38, 0xec, 0xf4, 0x8d, 0x17, 0x39, 0x11, 0x5f, 0x39, 0x15, 0x0f, 0xb4, 0xe8, 0x4c, 0x39, 0x82,
+ 0xc8, 0x4a, 0xcb, 0x06, 0x71, 0x26, 0x4f, 0xc3, 0x78, 0x00, 0xb9, 0x7e, 0x01, 0xf4, 0xb9, 0x9f,
+ 0x0a, 0xa6, 0xcb, 0x28, 0xaa, 0x05, 0xe6, 0xef, 0x5d, 0x16, 0x28, 0x4f, 0x65, 0x11, 0x86, 0x66,
+ 0xfe, 0x81, 0x66, 0x9f, 0x9f, 0x59, 0x52, 0xca, 0xcd, 0x49, 0xe9, 0xd6, 0xd6, 0xe2, 0xec, 0x19,
+ 0xaa, 0x62, 0x45, 0xdb, 0x20, 0x78, 0xbe, 0x1d, 0xfa, 0x7f, 0x09, 0x41, 0x02, 0x9b, 0xc8, 0x6b,
+ 0x7a, 0xb4, 0xfe, 0x79, 0x1b, 0x79, 0x6b, 0xbb, 0xea, 0xf2, 0x56, 0x35, 0x05, 0xc3, 0xaf, 0xc3,
+ 0x10, 0xce, 0xc4, 0xf3, 0x4c, 0xa6, 0xd6, 0x13, 0xaa, 0xbc, 0x5d, 0x70, 0xe4, 0x6a, 0xdb, 0xe5,
+ 0xad, 0x7a, 0x03, 0xb9, 0x78, 0x12, 0x86, 0xa0, 0x94, 0xdf, 0x65, 0x93, 0x95, 0xcd, 0xf5, 0x3b,
+ 0x39, 0xd3, 0x23, 0xea, 0x4e, 0x3a, 0x5d, 0x5e, 0xd7, 0x36, 0x48, 0xf5, 0x85, 0x26, 0x17, 0x15,
+ 0xd3, 0x9c, 0x56, 0x76, 0xcf, 0x3b, 0x72, 0x68, 0x15, 0xce, 0xef, 0xe7, 0xa8, 0x97, 0x6d, 0x70,
+ 0x32, 0x2e, 0xa4, 0x40, 0xe4, 0x51, 0x18, 0xf9, 0x13, 0x02, 0xfd, 0xe6, 0x44, 0x1e, 0xd1, 0xf3,
+ 0x22, 0x2e, 0x38, 0x29, 0xb9, 0xbf, 0xa9, 0x1a, 0xb1, 0xf2, 0x42, 0xc4, 0x10, 0x0c, 0x7f, 0xd7,
+ 0xa3, 0x91, 0x17, 0xb5, 0x7e, 0xa2, 0xfe, 0x41, 0x9c, 0x9f, 0x6b, 0x29, 0xfb, 0xa2, 0x0d, 0x99,
+ 0xa8, 0x6e, 0x45, 0x72, 0xdf, 0x47, 0x24, 0x7b, 0xa8, 0x64, 0x9a, 0x9f, 0x0a, 0x25, 0x13, 0xe7,
+ 0x53, 0xd1, 0xf9, 0x16, 0x1b, 0xa4, 0x12, 0x0a, 0x03, 0x2f, 0xb4, 0x0a, 0xa3, 0xe2, 0x15, 0xdf,
+ 0x34, 0xd6, 0x17, 0xc9, 0xdd, 0x4d, 0x97, 0x94, 0x73, 0x0b, 0x16, 0xd2, 0xc2, 0xc9, 0x17, 0xd7,
+ 0x23, 0x90, 0x4f, 0x0e, 0xf3, 0xfb, 0xb5, 0x88, 0x91, 0x13, 0x8c, 0xa1, 0x53, 0x8b, 0x56, 0x6c,
+ 0x4b, 0xc9, 0xa8, 0x7f, 0x32, 0x02, 0xf9, 0x61, 0xb3, 0xca, 0x81, 0xe8, 0x3d, 0x9b, 0x88, 0x3b,
+ 0x90, 0x6e, 0xc3, 0x92, 0x40, 0x83, 0x49, 0xaf, 0x17, 0xf9, 0x98, 0x82, 0xd1, 0x97, 0xca, 0xb0,
+ 0xd6, 0x2f, 0xc4, 0x6b, 0xf0, 0x3a, 0xcb, 0x26, 0x28, 0x2a, 0x6d, 0x32, 0x56, 0x0f, 0x86, 0x5f,
+ 0x76, 0x66, 0x64, 0x22, 0x34, 0x5a, 0x66, 0x42, 0x9d, 0x3f, 0xd9, 0x7c, 0xde, 0x79, 0x3b, 0xe2,
+ 0xc8, 0xd6, 0x08, 0x4a, 0x00, 0x44, 0xc4, 0x07, 0x4d, 0x32, 0xe2, 0x7f, 0xdc, 0x46, 0x8f, 0xb3,
+ 0xa6, 0x39, 0x34, 0x65, 0x06, 0x6b, 0xe0, 0xd2, 0x92, 0x41, 0x58, 0x5c, 0x67, 0x23, 0x79, 0xa9,
+ 0xc3, 0xbc, 0x66, 0x1f, 0x8f, 0x18, 0xb5, 0xd5, 0x6a, 0xdc, 0xb8, 0x96, 0xd8, 0x12, 0x1b, 0xe4,
+ 0xf6, 0x96, 0x93, 0xaa, 0xaa, 0x42, 0x0d, 0x39, 0xad, 0xc0, 0x6a, 0x1d, 0xb8, 0xe9, 0x63, 0xc9,
+ 0x96, 0x45, 0x93, 0x92, 0x1b, 0xe1, 0xc8, 0x63, 0xd7, 0xf4, 0x0a, 0xb1, 0x40, 0x03, 0xc6, 0xe8,
+ 0x1a, 0xb5, 0x8a, 0x01, 0xc1, 0x12, 0xf3, 0xdf, 0x02, 0xb4, 0x27, 0xf6, 0x1a, 0x47, 0x44, 0x6a,
+ 0x5a, 0x43, 0xc6, 0x1b, 0x05, 0x26, 0x06, 0xc3, 0xcd, 0xdc, 0x00, 0x42, 0xc2, 0xaf, 0xa8, 0x49,
+ 0xac, 0x76, 0x88, 0xf2, 0xb2, 0x9d, 0x3d, 0x65, 0xa7, 0xc6, 0x2d, 0x9b, 0xc9, 0x33, 0x68, 0xe0,
+ 0x7b, 0x0e, 0x13, 0x77, 0x21, 0xeb, 0x6d, 0x35, 0x9a, 0xe6, 0x40, 0x00, 0x14, 0x11, 0xc1, 0xb7,
+ 0x3c, 0xa9, 0x0e, 0x75, 0xed, 0xf7, 0xeb, 0xff, 0xa2, 0xba, 0xc5, 0xcd, 0xf2, 0x70, 0xb7, 0x20,
+ 0xb3, 0x20, 0x0b, 0xff, 0x5d, 0xd1, 0xd9, 0xd5, 0x8d, 0xe7, 0x2f, 0xdd, 0xe9, 0x8f, 0x4f, 0x15,
+ 0x70, 0x65, 0x93, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE sim_probe_xpm[1] = {{ png, sizeof( png ), "sim_probe_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/cpp_26/sim_run.cpp b/bitmaps_png/cpp_26/sim_run.cpp
new file mode 100644
index 0000000000..ebd4a7bc87
--- /dev/null
+++ b/bitmaps_png/cpp_26/sim_run.cpp
@@ -0,0 +1,39 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
+ 0xce, 0x00, 0x00, 0x01, 0x62, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xf8, 0xff, 0xff, 0x3f,
+ 0x03, 0x08, 0x33, 0x4c, 0xb3, 0x11, 0x84, 0xb1, 0x69, 0x81, 0x11, 0x8c, 0x89, 0x76, 0xed, 0x0c,
+ 0x93, 0xed, 0xd7, 0x31, 0x4c, 0xb6, 0x53, 0xa4, 0xad, 0x45, 0x93, 0xed, 0xdb, 0x18, 0x26, 0xd9,
+ 0xff, 0x07, 0xe2, 0x1f, 0x40, 0xdc, 0xca, 0xd0, 0xed, 0xc6, 0x4d, 0x6b, 0x8b, 0x20, 0x78, 0xb2,
+ 0xfd, 0x13, 0x86, 0x49, 0x76, 0xd1, 0x0c, 0xff, 0x19, 0x18, 0xa9, 0x6b, 0x11, 0xc8, 0x17, 0xc8,
+ 0x16, 0x21, 0xf0, 0x51, 0x86, 0xc9, 0x0e, 0x26, 0x54, 0xf4, 0x91, 0x43, 0x0b, 0x0e, 0x8b, 0x40,
+ 0xf8, 0x1f, 0x10, 0xcf, 0x65, 0x98, 0xe0, 0x2c, 0x4e, 0x6b, 0x8b, 0x60, 0xf8, 0x23, 0x30, 0x38,
+ 0x8b, 0x19, 0x66, 0x1a, 0xb3, 0x52, 0x10, 0x74, 0x76, 0xcd, 0x44, 0x58, 0x04, 0xc3, 0x37, 0x81,
+ 0xa9, 0xd4, 0x8b, 0xcc, 0xe4, 0x6d, 0xdf, 0x44, 0x82, 0x45, 0xb0, 0x04, 0xb3, 0x95, 0x61, 0x8a,
+ 0x8d, 0x1a, 0xed, 0x2d, 0x82, 0xe0, 0x5f, 0x0c, 0x93, 0x1c, 0x7a, 0x18, 0x26, 0x99, 0xf3, 0x11,
+ 0x9b, 0xea, 0x1a, 0xc9, 0xb4, 0x08, 0x86, 0x5f, 0x00, 0x83, 0x3f, 0x09, 0x57, 0x76, 0xa0, 0xa6,
+ 0x45, 0x30, 0x7c, 0x06, 0x18, 0x7f, 0x56, 0x78, 0x82, 0xce, 0xa1, 0x81, 0x4a, 0x16, 0x41, 0xb1,
+ 0xc3, 0x12, 0x86, 0x3e, 0x27, 0x69, 0x2c, 0xc9, 0xdb, 0xae, 0x9e, 0xba, 0x16, 0xd9, 0x3f, 0x07,
+ 0xfa, 0x2c, 0x8c, 0x96, 0x16, 0xfd, 0x04, 0xfa, 0xa6, 0x83, 0xa1, 0xd3, 0x9a, 0x17, 0x57, 0x1c,
+ 0xd5, 0x51, 0xc1, 0x92, 0x8d, 0x0c, 0x93, 0x9c, 0x94, 0x09, 0x15, 0xaa, 0xb5, 0x14, 0x58, 0x70,
+ 0x95, 0x61, 0x8a, 0xbd, 0x2b, 0xb1, 0xa5, 0x37, 0x39, 0x16, 0xbd, 0x03, 0xe2, 0x3c, 0x86, 0x06,
+ 0x07, 0x16, 0x12, 0x8a, 0x20, 0x87, 0x1a, 0x12, 0x2c, 0xf8, 0x03, 0x8c, 0xe8, 0xe9, 0x0c, 0x3d,
+ 0x0e, 0x22, 0xe4, 0xd4, 0xb0, 0xd5, 0x44, 0x5a, 0xb2, 0x9f, 0x61, 0x92, 0xa3, 0x3e, 0x25, 0x55,
+ 0x39, 0x21, 0x8b, 0x1e, 0x00, 0x7d, 0x1d, 0x42, 0x8d, 0x8a, 0xaf, 0x0a, 0x87, 0x05, 0x5f, 0xc1,
+ 0xf1, 0x37, 0xdf, 0x81, 0x83, 0x4a, 0x8d, 0x13, 0xfb, 0x4a, 0x2c, 0x96, 0x2c, 0x03, 0xfa, 0x42,
+ 0x86, 0xca, 0xad, 0x20, 0x14, 0x8b, 0xce, 0x32, 0x4c, 0x76, 0xb4, 0xa6, 0x51, 0xe3, 0xc4, 0xa1,
+ 0x02, 0x68, 0xc1, 0x4b, 0x60, 0x09, 0x91, 0xcc, 0xd0, 0xc0, 0xc0, 0x44, 0xbb, 0xe6, 0x16, 0x30,
+ 0x25, 0x11, 0xaa, 0x53, 0x28, 0xc1, 0x00, 0xfb, 0x3a, 0x4b, 0x39, 0x99, 0xc1, 0x7b, 0x69, 0x00,
+ 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE sim_run_xpm[1] = {{ png, sizeof( png ), "sim_run_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/cpp_26/sim_settings.cpp b/bitmaps_png/cpp_26/sim_settings.cpp
new file mode 100644
index 0000000000..f34a624628
--- /dev/null
+++ b/bitmaps_png/cpp_26/sim_settings.cpp
@@ -0,0 +1,40 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
+ 0xce, 0x00, 0x00, 0x01, 0x6e, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xd5, 0x96, 0x3d, 0x4b, 0x03,
+ 0x41, 0x10, 0x40, 0x4f, 0x11, 0x0c, 0x48, 0x30, 0x3f, 0x41, 0x10, 0x5b, 0x05, 0x6d, 0x2c, 0xc4,
+ 0x88, 0x4d, 0x1a, 0xd3, 0x88, 0x8a, 0x90, 0x46, 0x4b, 0x89, 0x16, 0x16, 0x62, 0xa1, 0xf8, 0x0b,
+ 0xa2, 0x95, 0x42, 0x50, 0xc8, 0x5f, 0xb0, 0x52, 0xac, 0x04, 0xc5, 0xca, 0xc2, 0x54, 0x5a, 0x58,
+ 0x89, 0xa0, 0xad, 0x85, 0x9d, 0x5f, 0xe7, 0x5b, 0xd8, 0x83, 0x65, 0x99, 0xdb, 0xec, 0xe6, 0x8c,
+ 0xe8, 0xc0, 0x2b, 0x96, 0xec, 0xdc, 0x5b, 0x36, 0x33, 0x73, 0x17, 0xc5, 0x71, 0x1c, 0xfd, 0x06,
+ 0xd1, 0x9f, 0x13, 0x11, 0xdd, 0xb0, 0x64, 0x50, 0xee, 0x94, 0x68, 0x10, 0x62, 0x83, 0xc7, 0x1f,
+ 0x11, 0x11, 0xf3, 0x30, 0x6e, 0xac, 0xcb, 0x96, 0xe8, 0x03, 0x7a, 0xf4, 0x6f, 0x5d, 0xb0, 0x0a,
+ 0x03, 0x41, 0x22, 0xa2, 0xa2, 0x1f, 0xf4, 0x06, 0xdb, 0xb0, 0x0b, 0x2f, 0x96, 0x48, 0x71, 0x07,
+ 0x55, 0x38, 0xd1, 0xeb, 0x87, 0x34, 0x99, 0x4b, 0x12, 0xb7, 0x89, 0x28, 0x93, 0x44, 0x47, 0x19,
+ 0x24, 0xc9, 0x95, 0x16, 0x7d, 0x44, 0x79, 0x7d, 0xaa, 0x76, 0x45, 0x3b, 0x21, 0xff, 0xd1, 0x8d,
+ 0xf0, 0x80, 0x27, 0x58, 0x81, 0x51, 0x98, 0x86, 0x1a, 0xbc, 0x0b, 0xfb, 0x16, 0x5a, 0x8a, 0x88,
+ 0x1c, 0xcc, 0x08, 0xc9, 0xf7, 0x50, 0x10, 0x0e, 0x54, 0x84, 0x4f, 0x6b, 0xef, 0x15, 0xf4, 0xa7,
+ 0x8a, 0x88, 0x3d, 0xc7, 0x75, 0x94, 0x1c, 0x6d, 0xd0, 0x48, 0xc9, 0x79, 0x86, 0x31, 0x49, 0x54,
+ 0x4f, 0x49, 0x50, 0x27, 0xee, 0x73, 0x88, 0x2a, 0x8e, 0x03, 0x4e, 0x85, 0x88, 0x54, 0x15, 0xe5,
+ 0x1c, 0xa2, 0xc5, 0x50, 0x51, 0xcd, 0x91, 0x30, 0xe9, 0x10, 0xed, 0x07, 0x89, 0x8c, 0xd2, 0x2e,
+ 0xc1, 0x97, 0x95, 0xd0, 0x84, 0x5e, 0x41, 0x32, 0xa2, 0xa7, 0x87, 0x2d, 0x58, 0x87, 0x21, 0x35,
+ 0x9a, 0x5a, 0x95, 0xf7, 0x99, 0x90, 0x7c, 0x0b, 0xb3, 0xaa, 0xeb, 0x61, 0x18, 0x36, 0xe0, 0x55,
+ 0xda, 0xe7, 0x3b, 0x82, 0xd4, 0x80, 0x3c, 0xcf, 0xd0, 0xb0, 0x97, 0xea, 0x95, 0xe2, 0x23, 0xaa,
+ 0x66, 0x1c, 0x41, 0x8a, 0x2d, 0x1f, 0xd1, 0x5c, 0x4a, 0xc7, 0x87, 0x70, 0xe8, 0x3b, 0x82, 0x4c,
+ 0xd9, 0x05, 0x9c, 0x0a, 0x05, 0x92, 0x70, 0x0d, 0xc7, 0xc6, 0xba, 0xe1, 0x75, 0x75, 0x96, 0x6c,
+ 0x2d, 0xa9, 0x1c, 0x5d, 0x8d, 0xb6, 0x64, 0xd3, 0xd8, 0xbf, 0x0c, 0x07, 0x92, 0x24, 0xf4, 0x55,
+ 0x9e, 0x17, 0x44, 0x13, 0x1d, 0xf9, 0x0a, 0xd2, 0x4d, 0x5d, 0x37, 0x28, 0xfc, 0xdf, 0xcf, 0xad,
+ 0xac, 0x7c, 0x03, 0x01, 0x1d, 0x36, 0xf5, 0x73, 0x3f, 0xe1, 0xc4, 0x00, 0x00, 0x00, 0x00, 0x49,
+ 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE sim_settings_xpm[1] = {{ png, sizeof( png ), "sim_settings_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/cpp_26/sim_stop.cpp b/bitmaps_png/cpp_26/sim_stop.cpp
new file mode 100644
index 0000000000..bf363abc76
--- /dev/null
+++ b/bitmaps_png/cpp_26/sim_stop.cpp
@@ -0,0 +1,23 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
+ 0xce, 0x00, 0x00, 0x00, 0x5a, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xf8, 0xff, 0xff, 0x3f,
+ 0x03, 0x3d, 0x30, 0xc3, 0xf0, 0xb5, 0xe8, 0x8c, 0xb1, 0x31, 0xeb, 0x2d, 0x55, 0xd9, 0x65, 0x40,
+ 0xbc, 0x94, 0x1a, 0xf8, 0xb6, 0x8a, 0x6c, 0x2b, 0x56, 0x8b, 0xee, 0x2b, 0x28, 0x70, 0x00, 0x15,
+ 0xfc, 0x04, 0xe2, 0xff, 0x54, 0xc2, 0x07, 0x47, 0x2d, 0x1a, 0xb5, 0x68, 0xd4, 0xa2, 0x51, 0x8b,
+ 0x46, 0x2d, 0x1a, 0xb5, 0x68, 0xd4, 0xa2, 0xdb, 0x2a, 0x2a, 0xec, 0x40, 0xc9, 0x2b, 0xb7, 0x54,
+ 0xe5, 0xae, 0x51, 0x03, 0xdf, 0x54, 0x93, 0x5d, 0x39, 0x42, 0x5a, 0x41, 0xb4, 0xc6, 0x00, 0xc9,
+ 0x67, 0x4f, 0x6a, 0x0a, 0x58, 0xfb, 0xec, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
+ 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE sim_stop_xpm[1] = {{ png, sizeof( png ), "sim_stop_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/cpp_26/sim_tune.cpp b/bitmaps_png/cpp_26/sim_tune.cpp
new file mode 100644
index 0000000000..5c3c4d368c
--- /dev/null
+++ b/bitmaps_png/cpp_26/sim_tune.cpp
@@ -0,0 +1,44 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
+ 0xce, 0x00, 0x00, 0x01, 0xad, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xf8, 0xff, 0xff, 0x3f,
+ 0x03, 0x3d, 0x30, 0x4d, 0x0d, 0x57, 0x13, 0x2e, 0x94, 0xa6, 0xa9, 0x45, 0x1a, 0x22, 0x45, 0x6a,
+ 0x1a, 0x62, 0x79, 0xbb, 0x35, 0xc4, 0xf2, 0xbf, 0x6b, 0x89, 0xe7, 0x9b, 0xd3, 0xc4, 0x22, 0x35,
+ 0x89, 0x7c, 0x53, 0xa0, 0x05, 0x5f, 0x80, 0xf8, 0xbf, 0xba, 0x58, 0xfe, 0x7b, 0x15, 0x89, 0x5c,
+ 0x51, 0xaa, 0x5b, 0x64, 0x20, 0x50, 0x20, 0x00, 0xb4, 0xe0, 0x32, 0xc8, 0x12, 0x10, 0xd6, 0x14,
+ 0x2d, 0xc8, 0xa6, 0x7a, 0xd0, 0x69, 0x8b, 0x66, 0xf1, 0x00, 0x0d, 0x3f, 0x0e, 0xb5, 0xe4, 0x27,
+ 0x30, 0xe8, 0xea, 0xa9, 0x9e, 0x18, 0x64, 0x64, 0x0a, 0x39, 0x35, 0xc4, 0x0b, 0x0e, 0x40, 0x2d,
+ 0xf9, 0xaa, 0x29, 0x5e, 0xe8, 0x42, 0xf5, 0x54, 0xa7, 0xa2, 0x92, 0xcb, 0xae, 0x21, 0x56, 0xb0,
+ 0x13, 0x6a, 0xc9, 0x27, 0x2d, 0xd1, 0x42, 0x5b, 0xaa, 0x27, 0x6f, 0x63, 0x86, 0x34, 0x56, 0xa0,
+ 0xe1, 0x1b, 0xc1, 0x96, 0x88, 0xe7, 0xbf, 0x53, 0x93, 0x28, 0x34, 0xa3, 0x7a, 0x3e, 0x62, 0x60,
+ 0x08, 0x65, 0xd6, 0x14, 0x2f, 0x58, 0x09, 0xf5, 0xc9, 0x2b, 0x6d, 0xd1, 0x02, 0x03, 0xaa, 0x67,
+ 0x58, 0x20, 0x60, 0x04, 0x1a, 0xbe, 0x10, 0x6a, 0xc9, 0x33, 0x6d, 0x89, 0x5c, 0x2d, 0x9a, 0x94,
+ 0x0c, 0x40, 0xc3, 0x67, 0x40, 0x2d, 0x79, 0xa8, 0x2d, 0x5a, 0xa8, 0x42, 0x93, 0x22, 0x48, 0x5d,
+ 0x34, 0xbf, 0x1f, 0x9c, 0x47, 0xc4, 0xf2, 0xef, 0x68, 0x4a, 0x66, 0xcb, 0x53, 0xad, 0xac, 0xd3,
+ 0x10, 0xcd, 0xcf, 0x01, 0xa6, 0xaa, 0x6e, 0x07, 0x86, 0x06, 0x16, 0x6d, 0x99, 0x42, 0x21, 0xa0,
+ 0x25, 0xb7, 0x80, 0x11, 0x7f, 0x5d, 0x5d, 0x24, 0x47, 0x8a, 0xaa, 0x85, 0x2a, 0x3c, 0xe9, 0x8a,
+ 0xe6, 0xef, 0x03, 0x59, 0x04, 0xf2, 0x85, 0xb2, 0x78, 0x89, 0x18, 0x55, 0x4b, 0x6f, 0x4d, 0x91,
+ 0x02, 0x23, 0xa0, 0x25, 0xcf, 0x61, 0x45, 0x0a, 0x10, 0x1f, 0x03, 0xe5, 0x1b, 0xaa, 0x55, 0x13,
+ 0x6a, 0x52, 0xc5, 0x22, 0xc0, 0x38, 0x98, 0x0e, 0x34, 0xf8, 0x2f, 0x92, 0x25, 0x90, 0xf2, 0x4b,
+ 0x3c, 0x6f, 0x2e, 0x55, 0x2c, 0x02, 0x5a, 0x10, 0x07, 0x34, 0xf0, 0x03, 0xba, 0x05, 0x50, 0xfc,
+ 0x16, 0x58, 0x22, 0xef, 0xa1, 0xd8, 0x22, 0xa0, 0x41, 0xe9, 0x40, 0xfc, 0x0f, 0x87, 0x25, 0x75,
+ 0x54, 0xa9, 0x61, 0x81, 0xa5, 0xaf, 0x04, 0xac, 0x1e, 0xc1, 0xc4, 0x05, 0x0f, 0x40, 0x05, 0x27,
+ 0x55, 0x2c, 0x42, 0xca, 0x84, 0x18, 0x18, 0x98, 0x77, 0x42, 0xa9, 0xd2, 0x66, 0x50, 0x13, 0xce,
+ 0xd1, 0x00, 0x1a, 0xf8, 0x1b, 0xab, 0x45, 0xe2, 0xf9, 0x5b, 0xa8, 0xd6, 0x38, 0x01, 0x26, 0x80,
+ 0xc5, 0x38, 0x7c, 0x73, 0x50, 0x4f, 0xbc, 0x84, 0x9b, 0x6a, 0x16, 0x21, 0xd5, 0x8c, 0x30, 0x7c,
+ 0x0f, 0xe8, 0x93, 0x28, 0x50, 0xe1, 0x49, 0xd5, 0xe6, 0x96, 0x86, 0x68, 0x41, 0x02, 0xa8, 0xd2,
+ 0x02, 0xc6, 0xc5, 0x23, 0x75, 0xf1, 0xbc, 0x7c, 0x6d, 0xed, 0x06, 0xb6, 0x21, 0xd5, 0xae, 0x43,
+ 0xc6, 0x00, 0xc1, 0x11, 0xfb, 0x4d, 0x3d, 0x78, 0x20, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
+ 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE sim_tune_xpm[1] = {{ png, sizeof( png ), "sim_tune_xpm" }};
+
+//EOF
diff --git a/bitmaps_png/sources/sim_add_signal.svg b/bitmaps_png/sources/sim_add_signal.svg
new file mode 100644
index 0000000000..94ba6db4c1
--- /dev/null
+++ b/bitmaps_png/sources/sim_add_signal.svg
@@ -0,0 +1,874 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="26"
+   width="26"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="sim_add_signal.svg">
+  <metadata
+     id="metadata50">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1000"
+     id="namedview48"
+     showgrid="true"
+     inkscape:zoom="18.980741"
+     inkscape:cx="10.347211"
+     inkscape:cy="9.8544862"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-to-guides="false"
+     inkscape:snap-grids="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3006"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <style
+       id="style3201"
+       type="text/css">
+    .fil0 {fill:#00923F}
+   </style>
+    <style
+       id="style3753"
+       type="text/css">
+    @font-face { font-family:&quot;Times New Roman&quot;;src:url(&quot;#FontID0&quot;) format(svg)}
+    .str1 {stroke:white;stroke-width:0.0762}
+    .str0 {stroke:#28166F;stroke-width:5.6444}
+    .fil1 {fill:none}
+    .fil2 {fill:#28166F}
+    .fil3 {fill:white}
+    .fil0 {fill:#28166F;fill-rule:nonzero}
+    .fnt0 {font-weight:normal;font-size:23.2785;font-family:'Times New Roman'}
+   </style>
+    <font
+       font-weight="400"
+       style="fill-rule:nonzero"
+       font-variant="normal"
+       id="FontID0">
+      <font-face
+         id="font-face3377"
+         font-family="Times New Roman" />
+      <missing-glyph
+         id="missing-glyph3379">
+        <path
+           id="path3381"
+           d="M0 0z" />
+      </missing-glyph>
+      <glyph
+         id="glyph3383"
+         horiz-adv-x="277"
+         unicode="/">
+        <path
+           id="path3385"
+           d="M280.332 694.332l-239.831 -707.997 -39.0017 0 239.668 707.997 39.1649 0z" />
+      </glyph>
+      <glyph
+         id="glyph3387"
+         horiz-adv-x="249"
+         unicode=".">
+        <path
+           id="path3389"
+           d="M124.999 94.6668c15.3317,0 28.1676,-5.16786 38.499,-15.8344 10.5033,-10.499 15.6668,-23.3305 15.6668,-38.3315 0,-15.001 -5.3311,-27.6693 -15.8301,-38.3358 -10.5033,-10.499 -23.3348,-15.8301 -38.3358,-15.8301 -15.001,0 -27.8325,5.3311 -38.3315,15.8301 -10.5033,10.6665 -15.8344,23.3348 -15.8344,38.3358 0,15.3317 5.3311,28.1676 15.8344,38.6666 10.499,10.3314 23.3305,15.4993 38.3315,15.4993z" />
+      </glyph>
+      <glyph
+         id="glyph3391"
+         horiz-adv-x="332"
+         unicode="-">
+        <path
+           id="path3393"
+           d="M40.5009 261.168l252.499 0 0 -73.6688 -252.499 0 0 73.6688z" />
+      </glyph>
+      <glyph
+         id="glyph3395"
+         horiz-adv-x="249"
+         unicode=",">
+        <path
+           id="path3397"
+           d="M53.6675 -166.501l0 21.5005c33.4987,11.0016 59.5013,28.1676 77.999,51.5025 18.3345,23.3305 27.5018,47.9971 27.5018,73.9996 0,6.16449 -1.50353,11.3323 -4.33447,15.6668 -2.33262,2.83094 -4.66525,4.33018 -6.83463,4.33018 -3.66433,0 -11.4999,-3.33355 -23.4981,-9.83311 -5.83371,-2.83094 -12.0025,-4.33018 -18.5021,-4.33018 -15.9976,0 -28.6659,4.66525 -38.164,14.1633 -9.33479,9.50233 -14.1676,22.5014 -14.1676,39.0017 0,16.0019 6.16449,29.6669 18.3345,40.9992 12.1657,11.4999 27.1667,17.1661 44.6635,17.1661 21.5005,0 40.6684,-9.3305 57.3362,-28.1633 16.831,-18.6696 25.1649,-43.5037 25.1649,-74.3347 0,-33.4987 -11.6674,-64.6691 -34.8347,-93.5026 -23.3305,-28.8292 -60.1671,-51.4982 -110.664,-68.1659z" />
+      </glyph>
+      <glyph
+         id="glyph3399"
+         horiz-adv-x="564"
+         unicode="+">
+        <path
+           id="path3401"
+           d="M261.168 68.8318l0 243.667 -243.169 0 0 40.0026 243.169 0 0 242.666 39.1649 0 0 -242.666 244.165 0 0 -40.0026 -244.165 0 0 -243.667 -39.1649 0z" />
+      </glyph>
+      <glyph
+         id="glyph3403"
+         horiz-adv-x="499"
+         unicode="*">
+        <path
+           id="path3405"
+           d="M241.167 509.835c-1.3317,22.3296 -5.83371,44.6635 -13.665,66.8299 -11.0016,31.8362 -16.5002,53.8351 -16.5002,65.8333 0,17.0028 3.9994,29.8344 11.8307,38.6666 8.00309,8.83648 17.8362,13.1667 29.6669,13.1667 10.0006,0 18.8328,-4.33018 26.3333,-13.1667 7.50048,-8.83218 11.1691,-21.333 11.1691,-37.6657 0,-14.6659 -4.33447,-34.998 -12.8359,-61.168 -8.66465,-26.3333 -14,-50.4972 -15.9976,-72.4961 17.9994,11.3323 33.997,25.1649 48.3322,41.4975 22.1664,25.6675 38.6666,41.6694 49.3331,47.8338 10.834,6.16878 21.6681,9.16726 32.8329,9.16726 10.6665,0 19.6662,-3.66862 26.9992,-11.0016 7.33295,-7.16541 11.0016,-15.9976 11.0016,-25.9982 0,-12.1657 -5.3354,-22.8322 -16.1651,-32.3346 -10.6665,-9.33479 -37.5024,-18.8328 -80.5035,-28.3309 -24.9973,-5.50293 -45.832,-11.835 -62.4997,-19.0004 17.0028,-8.83648 37.67,-15.5036 62.0014,-20.0013 39.3324,-7.16541 65.1674,-16.1651 77.3332,-26.8316 12.3333,-10.834 18.3345,-22.5014 18.3345,-35.1698 0,-9.83311 -3.66862,-18.167 -11.0016,-25.3324 -7.33295,-7.16541 -15.8344,-10.834 -25.4999,-10.834 -9.83311,0 -20.6671,3.50108 -32.4978,10.3357 -11.835,6.83034 -28.0001,22.1664 -48.1689,45.832 -13.3342,16.0019 -29.8344,30.9986 -49.8314,44.9986 0.66585,-18.6653 4.49771,-38.8341 11.3323,-60.6654 11.6674,-38.3315 17.5011,-64.5016 17.5011,-78.5016 0,-12.9991 -3.83616,-23.9964 -11.6674,-33.0004 -7.83556,-8.99972 -16.1694,-13.4974 -24.8341,-13.4974 -12.1657,0 -22.9998,4.83279 -32.8329,14.1676 -6.83463,6.83034 -10.1682,17.8319 -10.1682,32.8329 0,15.4993 3.66862,34.3321 11.1691,56.3309 7.50048,22.0031 12.1657,37.1673 14.1633,45.3337 2.00185,8.33387 3.83616,20.6671 5.3354,36.9998 -19.1679,-12.8316 -35.9989,-26.8316 -50.1665,-42.4984 -23.8332,-26.6684 -41.6651,-43.6669 -53.8351,-50.8323 -8.49711,-5.16786 -17.1661,-7.83556 -26.3333,-7.83556 -10.9973,0 -20.4996,3.83616 -28.3309,11.3323 -7.83556,7.50048 -11.6674,15.6668 -11.6674,24.8341 0,8.16633 3.33355,16.6677 10.0006,25.6675 6.6671,8.99972 16.6677,16.3327 29.9976,22.1664 8.83648,3.9994 28.8335,9.16726 59.9996,15.6668 20.1688,4.16694 40.0026,10.3357 59.1705,18.5021 -17.6687,8.83218 -38.6666,15.6668 -63.0023,20.4996 -39.9983,8.49711 -64.8324,16.1651 -74.1671,22.9998 -14.6659,10.6665 -21.9988,23.8332 -21.9988,38.9974 0,8.83648 3.66433,16.8353 11.0016,24.1682 7.33295,7.33295 15.8301,11.0016 25.6632,11.0016 10.6665,0 22.0031,-3.33355 34.1689,-10.1682 11.9982,-6.83463 26.9992,-20.6671 44.8311,-41.3343 18.0037,-20.6671 36.1664,-36.6647 54.6685,-47.9971z" />
+      </glyph>
+      <glyph
+         id="glyph3407"
+         horiz-adv-x="332"
+         unicode=")">
+        <path
+           id="path3409"
+           d="M22.5014 673.832l0 20.4996c49.5006,-24.3315 90.6674,-53.1649 123.5,-86.5004 46.4978,-47.4988 82.4967,-103.164 107.833,-167.163 25.4999,-64.0033 38.164,-130.67 38.164,-200 0,-100.836 -24.8341,-192.835 -74.4979,-276.001 -49.6681,-83.1669 -114.668,-142.668 -195,-178.499l0 17.9994c39.9983,22.5014 72.9987,52.8342 98.8337,91.1657 25.8307,38.1683 45.1661,86.8355 57.6669,146.002 12.4965,58.9986 18.8328,120.665 18.8328,184.664 0,69.3344 -5.50293,132.667 -16.1694,190.004 -8.16633,44.9986 -18.3302,80.83 -30.5002,107.997 -12.3333,27.0035 -28.4984,53.0017 -48.6672,78.0033 -20.1645,25.1649 -46.8329,48.998 -79.9966,71.8302z" />
+      </glyph>
+      <glyph
+         id="glyph3411"
+         horiz-adv-x="332"
+         unicode="(">
+        <path
+           id="path3413"
+           d="M310.501 -195.833l0 -17.9994c-49.1698,24.6665 -90.169,53.6675 -123.002,86.8312 -46.8329,47.168 -82.9993,102.833 -108.332,167 -25.4999,64.1665 -38.1683,130.67 -38.1683,199.669 0,100.999 25.0016,192.998 74.6655,276.165 49.8357,83.1669 114.836,142.668 194.836,178.499l0 -20.4996c-40.0026,-22.1664 -72.8354,-52.3316 -98.6662,-90.8306 -25.6675,-38.3358 -44.8354,-87.003 -57.5037,-146.002 -12.664,-58.8311 -18.9961,-120.502 -18.9961,-184.501 0,-69.6651 5.3311,-132.998 15.9976,-189.999 8.50141,-44.9986 18.8328,-81.0018 30.8353,-108.168 11.9982,-27.1667 28.1633,-53.3325 48.4997,-78.3298 20.3321,-25.1691 47.0005,-49.0023 79.8333,-71.8345z" />
+      </glyph>
+      <glyph
+         id="glyph3415"
+         horiz-adv-x="180"
+         unicode="'">
+        <path
+           id="path3417"
+           d="M77.1656 392.169l-26.3333 144.498c-7.50048,39.9983 -11.3323,67.0017 -11.3323,81.0018 0,20.8304 4.33447,35.9989 12.6683,45.4969 8.49711,9.33479 20.1645,14 34.6629,14 14.6702,0 26.8359,-4.66525 36.5015,-14.3308 9.50233,-9.66987 14.3351,-22.1664 14.3351,-37.8332 0,-12.0025 -4.16694,-41.6694 -12.6683,-88.833l-26.3333 -144 -21.5005 0z" />
+      </glyph>
+      <glyph
+         id="glyph3419"
+         horiz-adv-x="777"
+         unicode="&amp;">
+        <path
+           id="path3421"
+           d="M510.334 426.333l205 0 0 -18.167c-28.3352,-2.16509 -49.1655,-8.50141 -62.6673,-18.8328 -13.665,-10.1682 -34.6672,-41.1667 -63.3331,-93 -28.6659,-51.6657 -60.833,-100.002 -96.6686,-145.001 29.001,-33.8338 54.836,-57.4994 77.6682,-71.0011 22.8322,-13.4974 45.6688,-20.3321 68.8318,-20.3321 22.5014,0 41.5018,6.16878 57.1686,18.3345 15.4993,12.1657 26.6684,30.1652 33.1679,53.9983l17.9994 -13.1667c-12.0025,-45.9995 -31.3336,-79.8333 -58.002,-101.665 -26.6641,-21.6681 -57.8302,-32.6696 -93.3308,-32.6696 -26.6684,0 -53.8351,7.33724 -81.3369,21.8356 -27.4975,14.3308 -57.4994,38.8341 -89.9972,73.3338 -40.3334,-35.6681 -76.8348,-60.5022 -109.169,-74.3347 -32.3303,-13.8325 -66.9974,-20.8347 -103.83,-20.8347 -53.6675,0 -96.3335,14.3351 -127.835,43.0011 -31.6687,28.6659 -47.3355,62.8348 -47.3355,102.502 0,39.5 14.1676,78.6649 42.5027,117.997 28.3309,39.1692 81.5001,79.8333 159.667,121.833 -15.336,33.8338 -25.835,61.5031 -31.3336,83.1669 -5.49864,21.6681 -8.33387,42.5027 -8.33387,62.3322 0,55.6694 20.4996,98.1678 61.4988,127.336 31.9995,22.8322 68.3334,34.1646 109.002,34.1646 38.6666,0 70.331,-11.3323 94.6668,-34.3321 24.499,-22.9998 36.6647,-51.1674 36.6647,-84.6661 0,-34.4996 -11.8307,-64.8324 -35.5006,-90.8349 -23.4981,-26.1658 -65.3307,-54.5009 -125.167,-85.4995 41.3343,-73.5013 84.5029,-141.001 129.334,-202.165 57.3362,68.3334 86.0021,126 86.0021,172.833 0,14.9967 -4.83279,28.3309 -14.6659,39.9983 -7.16971,8.83218 -17.3336,14 -30.6678,15.6668l0 18.167zm-186.666 -12.8316c40.5009,19.3311 70.6661,41.1667 90.6674,65.4982 19.997,24.499 29.9976,51.6657 29.9976,81.5001 0,23.4981 -7.16541,42.8335 -21.6681,58.1653 -14.4984,15.336 -32.4978,22.9998 -53.9983,22.9998 -28.3352,0 -49.6681,-9.83311 -64.1665,-29.6669 -14.4984,-19.6662 -21.8313,-38.9974 -21.8313,-57.8302 0,-16.0019 2.83094,-33.6663 8.32957,-53.5 5.50293,-19.6662 16.5002,-48.6672 32.6696,-87.1663zm75.6664 -305.17c-42.8335,58.6679 -72.6679,101.501 -89.3357,128.501 -16.5002,26.9992 -34.8304,60.5022 -54.6642,100.5 -39.0017,-22.3339 -68.3334,-47.168 -88.1672,-74.1671 -19.6662,-26.9992 -29.4993,-56.3309 -29.4993,-87.8321 0,-34.8347 11.3323,-65.4982 33.6663,-91.8315 22.4972,-26.3333 52.8342,-39.5 90.8306,-39.5 20.5039,0 40.3334,3.9994 59.3337,12.1657 19.0004,8.16633 45.0029,25.4999 77.8358,52.164z" />
+      </glyph>
+      <glyph
+         id="glyph3423"
+         horiz-adv-x="833"
+         unicode="%">
+        <path
+           id="path3425"
+           d="M679.666 677.166l-482.333 -704.5 -43.4994 0 482.333 704.5 43.4994 0zm-502 0c44.002,0 78.1665,-18.167 102.335,-54.6642 24.3315,-36.334 36.334,-78.1665 36.334,-125.502 0,-56.4985 -13.6693,-100.333 -41.0035,-131.331 -27.3299,-30.8353 -60.1628,-46.3346 -98.4986,-46.3346 -25.8307,0 -49.3331,7.00217 -70.8336,21.1655 -21.5005,14.1676 -38.6666,35.333 -51.4982,63.3331 -12.8359,28.0001 -19.3354,59.0029 -19.3354,93.1675 0,34.3321 6.49956,65.6657 19.503,94.4992 12.9991,28.8335 30.831,50.334 53.5,64.5016 22.6647,14.1676 45.832,21.1655 69.4976,21.1655zm-1.3317 -27.3342c-16.6677,0 -31.3336,-9.66557 -44.3328,-29.1643 -12.8359,-19.6662 -19.1679,-60.6654 -19.1679,-123.165 0,-45.1704 3.50108,-79.6701 10.6665,-103.503 5.49864,-17.8319 14.1676,-31.6644 25.835,-41.4975 6.99787,-5.83371 15.3317,-8.66894 25.4999,-8.66894 15.6668,0 28.9967,8.33387 39.9983,25.3324 16.3327,25.0016 24.499,66.8342 24.499,125.502 0,61.8339 -7.9988,105.333 -24.0007,130.335 -10.3314,16.6634 -23.4981,24.8298 -38.9974,24.8298zm480.834 -321.163c23.163,0 46.1628,-7.33295 69.1668,-22.0031 22.9998,-14.6659 40.6641,-35.9989 53.1649,-63.999 12.5008,-28.0001 18.8328,-58.6679 18.8328,-92.3341 0,-57.4994 -13.8325,-101.665 -41.5018,-131.997 -27.665,-30.5002 -60.3303,-45.6688 -98.1635,-45.6688 -23.6699,0 -46.8329,7.33295 -68.9993,21.9988 -22.3339,14.6702 -40.0026,35.5006 -52.8342,62.6673 -12.8359,27.1667 -19.3354,58.1696 -19.3354,93 0,34.1689 6.49956,65.5025 19.3354,93.8334 12.8316,28.3352 30.5002,49.5006 52.8342,63.5007 22.1664,14 44.8311,21.0022 67.5001,21.0022zm0.498314 -26.0025c-15.4993,0 -29.1685,-8.66465 -40.5009,-26.3333 -14.6659,-22.8322 -21.9988,-65.8333 -21.9988,-129.334 0,-58.3328 7.50048,-98.9969 22.5014,-122.164 10.9973,-16.5002 24.499,-24.8341 39.9983,-24.8341 15.001,0 28.3352,8.99972 40.1658,26.8316 15.4993,23.8332 23.3348,64.6691 23.3348,122.504 0,61.3313 -7.83556,104.165 -23.3348,128.496 -10.834,16.6677 -24.1682,24.8341 -40.1658,24.8341z" />
+      </glyph>
+      <glyph
+         id="glyph3427"
+         horiz-adv-x="499"
+         unicode="$">
+        <path
+           id="path3429"
+           d="M52.6666 163.168l21.5005 0c3.66433,-44.6678 17.6644,-78.8324 42.0001,-102.67 24.499,-23.6656 61.0005,-37.8332 109.5,-42.4984l0 285.169c-73.3338,45.3337 -122.169,85.332 -146.5,120.167 -17.3336,24.6665 -26.0025,54.8317 -26.0025,90.3323 0,39.9983 15.001,75.0005 44.6678,104.998 29.8344,30.0019 72.3328,48.0014 127.835,54.1702l0 44.9986 31.1661 0 0 -44.9986c26.6684,-1.66677 49.1655,-4.66954 67.3325,-9.33479 9.50233,-2.16938 40.6684,-13.5017 93.8334,-33.6663l0 -146.002 -19.0004 0c-4.33447,51.8332 -17.6644,89.6664 -40.3334,113.5 -22.6647,24.0007 -56.4985,38.1683 -101.832,42.8335l0 -247.997c81.9984,-57.3362 134.665,-99.6671 158,-126.834 23.1673,-27.1667 34.8347,-60.833 34.8347,-101.334 0,-44.8354 -17.0028,-84.3353 -50.9998,-118.667 -34.0013,-34.1689 -81.3369,-53.8351 -141.835,-58.9986l0 -62.4997 -31.1661 0 0 62.4997c-30.6678,1.3317 -59.1662,4.83279 -85.4995,10.499 -26.3333,5.66617 -55.5019,15.001 -87.5013,28.0001l0 138.334zm173.001 249.501l0 226.999c-32.6653,-3.9994 -56.8336,-14.3351 -72.6679,-31.0029 -15.6668,-16.831 -23.6656,-37.8332 -23.6656,-63.3331 0,-23.6656 7.16541,-45.832 21.5005,-66.4991 14.3308,-20.6671 39.3324,-42.8335 74.833,-66.1641zm31.1661 -394.669c24.499,4.33447 43.1643,10.3357 56.1677,18.167 18.167,11.3323 32.6653,26.3333 43.1643,44.6678 10.6665,18.3345 15.8344,38.0007 15.8344,58.8311 0,21.5005 -6.33202,41.8326 -19.1679,61.0005 -12.8316,19.1679 -44.8311,46.3346 -95.9985,81.5001l0 -264.167z" />
+      </glyph>
+      <glyph
+         id="glyph3431"
+         horiz-adv-x="499"
+         unicode="#">
+        <path
+           id="path3433"
+           d="M56.1677 -13.665l45.3337 222.166 -83.5019 0 0 39.9983 91.3332 0 33.6663 167.502 -124.999 0 0 38.9974 134.334 0 44.5003 222.166 40.5009 0 -44.5003 -222.166 164.667 0 47.3312 222.166 40.5009 0 -46.3346 -222.166 82.9993 0 0 -38.9974 -90.3323 0 -34.1646 -167.502 124.497 0 0 -39.9983 -132.831 0 -45.5012 -222.166 -39.5 0 44.5003 222.166 -165.668 0 -46.3303 -222.166 -40.5009 0zm94.1641 262.165l165.668 0 35.0023 167.502 -166.501 0 -34.1689 -167.502z" />
+      </glyph>
+      <glyph
+         id="glyph3435"
+         horiz-adv-x="408"
+         unicode="&quot;">
+        <path
+           id="path3437"
+           d="M281.333 392.169l-26.5008 142.496 -10.6665 59.1662c-0.66585,8.00309 -0.996628,16.1694 -0.996628,24.3358 0,20.4996 4.49771,35.5006 13.665,44.9986 9.16726,9.33479 21.1655,14 36.1664,14 14,0 25.6675,-4.66525 34.8347,-14 9.3305,-9.49803 14,-22.1664 14,-38.164 0,-27.6693 -3.16601,-57.6669 -9.33479,-89.834l-27.8325 -142.999 -23.3348 0zm-178.835 0l-26.8316 144.498c-7.16541,39.6675 -10.6665,66.6667 -10.6665,81.0018 0,20.8304 4.33447,35.9989 12.8316,45.4969 8.66894,9.33479 20.3364,14 35.0023,14 14.3308,0 26.1658,-4.66525 35.6681,-14.3308 9.3305,-9.66987 14.1633,-22.3339 14.1633,-38.3358 0,-12.664 -4.33018,-42.1677 -12.8316,-88.3304l-26.3333 -144 -21.0022 0z" />
+      </glyph>
+      <glyph
+         id="glyph3439"
+         horiz-adv-x="332"
+         unicode="!">
+        <path
+           id="path3441"
+           d="M175.832 175.333l-18.6653 0 -42.8335 395.498c-1.99755,17.1704 -2.99847,30.0019 -2.99847,38.5033 0,20.4996 5.49864,36.9998 16.3327,49.3331 11.0016,12.3333 24.0007,18.4978 39.3324,18.4978 15.3317,0 28.1676,-6.16449 38.8341,-18.4978 10.499,-12.3333 15.8344,-30.6678 15.8344,-55.1668 0,-7.83556 -0.670146,-18.6696 -2.00185,-32.6696l-43.8344 -395.498zm-9.83311 -81.165c15.001,0 27.8325,-5.16786 38.3358,-15.8344 10.6665,-10.499 15.8301,-23.1673 15.8301,-37.8332 0,-15.001 -5.16356,-27.6693 -15.8301,-38.3358 -10.5033,-10.499 -23.3348,-15.8301 -38.3358,-15.8301 -14.9967,0 -27.665,5.3311 -38.3315,15.8301 -10.499,10.6665 -15.8344,23.3348 -15.8344,38.3358 0,14.6659 5.3354,27.3342 15.8344,37.8332 10.6665,10.6665 23.3348,15.8344 38.3315,15.8344z" />
+      </glyph>
+      <glyph
+         id="glyph3443"
+         horiz-adv-x="249"
+         unicode=" " />
+      <glyph
+         id="glyph3445"
+         horiz-adv-x="443"
+         unicode="?">
+        <path
+           id="path3447"
+           d="M221.668 156.333l-20.0013 0c2.33262,40.9992 7.33295,74.833 15.3317,101.669 8.00309,26.8316 24.5033,64.3297 49.6681,112.164 19.4987,36.669 32.167,64.9999 38.0007,84.6661 5.83371,19.6662 8.83218,39.6675 8.83218,59.8363 0,41.33 -11.0016,74.1671 -33.0004,98.6662 -21.9988,24.3315 -48.8305,36.4972 -80.8342,36.4972 -28.3309,0 -50.4972,-6.6628 -66.8299,-19.997 -16.337,-13.3342 -24.5033,-27.8325 -24.5033,-43.3361 0,-12.1657 5.00032,-26.9992 14.6702,-44.5003 9.83311,-17.6644 14.6659,-30.9986 14.6659,-39.9983 0,-11.835 -3.66862,-21.6681 -11.1691,-29.6669 -7.50048,-7.83126 -16.6634,-11.835 -27.3299,-11.835 -13.6693,0 -26.1701,6.6671 -37.3349,20.1688 -11.3323,13.5017 -16.8353,32.3346 -16.8353,56.4985 0,36.669 15.6668,69.3344 47.3355,97.6695 31.5012,28.3309 74.3304,42.3309 128.333,42.3309 67.165,0 116.335,-19.4987 147.999,-58.5003 23.5024,-28.6659 35.1655,-60.3303 35.1655,-95.1651 0,-23.8332 -5.3311,-48.1689 -15.8301,-73.3338 -10.6665,-25.0016 -30.6678,-54.5009 -60.3346,-88.3347 -47.168,-53.3325 -76.169,-91.1657 -86.668,-113.5 -10.6665,-22.3339 -16.9985,-52.9974 -19.3311,-91.9991zm-6.83463 -60.6654c15.3317,0 28.3352,-5.3354 38.8341,-15.8344 10.499,-10.499 15.8344,-23.4981 15.8344,-38.8341 0,-15.001 -5.3354,-27.665 -16.0019,-38.3315 -10.834,-10.499 -23.6656,-15.8344 -38.6666,-15.8344 -15.001,0 -27.665,5.3354 -38.3315,15.8344 -10.5033,10.6665 -15.8344,23.3305 -15.8344,38.3315 0,15.336 5.3311,28.3352 15.8344,38.8341 10.6665,10.499 23.3305,15.8344 38.3315,15.8344z" />
+      </glyph>
+      <glyph
+         id="glyph3449"
+         horiz-adv-x="564"
+         unicode="&gt;">
+        <path
+           id="path3451"
+           d="M543.502 318.835l-525.502 -227.502 0 42.0001 452.667 196.331 -452.667 198.17 0 44.5003 525.502 -229.504 0 -23.9964z" />
+      </glyph>
+      <glyph
+         id="glyph3453"
+         horiz-adv-x="564"
+         unicode="=">
+        <path
+           id="path3455"
+           d="M17.9994 431.166l527.001 0 0 -39.9983 -527.001 0 0 39.9983zm0 -159.164l527.001 0 0 -40.0026 -527.001 0 0 40.0026z" />
+      </glyph>
+      <glyph
+         id="glyph3457"
+         horiz-adv-x="564"
+         unicode="&lt;">
+        <path
+           id="path3459"
+           d="M17.9994 344.666l525.502 227.669 0 -42.5027 -452.168 -196.331 452.168 -198.166 0 -44.002 -525.502 229.499 0 23.8332z" />
+      </glyph>
+      <glyph
+         id="glyph3461"
+         horiz-adv-x="277"
+         unicode=";">
+        <path
+           id="path3463"
+           d="M137.668 461.499c15.001,0 27.8325,-5.3311 38.3315,-15.6668 10.6665,-10.499 15.8344,-23.1673 15.8344,-38.164 0,-15.001 -5.16786,-27.6693 -15.8344,-38.3358 -10.499,-10.499 -23.3305,-15.8344 -38.3315,-15.8344 -15.001,0 -27.6693,5.3354 -38.3358,15.8344 -10.499,10.6665 -15.8301,23.3348 -15.8301,38.3358 0,14.9967 5.3311,27.665 15.8301,38.164 10.6665,10.3357 23.3348,15.6668 38.3358,15.6668zm-68.3334 -628l0 21.5005c33.4987,11.0016 59.497,28.1676 77.8315,51.5025 18.5021,23.3305 27.6693,47.9971 27.6693,73.9996 0,6.16449 -1.50353,11.3323 -4.50201,15.6668 -2.16509,2.83094 -4.49771,4.33018 -6.83463,4.33018 -3.49679,0 -11.3323,-3.33355 -23.3305,-9.83311 -5.83371,-2.83094 -12.0025,-4.33018 -18.5021,-4.33018 -15.9976,0 -28.6659,4.66525 -38.164,14.1633 -9.50233,9.50233 -14.1676,22.5014 -14.1676,39.0017 0,16.0019 6.16449,29.6669 18.3302,40.9992 12.17,11.4999 27.0035,17.1661 44.6678,17.1661 21.5005,0 40.6684,-9.3305 57.3362,-28.1633 16.831,-18.6696 25.1649,-43.5037 25.1649,-74.3347 0,-33.4987 -11.6674,-64.6691 -34.8347,-93.5026 -23.3305,-28.8292 -60.1671,-51.4982 -110.664,-68.1659z" />
+      </glyph>
+      <glyph
+         id="glyph3465"
+         horiz-adv-x="277"
+         unicode=":">
+        <path
+           id="path3467"
+           d="M141.165 461c15.001,0 27.6693,-5.3354 38.3358,-16.0019 10.499,-10.499 15.8344,-23.3305 15.8344,-38.3315 0,-14.8334 -5.3354,-27.665 -15.8344,-38.3358 -10.6665,-10.499 -23.3348,-15.8301 -38.3358,-15.8301 -14.9967,0 -27.8325,5.3311 -38.3315,15.8301 -10.6665,10.6708 -16.0019,23.5024 -16.0019,38.3358 0,15.001 5.3354,27.8325 16.0019,38.3315 10.499,10.6665 23.3348,16.0019 38.3315,16.0019zm-0.996628 -365.835c15.3317,0 28.1633,-5.3311 38.8341,-15.9976 10.499,-10.834 15.8301,-23.6656 15.8301,-38.6666 0,-15.001 -5.3311,-27.6693 -16.1651,-38.3358 -10.6665,-10.499 -23.5024,-15.8301 -38.499,-15.8301 -15.001,0 -27.8325,5.3311 -38.3358,15.8301 -10.6665,10.6665 -15.8301,23.3348 -15.8301,38.3358 0,15.001 5.16356,27.8325 15.8301,38.6666 10.5033,10.6665 23.3348,15.9976 38.3358,15.9976z" />
+      </glyph>
+      <glyph
+         id="glyph3469"
+         horiz-adv-x="499"
+         unicode="9">
+        <path
+           id="path3471"
+           d="M52.6666 -13.665l0 17.9994c42.3352,0.66585 81.8352,10.499 118.165,29.6669 36.5015,19.0004 71.8345,52.3316 105.836,99.8303 34.0013,47.5031 57.6669,99.6671 71.0011,156.668 -51.1674,-32.8329 -97.3345,-49.3331 -138.669,-49.3331 -46.4978,0 -86.5004,17.9994 -119.668,53.9983 -33.1636,36.0032 -49.8314,83.6695 -49.8314,143.334 0,58.002 16.6677,109.5 49.8314,154.834 40.0026,54.9992 92.3341,82.501 156.836,82.501 54.3334,0 100.831,-22.5014 139.498,-67.5001 47.6663,-55.6651 71.3362,-124.334 71.3362,-206.001 0,-73.5013 -17.9994,-142.166 -54.1659,-205.834 -36.1707,-63.6639 -86.5004,-116.498 -150.834,-158.331 -52.4991,-34.6672 -109.5,-51.8332 -171.502,-51.8332l-27.8325 0zm302.833 340.331c5.83371,42.3352 8.83218,76.169 8.83218,101.501 0,31.6644 -5.49864,65.6657 -16.1651,102.33 -10.834,36.669 -25.9982,64.6691 -45.6688,84.1678 -19.6662,19.6662 -42.0001,29.3361 -67.165,29.3361 -29.001,0 -54.3334,-13.0034 -76.1647,-39.0017 -21.8356,-25.9982 -32.6696,-64.8324 -32.6696,-116.167 0,-68.6685 14.5027,-122.499 43.4994,-161.166 21.0022,-28.0001 47.168,-42.0001 78.0033,-42.0001 14.9967,0 32.8329,3.50108 53.3325,10.6665 20.4996,7.16541 38.499,17.3336 54.1659,30.3327z" />
+      </glyph>
+      <glyph
+         id="glyph3473"
+         horiz-adv-x="499"
+         unicode="8">
+        <path
+           id="path3475"
+           d="M191.834 333.501c-52.3316,43.0011 -86.1653,77.5007 -101.334,103.499 -15.001,25.9982 -22.6647,53.0017 -22.6647,81.0018 0,42.9968 16.6634,79.9966 49.8314,111.167 33.1679,30.9986 77.3332,46.6654 132.332,46.6654 53.3325,0 96.3335,-14.5027 128.836,-43.4994 32.6653,-29.001 48.8305,-62.0014 48.8305,-99.1688 0,-24.6665 -8.66465,-49.9989 -26.3333,-75.6664 -17.4968,-25.6675 -54.1659,-56.0002 -109.831,-90.8349 57.3319,-44.1652 95.1651,-78.9999 113.835,-104.5 24.6665,-33.1636 36.9998,-68.1659 36.9998,-104.998 0,-46.4978 -17.6687,-86.3329 -53.1692,-119.333 -35.5006,-33.0004 -81.9984,-49.5006 -139.665,-49.5006 -62.8348,0 -111.833,19.6662 -147.003,58.9986 -28.0001,31.6687 -42.0001,66.1684 -42.0001,103.503 0,29.3318 9.8374,58.3328 29.6669,87.1663 19.6705,28.8335 53.5,60.6654 101.669,95.5001zm76.6673 52.164c39.1649,35.1698 63.8314,63.0023 74.3304,83.3344 10.3357,20.3321 15.5036,43.3361 15.5036,69.1668 0,34.1689 -9.50233,60.833 -28.6702,80.1684 -19.3311,19.4987 -45.4969,29.1643 -78.6649,29.1643 -33.1679,0 -60.1671,-9.66557 -81.0018,-28.8335 -20.8304,-19.1636 -31.3293,-41.6651 -31.3293,-67.3325 0,-16.9985 4.33018,-33.8338 12.9991,-50.8323 8.49711,-16.9985 20.8304,-33.0004 36.8323,-48.3322l80.0009 -66.5034zm-53.6675 -70.6661c-26.9992,-22.8322 -47.0005,-47.6663 -59.9996,-74.4979 -12.9991,-26.8359 -19.4987,-56.0002 -19.4987,-87.1663 0,-42.0001 11.3323,-75.6664 34.3321,-100.836 22.9998,-25.1649 52.164,-37.8332 87.6646,-37.8332 35.1698,0 63.3331,9.83311 84.5029,29.8344 21.1655,19.8338 31.6644,43.8344 31.6644,72.1653 0,23.5024 -6.16449,44.5003 -18.4978,63.0023 -23.1673,34.4996 -69.8327,79.6658 -140.168,135.331z" />
+      </glyph>
+      <glyph
+         id="glyph3477"
+         horiz-adv-x="499"
+         unicode="7">
+        <path
+           id="path3479"
+           d="M100.668 662.165l354.834 0 0 -18.6653 -220.667 -657.164 -54.6685 0 197.835 596.164 -182.168 0c-36.8323,0 -62.998,-4.33018 -78.6649,-13.1667 -27.3342,-15.001 -49.3331,-38.0007 -65.8333,-69.3344l-14.1676 5.3354 63.5007 156.831z" />
+      </glyph>
+      <glyph
+         id="glyph3481"
+         horiz-adv-x="499"
+         unicode="6">
+        <path
+           id="path3483"
+           d="M448.165 675.834l0 -18.167c-42.8292,-4.16694 -77.999,-12.6683 -105.166,-25.6675 -27.1667,-12.8316 -53.9983,-32.3346 -80.4992,-58.8311 -26.5008,-26.3333 -48.4997,-55.6694 -66.0008,-87.9997 -17.3336,-32.5021 -31.9995,-71.0011 -43.6669,-115.501 46.8329,32.167 93.8334,48.3322 141.169,48.3322 45.1661,0 84.4986,-18.3345 117.667,-54.6642 33.1679,-36.5015 49.8314,-83.3344 49.8314,-140.671 0,-55.33 -16.831,-105.832 -50.334,-151.333 -40.3334,-55.33 -93.8334,-82.9993 -160.165,-82.9993 -45.3337,0 -83.6652,15.001 -115.334,44.8354 -61.8339,58.3328 -92.6649,133.832 -92.6649,226.664 0,59.1662 11.8307,115.501 35.6638,168.834 23.6699,53.5 57.6669,100.836 101.836,142.166 43.9977,41.3343 86.3329,69.1668 126.666,83.5019 40.3334,14.3351 77.999,21.5005 112.834,21.5005l28.1633 0zm-303.666 -341.835c-5.82941,-43.9977 -8.83218,-79.4982 -8.83218,-106.497 0,-31.1704 5.83371,-65.1674 17.3336,-101.836 11.6674,-36.4972 28.8335,-65.6657 51.6657,-87.1663 16.5002,-15.1642 36.669,-22.8322 60.5022,-22.8322 28.3309,0 53.6675,13.3342 75.8339,39.9983 22.3339,26.6684 33.4987,64.8367 33.4987,114.333 0,55.6694 -11.0016,103.834 -33.1679,144.502 -22.1664,40.6641 -53.5,61.0005 -94.3317,61.0005 -12.3333,0 -25.4999,-2.6677 -39.6675,-7.83556 -14.1676,-5.16356 -35.1655,-16.5002 -62.8348,-33.6663z" />
+      </glyph>
+      <glyph
+         id="glyph3485"
+         horiz-adv-x="499"
+         unicode="5">
+        <path
+           id="path3487"
+           d="M434.165 662.165l-38.164 -82.9993 -199.167 0 -43.4994 -89.0006c86.3329,-12.664 154.666,-44.6635 205,-96.166 43.3318,-44.1652 64.9999,-96.3335 64.9999,-156.166 0,-34.8347 -7.00217,-67.165 -21.1697,-96.6686 -14.1633,-29.6626 -31.9995,-54.8317 -53.5,-75.6664 -21.5005,-20.8304 -45.4969,-37.6657 -71.8302,-50.3297 -37.3349,-18.0037 -75.8339,-26.8359 -115.166,-26.8359 -39.835,0 -68.6685,6.6671 -86.668,20.1688 -18.167,13.4974 -27.1667,28.4984 -27.1667,44.6635 0,9.16726 3.83186,17.1704 11.1648,24.1682 7.50048,7.00217 17.0028,10.499 28.3352,10.499 8.50141,0 15.9976,-1.16416 22.3339,-3.83186 6.33202,-2.6677 17.1661,-9.33479 32.4978,-20.0013 24.3358,-16.9985 49.0023,-25.4999 74.1671,-25.4999 38.0007,0 71.4995,14.5027 100.333,43.3361 28.8335,28.8335 43.1686,63.8314 43.1686,105.166 0,39.9983 -12.8359,77.3332 -38.499,112 -25.835,34.6672 -61.168,61.4988 -106.502,80.3316 -35.5006,14.6659 -83.8327,23.1673 -145.001,25.4999l127.001 257.332 237.331 0z" />
+      </glyph>
+      <glyph
+         id="glyph3489"
+         horiz-adv-x="499"
+         unicode="4">
+        <path
+           id="path3491"
+           d="M465.335 244.165l0 -69.3301 -88.833 0 0 -174.835 -80.6667 0 0 174.835 -280.168 0 0 62.4997 307.168 438.499 53.6675 0 0 -431.669 88.833 0zm-169.5 0l0 328.668 -232.335 -328.668 232.335 0z" />
+      </glyph>
+      <glyph
+         id="glyph3493"
+         horiz-adv-x="499"
+         unicode="3">
+        <path
+           id="path3495"
+           d="M50.8323 536.169c18.8328,44.496 42.666,78.9999 71.4995,103.164 28.8335,24.3358 64.6691,36.5015 107.67,36.5015 52.9974,0 93.6658,-17.3336 121.997,-51.8332 21.5005,-25.6675 32.3346,-53.1692 32.3346,-82.501 0,-48.1646 -30.3327,-98.0003 -90.8349,-149.331 40.6684,-16.0019 71.3362,-38.8341 92.1666,-68.501 20.8347,-29.4993 31.3336,-64.334 31.3336,-104.5 0,-57.1686 -18.167,-106.832 -54.6642,-148.833 -47.5031,-54.6685 -116.335,-82.0027 -206.5,-82.0027 -44.6678,0 -75.0005,5.49864 -91.17,16.5002 -15.9976,11.1691 -24.1639,22.9998 -24.1639,35.6681 0,9.49803 3.83186,17.8319 11.4999,24.9973 7.66802,7.16971 16.831,10.6665 27.665,10.6665 7.9988,0 16.3327,-1.3317 24.8341,-3.83186 5.49864,-1.66677 17.9994,-7.66802 37.6657,-17.8319 19.503,-10.3357 33.0004,-16.3327 40.5009,-18.3345 11.9982,-3.66433 24.8341,-5.3311 38.499,-5.3311 33.1679,0 62.169,12.8316 86.668,38.499 24.6665,25.6675 36.8323,56.1677 36.8323,91.3332 0,25.6675 -5.66617,50.8323 -16.9985,75.1638 -8.50141,18.167 -17.8319,32.0038 -27.8325,41.5018 -14,12.9991 -33.1679,24.8341 -57.6669,35.333 -24.3358,10.6665 -49.3331,16.0019 -74.6698,16.0019l-15.6625 0 0 14.6659c25.6632,3.16601 51.4982,12.5008 77.3332,27.8325 25.9982,15.1685 44.8311,33.6663 56.4985,55.1668 11.6674,21.5005 17.5011,44.9986 17.5011,70.6661 0,33.6663 -10.5033,60.6654 -31.5012,81.3326 -21.0022,20.6671 -47.0005,31.0029 -78.3341,31.0029 -50.5015,0 -92.5017,-27.0035 -126.499,-81.0018l-16.0019 7.83556z" />
+      </glyph>
+      <glyph
+         id="glyph3497"
+         horiz-adv-x="499"
+         unicode="2">
+        <path
+           id="path3499"
+           d="M458.5 127.5l-46.3346 -127.5 -390.665 0 0 17.9994c114.831,104.835 195.833,190.502 242.666,256.834 46.8329,66.4991 70.3353,127.169 70.3353,182.168 0,42.0001 -12.8359,76.4998 -38.6666,103.499 -25.6675,26.9992 -56.3352,40.5009 -92.1666,40.5009 -32.6696,0 -61.8339,-9.50233 -87.6689,-28.5027 -25.835,-19.0004 -44.9986,-46.9962 -57.3319,-83.6652l-18.167 0c8.16633,60.1671 29.001,106.334 62.8305,138.669 33.6706,32.167 75.6707,48.3322 126.168,48.3322 53.6675,0 98.4986,-17.3336 134.502,-51.8332 35.9989,-34.4996 53.9983,-75.1681 53.9983,-122.001 0,-33.4987 -7.83126,-67.165 -23.4981,-100.668 -24.0007,-52.6666 -63.1699,-108.499 -117.168,-167.498 -81.0018,-88.5023 -131.667,-141.835 -151.831,-160.169l172.833 0c35.1655,0 59.832,1.336 73.9996,4.00369 14.1633,2.50016 26.9992,7.83126 38.3315,15.8301 11.3323,8.00309 21.333,19.3354 29.8344,34.0013l17.9994 0z" />
+      </glyph>
+      <glyph
+         id="glyph3501"
+         horiz-adv-x="499"
+         unicode="1">
+        <path
+           id="path3503"
+           d="M117.168 597.165l161.166 78.6692 16.1651 0 0 -559.168c0,-36.9998 1.49924,-60.1671 4.50201,-69.3344 3.16601,-8.99972 9.66557,-15.9976 19.3311,-20.9979 9.83311,-4.83279 29.6669,-7.66802 59.6688,-8.33387l0 -17.9994 -249.17 0 0 17.9994c31.3336,0.66585 51.5025,3.33355 60.6697,8.16633 8.99972,4.66954 15.3317,11.0016 19.0004,19.0004 3.49679,7.9988 5.3311,31.8319 5.3311,71.4995l0 357.502c0,48.1646 -1.66677,78.9999 -4.83279,92.6649 -2.33262,10.5033 -6.49956,18.167 -12.5008,22.9998 -5.99695,4.83279 -13.1667,7.33295 -21.6638,7.33295 -12.0025,0 -28.8335,-4.99603 -50.334,-15.1642l-7.33295 15.1642z" />
+      </glyph>
+      <glyph
+         id="glyph3505"
+         horiz-adv-x="499"
+         unicode="0">
+        <path
+           id="path3507"
+           d="M36.1664 327.165c0,75.5031 11.3323,140.503 34.1689,195.004 22.8322,54.4966 52.9974,95.1651 90.8306,121.833 29.3361,21.1655 59.5013,31.8319 90.8349,31.8319 50.6648,0 96.3335,-26.0025 136.667,-77.6682 50.4972,-64.1665 75.6664,-150.998 75.6664,-260.833 0,-76.8348 -11.0016,-141.998 -33.1679,-195.666 -22.1664,-53.8351 -50.334,-92.8324 -84.6661,-117.001 -34.3321,-24.3315 -67.5001,-36.334 -99.4995,-36.334 -63.0023,0 -115.669,37.1673 -157.669,111.833 -35.4963,62.8348 -53.1649,138.501 -53.1649,226.999zm95.6677 -12.1657c0,-91.1657 11.1648,-165.664 33.6663,-223.167 18.4978,-48.4997 46.3346,-72.8312 82.9993,-72.8312 17.6687,0 35.8356,7.9988 54.6685,23.6656 19.0004,15.8344 33.3312,42.3352 42.9968,79.335 15.001,56.0002 22.5014,135 22.5014,236.832 0,75.4989 -7.83126,138.501 -23.4981,188.998 -11.6674,37.5024 -26.8359,64.0033 -45.3337,79.6701 -13.3342,10.6665 -29.4993,15.9976 -48.3364,15.9976 -22.1664,0 -41.8326,-9.83311 -59.1662,-29.6669 -23.3305,-26.9992 -39.3324,-69.4976 -47.8338,-127.5 -8.49711,-57.9977 -12.664,-114.999 -12.664,-171.334z" />
+      </glyph>
+      <glyph
+         id="glyph3509"
+         horiz-adv-x="722"
+         unicode="O">
+        <path
+           id="path3511"
+           d="M365.668 677.166c85.9978,0 160.5,-32.4978 223.498,-97.8328 63.0023,-65.335 94.4992,-146.668 94.4992,-244.333 0,-100.668 -31.8319,-184.166 -95.3326,-250.502 -63.5007,-66.4991 -140.331,-99.6671 -230.5,-99.6671 -90.9981,0 -167.665,32.5021 -229.667,97.1669 -61.9971,64.8367 -93,148.669 -93,251.502 0,105.166 35.8356,190.833 107.335,257.332 62.3322,57.6669 136.667,86.3329 223.167,86.3329zm-9.16726 -35.5006c-59.3337,0 -106.832,-21.9988 -142.668,-65.9965 -44.5003,-54.6685 -66.8342,-134.669 -66.8342,-240.17 0,-108.164 23.1673,-191.331 69.3344,-249.496 35.5006,-44.337 82.3335,-66.5034 140.666,-66.5034 62.169,0 113.5,24.3358 154,72.8354 40.5009,48.4997 60.833,124.999 60.833,229.499 0,113.165 -22.3339,197.667 -66.9974,253.332 -35.8356,44.3328 -85.1687,66.4991 -148.334,66.4991z" />
+      </glyph>
+      <glyph
+         id="glyph3513"
+         horiz-adv-x="722"
+         unicode="N">
+        <path
+           id="path3515"
+           d="M-13.1667 662.165l179.668 0 404.833 -496.664 0 381.833c0,40.6684 -4.66954,66.1684 -13.6693,76.1647 -12.1657,13.6693 -31.1661,20.5039 -57.1643,20.5039l-22.9998 0 0 18.1627 230.5 0 0 -18.1627 -23.5024 0c-28.0001,0 -47.8338,-8.50141 -59.497,-25.3367 -7.16971,-10.499 -10.6665,-34.1646 -10.6665,-71.3319l0 -558 -17.6687 0 -436.501 533.166 0 -407.831c0,-40.6684 4.33447,-66.0008 13.1667,-76.169 12.3333,-13.665 31.5012,-20.4996 57.1686,-20.4996l23.3348 0 0 -17.9994 -230.337 0 0 17.9994 22.8365 0c28.3309,0 48.3322,8.50141 60.1671,25.4999 7.16541,10.3357 10.6665,34.1689 10.6665,71.1687l0 460.498c-19.1679,22.5014 -33.8338,37.3349 -43.6669,44.5003 -10.0006,7.16541 -24.5033,13.8325 -43.6669,20.0013 -9.50233,2.83094 -23.8332,4.33447 -43.0011,4.33447l0 18.1627z" />
+      </glyph>
+      <glyph
+         id="glyph3517"
+         horiz-adv-x="889"
+         unicode="M">
+        <path
+           id="path3519"
+           d="M409.167 0l-255.833 557.166 0 -442.498c0,-40.6684 4.33018,-66.0008 13.1667,-76.169 11.9982,-13.665 31.1661,-20.4996 57.1643,-20.4996l23.3348 0 0 -17.9994 -230.333 0 0 17.9994 23.3305 0c28.0001,0 47.8338,8.50141 59.6688,25.4999 7.16541,10.3357 10.6665,34.1689 10.6665,71.1687l0 432.665c0,29.3318 -3.16601,50.5015 -9.66557,63.5007 -4.66954,9.49803 -13.0034,17.3336 -25.1691,23.6656 -12.3333,6.33202 -31.8319,9.50233 -58.8311,9.50233l0 18.1627 187.499 0 240.166 -518.165 236.334 518.165 187.499 0 0 -18.1627 -22.9998 0c-28.3309,0 -48.3322,-8.50141 -59.9996,-25.3367 -7.16541,-10.499 -10.834,-34.1646 -10.834,-71.3319l0 -432.665c0,-40.6684 4.66954,-66.0008 13.8325,-76.169 12.0025,-13.665 31.0029,-20.4996 57.0011,-20.4996l22.9998 0 0 -17.9994 -281.333 0 0 17.9994 23.4981 0c28.3352,0 48.1689,8.50141 59.6688,25.4999 7.16541,10.3357 10.6665,34.1689 10.6665,71.1687l0 442.498 -255.334 -557.166 -16.1651 0z" />
+      </glyph>
+      <glyph
+         id="glyph3521"
+         horiz-adv-x="610"
+         unicode="L">
+        <path
+           id="path3523"
+           d="M573.168 183.165l16.1651 -3.49679 -56.666 -179.668 -512.666 0 0 17.9994 24.9973 0c28.0001,0 48.0014,9.16726 59.9996,27.3342 6.83463,10.499 10.1682,34.6672 10.1682,72.3328l0 427.334c0,41.3343 -4.49771,67.165 -13.665,77.5007 -12.6683,14.3308 -31.5012,21.5005 -56.5028,21.5005l-24.9973 0 0 18.1627 299.83 0 0 -18.1627c-35.1655,0.330777 -59.832,-2.83523 -73.9996,-9.66987 -14.1633,-6.83034 -23.8332,-15.4993 -28.9967,-25.9982 -5.16786,-10.3357 -7.83556,-35.333 -7.83556,-74.6655l0 -416.002c0,-26.9992 2.6677,-45.5012 7.83556,-55.6651 3.83186,-6.83463 9.83311,-11.835 17.9994,-15.1685 8.16633,-3.16601 33.4987,-4.83279 76.1647,-4.83279l48.3322 0c50.8366,0 86.5004,3.66862 107,11.1648 20.4996,7.50048 39.1692,20.8347 56.1677,39.835 16.8353,19.0004 33.8338,49.1655 50.6691,90.1647z" />
+      </glyph>
+      <glyph
+         id="glyph3525"
+         horiz-adv-x="722"
+         unicode="K">
+        <path
+           id="path3527"
+           d="M298.834 367.167l244.165 -242.666c40.0026,-40.0026 74.1671,-67.3325 102.502,-81.8352 28.3309,-14.4984 56.666,-22.6647 84.9969,-24.6665l0 -17.9994 -314.999 0 0 17.9994c18.8328,0 32.5021,3.16601 40.836,9.66557 8.32957,6.33632 12.4965,13.3342 12.4965,21.1697 0,7.83126 -1.66677,14.8334 -4.66525,20.9979 -3.16601,6.16878 -13.3342,17.6687 -30.5002,34.6672l-228.666 225.998 0 -213.33c0,-33.503 2.16509,-55.6694 6.49956,-66.3359 3.16601,-8.16633 10.0006,-15.1642 20.4996,-20.9979 14,-7.83556 28.6659,-11.835 44.3328,-11.835l22.5014 0 0 -17.9994 -282.166 0 0 17.9994 23.3305 0c27.3342,0 47.168,7.9988 59.6688,24.0007 7.83126,10.3314 11.6674,35.5006 11.6674,75.1681l0 427.833c0,33.4987 -2.16938,55.8326 -6.33632,66.8342 -3.33355,7.83126 -9.99635,14.6659 -19.997,20.4996 -14.3351,7.83126 -29.3361,11.6674 -45.0029,11.6674l-23.3305 0 0 18.1627 282.166 0 0 -18.1627 -22.5014 0c-15.3317,0 -29.9976,-3.66862 -44.3328,-11.1691 -10.1682,-5.16786 -17.1661,-12.9991 -20.9979,-23.4981 -4.00369,-10.3357 -6.00125,-31.8362 -6.00125,-64.334l0 -202.668c6.6671,6.16878 28.8335,26.8316 67.0017,62.0014 96.6643,88.498 155.165,147.664 175.329,177.163 8.66894,13.0034 13.1667,24.5033 13.1667,34.1689 0,7.50048 -3.49679,14.1676 -10.3314,19.8338 -6.83463,5.66617 -18.3345,8.50141 -34.6672,8.50141l-15.1642 0 0 18.1627 243.164 0 0 -18.1627c-14.3308,-0.335073 -27.3342,-2.16938 -38.9974,-5.83371 -11.6674,-3.50108 -26.0025,-10.5033 -43.0011,-20.6671 -16.8353,-10.3357 -37.6657,-26.8359 -62.4997,-49.6681 -7.16971,-6.49956 -40.1658,-39.835 -99.1688,-99.9979l-100.999 -100.668z" />
+      </glyph>
+      <glyph
+         id="glyph3529"
+         horiz-adv-x="389"
+         unicode="J">
+        <path
+           id="path3531"
+           d="M99.6671 644.002l0 18.1627 283.665 0 0 -18.1627 -24.0007 0c-26.9992,0 -46.6654,-8.00309 -58.9986,-23.8374 -7.83126,-10.499 -11.835,-35.4963 -11.835,-75.1638l0 -323.835c0,-49.8314 -5.3311,-90.1647 -16.3327,-121 -10.834,-30.9986 -29.6669,-57.9977 -56.3309,-80.83 -26.6684,-23.0041 -59.0029,-34.5039 -96.6686,-34.5039 -30.6678,0 -54.6642,7.66802 -72.3328,22.669 -17.5011,15.1642 -26.3333,32.4978 -26.3333,52.0008 0,15.9976 3.9994,28.0001 12.1657,36.1664 10.834,10.1639 23.3348,15.1642 37.67,15.1642 10.3314,0 19.8295,-3.33355 28.0001,-10.1639 8.32957,-6.83463 18.8328,-25.1691 31.4969,-54.836 7.50048,-17.4968 17.1661,-26.3333 28.8335,-26.3333 8.83218,0 17.0028,5.3354 24.6665,16.1694 7.66802,10.6665 11.4999,29.8301 11.4999,57.1643l0 452.168c0,33.4987 -2.16509,55.6651 -6.33202,66.3316 -3.33355,8.16633 -10.1682,15.1685 -20.4996,21.0022 -14,7.83126 -28.8335,11.6674 -44.5003,11.6674l-23.8332 0z" />
+      </glyph>
+      <glyph
+         id="glyph3533"
+         horiz-adv-x="332"
+         unicode="I">
+        <path
+           id="path3535"
+           d="M308.667 17.9994l0 -17.9994 -283.833 0 0 17.9994 23.4981 0c27.3342,0 47.168,7.9988 59.5013,24.0007 7.83126,10.3314 11.835,35.5006 11.835,75.1681l0 427.833c0,33.4987 -2.16938,55.6651 -6.33632,66.3316 -3.33355,8.16633 -10.0006,15.1685 -19.997,21.0022 -14.3351,7.83126 -29.3361,11.6674 -45.0029,11.6674l-23.4981 0 0 18.1627 283.833 0 0 -18.1627 -24.0007 0c-26.9992,0 -46.6654,-8.00309 -58.9986,-23.8374 -8.16633,-10.499 -12.3333,-35.4963 -12.3333,-75.1638l0 -427.833c0,-33.503 2.16509,-55.6694 6.33202,-66.3359 3.33355,-8.16633 10.1682,-15.1642 20.4996,-20.9979 14,-7.83556 28.8335,-11.835 44.5003,-11.835l24.0007 0z" />
+      </glyph>
+      <glyph
+         id="glyph3537"
+         horiz-adv-x="722"
+         unicode="H">
+        <path
+           id="path3539"
+           d="M205.499 355.001l307.67 0 0 189.497c0,33.8338 -2.16938,56.1677 -6.33632,66.8342 -3.33355,8.16633 -10.1639,15.1685 -20.4996,21.0022 -14,7.83126 -28.8335,11.6674 -44.5003,11.6674l-23.3305 0 0 18.1627 283.163 0 0 -18.1627 -23.4981 0c-15.4993,0 -30.3327,-3.66862 -44.3328,-11.1691 -10.499,-5.16786 -17.5011,-13.1667 -21.333,-23.6656 -3.66862,-10.6665 -5.50293,-32.167 -5.50293,-64.6691l0 -427.33c0,-33.503 2.00185,-55.6694 6.33632,-66.3359 3.16601,-8.16633 9.83311,-15.1642 19.997,-20.9979 14.3351,-7.83556 29.3361,-11.835 44.8354,-11.835l23.4981 0 0 -17.9994 -283.163 0 0 17.9994 23.3305 0c26.9992,0 46.8329,7.9988 59.1662,24.0007 8.16633,10.3314 12.17,35.5006 12.17,75.1681l0 201.667 -307.67 0 0 -201.667c0,-33.503 2.16938,-55.6694 6.33632,-66.3359 3.33355,-8.16633 10.1639,-15.1642 20.6671,-20.9979 14,-7.83556 28.6659,-11.835 44.3328,-11.835l23.9964 0 0 -17.9994 -283.665 0 0 17.9994 23.3348 0c27.3342,0 47.1637,7.9988 59.6645,24.0007 7.66802,10.3314 11.6674,35.5006 11.6674,75.1681l0 427.33c0,33.8338 -2.16509,56.1677 -6.33202,66.8342 -3.33355,8.16633 -10.0006,15.1685 -20.0013,21.0022 -14.3308,7.83126 -29.3318,11.6674 -44.9986,11.6674l-23.3348 0 0 18.1627 283.665 0 0 -18.1627 -23.9964 0c-15.6668,0 -30.3327,-3.66862 -44.3328,-11.1691 -10.1682,-5.16786 -17.1704,-13.1667 -21.0022,-23.6656 -3.9994,-10.6665 -6.00125,-32.167 -6.00125,-64.6691l0 -189.497z" />
+      </glyph>
+      <glyph
+         id="glyph3541"
+         horiz-adv-x="722"
+         unicode="G">
+        <path
+           id="path3543"
+           d="M613.833 677.166l17.0028 -208.832 -17.0028 0c-17.3336,52.0008 -39.6675,91.1657 -66.9974,117.667 -39.3367,38.0007 -90.0015,57.0011 -151.835,57.0011 -84.331,0 -148.498,-33.3355 -192.332,-100.002 -36.8323,-56.3309 -55.1668,-123.333 -55.1668,-201.164 0,-63.1699 12.1657,-120.837 36.4972,-172.833 24.5033,-52.1683 56.5028,-90.3366 96.0027,-114.501 39.5,-24.3358 80.1641,-36.5015 121.833,-36.5015 24.499,0 47.9971,3.16601 70.8336,9.33479 22.8322,6.16449 44.6635,15.3317 65.8333,27.3342l0 191.499c0,33.1679 -2.50016,54.8317 -7.50048,65.1674 -5.00032,10.1639 -12.8359,17.9994 -23.5024,23.3305 -10.499,5.50293 -29.1643,8.16633 -55.8326,8.16633l0 18.5021 256.335 0 0 -18.5021 -12.1657 0c-25.4999,0 -42.8335,-8.49711 -52.3358,-25.4999 -6.49956,-11.9982 -9.66557,-35.8313 -9.66557,-71.1644l0 -202.668c-37.5024,-20.1645 -74.5022,-34.998 -110.832,-44.5003 -36.5015,-9.49803 -77.0024,-14.1676 -121.67,-14.1676 -127.83,0 -224.997,41.0035 -291.496,123.002 -49.8357,61.6663 -74.6698,132.5 -74.6698,212.999 0,58.1696 14,114.002 42.0001,167.502 33.1679,63.5007 78.8324,112.331 136.667,146.5 48.4997,28.3309 105.836,42.3309 171.832,42.3309 24.1682,0 46.0038,-1.83431 65.8333,-5.83371 19.6705,-3.83186 47.5031,-12.4965 83.6695,-25.8307 18.167,-6.83463 30.5002,-10.1682 36.6647,-10.1682 6.16878,0 11.4999,2.83523 15.8344,8.50141 4.33447,5.66617 6.99787,16.831 7.9988,33.3312l18.167 0z" />
+      </glyph>
+      <glyph
+         id="glyph3545"
+         horiz-adv-x="556"
+         unicode="F">
+        <path
+           id="path3547"
+           d="M204.665 625.998l0 -260.33 120.502 0c27.665,0 48.0014,6.16449 60.833,18.3302 12.8316,12.17 21.333,36.334 25.6675,72.5004l17.9994 0 0 -223.996 -17.9994 0c-0.335073,25.6632 -3.66862,44.496 -10.0006,56.4985 -6.33202,12.1657 -15.1685,21.1655 -26.5008,27.1667 -11.1648,6.00125 -27.8325,8.99972 -49.9989,8.99972l-120.502 0 0 -207.999c0,-33.503 2.00185,-55.6694 6.33632,-66.3359 3.16601,-8.16633 9.99635,-15.1642 20.4996,-20.9979 14.3308,-7.83556 29.1643,-11.835 44.8311,-11.835l24.0007 0 0 -17.9994 -284.168 0 0 17.9994 23.3348 0c27.3342,0 47.3312,7.9988 59.6688,24.0007 7.83126,10.3314 11.6631,35.5006 11.6631,75.1681l0 427.833c0,33.4987 -2.16509,55.6651 -6.33202,66.3316 -3.33355,8.16633 -10.0006,15.1685 -20.0013,21.0022 -14,7.83126 -28.9967,11.6674 -44.9986,11.6674l-23.3348 0 0 18.1627 492.669 0 6.33202 -145.499 -17.1661 0c-8.33387,30.8353 -18.3345,53.5 -29.4993,68.0027 -11.1691,14.4984 -25.0016,24.9973 -41.5018,31.4969 -16.5002,6.49956 -41.8326,9.83311 -76.3322,9.83311l-146.002 0z" />
+      </glyph>
+      <glyph
+         id="glyph3549"
+         horiz-adv-x="610"
+         unicode="E">
+        <path
+           id="path3551"
+           d="M209 625.998l0 -261.666 145.499 0c37.8332,0 63.0023,5.66617 75.6664,17.0028 17.0028,14.9967 26.3333,41.33 28.3352,79.1632l17.9994 0 0 -230.496 -17.9994 0c-4.50201,32.1627 -9.16726,52.8299 -13.665,61.9971 -5.83371,11.3323 -15.5036,20.3364 -28.8335,26.8359 -13.3342,6.49956 -33.8338,9.83311 -61.5031,9.83311l-145.499 0 0 -218.335c0,-29.3318 1.3317,-47.168 3.83186,-53.5 2.6677,-6.33202 7.16971,-11.3323 13.6693,-15.1685 6.49956,-3.66433 19.0004,-5.49864 37.1673,-5.49864l112.331 0c37.3349,0 64.6691,2.50016 81.5001,7.83556 16.9985,5.16356 33.1679,15.3317 48.8348,30.6635 20.1645,20.1688 40.8317,50.6691 61.9971,91.3332l19.503 0 -57.0011 -165.999 -510.334 0 0 17.9994 23.5024 0c15.4993,0 30.3327,3.83186 44.3328,11.3323 10.499,5.16786 17.4968,13.0034 21.333,23.3348 3.66433,10.499 5.49864,31.8319 5.49864,63.999l0 430.169c0,42.0001 -4.16694,67.8308 -12.6683,77.6639 -11.6631,12.9991 -31.1661,19.503 -58.496,19.503l-23.5024 0 0 18.1627 510.334 0 7.33295 -144.996 -19.1679 0c-6.83034,34.8304 -14.3308,58.6636 -22.6647,71.667 -8.33387,12.9991 -20.4996,22.9998 -36.8323,29.8301 -12.9991,4.83279 -36.0032,7.33295 -68.8361,7.33295l-181.665 0z" />
+      </glyph>
+      <glyph
+         id="glyph3553"
+         horiz-adv-x="722"
+         unicode="D">
+        <path
+           id="path3555"
+           d="M17.1661 0l0 17.9994 24.8341 0c28.0001,0 47.8338,8.99972 59.5013,26.9992 7.16541,10.6665 10.834,34.8347 10.834,72.1696l0 427.833c0,41.3343 -4.66954,67.165 -13.6693,77.5007 -12.664,14.3308 -31.6644,21.5005 -56.666,21.5005l-24.8341 0 0 18.1627 269.502 0c98.8337,0 174.165,-11.3323 225.831,-33.6663 51.5025,-22.4972 93,-59.9996 124.501,-112.331 31.3336,-52.4991 47.168,-113.001 47.168,-181.665 0,-92.1666 -28.0001,-169.169 -84.0003,-231.003 -62.8348,-68.9993 -158.666,-103.499 -287.166,-103.499l-295.835 0zm188.835 47.8338c41.33,-9.16726 75.9972,-13.6693 103.997,-13.6693 75.5031,0 138.166,26.5008 188.002,79.6701 49.8314,52.9974 74.833,124.999 74.833,215.83 0,91.3332 -25.0016,163.503 -74.833,216.169 -49.8357,52.8342 -113.667,79.1675 -191.834,79.1675 -29.3318,0 -62.6673,-4.66954 -100.165,-14.1676l0 -563z" />
+      </glyph>
+      <glyph
+         id="glyph3557"
+         horiz-adv-x="667"
+         unicode="C">
+        <path
+           id="path3559"
+           d="M602.002 677.166l15.1642 -224.997 -15.1642 0c-20.1688,67.3325 -49.0023,115.832 -86.3372,145.499 -37.4981,29.6669 -82.3335,44.5003 -134.833,44.5003 -43.9977,0 -83.6652,-11.1691 -119.166,-33.503 -35.5006,-22.3296 -63.3331,-57.8302 -83.6652,-106.665 -20.3364,-48.8348 -30.5002,-109.668 -30.5002,-182.168 0,-59.832 9.49803,-111.833 28.8335,-155.83 19.1636,-43.8344 47.9971,-77.5007 86.6637,-101.003 38.5033,-23.4981 82.501,-35.1655 132.002,-35.1655 43.0011,0 80.8342,9.16726 113.835,27.6693 32.8329,18.3302 68.9993,54.8317 108.332,109.5l15.1685 -9.66987c-33.1679,-58.9986 -72.0021,-102.167 -116.167,-129.497 -44.3328,-27.3342 -96.8318,-41.0035 -157.832,-41.0035 -109.668,0 -194.669,40.6684 -254.836,122.169 -44.8311,60.4979 -67.3325,131.834 -67.3325,213.833 0,66.0008 14.8334,126.834 44.3328,182.168 29.6669,55.3343 70.5028,98.1678 122.336,128.668 51.9965,30.3327 108.667,45.4969 170.166,45.4969 47.8338,0 95.1651,-11.6674 141.667,-34.998 13.665,-7.16971 23.4981,-10.834 29.3318,-10.834 8.66894,0 16.3327,3.16601 22.8322,9.33479 8.50141,8.66465 14.5027,20.9979 18.167,36.4972l17.0028 0z" />
+      </glyph>
+      <glyph
+         id="glyph3561"
+         horiz-adv-x="667"
+         unicode="B">
+        <path
+           id="path3563"
+           d="M461.834 337.835c45.9995,-9.66987 80.3316,-25.3367 103.168,-46.8372 31.4969,-29.9976 47.3312,-66.4991 47.3312,-109.831 0,-32.8329 -10.499,-64.334 -31.3336,-94.4992 -20.8347,-30.1695 -49.3331,-52.0008 -85.667,-65.8333 -36.334,-13.8368 -91.664,-20.8347 -166.166,-20.8347l-312.499 0 0 17.9994 24.8341 0c27.665,0 47.4988,8.83218 59.497,26.5008 7.50048,11.3323 11.3366,35.5006 11.3366,72.6679l0 427.833c0,40.9992 -4.66954,66.8342 -14.1676,77.5007 -12.6683,14.3308 -31.6687,21.5005 -56.666,21.5005l-24.8341 0 0 18.1627 285.998 0c53.5,0 96.3335,-3.9994 128.501,-11.8307 48.8348,-11.6674 86.1653,-32.3346 111.833,-62.169 25.6675,-29.8301 38.499,-63.999 38.499,-102.833 0,-33.1636 -9.99635,-62.8305 -30.1652,-89.1638 -20.1645,-26.1701 -49.9989,-45.5012 -89.4989,-58.3328zm-255.833 26.4966c12.1657,-2.33262 25.8307,-3.9994 41.33,-5.16356 15.5036,-1.16846 32.5021,-1.66677 51.0041,-1.66677 47.4988,0 83.3301,5.00032 107.163,15.3317 24.0007,10.1682 42.3352,25.9982 54.9992,47.168 12.6683,20.9979 19.0004,44.1652 19.0004,69.3301 0,38.6666 -15.8301,71.667 -47.3312,99.0012 -31.6687,27.3342 -77.6682,40.9992 -138.166,40.9992 -32.6696,0 -61.8339,-3.49679 -87.9997,-10.6665l0 -254.333zm0 -316.498c37.8332,-8.83218 75.1638,-13.1667 111.833,-13.1667 58.9986,0 103.834,13.3342 134.833,39.8307 30.8353,26.5008 46.3346,59.3337 46.3346,98.3354 0,25.6675 -7.00217,50.5015 -21.0022,74.1671 -14,23.8332 -36.8323,42.4984 -68.3334,56.1677 -31.4969,13.665 -70.6661,20.4996 -117.164,20.4996 -20.1688,0 -37.5024,-0.335073 -51.8332,-0.833387 -14.3351,-0.66585 -25.835,-1.83431 -34.6672,-3.50108l0 -271.499z" />
+      </glyph>
+      <glyph
+         id="glyph3565"
+         horiz-adv-x="722"
+         unicode="A">
+        <path
+           id="path3567"
+           d="M457.499 221.668l-256.331 0 -44.8354 -104.5c-11.1648,-25.6675 -16.6677,-44.8354 -16.6677,-57.6669 0,-10.0006 4.83279,-18.8328 14.3351,-26.5008 9.66557,-7.66802 30.3327,-12.6683 62.3322,-15.001l0 -17.9994 -208.501 0 0 17.9994c27.6693,5.00032 45.5012,11.3323 53.6675,19.1679 16.6677,15.4993 35.0023,47.3312 55.1668,95.1651l233 544.833 16.9985 0 230.5 -550.667c18.5021,-44.3328 35.3373,-72.9987 50.5015,-86.1653 15.1685,-13.1667 36.334,-20.6671 63.3331,-22.3339l0 -17.9994 -261.331 0 0 17.9994c26.3333,1.336 44.1652,5.83371 53.5,13.3342 9.3305,7.33295 14,16.5002 14,27.3342 0,14.3308 -6.6671,36.8323 -19.6662,67.8308l-40.0026 95.1694zm-13.665 36.1664l-112.335 267.5 -115.166 -267.5 227.502 0z" />
+      </glyph>
+      <glyph
+         id="glyph3569"
+         horiz-adv-x="920"
+         unicode="@">
+        <path
+           id="path3571"
+           d="M687.501 467.835l-57.1686 -194.836c-21.1655,-72.9987 -34.0013,-119.166 -38.499,-138.664 -4.66525,-19.6662 -6.83463,-35.1655 -6.83463,-47.0005 0,-10.3357 3.50108,-19.1679 10.499,-26.3333 7.00217,-7.16541 15.6668,-10.6665 26.1701,-10.6665 23.6656,0 52.164,11.8307 85.667,35.6681 33.3312,23.6656 61.8296,62.3322 85.667,115.665 23.6656,53.3325 35.6638,109.002 35.6638,167 0,55.6651 -13.4974,107 -40.3334,154.336 -26.8316,47.1637 -64.8324,83.3301 -113.835,108.667 -48.998,25.1649 -102.996,37.8332 -162.33,37.8332 -75.1681,0 -145.001,-20.0013 -209.502,-59.8363 -64.334,-39.9983 -115.334,-97.3302 -153,-172.167 -37.6657,-74.833 -56.3309,-152.664 -56.3309,-233.331 0,-75.0005 16.5002,-142.999 49.4963,-204.167 33.0004,-61.168 79.5025,-107.498 139.335,-138.832 59.9996,-31.5012 124.334,-47.168 193.5,-47.168 85.4995,0 163,22.8322 232.167,68.8318 69.1668,45.8363 122.499,113.001 160.332,201.168l28.3352 0c-29.3361,-89.1681 -82.501,-161.501 -159.667,-216.835 -77.1656,-55.33 -165.002,-82.9993 -263.668,-82.9993 -77.5007,0 -149.498,18.3345 -215.834,54.9992 -66.3316,36.5015 -117.997,88.5023 -154.834,155.667 -36.6647,67.3325 -55.1668,141.169 -55.1668,222.003 0,85.8303 20.1688,165.999 60.5022,240.497 40.5009,74.3347 96.9994,132.5 169.835,174.337 72.6636,41.8326 149.834,62.663 231.664,62.663 67.3325,0 128.165,-13.8325 182.336,-41.6651 54.1659,-27.8325 95.5001,-68.6685 123.831,-122.169 28.3352,-53.5 42.3352,-110.334 42.3352,-170.664 0,-59.5013 -13.1667,-118.5 -39.6675,-177 -26.5008,-58.3328 -60.3346,-100.999 -101.334,-127.667 -40.9992,-26.6684 -83.8327,-39.9983 -128.501,-39.9983 -24.6665,0 -43.3318,5.82941 -55.8326,17.4968 -12.5008,11.835 -18.8328,28.1676 -18.8328,49.3331 0,18.3345 2.99847,42.1677 8.83218,71.8345 -48.1646,-58.3328 -86.8312,-95.9985 -115.832,-113.332 -28.8335,-17.1661 -54.5009,-25.835 -76.6673,-25.835 -22.9998,0 -43.4994,10.3357 -61.4988,31.0029 -17.8362,20.6628 -26.8359,48.1646 -26.8359,82.8318 0,47.168 15.336,99.9979 46.1671,158.666 30.8353,58.5003 71.4995,106.167 122.336,142.999 37.4981,27.0035 70.9968,40.5009 100.5,40.5009 21.8313,0 39.9983,-5.49864 54.4966,-16.831 14.5027,-11.1691 24.3358,-28.0001 29.4993,-50.5015l16.1694 53.6675 76.6673 10.834zm-171.334 -20.0013c-24.499,0 -49.1655,-12.9991 -74.3347,-38.6666 -36.6647,-37.6657 -68.1659,-88.6655 -94.1641,-152.832 -19.1679,-46.8372 -28.8335,-84.6704 -28.8335,-113.336 0,-20.4996 5.83371,-37.1673 17.3336,-49.9989 11.4999,-12.8316 24.499,-19.3354 38.8298,-19.3354 18.8328,0 38.6666,7.16971 59.5013,21.5005 20.8347,14.3351 42.666,36.5015 65.4982,66.1684 22.8365,29.8344 39.3367,59.6645 49.8357,89.6664 18.167,51.6657 27.3342,93.8334 27.3342,126.499 0,21.5005 -6.00125,38.5033 -17.8362,51.1674 -11.8307,12.6683 -26.3333,19.1679 -43.1643,19.1679z" />
+      </glyph>
+      <glyph
+         id="glyph3573"
+         horiz-adv-x="499"
+         unicode="_">
+        <path
+           id="path3575"
+           d="M508.834 -215.834l-517.168 0 0 40.9992 517.168 0 0 -40.9992z" />
+      </glyph>
+      <glyph
+         id="glyph3577"
+         horiz-adv-x="469"
+         unicode="^">
+        <path
+           id="path3579"
+           d="M243.169 675.834l207.496 -350.169 -44.8311 0 -170.999 286.17 -170.836 -286.17 -45.9995 0 210.499 350.169 14.6702 0z" />
+      </glyph>
+      <glyph
+         id="glyph3581"
+         horiz-adv-x="277"
+         unicode="\">
+        <path
+           id="path3583"
+           d="M40.5009 694.332l239.332 -707.997 -39.1649 0 -239.169 707.997 39.0017 0z" />
+      </glyph>
+      <glyph
+         id="glyph3585"
+         horiz-adv-x="610"
+         unicode="Z">
+        <path
+           id="path3587"
+           d="M575.166 662.165l-434.998 -622.166 271.499 0c41.6651,0 73.6645,9.16726 95.8309,27.3342 22.3339,18.3345 42.1677,55.1668 59.3337,110.836l16.1694 -2.83523 -31.1661 -175.333 -539.167 0 0 17.9994 424.83 604.502 -211.831 0c-35.1655,0 -60.6654,-3.83616 -76.4998,-11.3366 -15.8344,-7.66372 -27.8325,-18.8328 -36.1664,-33.3312 -8.33387,-14.4984 -15.8344,-41.5018 -22.669,-81.165l-18.4978 0 13.665 165.496 489.666 0z" />
+      </glyph>
+      <glyph
+         id="glyph3589"
+         horiz-adv-x="722"
+         unicode="Y">
+        <path
+           id="path3591"
+           d="M476.5 662.165l230.999 0 0 -18.1627 -12.664 0c-8.50141,0 -20.8347,-3.66862 -37.1673,-11.1691 -16.1651,-7.50048 -30.9986,-18.167 -44.3328,-32.167 -13.3342,-14 -29.8344,-36.8323 -49.3331,-68.501l-159.667 -251.331 0 -166.166c0,-40.6684 4.49771,-66.0008 13.665,-76.169 12.3333,-13.665 31.8319,-20.4996 58.5003,-20.4996l21.5005 0 0 -17.9994 -281.165 0 0 17.9994 23.3305 0c28.0001,0 48.0014,8.50141 59.6688,25.4999 7.16541,10.3357 10.6665,34.1689 10.6665,71.1687l0 156.831 -181.67 277.333c-21.333,32.5021 -35.9989,52.8342 -43.6626,61.0005 -7.66802,8.16633 -23.5024,17.9994 -47.5031,29.3318 -6.49956,3.33355 -15.9976,4.83708 -28.3309,4.83708l0 18.1627 283.167 0 0 -18.1627 -14.6702 0c-15.3317,0 -29.3318,-3.50108 -42.1634,-10.6708 -13.0034,-7.16541 -19.3354,-17.9994 -19.3354,-32.3303 0,-11.6674 9.83311,-32.8329 29.8344,-63.3331l138.166 -213.502 129.832 204.167c19.503,30.6678 29.3361,53.3325 29.3361,68.3334 0,9.16726 -2.33692,17.3336 -7.16971,24.499 -4.66525,7.16971 -11.4999,12.6683 -20.1645,16.8353 -8.83218,3.9994 -21.9988,6.00125 -39.6675,6.00125l0 18.1627z" />
+      </glyph>
+      <glyph
+         id="glyph3593"
+         horiz-adv-x="722"
+         unicode="X">
+        <path
+           id="path3595"
+           d="M408.166 366.665l142.166 -211.831c39.3367,-58.6679 68.501,-95.6677 87.6689,-111.167 19.0004,-15.4993 43.1643,-24.0007 72.5004,-25.6675l0 -17.9994 -284.168 0 0 17.9994c18.8328,0.335073 32.8329,2.33262 42.0001,6.00125 6.83463,2.83094 12.3333,7.33295 16.8353,13.3342 4.33018,5.99695 6.49956,12.1657 6.49956,18.3302 0,7.50048 -1.50353,15.001 -4.33447,22.5014 -2.33262,5.49864 -11.3323,19.8338 -26.8359,43.0011l-112.331 169.831 -138.669 -177.666c-14.6659,-19.0004 -23.4981,-31.4969 -26.3333,-37.8332 -2.99847,-6.33202 -4.49771,-12.9991 -4.49771,-19.8338 0,-10.499 4.49771,-19.0004 13.1667,-25.8307 8.83218,-6.83463 25.6675,-10.834 50.334,-11.835l0 -17.9994 -234.835 0 0 17.9994c16.6677,1.66677 30.8353,5.16786 43.0011,10.3357 20.1645,8.49711 39.3324,19.8295 57.4994,34.1646 18.3345,14.3351 39.1649,36.334 62.4997,66.0008l156.333 197.165 -130.335 191c-35.4963,51.6657 -65.6657,85.667 -90.3323,101.669 -24.8341,16.1651 -53.3325,24.6665 -85.4995,25.6675l0 18.1627 306.167 0 0 -18.1627c-25.9982,-1.00092 -43.8344,-5.16786 -53.5,-12.6683 -9.49803,-7.50048 -14.3308,-15.8344 -14.3308,-24.8341 0,-12.1657 7.83126,-29.6669 23.3305,-52.8342l101.669 -151.831 117.667 149c13.665,17.4968 21.9988,29.4993 25.1649,35.9989 2.99847,6.6671 4.66525,13.3342 4.66525,20.1645 0,6.83463 -1.99755,12.8359 -5.99695,18.0037 -4.83279,6.83034 -11.0016,11.6631 -18.5021,14.3308 -7.50048,2.83523 -22.9998,4.33447 -46.3346,4.66954l0 18.1627 234.835 0 0 -18.1627c-18.4978,-1.00092 -33.6663,-3.83616 -45.5012,-8.66894 -17.4968,-7.50048 -33.6663,-17.6644 -48.3322,-30.3327 -14.6659,-12.6683 -35.333,-36.1664 -61.9971,-70.3353l-131.336 -168.001z" />
+      </glyph>
+      <glyph
+         id="glyph3597"
+         horiz-adv-x="943"
+         unicode="W">
+        <path
+           id="path3599"
+           d="M936.001 662.165l0 -18.1627c-17.1661,0 -31.1661,-3.00277 -42.0001,-9.16726 -10.6665,-6.33632 -21.0022,-17.8362 -30.6678,-34.6672 -6.49956,-11.4999 -16.8353,-38.6666 -30.831,-81.6676l-184.501 -533.668 -19.503 0 -150.998 423.335 -149.834 -423.335 -17.6687 0 -196.666 549.834c-14.6659,41.0035 -24.0007,65.335 -27.8325,72.8354 -6.49956,12.3333 -15.4993,21.5005 -26.6641,27.4975 -11.1691,6.00125 -26.5008,9.00402 -45.6688,9.00402l0 18.1627 245.166 0 0 -18.1627 -11.6674 0c-17.3336,0 -30.5002,-3.83616 -39.6675,-11.6674 -8.99972,-7.83556 -13.665,-17.3336 -13.665,-28.3352 0,-11.3323 7.16541,-37.6657 21.5005,-78.6649l130.335 -371.502 109.831 315.832 -19.4987 55.6694 -15.4993 44.5003c-6.83463,16.3327 -14.5027,30.6635 -22.9998,42.9968 -4.33447,6.16878 -9.50233,11.3366 -15.6668,15.6668 -8.16633,5.83371 -16.3327,10.0006 -24.3358,12.6683 -6.33202,1.83431 -15.9976,2.83523 -29.3318,2.83523l0 18.1627 257.834 0 0 -18.1627 -17.6687 0c-18.167,0 -31.5012,-3.83616 -39.9983,-11.6674 -8.50141,-7.83556 -12.6683,-18.3345 -12.6683,-31.6687 0,-16.6677 7.33295,-45.6645 21.9988,-86.9987l126.834 -359.834 126 364.667c14.3351,40.5009 21.5005,68.3334 21.5005,84.0003 0,7.50048 -2.33262,14.4984 -6.99787,20.9979 -4.83708,6.50386 -10.6708,11.1691 -17.8362,13.6693 -12.3333,4.66525 -28.4984,6.83463 -48.3322,6.83463l0 18.1627 197.667 0z" />
+      </glyph>
+      <glyph
+         id="glyph3601"
+         horiz-adv-x="722"
+         unicode="V">
+        <path
+           id="path3603"
+           d="M709.998 662.165l0 -18.1627c-23.4981,-4.16694 -41.1667,-11.6674 -53.3325,-22.3339 -17.1661,-16.0019 -32.4978,-40.5009 -45.832,-73.3338l-230.999 -563.503 -18.0037 0 -247.997 570.836c-12.8359,29.3318 -21.6681,47.168 -27.0035,53.6675 -7.9988,10.1639 -17.9994,17.9994 -29.9976,23.6656 -11.835,5.83371 -27.8325,9.33479 -48.0014,11.0016l0 18.1627 270.503 0 0 -18.1627c-30.6678,-2.83523 -50.5015,-8.17063 -59.6688,-15.5036 -8.99972,-7.50048 -13.665,-17.1661 -13.665,-28.8335 0,-16.3327 7.50048,-41.6651 22.4972,-76.1647l168.503 -388.165 156.166 383.165c15.3317,37.8332 22.9998,63.999 22.9998,78.6649 0,9.50233 -4.66525,18.5021 -14.1676,27.1667 -9.49803,8.50141 -25.3324,14.6702 -47.8338,18.167 -1.66677,0.335073 -4.33018,0.833387 -8.33387,1.50353l0 18.1627 204.167 0z" />
+      </glyph>
+      <glyph
+         id="glyph3605"
+         horiz-adv-x="722"
+         unicode="U">
+        <path
+           id="path3607"
+           d="M476.998 644.002l0 18.1627 234.504 0 0 -18.1627 -25.0016 0c-26.0025,0 -45.9995,-10.834 -59.9996,-32.6696 -6.83463,-10.1639 -10.3357,-33.4987 -10.3357,-70.331l0 -268.501c0,-66.4991 -6.49956,-118.002 -19.6662,-154.499 -13.1667,-36.669 -39.1649,-68.1702 -77.6639,-94.336 -38.6666,-26.1658 -91.17,-39.3324 -157.502,-39.3324 -72.3328,0 -127.169,12.5008 -164.499,37.6657 -37.5024,25.0016 -63.999,58.6679 -79.6658,101.003 -10.3357,28.9967 -15.6668,83.3301 -15.6668,163.163l0 258.835c0,40.6641 -5.50293,67.3325 -16.8353,80.0009 -11.1648,12.664 -29.3318,19.0004 -54.3334,19.0004l-24.9973 0 0 18.1627 286.165 0 0 -18.1627 -25.3324 0c-27.3342,0 -47.0005,-8.50141 -58.6679,-25.835 -8.16633,-11.6674 -12.1657,-36.1664 -12.1657,-73.1662l0 -288.666c0,-25.6675 2.33262,-55.1668 6.99787,-88.3347 4.83279,-33.1679 13.3342,-59.1662 25.6675,-77.6682 12.3333,-18.4978 30.1652,-33.8338 53.5,-45.832 23.3348,-12.1657 51.8332,-18.167 85.667,-18.167 43.3318,0 81.9984,9.49803 116.167,28.3352 34.1646,18.8328 57.6669,42.9968 70.1635,72.4961 12.5008,29.5036 18.8371,79.335 18.8371,149.67l0 268.166c0,41.3343 -4.66954,67.165 -13.6693,77.5007 -12.8316,14.3308 -31.6644,21.5005 -56.666,21.5005l-25.0016 0z" />
+      </glyph>
+      <glyph
+         id="glyph3609"
+         horiz-adv-x="610"
+         unicode="T">
+        <path
+           id="path3611"
+           d="M578.667 662.165l7.33295 -155.332 -18.6653 0c-3.50108,27.3342 -8.33387,46.8329 -14.6659,58.6679 -10.0006,18.8328 -23.5024,32.6653 -40.1701,41.6651 -16.831,8.99972 -38.8341,13.5017 -66.1641,13.5017l-93.3351 0 0 -505.999c0,-40.6684 4.50201,-66.0008 13.1667,-76.169 12.3333,-13.665 31.5012,-20.4996 57.1686,-20.4996l22.9998 0 0 -17.9994 -280.834 0 0 17.9994 23.4981 0c28.0001,0 47.8338,8.50141 59.5013,25.4999 7.16541,10.3357 10.834,34.1689 10.834,71.1687l0 505.999 -79.6658 0c-30.8353,0 -52.8342,-2.33262 -65.8333,-6.83463 -17.0028,-6.16449 -31.5012,-18.167 -43.4994,-35.6638 -12.0025,-17.6687 -19.1679,-41.3343 -21.5005,-71.3362l-18.5021 0 7.83556 155.332 540.499 0z" />
+      </glyph>
+      <glyph
+         id="glyph3613"
+         horiz-adv-x="556"
+         unicode="S">
+        <path
+           id="path3615"
+           d="M458.5 677.166l0 -229.001 -17.9994 0c-6.00125,44.002 -16.5002,78.9999 -31.5012,105.002 -15.1685,26.1658 -36.8323,46.8329 -64.8324,62.0014 -28.0001,15.3317 -56.8336,22.9998 -86.8355,22.9998 -33.8338,0 -61.8339,-10.3357 -84.0003,-31.0029 -22.1664,-20.6671 -33.1636,-44.1652 -33.1636,-70.4985 0,-20.1688 6.99787,-38.6666 20.9979,-55.1668 20.1688,-24.499 68.1659,-57.0011 144,-97.6652 61.8339,-33.1679 104.169,-58.6679 126.666,-76.4998 22.669,-17.6687 40.1701,-38.6666 52.3358,-62.6673 12.1657,-24.1682 18.3302,-49.3331 18.3302,-75.6664 0,-50.1665 -19.4987,-93.3351 -58.3328,-129.669 -38.9974,-36.334 -89.0006,-54.5009 -150.164,-54.5009 -19.3354,0 -37.3349,1.50353 -54.3334,4.50201 -10.0006,1.49924 -31.0029,7.50048 -62.6673,17.6644 -31.6687,10.3357 -51.8332,15.5036 -60.3346,15.5036 -8.16633,0 -14.4984,-2.50016 -19.3311,-7.33295 -4.66954,-4.83708 -8.16633,-15.001 -10.5033,-30.337l-17.9994 0 0 227.003 17.9994 0c8.50141,-47.5031 20.0013,-83.0036 34.3364,-106.669 14.3308,-23.4981 36.1664,-43.1643 65.6657,-58.8311 29.3318,-15.4993 61.6663,-23.3348 96.8318,-23.3348 40.6684,0 72.8354,10.6665 96.5011,32.167 23.5024,21.5005 35.333,46.8329 35.333,76.1647 0,16.337 -4.49771,32.6696 -13.3342,49.3331 -8.99972,16.6677 -22.9998,32.0038 -41.8326,46.3346 -12.664,9.83311 -47.3312,30.5002 -103.997,62.3322 -56.6703,31.6687 -96.8361,57.0011 -120.837,75.8339 -23.9964,19.0004 -42.0001,39.835 -54.4966,62.4997 -12.3333,22.8365 -18.5021,48.0014 -18.5021,75.3356 0,47.4988 18.167,88.3347 54.6685,122.667 36.4972,34.3321 82.8318,51.4982 139.167,51.4982 35.1655,0 72.4961,-8.49711 111.833,-25.8307 18.167,-8.16633 31.1661,-12.17 38.499,-12.17 8.50141,0 15.4993,2.50016 20.8347,7.50048 5.3311,5.16786 9.66557,15.336 12.9991,30.5002l17.9994 0z" />
+      </glyph>
+      <glyph
+         id="glyph3617"
+         horiz-adv-x="667"
+         unicode="R">
+        <path
+           id="path3619"
+           d="M675.834 0l-176.833 0 -224.168 309.5c-16.5002,-0.498314 -29.9976,-0.833387 -40.5009,-0.833387 -4.16694,0 -8.66465,0 -13.665,0.167537 -4.83279,0.167537 -9.83311,0.330777 -15.1685,0.66585l0 -192.332c0,-41.6694 4.66954,-67.5001 13.6693,-77.6682 12.5008,-14.3351 30.9986,-21.5005 55.6651,-21.5005l25.9982 0 0 -17.9994 -283.665 0 0 17.9994 24.8341 0c28.0001,0 48.0014,9.16726 59.9996,27.3342 6.83463,10.1682 10.3357,34.1646 10.3357,71.8345l0 427.833c0,41.6651 -4.66954,67.5001 -13.6693,77.5007 -12.664,14.3308 -31.6644,21.5005 -56.666,21.5005l-24.8341 0 0 18.1627 241.167 0c70.3353,0 122.169,-5.16356 155.5,-15.4993 33.3355,-10.1639 61.6663,-28.9967 85.0012,-56.4985 23.1673,-27.665 34.8347,-60.3346 34.8347,-98.4986 0,-40.6684 -13.1667,-76.0015 -39.835,-106.003 -26.5008,-29.8301 -67.5001,-50.9998 -123.165,-63.3331l136.667 -189.999c31.1661,-43.6669 58.1653,-72.6636 80.4992,-86.9987 22.4972,-14.1676 51.8332,-23.3348 87.9997,-27.3342l0 -17.9994zm-470.335 340.331c6.33632,0 11.6674,0 16.1694,-0.163241 4.49771,-0.167537 8.33387,-0.335073 11.1648,-0.335073 63.1656,0 110.832,13.665 142.836,40.9992 32.1627,27.3342 48.1646,62.169 48.1646,104.5 0,41.3343 -12.9991,75.0005 -38.8341,100.836 -25.8307,25.8307 -60.1671,38.8341 -102.833,38.8341 -18.8328,0 -44.3328,-3.17031 -76.6673,-9.33479l0 -275.336z" />
+      </glyph>
+      <glyph
+         id="glyph3621"
+         horiz-adv-x="722"
+         unicode="Q">
+        <path
+           id="path3623"
+           d="M440.501 -7.33295c33.1636,-57.3319 68.9993,-99.4995 107.666,-126.499 38.499,-27.0035 82.3335,-42.5027 131.499,-46.3346l0 -15.6668c-44.8311,1.66677 -92.8324,10.6665 -144,27.1667 -51.1674,16.3327 -99.4995,39.1649 -145.332,68.3334 -45.6688,29.1643 -85.1687,60.1671 -118.332,93 -46.8372,18.8328 -84.0003,38.8341 -111.334,59.9996 -39.6675,31.6687 -70.5028,70.4985 -92.5017,116.498 -21.9988,46.1671 -33.0004,100.5 -33.0004,163.335 0,99.0012 31.9995,181.167 96.166,246.665 64.1665,65.335 141.835,98.0003 233,98.0003 86.5004,0 161.501,-32.6653 224.834,-98.3311 63.3331,-65.5025 95.0018,-148.334 95.0018,-248.336 0,-80.9975 -22.669,-152.166 -67.6676,-213.33 -45.1661,-61.168 -103.834,-102.67 -175.999,-124.501zm-82.1659 647c-59.1662,0 -106.837,-21.1655 -143.003,-63.5007 -45.4969,-53.0017 -68.3334,-134.334 -68.3334,-243.667 0,-107 23.1673,-189.669 69.3344,-247.499 35.8356,-44.6678 83.1669,-67.0017 142.002,-67.0017 61.3313,0 110.497,22.3339 147.999,67.0017 43.9977,52.6666 66.0008,130.498 66.0008,233.331 0,79.1675 -12.17,145.667 -36.1664,199.669 -18.6696,41.6651 -43.1686,72.3328 -74.0039,92.1666 -30.831,19.6662 -65.3307,29.4993 -103.83,29.4993z" />
+      </glyph>
+      <glyph
+         id="glyph3625"
+         horiz-adv-x="556"
+         unicode="P">
+        <path
+           id="path3627"
+           d="M205 309.998l0 -192.83c0,-41.6694 4.66525,-67.5001 13.8325,-77.6682 12.3333,-14.3351 30.9986,-21.5005 56.0002,-21.5005l25.4999 0 0 -17.9994 -283.665 0 0 17.9994 24.8341 0c28.0001,0 47.9971,9.16726 59.9996,27.3342 6.49956,10.1682 9.83311,34.1646 9.83311,71.8345l0 427.833c0,41.6651 -4.33447,67.5001 -13.1667,77.5007 -12.6683,14.3308 -31.6687,21.5005 -56.666,21.5005l-24.8341 0 0 18.1627 242.666 0c59.1662,0 105.832,-6.16449 140,-18.3302 34.3321,-12.1657 62.998,-32.8329 86.5004,-61.8339 23.4981,-29.001 35.1655,-63.3331 35.1655,-103.001 0,-53.9983 -17.8319,-98.0003 -53.5,-131.834 -35.6681,-33.8338 -86.0021,-50.8323 -151.165,-50.8323 -15.8344,0 -33.1679,1.16846 -51.67,3.50108 -18.4978,2.33262 -38.499,5.66617 -59.6645,10.1639zm0 27.8368c17.3336,-3.17031 32.6653,-5.67047 45.9995,-7.33724 13.3342,-1.49924 24.6665,-2.33262 34.1689,-2.33262 33.8295,0 62.998,12.9991 87.6646,39.3324 24.499,26.1701 36.8323,60.0039 36.8323,101.669 0,28.6659 -5.83371,55.3343 -17.4968,79.8333 -11.835,24.6665 -28.3352,43.0011 -49.8357,55.1668 -21.5005,12.3333 -45.9995,18.3345 -73.3338,18.3345 -16.5002,0 -37.8332,-3.00277 -63.999,-9.16726l0 -275.499z" />
+      </glyph>
+      <glyph
+         id="glyph3629"
+         horiz-adv-x="499"
+         unicode="o">
+        <path
+           id="path3631"
+           d="M249.999 460.498c67.6676,0 122.001,-25.8307 163.168,-77.1656 34.8347,-43.9977 52.1683,-94.4992 52.1683,-151.333 0,-40.1658 -9.66987,-80.6667 -28.8335,-121.666 -19.1679,-40.9992 -45.6688,-72.0021 -79.335,-92.8324 -33.6663,-20.8347 -71.1644,-31.1661 -112.499,-31.1661 -67.5001,0 -121,26.8316 -160.668,80.4992 -33.4987,45.3337 -50.334,96.166 -50.334,152.334 0,41.1667 10.1682,81.8309 30.5002,122.332 20.3321,40.5009 47.168,70.4985 80.3316,89.834 33.1679,19.4987 68.3334,29.1643 105.501,29.1643zm-15.1642 -31.8319c-17.1661,0 -34.4996,-5.00032 -52.0008,-15.3317 -17.3336,-10.3357 -31.5012,-28.1676 -42.1677,-54.0026 -10.834,-25.6632 -16.1651,-58.6636 -16.1651,-98.9969 0,-65.1674 12.9991,-121.335 38.8341,-168.503 25.8307,-47.1637 59.9996,-70.8336 102.33,-70.8336 31.5012,0 57.4994,13.0034 78.1665,39.0017 20.4996,26.1658 30.6678,70.8336 30.6678,134.334 0,79.4982 -16.9985,141.998 -51.3349,187.499 -22.9998,31.3336 -52.4991,46.8329 -88.3304,46.8329z" />
+      </glyph>
+      <glyph
+         id="glyph3633"
+         horiz-adv-x="499"
+         unicode="n">
+        <path
+           id="path3635"
+           d="M161.668 365.668c52.3316,63.1656 102.33,94.83 149.834,94.83 24.499,0 45.4969,-6.16449 62.998,-18.3302 17.6687,-12.1657 31.6687,-32.3346 42.0001,-60.3346 7.16541,-19.4987 10.6665,-49.5006 10.6665,-89.834l0 -191c0,-28.1633 2.33262,-47.4988 6.99787,-57.4994 3.50108,-8.16633 9.33479,-14.4984 17.3336,-19.1679 7.83556,-4.49771 22.669,-6.83034 44.1695,-6.83034l0 -17.5011 -221.333 0 0 17.5011 9.3305 0c20.8347,0 35.5006,3.33355 43.6669,9.66557 8.33387,6.33202 14.1676,15.6668 17.3336,28.0001 1.336,4.83279 2.00185,20.1645 2.00185,45.832l0 183.169c0,40.6641 -5.3354,70.1635 -15.8344,88.6655 -10.6665,18.3345 -28.4984,27.5018 -53.5,27.5018 -38.6666,0 -77.3332,-21.1697 -115.665,-63.5007l0 -235.836c0,-30.1652 1.66677,-48.8305 5.3311,-56.0002 4.50201,-9.49803 10.834,-16.5002 18.8328,-20.8304 7.9988,-4.33447 24.1682,-6.6671 48.4997,-6.6671l0 -17.5011 -221.165 0 0 17.5011 9.83311 0c22.669,0 38.1683,5.83371 46.1671,17.3336 7.83126,11.6674 11.835,33.6663 11.835,66.1641l0 166.166c0,53.6675 -1.16846,86.3329 -3.66862,98.0003 -2.33262,11.835 -6.16449,19.8338 -11.1648,24.0007 -5.00032,4.16694 -11.835,6.33202 -20.3364,6.33202 -8.99972,0 -19.997,-2.49587 -32.6653,-7.33295l-7.33295 17.6687 134.833 54.6642 21.0022 0 0 -94.83z" />
+      </glyph>
+      <glyph
+         id="glyph3637"
+         horiz-adv-x="777"
+         unicode="m">
+        <path
+           id="path3639"
+           d="M164.001 365.165c32.6653,32.6696 51.8332,51.3349 57.6669,56.1677 14.6659,12.5008 30.5002,21.9988 47.3312,28.8335 17.0028,6.83463 33.6663,10.3314 50.334,10.3314 28.0001,0 52.1683,-8.16633 72.3328,-24.499 20.1688,-16.1651 33.6663,-39.8307 40.5009,-70.8336 33.4987,39.1692 61.8339,64.8367 85.0012,77.0024 22.9998,12.1657 46.8329,18.3302 71.1644,18.3302 23.8332,0 44.8354,-6.16449 63.3331,-18.3302 18.3345,-12.1657 32.8329,-32.167 43.6669,-59.8363 7.16541,-18.8328 10.6665,-48.4997 10.6665,-88.833l0 -192.5c0,-28.0001 2.16938,-47.1637 6.33632,-57.4994 3.32925,-7.16541 9.3305,-13.3342 18.1627,-18.3345 8.83648,-5.00032 22.9998,-7.66372 43.0011,-7.66372l0 -17.5011 -220.83 0 0 17.5011 9.3305 0c19.1679,0 34.1689,3.83186 44.9986,11.3323 7.50048,5.16786 12.8359,13.5017 16.0019,24.8341 1.3317,5.49864 2.00185,21.333 2.00185,47.3312l0 192.5c0,36.5015 -4.33447,62.169 -13.1667,77.1699 -12.6683,20.8304 -33.0004,31.1661 -61.0005,31.1661 -17.3336,0 -34.6672,-4.33447 -52.0008,-12.8359 -17.5011,-8.66465 -38.499,-24.6665 -63.3331,-48.1646l-1.00092 -5.3354 1.00092 -20.9979 0 -213.502c0,-30.5002 1.83431,-49.5006 5.16786,-56.9968 3.49679,-7.50048 9.83311,-13.8368 19.3311,-18.8371 9.33479,-5.00032 25.4999,-7.66372 48.3322,-7.66372l0 -17.5011 -226.166 0 0 17.5011c24.8341,0 41.8326,2.99847 51.1674,8.83218 9.16726,5.83371 15.6668,14.6659 19.1679,26.3333 1.66677,5.66617 2.50016,21.6681 2.50016,48.3322l0 192.5c0,36.5015 -5.3354,62.6673 -16.1694,78.5016 -14.3308,20.8347 -34.3321,31.3336 -59.9996,31.3336 -17.6644,0 -34.998,-4.66525 -52.3316,-14.1676 -26.9992,-14.3308 -47.8338,-30.5002 -62.4997,-48.3322l0 -239.835c0,-29.1643 2.16509,-48.3322 6.16449,-56.9968 3.9994,-8.83648 10.1682,-15.5036 17.9994,-19.8338 8.00309,-4.33447 24.1682,-6.6671 48.6672,-6.6671l0 -17.5011 -221.165 0 0 17.5011c20.4996,0 34.8347,2.33262 43.0011,6.6671 7.9988,4.33018 14.3308,11.3323 18.4978,20.9979 4.16694,9.66557 6.33632,28.1676 6.33632,55.8326l0 171.003c0,49.1655 -1.50353,80.83 -4.33447,95.1651 -2.33262,10.834 -6.00125,18.167 -10.834,22.1664 -4.83279,4.16694 -11.4999,6.16449 -20.0013,6.16449 -9.16726,0 -19.997,-2.49587 -32.6653,-7.33295l-7.33295 17.6687 134.665 54.6642 21.0022 0 0 -95.3326z" />
+      </glyph>
+      <glyph
+         id="glyph3641"
+         horiz-adv-x="277"
+         unicode="l">
+        <path
+           id="path3643"
+           d="M184.999 694.332l0 -593.333c0,-28.0001 2.16938,-46.4978 6.16878,-55.6651 3.9994,-8.99972 10.3314,-16.0019 18.8328,-20.6671 8.50141,-4.66525 24.1639,-7.16541 47.3312,-7.16541l0 -17.5011 -219.164 0 0 17.5011c20.4996,0 34.4996,2.16509 41.8326,6.49956 7.50048,4.16694 13.4974,11.1648 17.6644,20.9979 4.16694,9.66987 6.33632,28.3352 6.33632,56.0002l0 406.336c0,50.4972 -1.16846,81.5001 -3.33355,93 -2.33262,11.4999 -6.00125,19.4987 -11.0016,23.6656 -5.16786,4.33447 -11.4999,6.33202 -19.3311,6.33202 -8.50141,0 -19.1679,-2.50016 -32.167,-7.83126l-8.33387 17.1661 133.333 54.6642 21.8313 0z" />
+      </glyph>
+      <glyph
+         id="glyph3645"
+         horiz-adv-x="499"
+         unicode="k">
+        <path
+           id="path3647"
+           d="M163.499 694.332l0 -445.334 113.835 104.002c24.1682,22.1664 38.1683,36.1664 42.0001,42.0001 2.6677,3.9994 3.83186,7.83556 3.83186,11.6674 0,6.6671 -2.6634,12.1657 -7.9988,16.9985 -5.3311,4.66954 -14.1676,7.33295 -26.6684,8.00309l0 15.6625 194.334 0 0 -15.6625c-26.6641,-0.670146 -48.8305,-4.66954 -66.4991,-12.17 -17.8319,-7.50048 -37.3306,-20.8304 -58.5003,-40.1658l-114.664 -105.832 114.664 -145.001c31.9995,-40.1658 53.5,-65.5025 64.5016,-76.3322 15.6668,-15.1685 29.3318,-25.1691 40.9992,-29.6669 8.16633,-3.33355 22.3339,-5.00032 42.4984,-5.00032l0 -17.5011 -217.334 0 0 17.5011c12.5008,0.330777 20.8347,2.33262 25.1691,5.66617 4.49771,3.50108 6.6671,8.16633 6.6671,14.4984 0,7.50048 -6.49956,19.503 -19.503,35.9989l-137.333 175.333 0 -148.33c0,-29.001 2.16938,-48.1689 6.16878,-57.1686 3.9994,-9.16726 9.83311,-15.6668 17.3336,-19.4987 7.50048,-3.9994 23.8332,-6.16878 48.8305,-6.49956l0 -17.5011 -227.497 0 0 17.5011c22.8322,0 39.8307,2.83094 51.1674,8.33387 6.83034,3.66433 12.1657,9.16296 15.6668,16.6634 4.83279,10.6665 7.33295,29.3361 7.33295,55.6694l0 407.165c0,51.8332 -1.16846,83.5019 -3.33355,95.0018 -2.33262,11.4999 -6.16878,19.4987 -11.3323,23.9964 -5.16786,4.33447 -12.0025,6.50386 -20.5039,6.50386 -6.83034,0 -16.9985,-2.6677 -30.6635,-8.33387l-8.33387 17.1661 132.831 54.6642 22.3339 0z" />
+      </glyph>
+      <glyph
+         id="glyph3649"
+         horiz-adv-x="277"
+         unicode="j">
+        <path
+           id="path3651"
+           d="M144.498 694.834c14,0 25.835,-4.83279 35.6681,-14.6659 9.83311,-9.83311 14.6659,-21.6681 14.6659,-35.6681 0,-13.665 -4.83279,-25.3324 -14.6659,-35.1655 -9.83311,-9.66987 -21.6681,-14.6702 -35.6681,-14.6702 -13.665,0 -25.3324,5.00032 -35.1655,14.6702 -9.66557,9.83311 -14.6659,21.5005 -14.6659,35.1655 0,14 5.00032,25.835 14.6659,35.6681 9.83311,9.83311 21.5005,14.6659 35.1655,14.6659zm42.0001 -234.336l0 -450.166c0,-76.4998 -16.3327,-133.333 -48.8305,-170.496 -32.5021,-37.1673 -74.833,-55.6694 -127.001,-55.6694 -29.4993,0 -51.4982,5.3354 -65.8333,16.1694 -14.3351,10.6665 -21.5005,21.8313 -21.5005,33.1636 0,11.3366 3.9994,21.1697 12.0025,29.3361 7.9988,8.16633 17.3336,12.1657 28.0001,12.1657 8.49711,0 17.1661,-2.16509 25.9982,-6.33202 5.49864,-2.33692 16.1651,-10.5033 31.8319,-24.6665 15.8344,-14.1676 29.1685,-21.1697 39.835,-21.1697 7.83126,0 15.4993,3.00277 22.9998,8.99972 7.50048,6.00125 12.9991,16.0019 16.6677,30.1695 3.49679,14.1633 5.3311,44.8311 5.3311,92.1666l0 318.332c0,49.1655 -1.49924,80.6667 -4.49771,94.6668 -2.16938,10.834 -5.83371,18.167 -10.6665,22.1664 -4.83279,4.16694 -11.4999,6.16449 -20.0013,6.16449 -9.16726,0 -20.1688,-2.49587 -33.1679,-7.33295l-6.83034 17.6687 134.665 54.6642 20.9979 0z" />
+      </glyph>
+      <glyph
+         id="glyph3653"
+         horiz-adv-x="277"
+         unicode="i">
+        <path
+           id="path3655"
+           d="M145.001 694.332c13.665,0 25.3324,-4.83279 34.998,-14.3308 9.50233,-9.66557 14.3351,-21.333 14.3351,-35.0023 0,-13.665 -4.83279,-25.3324 -14.3351,-35.1655 -9.66557,-9.66557 -21.333,-14.6659 -34.998,-14.6659 -13.6693,0 -25.3324,5.00032 -35.1655,14.6659 -9.66987,9.83311 -14.6702,21.5005 -14.6702,35.1655 0,13.6693 4.83279,25.3367 14.5027,35.0023 9.49803,9.49803 21.333,14.3308 35.333,14.3308zm40.5009 -233.834l0 -359.499c0,-28.0001 1.99755,-46.4978 6.16449,-55.8326 3.9994,-9.33479 10.0006,-16.1651 17.9994,-20.8347 8.00309,-4.49771 22.669,-6.83034 43.8344,-6.83034l0 -17.5011 -217.334 0 0 17.5011c21.8356,0 36.5015,2.16509 43.8344,6.49956 7.50048,4.16694 13.4974,11.1648 17.8319,20.9979 4.50201,9.66987 6.6671,28.3352 6.6671,56.0002l0 172.503c0,48.4997 -1.49924,79.8333 -4.33447,94.1641 -2.33262,10.5033 -5.99695,17.6687 -10.834,21.6681 -4.83279,4.16694 -11.4999,6.16449 -19.997,6.16449 -9.16726,0 -20.1688,-2.49587 -33.1679,-7.33295l-6.83463 17.6687 134.669 54.6642 21.5005 0z" />
+      </glyph>
+      <glyph
+         id="glyph3657"
+         horiz-adv-x="499"
+         unicode="h">
+        <path
+           id="path3659"
+           d="M162.665 694.332l0 -327.165c36.0032,39.6675 64.6691,65.1674 85.8346,76.4998 21.1655,11.1648 42.3352,16.831 63.5007,16.831 25.3324,0 47.168,-6.99787 65.4982,-20.9979 18.167,-14 31.6687,-35.9989 40.5009,-66.0008 6.16878,-20.8304 9.16726,-58.8311 9.16726,-114.165l0 -158.335c0,-28.1633 2.33262,-47.6663 6.99787,-57.9977 3.17031,-7.83556 8.66894,-14 16.5002,-18.6696 7.83556,-4.49771 22.1707,-6.83034 43.0011,-6.83034l0 -17.5011 -219.666 0 0 17.5011 10.1682 0c20.8304,0 35.333,3.33355 43.4994,9.66557 8.16633,6.33202 13.8325,15.6668 16.9985,28.0001 1.00092,5.16786 1.49924,20.4996 1.49924,45.832l0 158.335c0,48.8348 -2.50016,80.8342 -7.49619,96.166 -5.16786,15.3317 -13.1667,26.6684 -24.1682,34.3321 -11.1691,7.66802 -24.499,11.4999 -40.1658,11.4999 -15.8344,0 -32.5021,-4.16694 -49.6681,-12.664 -17.3336,-8.50141 -38.0007,-25.4999 -62.0014,-51.3349l0 -236.334c0,-30.5002 1.66677,-49.5006 5.00032,-56.9968 3.50108,-7.50048 9.83311,-13.8368 19.1679,-18.8371 9.16726,-5.00032 25.1649,-7.66372 48.0014,-7.66372l0 -17.5011 -221.668 0 0 17.5011c19.8338,0 35.5006,3.16601 46.8329,9.3305 6.49956,3.33355 11.835,9.50233 15.6668,18.5021 3.9994,9.16726 5.83371,27.665 5.83371,55.6651l0 404.833c0,51.1674 -1.16846,82.501 -3.66862,94.336 -2.33262,11.6674 -6.16449,19.6662 -11.1648,23.8332 -5.00032,4.33447 -11.835,6.33202 -20.3321,6.33202 -6.83463,0 -17.8362,-2.50016 -33.1679,-7.83126l-6.83463 17.1661 133.836 54.6642 22.4972 0z" />
+      </glyph>
+      <glyph
+         id="glyph3661"
+         horiz-adv-x="499"
+         unicode="g">
+        <path
+           id="path3663"
+           d="M150.834 163.168c-27.3342,13.3342 -48.3364,31.8319 -63.0023,55.8326 -14.6659,24.0007 -21.8313,50.334 -21.8313,79.335 0,44.3328 16.6677,82.3292 49.9989,114.333 33.3355,31.8319 76.0015,47.8295 128.165,47.8295 42.666,0 79.5025,-10.499 110.836,-31.3293l94.6668 0c14,0 22.1664,-0.335073 24.499,-1.16846 2.16509,-0.833387 3.83186,-2.16509 4.83279,-4.16694 2.00185,-2.99847 2.99847,-8.16633 2.99847,-15.6668 0,-8.50141 -0.833387,-14.3351 -2.50016,-17.5011 -0.996628,-1.66677 -2.6634,-2.99847 -5.16356,-3.9994 -2.33262,-1.00092 -10.6665,-1.3317 -24.6665,-1.3317l-58.002 0c18.167,-23.5024 27.3342,-53.5 27.3342,-90.0015 0,-41.6651 -16.0019,-77.1656 -47.8338,-106.832 -31.9995,-29.6669 -74.833,-44.5003 -128.501,-44.5003 -22.1664,0 -44.6678,3.33355 -67.8308,9.83311 -14.3351,-12.3333 -24.0007,-23.1673 -29.001,-32.4978 -5.16786,-9.33479 -7.66802,-17.1704 -7.66802,-23.6699 0,-5.49864 2.6677,-10.834 7.9988,-16.1651 5.50293,-5.16786 16.0019,-8.83218 31.5012,-11.1648 9.16726,-1.336 31.9995,-2.50016 68.501,-3.50108 67.0017,-1.49924 110.501,-3.83616 130.335,-6.83463 30.1652,-4.16694 54.3334,-15.3317 72.4961,-33.6663 18.0037,-18.167 27.0035,-40.6684 27.0035,-67.3325 0,-36.8323 -17.1661,-71.3362 -51.67,-103.499 -50.8323,-47.5031 -116.996,-71.3362 -198.664,-71.3362 -62.8348,0 -116,14.1676 -159.336,42.5027 -24.3315,16.3327 -36.4972,33.1636 -36.4972,50.8323 0,7.83126 1.66677,15.4993 5.3311,23.3305 5.50293,12.17 17.0028,28.8335 34.1689,50.334 2.33262,3.00277 18.8328,20.4996 49.8314,52.6666 -16.9985,10.1682 -28.8335,19.1679 -35.8313,27.1667 -7.00217,8.00309 -10.499,17.0028 -10.499,27.1667 0,11.3366 4.49771,24.6665 13.8325,40.0026 9.3305,15.3317 30.6635,36.9998 64.1665,64.9999zm84.9969 273.832c-23.9964,0 -44.3328,-9.66557 -60.4979,-28.8335 -16.3327,-19.1679 -24.499,-48.6672 -24.499,-88.3347 0,-51.4982 11.1648,-91.3332 33.3312,-119.664 16.8353,-21.5005 38.3358,-32.167 64.334,-32.167 24.8341,0 45.1661,9.16726 61.0005,27.8325 16.0019,18.5021 24.0007,47.6663 24.0007,87.3338 0,51.8332 -11.1691,92.3341 -33.6663,121.666 -16.6677,21.5005 -38.0007,32.167 -64.0033,32.167zm-89.8297 -437c-15.336,-16.6677 -26.8359,-31.9995 -34.6672,-46.3346 -7.83556,-14.3308 -11.6674,-27.4975 -11.6674,-39.6675 0,-15.4993 9.33479,-29.1643 28.3309,-40.9992 32.5021,-20.1645 79.5025,-30.1652 141.001,-30.1652 58.6679,0 101.832,10.3314 129.669,30.9986 27.8325,20.6671 41.8326,42.666 41.8326,66.1684 0,16.831 -8.33387,28.8335 -25.0016,35.9989 -16.831,7.16541 -50.4972,11.4999 -100.5,12.8359 -73.3338,1.83001 -129.665,5.66617 -168.997,11.1648z" />
+      </glyph>
+      <glyph
+         id="glyph3665"
+         horiz-adv-x="332"
+         unicode="f">
+        <path
+           id="path3667"
+           d="M206.001 412.166l0 -294.001c0,-41.6651 4.66525,-67.9984 13.665,-79.1632 12.1657,-14.3351 28.1676,-21.5005 48.3322,-21.5005l40.6684 0 0 -17.5011 -267.165 0 0 17.5011 19.997 0c12.9991,0 25.0016,3.33355 35.6681,9.83311 10.6665,6.49956 18.167,15.3317 22.1664,26.3333 4.16694,11.1648 6.16878,32.6653 6.16878,64.4973l0 294.001 -87.003 0 0 35.1655 87.003 0 0 29.1685c0,44.6678 7.16541,82.501 21.4962,113.332 14.3351,31.0029 36.1664,56.0002 65.67,75.0005 29.4993,19.0004 62.4997,28.5027 99.332,28.5027 34.1646,0 65.6657,-11.0016 94.3317,-33.1679 18.8328,-14.6659 28.1676,-31.1661 28.1676,-49.3331 0,-9.83311 -4.16694,-19.0004 -12.6683,-27.5018 -8.49711,-8.66465 -17.4968,-12.9991 -27.3299,-12.9991 -7.50048,0 -15.336,2.6677 -23.6699,7.9988 -8.32957,5.3354 -18.4978,17.0028 -30.5002,34.6672 -11.9982,17.8362 -23.163,29.6669 -33.1636,35.9989 -10.1682,6.16878 -21.333,9.16726 -33.6663,9.16726 -15.001,0 -27.6693,-3.9994 -38.1683,-11.9982 -10.3314,-7.83556 -17.8319,-20.3321 -22.5014,-36.9998 -4.49771,-16.8353 -6.83034,-59.9996 -6.83034,-129.669l0 -32.167 115.334 0 0 -35.1655 -115.334 0z" />
+      </glyph>
+      <glyph
+         id="glyph3669"
+         horiz-adv-x="443"
+         unicode="e">
+        <path
+           id="path3671"
+           d="M106.502 278.832c-0.335073,-66.4991 15.6668,-118.5 48.3322,-156.333 32.4978,-37.6657 70.8336,-56.4985 114.668,-56.4985 29.3318,0 54.8317,7.9988 76.4998,24.1639 21.6638,16.0019 39.6632,43.6669 54.3334,82.6686l15.1642 -9.66557c-6.83463,-44.6678 -26.6641,-85.3363 -59.5013,-121.833 -32.9961,-36.669 -74.1629,-54.9992 -123.496,-54.9992 -53.8351,0 -99.8346,20.8304 -138.003,62.663 -38.3315,41.8369 -57.3319,98.1678 -57.3319,168.834 0,76.4998 19.4987,136.169 58.8311,178.835 39.1692,42.8335 88.3347,64.334 147.668,64.334 50.1665,0 91.3332,-16.5002 123.5,-49.6681 32.167,-33.0004 48.3322,-77.1656 48.3322,-132.5l-308.998 0zm0 28.3352l206.998 0c-1.66677,28.6659 -5.00032,48.8305 -10.3314,60.4979 -8.00309,18.167 -20.1688,32.5021 -36.334,43.0011 -16.1694,10.3314 -33.0004,15.6668 -50.5015,15.6668 -26.9992,0 -51.1674,-10.499 -72.5004,-31.5012 -21.333,-20.9979 -33.8338,-50.334 -37.3306,-87.6646z" />
+      </glyph>
+      <glyph
+         id="glyph3673"
+         horiz-adv-x="499"
+         unicode="d">
+        <path
+           id="path3675"
+           d="M347.166 50.334c-21.8313,-22.8322 -43.1643,-39.1692 -63.999,-49.1655 -20.8347,-9.83311 -43.3318,-14.8334 -67.3325,-14.8334 -48.8348,0 -91.5007,20.4996 -128.002,61.3313 -36.334,40.8317 -54.6642,93.3351 -54.6642,157.334 0,64.1665 20.1645,122.834 60.6654,176.167 40.3334,53.1649 92.1666,79.8333 155.667,79.8333 39.3324,0 71.9978,-12.6683 97.6652,-37.6657l0 82.4967c0,51.1674 -1.16416,82.501 -3.66433,94.336 -2.50016,11.6674 -6.33632,19.6662 -11.4999,23.8332 -5.16786,4.33447 -11.6674,6.33202 -19.503,6.33202 -8.49711,0 -19.6662,-2.50016 -33.6663,-7.83126l-6.33202 17.1661 133.333 54.6642 21.8313 0 0 -517.164c0,-52.3358 1.336,-84.3353 3.66862,-95.8352 2.50016,-11.6674 6.33202,-19.6662 11.835,-24.1639 5.3311,-4.66954 11.6631,-6.83463 18.6653,-6.83463 8.83218,0 20.6671,2.6677 35.1655,8.33387l5.49864 -17.1661 -132.831 -55.1668 -22.5014 0 0 63.999zm0 34.1646l0 230.5c-1.99755,22.0031 -7.83126,42.3352 -17.5011,60.5022 -9.83311,18.167 -22.8322,31.9995 -38.8298,41.1667 -16.1694,9.3305 -31.8362,14 -47.168,14 -28.6659,0 -54.1659,-12.8359 -76.6673,-38.499 -29.6669,-34.0013 -44.5003,-83.3344 -44.5003,-148.502 0,-65.8333 14.3351,-116.167 43.0011,-151.165 28.6659,-35.0023 60.4979,-52.5034 95.6677,-52.5034 29.6669,0 58.3328,14.8334 85.9978,44.5003z" />
+      </glyph>
+      <glyph
+         id="glyph3677"
+         horiz-adv-x="443"
+         unicode="c">
+        <path
+           id="path3679"
+           d="M411.165 169.998c-11.9982,-58.9986 -35.6638,-104.332 -70.8336,-135.997 -35.1655,-31.8362 -73.9996,-47.6663 -116.666,-47.6663 -50.8323,0 -95.1651,21.333 -132.831,63.999 -37.8332,42.666 -56.6703,100.165 -56.6703,172.833 0,70.331 21.0022,127.5 62.8348,171.334 41.8326,43.9977 91.9991,65.9965 150.499,65.9965 44.002,0 80.1684,-11.6631 108.499,-34.998 28.3352,-23.1673 42.5027,-47.3312 42.5027,-72.5004 0,-12.3333 -3.9994,-22.3339 -12.0025,-29.9976 -7.9988,-7.66802 -19.1636,-11.4999 -33.4987,-11.4999 -19.1679,0 -33.6663,6.16449 -43.4994,18.4978 -5.49864,6.83463 -9.16726,20.0013 -10.834,39.1649 -1.83431,19.1679 -8.50141,33.8338 -19.8338,44.002 -11.4999,9.66557 -27.1667,14.4984 -47.3312,14.4984 -32.6696,0 -58.8354,-11.9982 -78.6692,-35.9989 -26.3333,-31.9995 -39.5,-74.1671 -39.5,-126.499 0,-53.3325 13.0034,-100.5 39.3367,-141.332 26.1658,-40.836 61.4988,-61.3356 106.167,-61.3356 31.8319,0 60.4979,10.834 85.8303,32.6653 17.9994,15.001 35.333,42.1677 52.3358,81.6676l14.1633 -6.83463z" />
+      </glyph>
+      <glyph
+         id="glyph3681"
+         horiz-adv-x="499"
+         unicode="b">
+        <path
+           id="path3683"
+           d="M153.833 370.166c43.3318,60.1671 90.0015,90.3323 140.168,90.3323 45.832,0 85.8346,-19.6662 119.999,-58.8311 34.1646,-39.3324 51.3349,-92.8324 51.3349,-160.998 0,-79.335 -26.3333,-143.334 -79.1675,-191.834 -45.1661,-41.6694 -95.6677,-62.4997 -151.333,-62.4997 -26.0025,0 -52.5034,4.66525 -79.335,14.1633 -26.8316,9.50233 -54.3334,23.6699 -82.3335,42.5027l0 463.333c0,50.8323 -1.16416,81.9984 -3.66433,93.8334 -2.33692,11.6674 -6.16878,19.6662 -11.3366,23.8332 -5.3311,4.33447 -11.8307,6.33202 -19.6662,6.33202 -8.99972,0 -20.4996,-2.50016 -34.1646,-7.83126l-6.83463 17.1661 134.334 54.6642 21.9988 0 0 -324.166zm0 -31.3336l0 -267.5c16.5002,-16.3327 33.6663,-28.6659 51.5025,-36.8323 17.6644,-8.33387 35.8313,-12.5008 54.4966,-12.5008 29.4993,0 57.1686,16.3327 82.6686,48.8348 25.4999,32.4978 38.3315,79.8333 38.3315,141.998 0,57.3362 -12.8316,101.334 -38.3315,132.169 -25.4999,30.6678 -54.5009,46.1671 -87.1663,46.1671 -17.1661,0 -34.4996,-4.50201 -51.6657,-13.1667 -13.0034,-6.49956 -29.6669,-19.6662 -49.8357,-39.1692z" />
+      </glyph>
+      <glyph
+         id="glyph3685"
+         horiz-adv-x="443"
+         unicode="a">
+        <path
+           id="path3687"
+           d="M284.666 64.5016c-45.832,-35.5006 -74.6655,-56.0002 -86.5004,-61.5031 -17.5011,-8.16633 -36.1664,-12.3333 -56.0002,-12.3333 -30.9986,0 -56.4985,10.6665 -76.4998,31.8362 -19.997,21.1655 -29.9976,48.998 -29.9976,83.4976 0,21.8356 4.83279,40.6684 14.6659,56.666 13.3342,22.0031 36.4972,42.8335 69.4976,62.4997 33.0004,19.503 87.9997,43.1686 164.835,71.1687l0 17.6644c0,44.5003 -6.99787,75.1681 -21.1655,91.8358 -14.1676,16.5002 -34.8347,24.8341 -61.8339,24.8341 -20.4996,0 -36.8323,-5.50293 -48.8348,-16.6677 -12.3333,-11.0016 -18.4978,-23.6656 -18.4978,-38.0007l1.00092 -28.3309c0,-15.001 -3.83616,-26.5008 -11.4999,-34.6672 -7.66802,-8.16633 -17.6687,-12.17 -30.0019,-12.17 -12.1657,0 -21.9988,4.16694 -29.6669,12.6683 -7.66802,8.50141 -11.4999,20.0013 -11.4999,34.6672 0,28.0001 14.3351,53.6675 43.0011,77.1656 28.6659,23.3348 68.8318,35.1655 120.665,35.1655 39.6675,0 72.1653,-6.6628 97.6652,-19.997 19.1679,-10.1682 33.3355,-26.0025 42.5027,-47.4988 5.83371,-14 8.66465,-42.5027 8.66465,-85.8346l0 -151.835c0,-42.666 0.833387,-68.8318 2.50016,-78.4973 1.66677,-9.50233 4.33447,-16.0019 8.00309,-19.1679 3.83186,-3.33355 8.16633,-5.00032 12.9991,-5.00032 5.16356,0 9.83311,1.16846 13.665,3.50108 6.83463,4.16694 20.0013,16.1651 39.5,35.6638l0 -27.3299c-36.334,-48.8348 -71.1644,-73.3338 -104.5,-73.3338 -15.8344,0 -28.4984,5.49864 -38.0007,16.6634 -9.49803,11.0016 -14.3308,30.0019 -14.6659,56.6703zm0 31.6644l0 170.501c-49.1655,-19.6662 -80.8342,-33.4987 -95.1651,-41.5018 -25.835,-14.3308 -44.1695,-29.3318 -55.1668,-44.9986 -11.1691,-15.6668 -16.6677,-32.6653 -16.6677,-51.3349 0,-23.3305 7.00217,-42.8292 21.0022,-58.3328 14,-15.3317 30.1652,-23.1673 48.3322,-23.1673 24.8341,0 57.3319,16.337 97.6652,48.8348z" />
+      </glyph>
+      <glyph
+         id="glyph3689"
+         horiz-adv-x="541"
+         unicode="~">
+        <path
+           id="path3691"
+           d="M508.834 329.665l21.9988 0c-1.3317,-42.3309 -13.3342,-75.4989 -36.1664,-99.4995 -22.8322,-23.8332 -50.6648,-35.8313 -83.5019,-35.8313 -14.9967,0 -31.1661,2.50016 -48.3322,7.50048 -17.3336,5.16356 -61.8339,22.3339 -133.832,51.6657 -50.1665,20.8347 -85.8346,31.1661 -107,31.1661 -22.669,0 -42.0001,-6.99787 -57.4994,-20.9979 -15.6668,-14 -26.6684,-36.8366 -33.1679,-68.3334l-21.5005 0c1.83431,43.9977 14,77.5007 35.9989,100.831 22.1664,23.3348 48.1689,34.8347 78.1665,34.8347 14.3351,0 29.001,-2.16938 44.002,-6.83463 33.8338,-9.66557 78.3341,-26.3333 133.501,-49.9989 55.1668,-23.6656 93.9966,-35.333 116.498,-35.333 24.3358,0 44.8354,7.83126 61.4988,23.3305 16.6677,15.6668 26.3333,38.1683 29.3361,67.5001z" />
+      </glyph>
+      <glyph
+         id="glyph3693"
+         horiz-adv-x="443"
+         unicode="z">
+        <path
+           id="path3695"
+           d="M420.001 137.165l-5.50293 -137.165 -394.497 0 0 17.5011 296.832 395.666 -146.5 0c-31.5012,0 -52.1683,-2.16509 -62.0014,-6.16878 -9.66557,-4.16264 -17.6644,-11.8307 -23.8332,-23.163 -8.83218,-16.337 -13.8325,-36.5015 -15.1642,-60.6697l-19.503 0 2.83523 124.166 374.998 0 0 -18.1627 -299.667 -396.503 163 0c34.1689,0 57.3362,2.83523 69.6694,8.66894 12.1657,5.66617 21.9988,15.6668 29.4993,29.9976 5.16786,10.3357 9.49803,32.3346 13.1667,65.8333l16.6677 0z" />
+      </glyph>
+      <glyph
+         id="glyph3697"
+         horiz-adv-x="499"
+         unicode="y">
+        <path
+           id="path3699"
+           d="M5.83371 447.331l208.501 0 0 -18.1627 -10.1682 0c-14.6659,0 -25.6675,-3.17031 -33.0004,-9.50233 -7.33295,-6.33202 -11.0016,-14.1676 -11.0016,-23.6656 0,-12.6683 5.3354,-30.3327 16.1694,-52.6666l108.834 -225.667 100.165 247c5.49864,13.5017 8.16633,26.6684 8.16633,39.6675 0,5.83371 -1.16846,10.1639 -3.33355,13.1667 -2.6677,3.49679 -6.6671,6.33202 -12.1657,8.49711 -5.66617,2.16938 -15.336,3.17031 -29.3361,3.17031l0 18.1627 145.503 0 0 -18.1627c-12.0025,-1.336 -21.333,-3.83616 -27.8368,-7.83556 -6.49956,-3.83186 -13.665,-11.1648 -21.4962,-21.9988 -3.00277,-4.50201 -8.50141,-17.0028 -16.6677,-37.5024l-182.001 -446.33c-17.6687,-43.3361 -40.6684,-76.0015 -69.1668,-98.1678 -28.4984,-22.1664 -55.8326,-33.1679 -82.3335,-33.1679 -19.1679,0 -34.998,5.50293 -47.3355,16.6677 -12.3333,11.0016 -18.4978,23.6656 -18.4978,38.0007 0,13.665 4.49771,24.6665 13.3342,33.0004 8.99972,8.33387 21.333,12.5008 36.9998,12.5008 10.6665,0 25.3324,-3.66862 43.8344,-10.834 12.9991,-4.83279 21.1655,-7.33295 24.499,-7.33295 9.66557,0 20.3321,5.16356 31.9995,15.1642 11.4999,10.1682 23.1673,29.6669 34.8347,58.6679l31.8319 77.5007 -160.668 337.5c-5.00032,10.0006 -12.664,22.6647 -23.4981,37.4981 -8.16633,11.4999 -14.8334,19.1679 -20.0013,22.9998 -7.50048,5.16786 -19.4987,9.83311 -36.1664,13.6693l0 18.1627z" />
+      </glyph>
+      <glyph
+         id="glyph3701"
+         horiz-adv-x="499"
+         unicode="x">
+        <path
+           id="path3703"
+           d="M13.1667 447.331l210.499 0 0 -18.1627c-13.3342,0 -22.6647,-2.16938 -28.1676,-6.83463 -5.3311,-4.50201 -7.9988,-10.499 -7.9988,-17.9994 0,-7.83556 5.66617,-19.8338 17.1661,-36.1664 3.50108,-5.16786 8.83648,-13.3342 16.0019,-24.3358l31.8319 -50.8323 36.5015 50.8323c23.4981,32.167 35.1655,52.4991 35.1655,61.0005 0,6.83463 -2.6677,12.5008 -8.16633,17.3336 -5.66617,4.66525 -14.4984,7.00217 -26.9992,7.00217l0 18.1627 151.5 0 0 -18.1627c-16.0019,-1.00092 -29.8344,-5.3354 -41.5018,-13.1667 -15.9976,-11.0016 -37.8332,-35.1698 -65.4982,-72.1696l-61.0005 -81.6676 111.334 -160.165c27.3299,-39.3324 46.8329,-62.998 58.5003,-71.0011 11.8307,-7.9988 26.8316,-12.4965 45.4969,-13.4974l0 -17.5011 -210.997 0 0 17.5011c14.6659,0 25.9982,3.33355 34.1646,9.83311 6.16878,4.49771 9.33479,10.6665 9.33479,17.9994 0,7.50048 -10.499,26.5008 -31.3336,56.666l-65.335 95.8352 -71.8302 -95.8352c-22.1707,-29.4993 -33.1679,-47.168 -33.1679,-52.6666 0,-7.83126 3.66433,-14.8334 10.9973,-21.333 7.33724,-6.33202 18.3345,-9.83311 33.0004,-10.499l0 -17.5011 -145.997 0 0 17.5011c11.6674,1.66677 21.8313,5.83371 30.6635,12.3333 12.3376,9.3305 33.1679,33.4987 62.504,72.1653l93.8334 124.501 -85.0012 123.165c-24.1682,35.1655 -42.666,57.1686 -56.0002,66.1684 -13.1667,8.83218 -29.6669,13.3342 -49.5006,13.3342l0 18.1627z" />
+      </glyph>
+      <glyph
+         id="glyph3705"
+         horiz-adv-x="722"
+         unicode="w">
+        <path
+           id="path3707"
+           d="M6.33202 447.331l187.499 0 0 -18.1627c-17.1661,-1.336 -28.4984,-4.33447 -33.997,-9.16726 -5.3354,-5.00032 -7.9988,-12.0025 -7.9988,-21.0022 0,-10.1639 2.83094,-22.3339 8.32957,-36.6647l95.6677 -257.336 96.166 209.502 -25.3324 65.8333c-7.83126,19.4987 -17.9994,33.0004 -30.831,40.5009 -7.16971,4.66525 -20.5039,7.33295 -40.0026,8.33387l0 18.1627 212.999 0 0 -18.1627c-23.4981,-1.00092 -40.1658,-5.16786 -49.8314,-12.6683 -6.49956,-5.16786 -9.83311,-13.5017 -9.83311,-24.8341 0,-6.49956 1.3317,-13.1667 3.9994,-20.0013l101.501 -256.997 94.1641 247.666c6.49956,17.5011 9.83311,31.4969 9.83311,42.0001 0,6.16449 -3.16601,11.6674 -9.49803,16.5002 -6.33202,5.00032 -18.8328,7.66372 -37.3349,8.33387l0 18.1627 141.001 0 0 -18.1627c-28.3352,-4.16694 -49.1655,-23.3348 -62.4997,-57.5037l-149.335 -385.33 -19.997 0 -111.837 285.667 -130.331 -285.667 -18.167 0 -143.502 375.999c-9.49803,23.6656 -18.6653,39.8307 -27.8325,47.9971 -9.16726,8.33387 -23.4981,14.6702 -43.0011,18.8371l0 18.1627z" />
+      </glyph>
+      <glyph
+         id="glyph3709"
+         horiz-adv-x="499"
+         unicode="v">
+        <path
+           id="path3711"
+           d="M8.33387 447.331l210.499 0 0 -18.1627 -13.8325 0c-12.6683,0 -22.3339,-3.00277 -29.001,-9.16726 -6.6671,-6.33632 -10.0006,-14.5027 -10.0006,-25.0016 0,-11.3323 3.50108,-24.8341 10.3357,-40.5009l103.997 -247 104.5 256.335c7.50048,18.167 11.1691,31.9995 11.1691,41.5018 0,4.49771 -1.336,8.16633 -3.83186,11.1648 -3.66862,4.83279 -8.17063,8.16633 -13.6693,10.0006 -5.66617,1.83431 -16.831,2.6677 -33.8338,2.6677l0 18.1627 146.002 0 0 -18.1627c-16.8353,-1.336 -28.6659,-4.66954 -35.1655,-10.1682 -11.3366,-9.83311 -21.5005,-26.1658 -30.6678,-48.8348l-158.666 -383.831 -20.0013 0 -159.667 377.499c-7.16541,17.5011 -14,30.1652 -20.4996,37.8332 -6.6671,7.66802 -14.8334,14 -25.0016,19.1679 -5.49864,2.99847 -16.5002,5.83371 -32.6653,8.33387l0 18.1627z" />
+      </glyph>
+      <glyph
+         id="glyph3713"
+         horiz-adv-x="499"
+         unicode="u">
+        <path
+           id="path3715"
+           d="M423.335 447.331l0 -270.997c0,-51.8332 1.16416,-83.5019 3.66433,-95.0018 2.50016,-11.6674 6.33202,-19.6662 11.6674,-24.1639 5.49864,-4.66954 11.6674,-6.83463 18.8328,-6.83463 10.1682,0 21.5005,2.6677 34.1689,8.33387l6.83034 -17.1661 -133.832 -55.1668 -21.8356 0 0 94.6668c-38.499,-41.6694 -67.8308,-67.8351 -87.9997,-78.5016 -20.1645,-10.834 -41.4975,-16.1651 -63.8314,-16.1651 -25.1649,0 -46.8329,7.16541 -65.335,21.6638 -18.3302,14.5027 -31.1661,33.1679 -38.3315,56.0002 -7.16541,22.8322 -10.6665,54.9992 -10.6665,96.6686l0 199.665c0,21.1655 -2.33262,35.8356 -6.83463,44.002 -4.49771,8.16633 -11.3323,14.3308 -20.3321,18.8328 -8.83218,4.33447 -25.1691,6.33202 -48.4997,6.00125l0 18.1627 156.664 0 0 -299.332c0,-41.6651 7.33724,-68.9993 21.8356,-81.9984 14.4984,-13.1667 31.9995,-19.6662 52.4991,-19.6662 14,0 29.8344,4.49771 47.4988,13.1667 17.8362,8.83218 38.8341,25.6675 63.3331,50.334l0 253.5c0,25.3324 -4.66525,42.4984 -14,51.4982 -9.3305,8.83218 -28.4984,13.665 -57.8302,14.3351l0 18.1627 152.334 0z" />
+      </glyph>
+      <glyph
+         id="glyph3717"
+         horiz-adv-x="277"
+         unicode="t">
+        <path
+           id="path3719"
+           d="M161.166 594.166l0 -146.835 104.5 0 0 -34.1646 -104.5 0 0 -290.165c0,-29.001 4.16694,-48.504 12.5008,-58.5003 8.16633,-10.1682 18.8328,-15.1685 31.8319,-15.1685 10.834,0 21.1697,3.33355 31.3336,10.0006 10.0006,6.6671 17.8362,16.5002 23.5024,29.4993l19.0004 0c-11.4999,-31.8319 -27.5018,-55.8326 -48.3364,-71.9978 -20.8304,-16.1694 -42.3309,-24.1682 -64.4973,-24.1682 -15.001,0 -29.6669,4.16694 -44.002,12.5008 -14.3308,8.33387 -24.8341,20.1645 -31.6644,35.6638 -6.83463,15.336 -10.3357,39.1692 -10.3357,71.5037l0 300.831 -70.6661 0 0 16.0019c17.8319,7.16541 36.1664,19.3311 54.8317,36.3297 18.6696,17.1704 35.5006,37.5024 50.0032,60.8373 7.50048,12.3333 17.9994,34.998 31.3336,67.8308l15.1642 0z" />
+      </glyph>
+      <glyph
+         id="glyph3721"
+         horiz-adv-x="389"
+         unicode="s">
+        <path
+           id="path3723"
+           d="M320.334 460.498l0 -152.329 -16.1694 0c-12.3333,47.8295 -28.1633,80.3316 -47.4988,97.6652 -19.4987,17.1661 -44.1652,25.835 -73.9996,25.835 -22.8322,0 -41.1667,-6.00125 -55.1668,-18.167 -14,-12.0025 -20.9979,-25.3367 -20.9979,-40.0026 0,-18.167 5.16356,-33.8338 15.4993,-46.8329 10.1639,-13.3342 30.6678,-27.4975 61.6663,-42.4984l71.1644 -34.6672c66.1684,-32.167 99.1688,-74.6655 99.1688,-127.5 0,-40.6684 -15.3317,-73.3338 -46.1671,-98.3354 -30.6678,-24.8341 -65.1674,-37.3306 -103.168,-37.3306 -27.4975,0 -58.6636,4.83279 -93.8334,14.6659 -10.6665,3.16601 -19.4987,4.83279 -26.3333,4.83279 -7.50048,0 -13.3299,-4.16694 -17.6644,-12.6683l-16.0019 0 0 159.667 16.0019 0c9.16726,-45.4969 26.6641,-79.8333 52.3316,-103.001 25.6675,-23.163 54.5009,-34.6629 86.3329,-34.6629 22.5014,0 40.836,6.49956 54.9992,19.6662 14.1676,13.3299 21.1697,29.1643 21.1697,47.6663 0,22.4972 -7.83556,41.3343 -23.6656,56.666 -15.6668,15.3317 -47.168,34.6672 -94.5035,58.1653 -47.1637,23.3348 -77.999,44.5003 -92.6649,63.3331 -14.6659,18.6696 -21.9988,42.0001 -21.9988,70.3353 0,36.8323 12.664,67.6676 37.8332,92.3341 25.1649,24.6665 57.8302,37.163 97.8328,37.163 17.6644,0 38.9974,-3.83186 63.999,-11.3323 16.6677,-4.83279 27.665,-7.33295 33.1679,-7.33295 5.3311,0 9.3305,1.16846 12.3333,3.50108 2.83094,2.33262 6.33202,7.33295 10.1639,15.1642l16.1694 0z" />
+      </glyph>
+      <glyph
+         id="glyph3725"
+         horiz-adv-x="332"
+         unicode="r">
+        <path
+           id="path3727"
+           d="M162.167 460.498l0 -100.664c37.3349,67.165 75.8339,100.664 115.166,100.664 17.8319,0 32.6653,-5.49864 44.5003,-16.3327 11.6674,-10.9973 17.5011,-23.6656 17.5011,-37.8332 0,-12.8316 -4.16694,-23.4981 -12.6683,-32.3303 -8.50141,-8.83648 -18.4978,-13.1667 -30.3327,-13.1667 -11.3323,0 -24.1682,5.66617 -38.3315,16.831 -14.1676,11.1691 -24.6708,16.8353 -31.5012,16.8353 -5.83371,0 -12.1657,-3.16601 -19.0004,-9.66987 -14.6659,-13.3299 -29.8344,-35.333 -45.3337,-65.9965l0 -214.335c0,-24.6665 2.99847,-43.4994 9.16726,-56.1677 4.33447,-8.83218 11.8307,-16.1651 22.4972,-21.9988 10.834,-5.83371 26.1701,-8.83218 46.3346,-8.83218l0 -17.5011 -229.001 0 0 17.5011c22.8365,0 39.835,3.66433 50.8366,10.834 8.16633,5.16356 13.8325,13.4974 17.1661,24.8298 1.49924,5.67047 2.33262,21.333 2.33262,47.5031l0 173.332c0,52.0008 -1.00092,82.9993 -3.16601,93 -2.00185,9.83311 -6.00125,17.1661 -11.6674,21.6681 -5.66617,4.49771 -12.8316,6.83034 -21.333,6.83034 -10.0006,0 -21.333,-2.49587 -34.1689,-7.33295l-4.83279 17.6687 135.335 54.6642 20.4996 0z" />
+      </glyph>
+      <glyph
+         id="glyph3729"
+         horiz-adv-x="499"
+         unicode="q">
+        <path
+           id="path3731"
+           d="M427.167 460.498l0 -575.166c0,-28.6659 2.00185,-47.1637 6.00125,-55.33 3.83186,-8.00309 10.0006,-14.3351 18.3302,-19.0004 8.17063,-4.50201 24.3358,-6.83463 48.4997,-6.83463l0 -17.9994 -225.663 0 0 17.9994 9.3305 0c18.3345,0 32.167,2.6677 41.5018,7.83126 6.49956,3.66862 11.6674,10.0006 15.6668,19.3354 3.83186,9.16726 5.83371,27.1667 5.83371,53.9983l0 192.336c-29.6669,-35.1698 -55.5019,-59.1662 -77.6682,-72.0021 -22.1664,-12.8316 -44.9986,-19.3311 -68.8318,-19.3311 -43.3361,0 -82.0027,19.6662 -116,58.9986 -34.0013,39.5 -50.9998,92.1666 -50.9998,158.335 0,75.8296 22.4972,137.496 67.5001,185.33 44.8311,47.6663 98.9969,71.4995 162.498,71.4995 18.5021,0 35.6681,-2.6634 51.3349,-7.83126 15.4993,-5.16786 29.4993,-12.9991 42.0001,-23.4981 18.8328,9.16296 36.8323,19.4987 54.1659,31.3293l16.5002 0zm-80.4992 -352.166l0 210.001c0,24.499 -3.16601,43.6669 -9.50233,57.6669 -6.33202,14 -17.6644,25.835 -33.997,35.6681 -16.1694,9.66557 -34.6672,14.6659 -55.1668,14.6659 -36.334,0 -67.6676,-15.4993 -93.6701,-46.4978 -25.9982,-30.8353 -39.1649,-77.6682 -39.1649,-140.503 0,-60.3303 13.3342,-105.999 39.835,-137.333 26.4966,-31.1661 58.5003,-46.8329 95.9985,-46.8329 19.1679,0 36.334,4.16694 51.1674,12.5008 15.001,8.33387 29.8344,21.8313 44.5003,40.6641z" />
+      </glyph>
+      <glyph
+         id="glyph3733"
+         horiz-adv-x="499"
+         unicode="p">
+        <path
+           id="path3735"
+           d="M-1.00092 402.835l137.668 55.6651 18.6653 0 0 -104.5c22.9998,39.3324 46.1671,66.9974 69.5019,82.8318 23.3305,15.6668 47.8338,23.6656 73.5013,23.6656 44.9986,0 82.3292,-17.6644 112.331,-52.8299 36.8323,-43.0011 55.1668,-98.8337 55.1668,-168.001 0,-77.0024 -22.1664,-140.834 -66.4991,-191.335 -36.334,-41.3343 -82.3335,-61.9971 -137.668,-61.9971 -24.0007,0 -44.8311,3.33355 -62.4997,10.1639 -12.9991,5.00032 -27.665,14.6659 -43.8344,29.3361l0 -136.169c0,-30.6678 1.83431,-49.9989 5.50293,-58.3328 3.83186,-8.33387 10.3314,-15.001 19.6662,-19.8338 9.16726,-4.83279 25.9982,-7.33295 50.4972,-7.33295l0 -17.9994 -234.5 0 0 17.9994 12.3333 0c17.8362,-0.335073 33.1679,3.16601 45.8363,10.3314 6.16449,3.50108 10.9973,9.33479 14.4984,17.3336 3.33355,8.00309 5.00032,28.1676 5.00032,60.6697l0 423c0,28.8335 -1.16846,47.3312 -3.83186,55.1668 -2.6677,7.83126 -6.83463,13.665 -12.5008,17.4968 -5.66617,4.00369 -13.3342,5.83371 -23.1673,5.83371 -7.83556,0 -17.6687,-2.16509 -29.8344,-6.83034l-5.83371 15.6668zm156.333 -77.6682l0 -167c0,-36.1664 1.336,-59.832 4.33447,-71.3362 4.50201,-18.8328 15.6668,-35.333 33.4987,-49.6639 17.6687,-14.3351 40.0026,-21.5005 67.1693,-21.5005 32.4978,0 58.8311,12.6683 78.9999,38.0007 26.3333,33.1636 39.5,80.0009 39.5,140.164 0,68.3334 -14.8334,121 -44.8354,157.669 -20.8304,25.4999 -45.6645,38.1683 -74.1671,38.1683 -15.6668,0 -31.1661,-4.00369 -46.4978,-11.6674 -11.6674,-6.00125 -31.0029,-23.5024 -58.002,-52.8342z" />
+      </glyph>
+      <glyph
+         id="glyph3737"
+         horiz-adv-x="759"
+         unicode="®">
+        <path
+           id="path3739"
+           d="M379.835 677.166c58.3328,0 115.166,-14.8334 170.496,-44.6635 55.3343,-29.6669 98.5029,-72.3371 129.669,-127.835 30.9986,-55.5019 46.4978,-113.332 46.4978,-173.667 0,-59.832 -15.1642,-117.336 -45.832,-172.335 -30.6678,-54.9992 -73.3338,-97.6652 -128.501,-128.165 -54.9992,-30.5002 -112.331,-45.6688 -172.331,-45.6688 -59.8363,0 -117.168,15.1685 -172.004,45.6688 -54.9992,30.5002 -97.6652,73.1662 -128.165,128.165 -30.6678,54.9992 -45.9995,112.503 -45.9995,172.335 0,60.3346 15.4993,118.165 46.6654,173.667 31.0029,55.4976 74.3347,98.1678 129.669,127.835 55.3343,29.8301 112,44.6635 169.835,44.6635zm0 -29.6669c-53.0017,0 -104.835,-13.665 -155.169,-40.9992 -50.5015,-27.3342 -89.834,-66.3316 -118.165,-117.001 -28.3352,-50.6648 -42.5027,-103.499 -42.5027,-158.498 0,-54.6685 13.8325,-107 41.6694,-157.166 27.8325,-50.1665 66.8299,-89.1681 116.996,-117.168 50.1708,-28.0001 102.502,-42.0001 157.171,-42.0001 54.6642,0 107.163,14 157.497,42.0001 50.334,28.0001 89.3357,67.0017 117.168,117.168 27.8325,50.1665 41.8326,102.498 41.8326,157.166 0,54.9992 -14.1676,107.833 -42.4984,158.498 -28.3352,50.6691 -67.6676,89.6664 -118.169,117.001 -50.4972,27.3342 -102.335,40.9992 -155.83,40.9992zm-191.335 -103.499l188.5 0c47.168,0 83.1669,-10.6665 107.833,-31.9995 24.8341,-21.333 37.1673,-47.168 37.1673,-77.5007 0,-24.6665 -8.33387,-46.3346 -25.1691,-65.1674 -16.831,-18.6653 -44.5003,-33.0004 -83.3301,-43.1643l102.163 -145.503c12.3333,-17.3293 23.3348,-29.1643 33.1679,-35.6638 6.16878,-3.83616 14.8334,-6.33202 25.835,-7.33295l0 -16.0019 -89.834 0 -143.502 197.667 -37.1673 0 0 -150.834c2.00185,-10.834 6.6671,-18.6653 14,-23.4981 7.33724,-4.83279 21.8356,-7.33295 43.6669,-7.33295l0 -16.0019 -179.165 0 0 16.0019c15.4993,0 26.6684,1.83431 33.1679,5.66617 6.49956,3.66433 11.1648,9.16726 14.1676,16.3327 2.33262,5.16786 3.32925,20.3321 3.32925,45.3337l0 255.498c0,24.0007 -0.498314,38.1683 -1.3317,42.5027 -2.33262,7.50048 -6.49956,13.1667 -12.5008,17.3336 -5.99695,3.9994 -16.3327,6.00125 -30.9986,6.00125l0 17.6644zm115.665 -203.669c38.5033,0 66.5034,3.66862 84.3353,11.1691 17.6687,7.50048 31.3336,17.9994 40.6684,31.5012 9.49803,13.4974 14.1633,28.9967 14.1633,46.1671 0,26.3333 -9.16726,48.4997 -27.4975,66.4991 -18.5021,17.8319 -42.0001,26.8316 -70.6661,26.8316 -12.3333,0 -26.0025,-2.6677 -41.0035,-7.83126l0 -174.337z" />
+      </glyph>
+      <glyph
+         id="glyph3741"
+         horiz-adv-x="332"
+         unicode="­">
+        <path
+           id="path3743"
+           d="M40.5009 261.168l252.499 0 0 -73.6688 -252.499 0 0 73.6688z" />
+      </glyph>
+      <glyph
+         id="glyph3745"
+         horiz-adv-x="759"
+         unicode="©">
+        <path
+           id="path3747"
+           d="M379.835 677.166c58.3328,0 115.166,-14.8334 170.496,-44.6635 55.3343,-29.6669 98.5029,-72.3371 129.669,-127.835 30.9986,-55.5019 46.4978,-113.332 46.4978,-173.667 0,-59.832 -15.1642,-117.336 -45.832,-172.335 -30.6678,-54.9992 -73.3338,-97.6652 -128.501,-128.165 -54.9992,-30.5002 -112.331,-45.6688 -172.331,-45.6688 -59.8363,0 -117.168,15.1685 -172.004,45.6688 -54.9992,30.5002 -97.6652,73.1662 -128.165,128.165 -30.6678,54.9992 -45.9995,112.503 -45.9995,172.335 0,60.3346 15.4993,118.165 46.6654,173.667 31.0029,55.4976 74.3347,98.1678 129.669,127.835 55.3343,29.8301 112,44.6635 169.835,44.6635zm0 -29.6669c-53.0017,0 -104.835,-13.665 -155.169,-40.9992 -50.5015,-27.3342 -89.834,-66.3316 -118.165,-117.001 -28.3352,-50.6648 -42.5027,-103.499 -42.5027,-158.498 0,-54.6685 13.8325,-107 41.6694,-157.166 27.8325,-50.1665 66.8299,-89.1681 116.996,-117.168 50.1708,-28.0001 102.502,-42.0001 157.171,-42.0001 54.6642,0 107.163,14 157.497,42.0001 50.334,28.0001 89.3357,67.0017 117.168,117.168 27.8325,50.1665 41.8326,102.498 41.8326,157.166 0,54.9992 -14.1676,107.833 -42.4984,158.498 -28.3352,50.6691 -67.6676,89.6664 -118.169,117.001 -50.4972,27.3342 -102.335,40.9992 -155.83,40.9992zm171.497 -93.8334l9.66557 -136.667 -19.0004 0c-11.6631,38.6666 -30.3327,67.6676 -55.8326,86.668 -25.6675,19.0004 -56.3309,28.4984 -92.1666,28.4984 -26.6641,0 -50.334,-5.49864 -71.1644,-16.5002 -20.8347,-11.1648 -38.0007,-25.9982 -51.3349,-44.496 -9.83311,-14 -17.9994,-32.5021 -24.499,-55.6694 -6.49956,-23.1673 -9.66557,-47.4988 -9.66557,-73.1662 0,-68.9993 14.8334,-119.999 44.3328,-152.664 29.6669,-32.6696 68.8318,-49.0023 117.331,-49.0023 63.3331,0 114.17,26.3333 152.334,78.9999l17.9994 -9.16726c-45.1661,-66.1641 -107.498,-99.1645 -187.001,-99.1645 -65.1631,0 -118.998,20.9979 -161.832,63.1656 -42.8335,42.1677 -64.1665,93.3351 -64.1665,153.665 0,62.4997 22.669,115.837 68.3334,159.834 45.5012,44.1652 103.834,66.1684 174.668,66.1684 15.001,0 27.4975,-1.00092 37.4981,-2.83523 9.83311,-1.99755 27.5018,-7.16541 52.8342,-15.6668 8.16633,-2.6677 14.1676,-3.9994 18.167,-3.9994 5.16786,0 9.49803,1.49924 13.1667,4.16694 3.50108,2.83523 7.16541,8.83218 10.6665,17.8319l19.6662 0z" />
+      </glyph>
+      <glyph
+         id="glyph3749"
+         horiz-adv-x="499"
+         unicode="£">
+        <path
+           id="path3751"
+           d="M353 321.833l-126 0c0.335073,-15.001 0.50261,-26.1658 0.50261,-33.3355 0,-30.496 -2.16938,-58.8311 -6.50386,-84.8293 -4.49771,-26.1701 -12.3333,-56.0002 -23.6656,-89.834 63.6682,-20.4996 100.17,-31.8362 109.333,-33.8338 16.8353,-3.83616 33.503,-5.83371 49.8357,-5.83371 26.9992,0 48.998,6.33202 65.8333,18.8328 16.9985,12.5008 29.3318,32.3346 37.1673,59.3337l17.4968 -4.33447c-6.83034,-52.4991 -23.6656,-92.1666 -50.4972,-119.166 -26.8359,-26.9992 -56.666,-40.5009 -89.6664,-40.5009 -22.0031,0 -42.0001,3.9994 -59.9996,11.835 -17.8362,7.9988 -50.9998,30.1652 -99.1688,66.1641 -12.9991,-25.9982 -26.9992,-45.4969 -42.1677,-58.5003 -15.1642,-12.9991 -31.3336,-19.4987 -48.6672,-19.4987 -16.1651,0 -29.8301,5.49864 -40.6641,16.8353 -11.0016,11.1648 -16.3327,26.5008 -16.3327,46.1671 0,21.6638 7.50048,39.8307 22.3339,54.3334 14.9967,14.4984 34.3321,21.8313 57.6669,21.8313 5.49864,0 11.6631,-0.335073 18.6653,-1.00092 6.83463,-0.66585 14.3308,-1.66677 22.8322,-2.99847 0.66585,8.50141 1.16846,15.8344 1.336,21.9988 0.163241,6.16878 0.163241,11.3323 0.163241,15.6668 0,28.6659 -3.49679,82.1659 -10.3314,160.668l-94.6668 0 0 46.3346 94.6668 0c-4.16694,48.4997 -6.33202,80.83 -6.33202,97.1669 0,39.6632 7.9988,75.9972 23.9964,108.83 16.0019,33.0004 38.0007,58.002 66.1684,75.5031 28.1676,17.3336 58.3328,26.1658 90.4998,26.1658 40.9992,0 72.0021,-11.1691 92.6649,-33.3355 20.6671,-21.9988 31.0029,-44.1652 31.0029,-66.3316 0,-10.3314 -3.9994,-19.6662 -12.0025,-27.8325 -7.9988,-8.16633 -16.6634,-12.1657 -26.1658,-12.1657 -12.3333,0 -22.6647,6.16449 -30.6678,18.4978 -3.66433,5.83371 -6.16449,18.5021 -7.33295,37.8332 -1.3317,19.3354 -6.83034,33.6663 -16.6634,42.8335 -10.1682,8.99972 -24.3358,13.665 -42.5027,13.665 -25.6675,0 -47.0005,-10.1639 -63.6639,-30.3327 -16.8353,-20.1645 -25.1691,-55.6651 -25.1691,-106.497 0,-23.6699 2.00185,-54.1659 5.83371,-91.3332 2.33262,-24.3358 3.83186,-42.0001 4.83279,-52.6666l126 0 0 -46.3346zm-207.5 -237.833c-7.16541,4.49771 -14.1676,7.9988 -20.9979,10.1682 -6.83463,2.33262 -13.6693,3.49679 -20.4996,3.49679 -14.6702,0 -26.0025,-3.9994 -34.1689,-11.9982 -8.16633,-7.9988 -12.1657,-18.3345 -12.1657,-30.9986 0,-11.6674 3.16601,-21.0022 9.49803,-27.8368 6.33632,-6.83034 13.6693,-10.1639 22.1664,-10.1639 10.834,0 21.3373,5.00032 31.5012,15.001 10.3357,10.1639 18.5021,27.4975 24.6665,52.3316z" />
+      </glyph>
+    </font>
+  </defs>
+  <g
+     style="fill-rule:evenodd"
+     id="g3961"
+     transform="matrix(0.26092747,0,0,0.26092747,-150.0074,-14.465307)">
+    <g
+       id="Layer_x0020_1">
+      <metadata
+         id="CorelCorpID_0Corel-Layer" />
+      <g
+         id="g3757">
+        <path
+           id="path3759"
+           d="m 593.15,80.4362 -14.7544,0 7.3772,-13.4111 7.3772,13.4111 z m -7.3772,63.2708 -1.4111,-1.4111 0,-63.0225 2.8222,0 0,63.0225 -1.4111,1.4111 z m 0,0 -1.4111,0 0,-1.4111 1.4111,1.4111 z m 70.9777,0 -70.9777,0 0,-2.8222 70.9777,0 0,2.8222 z m -1.1628,-8.7883 13.4111,7.3772 -13.4111,7.3772 0,-14.7544 z"
+           class="fil0"
+           inkscape:connector-curvature="0"
+           style="fill:#28166f;fill-rule:nonzero" />
+      </g>
+      <path
+         id="path3761"
+         d="m 584.507,122.884 c 5.4385,-10.8771 6.772,-13.3112 12.6675,-1.5201 5.2569,10.5139 11.1935,-16.4141 16.3833,-0.8445 4.908,14.7242 14.9355,-18.1932 21.6192,1.8579 1.2202,3.6606 6.4838,-0.3776 7.9383,-2.1957 7.0041,-8.7586 6.283,-3.6821 11.6541,1.689"
+         class="fil1 str0"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#28166f;stroke-width:5.64440012" />
+      <text
+         id="text3763"
+         class="fil2 fnt0"
+         y="105.433"
+         x="624.72302"
+         style="font-size:23.2784996px;font-weight:normal;fill:#28166f;font-family:Times New Roman">v(t)</text>
+      <rect
+         id="rect3765"
+         height="11.394"
+         width="3.4182"
+         y="115.457"
+         x="580.90997"
+         class="fil3 str1"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.0762" />
+    </g>
+  </g>
+</svg>
diff --git a/bitmaps_png/sources/sim_probe.svg b/bitmaps_png/sources/sim_probe.svg
new file mode 100644
index 0000000000..d6bb8b929c
--- /dev/null
+++ b/bitmaps_png/sources/sim_probe.svg
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="26"
+   width="26"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="sim_tune.svg">
+  <metadata
+     id="metadata50">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1000"
+     id="namedview48"
+     showgrid="true"
+     inkscape:zoom="22.961539"
+     inkscape:cx="22.847263"
+     inkscape:cy="14.370314"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-to-guides="false"
+     inkscape:snap-grids="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3006"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <style
+       id="style3201"
+       type="text/css">
+    .fil0 {fill:#00923F}
+   </style>
+    <style
+       id="style3282"
+       type="text/css">
+    .str0 {stroke:#DA251D;stroke-width:0.0762}
+    .fil0 {fill:#DA251D}
+   </style>
+    <style
+       id="style3363"
+       type="text/css">
+    .fil0 {fill:#28166F}
+   </style>
+    <style
+       id="style3448"
+       type="text/css">
+    .str0 {stroke:#28166F;stroke-width:0.0762}
+    .str1 {stroke:#28166F;stroke-width:2.8222}
+    .fil1 {fill:none}
+    .fil0 {fill:#28166F}
+   </style>
+  </defs>
+  <g
+     style="fill-rule:evenodd"
+     id="g3469"
+     transform="matrix(0.24461259,0,0,0.22640667,-97.21454,-8.3068908)">
+    <g
+       id="Layer_x0020_1">
+      <metadata
+         id="CorelCorpID_0Corel-Layer" />
+      <polygon
+         id="polygon3452"
+         points="479.386,49.1497 468.164,67.1189 461.483,62.0725 475.843,46.3793 "
+         class="fil0 str0"
+         style="fill:#28166f;stroke:#28166f;stroke-width:0.0762" />
+      <polygon
+         id="polygon3454"
+         points="409.114,129.032 418.351,109.564 433.894,121.304 417.417,135.398 "
+         class="fil0 str0"
+         style="fill:#28166f;stroke:#28166f;stroke-width:0.0762" />
+      <rect
+         id="rect3456"
+         ry="0.79079998"
+         rx="0.79079998"
+         height="36.848999"
+         width="7.9926"
+         transform="matrix(1.485,1.12165,-1.21627,1.61027,464.721,51.9919)"
+         class="fil0 str0"
+         x="0"
+         y="0"
+         style="fill:#28166f;stroke:#28166f;stroke-width:0.0762" />
+      <rect
+         id="rect3458"
+         ry="1.6112"
+         rx="1.6112"
+         height="3.4238"
+         width="11.6812"
+         transform="matrix(1.80799,1.36561,-1.36561,1.80799,416.388,106.365)"
+         class="fil0 str0"
+         x="0"
+         y="0"
+         style="fill:#28166f;stroke:#28166f;stroke-width:0.0762" />
+      <polygon
+         id="polygon3460"
+         points="415.651,125.526 405.196,139.368 400.984,148.426 408.418,142.645 419.076,128.535 "
+         class="fil0 str0"
+         style="fill:#28166f;stroke:#28166f;stroke-width:0.0762" />
+      <path
+         id="path3462"
+         d="m 476.138,50.2632 c 6.9706,-10.9547 21.8672,-11.2504 20.0427,3.4745 -2.3011,18.57 -50.7341,55.7184 -26.4633,74.9809 4.1502,3.1639 15.5463,9.4991 27.8104,7.409"
+         class="fil1 str1"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#28166f;stroke-width:2.82220006" />
+    </g>
+  </g>
+</svg>
diff --git a/bitmaps_png/sources/sim_run.svg b/bitmaps_png/sources/sim_run.svg
new file mode 100644
index 0000000000..e140caa655
--- /dev/null
+++ b/bitmaps_png/sources/sim_run.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="26"
+   width="26"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="add_arc.svg">
+  <metadata
+     id="metadata50">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1000"
+     id="namedview48"
+     showgrid="true"
+     inkscape:zoom="22.961539"
+     inkscape:cx="21.978887"
+     inkscape:cy="14.372445"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-to-guides="false"
+     inkscape:snap-grids="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3006"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <style
+       id="style3201"
+       type="text/css">
+    .fil0 {fill:#00923F}
+   </style>
+  </defs>
+  <g
+     style="fill-rule:evenodd"
+     id="g3212"
+     transform="matrix(0.25556099,0,0,0.25556099,-38.947924,-8.6975232)">
+    <g
+       id="Layer_x0020_1">
+      <metadata
+         id="CorelCorpID_0Corel-Layer" />
+      <polygon
+         id="polygon3205"
+         points="162.107,36.8175 245.819,85.5025 162.359,133.984 "
+         class="fil0"
+         style="fill:#00923f" />
+    </g>
+  </g>
+</svg>
diff --git a/bitmaps_png/sources/sim_settings.svg b/bitmaps_png/sources/sim_settings.svg
new file mode 100644
index 0000000000..9deb037228
--- /dev/null
+++ b/bitmaps_png/sources/sim_settings.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="26"
+   width="26"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="sim_settings.svg">
+  <metadata
+     id="metadata50">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1000"
+     id="namedview48"
+     showgrid="true"
+     inkscape:zoom="22.961539"
+     inkscape:cx="21.978887"
+     inkscape:cy="14.372445"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-to-guides="false"
+     inkscape:snap-grids="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3006"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <style
+       id="style3201"
+       type="text/css">
+    .fil0 {fill:#00923F}
+   </style>
+  </defs>
+  <path
+     id="path3281"
+     d="M 23.256135,14.998175 V 11.21958 L 20.910799,10.828691 C 20.780503,10.307505 20.51991,9.7863203 20.129021,9.0045413 L 21.562281,7.0500948 18.826057,4.3138704 16.87161,5.7471309 C 16.220128,5.3562417 15.568646,5.0956489 15.047461,4.9653525 L 14.786868,2.6200171 H 11.008272 L 10.617383,4.9653525 C 9.9659012,5.0956489 9.4447152,5.3562417 8.7932342,5.7471309 L 6.8387876,4.3138704 4.1025629,7.0500948 5.405527,9.0045413 C 5.0146378,9.6560233 4.8843414,10.177209 4.6237486,10.828691 l -2.215039,0.260593 v 3.778594 l 2.3453354,0.39089 c 0.1302964,0.651482 0.3908892,1.172667 0.7817784,1.824149 l -1.3029641,1.954446 2.7362247,2.736225 1.9544462,-1.302964 c 0.521185,0.260593 1.1726668,0.521186 1.8241488,0.781778 l 0.390889,2.345336 h 3.908893 l 0.390889,-2.345336 c 0.651482,-0.130296 1.172668,-0.390889 1.82415,-0.781778 l 1.954446,1.43326 2.736224,-2.736224 -1.43326,-1.954446 c 0.390889,-0.651482 0.651482,-1.302964 0.781778,-1.82415 l 1.954447,-0.390889 z m -10.423713,1.954446 c -2.215039,0 -3.9088918,-1.693853 -3.9088918,-3.908892 0,-2.215038 1.6938528,-3.9088917 3.9088918,-3.9088917 2.215039,0 3.908892,1.6938537 3.908892,3.9088917 0,2.215039 -1.693853,3.908892 -3.908892,3.908892 z"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/bitmaps_png/sources/sim_stop.svg b/bitmaps_png/sources/sim_stop.svg
new file mode 100644
index 0000000000..96ad3ab0f0
--- /dev/null
+++ b/bitmaps_png/sources/sim_stop.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="26"
+   width="26"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="sim_run.svg">
+  <metadata
+     id="metadata50">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1000"
+     id="namedview48"
+     showgrid="true"
+     inkscape:zoom="16.23626"
+     inkscape:cx="28.212686"
+     inkscape:cy="8.3654748"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-to-guides="false"
+     inkscape:snap-grids="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3006"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <style
+       id="style3201"
+       type="text/css">
+    .fil0 {fill:#00923F}
+   </style>
+    <style
+       id="style3282"
+       type="text/css">
+    .str0 {stroke:#DA251D;stroke-width:0.0762}
+    .fil0 {fill:#DA251D}
+   </style>
+  </defs>
+  <g
+     style="fill-rule:evenodd"
+     id="g3293"
+     transform="matrix(0.21662328,0,0,0.21662328,-0.09790372,-11.577568)">
+    <g
+       id="Layer_x0020_1">
+      <metadata
+         id="CorelCorpID_0Corel-Layer" />
+      <rect
+         id="rect3286"
+         height="89.604897"
+         width="90.811699"
+         y="69.152901"
+         x="14.49"
+         class="fil0 str0"
+         style="fill:#da251d;stroke:#da251d;stroke-width:0.0762" />
+    </g>
+  </g>
+</svg>
diff --git a/bitmaps_png/sources/sim_tune.svg b/bitmaps_png/sources/sim_tune.svg
new file mode 100644
index 0000000000..f6df39d745
--- /dev/null
+++ b/bitmaps_png/sources/sim_tune.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="26"
+   width="26"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="sim_stop.svg">
+  <metadata
+     id="metadata50">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1000"
+     id="namedview48"
+     showgrid="true"
+     inkscape:zoom="16.23626"
+     inkscape:cx="37.591318"
+     inkscape:cy="25.47254"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-to-guides="false"
+     inkscape:snap-grids="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3006"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <style
+       id="style3201"
+       type="text/css">
+    .fil0 {fill:#00923F}
+   </style>
+    <style
+       id="style3282"
+       type="text/css">
+    .str0 {stroke:#DA251D;stroke-width:0.0762}
+    .fil0 {fill:#DA251D}
+   </style>
+    <style
+       id="style3363"
+       type="text/css">
+    .fil0 {fill:#28166F}
+   </style>
+  </defs>
+  <g
+     style="fill-rule:evenodd"
+     id="g3375"
+     transform="matrix(0.21994704,0,0,0.21994704,-59.705381,-6.2888419)">
+    <g
+       id="Layer_x0020_1">
+      <metadata
+         id="CorelCorpID_0Corel-Layer" />
+      <g
+         id="_210257584">
+        <path
+           d="m 278.712,140.427 c -3.801,-3.5131 -2.6247,-12.0338 8.2392,-27.0585 6.2877,-8.6956 20.0408,-11.3843 21.6725,-14.7159 1.579,-3.2236 -1.1947,-12.8616 5.3512,-9.6322 3.4875,1.7205 6.4926,4.3826 8.8694,7.2744 2.9118,2.3567 5.5741,5.3616 7.2946,8.8491 3.2294,6.5459 -6.4085,3.7723 -9.6321,5.3513 -3.3319,1.6316 -6.0204,15.3847 -14.716,21.6724 -15.0247,10.8639 -23.5454,12.0402 -27.0788,8.2594 z"
+           class="fil0"
+           id="_210248864"
+           inkscape:connector-curvature="0"
+           style="fill:#28166f" />
+        <polygon
+           points="327.688,91.3873 330.28,94.3283 370.774,55.4503 374.438,53.3445 376.998,50.6064 382.653,41.1421 380.414,38.6621 377.937,36.4203 368.472,42.0751 365.734,44.6346 363.628,48.2992 324.75,88.7924 "
+           class="fil0"
+           id="_210248840"
+           style="fill:#28166f" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/eeschema/eeschema_id.h b/eeschema/eeschema_id.h
index 94d764893a..77acb97a4a 100644
--- a/eeschema/eeschema_id.h
+++ b/eeschema/eeschema_id.h
@@ -251,14 +251,18 @@ enum id_eeschema_frm
     ID_LIBVIEW_CMP_EXPORT_TO_SCHEMATIC,
     ID_SET_RELATIVE_OFFSET,
 
-    ID_END_EESCHEMA_ID_LIST,
-
     ID_UPDATE_PCB_FROM_SCH,
     ID_UPDATE_SCH_FROM_PCB,
 
-    ID_SIM_SHOW,
+    ID_SIM_RUN,
+    ID_SIM_TUNE,
     ID_SIM_PROBE,
-    ID_SIM_TUNE
+    ID_SIM_SETTINGS,
+    ID_SIM_ADD_SIGNALS,
+    ID_SIM_SHOW,
+    
+    ID_END_EESCHEMA_ID_LIST
+
 };
 
 
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 108da7ccfc..83b006870b 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -27,6 +27,7 @@
 #include <eeschema_id.h>
 #include <kiway.h>
 #include <confirm.h>
+#include <bitmaps.h>
 
 #include <widgets/tuner_slider.h>
 #include <dialogs/dialog_signal_list.h>
@@ -118,6 +119,32 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     Connect( EVT_SIM_STARTED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimStarted ), NULL, this );
     Connect( EVT_SIM_FINISHED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
     Connect( EVT_SIM_CURSOR_UPDATE, wxCommandEventHandler( SIM_PLOT_FRAME::onCursorUpdate ), NULL, this );
+
+
+    m_toolSimulate = m_toolBar->AddTool( ID_SIM_RUN, _("Run Simulation"), KiBitmap( sim_run_xpm ), _("Run Simulation"), wxITEM_NORMAL );
+    m_toolAddSignals = m_toolBar->AddTool( ID_SIM_ADD_SIGNALS, _("Add Signals"), KiBitmap( sim_add_signal_xpm ), _("Add signals to plot"), wxITEM_NORMAL );
+    m_toolProbe = m_toolBar->AddTool( ID_SIM_PROBE,  _("Probe"), KiBitmap( sim_probe_xpm ),_("Probe signals on the schematic"), wxITEM_NORMAL );
+    m_toolTune = m_toolBar->AddTool( ID_SIM_TUNE, _("Tune"), KiBitmap( sim_tune_xpm ), _("Tune component values"), wxITEM_NORMAL );
+    m_toolSettings = m_toolBar->AddTool( wxID_ANY, _("Settings"), KiBitmap( sim_settings_xpm ), _("Simulation settings"), wxITEM_NORMAL );
+
+    Connect( m_toolSimulate->GetId(), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimulate ), NULL, this );
+    Connect( m_toolAddSignals->GetId(), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME::onAddSignal ), NULL, this );
+    Connect( m_toolProbe->GetId(), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME::onProbe ), NULL, this );
+    Connect( m_toolTune->GetId(), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME::onTune ), NULL, this );
+    Connect( m_toolSettings->GetId(), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME::onSettings ), NULL, this );
+
+    int w, h;
+
+    GetSize( &w, &h );
+
+    printf("%d %d\n", w, h);
+
+    m_toolBar->Realize();
+
+    Layout();
+
+    m_splitterConsole->SetSashPosition( w * 0.8 );
+    m_splitterPlot->SetSashPosition( h *0.8 );
 }
 
 
@@ -152,6 +179,12 @@ void SIM_PLOT_FRAME::StartSimulation()
     m_simulator->Init();
     m_simulator->LoadNetlist( formatter.GetString() );
     m_simulator->Run();
+
+    m_welcomePanel->Show(false);
+    m_plotNotebook->Show(true);
+    m_plotNotebook->Raise();
+
+    Layout();
 }
 
 
@@ -559,7 +592,7 @@ void SIM_PLOT_FRAME::menuShowLegendUpdate( wxUpdateUIEvent& event )
     event.Check( plot ? plot->IsLegendShown() : false );
 }
 
-
+#if 0
 void SIM_PLOT_FRAME::menuShowCoords( wxCommandEvent& event )
 {
     SIM_PLOT_PANEL* plot = CurrentPlot();
@@ -572,7 +605,7 @@ void SIM_PLOT_FRAME::menuShowCoordsUpdate( wxUpdateUIEvent& event )
     SIM_PLOT_PANEL* plot = CurrentPlot();
     event.Check( plot ? plot->IsCoordsShown() : false );
 }
-
+#endif
 
 void SIM_PLOT_FRAME::onPlotChanged( wxNotebookEvent& event )
 {
@@ -705,14 +738,14 @@ void SIM_PLOT_FRAME::onCursorUpdate( wxCommandEvent& event )
 
 void SIM_PLOT_FRAME::onSimStarted( wxCommandEvent& aEvent )
 {
-    m_simulateBtn->SetLabel( wxT( "Stop" ) );
+    //m_simulateBtn->SetLabel( wxT( "Stop" ) );
     SetCursor( wxCURSOR_ARROWWAIT );
 }
 
 
 void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
 {
-    m_simulateBtn->SetLabel( wxT( "Simulate" ) );
+    //m_simulateBtn->SetLabel( wxT( "Simulate" ) );
     SetCursor( wxCURSOR_ARROW );
 
     SIM_TYPE simType = m_exporter->GetSimType();
@@ -765,6 +798,8 @@ void SIM_PLOT_FRAME::onSimUpdate( wxCommandEvent& aEvent )
             std::string command( "alter @" + tuner->GetSpiceName()
                     + "=" + tuner->GetValue().ToSpiceString() );
             m_simulator->Command( command );
+
+            printf("CMD: %s\n", command.c_str() );
         }
     }
 
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 7fc751a0f0..6a11cb491b 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -195,8 +195,8 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void menuShowGridUpdate( wxUpdateUIEvent& event ) override;
         void menuShowLegend( wxCommandEvent& event ) override;
         void menuShowLegendUpdate( wxUpdateUIEvent& event ) override;
-        void menuShowCoords( wxCommandEvent& event ) override;
-        void menuShowCoordsUpdate( wxUpdateUIEvent& event ) override;
+        //void menuShowCoords( wxCommandEvent& event ) override;
+        //void menuShowCoordsUpdate( wxUpdateUIEvent& event ) override;
 
         // Event handlers
         void onPlotChanged( wxNotebookEvent& event ) override;
@@ -204,11 +204,11 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void onSignalDblClick( wxCommandEvent& event ) override;
         void onSignalRClick( wxMouseEvent& event ) override;
 
-        void onSimulate( wxCommandEvent& event ) override;
-        void onSettings( wxCommandEvent& event ) override;
-        void onAddSignal( wxCommandEvent& event ) override;
-        void onProbe( wxCommandEvent& event ) override;
-        void onTune( wxCommandEvent& event ) override;
+        void onSimulate( wxCommandEvent& event );
+        void onSettings( wxCommandEvent& event );
+        void onAddSignal( wxCommandEvent& event );
+        void onProbe( wxCommandEvent& event );
+        void onTune( wxCommandEvent& event );
 
         void onClose( wxCloseEvent& aEvent );
 
@@ -218,6 +218,12 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void onSimStarted( wxCommandEvent& aEvent );
         void onSimFinished( wxCommandEvent& aEvent );
 
+        wxToolBarToolBase* m_toolSimulate;
+		wxToolBarToolBase* m_toolAddSignals;
+		wxToolBarToolBase* m_toolProbe;
+		wxToolBarToolBase* m_toolTune;
+		wxToolBarToolBase* m_toolSettings;
+
         SCH_EDIT_FRAME* m_schematicFrame;
         std::unique_ptr<NETLIST_EXPORTER_PSPICE_SIM> m_exporter;
         std::unique_ptr<SPICE_SIMULATOR> m_simulator;
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index b5c2429d0e..840c618200 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 24 2016)
+// C++ code generated with wxFormBuilder (version Jun 17 2015)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -47,6 +47,33 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	
 	m_mainMenu->Append( m_fileMenu, _("File") ); 
 	
+	m_simulationMenu = new wxMenu();
+	wxMenuItem* m_runSimulation;
+	m_runSimulation = new wxMenuItem( m_simulationMenu, wxID_NEW, wxString( _("Run Simulation") ) , wxEmptyString, wxITEM_NORMAL );
+	m_simulationMenu->Append( m_runSimulation );
+	
+	m_simulationMenu->AppendSeparator();
+	
+	wxMenuItem* m_addSignals;
+	m_addSignals = new wxMenuItem( m_simulationMenu, wxID_OPEN, wxString( _("Add signals...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_simulationMenu->Append( m_addSignals );
+	
+	wxMenuItem* m_probeSignals;
+	m_probeSignals = new wxMenuItem( m_simulationMenu, wxID_SAVE, wxString( _("Probe from schematics") ) , wxEmptyString, wxITEM_NORMAL );
+	m_simulationMenu->Append( m_probeSignals );
+	
+	wxMenuItem* m_tuneValue;
+	m_tuneValue = new wxMenuItem( m_simulationMenu, wxID_ANY, wxString( _("Tune component value") ) , wxEmptyString, wxITEM_NORMAL );
+	m_simulationMenu->Append( m_tuneValue );
+	
+	m_simulationMenu->AppendSeparator();
+	
+	wxMenuItem* m_exitSim1;
+	m_exitSim1 = new wxMenuItem( m_simulationMenu, wxID_CLOSE, wxString( _("Settings...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_simulationMenu->Append( m_exitSim1 );
+	
+	m_mainMenu->Append( m_simulationMenu, _("Simulation") ); 
+	
 	m_viewMenu = new wxMenu();
 	wxMenuItem* m_zoomIn;
 	m_zoomIn = new wxMenuItem( m_viewMenu, wxID_ZOOM_IN, wxString( _("Zoom In") ) , wxEmptyString, wxITEM_NORMAL );
@@ -70,10 +97,6 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_showLegend = new wxMenuItem( m_viewMenu, wxID_ANY, wxString( _("Show &legend") ) , wxEmptyString, wxITEM_CHECK );
 	m_viewMenu->Append( m_showLegend );
 	
-	wxMenuItem* m_showCoords;
-	m_showCoords = new wxMenuItem( m_viewMenu, wxID_ANY, wxString( _("Show &coordinates") ) , wxEmptyString, wxITEM_CHECK );
-	m_viewMenu->Append( m_showCoords );
-	
 	m_mainMenu->Append( m_viewMenu, _("View") ); 
 	
 	this->SetMenuBar( m_mainMenu );
@@ -81,31 +104,99 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	wxBoxSizer* bSizer1;
 	bSizer1 = new wxBoxSizer( wxVERTICAL );
 	
+	m_toolBar = new wxToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_FLAT|wxTB_HORIZONTAL|wxTB_TEXT ); 
+	m_toolBar->Realize(); 
+	
+	bSizer1->Add( m_toolBar, 0, wxEXPAND, 5 );
+	
+	m_splitterPlot = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
+	m_splitterPlot->SetSashGravity( 0.8 );
+	m_splitterPlot->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterPlotOnIdle ), NULL, this );
+	
+	m_panel2 = new wxPanel( m_splitterPlot, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer11;
+	bSizer11 = new wxBoxSizer( wxVERTICAL );
+	
+	m_splitterConsole = new wxSplitterWindow( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
+	m_splitterConsole->SetSashGravity( 0.8 );
+	m_splitterConsole->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterConsoleOnIdle ), NULL, this );
+	
+	m_panel4 = new wxPanel( m_splitterConsole, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer5;
 	bSizer5 = new wxBoxSizer( wxHORIZONTAL );
 	
-	wxBoxSizer* bSizer51;
-	bSizer51 = new wxBoxSizer( wxVERTICAL );
-	
-	m_plotNotebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_plotNotebook = new wxNotebook( m_panel4, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_plotNotebook->Hide();
 	m_plotNotebook->SetMinSize( wxSize( 400,-1 ) );
 	
 	
-	bSizer51->Add( m_plotNotebook, 3, wxEXPAND | wxALL, 5 );
+	bSizer5->Add( m_plotNotebook, 3, wxEXPAND | wxALL, 5 );
 	
-	m_simConsole = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
-	m_simConsole->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-	
-	bSizer51->Add( m_simConsole, 1, wxALL|wxEXPAND, 5 );
+	m_welcomePanel = new wxPanel( m_panel4, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer8;
+	bSizer8 = new wxBoxSizer( wxVERTICAL );
 	
 	
-	bSizer5->Add( bSizer51, 5, wxEXPAND, 5 );
+	bSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
 	
+	wxBoxSizer* bSizer81;
+	bSizer81 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer81->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticText2 = new wxStaticText( m_welcomePanel, wxID_ANY, _("Start the simulation by clicking the Run Simulation button"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText2->Wrap( -1 );
+	m_staticText2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+	m_staticText2->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	
+	bSizer81->Add( m_staticText2, 0, wxALIGN_RIGHT|wxALL|wxEXPAND, 5 );
+	
+	
+	bSizer81->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	
+	bSizer8->Add( bSizer81, 0, wxEXPAND, 5 );
+	
+	
+	bSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	
+	m_welcomePanel->SetSizer( bSizer8 );
+	m_welcomePanel->Layout();
+	bSizer8->Fit( m_welcomePanel );
+	bSizer5->Add( m_welcomePanel, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	
+	m_panel4->SetSizer( bSizer5 );
+	m_panel4->Layout();
+	bSizer5->Fit( m_panel4 );
+	m_panel5 = new wxPanel( m_splitterConsole, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer13;
+	bSizer13 = new wxBoxSizer( wxVERTICAL );
+	
+	m_simConsole = new wxTextCtrl( m_panel5, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
+	m_simConsole->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 76, 90, 90, false, wxEmptyString ) );
+	
+	bSizer13->Add( m_simConsole, 1, wxALL|wxEXPAND, 5 );
+	
+	
+	m_panel5->SetSizer( bSizer13 );
+	m_panel5->Layout();
+	bSizer13->Fit( m_panel5 );
+	m_splitterConsole->SplitHorizontally( m_panel4, m_panel5, 0 );
+	bSizer11->Add( m_splitterConsole, 1, wxEXPAND, 5 );
+	
+	
+	m_panel2->SetSizer( bSizer11 );
+	m_panel2->Layout();
+	bSizer11->Fit( m_panel2 );
+	m_panel31 = new wxPanel( m_splitterPlot, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer7;
 	bSizer7 = new wxBoxSizer( wxVERTICAL );
 	
 	wxStaticBoxSizer* sbSizer1;
-	sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Signals") ), wxVERTICAL );
+	sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_panel31, wxID_ANY, _("Signals") ), wxVERTICAL );
 	
 	m_signals = new wxListBox( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_SORT ); 
 	sbSizer1->Add( m_signals, 1, wxALL|wxEXPAND, 5 );
@@ -114,7 +205,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	bSizer7->Add( sbSizer1, 1, wxEXPAND, 5 );
 	
 	wxStaticBoxSizer* sbSizer3;
-	sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Cursors") ), wxVERTICAL );
+	sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_panel31, wxID_ANY, _("Cursors") ), wxVERTICAL );
 	
 	m_cursors = new wxListCtrl( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL );
 	sbSizer3->Add( m_cursors, 1, wxALL|wxEXPAND, 5 );
@@ -123,7 +214,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	bSizer7->Add( sbSizer3, 1, wxEXPAND, 5 );
 	
 	wxStaticBoxSizer* sbSizer4;
-	sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Tune") ), wxVERTICAL );
+	sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( m_panel31, wxID_ANY, _("Tune") ), wxVERTICAL );
 	
 	m_tuneSizer = new wxBoxSizer( wxHORIZONTAL );
 	
@@ -133,32 +224,12 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	
 	bSizer7->Add( sbSizer4, 1, wxEXPAND, 5 );
 	
-	wxBoxSizer* bSizer4;
-	bSizer4 = new wxBoxSizer( wxHORIZONTAL );
 	
-	m_simulateBtn = new wxButton( this, wxID_ANY, _("Simulate"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer4->Add( m_simulateBtn, 1, wxALL|wxEXPAND, 5 );
-	
-	m_settingsBtn = new wxButton( this, wxID_ANY, _("Settings"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer4->Add( m_settingsBtn, 1, wxALL|wxEXPAND, 5 );
-	
-	m_addSignal = new wxButton( this, wxID_ANY, _("Add signal"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer4->Add( m_addSignal, 0, wxALL|wxEXPAND, 5 );
-	
-	m_probeBtn = new wxButton( this, wxID_ANY, _("Probe"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer4->Add( m_probeBtn, 1, wxALL|wxEXPAND, 5 );
-	
-	m_tuneBtn = new wxButton( this, wxID_ANY, _("Tune"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer4->Add( m_tuneBtn, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer7->Add( bSizer4, 0, 0, 5 );
-	
-	
-	bSizer5->Add( bSizer7, 1, wxEXPAND, 5 );
-	
-	
-	bSizer1->Add( bSizer5, 3, wxEXPAND, 5 );
+	m_panel31->SetSizer( bSizer7 );
+	m_panel31->Layout();
+	bSizer7->Fit( m_panel31 );
+	m_splitterPlot->SplitVertically( m_panel2, m_panel31, 0 );
+	bSizer1->Add( m_splitterPlot, 1, wxEXPAND, 5 );
 	
 	
 	this->SetSizer( bSizer1 );
@@ -173,6 +244,11 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	this->Connect( m_saveImage->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveImage ) );
 	this->Connect( m_saveCsv->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveCsv ) );
 	this->Connect( m_exitSim->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) );
+	this->Connect( m_runSimulation->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuNewPlot ) );
+	this->Connect( m_addSignals->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuOpenWorkbook ) );
+	this->Connect( m_probeSignals->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveWorkbook ) );
+	this->Connect( m_tuneValue->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveImage ) );
+	this->Connect( m_exitSim1->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) );
 	this->Connect( m_zoomIn->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomIn ) );
 	this->Connect( m_zoomOut->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomOut ) );
 	this->Connect( m_zoomFit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ) );
@@ -180,16 +256,9 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	this->Connect( m_showGrid->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridUpdate ) );
 	this->Connect( m_showLegend->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegend ) );
 	this->Connect( m_showLegend->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegendUpdate ) );
-	this->Connect( m_showCoords->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowCoords ) );
-	this->Connect( m_showCoords->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowCoordsUpdate ) );
 	m_plotNotebook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotChanged ), NULL, this );
 	m_signals->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
 	m_signals->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
-	m_simulateBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
-	m_settingsBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSettings ), NULL, this );
-	m_addSignal->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onAddSignal ), NULL, this );
-	m_probeBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onProbe ), NULL, this );
-	m_tuneBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onTune ), NULL, this );
 }
 
 SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
@@ -201,6 +270,11 @@ SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveImage ) );
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveCsv ) );
 	this->Disconnect( wxID_CLOSE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) );
+	this->Disconnect( wxID_NEW, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuNewPlot ) );
+	this->Disconnect( wxID_OPEN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuOpenWorkbook ) );
+	this->Disconnect( wxID_SAVE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveWorkbook ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveImage ) );
+	this->Disconnect( wxID_CLOSE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) );
 	this->Disconnect( wxID_ZOOM_IN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomIn ) );
 	this->Disconnect( wxID_ZOOM_OUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomOut ) );
 	this->Disconnect( wxID_ZOOM_FIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ) );
@@ -208,15 +282,8 @@ SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
 	this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridUpdate ) );
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegend ) );
 	this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegendUpdate ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowCoords ) );
-	this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowCoordsUpdate ) );
 	m_plotNotebook->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotChanged ), NULL, this );
 	m_signals->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
 	m_signals->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
-	m_simulateBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSimulate ), NULL, this );
-	m_settingsBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSettings ), NULL, this );
-	m_addSignal->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onAddSignal ), NULL, this );
-	m_probeBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onProbe ), NULL, this );
-	m_tuneBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onTune ), NULL, this );
 	
 }
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index ebd2282bd0..d9ef495e76 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -88,7 +88,7 @@
             <event name="OnSetFocus"></event>
             <event name="OnSize"></event>
             <event name="OnUpdateUI"></event>
-            <object class="wxMenuBar" expanded="0">
+            <object class="wxMenuBar" expanded="1">
                 <property name="bg"></property>
                 <property name="context_help"></property>
                 <property name="context_menu">1</property>
@@ -240,7 +240,95 @@
                         <event name="OnUpdateUI"></event>
                     </object>
                 </object>
-                <object class="wxMenu" expanded="0">
+                <object class="wxMenu" expanded="1">
+                    <property name="label">Simulation</property>
+                    <property name="name">m_simulationMenu</property>
+                    <property name="permission">protected</property>
+                    <object class="wxMenuItem" expanded="0">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_NEW</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Run Simulation</property>
+                        <property name="name">m_runSimulation</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection">menuNewPlot</event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="separator" expanded="0">
+                        <property name="name">m_separator31</property>
+                        <property name="permission">none</property>
+                    </object>
+                    <object class="wxMenuItem" expanded="0">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_OPEN</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Add signals...</property>
+                        <property name="name">m_addSignals</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection">menuOpenWorkbook</event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="wxMenuItem" expanded="0">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_SAVE</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Probe from schematics</property>
+                        <property name="name">m_probeSignals</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection">menuSaveWorkbook</event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="wxMenuItem" expanded="0">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Tune component value</property>
+                        <property name="name">m_tuneValue</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection">menuSaveImage</event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="separator" expanded="0">
+                        <property name="name">m_separator41</property>
+                        <property name="permission">none</property>
+                    </object>
+                    <object class="wxMenuItem" expanded="0">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help"></property>
+                        <property name="id">wxID_CLOSE</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Settings...</property>
+                        <property name="name">m_exitSim1</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection">menuExit</event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="wxMenu" expanded="1">
                     <property name="label">View</property>
                     <property name="name">m_viewMenu</property>
                     <property name="permission">protected</property>
@@ -323,21 +411,6 @@
                         <event name="OnMenuSelection">menuShowLegend</event>
                         <event name="OnUpdateUI">menuShowLegendUpdate</event>
                     </object>
-                    <object class="wxMenuItem" expanded="0">
-                        <property name="bitmap"></property>
-                        <property name="checked">0</property>
-                        <property name="enabled">1</property>
-                        <property name="help"></property>
-                        <property name="id">wxID_ANY</property>
-                        <property name="kind">wxITEM_CHECK</property>
-                        <property name="label">Show &amp;coordinates</property>
-                        <property name="name">m_showCoords</property>
-                        <property name="permission">none</property>
-                        <property name="shortcut"></property>
-                        <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection">menuShowCoords</event>
-                        <event name="OnUpdateUI">menuShowCoordsUpdate</event>
-                    </object>
                 </object>
             </object>
             <object class="wxBoxSizer" expanded="1">
@@ -348,903 +421,1233 @@
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
                     <property name="flag">wxEXPAND</property>
-                    <property name="proportion">3</property>
-                    <object class="wxBoxSizer" expanded="1">
+                    <property name="proportion">0</property>
+                    <object class="wxToolBar" 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_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="bitmapsize"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</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="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="margins"></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="name">bSizer5</property>
-                        <property name="orient">wxHORIZONTAL</property>
-                        <property name="permission">none</property>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxEXPAND</property>
-                            <property name="proportion">5</property>
-                            <object class="wxBoxSizer" expanded="1">
+                        <property name="moveable">1</property>
+                        <property name="name">m_toolBar</property>
+                        <property name="packing">1</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="separation">5</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="style">wxTB_FLAT|wxTB_HORIZONTAL|wxTB_TEXT</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"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND</property>
+                    <property name="proportion">1</property>
+                    <object class="wxSplitterWindow" 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_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</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="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_pane_size">0</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">m_splitterPlot</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="sashgravity">0.8</property>
+                        <property name="sashpos">0</property>
+                        <property name="sashsize">-1</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="splitmode">wxSPLIT_VERTICAL</property>
+                        <property name="style">wxSP_3D</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"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnSplitterDClick"></event>
+                        <event name="OnSplitterSashPosChanged"></event>
+                        <event name="OnSplitterSashPosChanging"></event>
+                        <event name="OnSplitterUnsplit"></event>
+                        <event name="OnUpdateUI"></event>
+                        <object class="splitteritem" expanded="1">
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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="name">bSizer51</property>
-                                <property name="orient">wxVERTICAL</property>
-                                <property name="permission">none</property>
-                                <object class="sizeritem" expanded="0">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxEXPAND | wxALL</property>
-                                    <property name="proportion">3</property>
-                                    <object class="wxNotebook" expanded="0">
-                                        <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_name"></property>
-                                        <property name="aui_position"></property>
-                                        <property name="aui_row"></property>
-                                        <property name="best_size"></property>
-                                        <property name="bg"></property>
-                                        <property name="bitmapsize"></property>
-                                        <property name="caption"></property>
-                                        <property name="caption_visible">1</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="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">400,-1</property>
-                                        <property name="moveable">1</property>
-                                        <property name="name">m_plotNotebook</property>
-                                        <property name="pane_border">1</property>
-                                        <property name="pane_position"></property>
-                                        <property name="pane_size"></property>
-                                        <property name="permission">protected</property>
-                                        <property name="pin_button">1</property>
-                                        <property name="pos"></property>
-                                        <property name="resize">Resizable</property>
-                                        <property name="show">1</property>
-                                        <property name="size"></property>
-                                        <property name="style"></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"></property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnNotebookPageChanged">onPlotChanged</event>
-                                        <event name="OnNotebookPageChanging"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
-                                    </object>
-                                </object>
-                                <object class="sizeritem" expanded="0">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxALL|wxEXPAND</property>
-                                    <property name="proportion">1</property>
-                                    <object class="wxTextCtrl" expanded="0">
-                                        <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_name"></property>
-                                        <property name="aui_position"></property>
-                                        <property name="aui_row"></property>
-                                        <property name="best_size"></property>
-                                        <property name="bg"></property>
-                                        <property name="caption"></property>
-                                        <property name="caption_visible">1</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="fg"></property>
-                                        <property name="floatable">1</property>
-                                        <property name="font">,90,90,-1,76,0</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="maxlength"></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">m_simConsole</property>
-                                        <property name="pane_border">1</property>
-                                        <property name="pane_position"></property>
-                                        <property name="pane_size"></property>
-                                        <property name="permission">protected</property>
-                                        <property name="pin_button">1</property>
-                                        <property name="pos"></property>
-                                        <property name="resize">Resizable</property>
-                                        <property name="show">1</property>
-                                        <property name="size"></property>
-                                        <property name="style">wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY</property>
-                                        <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="value"></property>
-                                        <property name="window_extra_style"></property>
-                                        <property name="window_name"></property>
-                                        <property name="window_style"></property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnText"></event>
-                                        <event name="OnTextEnter"></event>
-                                        <event name="OnTextMaxLen"></event>
-                                        <event name="OnTextURL"></event>
-                                        <event name="OnUpdateUI"></event>
+                                <property name="moveable">1</property>
+                                <property name="name">m_panel2</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxBoxSizer" expanded="1">
+                                    <property name="minimum_size"></property>
+                                    <property name="name">bSizer11</property>
+                                    <property name="orient">wxVERTICAL</property>
+                                    <property name="permission">none</property>
+                                    <object class="sizeritem" expanded="1">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxSplitterWindow" 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_name"></property>
+                                            <property name="aui_position"></property>
+                                            <property name="aui_row"></property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</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="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_pane_size">0</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">m_splitterConsole</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="sashgravity">0.8</property>
+                                            <property name="sashpos">0</property>
+                                            <property name="sashsize">-1</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="splitmode">wxSPLIT_HORIZONTAL</property>
+                                            <property name="style">wxSP_3D</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"></property>
+                                            <event name="OnChar"></event>
+                                            <event name="OnEnterWindow"></event>
+                                            <event name="OnEraseBackground"></event>
+                                            <event name="OnKeyDown"></event>
+                                            <event name="OnKeyUp"></event>
+                                            <event name="OnKillFocus"></event>
+                                            <event name="OnLeaveWindow"></event>
+                                            <event name="OnLeftDClick"></event>
+                                            <event name="OnLeftDown"></event>
+                                            <event name="OnLeftUp"></event>
+                                            <event name="OnMiddleDClick"></event>
+                                            <event name="OnMiddleDown"></event>
+                                            <event name="OnMiddleUp"></event>
+                                            <event name="OnMotion"></event>
+                                            <event name="OnMouseEvents"></event>
+                                            <event name="OnMouseWheel"></event>
+                                            <event name="OnPaint"></event>
+                                            <event name="OnRightDClick"></event>
+                                            <event name="OnRightDown"></event>
+                                            <event name="OnRightUp"></event>
+                                            <event name="OnSetFocus"></event>
+                                            <event name="OnSize"></event>
+                                            <event name="OnSplitterDClick"></event>
+                                            <event name="OnSplitterSashPosChanged"></event>
+                                            <event name="OnSplitterSashPosChanging"></event>
+                                            <event name="OnSplitterUnsplit"></event>
+                                            <event name="OnUpdateUI"></event>
+                                            <object class="splitteritem" expanded="0">
+                                                <object class="wxPanel" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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">m_panel4</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                    <object class="wxBoxSizer" expanded="0">
+                                                        <property name="minimum_size"></property>
+                                                        <property name="name">bSizer5</property>
+                                                        <property name="orient">wxHORIZONTAL</property>
+                                                        <property name="permission">none</property>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxEXPAND | wxALL</property>
+                                                            <property name="proportion">3</property>
+                                                            <object class="wxNotebook" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="bitmapsize"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="fg"></property>
+                                                                <property name="floatable">1</property>
+                                                                <property name="font"></property>
+                                                                <property name="gripper">0</property>
+                                                                <property name="hidden">1</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">400,-1</property>
+                                                                <property name="moveable">1</property>
+                                                                <property name="name">m_plotNotebook</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style"></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"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnNotebookPageChanged">onPlotChanged</event>
+                                                                <event name="OnNotebookPageChanging"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
+                                                            <property name="proportion">1</property>
+                                                            <object class="wxPanel" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="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">m_welcomePanel</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                                <object class="wxBoxSizer" expanded="0">
+                                                                    <property name="minimum_size"></property>
+                                                                    <property name="name">bSizer8</property>
+                                                                    <property name="orient">wxVERTICAL</property>
+                                                                    <property name="permission">none</property>
+                                                                    <object class="sizeritem" expanded="0">
+                                                                        <property name="border">5</property>
+                                                                        <property name="flag">wxEXPAND</property>
+                                                                        <property name="proportion">1</property>
+                                                                        <object class="spacer" expanded="0">
+                                                                            <property name="height">0</property>
+                                                                            <property name="permission">protected</property>
+                                                                            <property name="width">0</property>
+                                                                        </object>
+                                                                    </object>
+                                                                    <object class="sizeritem" expanded="0">
+                                                                        <property name="border">5</property>
+                                                                        <property name="flag">wxEXPAND</property>
+                                                                        <property name="proportion">0</property>
+                                                                        <object class="wxBoxSizer" expanded="0">
+                                                                            <property name="minimum_size"></property>
+                                                                            <property name="name">bSizer81</property>
+                                                                            <property name="orient">wxHORIZONTAL</property>
+                                                                            <property name="permission">none</property>
+                                                                            <object class="sizeritem" expanded="0">
+                                                                                <property name="border">5</property>
+                                                                                <property name="flag">wxEXPAND</property>
+                                                                                <property name="proportion">1</property>
+                                                                                <object class="spacer" expanded="0">
+                                                                                    <property name="height">0</property>
+                                                                                    <property name="permission">protected</property>
+                                                                                    <property name="width">0</property>
+                                                                                </object>
+                                                                            </object>
+                                                                            <object class="sizeritem" expanded="0">
+                                                                                <property name="border">5</property>
+                                                                                <property name="flag">wxALIGN_RIGHT|wxALL|wxEXPAND</property>
+                                                                                <property name="proportion">0</property>
+                                                                                <object class="wxStaticText" expanded="0">
+                                                                                    <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_name"></property>
+                                                                                    <property name="aui_position"></property>
+                                                                                    <property name="aui_row"></property>
+                                                                                    <property name="best_size"></property>
+                                                                                    <property name="bg"></property>
+                                                                                    <property name="caption"></property>
+                                                                                    <property name="caption_visible">1</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="fg">wxSYS_COLOUR_GRAYTEXT</property>
+                                                                                    <property name="floatable">1</property>
+                                                                                    <property name="font">,90,92,-1,70,0</property>
+                                                                                    <property name="gripper">0</property>
+                                                                                    <property name="hidden">0</property>
+                                                                                    <property name="id">wxID_ANY</property>
+                                                                                    <property name="label">Start the simulation by clicking the Run Simulation button</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">m_staticText2</property>
+                                                                                    <property name="pane_border">1</property>
+                                                                                    <property name="pane_position"></property>
+                                                                                    <property name="pane_size"></property>
+                                                                                    <property name="permission">protected</property>
+                                                                                    <property name="pin_button">1</property>
+                                                                                    <property name="pos"></property>
+                                                                                    <property name="resize">Resizable</property>
+                                                                                    <property name="show">1</property>
+                                                                                    <property name="size"></property>
+                                                                                    <property name="style"></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"></property>
+                                                                                    <property name="wrap">-1</property>
+                                                                                    <event name="OnChar"></event>
+                                                                                    <event name="OnEnterWindow"></event>
+                                                                                    <event name="OnEraseBackground"></event>
+                                                                                    <event name="OnKeyDown"></event>
+                                                                                    <event name="OnKeyUp"></event>
+                                                                                    <event name="OnKillFocus"></event>
+                                                                                    <event name="OnLeaveWindow"></event>
+                                                                                    <event name="OnLeftDClick"></event>
+                                                                                    <event name="OnLeftDown"></event>
+                                                                                    <event name="OnLeftUp"></event>
+                                                                                    <event name="OnMiddleDClick"></event>
+                                                                                    <event name="OnMiddleDown"></event>
+                                                                                    <event name="OnMiddleUp"></event>
+                                                                                    <event name="OnMotion"></event>
+                                                                                    <event name="OnMouseEvents"></event>
+                                                                                    <event name="OnMouseWheel"></event>
+                                                                                    <event name="OnPaint"></event>
+                                                                                    <event name="OnRightDClick"></event>
+                                                                                    <event name="OnRightDown"></event>
+                                                                                    <event name="OnRightUp"></event>
+                                                                                    <event name="OnSetFocus"></event>
+                                                                                    <event name="OnSize"></event>
+                                                                                    <event name="OnUpdateUI"></event>
+                                                                                </object>
+                                                                            </object>
+                                                                            <object class="sizeritem" expanded="0">
+                                                                                <property name="border">5</property>
+                                                                                <property name="flag">wxEXPAND</property>
+                                                                                <property name="proportion">1</property>
+                                                                                <object class="spacer" expanded="0">
+                                                                                    <property name="height">0</property>
+                                                                                    <property name="permission">protected</property>
+                                                                                    <property name="width">0</property>
+                                                                                </object>
+                                                                            </object>
+                                                                        </object>
+                                                                    </object>
+                                                                    <object class="sizeritem" expanded="0">
+                                                                        <property name="border">5</property>
+                                                                        <property name="flag">wxEXPAND</property>
+                                                                        <property name="proportion">1</property>
+                                                                        <object class="spacer" expanded="0">
+                                                                            <property name="height">0</property>
+                                                                            <property name="permission">protected</property>
+                                                                            <property name="width">0</property>
+                                                                        </object>
+                                                                    </object>
+                                                                </object>
+                                                            </object>
+                                                        </object>
+                                                    </object>
+                                                </object>
+                                            </object>
+                                            <object class="splitteritem" expanded="0">
+                                                <object class="wxPanel" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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">m_panel5</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                    <object class="wxBoxSizer" expanded="0">
+                                                        <property name="minimum_size"></property>
+                                                        <property name="name">bSizer13</property>
+                                                        <property name="orient">wxVERTICAL</property>
+                                                        <property name="permission">none</property>
+                                                        <object class="sizeritem" expanded="0">
+                                                            <property name="border">5</property>
+                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                            <property name="proportion">1</property>
+                                                            <object class="wxTextCtrl" expanded="0">
+                                                                <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_name"></property>
+                                                                <property name="aui_position"></property>
+                                                                <property name="aui_row"></property>
+                                                                <property name="best_size"></property>
+                                                                <property name="bg"></property>
+                                                                <property name="caption"></property>
+                                                                <property name="caption_visible">1</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="fg"></property>
+                                                                <property name="floatable">1</property>
+                                                                <property name="font">,90,90,-1,76,0</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="maxlength"></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">m_simConsole</property>
+                                                                <property name="pane_border">1</property>
+                                                                <property name="pane_position"></property>
+                                                                <property name="pane_size"></property>
+                                                                <property name="permission">protected</property>
+                                                                <property name="pin_button">1</property>
+                                                                <property name="pos"></property>
+                                                                <property name="resize">Resizable</property>
+                                                                <property name="show">1</property>
+                                                                <property name="size"></property>
+                                                                <property name="style">wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY</property>
+                                                                <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="value"></property>
+                                                                <property name="window_extra_style"></property>
+                                                                <property name="window_name"></property>
+                                                                <property name="window_style"></property>
+                                                                <event name="OnChar"></event>
+                                                                <event name="OnEnterWindow"></event>
+                                                                <event name="OnEraseBackground"></event>
+                                                                <event name="OnKeyDown"></event>
+                                                                <event name="OnKeyUp"></event>
+                                                                <event name="OnKillFocus"></event>
+                                                                <event name="OnLeaveWindow"></event>
+                                                                <event name="OnLeftDClick"></event>
+                                                                <event name="OnLeftDown"></event>
+                                                                <event name="OnLeftUp"></event>
+                                                                <event name="OnMiddleDClick"></event>
+                                                                <event name="OnMiddleDown"></event>
+                                                                <event name="OnMiddleUp"></event>
+                                                                <event name="OnMotion"></event>
+                                                                <event name="OnMouseEvents"></event>
+                                                                <event name="OnMouseWheel"></event>
+                                                                <event name="OnPaint"></event>
+                                                                <event name="OnRightDClick"></event>
+                                                                <event name="OnRightDown"></event>
+                                                                <event name="OnRightUp"></event>
+                                                                <event name="OnSetFocus"></event>
+                                                                <event name="OnSize"></event>
+                                                                <event name="OnText"></event>
+                                                                <event name="OnTextEnter"></event>
+                                                                <event name="OnTextMaxLen"></event>
+                                                                <event name="OnTextURL"></event>
+                                                                <event name="OnUpdateUI"></event>
+                                                            </object>
+                                                        </object>
+                                                    </object>
+                                                </object>
+                                            </object>
+                                        </object>
                                     </object>
                                 </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="wxBoxSizer" expanded="1">
+                        <object class="splitteritem" expanded="1">
+                            <object class="wxPanel" 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_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</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="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="name">bSizer7</property>
-                                <property name="orient">wxVERTICAL</property>
-                                <property name="permission">none</property>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxEXPAND</property>
-                                    <property name="proportion">1</property>
-                                    <object class="wxStaticBoxSizer" expanded="0">
-                                        <property name="id">wxID_ANY</property>
-                                        <property name="label">Signals</property>
-                                        <property name="minimum_size"></property>
-                                        <property name="name">sbSizer1</property>
-                                        <property name="orient">wxVERTICAL</property>
-                                        <property name="parent">1</property>
-                                        <property name="permission">none</property>
-                                        <event name="OnUpdateUI"></event>
-                                        <object class="sizeritem" expanded="0">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">1</property>
-                                            <object class="wxListBox" expanded="0">
-                                                <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_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</property>
-                                                <property name="center_pane">0</property>
-                                                <property name="choices"></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="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">m_signals</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style">wxLB_SINGLE|wxLB_SORT</property>
-                                                <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>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnListBox"></event>
-                                                <event name="OnListBoxDClick">onSignalDblClick</event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp">onSignalRClick</event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
+                                <property name="moveable">1</property>
+                                <property name="name">m_panel31</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                                <object class="wxBoxSizer" expanded="0">
+                                    <property name="minimum_size"></property>
+                                    <property name="name">bSizer7</property>
+                                    <property name="orient">wxVERTICAL</property>
+                                    <property name="permission">none</property>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxStaticBoxSizer" expanded="0">
+                                            <property name="id">wxID_ANY</property>
+                                            <property name="label">Signals</property>
+                                            <property name="minimum_size"></property>
+                                            <property name="name">sbSizer1</property>
+                                            <property name="orient">wxVERTICAL</property>
+                                            <property name="permission">none</property>
+                                            <event name="OnUpdateUI"></event>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALL|wxEXPAND</property>
+                                                <property name="proportion">1</property>
+                                                <object class="wxListBox" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</property>
+                                                    <property name="center_pane">0</property>
+                                                    <property name="choices"></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="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">m_signals</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style">wxLB_SINGLE|wxLB_SORT</property>
+                                                    <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>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnListBox"></event>
+                                                    <event name="OnListBoxDClick">onSignalDblClick</event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp">onSignalRClick</event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
                                             </object>
                                         </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="wxStaticBoxSizer" expanded="0">
-                                        <property name="id">wxID_ANY</property>
-                                        <property name="label">Cursors</property>
-                                        <property name="minimum_size"></property>
-                                        <property name="name">sbSizer3</property>
-                                        <property name="orient">wxVERTICAL</property>
-                                        <property name="parent">1</property>
-                                        <property name="permission">none</property>
-                                        <event name="OnUpdateUI"></event>
-                                        <object class="sizeritem" expanded="0">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">1</property>
-                                            <object class="wxListCtrl" expanded="0">
-                                                <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_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</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="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">m_cursors</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style">wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL</property>
-                                                <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>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnListBeginDrag"></event>
-                                                <event name="OnListBeginLabelEdit"></event>
-                                                <event name="OnListBeginRDrag"></event>
-                                                <event name="OnListCacheHint"></event>
-                                                <event name="OnListColBeginDrag"></event>
-                                                <event name="OnListColClick"></event>
-                                                <event name="OnListColDragging"></event>
-                                                <event name="OnListColEndDrag"></event>
-                                                <event name="OnListColRightClick"></event>
-                                                <event name="OnListDeleteAllItems"></event>
-                                                <event name="OnListDeleteItem"></event>
-                                                <event name="OnListEndLabelEdit"></event>
-                                                <event name="OnListInsertItem"></event>
-                                                <event name="OnListItemActivated"></event>
-                                                <event name="OnListItemDeselected"></event>
-                                                <event name="OnListItemFocused"></event>
-                                                <event name="OnListItemMiddleClick"></event>
-                                                <event name="OnListItemRightClick"></event>
-                                                <event name="OnListItemSelected"></event>
-                                                <event name="OnListKeyDown"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxStaticBoxSizer" expanded="0">
+                                            <property name="id">wxID_ANY</property>
+                                            <property name="label">Cursors</property>
+                                            <property name="minimum_size"></property>
+                                            <property name="name">sbSizer3</property>
+                                            <property name="orient">wxVERTICAL</property>
+                                            <property name="permission">none</property>
+                                            <event name="OnUpdateUI"></event>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxALL|wxEXPAND</property>
+                                                <property name="proportion">1</property>
+                                                <object class="wxListCtrl" expanded="0">
+                                                    <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_name"></property>
+                                                    <property name="aui_position"></property>
+                                                    <property name="aui_row"></property>
+                                                    <property name="best_size"></property>
+                                                    <property name="bg"></property>
+                                                    <property name="caption"></property>
+                                                    <property name="caption_visible">1</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="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">m_cursors</property>
+                                                    <property name="pane_border">1</property>
+                                                    <property name="pane_position"></property>
+                                                    <property name="pane_size"></property>
+                                                    <property name="permission">protected</property>
+                                                    <property name="pin_button">1</property>
+                                                    <property name="pos"></property>
+                                                    <property name="resize">Resizable</property>
+                                                    <property name="show">1</property>
+                                                    <property name="size"></property>
+                                                    <property name="style">wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL</property>
+                                                    <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>
+                                                    <event name="OnChar"></event>
+                                                    <event name="OnEnterWindow"></event>
+                                                    <event name="OnEraseBackground"></event>
+                                                    <event name="OnKeyDown"></event>
+                                                    <event name="OnKeyUp"></event>
+                                                    <event name="OnKillFocus"></event>
+                                                    <event name="OnLeaveWindow"></event>
+                                                    <event name="OnLeftDClick"></event>
+                                                    <event name="OnLeftDown"></event>
+                                                    <event name="OnLeftUp"></event>
+                                                    <event name="OnListBeginDrag"></event>
+                                                    <event name="OnListBeginLabelEdit"></event>
+                                                    <event name="OnListBeginRDrag"></event>
+                                                    <event name="OnListCacheHint"></event>
+                                                    <event name="OnListColBeginDrag"></event>
+                                                    <event name="OnListColClick"></event>
+                                                    <event name="OnListColDragging"></event>
+                                                    <event name="OnListColEndDrag"></event>
+                                                    <event name="OnListColRightClick"></event>
+                                                    <event name="OnListDeleteAllItems"></event>
+                                                    <event name="OnListDeleteItem"></event>
+                                                    <event name="OnListEndLabelEdit"></event>
+                                                    <event name="OnListInsertItem"></event>
+                                                    <event name="OnListItemActivated"></event>
+                                                    <event name="OnListItemDeselected"></event>
+                                                    <event name="OnListItemFocused"></event>
+                                                    <event name="OnListItemMiddleClick"></event>
+                                                    <event name="OnListItemRightClick"></event>
+                                                    <event name="OnListItemSelected"></event>
+                                                    <event name="OnListKeyDown"></event>
+                                                    <event name="OnMiddleDClick"></event>
+                                                    <event name="OnMiddleDown"></event>
+                                                    <event name="OnMiddleUp"></event>
+                                                    <event name="OnMotion"></event>
+                                                    <event name="OnMouseEvents"></event>
+                                                    <event name="OnMouseWheel"></event>
+                                                    <event name="OnPaint"></event>
+                                                    <event name="OnRightDClick"></event>
+                                                    <event name="OnRightDown"></event>
+                                                    <event name="OnRightUp"></event>
+                                                    <event name="OnSetFocus"></event>
+                                                    <event name="OnSize"></event>
+                                                    <event name="OnUpdateUI"></event>
+                                                </object>
                                             </object>
                                         </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="wxStaticBoxSizer" expanded="1">
-                                        <property name="id">wxID_ANY</property>
-                                        <property name="label">Tune</property>
-                                        <property name="minimum_size"></property>
-                                        <property name="name">sbSizer4</property>
-                                        <property name="orient">wxVERTICAL</property>
-                                        <property name="parent">1</property>
-                                        <property name="permission">none</property>
-                                        <event name="OnUpdateUI"></event>
-                                        <object class="sizeritem" expanded="1">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxEXPAND</property>
-                                            <property name="proportion">1</property>
-                                            <object class="wxBoxSizer" expanded="1">
-                                                <property name="minimum_size"></property>
-                                                <property name="name">m_tuneSizer</property>
-                                                <property name="orient">wxHORIZONTAL</property>
-                                                <property name="permission">protected</property>
-                                            </object>
-                                        </object>
-                                    </object>
-                                </object>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag"></property>
-                                    <property name="proportion">0</property>
-                                    <object class="wxBoxSizer" expanded="0">
-                                        <property name="minimum_size"></property>
-                                        <property name="name">bSizer4</property>
-                                        <property name="orient">wxHORIZONTAL</property>
-                                        <property name="permission">none</property>
-                                        <object class="sizeritem" expanded="0">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">1</property>
-                                            <object class="wxButton" expanded="0">
-                                                <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_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</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">0</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="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="label">Simulate</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">m_simulateBtn</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <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>
-                                                <event name="OnButtonClick">onSimulate</event>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
-                                        <object class="sizeritem" expanded="0">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">1</property>
-                                            <object class="wxButton" expanded="0">
-                                                <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_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</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">0</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="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="label">Settings</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">m_settingsBtn</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <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>
-                                                <event name="OnButtonClick">onSettings</event>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
-                                        <object class="sizeritem" expanded="0">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">0</property>
-                                            <object class="wxButton" expanded="0">
-                                                <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_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</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">0</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="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="label">Add signal</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">m_addSignal</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <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>
-                                                <event name="OnButtonClick">onAddSignal</event>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
-                                        <object class="sizeritem" expanded="0">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">1</property>
-                                            <object class="wxButton" expanded="0">
-                                                <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_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</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">0</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="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="label">Probe</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">m_probeBtn</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <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>
-                                                <event name="OnButtonClick">onProbe</event>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
-                                        <object class="sizeritem" expanded="0">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxALL|wxEXPAND</property>
-                                            <property name="proportion">1</property>
-                                            <object class="wxButton" expanded="0">
-                                                <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_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</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">0</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="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="label">Tune</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">m_tuneBtn</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <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>
-                                                <event name="OnButtonClick">onTune</event>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
+                                    <object class="sizeritem" expanded="0">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxEXPAND</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxStaticBoxSizer" expanded="0">
+                                            <property name="id">wxID_ANY</property>
+                                            <property name="label">Tune</property>
+                                            <property name="minimum_size"></property>
+                                            <property name="name">sbSizer4</property>
+                                            <property name="orient">wxVERTICAL</property>
+                                            <property name="permission">none</property>
+                                            <event name="OnUpdateUI"></event>
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxEXPAND</property>
+                                                <property name="proportion">1</property>
+                                                <object class="wxBoxSizer" expanded="0">
+                                                    <property name="minimum_size"></property>
+                                                    <property name="name">m_tuneSizer</property>
+                                                    <property name="orient">wxHORIZONTAL</property>
+                                                    <property name="permission">protected</property>
+                                                </object>
                                             </object>
                                         </object>
                                     </object>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index b4859b9882..d7e7573721 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 24 2016)
+// C++ code generated with wxFormBuilder (version Jun 17 2015)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -23,13 +23,16 @@ class KIWAY_PLAYER;
 #include <wx/font.h>
 #include <wx/colour.h>
 #include <wx/settings.h>
+#include <wx/toolbar.h>
 #include <wx/notebook.h>
-#include <wx/textctrl.h>
+#include <wx/stattext.h>
 #include <wx/sizer.h>
+#include <wx/panel.h>
+#include <wx/textctrl.h>
+#include <wx/splitter.h>
 #include <wx/listbox.h>
 #include <wx/statbox.h>
 #include <wx/listctrl.h>
-#include <wx/button.h>
 #include <wx/frame.h>
 
 ///////////////////////////////////////////////////////////////////////////
@@ -45,17 +48,22 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 	protected:
 		wxMenuBar* m_mainMenu;
 		wxMenu* m_fileMenu;
+		wxMenu* m_simulationMenu;
 		wxMenu* m_viewMenu;
+		wxToolBar* m_toolBar;
+		wxSplitterWindow* m_splitterPlot;
+		wxPanel* m_panel2;
+		wxSplitterWindow* m_splitterConsole;
+		wxPanel* m_panel4;
 		wxNotebook* m_plotNotebook;
+		wxPanel* m_welcomePanel;
+		wxStaticText* m_staticText2;
+		wxPanel* m_panel5;
 		wxTextCtrl* m_simConsole;
+		wxPanel* m_panel31;
 		wxListBox* m_signals;
 		wxListCtrl* m_cursors;
 		wxBoxSizer* m_tuneSizer;
-		wxButton* m_simulateBtn;
-		wxButton* m_settingsBtn;
-		wxButton* m_addSignal;
-		wxButton* m_probeBtn;
-		wxButton* m_tuneBtn;
 		
 		// Virtual event handlers, overide them in your derived class
 		virtual void menuNewPlot( wxCommandEvent& event ) { event.Skip(); }
@@ -71,16 +79,9 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		virtual void menuShowGridUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
 		virtual void menuShowLegend( wxCommandEvent& event ) { event.Skip(); }
 		virtual void menuShowLegendUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
-		virtual void menuShowCoords( wxCommandEvent& event ) { event.Skip(); }
-		virtual void menuShowCoordsUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
 		virtual void onPlotChanged( wxNotebookEvent& event ) { event.Skip(); }
 		virtual void onSignalDblClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onSignalRClick( wxMouseEvent& event ) { event.Skip(); }
-		virtual void onSimulate( wxCommandEvent& event ) { event.Skip(); }
-		virtual void onSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void onAddSignal( wxCommandEvent& event ) { event.Skip(); }
-		virtual void onProbe( wxCommandEvent& event ) { event.Skip(); }
-		virtual void onTune( wxCommandEvent& event ) { event.Skip(); }
 		
 	
 	public:
@@ -88,6 +89,18 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Simulation Workbook"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1280,900 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("SIM_PLOT_FRAME") );
 		
 		~SIM_PLOT_FRAME_BASE();
+		
+		void m_splitterPlotOnIdle( wxIdleEvent& )
+		{
+			m_splitterPlot->SetSashPosition( 0 );
+			m_splitterPlot->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterPlotOnIdle ), NULL, this );
+		}
+		
+		void m_splitterConsoleOnIdle( wxIdleEvent& )
+		{
+			m_splitterConsole->SetSashPosition( 0 );
+			m_splitterConsole->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterConsoleOnIdle ), NULL, this );
+		}
 	
 };
 
diff --git a/include/bitmaps.h b/include/bitmaps.h
index ffd70e0b79..92422380f1 100644
--- a/include/bitmaps.h
+++ b/include/bitmaps.h
@@ -570,5 +570,11 @@ EXTERN_BITMAP( zoom_xpm )
 EXTERN_BITMAP( tune_diff_pair_length_legend_xpm )
 EXTERN_BITMAP( tune_diff_pair_skew_legend_xpm )
 EXTERN_BITMAP( tune_single_track_length_legend_xpm )
+EXTERN_BITMAP( sim_run_xpm )
+EXTERN_BITMAP( sim_stop_xpm )
+EXTERN_BITMAP( sim_tune_xpm )
+EXTERN_BITMAP( sim_probe_xpm )
+EXTERN_BITMAP( sim_add_signal_xpm )
+EXTERN_BITMAP( sim_settings_xpm )
 
 #endif  // BITMAPS_H_

From 1cb7f665fbab34134f6f9b0385f8a305e9ab4a28 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:00 +0200
Subject: [PATCH 135/197] sim: tuner slider now located in a nested wxPanel

---
 eeschema/widgets/tuner_slider.cpp | 23 ++++++++++++++---------
 eeschema/widgets/tuner_slider.h   |  4 +++-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/eeschema/widgets/tuner_slider.cpp b/eeschema/widgets/tuner_slider.cpp
index d177d5b791..9f863ba16d 100644
--- a/eeschema/widgets/tuner_slider.cpp
+++ b/eeschema/widgets/tuner_slider.cpp
@@ -29,9 +29,9 @@
 #include <template_fieldnames.h>
 #include <netlist_exporters/netlist_exporter_pspice.h>
 
-TUNER_SLIDER::TUNER_SLIDER( SIM_PLOT_FRAME* aParent, SCH_COMPONENT* aComponent )
+TUNER_SLIDER::TUNER_SLIDER( SIM_PLOT_FRAME* aFrame, wxWindow* aParent, SCH_COMPONENT* aComponent )
     : TUNER_SLIDER_BASE( aParent ), m_component( aComponent ),
-    m_min( 0.0 ), m_max( 0.0 ), m_value( 0.0 )
+    m_min( 0.0 ), m_max( 0.0 ), m_value( 0.0 ), m_frame ( aFrame )
 {
     const wxString compName = aComponent->GetField( REFERENCE )->GetText();
     m_name->SetLabel( compName );
@@ -43,9 +43,14 @@ TUNER_SLIDER::TUNER_SLIDER( SIM_PLOT_FRAME* aParent, SCH_COMPONENT* aComponent )
     m_spiceName = wxString( prim + compName ).Lower();
 
     // Call Set*() methods to update fields and slider
-    SetMax( SPICE_VALUE( 2.0 ) * m_value );
-    SetMin( SPICE_VALUE( 0.5 ) * m_value );
-    SetValue( m_value );
+    m_max = SPICE_VALUE( 2.0 ) * m_value;
+    m_min = SPICE_VALUE( 0.5 ) * m_value;
+
+    m_minText->SetValue( m_min.ToOrigString() );
+    m_maxText->SetValue( m_max.ToOrigString() );
+
+    updateValueText();
+    updateSlider();
 
     m_simTimer.SetOwner( this );
     Connect( wxEVT_TIMER, wxTimerEventHandler( TUNER_SLIDER::onSimTimer ), NULL, this );
@@ -114,7 +119,8 @@ void TUNER_SLIDER::updateComponentValue()
 void TUNER_SLIDER::updateSlider()
 {
     assert( m_max >= m_value && m_value >= m_min );
-    m_slider->SetValue( ( ( m_value - m_min ) / ( m_max - m_min ) ).ToDouble() * 100 );
+
+    m_slider->SetValue( ( ( m_value - m_min ) / ( m_max - m_min ) ).ToDouble() * 100.0 );
 }
 
 
@@ -127,7 +133,7 @@ void TUNER_SLIDER::updateValueText()
 
 void TUNER_SLIDER::onClose( wxCommandEvent& event )
 {
-    static_cast<SIM_PLOT_FRAME*>( GetParent() )->RemoveTuner( this );
+    m_frame->RemoveTuner( this );
 }
 
 
@@ -197,8 +203,7 @@ void TUNER_SLIDER::onSimTimer( wxTimerEvent& event )
 {
     if(m_changed)
     {
-        printf("Slider Ch\n");
-        wxQueueEvent( GetParent(), new wxCommandEvent( EVT_SIM_UPDATE ) );
+        wxQueueEvent( m_frame, new wxCommandEvent( EVT_SIM_UPDATE ) );
         m_changed = false;
     }
 }
diff --git a/eeschema/widgets/tuner_slider.h b/eeschema/widgets/tuner_slider.h
index ecdc6185a3..d3b5ddece9 100644
--- a/eeschema/widgets/tuner_slider.h
+++ b/eeschema/widgets/tuner_slider.h
@@ -40,7 +40,7 @@ class SCH_COMPONENT;
 class TUNER_SLIDER : public TUNER_SLIDER_BASE
 {
 public:
-    TUNER_SLIDER( SIM_PLOT_FRAME* aParent, SCH_COMPONENT* aComponent );
+    TUNER_SLIDER( SIM_PLOT_FRAME *aFrame, wxWindow* aParent, SCH_COMPONENT* aComponent );
 
     wxString GetComponentName() const
     {
@@ -95,6 +95,8 @@ private:
 
     SPICE_VALUE m_min, m_max, m_value;
     bool m_changed;
+
+    SIM_PLOT_FRAME *m_frame;
 };
 
 #endif /* TUNER_SLIDER_H */

From bba57097b7e49d007420ea7a45ba47d28b41369b Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:01 +0200
Subject: [PATCH 136/197] sim: use C locale for SPICE simulation. Added error
 callback

---
 eeschema/sim/ngspice.cpp | 88 +++++++---------------------------------
 eeschema/sim/ngspice.h   |  1 +
 2 files changed, 16 insertions(+), 73 deletions(-)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 7e13c92415..43f539b513 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -52,18 +52,21 @@ NGSPICE::NGSPICE()
     m_ngSpice_AllPlots = (ngSpice_AllPlots) m_dll->GetSymbol( "ngSpice_AllPlots" );
     m_ngSpice_AllVecs = (ngSpice_AllVecs) m_dll->GetSymbol( "ngSpice_AllVecs" );
     m_ngSpice_Running = (ngSpice_Running) m_dll->GetSymbol( "ngSpice_running" );
+
+    setlocale( LC_ALL, "C" );
 }
 
 
 NGSPICE::~NGSPICE()
 {
+    setlocale( LC_ALL, "" );
     delete m_dll;
 }
 
 
 void NGSPICE::Init()
 {
-    m_ngSpice_Init( &cbSendChar, &cbSendStat, NULL, NULL, NULL, &cbBGThreadRunning, this );
+    m_ngSpice_Init( &cbSendChar, &cbSendStat, &cbControlledExit, NULL, NULL, &cbBGThreadRunning, this );
 }
 
 
@@ -206,19 +209,27 @@ bool NGSPICE::LoadNetlist( const string& aNetlist )
     stringstream ss( aNetlist );
     int n = 0;
 
+    printf("***\n");
     while( !ss.eof() && n < 16384 )
     {
         char line[1024];
         ss.getline( line, sizeof(line) );
         lines[n++] = strdup(line);
+
+        printf("%s\n", line);
     }
+    printf("***\n");
 
     lines[n] = NULL;
+
     m_ngSpice_Circ( lines );
 
     for(int i = 0; i < n; i++)
         delete lines[i];
 
+
+    printf("Netlist load complete!\n");
+
     return true;
 }
 
@@ -273,82 +284,13 @@ string NGSPICE::GetXAxis( SIM_TYPE aType ) const
     return string( "" );
 }
 
-
-void NGSPICE::dump()
+int NGSPICE::cbControlledExit ( int status, bool immediate, bool exit_upon_quit, int id, void *user )
 {
-//    m_ngSpice_Command("run\n");
-    char** plots = m_ngSpice_AllPlots();
-
-    for( int i = 0; plots[i]; ++i )
-    {
-        wxLogDebug( "-> plot : %s", plots[i] );
-        char** vecs = m_ngSpice_AllVecs( plots[i] );
-
-        for( int j = 0; vecs[j]; j++ )
-        {
-            wxLogDebug( "   - vector %s", vecs[j] );
-
-            vector_info* vi = m_ngGet_Vec_Info( vecs[j] );
-
-            wxLogDebug( "       - v_type %x", vi->v_type );
-            wxLogDebug( "       - v_flags %x", vi->v_flags );
-            wxLogDebug( "       - v_length %d", vi->v_length );
-        }
-    }
+        printf("stat %d immed %d quit %d\n", status, !!immediate, !!exit_upon_quit);
+        return 0;
 }
 
 
-#if 0
-static string loadFile(const string& filename)
-{
-
-    FILE *f=fopen(filename.c_str(),"rb");
-    char buf[10000];
-    int n = fread(buf, 1, 10000, f);
-    fclose(f);
-    buf[n] = 0;
-    return buf;
-}
-
-
-main()
-{
-    NGSPICE spice;
-    spice.Init();
-    spice.LoadNetlist(loadFile("1.ckt"));
-
-    spice.Command("tran .05 1");
-    spice.Command("save all");
-
-    spice.Run();
-    vector<double> t = spice.GetPlot("time");
-    vector<double> v1 = spice.GetPlot("V(1)");
-    vector<double> v2 = spice.GetPlot("V(2)");
-
-    // Prepare data.
-
-    // Plot line from given x and y data. Color is selected automatically.
-    plt::plot(t, v1);
-    // Plot a red dashed line from given x and y data.
-    plt::plot(t, v2,"r--");
-
-    for(int i=0;i<v1.size();i++)
-        wxLogDebug("%.10f\n",v2[i]);
-
-    // Add graph title
-    plt::title("Sample figure");
-    // Enable legend.
-    plt::legend();
-    // save figure
-    plt::show();
-
-
-//    spice.Run();
-}
-
-#endif
-
-
 int NGSPICE::cbSendChar( char* what, int id, void* user )
 {
     NGSPICE* sim = reinterpret_cast<NGSPICE*>( user );
diff --git a/eeschema/sim/ngspice.h b/eeschema/sim/ngspice.h
index 0a38e25931..ca5d1fca87 100644
--- a/eeschema/sim/ngspice.h
+++ b/eeschema/sim/ngspice.h
@@ -75,6 +75,7 @@ private:
     static int cbSendChar( char* what, int id, void* user );
     static int cbSendStat( char* what, int id, void* user );
     static int cbBGThreadRunning( bool is_running, int id, void* user );
+    static int cbControlledExit ( int status, bool immediate, bool exit_upon_quit, int id, void *user );
 
     void dump();
 };

From 2bcd8af25c5af3a3be60997484953efc112bf876 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:01 +0200
Subject: [PATCH 137/197] sim: fix trailing zero removal

---
 eeschema/sim/spice_value.cpp | 11 +++++++----
 eeschema/sim/spice_value.h   |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/eeschema/sim/spice_value.cpp b/eeschema/sim/spice_value.cpp
index f773bc9e3c..21608a4078 100644
--- a/eeschema/sim/spice_value.cpp
+++ b/eeschema/sim/spice_value.cpp
@@ -221,11 +221,14 @@ SPICE_VALUE SPICE_VALUE::operator/( const SPICE_VALUE& aOther ) const
 
 void SPICE_VALUE::stripZeros( wxString& aString )
 {
-    while( aString.EndsWith( '0' ) )
-        aString.RemoveLast();
+    if ( aString.Find(',') >= 0 || aString.Find('.') >= 0 )
+    {
+        while( aString.EndsWith( '0' ) )
+            aString.RemoveLast();
 
-    if( aString.EndsWith( '.' ) || aString.EndsWith( ',' ) )
-        aString.RemoveLast();
+        if( aString.EndsWith( '.' ) || aString.EndsWith( ',' ) )
+                aString.RemoveLast();
+    }
 }
 
 
diff --git a/eeschema/sim/spice_value.h b/eeschema/sim/spice_value.h
index 571acdd7f4..c8c01e7848 100644
--- a/eeschema/sim/spice_value.h
+++ b/eeschema/sim/spice_value.h
@@ -47,7 +47,7 @@ public:
     };
 
     SPICE_VALUE()
-        : m_base( 0 ), m_prefix( PFX_NONE )
+        : m_base( 0 ), m_prefix( PFX_NONE ), m_spiceStr( false )
     {
     }
 

From 8e4ae1968f447866476d2e6adb620b767efc2fe5 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:01 +0200
Subject: [PATCH 138/197] sim: working on improved UX [wip]

---
 eeschema/sim/sim_plot_frame.cpp      | 25 ++++++++++-------
 eeschema/sim/sim_plot_frame_base.cpp | 40 +++++++++++++---------------
 eeschema/sim/sim_plot_frame_base.fbp | 16 +++++------
 eeschema/sim/sim_plot_frame_base.h   |  6 +++--
 eeschema/sim/sim_plot_panel.cpp      |  6 ++---
 5 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 83b006870b..aa5337cb32 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -137,14 +137,12 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
 
     GetSize( &w, &h );
 
-    printf("%d %d\n", w, h);
-
     m_toolBar->Realize();
 
-    Layout();
-
     m_splitterConsole->SetSashPosition( w * 0.8 );
-    m_splitterPlot->SetSashPosition( h *0.8 );
+    m_splitterPlot->SetSashPosition( h * 0.8 );
+
+    Layout();
 }
 
 
@@ -182,7 +180,7 @@ void SIM_PLOT_FRAME::StartSimulation()
 
     m_welcomePanel->Show(false);
     m_plotNotebook->Show(true);
-    m_plotNotebook->Raise();
+    m_plotNotebook->Fit();
 
     Layout();
 }
@@ -252,9 +250,12 @@ void SIM_PLOT_FRAME::AddTuner( SCH_COMPONENT* aComponent )
 
     try
     {
-        TUNER_SLIDER* tuner = new TUNER_SLIDER( this, aComponent );
-        m_tuneSizer->Add( tuner );
+        TUNER_SLIDER* tuner = new TUNER_SLIDER( this, m_sidePanel, aComponent );
+        m_tuneSizer->Add( tuner , 0, wxALL, 5 );
         tunerList.push_back( tuner );
+        m_sidePanel->Layout();
+        m_sideSizer->Fit( m_sidePanel );
+        m_splitterPlot->Layout();
         Layout();
     }
     catch( ... )
@@ -318,7 +319,13 @@ void SIM_PLOT_FRAME::addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const
     if( updated )
     {
         updateSignalList();
+        plotPanel->Layout();
         plotPanel->Fit();
+        m_plotPanel->Layout();
+        //m_sideSizer->Fit( m_sidePanel );
+        m_splitterPlot->Layout();
+        Layout();
+
     }
 }
 
@@ -799,7 +806,7 @@ void SIM_PLOT_FRAME::onSimUpdate( wxCommandEvent& aEvent )
                     + "=" + tuner->GetValue().ToSpiceString() );
             m_simulator->Command( command );
 
-            printf("CMD: %s\n", command.c_str() );
+//            printf("CMD: %s\n", command.c_str() );
         }
     }
 
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index 840c618200..fa87e39ade 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -121,18 +121,18 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_splitterConsole->SetSashGravity( 0.8 );
 	m_splitterConsole->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterConsoleOnIdle ), NULL, this );
 	
-	m_panel4 = new wxPanel( m_splitterConsole, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_plotPanel = new wxPanel( m_splitterConsole, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer5;
 	bSizer5 = new wxBoxSizer( wxHORIZONTAL );
 	
-	m_plotNotebook = new wxNotebook( m_panel4, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_plotNotebook = new wxNotebook( m_plotPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	m_plotNotebook->Hide();
 	m_plotNotebook->SetMinSize( wxSize( 400,-1 ) );
 	
 	
 	bSizer5->Add( m_plotNotebook, 3, wxEXPAND | wxALL, 5 );
 	
-	m_welcomePanel = new wxPanel( m_panel4, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_welcomePanel = new wxPanel( m_plotPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer8;
 	bSizer8 = new wxBoxSizer( wxVERTICAL );
 	
@@ -168,9 +168,9 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	bSizer5->Add( m_welcomePanel, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
 	
 	
-	m_panel4->SetSizer( bSizer5 );
-	m_panel4->Layout();
-	bSizer5->Fit( m_panel4 );
+	m_plotPanel->SetSizer( bSizer5 );
+	m_plotPanel->Layout();
+	bSizer5->Fit( m_plotPanel );
 	m_panel5 = new wxPanel( m_splitterConsole, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer13;
 	bSizer13 = new wxBoxSizer( wxVERTICAL );
@@ -184,37 +184,35 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_panel5->SetSizer( bSizer13 );
 	m_panel5->Layout();
 	bSizer13->Fit( m_panel5 );
-	m_splitterConsole->SplitHorizontally( m_panel4, m_panel5, 0 );
+	m_splitterConsole->SplitHorizontally( m_plotPanel, m_panel5, 0 );
 	bSizer11->Add( m_splitterConsole, 1, wxEXPAND, 5 );
 	
 	
 	m_panel2->SetSizer( bSizer11 );
 	m_panel2->Layout();
 	bSizer11->Fit( m_panel2 );
-	m_panel31 = new wxPanel( m_splitterPlot, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer7;
-	bSizer7 = new wxBoxSizer( wxVERTICAL );
+	m_sidePanel = new wxPanel( m_splitterPlot, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_sideSizer = new wxBoxSizer( wxVERTICAL );
 	
 	wxStaticBoxSizer* sbSizer1;
-	sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_panel31, wxID_ANY, _("Signals") ), wxVERTICAL );
+	sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_sidePanel, wxID_ANY, _("Signals") ), wxVERTICAL );
 	
 	m_signals = new wxListBox( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_SORT ); 
 	sbSizer1->Add( m_signals, 1, wxALL|wxEXPAND, 5 );
 	
 	
-	bSizer7->Add( sbSizer1, 1, wxEXPAND, 5 );
+	m_sideSizer->Add( sbSizer1, 1, wxEXPAND, 5 );
 	
 	wxStaticBoxSizer* sbSizer3;
-	sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_panel31, wxID_ANY, _("Cursors") ), wxVERTICAL );
+	sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_sidePanel, wxID_ANY, _("Cursors") ), wxVERTICAL );
 	
 	m_cursors = new wxListCtrl( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL );
 	sbSizer3->Add( m_cursors, 1, wxALL|wxEXPAND, 5 );
 	
 	
-	bSizer7->Add( sbSizer3, 1, wxEXPAND, 5 );
+	m_sideSizer->Add( sbSizer3, 1, wxEXPAND, 5 );
 	
-	wxStaticBoxSizer* sbSizer4;
-	sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( m_panel31, wxID_ANY, _("Tune") ), wxVERTICAL );
+	sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( m_sidePanel, wxID_ANY, _("Tune") ), wxVERTICAL );
 	
 	m_tuneSizer = new wxBoxSizer( wxHORIZONTAL );
 	
@@ -222,13 +220,13 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	sbSizer4->Add( m_tuneSizer, 1, wxEXPAND, 5 );
 	
 	
-	bSizer7->Add( sbSizer4, 1, wxEXPAND, 5 );
+	m_sideSizer->Add( sbSizer4, 1, wxEXPAND, 5 );
 	
 	
-	m_panel31->SetSizer( bSizer7 );
-	m_panel31->Layout();
-	bSizer7->Fit( m_panel31 );
-	m_splitterPlot->SplitVertically( m_panel2, m_panel31, 0 );
+	m_sidePanel->SetSizer( m_sideSizer );
+	m_sidePanel->Layout();
+	m_sideSizer->Fit( m_sidePanel );
+	m_splitterPlot->SplitVertically( m_panel2, m_sidePanel, 0 );
 	bSizer1->Add( m_splitterPlot, 1, wxEXPAND, 5 );
 	
 	
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index d9ef495e76..0a08ebd1b8 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -675,7 +675,7 @@
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxSplitterWindow" expanded="1">
+                                        <object class="wxSplitterWindow" expanded="0">
                                             <property name="BottomDockable">1</property>
                                             <property name="LeftDockable">1</property>
                                             <property name="RightDockable">1</property>
@@ -1361,7 +1361,7 @@
                                 <property name="minimize_button">0</property>
                                 <property name="minimum_size"></property>
                                 <property name="moveable">1</property>
-                                <property name="name">m_panel31</property>
+                                <property name="name">m_sidePanel</property>
                                 <property name="pane_border">1</property>
                                 <property name="pane_position"></property>
                                 <property name="pane_size"></property>
@@ -1400,11 +1400,11 @@
                                 <event name="OnSetFocus"></event>
                                 <event name="OnSize"></event>
                                 <event name="OnUpdateUI"></event>
-                                <object class="wxBoxSizer" expanded="0">
+                                <object class="wxBoxSizer" expanded="1">
                                     <property name="minimum_size"></property>
-                                    <property name="name">bSizer7</property>
+                                    <property name="name">m_sideSizer</property>
                                     <property name="orient">wxVERTICAL</property>
-                                    <property name="permission">none</property>
+                                    <property name="permission">protected</property>
                                     <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
@@ -1626,17 +1626,17 @@
                                             </object>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="0">
+                                    <object class="sizeritem" expanded="1">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxStaticBoxSizer" expanded="0">
+                                        <object class="wxStaticBoxSizer" expanded="1">
                                             <property name="id">wxID_ANY</property>
                                             <property name="label">Tune</property>
                                             <property name="minimum_size"></property>
                                             <property name="name">sbSizer4</property>
                                             <property name="orient">wxVERTICAL</property>
-                                            <property name="permission">none</property>
+                                            <property name="permission">protected</property>
                                             <event name="OnUpdateUI"></event>
                                             <object class="sizeritem" expanded="0">
                                                 <property name="border">5</property>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index d7e7573721..5a6da6d9e1 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -54,15 +54,17 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxSplitterWindow* m_splitterPlot;
 		wxPanel* m_panel2;
 		wxSplitterWindow* m_splitterConsole;
-		wxPanel* m_panel4;
+		wxPanel* m_plotPanel;
 		wxNotebook* m_plotNotebook;
 		wxPanel* m_welcomePanel;
 		wxStaticText* m_staticText2;
 		wxPanel* m_panel5;
 		wxTextCtrl* m_simConsole;
-		wxPanel* m_panel31;
+		wxPanel* m_sidePanel;
+		wxBoxSizer* m_sideSizer;
 		wxListBox* m_signals;
 		wxListCtrl* m_cursors;
+		wxStaticBoxSizer* sbSizer4;
 		wxBoxSizer* m_tuneSizer;
 		
 		// Virtual event handlers, overide them in your derived class
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index f2cfec4e77..97c130ad18 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -105,7 +105,6 @@ public:
 
     const wxString getLabel( int n )
     {
-        printf("%.10f\n", m_labeledTicks[n] );
         return formatSI ( m_labeledTicks[n], wxT("Hz"), 2 );
     }
 };
@@ -119,7 +118,6 @@ public:
 
     const wxString getLabel( int n )
     {
-        printf("%.10f\n", m_labeledTicks[n] );
         return formatSI ( m_labeledTicks[n], wxT("Hz"), 2 );
     }
 };
@@ -305,7 +303,7 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
     switch( m_type )
     {
         case ST_AC:
-            m_axis_x = new FREQUENCY_LIN_SCALE( wxT( "Frequency" ), mpALIGN_BOTTOM );
+            m_axis_x = new FREQUENCY_LOG_SCALE( wxT( "Frequency" ), mpALIGN_BOTTOM );
             m_axis_y1 = new GAIN_SCALE( wxT( "Gain" ), mpALIGN_LEFT );
             m_axis_y2 = new PHASE_SCALE( wxT( "Phase" ), mpALIGN_RIGHT );
             m_axis_y2->SetMasterScale(m_axis_y1);
@@ -354,7 +352,9 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
     m_legend = new mpInfoLegend( wxRect( 0, 40, 200, 40 ), wxTRANSPARENT_BRUSH );
     AddLayer( m_legend );
     m_topLevel.push_back( m_legend );
+    SetColourTheme(*wxBLACK, *wxWHITE, grey);
 
+    EnableDoubleBuffer(true);
     UpdateAll();
 }
 

From d0e1f2e4129dee4160edecb302fd86c5a6c65a29 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:01 +0200
Subject: [PATCH 139/197] mathplot: silence debugging messages

---
 common/widgets/mathplot.cpp | 1 -
 include/widgets/mathplot.h  | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index a4cf48f4a9..946e1a4494 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -1108,7 +1108,6 @@ void mpScaleXLog::recalculateTicks ( wxDC & dc, mpWindow & w )
 
     double visibleDecades =  log( maxVvis / minVvis ) / log(10);
 
-    printf("visibleD %f %f\n", minDecade, maxDecade);
     double d;
 
     m_tickValues.clear();
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index 081cc06fea..6b86083825 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -733,13 +733,11 @@ public:
             m_maxV = std::max(maxV, m_maxV);
         }
 
-        printf("Extend min %.10f max %.10f\n", m_minV, m_maxV);
-
         if (m_minV == m_maxV)
         {
             m_minV = -1.0;
             m_maxV = 1.0;
-    }
+        }
     }
 
 

From 36297f84c325c5f42dca411b5659f5dc9f34b693 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:02 +0200
Subject: [PATCH 140/197] sim: further locale hacks, fixed plot/welcome message
 sizing

---
 eeschema/sim/ngspice.cpp             |  43 ++-
 eeschema/sim/sim_plot_frame.cpp      |  38 +--
 eeschema/sim/sim_plot_frame.h        |   1 +
 eeschema/sim/sim_plot_frame_base.cpp |  57 ++--
 eeschema/sim/sim_plot_frame_base.fbp | 456 +++++++++++++--------------
 eeschema/sim/sim_plot_frame_base.h   |   7 +-
 6 files changed, 307 insertions(+), 295 deletions(-)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 43f539b513..0c365c1ec2 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -53,27 +53,29 @@ NGSPICE::NGSPICE()
     m_ngSpice_AllVecs = (ngSpice_AllVecs) m_dll->GetSymbol( "ngSpice_AllVecs" );
     m_ngSpice_Running = (ngSpice_Running) m_dll->GetSymbol( "ngSpice_running" );
 
-    setlocale( LC_ALL, "C" );
 }
 
 
 NGSPICE::~NGSPICE()
 {
-    setlocale( LC_ALL, "" );
     delete m_dll;
 }
 
 
 void NGSPICE::Init()
 {
+    setlocale( LC_ALL, "C" );
     m_ngSpice_Init( &cbSendChar, &cbSendStat, &cbControlledExit, NULL, NULL, &cbBGThreadRunning, this );
+    setlocale( LC_ALL, "" );
 }
 
 
 vector<COMPLEX> NGSPICE::GetPlot( const string& aName, int aMaxLen )
 {
     vector<COMPLEX> data;
+    setlocale( LC_ALL, "C" );
     vector_info* vi = m_ngGet_Vec_Info( (char*) aName.c_str() );
+    setlocale( LC_ALL, "" );
 
     if( vi )
     {
@@ -99,7 +101,9 @@ vector<COMPLEX> NGSPICE::GetPlot( const string& aName, int aMaxLen )
 vector<double> NGSPICE::GetRealPlot( const string& aName, int aMaxLen )
 {
     vector<double> data;
+    setlocale( LC_ALL, "C" );
     vector_info* vi = m_ngGet_Vec_Info( (char*) aName.c_str() );
+    setlocale( LC_ALL, "" );
 
     if( vi )
     {
@@ -130,7 +134,10 @@ vector<double> NGSPICE::GetRealPlot( const string& aName, int aMaxLen )
 vector<double> NGSPICE::GetImagPlot( const string& aName, int aMaxLen )
 {
     vector<double> data;
+
+    setlocale( LC_ALL, "C" );
     vector_info* vi = m_ngGet_Vec_Info( (char*) aName.c_str() );
+    setlocale( LC_ALL, "" );
 
     if( vi )
     {
@@ -153,7 +160,10 @@ vector<double> NGSPICE::GetImagPlot( const string& aName, int aMaxLen )
 vector<double> NGSPICE::GetMagPlot( const string& aName, int aMaxLen )
 {
     vector<double> data;
+
+    setlocale( LC_ALL, "C" );
     vector_info* vi = m_ngGet_Vec_Info( (char*) aName.c_str() );
+    setlocale( LC_ALL, "" );
 
     if( vi )
     {
@@ -179,7 +189,10 @@ vector<double> NGSPICE::GetMagPlot( const string& aName, int aMaxLen )
 vector<double> NGSPICE::GetPhasePlot( const string& aName, int aMaxLen )
 {
     vector<double> data;
+
+    setlocale( LC_ALL, "C" );
     vector_info* vi = m_ngGet_Vec_Info( (char*) aName.c_str() );
+    setlocale( LC_ALL, "" );
 
     if( vi )
     {
@@ -209,52 +222,58 @@ bool NGSPICE::LoadNetlist( const string& aNetlist )
     stringstream ss( aNetlist );
     int n = 0;
 
-    printf("***\n");
     while( !ss.eof() && n < 16384 )
     {
         char line[1024];
         ss.getline( line, sizeof(line) );
         lines[n++] = strdup(line);
 
-        printf("%s\n", line);
     }
-    printf("***\n");
-
     lines[n] = NULL;
 
+    setlocale( LC_ALL, "C" );
     m_ngSpice_Circ( lines );
+    setlocale( LC_ALL, "" );
 
     for(int i = 0; i < n; i++)
         delete lines[i];
 
-
-    printf("Netlist load complete!\n");
-
     return true;
 }
 
 
 bool NGSPICE::Run()
 {
-    return Command( "bg_run" );
+    setlocale( LC_ALL, "C" );
+    bool rv =  Command( "bg_run" );
+    setlocale( LC_ALL, "" );
+    return rv;
 }
 
 
 bool NGSPICE::Stop()
 {
-    return Command( "bg_halt" );
+    setlocale( LC_ALL, "C" );
+    bool rv = Command( "bg_halt" );
+    setlocale( LC_ALL, "" );
+    return rv;
 }
 
 
 bool NGSPICE::IsRunning()
 {
-    return m_ngSpice_Running();
+    setlocale( LC_ALL, "C" );
+    bool rv = m_ngSpice_Running();
+    setlocale( LC_ALL, "" );
+    return rv;
 }
 
 
 bool NGSPICE::Command( const string& aCmd )
 {
+    setlocale( LC_ALL, "C" );
     m_ngSpice_Command( (char*) aCmd.c_str() );
+    setlocale( LC_ALL, "" );
 
     return true;
 }
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index aa5337cb32..b109c9e78c 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -133,16 +133,10 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     Connect( m_toolTune->GetId(), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME::onTune ), NULL, this );
     Connect( m_toolSettings->GetId(), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME::onSettings ), NULL, this );
 
-    int w, h;
-
-    GetSize( &w, &h );
-
     m_toolBar->Realize();
+    m_plotNotebook->SetPageText(0, _("Welcome!") );
 
-    m_splitterConsole->SetSashPosition( w * 0.8 );
-    m_splitterPlot->SetSashPosition( h * 0.8 );
-
-    Layout();
+    //relayout();
 }
 
 
@@ -178,9 +172,11 @@ void SIM_PLOT_FRAME::StartSimulation()
     m_simulator->LoadNetlist( formatter.GetString() );
     m_simulator->Run();
 
-    m_welcomePanel->Show(false);
-    m_plotNotebook->Show(true);
-    m_plotNotebook->Fit();
+    if ( m_welcomePanel )
+    {
+        m_plotNotebook->DeletePage( 0 );
+        m_welcomePanel = nullptr;
+    }
 
     Layout();
 }
@@ -253,9 +249,13 @@ void SIM_PLOT_FRAME::AddTuner( SCH_COMPONENT* aComponent )
         TUNER_SLIDER* tuner = new TUNER_SLIDER( this, m_sidePanel, aComponent );
         m_tuneSizer->Add( tuner , 0, wxALL, 5 );
         tunerList.push_back( tuner );
-        m_sidePanel->Layout();
-        m_sideSizer->Fit( m_sidePanel );
-        m_splitterPlot->Layout();
+        //m_sidePanel->Layout();
+        //m_sideSizer->Fit( m_sidePanel );
+        //m_splitterPlot->Layout();
+        Layout();
+        Layout();
+        Layout();
+        Layout();
         Layout();
     }
     catch( ... )
@@ -275,6 +275,8 @@ void SIM_PLOT_FRAME::RemoveTuner( TUNER_SLIDER* aTuner )
     m_plots[plotPanel].m_tuners.remove( aTuner );
     aTuner->Destroy();
     Layout();
+    Layout();
+    Layout();
 }
 
 
@@ -319,17 +321,9 @@ void SIM_PLOT_FRAME::addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const
     if( updated )
     {
         updateSignalList();
-        plotPanel->Layout();
-        plotPanel->Fit();
-        m_plotPanel->Layout();
-        //m_sideSizer->Fit( m_sidePanel );
-        m_splitterPlot->Layout();
-        Layout();
-
     }
 }
 
-
 void SIM_PLOT_FRAME::removePlot( const wxString& aPlotName )
 {
     SIM_PLOT_PANEL* plotPanel = CurrentPlot();
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 6a11cb491b..e984564152 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -136,6 +136,7 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         SIM_PLOT_PANEL* CurrentPlot() const;
 
     private:
+        void relayout();
         /**
          * @brief Adds a new plot to the current panel.
          * @param aName is the device/net name.
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index fa87e39ade..d6d3e6fb11 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -101,43 +101,35 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	
 	this->SetMenuBar( m_mainMenu );
 	
-	wxBoxSizer* bSizer1;
-	bSizer1 = new wxBoxSizer( wxVERTICAL );
+	m_sizer1 = new wxBoxSizer( wxVERTICAL );
 	
 	m_toolBar = new wxToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_FLAT|wxTB_HORIZONTAL|wxTB_TEXT ); 
 	m_toolBar->Realize(); 
 	
-	bSizer1->Add( m_toolBar, 0, wxEXPAND, 5 );
+	m_sizer1->Add( m_toolBar, 0, wxEXPAND, 5 );
 	
 	m_splitterPlot = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
 	m_splitterPlot->SetSashGravity( 0.8 );
 	m_splitterPlot->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterPlotOnIdle ), NULL, this );
 	
 	m_panel2 = new wxPanel( m_splitterPlot, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer11;
-	bSizer11 = new wxBoxSizer( wxVERTICAL );
+	m_sizer11 = new wxBoxSizer( wxVERTICAL );
 	
 	m_splitterConsole = new wxSplitterWindow( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
 	m_splitterConsole->SetSashGravity( 0.8 );
 	m_splitterConsole->Connect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterConsoleOnIdle ), NULL, this );
 	
 	m_plotPanel = new wxPanel( m_splitterConsole, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer5;
-	bSizer5 = new wxBoxSizer( wxHORIZONTAL );
+	m_sizer5 = new wxBoxSizer( wxHORIZONTAL );
 	
 	m_plotNotebook = new wxNotebook( m_plotPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_plotNotebook->Hide();
 	m_plotNotebook->SetMinSize( wxSize( 400,-1 ) );
 	
-	
-	bSizer5->Add( m_plotNotebook, 3, wxEXPAND | wxALL, 5 );
-	
-	m_welcomePanel = new wxPanel( m_plotPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer8;
-	bSizer8 = new wxBoxSizer( wxVERTICAL );
+	m_welcomePanel = new wxPanel( m_plotNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_sizer8 = new wxBoxSizer( wxVERTICAL );
 	
 	
-	bSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
+	m_sizer8->Add( 0, 0, 1, wxEXPAND, 5 );
 	
 	wxBoxSizer* bSizer81;
 	bSizer81 = new wxBoxSizer( wxHORIZONTAL );
@@ -156,41 +148,42 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	bSizer81->Add( 0, 0, 1, wxEXPAND, 5 );
 	
 	
-	bSizer8->Add( bSizer81, 0, wxEXPAND, 5 );
+	m_sizer8->Add( bSizer81, 0, wxEXPAND, 5 );
 	
 	
-	bSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
+	m_sizer8->Add( 0, 0, 1, wxEXPAND, 5 );
 	
 	
-	m_welcomePanel->SetSizer( bSizer8 );
+	m_welcomePanel->SetSizer( m_sizer8 );
 	m_welcomePanel->Layout();
-	bSizer8->Fit( m_welcomePanel );
-	bSizer5->Add( m_welcomePanel, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_sizer8->Fit( m_welcomePanel );
+	m_plotNotebook->AddPage( m_welcomePanel, _("a page"), false );
+	
+	m_sizer5->Add( m_plotNotebook, 3, wxEXPAND | wxALL, 5 );
 	
 	
-	m_plotPanel->SetSizer( bSizer5 );
+	m_plotPanel->SetSizer( m_sizer5 );
 	m_plotPanel->Layout();
-	bSizer5->Fit( m_plotPanel );
+	m_sizer5->Fit( m_plotPanel );
 	m_panel5 = new wxPanel( m_splitterConsole, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer13;
-	bSizer13 = new wxBoxSizer( wxVERTICAL );
+	m_sizer13 = new wxBoxSizer( wxVERTICAL );
 	
 	m_simConsole = new wxTextCtrl( m_panel5, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
 	m_simConsole->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 76, 90, 90, false, wxEmptyString ) );
 	
-	bSizer13->Add( m_simConsole, 1, wxALL|wxEXPAND, 5 );
+	m_sizer13->Add( m_simConsole, 1, wxALL|wxEXPAND, 5 );
 	
 	
-	m_panel5->SetSizer( bSizer13 );
+	m_panel5->SetSizer( m_sizer13 );
 	m_panel5->Layout();
-	bSizer13->Fit( m_panel5 );
+	m_sizer13->Fit( m_panel5 );
 	m_splitterConsole->SplitHorizontally( m_plotPanel, m_panel5, 0 );
-	bSizer11->Add( m_splitterConsole, 1, wxEXPAND, 5 );
+	m_sizer11->Add( m_splitterConsole, 1, wxEXPAND, 5 );
 	
 	
-	m_panel2->SetSizer( bSizer11 );
+	m_panel2->SetSizer( m_sizer11 );
 	m_panel2->Layout();
-	bSizer11->Fit( m_panel2 );
+	m_sizer11->Fit( m_panel2 );
 	m_sidePanel = new wxPanel( m_splitterPlot, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	m_sideSizer = new wxBoxSizer( wxVERTICAL );
 	
@@ -227,10 +220,10 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_sidePanel->Layout();
 	m_sideSizer->Fit( m_sidePanel );
 	m_splitterPlot->SplitVertically( m_panel2, m_sidePanel, 0 );
-	bSizer1->Add( m_splitterPlot, 1, wxEXPAND, 5 );
+	m_sizer1->Add( m_splitterPlot, 1, wxEXPAND, 5 );
 	
 	
-	this->SetSizer( bSizer1 );
+	this->SetSizer( m_sizer1 );
 	this->Layout();
 	
 	this->Centre( wxBOTH );
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index 0a08ebd1b8..eb664e9611 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -415,9 +415,9 @@
             </object>
             <object class="wxBoxSizer" expanded="1">
                 <property name="minimum_size"></property>
-                <property name="name">bSizer1</property>
+                <property name="name">m_sizer1</property>
                 <property name="orient">wxVERTICAL</property>
-                <property name="permission">none</property>
+                <property name="permission">protected</property>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
                     <property name="flag">wxEXPAND</property>
@@ -668,14 +668,14 @@
                                 <event name="OnUpdateUI"></event>
                                 <object class="wxBoxSizer" expanded="1">
                                     <property name="minimum_size"></property>
-                                    <property name="name">bSizer11</property>
+                                    <property name="name">m_sizer11</property>
                                     <property name="orient">wxVERTICAL</property>
-                                    <property name="permission">none</property>
+                                    <property name="permission">protected</property>
                                     <object class="sizeritem" expanded="1">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxSplitterWindow" expanded="0">
+                                        <object class="wxSplitterWindow" expanded="1">
                                             <property name="BottomDockable">1</property>
                                             <property name="LeftDockable">1</property>
                                             <property name="RightDockable">1</property>
@@ -759,8 +759,8 @@
                                             <event name="OnSplitterSashPosChanging"></event>
                                             <event name="OnSplitterUnsplit"></event>
                                             <event name="OnUpdateUI"></event>
-                                            <object class="splitteritem" expanded="0">
-                                                <object class="wxPanel" expanded="0">
+                                            <object class="splitteritem" expanded="1">
+                                                <object class="wxPanel" expanded="1">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -795,7 +795,7 @@
                                                     <property name="minimize_button">0</property>
                                                     <property name="minimum_size"></property>
                                                     <property name="moveable">1</property>
-                                                    <property name="name">m_panel4</property>
+                                                    <property name="name">m_plotPanel</property>
                                                     <property name="pane_border">1</property>
                                                     <property name="pane_position"></property>
                                                     <property name="pane_size"></property>
@@ -834,11 +834,11 @@
                                                     <event name="OnSetFocus"></event>
                                                     <event name="OnSize"></event>
                                                     <event name="OnUpdateUI"></event>
-                                                    <object class="wxBoxSizer" expanded="0">
+                                                    <object class="wxBoxSizer" expanded="1">
                                                         <property name="minimum_size"></property>
-                                                        <property name="name">bSizer5</property>
+                                                        <property name="name">m_sizer5</property>
                                                         <property name="orient">wxHORIZONTAL</property>
-                                                        <property name="permission">none</property>
+                                                        <property name="permission">protected</property>
                                                         <object class="sizeritem" expanded="0">
                                                             <property name="border">5</property>
                                                             <property name="flag">wxEXPAND | wxALL</property>
@@ -870,7 +870,7 @@
                                                                 <property name="floatable">1</property>
                                                                 <property name="font"></property>
                                                                 <property name="gripper">0</property>
-                                                                <property name="hidden">1</property>
+                                                                <property name="hidden">0</property>
                                                                 <property name="id">wxID_ANY</property>
                                                                 <property name="max_size"></property>
                                                                 <property name="maximize_button">0</property>
@@ -921,223 +921,223 @@
                                                                 <event name="OnSetFocus"></event>
                                                                 <event name="OnSize"></event>
                                                                 <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
-                                                            <property name="proportion">1</property>
-                                                            <object class="wxPanel" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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">m_welcomePanel</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                                <object class="wxBoxSizer" expanded="0">
-                                                                    <property name="minimum_size"></property>
-                                                                    <property name="name">bSizer8</property>
-                                                                    <property name="orient">wxVERTICAL</property>
-                                                                    <property name="permission">none</property>
-                                                                    <object class="sizeritem" expanded="0">
-                                                                        <property name="border">5</property>
-                                                                        <property name="flag">wxEXPAND</property>
-                                                                        <property name="proportion">1</property>
-                                                                        <object class="spacer" expanded="0">
-                                                                            <property name="height">0</property>
-                                                                            <property name="permission">protected</property>
-                                                                            <property name="width">0</property>
-                                                                        </object>
-                                                                    </object>
-                                                                    <object class="sizeritem" expanded="0">
-                                                                        <property name="border">5</property>
-                                                                        <property name="flag">wxEXPAND</property>
-                                                                        <property name="proportion">0</property>
+                                                                <object class="notebookpage" expanded="1">
+                                                                    <property name="bitmap"></property>
+                                                                    <property name="label">a page</property>
+                                                                    <property name="select">0</property>
+                                                                    <object class="wxPanel" 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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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">m_welcomePanel</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
                                                                         <object class="wxBoxSizer" expanded="0">
                                                                             <property name="minimum_size"></property>
-                                                                            <property name="name">bSizer81</property>
-                                                                            <property name="orient">wxHORIZONTAL</property>
-                                                                            <property name="permission">none</property>
-                                                                            <object class="sizeritem" expanded="0">
-                                                                                <property name="border">5</property>
-                                                                                <property name="flag">wxEXPAND</property>
-                                                                                <property name="proportion">1</property>
-                                                                                <object class="spacer" expanded="0">
-                                                                                    <property name="height">0</property>
-                                                                                    <property name="permission">protected</property>
-                                                                                    <property name="width">0</property>
-                                                                                </object>
-                                                                            </object>
-                                                                            <object class="sizeritem" expanded="0">
-                                                                                <property name="border">5</property>
-                                                                                <property name="flag">wxALIGN_RIGHT|wxALL|wxEXPAND</property>
-                                                                                <property name="proportion">0</property>
-                                                                                <object class="wxStaticText" expanded="0">
-                                                                                    <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_name"></property>
-                                                                                    <property name="aui_position"></property>
-                                                                                    <property name="aui_row"></property>
-                                                                                    <property name="best_size"></property>
-                                                                                    <property name="bg"></property>
-                                                                                    <property name="caption"></property>
-                                                                                    <property name="caption_visible">1</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="fg">wxSYS_COLOUR_GRAYTEXT</property>
-                                                                                    <property name="floatable">1</property>
-                                                                                    <property name="font">,90,92,-1,70,0</property>
-                                                                                    <property name="gripper">0</property>
-                                                                                    <property name="hidden">0</property>
-                                                                                    <property name="id">wxID_ANY</property>
-                                                                                    <property name="label">Start the simulation by clicking the Run Simulation button</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">m_staticText2</property>
-                                                                                    <property name="pane_border">1</property>
-                                                                                    <property name="pane_position"></property>
-                                                                                    <property name="pane_size"></property>
-                                                                                    <property name="permission">protected</property>
-                                                                                    <property name="pin_button">1</property>
-                                                                                    <property name="pos"></property>
-                                                                                    <property name="resize">Resizable</property>
-                                                                                    <property name="show">1</property>
-                                                                                    <property name="size"></property>
-                                                                                    <property name="style"></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"></property>
-                                                                                    <property name="wrap">-1</property>
-                                                                                    <event name="OnChar"></event>
-                                                                                    <event name="OnEnterWindow"></event>
-                                                                                    <event name="OnEraseBackground"></event>
-                                                                                    <event name="OnKeyDown"></event>
-                                                                                    <event name="OnKeyUp"></event>
-                                                                                    <event name="OnKillFocus"></event>
-                                                                                    <event name="OnLeaveWindow"></event>
-                                                                                    <event name="OnLeftDClick"></event>
-                                                                                    <event name="OnLeftDown"></event>
-                                                                                    <event name="OnLeftUp"></event>
-                                                                                    <event name="OnMiddleDClick"></event>
-                                                                                    <event name="OnMiddleDown"></event>
-                                                                                    <event name="OnMiddleUp"></event>
-                                                                                    <event name="OnMotion"></event>
-                                                                                    <event name="OnMouseEvents"></event>
-                                                                                    <event name="OnMouseWheel"></event>
-                                                                                    <event name="OnPaint"></event>
-                                                                                    <event name="OnRightDClick"></event>
-                                                                                    <event name="OnRightDown"></event>
-                                                                                    <event name="OnRightUp"></event>
-                                                                                    <event name="OnSetFocus"></event>
-                                                                                    <event name="OnSize"></event>
-                                                                                    <event name="OnUpdateUI"></event>
-                                                                                </object>
-                                                                            </object>
-                                                                            <object class="sizeritem" expanded="0">
-                                                                                <property name="border">5</property>
-                                                                                <property name="flag">wxEXPAND</property>
-                                                                                <property name="proportion">1</property>
-                                                                                <object class="spacer" expanded="0">
-                                                                                    <property name="height">0</property>
-                                                                                    <property name="permission">protected</property>
-                                                                                    <property name="width">0</property>
-                                                                                </object>
-                                                                            </object>
-                                                                        </object>
-                                                                    </object>
-                                                                    <object class="sizeritem" expanded="0">
-                                                                        <property name="border">5</property>
-                                                                        <property name="flag">wxEXPAND</property>
-                                                                        <property name="proportion">1</property>
-                                                                        <object class="spacer" expanded="0">
-                                                                            <property name="height">0</property>
+                                                                            <property name="name">m_sizer8</property>
+                                                                            <property name="orient">wxVERTICAL</property>
                                                                             <property name="permission">protected</property>
-                                                                            <property name="width">0</property>
+                                                                            <object class="sizeritem" expanded="0">
+                                                                                <property name="border">5</property>
+                                                                                <property name="flag">wxEXPAND</property>
+                                                                                <property name="proportion">1</property>
+                                                                                <object class="spacer" expanded="0">
+                                                                                    <property name="height">0</property>
+                                                                                    <property name="permission">protected</property>
+                                                                                    <property name="width">0</property>
+                                                                                </object>
+                                                                            </object>
+                                                                            <object class="sizeritem" expanded="0">
+                                                                                <property name="border">5</property>
+                                                                                <property name="flag">wxEXPAND</property>
+                                                                                <property name="proportion">0</property>
+                                                                                <object class="wxBoxSizer" expanded="0">
+                                                                                    <property name="minimum_size"></property>
+                                                                                    <property name="name">bSizer81</property>
+                                                                                    <property name="orient">wxHORIZONTAL</property>
+                                                                                    <property name="permission">none</property>
+                                                                                    <object class="sizeritem" expanded="0">
+                                                                                        <property name="border">5</property>
+                                                                                        <property name="flag">wxEXPAND</property>
+                                                                                        <property name="proportion">1</property>
+                                                                                        <object class="spacer" expanded="0">
+                                                                                            <property name="height">0</property>
+                                                                                            <property name="permission">protected</property>
+                                                                                            <property name="width">0</property>
+                                                                                        </object>
+                                                                                    </object>
+                                                                                    <object class="sizeritem" expanded="0">
+                                                                                        <property name="border">5</property>
+                                                                                        <property name="flag">wxALIGN_RIGHT|wxALL|wxEXPAND</property>
+                                                                                        <property name="proportion">0</property>
+                                                                                        <object class="wxStaticText" expanded="0">
+                                                                                            <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_name"></property>
+                                                                                            <property name="aui_position"></property>
+                                                                                            <property name="aui_row"></property>
+                                                                                            <property name="best_size"></property>
+                                                                                            <property name="bg"></property>
+                                                                                            <property name="caption"></property>
+                                                                                            <property name="caption_visible">1</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="fg">wxSYS_COLOUR_GRAYTEXT</property>
+                                                                                            <property name="floatable">1</property>
+                                                                                            <property name="font">,90,92,-1,70,0</property>
+                                                                                            <property name="gripper">0</property>
+                                                                                            <property name="hidden">0</property>
+                                                                                            <property name="id">wxID_ANY</property>
+                                                                                            <property name="label">Start the simulation by clicking the Run Simulation button</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">m_staticText2</property>
+                                                                                            <property name="pane_border">1</property>
+                                                                                            <property name="pane_position"></property>
+                                                                                            <property name="pane_size"></property>
+                                                                                            <property name="permission">protected</property>
+                                                                                            <property name="pin_button">1</property>
+                                                                                            <property name="pos"></property>
+                                                                                            <property name="resize">Resizable</property>
+                                                                                            <property name="show">1</property>
+                                                                                            <property name="size"></property>
+                                                                                            <property name="style"></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"></property>
+                                                                                            <property name="wrap">-1</property>
+                                                                                            <event name="OnChar"></event>
+                                                                                            <event name="OnEnterWindow"></event>
+                                                                                            <event name="OnEraseBackground"></event>
+                                                                                            <event name="OnKeyDown"></event>
+                                                                                            <event name="OnKeyUp"></event>
+                                                                                            <event name="OnKillFocus"></event>
+                                                                                            <event name="OnLeaveWindow"></event>
+                                                                                            <event name="OnLeftDClick"></event>
+                                                                                            <event name="OnLeftDown"></event>
+                                                                                            <event name="OnLeftUp"></event>
+                                                                                            <event name="OnMiddleDClick"></event>
+                                                                                            <event name="OnMiddleDown"></event>
+                                                                                            <event name="OnMiddleUp"></event>
+                                                                                            <event name="OnMotion"></event>
+                                                                                            <event name="OnMouseEvents"></event>
+                                                                                            <event name="OnMouseWheel"></event>
+                                                                                            <event name="OnPaint"></event>
+                                                                                            <event name="OnRightDClick"></event>
+                                                                                            <event name="OnRightDown"></event>
+                                                                                            <event name="OnRightUp"></event>
+                                                                                            <event name="OnSetFocus"></event>
+                                                                                            <event name="OnSize"></event>
+                                                                                            <event name="OnUpdateUI"></event>
+                                                                                        </object>
+                                                                                    </object>
+                                                                                    <object class="sizeritem" expanded="0">
+                                                                                        <property name="border">5</property>
+                                                                                        <property name="flag">wxEXPAND</property>
+                                                                                        <property name="proportion">1</property>
+                                                                                        <object class="spacer" expanded="0">
+                                                                                            <property name="height">0</property>
+                                                                                            <property name="permission">protected</property>
+                                                                                            <property name="width">0</property>
+                                                                                        </object>
+                                                                                    </object>
+                                                                                </object>
+                                                                            </object>
+                                                                            <object class="sizeritem" expanded="0">
+                                                                                <property name="border">5</property>
+                                                                                <property name="flag">wxEXPAND</property>
+                                                                                <property name="proportion">1</property>
+                                                                                <object class="spacer" expanded="0">
+                                                                                    <property name="height">0</property>
+                                                                                    <property name="permission">protected</property>
+                                                                                    <property name="width">0</property>
+                                                                                </object>
+                                                                            </object>
                                                                         </object>
                                                                     </object>
                                                                 </object>
@@ -1223,9 +1223,9 @@
                                                     <event name="OnUpdateUI"></event>
                                                     <object class="wxBoxSizer" expanded="0">
                                                         <property name="minimum_size"></property>
-                                                        <property name="name">bSizer13</property>
+                                                        <property name="name">m_sizer13</property>
                                                         <property name="orient">wxVERTICAL</property>
-                                                        <property name="permission">none</property>
+                                                        <property name="permission">protected</property>
                                                         <object class="sizeritem" expanded="0">
                                                             <property name="border">5</property>
                                                             <property name="flag">wxALL|wxEXPAND</property>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index 5a6da6d9e1..ea08cb2345 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -24,10 +24,10 @@ class KIWAY_PLAYER;
 #include <wx/colour.h>
 #include <wx/settings.h>
 #include <wx/toolbar.h>
-#include <wx/notebook.h>
 #include <wx/stattext.h>
 #include <wx/sizer.h>
 #include <wx/panel.h>
+#include <wx/notebook.h>
 #include <wx/textctrl.h>
 #include <wx/splitter.h>
 #include <wx/listbox.h>
@@ -50,15 +50,20 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxMenu* m_fileMenu;
 		wxMenu* m_simulationMenu;
 		wxMenu* m_viewMenu;
+		wxBoxSizer* m_sizer1;
 		wxToolBar* m_toolBar;
 		wxSplitterWindow* m_splitterPlot;
 		wxPanel* m_panel2;
+		wxBoxSizer* m_sizer11;
 		wxSplitterWindow* m_splitterConsole;
 		wxPanel* m_plotPanel;
+		wxBoxSizer* m_sizer5;
 		wxNotebook* m_plotNotebook;
 		wxPanel* m_welcomePanel;
+		wxBoxSizer* m_sizer8;
 		wxStaticText* m_staticText2;
 		wxPanel* m_panel5;
+		wxBoxSizer* m_sizer13;
 		wxTextCtrl* m_simConsole;
 		wxPanel* m_sidePanel;
 		wxBoxSizer* m_sideSizer;

From f4033f776fa96c91d389074c0908a50119e75bd5 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:02 +0200
Subject: [PATCH 141/197] mathplot: fix freeze in scale ticks calculation

---
 common/widgets/mathplot.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index 946e1a4494..9d9d311832 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -1005,7 +1005,10 @@ void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
     double zeroOffset = 100000000.0;
     //printf("maxVVis %.3f\n", maxVvis);
 
-    while ( v < maxVvis )
+    const int iterLimit = 1000;
+    int i = 0;
+
+    while ( v < maxVvis && i < iterLimit)
     {
         m_tickValues.push_back(v);
 
@@ -1016,6 +1019,12 @@ void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
         v+=bestStep;
     }
 
+    // something weird happened...
+    if ( i == iterLimit )
+    {
+        m_tickValues.clear();
+    }
+
     if ( zeroOffset <= bestStep )
     {
         for( double& t: m_tickValues )
@@ -3625,4 +3634,3 @@ double mpFXY::y2s(double y) const
 {
     return m_scaleY->TransformToPlot( y );
 }
-

From bc433764fea143b046e9621a7869c5fd2d32c11f Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:02 +0200
Subject: [PATCH 142/197] Fixed layout proportions

---
 eeschema/sim/sim_plot_frame_base.cpp |  8 +++-----
 eeschema/sim/sim_plot_frame_base.fbp | 29 +++++++++++++++-------------
 eeschema/sim/sim_plot_frame_base.h   |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index d6d3e6fb11..531e93fa9a 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -123,8 +123,6 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_sizer5 = new wxBoxSizer( wxHORIZONTAL );
 	
 	m_plotNotebook = new wxNotebook( m_plotPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_plotNotebook->SetMinSize( wxSize( 400,-1 ) );
-	
 	m_welcomePanel = new wxPanel( m_plotNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	m_sizer8 = new wxBoxSizer( wxVERTICAL );
 	
@@ -139,7 +137,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	
 	m_staticText2 = new wxStaticText( m_welcomePanel, wxID_ANY, _("Start the simulation by clicking the Run Simulation button"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText2->Wrap( -1 );
-	m_staticText2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+	m_staticText2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 	m_staticText2->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 	
 	bSizer81->Add( m_staticText2, 0, wxALIGN_RIGHT|wxALL|wxEXPAND, 5 );
@@ -169,7 +167,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_sizer13 = new wxBoxSizer( wxVERTICAL );
 	
 	m_simConsole = new wxTextCtrl( m_panel5, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
-	m_simConsole->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 76, 90, 90, false, wxEmptyString ) );
+	m_simConsole->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 	
 	m_sizer13->Add( m_simConsole, 1, wxALL|wxEXPAND, 5 );
 	
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index eb664e9611..714cd890e4 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -834,7 +834,7 @@
                                                     <event name="OnSetFocus"></event>
                                                     <event name="OnSize"></event>
                                                     <event name="OnUpdateUI"></event>
-                                                    <object class="wxBoxSizer" expanded="1">
+                                                    <object class="wxBoxSizer" expanded="0">
                                                         <property name="minimum_size"></property>
                                                         <property name="name">m_sizer5</property>
                                                         <property name="orient">wxHORIZONTAL</property>
@@ -877,7 +877,7 @@
                                                                 <property name="maximum_size"></property>
                                                                 <property name="min_size"></property>
                                                                 <property name="minimize_button">0</property>
-                                                                <property name="minimum_size">400,-1</property>
+                                                                <property name="minimum_size">-1,-1</property>
                                                                 <property name="moveable">1</property>
                                                                 <property name="name">m_plotNotebook</property>
                                                                 <property name="pane_border">1</property>
@@ -921,11 +921,11 @@
                                                                 <event name="OnSetFocus"></event>
                                                                 <event name="OnSize"></event>
                                                                 <event name="OnUpdateUI"></event>
-                                                                <object class="notebookpage" expanded="1">
+                                                                <object class="notebookpage" expanded="0">
                                                                     <property name="bitmap"></property>
                                                                     <property name="label">a page</property>
                                                                     <property name="select">0</property>
-                                                                    <object class="wxPanel" expanded="1">
+                                                                    <object class="wxPanel" expanded="0">
                                                                         <property name="BottomDockable">1</property>
                                                                         <property name="LeftDockable">1</property>
                                                                         <property name="RightDockable">1</property>
@@ -1146,8 +1146,8 @@
                                                     </object>
                                                 </object>
                                             </object>
-                                            <object class="splitteritem" expanded="0">
-                                                <object class="wxPanel" expanded="0">
+                                            <object class="splitteritem" expanded="1">
+                                                <object class="wxPanel" expanded="1">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -1221,7 +1221,7 @@
                                                     <event name="OnSetFocus"></event>
                                                     <event name="OnSize"></event>
                                                     <event name="OnUpdateUI"></event>
-                                                    <object class="wxBoxSizer" expanded="0">
+                                                    <object class="wxBoxSizer" expanded="1">
                                                         <property name="minimum_size"></property>
                                                         <property name="name">m_sizer13</property>
                                                         <property name="orient">wxVERTICAL</property>
@@ -1405,16 +1405,17 @@
                                     <property name="name">m_sideSizer</property>
                                     <property name="orient">wxVERTICAL</property>
                                     <property name="permission">protected</property>
-                                    <object class="sizeritem" expanded="0">
+                                    <object class="sizeritem" expanded="1">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxStaticBoxSizer" expanded="0">
+                                        <object class="wxStaticBoxSizer" expanded="1">
                                             <property name="id">wxID_ANY</property>
                                             <property name="label">Signals</property>
                                             <property name="minimum_size"></property>
                                             <property name="name">sbSizer1</property>
                                             <property name="orient">wxVERTICAL</property>
+                                            <property name="parent">1</property>
                                             <property name="permission">none</property>
                                             <event name="OnUpdateUI"></event>
                                             <object class="sizeritem" expanded="0">
@@ -1507,16 +1508,17 @@
                                             </object>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="0">
+                                    <object class="sizeritem" expanded="1">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxStaticBoxSizer" expanded="0">
+                                        <object class="wxStaticBoxSizer" expanded="1">
                                             <property name="id">wxID_ANY</property>
                                             <property name="label">Cursors</property>
                                             <property name="minimum_size"></property>
                                             <property name="name">sbSizer3</property>
                                             <property name="orient">wxVERTICAL</property>
+                                            <property name="parent">1</property>
                                             <property name="permission">none</property>
                                             <event name="OnUpdateUI"></event>
                                             <object class="sizeritem" expanded="0">
@@ -1626,16 +1628,17 @@
                                             </object>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxStaticBoxSizer" expanded="1">
+                                        <object class="wxStaticBoxSizer" expanded="0">
                                             <property name="id">wxID_ANY</property>
                                             <property name="label">Tune</property>
                                             <property name="minimum_size"></property>
                                             <property name="name">sbSizer4</property>
                                             <property name="orient">wxVERTICAL</property>
+                                            <property name="parent">1</property>
                                             <property name="permission">protected</property>
                                             <event name="OnUpdateUI"></event>
                                             <object class="sizeritem" expanded="0">
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index ea08cb2345..6343e3413d 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!

From ba3ce9b56638fd9dee8640e43f68fab3a17dde58 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:03 +0200
Subject: [PATCH 143/197] Fixed tuner autoplacement

---
 eeschema/sim/sim_plot_frame.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index b109c9e78c..3821ca989a 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -247,16 +247,9 @@ void SIM_PLOT_FRAME::AddTuner( SCH_COMPONENT* aComponent )
     try
     {
         TUNER_SLIDER* tuner = new TUNER_SLIDER( this, m_sidePanel, aComponent );
-        m_tuneSizer->Add( tuner , 0, wxALL, 5 );
+        m_tuneSizer->Add( tuner );
         tunerList.push_back( tuner );
-        //m_sidePanel->Layout();
-        //m_sideSizer->Fit( m_sidePanel );
-        //m_splitterPlot->Layout();
-        Layout();
-        Layout();
-        Layout();
-        Layout();
-        Layout();
+        m_sidePanel->Layout();
     }
     catch( ... )
     {

From 9d8b40b93df0547414f0b61b06dcd77ca7ffc95b Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:03 +0200
Subject: [PATCH 144/197] Reset scales when a plot is removed

---
 common/widgets/mathplot.cpp     | 10 ++++++----
 eeschema/sim/sim_plot_panel.cpp | 13 +++++++++++++
 include/widgets/mathplot.h      |  6 ++++++
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index 9d9d311832..df4d828f9a 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -3600,15 +3600,17 @@ void mpFXY::SetScale ( mpScaleBase *scaleX, mpScaleBase *scaleY )
     m_scaleY = scaleY;
 
     //printf("SetScales : %p %p\n", scaleX, scaleY);
+    UpdateScales();
+}
 
+
+void mpFXY::UpdateScales()
+{
     if(m_scaleX)
-    {
         m_scaleX->ExtendDataRange(GetMinX(), GetMaxX());
-    }
+
     if(m_scaleY)
-    {
         m_scaleY->ExtendDataRange(GetMinY(), GetMaxY());
-    }
 }
 
 
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 97c130ad18..ba5ee67016 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -453,6 +453,19 @@ bool SIM_PLOT_PANEL::DeleteTrace( const wxString& aName )
 
         DelLayer( trace, true, true );
 
+        // Reset scales
+        if( m_axis_x )
+            m_axis_x->ResetDataRange();
+
+        if( m_axis_y1 )
+            m_axis_y1->ResetDataRange();
+
+        if( m_axis_y2 )
+            m_axis_y2->ResetDataRange();
+
+        for( auto t : m_traces )
+            t.second->UpdateScales();
+
         return true;
     }
 
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index 6b86083825..668e756fdc 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -612,6 +612,8 @@ class WXDLLIMPEXP_MATHPLOT mpFXY : public mpLayer
 
         virtual void SetScale(mpScaleBase *scaleX, mpScaleBase *scaleY);
 
+        void UpdateScales();
+
         double s2x(double plotCoordX) const;
         double s2y(double plotCoordY) const;
 
@@ -740,6 +742,10 @@ public:
         }
     }
 
+    void ResetDataRange()
+    {
+        m_rangeSet = 0;
+    }
 
     double AbsMaxValue() const
     {

From 7d268d2608e46dc9cb7c166ecb752299aac397c3 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:04 +0200
Subject: [PATCH 145/197] Reset scales upon simulation relaunch

---
 eeschema/sim/sim_plot_frame.cpp |  1 +
 eeschema/sim/sim_plot_panel.cpp | 30 +++++++++++++++++-------------
 eeschema/sim/sim_plot_panel.h   |  2 ++
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 3821ca989a..564bcde9a3 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -759,6 +759,7 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
             updatePlot( trace.second, plotPanel );
 
         plotPanel->UpdateAll();
+        plotPanel->ResetScales();
     }
     else
     {
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index ba5ee67016..dffe31409b 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -452,19 +452,7 @@ bool SIM_PLOT_PANEL::DeleteTrace( const wxString& aName )
             DelLayer( cursor, true );
 
         DelLayer( trace, true, true );
-
-        // Reset scales
-        if( m_axis_x )
-            m_axis_x->ResetDataRange();
-
-        if( m_axis_y1 )
-            m_axis_y1->ResetDataRange();
-
-        if( m_axis_y2 )
-            m_axis_y2->ResetDataRange();
-
-        for( auto t : m_traces )
-            t.second->UpdateScales();
+        ResetScales();
 
         return true;
     }
@@ -517,6 +505,22 @@ void SIM_PLOT_PANEL::EnableCursor( const wxString& aName, bool aEnable )
 }
 
 
+void SIM_PLOT_PANEL::ResetScales()
+{
+    if( m_axis_x )
+        m_axis_x->ResetDataRange();
+
+    if( m_axis_y1 )
+        m_axis_y1->ResetDataRange();
+
+    if( m_axis_y2 )
+        m_axis_y2->ResetDataRange();
+
+    for( auto t : m_traces )
+        t.second->UpdateScales();
+}
+
+
 wxColour SIM_PLOT_PANEL::generateColor()
 {
     /// @todo have a look at:
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 59eaabcc69..c88589abcd 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -218,6 +218,8 @@ public:
 
     void EnableCursor( const wxString& aName, bool aEnable );
 
+    void ResetScales();
+
 private:
     wxColour generateColor();
 

From e9609fe19d1758ec304aa691073d50a24b4416d4 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:04 +0200
Subject: [PATCH 146/197] mathplot: removed some warnings, fixes to labelling
 code

---
 common/widgets/mathplot.cpp | 408 ++++++++++++++++--------------------
 include/widgets/mathplot.h  |  89 +++++---
 2 files changed, 245 insertions(+), 252 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index df4d828f9a..4d497985d6 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -215,8 +215,6 @@ mpInfoCoords::~mpInfoCoords()
 void mpInfoCoords::UpdateInfo(mpWindow& w, wxEvent& event)
 {
     if (event.GetEventType() == wxEVT_MOTION) {
-        int mouseX = ((wxMouseEvent&)event).GetX();
-        int mouseY = ((wxMouseEvent&)event).GetY();
         /* It seems that Windows port of wxWidgets don't support multi-line test to be drawn in a wxDC.
            wxGTK instead works perfectly with it.
            Info on wxForum: http://wxforum.shadonet.com/viewtopic.php?t=3451&highlight=drawtext+eol */
@@ -762,7 +760,7 @@ void mpScaleX::recalculateTicks ( wxDC & dc, mpWindow & w )
     //printf("minV %.10f maxV %.10f %.10f %.10f\n", minV, maxV, minVvis, maxVvis);
 
     m_tickValues.clear();
-    m_labeledTicks.clear();
+    m_tickLabels.clear();
 
     double minErr = 1000000000000.0;
     double bestStep;
@@ -808,18 +806,56 @@ void mpScaleX::recalculateTicks ( wxDC & dc, mpWindow & w )
     }
 
     for( double t: m_tickValues )
-        m_labeledTicks.push_back(t);
+    {
+        m_tickLabels.push_back( TickLabel ( t ) );
+    }
 
     //n0 = floor(minVvis / bestStep) * bestStep;
     //end = n0 +
 
     //n0 = floor( (w.GetPosX() ) / step ) * step ;
     //printf("zeroOffset:%.3f tickjs : %d\n", zeroOffset, m_tickValues.size());
-    computeLabelExtents( dc, w );
+    updateTickLabels( dc, w );
 }
 
-void mpScaleX::computeLabelExtents ( wxDC & dc, mpWindow & w )
+int countDecimalDigits ( double x )
 {
+    int k = (int) ( ( x - floor(x)) * 1000000000.0 );
+    int n = 0;
+
+    while(k && ((k % 10) == 0 || (k % 10) == 9))
+    {
+        k /= 10;
+    }
+
+    n = 0;
+
+    while (k != 0)
+    {
+        n++;
+        k /= 10;
+    }
+
+    return n;
+}
+
+
+int mpScaleBase::getLabelDecimalDigits(int maxDigits)
+{
+    int m = 0;
+    for( auto l: m_tickLabels )
+    {
+        m = std::max ( countDecimalDigits ( l.pos ), m );
+    }
+
+    return std::min(m, maxDigits);
+}
+
+
+void mpScaleBase::computeLabelExtents ( wxDC & dc, mpWindow & w )
+{
+
+    //printf("test: %d %d %d\n", countDecimalDigits(1.0), countDecimalDigits(1.1), countDecimalDigits(1.22231));
     m_maxLabelHeight = 0;
     m_maxLabelWidth = 0;
     for (int n = 0; n < labelCount(); n++)
@@ -833,6 +869,63 @@ void mpScaleX::computeLabelExtents ( wxDC & dc, mpWindow & w )
     }
 }
 
+void mpScaleBase::updateTickLabels( wxDC & dc, mpWindow & w )
+{
+    int sigDigits = 0;
+
+    for ( auto l : m_tickLabels )
+        sigDigits = std::max( sigDigits, countDecimalDigits( l.pos ) );
+
+    //printf("sigDigits: %d\n",sigDigits);
+
+    for ( auto &l : m_tickLabels )
+    {
+        l.label = formatLabel ( l.pos, sigDigits );
+        l.visible = true;
+    }
+
+    computeLabelExtents(dc, w);
+
+    int gap = IsHorizontal() ? m_maxLabelWidth + 10 : m_maxLabelHeight + 5;
+
+    if ( m_tickLabels.size() <= 2)
+        return;
+
+/*
+    fixme!
+
+    for ( auto &l : m_tickLabels )
+    {
+        double p = TransformToPlot ( l.pos );
+
+        if ( !IsHorizontal() )
+            l.pixelPos = (int)(( w.GetPosY() - p ) * w.GetScaleY());
+        else
+            l.pixelPos = (int)(( p - w.GetPosX()) * w.GetScaleX());
+    }
+
+
+    for (int i = 1; i  < m_tickLabels.size() - 1; i++)
+    {
+        int dist_prev;
+
+        for(int j = i-1; j >= 1; j--)
+        {
+            if( m_tickLabels[j].visible)
+            {
+                dist_prev = abs( m_tickLabels[j].pixelPos - m_tickLabels[i].pixelPos );
+                break;
+            }
+        }
+
+        if (dist_prev < gap)
+            m_tickLabels[i].visible = false;
+    }
+*/
+
+}
+
+#if 0
 int mpScaleX::tickCount() const
 {
     return m_tickValues.size();
@@ -840,7 +933,7 @@ int mpScaleX::tickCount() const
 
 int mpScaleX::labelCount() const
 {
-    return m_labeledTicks.size();
+    return 0;//return m_labeledTicks.size();
 }
 
 const wxString mpScaleX::getLabel( int n )
@@ -855,9 +948,9 @@ double mpScaleX::getTickPos( int n )
 
 double mpScaleX::getLabelPos( int n )
 {
-    return m_labeledTicks[n];
+    return 0;//return m_labeledTicks[n];
 }
-
+#endif
 void mpScaleY::getVisibleDataRange ( mpWindow& w, double &minV, double& maxV)
 {
     wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
@@ -875,24 +968,13 @@ void mpScaleY::getVisibleDataRange ( mpWindow& w, double &minV, double& maxV)
 
 void mpScaleY::computeSlaveTicks( mpWindow& w )
 {
-        double extend;
-
-        double bestErr = 100000000.0;
-
-        double alpha, beta;
-
-
-        //printf("ComputeSlaveTicks!\n");
-
-        //for(alpha = 1.0; alpha < 1.03; alpha += 0.001)
-        //    for(beta = -0.05; beta < 0.05; beta += 0.001)
-            {
-        //        for ( double t: m_masterScale->m_tickValues )
-        //        {
 
         if( m_masterScale->m_tickValues.size() == 0)
             return;
 
+            m_tickValues.clear();
+            m_tickLabels.clear();
+
 //                    printf("NTicks %d\n", m_masterScale->m_tickValues.size());
                     double p0 = m_masterScale->TransformToPlot(m_masterScale->m_tickValues[0]);
                     double p1 = m_masterScale->TransformToPlot(m_masterScale->m_tickValues[1]);
@@ -918,56 +1000,34 @@ void mpScaleY::computeSlaveTicks( mpWindow& w )
                     m_scale = 1.0 / ( m_maxV - m_minV );
                     m_scale *= dy_slave / dy_scaled;
 
-//                    printf("dy %.10f %.10f minV %.1f maxV %.1f\n", dy_slave, dy_scaled, m_minV, m_maxV);
-
-
-                    //minvv = (p0 / m_scale - m_offset);
-
                     m_offset = p0 / m_scale - minvv;
 
-                    //m_offset =
-                    //double y0_offset = floor ( (p0 / m_scale ) / dy_scaled) * dy_scaled;
-
-                    //printf("P0 %.10f minvv %.10f\n", (p0 / m_scale) - m_offset, minvv);
-
-
                     m_tickValues.clear();
-                    m_labeledTicks.clear();
 
                     double m;
 
-                    for (int i = 0; i < m_masterScale->m_tickValues.size(); i++)
+                    for (unsigned int i = 0; i < m_masterScale->m_tickValues.size(); i++)
                     {
                         m = TransformFromPlot ( m_masterScale->TransformToPlot(m_masterScale->m_tickValues[i]) );
-                    //    printf("m %.10f\n", m);
                         m_tickValues.push_back(m);
-                        m_labeledTicks.push_back(m);
-                        //m += dy_scaled;
+                        m_tickLabels.push_back( TickLabel (m) );
                     }
 
-
-                //double py = TransformToPlot
-
-                //    printf("p %.1f %.1f\n", t, y_slave);
-            //    }
-            }
 }
 
 void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
 {
 
-//    printf("this %p master %p\n", this, m_masterScale);
+    //printf("this %p master %p\n", this, m_masterScale);
 
     if ( m_masterScale )
     {
         computeSlaveTicks( w );
-        computeLabelExtents( dc, w );
+        updateTickLabels(dc, w);
+
         return;
     }
 
-    //dig  = floor( log( 128.0 / w.GetScaleY() ) / mpLN10 );
-    //step = exp( mpLN10 * dig);
-    //end  = w.GetPosX() + (double)extend / w.GetScaleY();
     double minV, maxV, minVvis, maxVvis;
     GetDataRange ( minV, maxV );
     getVisibleDataRange ( w, minVvis, maxVvis );
@@ -976,7 +1036,7 @@ void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
     m_absVisibleMaxV = std::max(std::abs(minVvis), std::abs(maxVvis));
 
     m_tickValues.clear();
-    m_labeledTicks.clear();
+    m_tickLabels.clear();
 
 
     double minErr = 1000000000000.0;
@@ -1003,7 +1063,7 @@ void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
     double v = floor(minVvis / bestStep) * bestStep;
 
     double zeroOffset = 100000000.0;
-    //printf("maxVVis %.3f\n", maxVvis);
+    //printf("v %.3f maxVVis %.3f\n", v, maxVvis);
 
     const int iterLimit = 1000;
     int i = 0;
@@ -1015,10 +1075,12 @@ void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
         if (fabs(v) < zeroOffset)
             zeroOffset = fabs(v);
 
-        //printf("tick %.3f\n", v);
+        //printf("tick %.3f %d\n", v, m_tickValues.size());
         v+=bestStep;
+        i++;
     }
 
+
     // something weird happened...
     if ( i == iterLimit )
     {
@@ -1032,63 +1094,21 @@ void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
     }
 
     for( double t: m_tickValues )
-        m_labeledTicks.push_back(t);
+        m_tickLabels.push_back( TickLabel( t ) );
+
 
     //n0 = floor(minVvis / bestStep) * bestStep;
     //end = n0 +
 
     //n0 = floor( (w.GetPosX() ) / step ) * step ;
     //printf("zeroOffset:%.3f tickjs : %d\n", zeroOffset, m_tickValues.size());
-    computeLabelExtents( dc, w );
+    updateTickLabels( dc, w );
 
     //labelStep = ceil(((double) m_maxLabelWidth + mpMIN_X_AXIS_LABEL_SEPARATION)/(w.GetScaleX()*step))*step;
 }
 
 
 
-void mpScaleY::computeLabelExtents ( wxDC & dc, mpWindow & w )
-{
-    m_maxLabelHeight = 0;
-    m_maxLabelWidth = 0;
-    for (int n = 0; n < labelCount(); n++)
-    {
-        int tx, ty;
-
-        //printf("***********GetLabel %d\n", n);
-
-        const wxString s = getLabel( n );
-
-        dc.GetTextExtent(s, &tx, &ty);
-        m_maxLabelHeight = std::max( ty, m_maxLabelHeight );
-        m_maxLabelWidth = std::max( tx, m_maxLabelWidth );
-    }
-}
-
-int mpScaleY::tickCount() const
-{
-    return m_tickValues.size();
-}
-
-int mpScaleY::labelCount() const
-{
-    return m_labeledTicks.size();
-}
-
-const wxString mpScaleY::getLabel( int n )
-{
-        return wxT("L");
-}
-
-double mpScaleY::getTickPos( int n )
-{
-        return m_tickValues[n];
-}
-
-double mpScaleY::getLabelPos( int n )
-{
-    return m_labeledTicks[n];
-}
-
 
 void mpScaleXBase::getVisibleDataRange ( mpWindow& w, double &minV, double& maxV)
 {
@@ -1110,9 +1130,10 @@ void mpScaleXLog::recalculateTicks ( wxDC & dc, mpWindow & w )
     GetDataRange ( minV, maxV );
     getVisibleDataRange ( w, minVvis, maxVvis );
 
-    double decades = log( maxV / minV ) / log(10);
+    //double decades = log( maxV / minV ) / log(10);
     double minDecade = pow(10, floor(log10(minV)));
     double maxDecade = pow(10, ceil(log10(maxV)));
+    //printf("test: %d %d %d\n", countDecimalDigits(1.0), countDecimalDigits(1.1), countDecimalDigits(1.22231));
 
 
     double visibleDecades =  log( maxVvis / minVvis ) / log(10);
@@ -1120,7 +1141,7 @@ void mpScaleXLog::recalculateTicks ( wxDC & dc, mpWindow & w )
     double d;
 
     m_tickValues.clear();
-    m_labeledTicks.clear();
+    m_tickLabels.clear();
 
     if ( minDecade == 0.0 )
         return;
@@ -1129,68 +1150,21 @@ void mpScaleXLog::recalculateTicks ( wxDC & dc, mpWindow & w )
     for ( d= minDecade; d<=maxDecade; d *= 10.0)
     {
         //printf("d %.1f\n",d );
-        m_labeledTicks.push_back( d );
+        m_tickLabels.push_back( TickLabel(d ) );
 
         for(double dd = d; dd < d * 10; dd += d)
         {
             if(visibleDecades < 2)
-                m_labeledTicks.push_back(dd);
-            //printf("dd %.1f\n",dd);
+                m_tickLabels.push_back(TickLabel(dd));
+
             m_tickValues.push_back(dd);
         }
     }
 
-    computeLabelExtents( dc, w );
-
-    //printf("labeled ticks : %d\n", m_labeledTicks.size());
-
-    labelStep = ceil(((double) m_maxLabelWidth + mpMIN_X_AXIS_LABEL_SEPARATION)/(w.GetScaleX()*step))*step;
+    updateTickLabels( dc, w );
 }
 
 
-void mpScaleXLog::computeLabelExtents ( wxDC & dc, mpWindow & w )
-{
-    m_maxLabelHeight = 0;
-    m_maxLabelWidth = 0;
-    for (int n = 0; n < labelCount(); n++)
-    {
-        int tx, ty;
-        const wxString s = getLabel( n );
-
-        dc.GetTextExtent(s, &tx, &ty);
-        m_maxLabelHeight = std::max( ty, m_maxLabelHeight );
-        m_maxLabelWidth = std::max( tx, m_maxLabelWidth );
-    }
-}
-
-
-int mpScaleXLog::tickCount() const
-{
-    return m_tickValues.size();
-}
-
-int mpScaleXLog::labelCount() const
-{
-    return m_labeledTicks.size();
-    //    return (int) floor( ( end - n0 ) / labelStep );
-}
-
-
-const wxString mpScaleXLog::getLabel( int n )
-{
-    return wxT("L");
-}
-
-double mpScaleXLog::getTickPos( int n )
-{
-    return m_tickValues[n]; //n0 + (double) n * step;
-}
-
-double mpScaleXLog::getLabelPos( int n )
-{
-    return m_labeledTicks[n];
-}
-
 
 IMPLEMENT_ABSTRACT_CLASS(mpScaleXBase, mpLayer)
 IMPLEMENT_DYNAMIC_CLASS(mpScaleX, mpScaleXBase)
@@ -1262,7 +1236,7 @@ void mpScaleXBase::Plot(wxDC & dc, mpWindow & w)
 
         //printf("StartPx %d endPx %d ordy %d maxy %d\n", startPx, endPx, orgy, maxYpx);
 
-        int tmp=-65535;
+        //int tmp=-65535;
         int labelH = m_maxLabelHeight; // Control labels heigth to decide where to put axis name (below labels or on top of axis)
         //int maxExtent = tc.MaxLabelWidth();
         //printf("Ticks : %d\n",labelCount());
@@ -1323,6 +1297,9 @@ void mpScaleXBase::Plot(wxDC & dc, mpWindow & w)
         {
             double tp = getLabelPos(n);
 
+            if ( !m_tickLabels[n].visible )
+                continue;
+
             //double xlogmin = log10 ( m_minV );
             //double xlogmax = log10 ( m_maxV );
 
@@ -1336,7 +1313,7 @@ void mpScaleXBase::Plot(wxDC & dc, mpWindow & w)
 #endif
             if ((p >= startPx) && (p <= endPx)) {
                 // Write ticks labels in s string
-                wxString s = getLabel ( n );
+                wxString s = m_tickLabels[n].label;
 
                 dc.GetTextExtent(s, &tx, &ty);
                 if ((m_flags == mpALIGN_BORDER_BOTTOM) || (m_flags == mpALIGN_TOP)) {
@@ -1349,16 +1326,15 @@ void mpScaleXBase::Plot(wxDC & dc, mpWindow & w)
 
         // Draw axis name
         dc.GetTextExtent(m_name, &tx, &ty);
-        switch (m_flags) {
+        switch (m_nameFlags) {
             case mpALIGN_BORDER_BOTTOM:
                 dc.DrawText( m_name, extend - tx - 4, orgy - 8 - ty - labelH);
                 break;
             case mpALIGN_BOTTOM: {
-                                     if ((!m_drawOutsideMargins) && (w.GetMarginBottom() > (ty + labelH + 8))) {
-                                         dc.DrawText( m_name, (endPx - startPx - tx)>>1, orgy + 6 + labelH);
-                                     } else {
-                                         dc.DrawText( m_name, extend - tx - 4, orgy - 4 - ty);
-                                     }
+
+
+                                         dc.DrawText( m_name, (endPx + startPx) / 2 - tx / 2, orgy + 6 + labelH);
+
                                  } break;
             case mpALIGN_CENTER:
                                  dc.DrawText( m_name, extend - tx - 4, orgy - 4 - ty);
@@ -1377,14 +1353,7 @@ void mpScaleXBase::Plot(wxDC & dc, mpWindow & w)
                               break;
         }
     }
-    /*    if (m_flags != mpALIGN_TOP) {
 
-          if ((m_flags == mpALIGN_BORDER_BOTTOM) || (m_flags == mpALIGN_TOP)) {
-          dc.DrawText( m_name, extend - tx - 4, orgy - 4 - (ty*2));
-          } else {
-          dc.DrawText( m_name, extend - tx - 4, orgy - 4 - ty); //orgy + 4 + ty);
-          }
-          }; */
 }
 
 
@@ -1401,6 +1370,7 @@ mpScaleY::mpScaleY(wxString name, int flags, bool ticks)
     m_ticks = ticks;
     m_type = mpLAYER_AXIS;
     m_masterScale = NULL;
+    m_nameFlags = mpALIGN_BORDER_LEFT;
     //m_labelFormat = wxT("");
 }
 
@@ -1416,7 +1386,7 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
         dc.SetFont( m_font);
 
         int orgx=0;
-        const int extend = w.GetScrY(); // /2;
+        //const int extend = w.GetScrY(); // /2;
         if (m_flags == mpALIGN_CENTER)
             orgx   = w.x2p(0); //(int)(w.GetPosX() * w.GetScaleX());
         if (m_flags == mpALIGN_LEFT) {
@@ -1449,38 +1419,14 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
            dc.DrawLine( orgx, w.GetMarginTop(), orgx, w.GetScrY() - w.GetMarginBottom()); */
 
         const double dig  = floor( log( 128.0 / w.GetScaleY() ) / mpLN10 );
-        const double step = exp( mpLN10 * dig);
-        const double end  = w.GetPosY() + (double)extend / w.GetScaleY();
+        //const double step = exp( mpLN10 * dig);
+        //const double end  = w.GetPosY() + (double)extend / w.GetScaleY();
 
         wxCoord tx, ty;
         wxString s;
         wxString fmt;
         int tmp = (int)dig;
-        double maxScaleAbs = fabs(w.GetDesiredYmax());
-        double minScaleAbs = fabs(w.GetDesiredYmin());
-        double endscale = (maxScaleAbs > minScaleAbs) ? maxScaleAbs : minScaleAbs;
-    /*    if (m_labelFormat.IsEmpty()) {
-            if ((endscale < 1e4) && (endscale > 1e-3))
-                fmt = wxT("%.2f");
-            else
-                fmt = wxT("%.1e");
-        } else {
-            fmt = m_labelFormat;
-        }*/
-        /*    if (tmp>=1)
-              {*/
-        //    fmt = wxT("%7.5g");
-        //     }
-        //     else
-        //     {
-        //         tmp=8-tmp;
-        //         fmt.Printf(wxT("%%.%dg"), (tmp >= -1) ? 2 : -tmp);
-        //     }
-
-        int n;
-//        double n = floor( (w.GetPosY() - (double)(extend - w.GetMarginTop() - w.GetMarginBottom())/ w.GetScaleY()) / step ) * step ;
-
-        /* wxCoord startPx = m_drawOutsideMargins ? 0 : w.GetMarginLeft(); */
+        int n=0;
 
 
         tmp=65536;
@@ -1489,6 +1435,7 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
         int labelHeigth = 0;
         s.Printf(fmt,n);
         dc.GetTextExtent(s, &tx, &labelHeigth);
+        //printf("Y-ticks: %d\n", tickCount());
         for (n = 0; n < tickCount(); n++ ) {
             //printf("Tick %d\n", n);
 
@@ -1506,15 +1453,19 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
                         dc.DrawLine( orgx-4, p, orgx, p); //( orgx, p, orgx+4, p);
                     }
                 } else {
+                    dc.DrawLine( orgx-4, p, orgx+4, p);
+
                     m_pen.SetStyle(wxDOT);
                     dc.SetPen( m_pen);
                     if ((m_flags == mpALIGN_LEFT) && !m_drawOutsideMargins) {
                         dc.DrawLine( orgx-4, p, endPx, p);
                     } else {
                         if ((m_flags == mpALIGN_RIGHT) && !m_drawOutsideMargins) {
-                            dc.DrawLine( minYpx, p, orgx+4, p);
+                            //dc.DrawLine( orgX-4, p, orgx+4, p);
+                            dc.DrawLine( orgx-4, p, endPx, p);
                         } else {
-                            dc.DrawLine( 0/*-w.GetScrX()*/, p, w.GetScrX(), p);
+                            dc.DrawLine( orgx-4, p, endPx, p);
+                            //dc.DrawLine( orgx-4/*-w.GetScrX()*/, p, w.GetScrX(), p);
                         }
                     }
                     m_pen.SetStyle(wxSOLID);
@@ -1522,44 +1473,58 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
                 }
                 // Print ticks labels
 
-                s=getLabel(n);
-                dc.GetTextExtent(s, &tx, &ty);
-#ifdef MATHPLOT_DO_LOGGING
-                if (ty != labelHeigth) wxLogMessage(wxT("mpScaleY::Plot: ty(%f) and labelHeigth(%f) differ!"), ty, labelHeigth);
-#endif
-                labelW = (labelW <= tx) ? tx : labelW;
-                if ((tmp-p+labelHeigth/2) > mpMIN_Y_AXIS_LABEL_SEPARATION) {
+
+            }
+        }
+
+        //printf("Y-ticks: %d\n", tickCount());
+            for (n = 0; n < labelCount(); n++ ) {
+                //printf("Tick %d\n", n);
+
+                double tp = getLabelPos(n);
+
+                double py = TransformToPlot ( tp ); //( log10 ( tp ) - xlogmin) / (xlogmax - xlogmin);
+                const int p = (int)(( w.GetPosY() - py ) * w.GetScaleY());
+
+                if ( !m_tickLabels[n].visible )
+                    continue;
+
+                if ((p >= minYpx) && (p <= maxYpx)) {
+
+                    s=getLabel(n);
+                    dc.GetTextExtent(s, &tx, &ty);
                     if ((m_flags == mpALIGN_BORDER_LEFT) || (m_flags == mpALIGN_RIGHT))
                         dc.DrawText( s, orgx+4, p-ty/2);
                     else
                         dc.DrawText( s, orgx-4-tx, p-ty/2); //( s, orgx+4, p-ty/2);
-                    tmp=p-labelHeigth/2;
                 }
             }
-        }
+            // Draw axis name
         // Draw axis name
 
         dc.GetTextExtent(m_name, &tx, &ty);
-        switch (m_flags) {
+        switch (m_nameFlags) {
             case mpALIGN_BORDER_LEFT:
                 dc.DrawText( m_name, labelW + 8, 4);
                 break;
             case mpALIGN_LEFT: {
-                                   if ((!m_drawOutsideMargins) && (w.GetMarginLeft() > (ty + labelW + 8))) {
-                                       dc.DrawRotatedText( m_name, orgx - 6 - labelW - ty, (maxYpx - minYpx + tx)>>1, 90);
-                                   } else {
-                                       dc.DrawText( m_name, orgx + 4, 4);
-                                   }
+    //                               if ((!m_drawOutsideMargins) && (w.GetMarginLeft() > (ty + labelW + 8))) {
+    //                                   dc.DrawRotatedText( m_name, orgx - 6 - labelW - ty, (maxYpx + minYpx) / 2 + tx / 2, 90);
+    //                               } else {
+                                       dc.DrawText( m_name, orgx + 4, minYpx - ty - 4);
+    //                               }
                                } break;
             case mpALIGN_CENTER:
                                dc.DrawText( m_name, orgx + 4, 4);
                                break;
             case mpALIGN_RIGHT: {
-                                    if ((!m_drawOutsideMargins) && (w.GetMarginRight() > (ty + labelW + 8))) {
+                                    //dc.DrawRotatedText( m_name, orgx + 6, (maxYpx + minYpx) / 2 + tx / 2, 90);
+
+                                    /*if ((!m_drawOutsideMargins) && (w.GetMarginRight() > (ty + labelW + 8))) {
                                         dc.DrawRotatedText( m_name, orgx + 6 + labelW, (maxYpx - minYpx + tx)>>1, 90);
-                                    } else {
-                                        dc.DrawText( m_name, orgx - tx - 4, 4);
-                                    }
+                                    } else {*/
+                                        dc.DrawText( m_name, orgx - tx - 4, minYpx - ty - 4);
+                                    //}
                                 } break;
             case mpALIGN_BORDER_RIGHT:
                                 dc.DrawText( m_name, orgx - 6 - tx -labelW, 4);
@@ -1568,20 +1533,9 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
                                 break;
         }
     }
-
-    /*    if (m_flags != mpALIGN_RIGHT) {
-          dc.GetTextExtent(m_name, &tx, &ty);
-          if (m_flags == mpALIGN_BORDER_LEFT) {
-          dc.DrawText( m_name, orgx-tx-4, -extend + ty + 4);
-          } else {
-          if (m_flags == mpALIGN_BORDER_RIGHT )
-          dc.DrawText( m_name, orgx-(tx*2)-4, -extend + ty + 4);
-          else
-          dc.DrawText( m_name, orgx + 4, -extend + 4);
-          }
-          }; */
 }
 
+
 //-----------------------------------------------------------------------------
 // mpWindow
 //-----------------------------------------------------------------------------
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index 668e756fdc..23671bf93d 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -689,15 +689,19 @@ class WXDLLIMPEXP_MATHPLOT mpProfile : public mpLayer
 class WXDLLIMPEXP_MATHPLOT mpScaleBase : public mpLayer
 {
 public:
-    mpScaleBase () { m_rangeSet = false; };
+    mpScaleBase () { m_rangeSet = false; m_nameFlags = mpALIGN_BORDER_BOTTOM; };
     virtual ~mpScaleBase () {};
 
+    virtual bool IsHorizontal() = 0;
+
     bool HasBBox() { return FALSE; }
 
     /** Set X axis alignment.
       @param align alignment (choose between mpALIGN_BORDER_BOTTOM, mpALIGN_BOTTOM, mpALIGN_CENTER, mpALIGN_TOP, mpALIGN_BORDER_TOP */
     void SetAlign(int align) { m_flags = align; };
 
+    void SetNameAlign ( int align ) { m_nameFlags = align; }
+
     /** Set X axis ticks or grid
       @param ticks TRUE to plot axis ticks, FALSE to plot grid. */
     void SetTicks(bool enable) { m_ticks = enable; };
@@ -760,23 +764,63 @@ public:
     virtual double TransformToPlot ( double x ) { return 0.0; };
     virtual double TransformFromPlot (double xplot ){ return 0.0; };
 
+
+
 protected:
 
+    void updateTickLabels( wxDC & dc, mpWindow & w );
+    void computeLabelExtents ( wxDC & dc, mpWindow & w );
 
+    virtual int getLabelDecimalDigits(int maxDigits);
     virtual void getVisibleDataRange ( mpWindow& w, double &minV, double& maxV) {};
     virtual void recalculateTicks ( wxDC & dc, mpWindow & w ) {};
-    virtual int tickCount() const { return 0; }
-    virtual int labelCount() const { return 0; }
-    virtual const wxString getLabel( int n ) { return wxT(""); }
-    virtual double getTickPos( int n ) { return 0.0; }
-    virtual double getLabelPos( int n ) { return 0.0; }
+
+    int tickCount() const
+    {
+        return m_tickValues.size();
+    }
+
+    virtual int labelCount() const
+    {
+        return m_tickLabels.size();
+    }
+
+    virtual const wxString formatLabel( double value, int nDigits ) { return wxT(""); }
+
+    virtual double getTickPos( int n )
+    {
+        return m_tickValues [n];
+    }
+
+    virtual double getLabelPos( int n )
+    {
+        return m_tickLabels[n].pos;
+    }
+
+    virtual const wxString getLabel( int n )
+    {
+        return m_tickLabels[n].label;
+    }
+
+
+    struct TickLabel {
+        TickLabel( double pos_=0.0, const wxString& label_ = wxT("") ) :
+            pos ( pos_ ),
+            label ( label_ ) {};
+        double pos;
+        wxString label;
+        int pixelPos;
+        bool visible;
+    };
+
 
     std::vector<double> m_tickValues;
-    std::vector<double> m_labeledTicks;
+    std::vector<TickLabel> m_tickLabels;
 
     double m_offset, m_scale;
     double m_absVisibleMaxV;
     int m_flags; //!< Flag for axis alignment
+    int m_nameFlags;
     bool m_ticks; //!< Flag to toggle between ticks or grid
     double m_minV, m_maxV;
     bool m_rangeSet;
@@ -796,6 +840,7 @@ class WXDLLIMPEXP_MATHPLOT mpScaleXBase : public mpScaleBase
         mpScaleXBase(wxString name = wxT("X"), int flags = mpALIGN_CENTER, bool ticks = true, unsigned int type = mpX_NORMAL);
         virtual ~mpScaleXBase () {};
 
+        virtual bool IsHorizontal() { return true; }
         /** Layer plot handler.
           This implementation will plot the ruler adjusted to the visible area. */
         virtual void Plot(wxDC & dc, mpWindow & w);
@@ -828,14 +873,8 @@ class WXDLLIMPEXP_MATHPLOT mpScaleX : public mpScaleXBase
         virtual double TransformToPlot ( double x );
         virtual double TransformFromPlot (double xplot );
     protected:
-        void computeLabelExtents ( wxDC & dc, mpWindow & w );
 
         virtual void recalculateTicks ( wxDC & dc, mpWindow & w );
-        virtual int tickCount() const;
-        virtual int labelCount() const;
-        virtual const wxString getLabel( int n );
-        virtual double getTickPos( int n );
-        virtual double getLabelPos( int n );
 
 
         double n0, dig, step, labelStep, end;
@@ -863,11 +902,11 @@ class WXDLLIMPEXP_MATHPLOT mpScaleXLog : public mpScaleXBase
     protected:
 
         void recalculateTicks ( wxDC & dc, mpWindow & w );
-        int tickCount() const;
-        int labelCount() const;
-        const wxString getLabel( int n );
-        double getTickPos( int n );
-        double getLabelPos( int n );
+        //int tickCount() const;
+        //int labelCount() const;
+        //const wxString getLabel( int n );
+        //double getTickPos( int n );
+        //double getLabelPos( int n );
 
 
         void computeLabelExtents ( wxDC & dc, mpWindow & w );
@@ -893,6 +932,8 @@ class WXDLLIMPEXP_MATHPLOT mpScaleY : public mpScaleBase
           @param ticks Select ticks or grid. Give TRUE (default) for drawing axis ticks, FALSE for drawing the grid */
         mpScaleY(wxString name = wxT("Y"), int flags = mpALIGN_CENTER, bool ticks = true);
 
+        virtual bool IsHorizontal() { return false; }
+
         /** Layer plot handler.
           This implementation will plot the ruler adjusted to the visible area.
           */
@@ -928,11 +969,11 @@ class WXDLLIMPEXP_MATHPLOT mpScaleY : public mpScaleBase
     protected:
         virtual void getVisibleDataRange ( mpWindow& w, double &minV, double& maxV);
         virtual void recalculateTicks ( wxDC & dc, mpWindow & w );
-        virtual int tickCount() const;
-        virtual int labelCount() const;
-        virtual const wxString getLabel( int n );
-        virtual double getTickPos( int n );
-        virtual double getLabelPos( int n );
+        //virtual int tickCount() const;
+        //virtual int labelCount() const;
+        //virtual const wxString getLabel( int n );
+        //virtual double getTickPos( int n );
+        //virtual double getLabelPos( int n );
         void computeLabelExtents ( wxDC & dc, mpWindow & w );
         void computeSlaveTicks ( mpWindow& w );
         mpScaleY * m_masterScale;
@@ -940,8 +981,6 @@ class WXDLLIMPEXP_MATHPLOT mpScaleY : public mpScaleBase
 //        double m_minV, m_maxV;
         int m_maxLabelHeight;
         int m_maxLabelWidth;
-        std::vector<double> m_tickValues;
-        std::vector<double> m_labeledTicks;
 
         int m_flags; //!< Flag for axis alignment
         bool m_ticks; //!< Flag to toggle between ticks or grid

From e691565fe32f05e82ab19a1dc058b1fd34532d46 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:04 +0200
Subject: [PATCH 147/197] sim: updated label generation code to match changes
 in the mathplot api

---
 eeschema/sim/sim_plot_panel.cpp | 45 ++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index dffe31409b..6d5bc8ff07 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -103,9 +103,9 @@ public:
     FREQUENCY_LIN_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
         mpScaleX( name, flags, ticks ,type ) {};
 
-    const wxString getLabel( int n )
+    const wxString formatLabel( double value, int nDigits )
     {
-        return formatSI ( m_labeledTicks[n], wxT("Hz"), 2 );
+        return formatSI ( value, wxT("Hz"), std::min(nDigits, 2) );
     }
 };
 
@@ -116,9 +116,9 @@ public:
     FREQUENCY_LOG_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
         mpScaleXLog( name, flags, ticks ,type ) {};
 
-    const wxString getLabel( int n )
+    const wxString formatLabel( double value, int nDigits )
     {
-        return formatSI ( m_labeledTicks[n], wxT("Hz"), 2 );
+        return formatSI ( value, wxT("Hz"), std::min(nDigits, 2) );
     }
 };
 
@@ -129,9 +129,9 @@ public:
     TIME_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
         mpScaleX ( name, flags, ticks ,type ) {};
 
-    const wxString getLabel( int n )
+    const wxString formatLabel( double value, int nDigits )
     {
-        return formatSI ( m_labeledTicks[n], wxT("s"), 3, AbsVisibleMaxValue() );
+        return formatSI ( value, wxT("s"), std::min(nDigits, 3), AbsVisibleMaxValue() );
     }
 };
 
@@ -141,9 +141,9 @@ public:
     VOLTAGE_SCALE_X(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
         mpScaleX ( name, flags, ticks, type ) {};
 
-    const wxString getLabel( int n )
+    const wxString formatLabel( double value, int nDigits )
     {
-        return formatSI ( m_labeledTicks[n], wxT("V"), 3, AbsVisibleMaxValue() );
+        return formatSI ( value, wxT("V"), std::min(nDigits, 3), AbsVisibleMaxValue() );
     }
 };
 
@@ -153,9 +153,9 @@ public:
     GAIN_SCALE(wxString name, int flags,  bool ticks = false, unsigned int type = 0) :
         mpScaleY ( name, flags, ticks ) {};
 
-    const wxString getLabel( int n )
+    const wxString formatLabel( double value, int nDigits )
     {
-        return formatSI ( m_labeledTicks[n], wxT("dB"), 1, AbsVisibleMaxValue(), true, 0 );
+        return formatSI ( value, wxT("dB"), std::min(nDigits, 1), AbsVisibleMaxValue(), true, 0 );
     }
 };
 
@@ -165,9 +165,9 @@ public:
     PHASE_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
         mpScaleY ( name, flags, ticks ) {};
 
-    const wxString getLabel( int n )
+    const wxString formatLabel( double value, int nDigits )
     {
-        return formatSI ( m_labeledTicks[n], wxT("\u00B0"), 1, AbsVisibleMaxValue(), true, 0 );
+        return formatSI ( value, wxT("\u00B0"), std::min(nDigits, 1), AbsVisibleMaxValue(), true, 0 );
     }
 };
 
@@ -177,9 +177,9 @@ public:
     VOLTAGE_SCALE_Y(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
         mpScaleY ( name, flags, ticks ) {};
 
-    const wxString getLabel( int n )
+    const wxString formatLabel( double value, int nDigits )
     {
-        return formatSI ( m_labeledTicks[n], wxT("V"), 3, AbsVisibleMaxValue() );
+        return formatSI ( value, wxT("V"), std::min(nDigits, 3), AbsVisibleMaxValue() );
     }
 };
 
@@ -189,11 +189,12 @@ public:
     CURRENT_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
         mpScaleY ( name, flags, ticks ) {};
 
-    const wxString getLabel( int n )
+    const wxString formatLabel( double value, int nDigits )
     {
-        return formatSI ( m_labeledTicks[n], wxT("A"), 3, AbsVisibleMaxValue() );
+        return formatSI ( value, wxT("A"), std::min(nDigits, 3), AbsVisibleMaxValue() );
     }
 };
+
 void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
 {
     if( !m_window )
@@ -310,13 +311,13 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
             break;
 
         case ST_DC:
-            m_axis_x = new VOLTAGE_SCALE_X( wxT( "Voltage (sweeped)" ), mpALIGN_BORDER_BOTTOM );
-            m_axis_y1 = new VOLTAGE_SCALE_Y( wxT( "Voltage (measured)" ), mpALIGN_BORDER_LEFT );
+            m_axis_x = new VOLTAGE_SCALE_X( wxT( "Voltage (sweeped)" ), mpALIGN_BOTTOM );
+            m_axis_y1 = new VOLTAGE_SCALE_Y( wxT( "Voltage (measured)" ), mpALIGN_LEFT );
             break;
 
         case ST_NOISE:
-            m_axis_x = new mpScaleX( wxT( "frequency [Hz]" ), mpALIGN_BORDER_BOTTOM );
-            m_axis_y1 = new mpScaleY( wxT( "noise [(V or A)^2/Hz]" ), mpALIGN_BORDER_LEFT );
+            m_axis_x = new FREQUENCY_LOG_SCALE( wxT( "Frequency" ), mpALIGN_BOTTOM );
+            m_axis_y1 = new mpScaleY( wxT( "noise [(V or A)^2/Hz]" ), mpALIGN_LEFT );
             break;
 
         case ST_TRANSIENT:
@@ -334,18 +335,22 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
     if( m_axis_x )
     {
         m_axis_x->SetTicks( false );
+        m_axis_x->SetNameAlign ( mpALIGN_BOTTOM );
+
         AddLayer( m_axis_x );
     }
 
     if( m_axis_y1 )
     {
         m_axis_y1->SetTicks( false );
+        m_axis_y1->SetNameAlign ( mpALIGN_LEFT );
         AddLayer( m_axis_y1 );
     }
 
     if( m_axis_y2 )
     {
         m_axis_y2->SetTicks( false );
+        m_axis_y2->SetNameAlign ( mpALIGN_RIGHT );
         AddLayer( m_axis_y2 );
     }
 

From cf9abef23a10c5afe3fc84efe435fb9788ea73d5 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:06 +0200
Subject: [PATCH 148/197] demos: some simulation examples [wip]

---
 .../simulation/rectifier/rectifier-cache.lib  | 101 +++++++
 demos/simulation/rectifier/rectifier.pro      |  63 ++++
 demos/simulation/rectifier/rectifier.sch      | 159 ++++++++++
 demos/simulation/sallen_key/AD8051.lib        | 112 +++++++
 .../sallen_key/sallen_key-cache.lib           | 124 ++++++++
 demos/simulation/sallen_key/sallen_key.pro    |  74 +++++
 demos/simulation/sallen_key/sallen_key.sch    | 285 ++++++++++++++++++
 7 files changed, 918 insertions(+)
 create mode 100644 demos/simulation/rectifier/rectifier-cache.lib
 create mode 100644 demos/simulation/rectifier/rectifier.pro
 create mode 100644 demos/simulation/rectifier/rectifier.sch
 create mode 100644 demos/simulation/sallen_key/AD8051.lib
 create mode 100644 demos/simulation/sallen_key/sallen_key-cache.lib
 create mode 100644 demos/simulation/sallen_key/sallen_key.pro
 create mode 100644 demos/simulation/sallen_key/sallen_key.sch

diff --git a/demos/simulation/rectifier/rectifier-cache.lib b/demos/simulation/rectifier/rectifier-cache.lib
new file mode 100644
index 0000000000..3d5c8c2b86
--- /dev/null
+++ b/demos/simulation/rectifier/rectifier-cache.lib
@@ -0,0 +1,101 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# C
+#
+DEF C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ C?
+ C_????_*
+ C_????
+ SMD*_c
+ Capacitor*
+ Capacitors_ThroughHole:C_Radial_D10_L13_P5
+ Capacitors_SMD:C_0805
+ Capacitors_SMD:C_1206
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 40 40 1 1 P
+X ~ 2 0 -150 110 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# D
+#
+DEF D D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Diode_*
+ D-Pak_TO252AA
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+$ENDFPLIST
+DRAW
+P 2 0 1 6 -50 50 -50 -50 N
+P 3 0 1 0 50 50 -50 0 50 -50 F
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# VSOURCE
+#
+DEF ~VSOURCE V 0 40 Y Y 1 F N
+F0 "V" 200 200 50 H V C CNN
+F1 "VSOURCE" 250 100 50 H I C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+F4 "Value" 0 0 60 H I C CNN "Fieldname"
+F5 "V" 0 0 60 H I C CNN "Spice_Primitive"
+F6 "1 2" -300 200 60 H I C CNN "Spice_Node_Sequence"
+DRAW
+C 0 0 100 0 1 0 N
+P 2 0 1 0 0 -75 0 75 N
+P 4 0 1 0 0 75 -25 25 25 25 0 75 F
+X ~ 1 0 200 100 D 50 50 1 1 I
+X ~ 2 0 -200 100 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/simulation/rectifier/rectifier.pro b/demos/simulation/rectifier/rectifier.pro
new file mode 100644
index 0000000000..d9bf54bb1a
--- /dev/null
+++ b/demos/simulation/rectifier/rectifier.pro
@@ -0,0 +1,63 @@
+update=śro, 11 maj 2016, 18:59:29
+version=1
+last_client=eeschema
+[general]
+version=1
+RootSch=
+BoardNm=
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[eeschema]
+version=1
+LibDir=/home/twl/Kicad-dev/kicad-library/library
+[eeschema/libraries]
+LibName1=power
+LibName2=device
+LibName3=transistors
+LibName4=conn
+LibName5=linear
+LibName6=regul
+LibName7=74xx
+LibName8=cmos4000
+LibName9=adc-dac
+LibName10=memory
+LibName11=xilinx
+LibName12=microcontrollers
+LibName13=dsp
+LibName14=microchip
+LibName15=analog_switches
+LibName16=motorola
+LibName17=texas
+LibName18=intel
+LibName19=audio
+LibName20=interface
+LibName21=digital-audio
+LibName22=philips
+LibName23=display
+LibName24=cypress
+LibName25=siliconi
+LibName26=opto
+LibName27=atmel
+LibName28=contrib
+LibName29=valves
+LibName30=pspice
diff --git a/demos/simulation/rectifier/rectifier.sch b/demos/simulation/rectifier/rectifier.sch
new file mode 100644
index 0000000000..055b7ba0a8
--- /dev/null
+++ b/demos/simulation/rectifier/rectifier.sch
@@ -0,0 +1,159 @@
+EESchema Schematic File Version 2
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:pspice
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L VSOURCE V1
+U 1 1 57336052
+P 4400 4050
+F 0 "V1" H 4528 4096 50  0000 L CNN
+F 1 "SINE(0 1.5 1k 0 0 0 0)" H 4528 4005 50  0000 L CNN
+F 2 "" H 4400 4050 50  0000 C CNN
+F 3 "" H 4400 4050 50  0000 C CNN
+F 4 "Value" H 4400 4050 60  0001 C CNN "Fieldname"
+F 5 "V" H 4400 4050 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 4100 4250 60  0001 C CNN "Spice_Node_Sequence"
+	1    4400 4050
+	-1   0    0    1   
+$EndComp
+$Comp
+L GND #PWR1
+U 1 1 573360D3
+P 4400 4350
+F 0 "#PWR1" H 4400 4100 50  0001 C CNN
+F 1 "GND" H 4405 4177 50  0000 C CNN
+F 2 "" H 4400 4350 50  0000 C CNN
+F 3 "" H 4400 4350 50  0000 C CNN
+	1    4400 4350
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R1
+U 1 1 573360F5
+P 4650 3700
+F 0 "R1" V 4443 3700 50  0000 C CNN
+F 1 "1k" V 4534 3700 50  0000 C CNN
+F 2 "" V 4580 3700 50  0000 C CNN
+F 3 "" H 4650 3700 50  0000 C CNN
+F 4 "Value" H 4650 3700 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 4650 3700 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 4650 3700 60  0001 C CNN "Spice_Primitive"
+	1    4650 3700
+	0    1    1    0   
+$EndComp
+$Comp
+L D D1
+U 1 1 573361B8
+P 5100 3700
+F 0 "D1" H 5100 3485 50  0000 C CNN
+F 1 "1N4148" H 5100 3576 50  0000 C CNN
+F 2 "" H 5100 3700 50  0000 C CNN
+F 3 "" H 5100 3700 50  0000 C CNN
+F 4 "Value" H 5100 3700 60  0001 C CNN "Fieldname"
+F 5 "D" H 5100 3700 60  0001 C CNN "Spice_Primitive"
+F 6 "2 1" H 5100 3700 60  0001 C CNN "Spice_Node_Sequence"
+	1    5100 3700
+	-1   0    0    1   
+$EndComp
+$Comp
+L C C1
+U 1 1 5733628F
+P 5400 4000
+F 0 "C1" H 5515 4046 50  0000 L CNN
+F 1 "100n" H 5515 3955 50  0000 L CNN
+F 2 "" H 5438 3850 50  0000 C CNN
+F 3 "" H 5400 4000 50  0000 C CNN
+F 4 "Value" H 5400 4000 60  0001 C CNN "Fieldname"
+F 5 "C" H 5400 4000 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 5400 4000 60  0001 C CNN "SpiceMapping"
+	1    5400 4000
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R2
+U 1 1 573362F7
+P 5750 4000
+F 0 "R2" H 5680 3954 50  0000 R CNN
+F 1 "100k" H 5680 4045 50  0000 R CNN
+F 2 "" V 5680 4000 50  0000 C CNN
+F 3 "" H 5750 4000 50  0000 C CNN
+F 4 "Value" H 5750 4000 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 5750 4000 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 5750 4000 60  0001 C CNN "Spice_Primitive"
+	1    5750 4000
+	-1   0    0    1   
+$EndComp
+Text Notes 4300 4900 0    60   ~ 0
+.tran 1u 10m\n
+Wire Wire Line
+	4400 4350 4400 4250
+Wire Wire Line
+	4400 4300 5750 4300
+Connection ~ 4400 4300
+Wire Wire Line
+	5250 3700 5750 3700
+Wire Wire Line
+	5750 3700 5750 3850
+Wire Wire Line
+	5400 3850 5400 3700
+Connection ~ 5400 3700
+Wire Wire Line
+	5400 4300 5400 4150
+Wire Wire Line
+	5750 4300 5750 4150
+Connection ~ 5400 4300
+Wire Wire Line
+	4800 3700 4950 3700
+Connection ~ 4900 3700
+Wire Wire Line
+	4400 3850 4400 3700
+Wire Wire Line
+	4400 3700 4500 3700
+Text Label 4400 3800 0    60   ~ 0
+in
+Text Label 5550 3700 0    60   ~ 0
+rect
+Text Notes 4300 5000 0    60   ~ 0
+*.ac dec 10 1 1Meg\n
+$EndSCHEMATC
diff --git a/demos/simulation/sallen_key/AD8051.lib b/demos/simulation/sallen_key/AD8051.lib
new file mode 100644
index 0000000000..20ac791cd7
--- /dev/null
+++ b/demos/simulation/sallen_key/AD8051.lib
@@ -0,0 +1,112 @@
+* AD8051 SPICE Macro-model
+* Description: Amplifier
+* Generic Desc: Single 110 MHz rail-to-rail op amp - 3V
+* Developed by: JCH / ADI
+* Revision History: 08/10/2012 - Updated to new header style
+* 0.0 (09/1998)
+* Copyright 1998, 2012 by Analog Devices, Inc.
+*
+* Refer to http://www.analog.com/Analog_Root/static/techSupport/designTools/spiceModels/license/spice_general.html for License Statement.  Use of this model
+* indicates your acceptance with the terms and provisions in the License Statement.
+*
+* BEGIN Notes:
+*
+* Not Modeled:
+* CMRR IS NOT MODELED
+*    
+* Parameters modeled include:
+* THIS MODEL IS FOR SINGLE SUPPLY OPERATION (+5V)
+*
+* END Notes
+*	
+* Node assignments
+*                 noninverting input
+*                 |       inverting input  
+*                 |       |       positive supply
+*                 |       |       |       negative supply
+*                 |       |       |       |       output
+*                 |       |       |       |       |
+*                 |       |       |       |       |
+.SUBCKT AD8051  1       2       99      50      45
+*
+* INPUT STAGE
+*
+Q1  4  3  5 QPI
+Q2  6  2  7 QPI
+RC1   50  4 20.5k
+RC2   50  6 20.5k
+RE1    5  8 5k
+RE2    7  8 5k 
+EOS    3  1 POLY(1) 53 98 1.7E-3 1 
+IOS    1  2 0.1u
+FNOI1  1  0 VMEAS2 1E-4
+FNOI2  2  0 VMEAS2 1E-4
+
+CPAR1  3 50 1.7p
+CPAR2  2 50 1.7p
+VCMH1 99  9 1
+VCMH2 99 10 1
+D1     5  9  DX
+D2     7 10 DX
+IBIAS 99  8 73u
+*
+* INTERNAL VOLTAGE REFERENCE
+*
+EREF1 98  0 POLY(2) 99 0 50 0 0 0.5 0.5
+EREF2 97  0 POLY(2)  1 0 2 0 0 0.5 0.5
+GREF2 97 0 97 0 1E-6
+*
+*VOLTAGE NOISE STAGE
+*
+DN1 51 52 DNOI1
+VN1 51 98 0.61
+VMEAS 52 98 0
+RNOI1 52 98 6.5E-3
+
+H1 53 98 VMEAS 1
+RNOI2 53 98 1
+*
+*CURRENT NOISE STAGE
+*
+DN2 61 62 DNOI2
+VN2 61 98 0.545
+VMEAS2 62 98 0
+RNOI3  62 98 2E-4
+*
+* INTERMEDIATE GAIN STAGE WITH POLE = 96MHz
+*
+G1   98 20 4 6 1E-3 
+RP1  98 20 550
+CP1  98 20 3p
+*
+* GAIN STAGE WITH DOMINANT POLE
+*
+G4   98 30 20 98 2.6E-3
+RG1 30 98 155k
+CF1  30 45 13.5p
+D5 31 99 DX
+D6 50 32 DX
+V1 31 30 0.6
+V2 30 32 0.6
+*
+* OUTPUT STAGE
+*
+Q3  45 42 99 QPOX
+Q4  45 44 50 QNOX
+EO3 99 42 POLY(1) 98 30 0.7175 0.5
+EO4 44 50 POLY(1) 30 98 0.7355 0.5
+*
+* MODELS
+*
+.MODEL QPI PNP (IS=8.6E-18,BF=91,VAF=30.6)
+.MODEL QNOX NPN(IS=6.37E-16,BF=100,VAF=90,RC=3)
+.MODEL QPOX PNP(IS=1.19E-15,BF=112,VAF=19.2,RC=6)
+.MODEL DX D(IS=1E-16)
+.MODEL DZ D(IS=1E-14,BV=6.6)
+.MODEL DNOI1 D(KF=9E-10)
+.MODEL DNOI2 D(KF=1E-8)
+.ENDS AD8051
+
+
+
+
diff --git a/demos/simulation/sallen_key/sallen_key-cache.lib b/demos/simulation/sallen_key/sallen_key-cache.lib
new file mode 100644
index 0000000000..96a2f7eecf
--- /dev/null
+++ b/demos/simulation/sallen_key/sallen_key-cache.lib
@@ -0,0 +1,124 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# C
+#
+DEF C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ C?
+ C_????_*
+ C_????
+ SMD*_c
+ Capacitor*
+ Capacitors_ThroughHole:C_Radial_D10_L13_P5
+ Capacitors_SMD:C_0805
+ Capacitors_SMD:C_1206
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 40 40 1 1 P
+X ~ 2 0 -150 110 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# Generic_Opamp
+#
+DEF Generic_Opamp U 0 20 Y Y 1 F N
+F0 "U" 0 250 50 H V L CNN
+F1 "Generic_Opamp" 0 150 50 H V L CNN
+F2 "" -100 -100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 4 0 1 10 -200 200 200 0 -200 -200 -200 200 f
+X + 1 -300 100 100 R 50 50 1 1 I
+X - 2 -300 -100 100 R 50 50 1 1 I
+X V+ 3 -100 300 150 D 50 50 1 1 W
+X V- 4 -100 -300 150 U 50 50 1 1 W
+X ~ 5 300 0 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# VDD
+#
+DEF VDD #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VDD" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C 0 75 25 0 1 0 N
+P 2 0 1 0 0 0 0 50 N
+X VDD 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# VSOURCE
+#
+DEF ~VSOURCE V 0 40 Y Y 1 F N
+F0 "V" 200 200 50 H V C CNN
+F1 "VSOURCE" 250 100 50 H I C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+F4 "Value" 0 0 60 H I C CNN "Fieldname"
+F5 "V" 0 0 60 H I C CNN "Spice_Primitive"
+F6 "1 2" -300 200 60 H I C CNN "Spice_Node_Sequence"
+DRAW
+C 0 0 100 0 1 0 N
+P 2 0 1 0 0 -75 0 75 N
+P 4 0 1 0 0 75 -25 25 25 25 0 75 F
+X ~ 1 0 200 100 D 50 50 1 1 I
+X ~ 2 0 -200 100 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# VSS
+#
+DEF VSS #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VSS" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C 0 75 25 0 1 0 N
+P 2 0 1 0 0 0 0 50 N
+X VSS 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/simulation/sallen_key/sallen_key.pro b/demos/simulation/sallen_key/sallen_key.pro
new file mode 100644
index 0000000000..d91a6573a1
--- /dev/null
+++ b/demos/simulation/sallen_key/sallen_key.pro
@@ -0,0 +1,74 @@
+update=piÄ…, 15 lip 2016, 17:18:36
+version=1
+last_client=eeschema
+[general]
+version=1
+RootSch=
+BoardNm=
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[eeschema]
+version=1
+LibDir=../../kicad-library/library
+[eeschema/libraries]
+LibName1=power
+LibName2=device
+LibName3=transistors
+LibName4=conn
+LibName5=linear
+LibName6=regul
+LibName7=74xx
+LibName8=cmos4000
+LibName9=adc-dac
+LibName10=memory
+LibName11=xilinx
+LibName12=microcontrollers
+LibName13=dsp
+LibName14=microchip
+LibName15=analog_switches
+LibName16=motorola
+LibName17=texas
+LibName18=intel
+LibName19=audio
+LibName20=interface
+LibName21=digital-audio
+LibName22=philips
+LibName23=display
+LibName24=cypress
+LibName25=siliconi
+LibName26=opto
+LibName27=atmel
+LibName28=contrib
+LibName29=valves
+LibName30=pspice
+[schematic_editor]
+version=1
+PageLayoutDescrFile=
+PlotDirectoryName=
+SubpartIdSeparator=0
+SubpartFirstId=65
+NetFmtName=
+SpiceForceRefPrefix=0
+SpiceUseNetNumbers=0
+LabSize=60
+ERC_TestSimilarLabels=1
diff --git a/demos/simulation/sallen_key/sallen_key.sch b/demos/simulation/sallen_key/sallen_key.sch
new file mode 100644
index 0000000000..4b0d2e2edd
--- /dev/null
+++ b/demos/simulation/sallen_key/sallen_key.sch
@@ -0,0 +1,285 @@
+EESchema Schematic File Version 2
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:pspice
+LIBS:sallen_key-cache
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L VSOURCE V1
+U 1 1 57336052
+P 6000 4700
+F 0 "V1" H 6128 4746 50  0000 L CNN
+F 1 "AC 1" H 6128 4655 50  0000 L CNN
+F 2 "" H 6000 4700 50  0000 C CNN
+F 3 "" H 6000 4700 50  0000 C CNN
+F 4 "Value" H 6000 4700 60  0001 C CNN "Fieldname"
+F 5 "V" H 6000 4700 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 5700 4900 60  0001 C CNN "Spice_Node_Sequence"
+	1    6000 4700
+	1    0    0    -1  
+$EndComp
+Text Notes 4300 4900 0    60   ~ 0
+*.tran 1u 10m\n
+Text Notes 4300 4800 0    60   ~ 0
+.include diodes.lib\n
+Text Label 8550 4400 0    60   ~ 0
+lowpass
+Text Notes 4300 5000 0    60   ~ 0
+.ac dec 10 1 1Meg\n
+$Comp
+L Generic_Opamp U1
+U 1 1 5788FF9F
+P 7850 4400
+F 0 "U1" H 8191 4446 50  0000 L CNN
+F 1 "AD8051" H 8191 4355 50  0000 L CNN
+F 2 "" H 7750 4300 50  0000 C CNN
+F 3 "" H 7850 4400 50  0000 C CNN
+F 4 "Value" H 7850 4400 60  0001 C CNN "Fieldname"
+F 5 "X" H 7850 4400 60  0001 C CNN "Spice_Primitive"
+F 6 "AD8051" H 7850 4400 60  0001 C CNN "Spice_Model"
+F 7 "Y" H 7850 4400 60  0001 C CNN "Spice_Netlist_Enabled"
+F 8 "/home/twl/Kicad-dev/kicad-git/eeschema/AD8051.lib" H 7850 4400 60  0001 C CNN "Spice_Lib_File"
+	1    7850 4400
+	1    0    0    -1  
+$EndComp
+$Comp
+L VSOURCE V2
+U 1 1 578900BA
+P 9650 1900
+F 0 "V2" H 9778 1946 50  0000 L CNN
+F 1 "DC 10" H 9778 1855 50  0000 L CNN
+F 2 "" H 9650 1900 50  0000 C CNN
+F 3 "" H 9650 1900 50  0000 C CNN
+F 4 "Value" H 9650 1900 60  0001 C CNN "Fieldname"
+F 5 "V" H 9650 1900 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 9350 2100 60  0001 C CNN "Spice_Node_Sequence"
+	1    9650 1900
+	1    0    0    -1  
+$EndComp
+$Comp
+L VSOURCE V3
+U 1 1 57890232
+P 9650 2300
+F 0 "V3" H 9778 2346 50  0000 L CNN
+F 1 "DC 10" H 9778 2255 50  0000 L CNN
+F 2 "" H 9650 2300 50  0000 C CNN
+F 3 "" H 9650 2300 50  0000 C CNN
+F 4 "Value" H 9650 2300 60  0001 C CNN "Fieldname"
+F 5 "V" H 9650 2300 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 9350 2500 60  0001 C CNN "Spice_Node_Sequence"
+	1    9650 2300
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR5
+U 1 1 578902D2
+P 9400 2100
+F 0 "#PWR5" H 9400 1850 50  0001 C CNN
+F 1 "GND" H 9405 1927 50  0000 C CNN
+F 2 "" H 9400 2100 50  0000 C CNN
+F 3 "" H 9400 2100 50  0000 C CNN
+	1    9400 2100
+	1    0    0    -1  
+$EndComp
+$Comp
+L VDD #PWR6
+U 1 1 578903C0
+P 9650 1700
+F 0 "#PWR6" H 9650 1550 50  0001 C CNN
+F 1 "VDD" H 9667 1873 50  0000 C CNN
+F 2 "" H 9650 1700 50  0000 C CNN
+F 3 "" H 9650 1700 50  0000 C CNN
+	1    9650 1700
+	1    0    0    -1  
+$EndComp
+$Comp
+L VSS #PWR7
+U 1 1 578903E2
+P 9650 2500
+F 0 "#PWR7" H 9650 2350 50  0001 C CNN
+F 1 "VSS" H 9668 2673 50  0000 C CNN
+F 2 "" H 9650 2500 50  0000 C CNN
+F 3 "" H 9650 2500 50  0000 C CNN
+	1    9650 2500
+	-1   0    0    1   
+$EndComp
+$Comp
+L VDD #PWR3
+U 1 1 57890425
+P 7750 4100
+F 0 "#PWR3" H 7750 3950 50  0001 C CNN
+F 1 "VDD" H 7767 4273 50  0000 C CNN
+F 2 "" H 7750 4100 50  0000 C CNN
+F 3 "" H 7750 4100 50  0000 C CNN
+	1    7750 4100
+	1    0    0    -1  
+$EndComp
+$Comp
+L VSS #PWR4
+U 1 1 57890453
+P 7750 4700
+F 0 "#PWR4" H 7750 4550 50  0001 C CNN
+F 1 "VSS" H 7768 4873 50  0000 C CNN
+F 2 "" H 7750 4700 50  0000 C CNN
+F 3 "" H 7750 4700 50  0000 C CNN
+	1    7750 4700
+	-1   0    0    1   
+$EndComp
+$Comp
+L R R2
+U 1 1 57890691
+P 6950 4300
+F 0 "R2" V 6743 4300 50  0000 C CNN
+F 1 "1k" V 6834 4300 50  0000 C CNN
+F 2 "" V 6880 4300 50  0000 C CNN
+F 3 "" H 6950 4300 50  0000 C CNN
+F 4 "Value" H 6950 4300 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 6950 4300 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 6950 4300 60  0001 C CNN "Spice_Primitive"
+	1    6950 4300
+	0    1    1    0   
+$EndComp
+$Comp
+L R R1
+U 1 1 578906FF
+P 6400 4300
+F 0 "R1" V 6193 4300 50  0000 C CNN
+F 1 "1k" V 6284 4300 50  0000 C CNN
+F 2 "" V 6330 4300 50  0000 C CNN
+F 3 "" H 6400 4300 50  0000 C CNN
+F 4 "Value" H 6400 4300 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 6400 4300 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 6400 4300 60  0001 C CNN "Spice_Primitive"
+	1    6400 4300
+	0    1    1    0   
+$EndComp
+$Comp
+L C C1
+U 1 1 5789077D
+P 7000 4950
+F 0 "C1" H 7115 4996 50  0000 L CNN
+F 1 "100n" H 7115 4905 50  0000 L CNN
+F 2 "" H 7038 4800 50  0000 C CNN
+F 3 "" H 7000 4950 50  0000 C CNN
+F 4 "Value" H 7000 4950 60  0001 C CNN "Fieldname"
+F 5 "C" H 7000 4950 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 7000 4950 60  0001 C CNN "SpiceMapping"
+	1    7000 4950
+	0    1    1    0   
+$EndComp
+$Comp
+L C C2
+U 1 1 5789085B
+P 7350 4000
+F 0 "C2" H 7465 4046 50  0000 L CNN
+F 1 "100n" H 7465 3955 50  0000 L CNN
+F 2 "" H 7388 3850 50  0000 C CNN
+F 3 "" H 7350 4000 50  0000 C CNN
+F 4 "Value" H 7350 4000 60  0001 C CNN "Fieldname"
+F 5 "C" H 7350 4000 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 7350 4000 60  0001 C CNN "SpiceMapping"
+	1    7350 4000
+	-1   0    0    1   
+$EndComp
+$Comp
+L GND #PWR2
+U 1 1 57890B95
+P 7350 3800
+F 0 "#PWR2" H 7350 3550 50  0001 C CNN
+F 1 "GND" H 7355 3627 50  0000 C CNN
+F 2 "" H 7350 3800 50  0000 C CNN
+F 3 "" H 7350 3800 50  0000 C CNN
+	1    7350 3800
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	9650 2100 9400 2100
+Wire Wire Line
+	8150 4400 8900 4400
+Wire Wire Line
+	8350 4400 8350 4950
+Wire Wire Line
+	8350 4950 7400 4950
+Wire Wire Line
+	7400 4950 7400 4500
+Wire Wire Line
+	7400 4500 7550 4500
+Wire Wire Line
+	7550 4300 7100 4300
+Wire Wire Line
+	6550 4300 6850 4300
+Wire Wire Line
+	6850 4950 6650 4950
+Wire Wire Line
+	6650 4950 6650 4300
+Connection ~ 6800 4300
+Connection ~ 6650 4300
+Wire Wire Line
+	7150 4950 7450 4950
+Connection ~ 7400 4950
+Wire Wire Line
+	7350 4150 7350 4300
+Connection ~ 7350 4300
+Wire Wire Line
+	7350 3800 7350 3850
+Wire Wire Line
+	6250 4300 6000 4300
+Wire Wire Line
+	6000 4300 6000 4500
+Wire Wire Line
+	6000 4900 6000 5000
+$Comp
+L GND #PWR1
+U 1 1 57890E7F
+P 6000 5000
+F 0 "#PWR1" H 6000 4750 50  0001 C CNN
+F 1 "GND" H 6005 4827 50  0000 C CNN
+F 2 "" H 6000 5000 50  0000 C CNN
+F 3 "" H 6000 5000 50  0000 C CNN
+	1    6000 5000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8900 4400 8900 4450
+Connection ~ 8350 4400
+$EndSCHEMATC

From 2740556505e0addcdfa15813dffe0c5e61269429 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:06 +0200
Subject: [PATCH 149/197] Fix for Spice library parser

---
 eeschema/dialogs/dialog_spice_model.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp
index bfc088a65e..603776b69f 100644
--- a/eeschema/dialogs/dialog_spice_model.cpp
+++ b/eeschema/dialogs/dialog_spice_model.cpp
@@ -585,8 +585,9 @@ void DIALOG_SPICE_MODEL::updateFromFile( wxComboBox* aComboBox,
         {
             wxString data = line.Mid( idx );
             data = data.AfterFirst( ' ' );
+            data.Trim( false );
             data = data.BeforeFirst( ' ' );
-            data = data.Trim();
+            data.Trim();
 
             if( !data.IsEmpty() )
                 aComboBox->Append( data );

From 8306cd3b9be338b03947daaf5764f2e62422be5c Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:06 +0200
Subject: [PATCH 150/197] Fixed tuners layout after a tuner is removed

---
 eeschema/sim/sim_plot_frame.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 564bcde9a3..562c79ddc5 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -267,9 +267,7 @@ void SIM_PLOT_FRAME::RemoveTuner( TUNER_SLIDER* aTuner )
 
     m_plots[plotPanel].m_tuners.remove( aTuner );
     aTuner->Destroy();
-    Layout();
-    Layout();
-    Layout();
+    m_sidePanel->Layout();
 }
 
 

From fccf71aaddb0aa48a23729216071c788f5ccb8c1 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:06 +0200
Subject: [PATCH 151/197] Change 'Run Simulation' button icon when simulation
 is running

---
 eeschema/sim/sim_plot_frame.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 562c79ddc5..e6bd931005 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -120,8 +120,7 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     Connect( EVT_SIM_FINISHED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
     Connect( EVT_SIM_CURSOR_UPDATE, wxCommandEventHandler( SIM_PLOT_FRAME::onCursorUpdate ), NULL, this );
 
-
-    m_toolSimulate = m_toolBar->AddTool( ID_SIM_RUN, _("Run Simulation"), KiBitmap( sim_run_xpm ), _("Run Simulation"), wxITEM_NORMAL );
+    m_toolSimulate = m_toolBar->AddTool( ID_SIM_RUN, _("Run/Stop Simulation"), KiBitmap( sim_run_xpm ), _("Run Simulation"), wxITEM_NORMAL );
     m_toolAddSignals = m_toolBar->AddTool( ID_SIM_ADD_SIGNALS, _("Add Signals"), KiBitmap( sim_add_signal_xpm ), _("Add signals to plot"), wxITEM_NORMAL );
     m_toolProbe = m_toolBar->AddTool( ID_SIM_PROBE,  _("Probe"), KiBitmap( sim_probe_xpm ),_("Probe signals on the schematic"), wxITEM_NORMAL );
     m_toolTune = m_toolBar->AddTool( ID_SIM_TUNE, _("Tune"), KiBitmap( sim_tune_xpm ), _("Tune component values"), wxITEM_NORMAL );
@@ -730,14 +729,14 @@ void SIM_PLOT_FRAME::onCursorUpdate( wxCommandEvent& event )
 
 void SIM_PLOT_FRAME::onSimStarted( wxCommandEvent& aEvent )
 {
-    //m_simulateBtn->SetLabel( wxT( "Stop" ) );
+    m_toolBar->SetToolNormalBitmap( ID_SIM_RUN, KiBitmap( sim_stop_xpm ) );
     SetCursor( wxCURSOR_ARROWWAIT );
 }
 
 
 void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
 {
-    //m_simulateBtn->SetLabel( wxT( "Simulate" ) );
+    m_toolBar->SetToolNormalBitmap( ID_SIM_RUN, KiBitmap( sim_run_xpm ) );
     SetCursor( wxCURSOR_ARROW );
 
     SIM_TYPE simType = m_exporter->GetSimType();

From 2f8f92cf0a681ec1ad5d7cf1b224bca771935635 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:07 +0200
Subject: [PATCH 152/197] Closing tabs with middle button click I could not
 find a way to make tab close button work in wxWidgets..

---
 eeschema/sim/sim_plot_frame.cpp      | 66 ++++++++++++++++++++--------
 eeschema/sim/sim_plot_frame.h        | 11 ++++-
 eeschema/sim/sim_plot_frame_base.cpp | 12 ++---
 eeschema/sim/sim_plot_frame_base.fbp | 56 +++++++++++++----------
 eeschema/sim/sim_plot_frame_base.h   |  7 +--
 5 files changed, 100 insertions(+), 52 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index e6bd931005..72c50f42b8 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -134,8 +134,6 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
 
     m_toolBar->Realize();
     m_plotNotebook->SetPageText(0, _("Welcome!") );
-
-    //relayout();
 }
 
 
@@ -171,12 +169,6 @@ void SIM_PLOT_FRAME::StartSimulation()
     m_simulator->LoadNetlist( formatter.GetString() );
     m_simulator->Run();
 
-    if ( m_welcomePanel )
-    {
-        m_plotNotebook->DeletePage( 0 );
-        m_welcomePanel = nullptr;
-    }
-
     Layout();
 }
 
@@ -198,6 +190,12 @@ SIM_PLOT_PANEL* SIM_PLOT_FRAME::NewPlotPanel( SIM_TYPE aSimType )
 {
     SIM_PLOT_PANEL* plot = new SIM_PLOT_PANEL( aSimType, m_plotNotebook, wxID_ANY );
 
+    if( m_welcomePanel )
+    {
+        m_plotNotebook->DeletePage( 0 );
+        m_welcomePanel = nullptr;
+    }
+
     m_plotNotebook->AddPage( plot, wxString::Format( wxT( "Plot%u" ),
             (unsigned int) m_plotNotebook->GetPageCount() + 1 ), true );
 
@@ -286,7 +284,7 @@ void SIM_PLOT_FRAME::addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const
     // Create a new plot if the current one displays a different type
     SIM_PLOT_PANEL* plotPanel = CurrentPlot();
 
-    if( plotPanel == nullptr || plotPanel->GetType() != simType )
+    if( !plotPanel || plotPanel->GetType() != simType )
         plotPanel = NewPlotPanel( simType );
 
     TRACE_DESC descriptor( *m_exporter, aName, aType, aParam );
@@ -314,6 +312,7 @@ void SIM_PLOT_FRAME::addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const
     }
 }
 
+
 void SIM_PLOT_FRAME::removePlot( const wxString& aPlotName )
 {
     SIM_PLOT_PANEL* plotPanel = CurrentPlot();
@@ -440,7 +439,7 @@ void SIM_PLOT_FRAME::updateTuners()
 
     m_tuneSizer->Clear();
 
-    for( auto tuner : m_plots[plotPanel].m_tuners )
+    for( auto& tuner : m_plots[plotPanel].m_tuners )
     {
         m_tuneSizer->Add( tuner );
         tuner->Show();
@@ -598,7 +597,27 @@ void SIM_PLOT_FRAME::menuShowCoordsUpdate( wxUpdateUIEvent& event )
 }
 #endif
 
-void SIM_PLOT_FRAME::onPlotChanged( wxNotebookEvent& event )
+
+void SIM_PLOT_FRAME::onPlotClose( wxAuiNotebookEvent& event )
+{
+    int idx = event.GetSelection();
+
+    if( idx == wxNOT_FOUND )
+        return;
+
+    SIM_PLOT_PANEL* plotPanel = dynamic_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetPage( idx ) );
+
+    if( !plotPanel )
+        return;
+
+    m_plots.erase( plotPanel );
+    updateSignalList();
+    updateTuners();
+    updateCursors();
+}
+
+
+void SIM_PLOT_FRAME::onPlotChanged( wxAuiNotebookEvent& event )
 {
     updateSignalList();
     updateTuners();
@@ -697,13 +716,17 @@ void SIM_PLOT_FRAME::onClose( wxCloseEvent& aEvent )
 void SIM_PLOT_FRAME::onCursorUpdate( wxCommandEvent& event )
 {
     wxSize size = m_cursors->GetClientSize();
+    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
     m_cursors->ClearAll();
 
-    const long SIGNAL_COL = m_cursors->AppendColumn( wxT( "Signal" ), wxLIST_FORMAT_LEFT, size.x / 2 );
-    const long X_COL = m_cursors->AppendColumn( CurrentPlot()->GetLabelX(), wxLIST_FORMAT_LEFT, size.x / 4 );
+    if( !plotPanel )
+        return;
 
-    wxString labelY1 = CurrentPlot()->GetLabelY1();
-    wxString labelY2 = CurrentPlot()->GetLabelY2();
+    const long SIGNAL_COL = m_cursors->AppendColumn( wxT( "Signal" ), wxLIST_FORMAT_LEFT, size.x / 2 );
+    const long X_COL = m_cursors->AppendColumn( plotPanel->GetLabelX(), wxLIST_FORMAT_LEFT, size.x / 4 );
+
+    wxString labelY1 = plotPanel->GetLabelY1();
+    wxString labelY2 = plotPanel->GetLabelY2();
     wxString labelY;
 
     if( !labelY2.IsEmpty() )
@@ -714,7 +737,7 @@ void SIM_PLOT_FRAME::onCursorUpdate( wxCommandEvent& event )
     const long Y_COL = m_cursors->AppendColumn( labelY, wxLIST_FORMAT_LEFT, size.x / 4 );
 
     // Update cursor values
-    for( const auto& trace : CurrentPlot()->GetTraces() )
+    for( const auto& trace : plotPanel->GetTraces() )
     {
         if( CURSOR* cursor = trace.second->GetCursor() )
         {
@@ -746,7 +769,7 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
 
     SIM_PLOT_PANEL* plotPanel = CurrentPlot();
 
-    if( plotPanel == nullptr || plotPanel->GetType() != simType )
+    if( !plotPanel || plotPanel->GetType() != simType )
         plotPanel = NewPlotPanel( simType );
 
     // If there are any signals plotted, update them
@@ -784,7 +807,7 @@ void SIM_PLOT_FRAME::onSimUpdate( wxCommandEvent& aEvent )
     // Apply tuned values
     if( SIM_PLOT_PANEL* plotPanel = CurrentPlot() )
     {
-        for( auto tuner : m_plots[plotPanel].m_tuners )
+        for( auto& tuner : m_plots[plotPanel].m_tuners )
         {
             /// @todo no ngspice hardcoding
             std::string command( "alter @" + tuner->GetSpiceName()
@@ -807,6 +830,13 @@ void SIM_PLOT_FRAME::onSimReport( wxCommandEvent& aEvent )
 }
 
 
+SIM_PLOT_FRAME::PLOT_INFO::~PLOT_INFO()
+{
+    for( auto& t : m_tuners )
+        t->Destroy();
+}
+
+
 SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::SIGNAL_CONTEXT_MENU( const wxString& aSignal,
         SIM_PLOT_FRAME* aPlotFrame )
     : m_signal( aSignal ), m_plotFrame( aPlotFrame )
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index e984564152..6b6286b3f9 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -200,7 +200,8 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         //void menuShowCoordsUpdate( wxUpdateUIEvent& event ) override;
 
         // Event handlers
-        void onPlotChanged( wxNotebookEvent& event ) override;
+        void onPlotChanged( wxAuiNotebookEvent& event ) override;
+        void onPlotClose( wxAuiNotebookEvent& event ) override;
 
         void onSignalDblClick( wxCommandEvent& event ) override;
         void onSignalRClick( wxMouseEvent& event ) override;
@@ -232,9 +233,15 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         typedef std::map<wxString, TRACE_DESC> TRACE_MAP;
         typedef std::list<TUNER_SLIDER*> TUNER_LIST;
 
-        struct PLOT_INFO
+        class PLOT_INFO
         {
+        public:
+            ~PLOT_INFO();
+
+            ///> List of component value tuners
             TUNER_LIST m_tuners;
+
+            ///> Map of the traces displayed on the plot
             TRACE_MAP m_traces;
         };
 
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index 531e93fa9a..a227c96e9e 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -122,7 +122,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_plotPanel = new wxPanel( m_splitterConsole, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	m_sizer5 = new wxBoxSizer( wxHORIZONTAL );
 	
-	m_plotNotebook = new wxNotebook( m_plotPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_plotNotebook = new wxAuiNotebook( m_plotPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_MIDDLE_CLICK_CLOSE|wxAUI_NB_TAB_MOVE|wxAUI_NB_TAB_SPLIT|wxAUI_NB_TOP );
 	m_welcomePanel = new wxPanel( m_plotNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	m_sizer8 = new wxBoxSizer( wxVERTICAL );
 	
@@ -155,9 +155,9 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_welcomePanel->SetSizer( m_sizer8 );
 	m_welcomePanel->Layout();
 	m_sizer8->Fit( m_welcomePanel );
-	m_plotNotebook->AddPage( m_welcomePanel, _("a page"), false );
+	m_plotNotebook->AddPage( m_welcomePanel, _("a page"), false, wxNullBitmap );
 	
-	m_sizer5->Add( m_plotNotebook, 3, wxEXPAND | wxALL, 5 );
+	m_sizer5->Add( m_plotNotebook, 1, wxEXPAND | wxALL, 5 );
 	
 	
 	m_plotPanel->SetSizer( m_sizer5 );
@@ -245,7 +245,8 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	this->Connect( m_showGrid->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridUpdate ) );
 	this->Connect( m_showLegend->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegend ) );
 	this->Connect( m_showLegend->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegendUpdate ) );
-	m_plotNotebook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotChanged ), NULL, this );
+	m_plotNotebook->Connect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotChanged ), NULL, this );
+	m_plotNotebook->Connect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, wxAuiNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotClose ), NULL, this );
 	m_signals->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
 	m_signals->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
 }
@@ -271,7 +272,8 @@ SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
 	this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowGridUpdate ) );
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegend ) );
 	this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( SIM_PLOT_FRAME_BASE::menuShowLegendUpdate ) );
-	m_plotNotebook->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotChanged ), NULL, this );
+	m_plotNotebook->Disconnect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotChanged ), NULL, this );
+	m_plotNotebook->Disconnect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, wxAuiNotebookEventHandler( SIM_PLOT_FRAME_BASE::onPlotClose ), NULL, this );
 	m_signals->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::onSignalDblClick ), NULL, this );
 	m_signals->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( SIM_PLOT_FRAME_BASE::onSignalRClick ), NULL, this );
 	
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index 714cd890e4..793009961f 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -240,7 +240,7 @@
                         <event name="OnUpdateUI"></event>
                     </object>
                 </object>
-                <object class="wxMenu" expanded="1">
+                <object class="wxMenu" expanded="0">
                     <property name="label">Simulation</property>
                     <property name="name">m_simulationMenu</property>
                     <property name="permission">protected</property>
@@ -328,7 +328,7 @@
                         <event name="OnUpdateUI"></event>
                     </object>
                 </object>
-                <object class="wxMenu" expanded="1">
+                <object class="wxMenu" expanded="0">
                     <property name="label">View</property>
                     <property name="name">m_viewMenu</property>
                     <property name="permission">protected</property>
@@ -418,11 +418,11 @@
                 <property name="name">m_sizer1</property>
                 <property name="orient">wxVERTICAL</property>
                 <property name="permission">protected</property>
-                <object class="sizeritem" expanded="1">
+                <object class="sizeritem" expanded="0">
                     <property name="border">5</property>
                     <property name="flag">wxEXPAND</property>
                     <property name="proportion">0</property>
-                    <object class="wxToolBar" expanded="1">
+                    <object class="wxToolBar" expanded="0">
                         <property name="BottomDockable">1</property>
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
@@ -834,16 +834,16 @@
                                                     <event name="OnSetFocus"></event>
                                                     <event name="OnSize"></event>
                                                     <event name="OnUpdateUI"></event>
-                                                    <object class="wxBoxSizer" expanded="0">
+                                                    <object class="wxBoxSizer" expanded="1">
                                                         <property name="minimum_size"></property>
                                                         <property name="name">m_sizer5</property>
                                                         <property name="orient">wxHORIZONTAL</property>
                                                         <property name="permission">protected</property>
-                                                        <object class="sizeritem" expanded="0">
+                                                        <object class="sizeritem" expanded="1">
                                                             <property name="border">5</property>
                                                             <property name="flag">wxEXPAND | wxALL</property>
-                                                            <property name="proportion">3</property>
-                                                            <object class="wxNotebook" expanded="0">
+                                                            <property name="proportion">1</property>
+                                                            <object class="wxAuiNotebook" expanded="1">
                                                                 <property name="BottomDockable">1</property>
                                                                 <property name="LeftDockable">1</property>
                                                                 <property name="RightDockable">1</property>
@@ -854,7 +854,6 @@
                                                                 <property name="aui_row"></property>
                                                                 <property name="best_size"></property>
                                                                 <property name="bg"></property>
-                                                                <property name="bitmapsize"></property>
                                                                 <property name="caption"></property>
                                                                 <property name="caption_visible">1</property>
                                                                 <property name="center_pane">0</property>
@@ -877,7 +876,7 @@
                                                                 <property name="maximum_size"></property>
                                                                 <property name="min_size"></property>
                                                                 <property name="minimize_button">0</property>
-                                                                <property name="minimum_size">-1,-1</property>
+                                                                <property name="minimum_size"></property>
                                                                 <property name="moveable">1</property>
                                                                 <property name="name">m_plotNotebook</property>
                                                                 <property name="pane_border">1</property>
@@ -889,13 +888,24 @@
                                                                 <property name="resize">Resizable</property>
                                                                 <property name="show">1</property>
                                                                 <property name="size"></property>
-                                                                <property name="style"></property>
+                                                                <property name="style">wxAUI_NB_MIDDLE_CLICK_CLOSE|wxAUI_NB_TAB_MOVE|wxAUI_NB_TAB_SPLIT|wxAUI_NB_TOP</property>
                                                                 <property name="subclass"></property>
+                                                                <property name="tab_ctrl_height">-1</property>
                                                                 <property name="toolbar_pane">0</property>
                                                                 <property name="tooltip"></property>
+                                                                <property name="uniform_bitmap_size"></property>
                                                                 <property name="window_extra_style"></property>
                                                                 <property name="window_name"></property>
                                                                 <property name="window_style"></property>
+                                                                <event name="OnAuiNotebookAllowDND"></event>
+                                                                <event name="OnAuiNotebookBeginDrag"></event>
+                                                                <event name="OnAuiNotebookButton"></event>
+                                                                <event name="OnAuiNotebookDragMotion"></event>
+                                                                <event name="OnAuiNotebookEndDrag"></event>
+                                                                <event name="OnAuiNotebookPageChanged">onPlotChanged</event>
+                                                                <event name="OnAuiNotebookPageChanging"></event>
+                                                                <event name="OnAuiNotebookPageClose">onPlotClose</event>
+                                                                <event name="OnAuiNotebookPageClosed"></event>
                                                                 <event name="OnChar"></event>
                                                                 <event name="OnEnterWindow"></event>
                                                                 <event name="OnEraseBackground"></event>
@@ -912,8 +922,6 @@
                                                                 <event name="OnMotion"></event>
                                                                 <event name="OnMouseEvents"></event>
                                                                 <event name="OnMouseWheel"></event>
-                                                                <event name="OnNotebookPageChanged">onPlotChanged</event>
-                                                                <event name="OnNotebookPageChanging"></event>
                                                                 <event name="OnPaint"></event>
                                                                 <event name="OnRightDClick"></event>
                                                                 <event name="OnRightDown"></event>
@@ -921,7 +929,7 @@
                                                                 <event name="OnSetFocus"></event>
                                                                 <event name="OnSize"></event>
                                                                 <event name="OnUpdateUI"></event>
-                                                                <object class="notebookpage" expanded="0">
+                                                                <object class="auinotebookpage" expanded="1">
                                                                     <property name="bitmap"></property>
                                                                     <property name="label">a page</property>
                                                                     <property name="select">0</property>
@@ -1146,8 +1154,8 @@
                                                     </object>
                                                 </object>
                                             </object>
-                                            <object class="splitteritem" expanded="1">
-                                                <object class="wxPanel" expanded="1">
+                                            <object class="splitteritem" expanded="0">
+                                                <object class="wxPanel" expanded="0">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -1221,7 +1229,7 @@
                                                     <event name="OnSetFocus"></event>
                                                     <event name="OnSize"></event>
                                                     <event name="OnUpdateUI"></event>
-                                                    <object class="wxBoxSizer" expanded="1">
+                                                    <object class="wxBoxSizer" expanded="0">
                                                         <property name="minimum_size"></property>
                                                         <property name="name">m_sizer13</property>
                                                         <property name="orient">wxVERTICAL</property>
@@ -1325,8 +1333,8 @@
                                 </object>
                             </object>
                         </object>
-                        <object class="splitteritem" expanded="1">
-                            <object class="wxPanel" expanded="1">
+                        <object class="splitteritem" expanded="0">
+                            <object class="wxPanel" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -1400,16 +1408,16 @@
                                 <event name="OnSetFocus"></event>
                                 <event name="OnSize"></event>
                                 <event name="OnUpdateUI"></event>
-                                <object class="wxBoxSizer" expanded="1">
+                                <object class="wxBoxSizer" expanded="0">
                                     <property name="minimum_size"></property>
                                     <property name="name">m_sideSizer</property>
                                     <property name="orient">wxVERTICAL</property>
                                     <property name="permission">protected</property>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxStaticBoxSizer" expanded="1">
+                                        <object class="wxStaticBoxSizer" expanded="0">
                                             <property name="id">wxID_ANY</property>
                                             <property name="label">Signals</property>
                                             <property name="minimum_size"></property>
@@ -1508,11 +1516,11 @@
                                             </object>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="1">
+                                    <object class="sizeritem" expanded="0">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxStaticBoxSizer" expanded="1">
+                                        <object class="wxStaticBoxSizer" expanded="0">
                                             <property name="id">wxID_ANY</property>
                                             <property name="label">Cursors</property>
                                             <property name="minimum_size"></property>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index 6343e3413d..aad625bb50 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -27,7 +27,7 @@ class KIWAY_PLAYER;
 #include <wx/stattext.h>
 #include <wx/sizer.h>
 #include <wx/panel.h>
-#include <wx/notebook.h>
+#include <wx/aui/auibook.h>
 #include <wx/textctrl.h>
 #include <wx/splitter.h>
 #include <wx/listbox.h>
@@ -58,7 +58,7 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxSplitterWindow* m_splitterConsole;
 		wxPanel* m_plotPanel;
 		wxBoxSizer* m_sizer5;
-		wxNotebook* m_plotNotebook;
+		wxAuiNotebook* m_plotNotebook;
 		wxPanel* m_welcomePanel;
 		wxBoxSizer* m_sizer8;
 		wxStaticText* m_staticText2;
@@ -86,7 +86,8 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		virtual void menuShowGridUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
 		virtual void menuShowLegend( wxCommandEvent& event ) { event.Skip(); }
 		virtual void menuShowLegendUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
-		virtual void onPlotChanged( wxNotebookEvent& event ) { event.Skip(); }
+		virtual void onPlotChanged( wxAuiNotebookEvent& event ) { event.Skip(); }
+		virtual void onPlotClose( wxAuiNotebookEvent& event ) { event.Skip(); }
 		virtual void onSignalDblClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onSignalRClick( wxMouseEvent& event ) { event.Skip(); }
 		

From 5772938a71f7d3102fa708e3cd664549d43e8581 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:07 +0200
Subject: [PATCH 153/197] New cursor shows up in the center, can be dragged by
 its axis

---
 eeschema/sim/sim_plot_panel.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 6d5bc8ff07..e6464e2b35 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -195,6 +195,7 @@ public:
     }
 };
 
+
 void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
 {
     if( !m_window )
@@ -274,7 +275,7 @@ bool CURSOR::Inside( wxPoint& aPoint )
         return false;
 
     return ( std::abs( aPoint.x - m_window->x2p( m_trace->x2s( m_coords.x ) ) ) <= DRAG_MARGIN )
-        && ( std::abs( aPoint.y - m_window->y2p( m_trace->y2s( m_coords.y ) ) ) <= DRAG_MARGIN );
+        || ( std::abs( aPoint.y - m_window->y2p( m_trace->y2s( m_coords.y ) ) ) <= DRAG_MARGIN );
 }
 
 
@@ -495,6 +496,8 @@ void SIM_PLOT_PANEL::EnableCursor( const wxString& aName, bool aEnable )
     if( aEnable )
     {
         CURSOR* c = new CURSOR( t );
+        int plotCenter = GetMarginLeft() + ( GetXScreen() - GetMarginLeft() - GetMarginRight() ) / 2;
+        c->Move( wxPoint( plotCenter, 0 ) );
         t->SetCursor( c );
         AddLayer( c );
     }

From bf758dce3e619e9bb3b1dddca6e54c0a2c2928ef Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:07 +0200
Subject: [PATCH 154/197] Tuners are common for all plots

---
 eeschema/sim/sim_plot_frame.cpp | 75 +++++++++------------------------
 eeschema/sim/sim_plot_frame.h   | 23 +++++-----
 2 files changed, 29 insertions(+), 69 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 72c50f42b8..d3f0f7b6c1 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -167,6 +167,7 @@ void SIM_PLOT_FRAME::StartSimulation()
     m_simulator->SetReporter( new SIM_THREAD_REPORTER( this ) );
     m_simulator->Init();
     m_simulator->LoadNetlist( formatter.GetString() );
+    applyTuners();
     m_simulator->Run();
 
     Layout();
@@ -229,23 +230,22 @@ void SIM_PLOT_FRAME::AddTuner( SCH_COMPONENT* aComponent )
         return;
 
     const wxString& componentName = aComponent->GetField( REFERENCE )->GetText();
-    auto& tunerList = m_plots[plotPanel].m_tuners;
 
     // Do not add multiple instances for the same component
-    auto tunerIt = std::find_if( tunerList.begin(), tunerList.end(), [&]( const TUNER_SLIDER* t )
+    auto tunerIt = std::find_if( m_tuners.begin(), m_tuners.end(), [&]( const TUNER_SLIDER* t )
         {
             return t->GetComponentName() == componentName;
         }
     );
 
-    if( tunerIt != tunerList.end() )
+    if( tunerIt != m_tuners.end() )
         return;     // We already have it
 
     try
     {
         TUNER_SLIDER* tuner = new TUNER_SLIDER( this, m_sidePanel, aComponent );
         m_tuneSizer->Add( tuner );
-        tunerList.push_back( tuner );
+        m_tuners.push_back( tuner );
         m_sidePanel->Layout();
     }
     catch( ... )
@@ -257,12 +257,7 @@ void SIM_PLOT_FRAME::AddTuner( SCH_COMPONENT* aComponent )
 
 void SIM_PLOT_FRAME::RemoveTuner( TUNER_SLIDER* aTuner )
 {
-    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
-
-    if( !plotPanel )
-        return;
-
-    m_plots[plotPanel].m_tuners.remove( aTuner );
+    m_tuners.remove( aTuner );
     aTuner->Destroy();
     m_sidePanel->Layout();
 }
@@ -427,34 +422,24 @@ void SIM_PLOT_FRAME::updateSignalList()
 }
 
 
-void SIM_PLOT_FRAME::updateTuners()
-{
-    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
-
-    if( !plotPanel )
-        return;
-
-    for( unsigned int i = 0; i < m_tuneSizer->GetItemCount(); ++i )
-        m_tuneSizer->Hide( i );
-
-    m_tuneSizer->Clear();
-
-    for( auto& tuner : m_plots[plotPanel].m_tuners )
-    {
-        m_tuneSizer->Add( tuner );
-        tuner->Show();
-    }
-
-    Layout();
-}
-
-
 void SIM_PLOT_FRAME::updateCursors()
 {
     wxQueueEvent( this, new wxCommandEvent( EVT_SIM_CURSOR_UPDATE ) );
 }
 
 
+void SIM_PLOT_FRAME::applyTuners()
+{
+    for( auto& tuner : m_tuners )
+    {
+        /// @todo no ngspice hardcoding
+        std::string command( "alter @" + tuner->GetSpiceName()
+                + "=" + tuner->GetValue().ToSpiceString() );
+        m_simulator->Command( command );
+    }
+}
+
+
 SIM_PLOT_TYPE SIM_PLOT_FRAME::GetXAxisType( SIM_TYPE aType ) const
 {
     switch( aType )
@@ -612,7 +597,6 @@ void SIM_PLOT_FRAME::onPlotClose( wxAuiNotebookEvent& event )
 
     m_plots.erase( plotPanel );
     updateSignalList();
-    updateTuners();
     updateCursors();
 }
 
@@ -620,7 +604,6 @@ void SIM_PLOT_FRAME::onPlotClose( wxAuiNotebookEvent& event )
 void SIM_PLOT_FRAME::onPlotChanged( wxAuiNotebookEvent& event )
 {
     updateSignalList();
-    updateTuners();
     updateCursors();
 }
 
@@ -803,21 +786,8 @@ void SIM_PLOT_FRAME::onSimUpdate( wxCommandEvent& aEvent )
         StopSimulation();
 
     m_simConsole->Clear();
-
-    // Apply tuned values
-    if( SIM_PLOT_PANEL* plotPanel = CurrentPlot() )
-    {
-        for( auto& tuner : m_plots[plotPanel].m_tuners )
-        {
-            /// @todo no ngspice hardcoding
-            std::string command( "alter @" + tuner->GetSpiceName()
-                    + "=" + tuner->GetValue().ToSpiceString() );
-            m_simulator->Command( command );
-
-//            printf("CMD: %s\n", command.c_str() );
-        }
-    }
-
+    // Do not export netlist, it is already stored in the simulator
+    applyTuners();
     m_simulator->Run();
 }
 
@@ -830,13 +800,6 @@ void SIM_PLOT_FRAME::onSimReport( wxCommandEvent& aEvent )
 }
 
 
-SIM_PLOT_FRAME::PLOT_INFO::~PLOT_INFO()
-{
-    for( auto& t : m_tuners )
-        t->Destroy();
-}
-
-
 SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::SIGNAL_CONTEXT_MENU( const wxString& aSignal,
         SIM_PLOT_FRAME* aPlotFrame )
     : m_signal( aSignal ), m_plotFrame( aPlotFrame )
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 6b6286b3f9..490196b426 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -167,16 +167,16 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
          */
         void updateSignalList();
 
-        /**
-         * @brief Fills the tuners area with the ones related to the current plot.
-         */
-        void updateTuners();
-
         /**
          * @brief Updates the cursor values list.
          */
         void updateCursors();
 
+        /**
+         * @brief Applies component values specified using tunder sliders to the current netlist.
+         */
+        void applyTuners();
+
         SIM_PLOT_TYPE GetXAxisType( SIM_TYPE aType ) const;
 
         // Menu handlers
@@ -231,22 +231,19 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         std::unique_ptr<SPICE_SIMULATOR> m_simulator;
 
         typedef std::map<wxString, TRACE_DESC> TRACE_MAP;
-        typedef std::list<TUNER_SLIDER*> TUNER_LIST;
 
-        class PLOT_INFO
+        struct PLOT_INFO
         {
-        public:
-            ~PLOT_INFO();
-
-            ///> List of component value tuners
-            TUNER_LIST m_tuners;
-
             ///> Map of the traces displayed on the plot
             TRACE_MAP m_traces;
         };
 
+        ///> Map of plot panels and associated data
         std::map<SIM_PLOT_PANEL*, PLOT_INFO> m_plots;
 
+        ///> List of currently displayed tuners
+        std::list<TUNER_SLIDER*> m_tuners;
+
         // Trick to preserve settings between runs
         DIALOG_SIM_SETTINGS m_settingsDlg;
 

From dbf0fd61562459be61a01644ad3c8a53874f94c0 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:07 +0200
Subject: [PATCH 155/197] Better normalization rules for SPICE_VALUE

---
 eeschema/sim/spice_value.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eeschema/sim/spice_value.cpp b/eeschema/sim/spice_value.cpp
index 21608a4078..a65875355d 100644
--- a/eeschema/sim/spice_value.cpp
+++ b/eeschema/sim/spice_value.cpp
@@ -87,7 +87,7 @@ void SPICE_VALUE::Normalize()
         m_prefix = (UNIT_PREFIX)( m_prefix + 3 );
     }
 
-    while( m_base != 0.0 && std::fabs( m_base ) <= 1.000 )
+    while( m_base != 0.0 && std::fabs( m_base ) < 1.000 )
     {
         m_base *= 1000.0;
         m_prefix = (UNIT_PREFIX)( m_prefix - 3 );

From 63bdb3995e3c46828272d0fa8112ebf60a6b3204 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:08 +0200
Subject: [PATCH 156/197] Fixes for limited view panning

---
 common/widgets/mathplot.cpp | 67 +++++++++++++++++++++++++++++++++----
 include/widgets/mathplot.h  | 16 +++++++++
 2 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index 4d497985d6..7758b8048b 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -1930,14 +1930,59 @@ void mpWindow::DoZoomOutYCalc  (const int staticYpixel)
 }
 
 
+void mpWindow::AdjustLimitedView()
+{
+    if(!m_enableLimitedView)
+        return;
+
+    const double xMin = m_minX - m_marginLeft / m_scaleX;
+    const double xMax = m_maxX - m_marginRight / m_scaleX;
+    const double yMin = m_minY + m_marginTop / m_scaleY;
+    const double yMax = m_maxY + m_marginBottom / m_scaleY;
+
+    if(m_desiredXmin < xMin)
+    {
+        double diff = xMin - m_desiredXmin;
+        m_posX += diff;
+        m_desiredXmax += diff;
+        m_desiredXmin = xMin;
+    }
+
+    if(m_desiredXmax > xMax)
+    {
+        double diff = m_desiredXmax - xMax;
+        m_posX -= diff;
+        m_desiredXmin -= diff;
+        m_desiredXmax = xMax;
+    }
+
+    if(m_desiredYmin < yMin)
+    {
+        double diff = yMin - m_desiredYmin;
+        m_posY += diff;
+        m_desiredYmax += diff;
+        m_desiredYmin = yMin;
+    }
+
+    if(m_desiredYmax > yMax)
+    {
+        double diff = m_desiredYmax - yMax;
+        m_posY -= diff;
+        m_desiredYmin -= diff;
+        m_desiredYmax = yMax;
+    }
+}
+
+
 bool mpWindow::SetXView(double pos, double desiredMax, double desiredMin)
 {
-    if(m_enableLimitedView && (desiredMax > m_maxX || desiredMin < m_minX))
-        return false;
+    //if(!CheckXLimits(desiredMax, desiredMin))
+        //return false;
 
     m_posX = pos;
     m_desiredXmax = desiredMax;
     m_desiredXmin = desiredMin;
+    AdjustLimitedView();
 
     return true;
 }
@@ -1945,12 +1990,13 @@ bool mpWindow::SetXView(double pos, double desiredMax, double desiredMin)
 
 bool mpWindow::SetYView(double pos, double desiredMax, double desiredMin)
 {
-    if(m_enableLimitedView && (desiredMax > m_maxY || desiredMin < m_minY))
-        return false;
+    //if(!CheckYLimits(desiredMax, desiredMin))
+        //return false;
 
     m_posY = pos;
     m_desiredYmax = desiredMax;
     m_desiredYmin = desiredMin;
+    AdjustLimitedView();
 
     return true;
 }
@@ -1965,6 +2011,13 @@ void mpWindow::ZoomIn(const wxPoint& centerPoint )
         c.x = (m_scrX - m_marginLeft - m_marginRight)/2 + m_marginLeft; // c.x = m_scrX/2;
         c.y = (m_scrY - m_marginTop - m_marginBottom)/2 - m_marginTop; // c.y = m_scrY/2;
     }
+    else
+    {
+        c.x = std::max(c.x, m_marginLeft);
+        c.x = std::min(c.x, m_scrX - m_marginRight);
+        c.y = std::max(c.y, m_marginTop);
+        c.y = std::min(c.y, m_scrY - m_marginBottom);
+    }
 
     // Preserve the position of the clicked point:
     double prior_layer_x = p2x( c.x );
@@ -1994,7 +2047,7 @@ void mpWindow::ZoomIn(const wxPoint& centerPoint )
     m_desiredXmax = m_posX + (m_scrX - m_marginLeft - m_marginRight) / m_scaleX; // m_desiredXmax = m_posX + m_scrX / m_scaleX;
     m_desiredYmax = m_posY;
     m_desiredYmin = m_posY - (m_scrY - m_marginTop - m_marginBottom) / m_scaleY; // m_desiredYmin = m_posY - m_scrY / m_scaleY;
-
+    AdjustLimitedView();
 
 #ifdef MATHPLOT_DO_LOGGING
     wxLogMessage(_("mpWindow::ZoomIn() prior coords: (%f,%f), new coords: (%f,%f) SHOULD BE EQUAL!!"), prior_layer_x,prior_layer_y, p2x(c.x),p2y(c.y));
@@ -2033,8 +2086,7 @@ void mpWindow::ZoomOut(const wxPoint& centerPoint )
     //printf("desired xmin %.1f ymin %.1f xmax %.1f ymax %.1f l %d\n", m_desiredXmin, m_desiredYmin, m_desiredXmax, m_desiredYmax, !!m_enableLimitedView);
     //printf("current xmin %.1f ymin %.1f xmax %.1f ymax %.1f\n", m_minX, m_minY, m_maxX, m_maxY);
 
-    if(m_enableLimitedView && (m_desiredXmin < m_minX || m_desiredXmin < m_minX
-                            || m_desiredXmax > m_maxX || m_desiredXmax > m_maxX))
+    if(!CheckXLimits(m_desiredXmax, m_desiredXmin) || !CheckYLimits(m_desiredYmax, m_desiredYmin))
     {
         //printf("call fit()\n");
         Fit();
@@ -2089,6 +2141,7 @@ void mpWindow::ZoomRect(wxPoint p0, wxPoint p1)
 #endif
 
     Fit(zoom_x_min,zoom_x_max,zoom_y_min,zoom_y_max);
+    AdjustLimitedView();
 }
 
 void mpWindow::LockAspect(bool enable)
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index 23671bf93d..2b4e7a6377 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -1406,6 +1406,22 @@ class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
         void DoZoomOutXCalc  (const int         staticXpixel);
         void DoZoomOutYCalc  (const int         staticYpixel);
 
+        bool CheckXLimits(double& desiredMax, double& desiredMin) const
+        {
+            return !(m_enableLimitedView
+                    && (desiredMax > m_maxX - m_marginRight / m_scaleX
+                    || desiredMin < m_minX - m_marginLeft / m_scaleX));
+        }
+
+        bool CheckYLimits(double& desiredMax, double& desiredMin) const
+        {
+            return !(m_enableLimitedView
+                    && (desiredMax > m_maxY + m_marginBottom / m_scaleY
+                    || desiredMin < m_minY + m_marginTop / m_scaleY));
+        }
+
+        void AdjustLimitedView();
+
         /** Recalculate global layer bounding box, and save it in m_minX,...
          * \return true if there is any valid BBox information.
          */

From 39caddd22b1a48749e1b7ba8d674bddf9a71a4ac Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:08 +0200
Subject: [PATCH 157/197] Parsing sim command directives

---
 eeschema/dialogs/dialog_sim_settings.cpp | 120 +++++++++++++++++++++--
 eeschema/dialogs/dialog_sim_settings.h   |  17 ++++
 2 files changed, 127 insertions(+), 10 deletions(-)

diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
index 813f76b80a..190c128329 100644
--- a/eeschema/dialogs/dialog_sim_settings.cpp
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -26,9 +26,18 @@
 #include <sim/netlist_exporter_pspice_sim.h>
 #include <confirm.h>
 
+#include <wx/tokenzr.h>
+
 /// @todo ngspice offers more types of analysis,
 //so there are a few tabs missing (e.g. pole-zero, distortion, sensitivity)
 
+// Helper function to shorten conditions
+static bool empty( const wxTextEntryBase* aCtrl )
+{
+    return aCtrl->GetValue().IsEmpty();
+}
+
+
 DIALOG_SIM_SETTINGS::DIALOG_SIM_SETTINGS( wxWindow* aParent )
     : DIALOG_SIM_SETTINGS_BASE( aParent ), m_exporter( nullptr ), m_spiceEmptyValidator( true )
 {
@@ -94,7 +103,7 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
 
         if( m_dcEnable1->IsChecked() )
         {
-            if( m_dcSource1->GetValue().IsEmpty() )
+            if( empty( m_dcSource1 ) )
             {
                 DisplayError( this, wxT( "You need to select DC source (sweep 1)" ) );
                 return false;
@@ -122,7 +131,7 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
 
         if( m_dcEnable2->IsChecked() )
         {
-            if( m_dcSource2->GetValue().IsEmpty() )
+            if( empty( m_dcSource2 ) )
             {
                 DisplayError( this, wxT( "You need to select DC source (sweep 2)" ) );
                 return false;
@@ -157,13 +166,12 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
     {
         const NETLIST_EXPORTER_PSPICE::NET_INDEX_MAP& netMap = m_exporter->GetNetIndexMap();
 
-        if( m_noiseMeas->GetValue().IsEmpty() || m_noiseSrc->GetValue().IsEmpty() ||
-                m_noisePointsNumber->IsEmpty() || m_noiseFreqStart->IsEmpty() ||
-                m_noiseFreqStop->IsEmpty() )
+        if( empty( m_noiseMeas ) || empty( m_noiseSrc ) || empty( m_noisePointsNumber )
+                || empty( m_noiseFreqStart ) || empty( m_noiseFreqStop ) )
             return false;
 
-        wxString ref = m_noiseRef->GetValue().IsEmpty() ? wxString()
-            : wxString::Format( ", %d", netMap.at( m_noiseRef->GetValue() ) );
+        wxString ref = empty( m_noiseRef )
+            ? wxString() : wxString::Format( ", %d", netMap.at( m_noiseRef->GetValue() ) );
 
         m_simCommand = wxString::Format( ".noise v(%d%s) v%s %s %s %s %s",
             netMap.at( m_noiseMeas->GetValue() ), ref,
@@ -187,8 +195,8 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
         if( !m_pgTransient->Validate() )
             return false;
 
-        wxString initial =
-            m_transInitial->IsEmpty() ? "" : SPICE_VALUE( m_transInitial->GetValue() ).ToSpiceString();
+        wxString initial = empty( m_transInitial )
+            ? "" : SPICE_VALUE( m_transInitial->GetValue() ).ToSpiceString();
 
         m_simCommand = wxString::Format( ".tran %s %s %s",
             SPICE_VALUE( m_transStep->GetValue() ).ToSpiceString(),
@@ -217,9 +225,12 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
 bool DIALOG_SIM_SETTINGS::TransferDataToWindow()
 {
     /// @todo one day it could interpret the sim command and fill out appropriate fields..
-    if( m_customTxt->IsEmpty() )
+    if( empty( m_customTxt ) )
         loadDirectives();
 
+    if( m_simCommand.IsEmpty() && !empty( m_customTxt ) )
+        return parseCommand( m_customTxt->GetValue() );
+
     return true;
 }
 
@@ -284,6 +295,95 @@ int DIALOG_SIM_SETTINGS::ShowModal()
 }
 
 
+bool DIALOG_SIM_SETTINGS::parseCommand( const wxString& aCommand )
+{
+    if( aCommand.IsEmpty() )
+        return false;
+
+    wxStringTokenizer tokenizer( aCommand, " " );
+    wxString tkn = tokenizer.GetNextToken().Lower();
+
+    try {
+        if( tkn == ".ac" )
+        {
+            m_simPages->SetSelection( m_simPages->FindPage( m_pgAC ) );
+
+            tkn = tokenizer.GetNextToken().Lower();
+
+            if( tkn == "dec" )
+                m_acScale->SetSelection( 0 );
+            if( tkn == "oct" )
+                m_acScale->SetSelection( 1 );
+            if( tkn == "lin" )
+                m_acScale->SetSelection( 2 );
+            else
+                return false;
+
+            m_acPointsNumber->SetValue( tokenizer.GetNextToken() );
+            m_acFreqStart->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+            m_acFreqStop->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+
+            // Check required fields
+            if( empty( m_acPointsNumber ) || empty( m_acFreqStart ) || empty( m_acFreqStop ) )
+                return false;
+        }
+
+        else if( tkn == ".dc" )
+        {
+            m_simPages->SetSelection( m_simPages->FindPage( m_pgDC ) );
+
+            m_dcSource1->SetValue( tokenizer.GetNextToken() );
+            m_dcStart1->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+            m_dcStop1->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+            m_dcIncr1->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+
+            // Check the 'Enabled' field, if all values are filled
+            m_dcEnable1->SetValue( !empty( m_dcSource1 ) && !empty( m_dcStart1 )
+                    && !empty( m_dcStop1 ) && !empty( m_dcIncr1 ) );
+
+            m_dcSource2->SetValue( tokenizer.GetNextToken() );
+            m_dcStart2->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+            m_dcStop2->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+            m_dcIncr2->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+
+            // Check the 'Enabled' field, if all values are filled
+            m_dcEnable2->SetValue( !empty( m_dcSource2 ) && !empty( m_dcStart2 )
+                    && !empty( m_dcStop2 ) && !empty( m_dcIncr2 ) );
+
+            // Check if the directive is complete
+            if( !m_dcEnable1->IsChecked() || !m_dcEnable2->IsChecked() )
+                return false;
+        }
+
+        else if( tkn == ".tran" )
+        {
+            m_simPages->SetSelection( m_simPages->FindPage( m_pgTransient ) );
+
+            m_transStep->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+            m_transFinal->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+            m_transInitial->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+
+            // Check required fields
+            if( empty( m_transStep ) || empty( m_transFinal ) )
+                return false;
+        }
+
+        // Custom directives
+        else if( !empty( m_customTxt ) )
+        {
+            m_simPages->SetSelection( m_simPages->FindPage( m_pgCustom ) );
+        }
+    }
+    catch( ... )
+    {
+        // Nothing really bad has happened
+        return false;
+    }
+
+    return true;
+}
+
+
 void DIALOG_SIM_SETTINGS::loadDirectives()
 {
     if( m_exporter )
diff --git a/eeschema/dialogs/dialog_sim_settings.h b/eeschema/dialogs/dialog_sim_settings.h
index 9ac8829ce4..2be181bba4 100644
--- a/eeschema/dialogs/dialog_sim_settings.h
+++ b/eeschema/dialogs/dialog_sim_settings.h
@@ -42,6 +42,16 @@ public:
         return m_simCommand;
     }
 
+    bool SetSimCommand( const wxString& aCommand )
+    {
+        bool res = parseCommand( aCommand );
+
+        if( res )
+            m_simCommand = aCommand;
+
+        return res;
+    }
+
     int GetNetlistOptions() const
     {
         return m_netlistOpts;
@@ -65,6 +75,13 @@ private:
         LINEAR
     };
 
+    /**
+     * @brief Parses a Spice directive.
+     * @param aCommand is the directive to be parsed (e.g. ".tran 10n 1000n").
+     * @return bool if the directive was parsed correctly.
+     */
+    bool parseCommand( const wxString& aCommand );
+
     void onLoadDirectives( wxCommandEvent& event ) override
     {
         loadDirectives();

From 53d772989a4abefcdaa6281db80b52ae3e38247f Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:08 +0200
Subject: [PATCH 158/197] Store relative library path if possible

---
 eeschema/dialogs/dialog_spice_model.cpp      | 50 +++++++++++++-------
 eeschema/dialogs/dialog_spice_model_base.cpp |  2 +-
 eeschema/dialogs/dialog_spice_model_base.fbp |  2 +-
 eeschema/dialogs/dialog_spice_model_base.h   |  5 +-
 4 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp
index 603776b69f..e5f0d4ce28 100644
--- a/eeschema/dialogs/dialog_spice_model.cpp
+++ b/eeschema/dialogs/dialog_spice_model.cpp
@@ -27,6 +27,7 @@
 #include <netlist_exporters/netlist_exporter_pspice.h>
 #include <sim/spice_value.h>
 #include <confirm.h>
+#include <project.h>
 
 #include <wx/tokenzr.h>
 
@@ -263,7 +264,7 @@ bool DIALOG_SPICE_MODEL::TransferDataToWindow()
             {
                 const wxString& libFile = m_semiLib->GetValue();
                 m_fieldsTmp[SF_LIB_FILE] = libFile;
-                updateFromFile( m_semiModel, libFile, "model" );
+                updateFromFile( m_semiModel, libFile, ".model" );
             }
             break;
 
@@ -276,7 +277,7 @@ bool DIALOG_SPICE_MODEL::TransferDataToWindow()
             {
                 const wxString& libFile = m_icLib->GetValue();
                 m_fieldsTmp[SF_LIB_FILE] = libFile;
-                updateFromFile( m_icModel, libFile, "subckt" );
+                updateFromFile( m_icModel, libFile, ".subckt" );
             }
             break;
 
@@ -577,24 +578,25 @@ void DIALOG_SPICE_MODEL::updateFromFile( wxComboBox* aComboBox,
     aComboBox->Clear();
 
     // Process the file, looking for components
-    for( wxString line = file.GetFirstLine().Lower(); !file.Eof(); line = file.GetNextLine().Lower() )
+    for( wxString line = file.GetFirstLine().Lower(); !file.Eof(); line = file.GetNextLine() )
     {
-        int idx = line.Find( keyword );
+        wxStringTokenizer tokenizer( line, " " );
 
-        if( idx != wxNOT_FOUND )
+        while( tokenizer.HasMoreTokens() )
         {
-            wxString data = line.Mid( idx );
-            data = data.AfterFirst( ' ' );
-            data.Trim( false );
-            data = data.BeforeFirst( ' ' );
-            data.Trim();
+            wxString token = tokenizer.GetNextToken().Lower();
 
-            if( !data.IsEmpty() )
-                aComboBox->Append( data );
+            if( token == keyword )
+            {
+                token = tokenizer.GetNextToken();
+
+                if( !token.IsEmpty() )
+                    aComboBox->Append( token );
+            }
         }
     }
 
-    // Restore the previous value
+    // Restore the previous value or if there is none - pick the first one from the loaded library
     if( !curValue.IsEmpty() )
         aComboBox->SetValue( curValue );
     else if( aComboBox->GetCount() > 0 )
@@ -655,8 +657,15 @@ void DIALOG_SPICE_MODEL::onSemiSelectLib( wxCommandEvent& event )
     if( openDlg.ShowModal() == wxID_CANCEL )
         return;
 
-    m_semiLib->SetValue( openDlg.GetPath() );
-    updateFromFile( m_semiModel, openDlg.GetPath(), "model" );
+    wxFileName libPath( openDlg.GetPath() );
+
+    // Try to convert the path to relative to project
+    if( libPath.MakeRelativeTo( Prj().GetProjectPath() ) && !libPath.GetFullPath().StartsWith( ".." ) )
+        m_semiLib->SetValue( libPath.GetFullPath() );
+    else
+        m_semiLib->SetValue( openDlg.GetPath() );
+
+    updateFromFile( m_semiModel, openDlg.GetPath(), ".model" );
 }
 
 
@@ -670,8 +679,15 @@ void DIALOG_SPICE_MODEL::onSelectIcLib( wxCommandEvent& event )
     if( openDlg.ShowModal() == wxID_CANCEL )
         return;
 
-    m_icLib->SetValue( openDlg.GetPath() );
-    updateFromFile( m_icModel, openDlg.GetPath(), "subckt" );
+    wxFileName libPath( openDlg.GetPath() );
+
+    // Try to convert the path to relative to project
+    if( libPath.MakeRelativeTo( Prj().GetProjectPath() ) && !libPath.GetFullPath().StartsWith( ".." ) )
+        m_icLib->SetValue( libPath.GetFullPath() );
+    else
+        m_icLib->SetValue( openDlg.GetPath() );
+
+    updateFromFile( m_icModel, openDlg.GetPath(), ".subckt" );
 }
 
 
diff --git a/eeschema/dialogs/dialog_spice_model_base.cpp b/eeschema/dialogs/dialog_spice_model_base.cpp
index ff9a8f5dfd..8125f71d2f 100644
--- a/eeschema/dialogs/dialog_spice_model_base.cpp
+++ b/eeschema/dialogs/dialog_spice_model_base.cpp
@@ -9,7 +9,7 @@
 
 ///////////////////////////////////////////////////////////////////////////
 
-DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 	
diff --git a/eeschema/dialogs/dialog_spice_model_base.fbp b/eeschema/dialogs/dialog_spice_model_base.fbp
index 36fb42ec6c..25b938c003 100644
--- a/eeschema/dialogs/dialog_spice_model_base.fbp
+++ b/eeschema/dialogs/dialog_spice_model_base.fbp
@@ -46,7 +46,7 @@
             <property name="pos"></property>
             <property name="size">425,630</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE</property>
-            <property name="subclass"></property>
+            <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
             <property name="title"></property>
             <property name="tooltip"></property>
             <property name="window_extra_style"></property>
diff --git a/eeschema/dialogs/dialog_spice_model_base.h b/eeschema/dialogs/dialog_spice_model_base.h
index e513d30bdd..d9588b6fa6 100644
--- a/eeschema/dialogs/dialog_spice_model_base.h
+++ b/eeschema/dialogs/dialog_spice_model_base.h
@@ -11,6 +11,9 @@
 #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>
 #include <wx/gdicmn.h>
@@ -37,7 +40,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DIALOG_SPICE_MODEL_BASE
 ///////////////////////////////////////////////////////////////////////////////
-class DIALOG_SPICE_MODEL_BASE : public wxDialog 
+class DIALOG_SPICE_MODEL_BASE : public DIALOG_SHIM
 {
 	private:
 	

From 741ae10a97421108cf9e827caed56252ef5e6968 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:09 +0200
Subject: [PATCH 159/197] Improved Spice model dialog for sources Now user can
 specify both DC/AC & transient analysis specifications at once.

---
 eeschema/dialogs/dialog_spice_model.cpp      |  227 +-
 eeschema/dialogs/dialog_spice_model_base.cpp |   63 +-
 eeschema/dialogs/dialog_spice_model_base.fbp | 9599 +++++++++---------
 eeschema/dialogs/dialog_spice_model_base.h   |    8 +-
 4 files changed, 4970 insertions(+), 4927 deletions(-)

diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp
index e5f0d4ce28..d60eefdf93 100644
--- a/eeschema/dialogs/dialog_spice_model.cpp
+++ b/eeschema/dialogs/dialog_spice_model.cpp
@@ -69,22 +69,22 @@ DIALOG_SPICE_MODEL::DIALOG_SPICE_MODEL( wxWindow* aParent, SCH_COMPONENT& aCompo
     m_genAcMag->SetValidator( m_spiceEmptyValidator );
     m_genAcPhase->SetValidator( m_spiceEmptyValidator );
 
-    m_pulseInit->SetValidator( m_spiceValidator );
-    m_pulseNominal->SetValidator( m_spiceValidator );
+    m_pulseInit->SetValidator( m_spiceEmptyValidator );
+    m_pulseNominal->SetValidator( m_spiceEmptyValidator );
     m_pulseDelay->SetValidator( m_spiceEmptyValidator );
     m_pulseRise->SetValidator( m_spiceEmptyValidator );
     m_pulseFall->SetValidator( m_spiceEmptyValidator );
     m_pulseWidth->SetValidator( m_spiceEmptyValidator );
     m_pulsePeriod->SetValidator( m_spiceEmptyValidator );
 
-    m_sinOffset->SetValidator( m_spiceValidator );
-    m_sinAmplitude->SetValidator( m_spiceValidator );
+    m_sinOffset->SetValidator( m_spiceEmptyValidator );
+    m_sinAmplitude->SetValidator( m_spiceEmptyValidator );
     m_sinFreq->SetValidator( m_spiceEmptyValidator );
     m_sinDelay->SetValidator( m_spiceEmptyValidator );
     m_sinDampFactor->SetValidator( m_spiceEmptyValidator );
 
-    m_expInit->SetValidator( m_spiceValidator );
-    m_expPulsed->SetValidator( m_spiceValidator );
+    m_expInit->SetValidator( m_spiceEmptyValidator );
+    m_expPulsed->SetValidator( m_spiceEmptyValidator );
     m_expRiseDelay->SetValidator( m_spiceEmptyValidator );
     m_expRiseConst->SetValidator( m_spiceEmptyValidator );
     m_expFallDelay->SetValidator( m_spiceEmptyValidator );
@@ -314,43 +314,57 @@ bool DIALOG_SPICE_MODEL::parsePowerSource( const wxString& aModel )
     if( aModel.IsEmpty() )
         return false;
 
-    // Variables used for generic values processing (filling out wxTextCtrls in sequence)
-    bool genericProcessing = false;
-    unsigned int genericReqParamsCount = 0;
-    std::vector<wxTextCtrl*> genericControls;
-
     wxStringTokenizer tokenizer( aModel, " ()" );
     wxString tkn = tokenizer.GetNextToken().Lower();
 
-    try
+    while( tokenizer.HasMoreTokens() )
     {
+        // Variables used for generic values processing (filling out wxTextCtrls in sequence)
+        bool genericProcessing = false;
+        unsigned int genericReqParamsCount = 0;
+        std::vector<wxTextCtrl*> genericControls;
+
         if( tkn == "dc" )
         {
-            m_powerNotebook->SetSelection( m_powerNotebook->FindPage( m_pwrGeneric ) );
-            tkn = tokenizer.GetNextToken().Lower();
-
-            // it might be an optional "dc" or "trans" directive
+            // There might be an optional "dc" or "trans" directive, skip it
             if( tkn == "dc" || tkn == "trans" )
                 tkn = tokenizer.GetNextToken().Lower();
 
             // DC value
-            m_genDc->SetValue( SPICE_VALUE( tkn ).ToSpiceString() );
-
-            if( !tokenizer.HasMoreTokens() )
-                return true;
-
-            tkn = tokenizer.GetNextToken().Lower();
-
-            if( tkn != "ac" )
+            try
+            {
+                m_genDc->SetValue( SPICE_VALUE( tkn ).ToSpiceString() );
+            }
+            catch( ... )
+            {
                 return false;
+            }
+        }
 
+
+        else if( tkn == "ac" )
+        {
             // AC magnitude
-            tkn = tokenizer.GetNextToken().Lower();
-            m_genAcMag->SetValue( SPICE_VALUE( tkn ).ToSpiceString() );
+            try
+            {
+                tkn = tokenizer.GetNextToken().Lower();
+                m_genAcMag->SetValue( SPICE_VALUE( tkn ).ToSpiceString() );
+            }
+            catch( ... )
+            {
+                return false;
+            }
 
-            // AC phase
-            tkn = tokenizer.GetNextToken().Lower();
-            m_genAcMag->SetValue( SPICE_VALUE( tkn ).ToSpiceString() );
+            // AC phase (optional)
+            try
+            {
+                tkn = tokenizer.GetNextToken().Lower();
+                m_genAcPhase->SetValue( SPICE_VALUE( tkn ).ToSpiceString() );
+            }
+            catch( ... )
+            {
+                continue;   // perhaps another directive
+            }
         }
 
 
@@ -390,15 +404,22 @@ bool DIALOG_SPICE_MODEL::parsePowerSource( const wxString& aModel )
         {
             m_powerNotebook->SetSelection( m_powerNotebook->FindPage( m_pwrPwl ) );
 
-            while( tokenizer.HasMoreTokens() )
+            try
             {
-                tkn = tokenizer.GetNextToken();
-                SPICE_VALUE time( tkn );
+                while( tokenizer.HasMoreTokens() )
+                {
+                    tkn = tokenizer.GetNextToken();
+                    SPICE_VALUE time( tkn );
 
-                tkn = tokenizer.GetNextToken();
-                SPICE_VALUE value( tkn );
+                    tkn = tokenizer.GetNextToken();
+                    SPICE_VALUE value( tkn );
 
-                addPwlValue( time.ToSpiceString(), value.ToSpiceString() );
+                    addPwlValue( time.ToSpiceString(), value.ToSpiceString() );
+                }
+            }
+            catch( ... )
+            {
+                return false;
             }
         }
 
@@ -406,27 +427,34 @@ bool DIALOG_SPICE_MODEL::parsePowerSource( const wxString& aModel )
         else
         {
             // Unhandled power source type
+            wxASSERT_MSG( false, "Unhandled power source type" );
             return false;
         }
 
 
         if( genericProcessing )
         {
-            for( unsigned int i = 0; i < genericControls.size(); ++i )
+            try
             {
-                // If there are no more tokens, let's check if we got at least required fields
-                if( !tokenizer.HasMoreTokens() )
-                    return ( i >= genericReqParamsCount );
+                for( unsigned int i = 0; i < genericControls.size(); ++i )
+                {
+                    // If there are no more tokens, let's check if we got at least required fields
+                    if( !tokenizer.HasMoreTokens() )
+                        return ( i >= genericReqParamsCount );
 
-                tkn = tokenizer.GetNextToken().Lower();
-                genericControls[i]->SetValue( SPICE_VALUE( tkn ).ToSpiceString() );
+                    tkn = tokenizer.GetNextToken().Lower();
+                    genericControls[i]->SetValue( SPICE_VALUE( tkn ).ToSpiceString() );
+                }
+            }
+            catch( ... )
+            {
+                return false;
             }
         }
-    }
-    catch( std::exception& e )
-    {
-        // Nothing, the dialog simply will not be filled
-        return false;
+
+        // Get the next token now, so if any of the branches catches an expection, try to
+        // process it in another branch
+        tkn = tokenizer.GetNextToken().Lower();
     }
 
     return true;
@@ -435,45 +463,52 @@ bool DIALOG_SPICE_MODEL::parsePowerSource( const wxString& aModel )
 
 bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
 {
-    wxString res;
+    wxString acdc, trans;
     wxWindow* page = m_powerNotebook->GetCurrentPage();
+    bool useTrans = true;       // shall we use the transient command part?
 
     // Variables for generic processing
     bool genericProcessing = false;
     unsigned int genericReqParamsCount = 0;
     std::vector<wxTextCtrl*> genericControls;
 
-    if( page == m_pwrGeneric )
+    /// DC / AC section
+    // If SPICE_VALUE can be properly constructed, then it is a valid value
+    try
     {
-        if( !m_pwrGeneric->Validate() )
-            return false;
-
-        if( empty( m_genDc ) && empty( m_genAcMag ) )
-        {
-            DisplayError( NULL, wxT( "You have to specify DC or/and AC value" ) );
-            return false;
-        }
-
         if( !empty( m_genDc ) )
-            res += wxString::Format( "dc %s", m_genDc->GetValue() );
-
-        if( !empty( m_genAcMag ) )
-        {
-            res += wxString::Format( " ac %s", m_genAcMag->GetValue() );
-
-            if( !empty( m_genAcPhase ) )
-                res += wxString::Format( " %s", m_genAcPhase->GetValue() );
-        }
+            acdc += wxString::Format( "dc %s ", SPICE_VALUE( m_genDc->GetValue() ).ToSpiceString() );
+    }
+    catch( ... )
+    {
+        DisplayError( NULL, wxT( "Invalid DC value" ) );
+        return false;
     }
 
+    try
+    {
+        if( !empty( m_genAcMag ) )
+        {
+            acdc += wxString::Format( "ac %s ", SPICE_VALUE( m_genAcMag->GetValue() ).ToSpiceString() );
 
-    else if( page == m_pwrPulse )
+            if( !empty( m_genAcPhase ) )
+                acdc += wxString::Format( "%s ", SPICE_VALUE( m_genAcPhase->GetValue() ).ToSpiceString() );
+        }
+    }
+    catch( ... )
+    {
+        DisplayError( NULL, wxT( "Invalid AC magnitude or phase" ) );
+        return false;
+    }
+
+    /// Transient section
+    if( page == m_pwrPulse )
     {
         if( !m_pwrPulse->Validate() )
             return false;
 
         genericProcessing = true;
-        res = "pulse";
+        trans += "pulse";
         genericReqParamsCount = 2;
         genericControls = { m_pulseInit, m_pulseNominal, m_pulseDelay,
             m_pulseRise, m_pulseFall, m_pulseWidth, m_pulsePeriod };
@@ -486,7 +521,7 @@ bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
             return false;
 
         genericProcessing = true;
-        res = "sin";
+        trans += "sin";
         genericReqParamsCount = 2;
         genericControls = { m_sinOffset, m_sinAmplitude, m_sinFreq, m_sinDelay, m_sinDampFactor };
     }
@@ -498,7 +533,7 @@ bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
             return false;
 
         genericProcessing = true;
-        res = "exp";
+        trans += "exp";
         genericReqParamsCount = 2;
         genericControls = { m_expInit, m_expPulsed,
             m_expRiseDelay, m_expRiseConst, m_expFallDelay, m_expFallConst };
@@ -507,21 +542,19 @@ bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
 
     else if( page == m_pwrPwl )
     {
-        if( m_pwlValList->GetItemCount() == 0 )
+        if( m_pwlValList->GetItemCount() > 0 )
         {
-            DisplayError( NULL, wxT( "You have to specify at least one value" ) );
-            return false;
+            trans += "pwl(";
+
+            for( int i = 0; i < m_pwlValList->GetItemCount(); ++i )
+            {
+                trans += wxString::Format( "%s %s ", m_pwlValList->GetItemText( i, m_pwlTimeCol ),
+                                                     m_pwlValList->GetItemText( i, m_pwlValueCol ) );
+            }
+
+            trans.Trim();
+            trans += ")";
         }
-
-        res = "pwl(";
-
-        for( int i = 0; i < m_pwlValList->GetItemCount(); ++i )
-        {
-            res += wxString::Format( "%s %s ", m_pwlValList->GetItemText( i, m_pwlTimeCol ),
-                                                m_pwlValList->GetItemText( i, m_pwlValueCol ) );
-        }
-
-        res += ")";
     }
 
     if( genericProcessing )
@@ -529,7 +562,7 @@ bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
         bool finished = false;
         unsigned int paramCounter = 0;
 
-        res += "(";
+        trans += "(";
 
         for( auto textCtrl : genericControls )
         {
@@ -539,8 +572,16 @@ bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
 
                 if( paramCounter < genericReqParamsCount )
                 {
+                    if( paramCounter == 0 )
+                    {
+                        // It is fine, no parameters were entered
+                        useTrans = false;
+                        break;
+                    }
+
                     DisplayError( NULL,
-                            wxString::Format( wxT( "You need to specify at least the first %d parameters" ),
+                            wxString::Format( wxT( "You need to specify at least the "
+                                    "first %d parameters for the transient source" ),
                             genericReqParamsCount ) );
 
                     return false;
@@ -548,18 +589,26 @@ bool DIALOG_SPICE_MODEL::generatePowerSource( wxString& aTarget ) const
             }
             else if( finished )
             {
-                DisplayError( NULL, wxT( "You cannot leave interleaved blank spaces" ) );
+                DisplayError( NULL, wxT( "You cannot leave interleaved blank "
+                                        "spaces for the transient source" ) );
                 return false;
             }
 
-            res += wxString::Format( "%s ", textCtrl->GetValue() );
+            trans += wxString::Format( "%s ", textCtrl->GetValue() );
             ++paramCounter;
         }
 
-        res += ")";
+        trans.Trim();
+        trans += ")";
     }
 
-    aTarget = res;
+    aTarget = acdc;
+
+    if( useTrans )
+        aTarget += trans;
+
+    aTarget.Trim( false );
+    aTarget.Trim( true );
 
     return true;
 }
diff --git a/eeschema/dialogs/dialog_spice_model_base.cpp b/eeschema/dialogs/dialog_spice_model_base.cpp
index 8125f71d2f..fa9d1ecccd 100644
--- a/eeschema/dialogs/dialog_spice_model_base.cpp
+++ b/eeschema/dialogs/dialog_spice_model_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 24 2016)
+// C++ code generated with wxFormBuilder (version Jul 17 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -131,42 +131,58 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i
 	wxBoxSizer* bSizer4;
 	bSizer4 = new wxBoxSizer( wxVERTICAL );
 	
-	m_powerNotebook = new wxNotebook( m_power, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_pwrGeneric = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxStaticBoxSizer* sbSizer1;
+	sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_power, wxID_ANY, _("DC/AC analysis") ), wxVERTICAL );
+	
 	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer6 = new wxFlexGridSizer( 0, 4, 0, 0 );
 	fgSizer6->AddGrowableCol( 0 );
 	fgSizer6->SetFlexibleDirection( wxBOTH );
 	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
-	m_staticText10 = new wxStaticText( m_pwrGeneric, wxID_ANY, _("DC [V/A]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText10 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("DC [V/A]"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText10->Wrap( -1 );
 	fgSizer6->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
-	m_genDc = new wxTextCtrl( m_pwrGeneric, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_genDc->SetMinSize( wxSize( 200,-1 ) );
+	m_genDc = new wxTextCtrl( sbSizer1->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_genDc->SetMinSize( wxSize( 60,-1 ) );
 	
 	fgSizer6->Add( m_genDc, 0, wxALL, 5 );
 	
-	m_staticText11 = new wxStaticText( m_pwrGeneric, wxID_ANY, _("AC magnitude [V/A]"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	
+	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticText11 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("AC magnitude [V/A]"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText11->Wrap( -1 );
 	fgSizer6->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
-	m_genAcMag = new wxTextCtrl( m_pwrGeneric, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_genAcMag = new wxTextCtrl( sbSizer1->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_genAcMag->SetMinSize( wxSize( 60,-1 ) );
+	
 	fgSizer6->Add( m_genAcMag, 0, wxALL|wxEXPAND, 5 );
 	
-	m_staticText12 = new wxStaticText( m_pwrGeneric, wxID_ANY, _("AC phase [rad]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText12 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("AC phase [rad]"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText12->Wrap( -1 );
 	fgSizer6->Add( m_staticText12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
-	m_genAcPhase = new wxTextCtrl( m_pwrGeneric, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_genAcPhase = new wxTextCtrl( sbSizer1->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_genAcPhase->SetMinSize( wxSize( 60,-1 ) );
+	
 	fgSizer6->Add( m_genAcPhase, 0, wxALL|wxEXPAND, 5 );
 	
 	
-	m_pwrGeneric->SetSizer( fgSizer6 );
-	m_pwrGeneric->Layout();
-	fgSizer6->Fit( m_pwrGeneric );
-	m_powerNotebook->AddPage( m_pwrGeneric, _("DC/AC"), true );
+	sbSizer1->Add( fgSizer6, 1, wxEXPAND, 5 );
+	
+	
+	bSizer4->Add( sbSizer1, 1, wxALL|wxEXPAND, 5 );
+	
+	wxStaticBoxSizer* sbSizer3;
+	sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_power, wxID_ANY, _("Transient analysis") ), wxVERTICAL );
+	
+	m_powerNotebook = new wxNotebook( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	m_pwrPulse = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxFlexGridSizer* fgSizer7;
 	fgSizer7 = new wxFlexGridSizer( 0, 2, 0, 0 );
@@ -179,7 +195,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i
 	fgSizer7->Add( m_staticText13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	m_pulseInit = new wxTextCtrl( m_pwrPulse, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_pulseInit->SetMinSize( wxSize( 200,-1 ) );
+	m_pulseInit->SetMinSize( wxSize( 100,-1 ) );
 	
 	fgSizer7->Add( m_pulseInit, 0, wxALL|wxEXPAND, 5 );
 	
@@ -229,7 +245,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i
 	m_pwrPulse->SetSizer( fgSizer7 );
 	m_pwrPulse->Layout();
 	fgSizer7->Fit( m_pwrPulse );
-	m_powerNotebook->AddPage( m_pwrPulse, _("Pulse"), false );
+	m_powerNotebook->AddPage( m_pwrPulse, _("Pulse"), true );
 	m_pwrSin = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxFlexGridSizer* fgSizer8;
 	fgSizer8 = new wxFlexGridSizer( 0, 2, 0, 0 );
@@ -242,7 +258,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i
 	fgSizer8->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	m_sinOffset = new wxTextCtrl( m_pwrSin, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_sinOffset->SetMinSize( wxSize( 200,-1 ) );
+	m_sinOffset->SetMinSize( wxSize( 100,-1 ) );
 	
 	fgSizer8->Add( m_sinOffset, 0, wxALL, 5 );
 	
@@ -291,7 +307,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i
 	fgSizer9->Add( m_staticText26, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	m_expInit = new wxTextCtrl( m_pwrExp, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_expInit->SetMinSize( wxSize( 200,-1 ) );
+	m_expInit->SetMinSize( wxSize( 100,-1 ) );
 	
 	fgSizer9->Add( m_expInit, 0, wxALL|wxEXPAND, 5 );
 	
@@ -356,7 +372,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i
 	fgSizer10->Add( m_staticText34, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	m_pwlTime = new wxTextCtrl( m_pwrPwl, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_pwlTime->SetMinSize( wxSize( 200,-1 ) );
+	m_pwlTime->SetMinSize( wxSize( 100,-1 ) );
 	
 	fgSizer10->Add( m_pwlTime, 0, wxALL|wxEXPAND, 5 );
 	
@@ -385,7 +401,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i
 	m_pwrPwl->SetSizer( fgSizer15 );
 	m_pwrPwl->Layout();
 	fgSizer15->Fit( m_pwrPwl );
-	m_powerNotebook->AddPage( m_pwrPwl, _("PWL"), false );
+	m_powerNotebook->AddPage( m_pwrPwl, _("Piece-wise Linear"), false );
 	m_pwrFm = new wxPanel( m_powerNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	m_pwrFm->Hide();
 	
@@ -407,7 +423,10 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i
 	
 	m_powerNotebook->AddPage( m_pwrExtData, _("External data"), false );
 	
-	bSizer4->Add( m_powerNotebook, 1, wxEXPAND | wxALL, 5 );
+	sbSizer3->Add( m_powerNotebook, 1, wxEXPAND | wxALL, 5 );
+	
+	
+	bSizer4->Add( sbSizer3, 1, wxALL|wxEXPAND, 5 );
 	
 	wxString m_pwrTypeChoices[] = { _("Voltage"), _("Current") };
 	int m_pwrTypeNChoices = sizeof( m_pwrTypeChoices ) / sizeof( wxString );
diff --git a/eeschema/dialogs/dialog_spice_model_base.fbp b/eeschema/dialogs/dialog_spice_model_base.fbp
index 25b938c003..d96240e766 100644
--- a/eeschema/dialogs/dialog_spice_model_base.fbp
+++ b/eeschema/dialogs/dialog_spice_model_base.fbp
@@ -44,7 +44,7 @@
             <property name="minimum_size"></property>
             <property name="name">DIALOG_SPICE_MODEL_BASE</property>
             <property name="pos"></property>
-            <property name="size">425,630</property>
+            <property name="size">410,705</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE</property>
             <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
             <property name="title"></property>
@@ -1963,91 +1963,597 @@
                                     <property name="permission">none</property>
                                     <object class="sizeritem" expanded="1">
                                         <property name="border">5</property>
-                                        <property name="flag">wxEXPAND | wxALL</property>
+                                        <property name="flag">wxALL|wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxNotebook" 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_name"></property>
-                                            <property name="aui_position"></property>
-                                            <property name="aui_row"></property>
-                                            <property name="best_size"></property>
-                                            <property name="bg"></property>
-                                            <property name="bitmapsize"></property>
-                                            <property name="caption"></property>
-                                            <property name="caption_visible">1</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="fg"></property>
-                                            <property name="floatable">1</property>
-                                            <property name="font"></property>
-                                            <property name="gripper">0</property>
-                                            <property name="hidden">0</property>
+                                        <object class="wxStaticBoxSizer" expanded="0">
                                             <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="label">DC/AC analysis</property>
                                             <property name="minimum_size"></property>
-                                            <property name="moveable">1</property>
-                                            <property name="name">m_powerNotebook</property>
-                                            <property name="pane_border">1</property>
-                                            <property name="pane_position"></property>
-                                            <property name="pane_size"></property>
-                                            <property name="permission">protected</property>
-                                            <property name="pin_button">1</property>
-                                            <property name="pos"></property>
-                                            <property name="resize">Resizable</property>
-                                            <property name="show">1</property>
-                                            <property name="size"></property>
-                                            <property name="style"></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"></property>
-                                            <event name="OnChar"></event>
-                                            <event name="OnEnterWindow"></event>
-                                            <event name="OnEraseBackground"></event>
-                                            <event name="OnKeyDown"></event>
-                                            <event name="OnKeyUp"></event>
-                                            <event name="OnKillFocus"></event>
-                                            <event name="OnLeaveWindow"></event>
-                                            <event name="OnLeftDClick"></event>
-                                            <event name="OnLeftDown"></event>
-                                            <event name="OnLeftUp"></event>
-                                            <event name="OnMiddleDClick"></event>
-                                            <event name="OnMiddleDown"></event>
-                                            <event name="OnMiddleUp"></event>
-                                            <event name="OnMotion"></event>
-                                            <event name="OnMouseEvents"></event>
-                                            <event name="OnMouseWheel"></event>
-                                            <event name="OnNotebookPageChanged"></event>
-                                            <event name="OnNotebookPageChanging"></event>
-                                            <event name="OnPaint"></event>
-                                            <event name="OnRightDClick"></event>
-                                            <event name="OnRightDown"></event>
-                                            <event name="OnRightUp"></event>
-                                            <event name="OnSetFocus"></event>
-                                            <event name="OnSize"></event>
+                                            <property name="name">sbSizer1</property>
+                                            <property name="orient">wxVERTICAL</property>
+                                            <property name="parent">1</property>
+                                            <property name="permission">none</property>
                                             <event name="OnUpdateUI"></event>
-                                            <object class="notebookpage" expanded="0">
-                                                <property name="bitmap"></property>
-                                                <property name="label">DC/AC</property>
-                                                <property name="select">1</property>
-                                                <object class="wxPanel" expanded="0">
+                                            <object class="sizeritem" expanded="0">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxEXPAND</property>
+                                                <property name="proportion">1</property>
+                                                <object class="wxFlexGridSizer" expanded="0">
+                                                    <property name="cols">4</property>
+                                                    <property name="flexible_direction">wxBOTH</property>
+                                                    <property name="growablecols">0</property>
+                                                    <property name="growablerows"></property>
+                                                    <property name="hgap">0</property>
+                                                    <property name="minimum_size"></property>
+                                                    <property name="name">fgSizer6</property>
+                                                    <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                                    <property name="permission">none</property>
+                                                    <property name="rows">0</property>
+                                                    <property name="vgap">0</property>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="label">DC [V/A]</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">m_staticText10</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></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"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxTextCtrl" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="maxlength"></property>
+                                                            <property name="min_size"></property>
+                                                            <property name="minimize_button">0</property>
+                                                            <property name="minimum_size">60,-1</property>
+                                                            <property name="moveable">1</property>
+                                                            <property name="name">m_genDc</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></property>
+                                                            <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="value"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnText"></event>
+                                                            <event name="OnTextEnter"></event>
+                                                            <event name="OnTextMaxLen"></event>
+                                                            <event name="OnTextURL"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxEXPAND</property>
+                                                        <property name="proportion">1</property>
+                                                        <object class="spacer" expanded="0">
+                                                            <property name="height">0</property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="width">0</property>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxEXPAND</property>
+                                                        <property name="proportion">1</property>
+                                                        <object class="spacer" expanded="0">
+                                                            <property name="height">0</property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="width">0</property>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="label">AC magnitude [V/A]</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">m_staticText11</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></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"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL|wxEXPAND</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxTextCtrl" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="maxlength"></property>
+                                                            <property name="min_size"></property>
+                                                            <property name="minimize_button">0</property>
+                                                            <property name="minimum_size">60,-1</property>
+                                                            <property name="moveable">1</property>
+                                                            <property name="name">m_genAcMag</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></property>
+                                                            <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="value"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnText"></event>
+                                                            <event name="OnTextEnter"></event>
+                                                            <event name="OnTextMaxLen"></event>
+                                                            <event name="OnTextURL"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxStaticText" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="label">AC phase [rad]</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">m_staticText12</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></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"></property>
+                                                            <property name="wrap">-1</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="sizeritem" expanded="0">
+                                                        <property name="border">5</property>
+                                                        <property name="flag">wxALL|wxEXPAND</property>
+                                                        <property name="proportion">0</property>
+                                                        <object class="wxTextCtrl" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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="maxlength"></property>
+                                                            <property name="min_size"></property>
+                                                            <property name="minimize_button">0</property>
+                                                            <property name="minimum_size">60,-1</property>
+                                                            <property name="moveable">1</property>
+                                                            <property name="name">m_genAcPhase</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="style"></property>
+                                                            <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="value"></property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style"></property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnText"></event>
+                                                            <event name="OnTextEnter"></event>
+                                                            <event name="OnTextMaxLen"></event>
+                                                            <event name="OnTextURL"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                </object>
+                                            </object>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem" expanded="1">
+                                        <property name="border">5</property>
+                                        <property name="flag">wxALL|wxEXPAND</property>
+                                        <property name="proportion">1</property>
+                                        <object class="wxStaticBoxSizer" expanded="1">
+                                            <property name="id">wxID_ANY</property>
+                                            <property name="label">Transient analysis</property>
+                                            <property name="minimum_size"></property>
+                                            <property name="name">sbSizer3</property>
+                                            <property name="orient">wxVERTICAL</property>
+                                            <property name="parent">1</property>
+                                            <property name="permission">none</property>
+                                            <event name="OnUpdateUI"></event>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxEXPAND | wxALL</property>
+                                                <property name="proportion">1</property>
+                                                <object class="wxNotebook" expanded="1">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -2058,6 +2564,7 @@
                                                     <property name="aui_row"></property>
                                                     <property name="best_size"></property>
                                                     <property name="bg"></property>
+                                                    <property name="bitmapsize"></property>
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
@@ -2082,7 +2589,7 @@
                                                     <property name="minimize_button">0</property>
                                                     <property name="minimum_size"></property>
                                                     <property name="moveable">1</property>
-                                                    <property name="name">m_pwrGeneric</property>
+                                                    <property name="name">m_powerNotebook</property>
                                                     <property name="pane_border">1</property>
                                                     <property name="pane_position"></property>
                                                     <property name="pane_size"></property>
@@ -2092,12 +2599,13 @@
                                                     <property name="resize">Resizable</property>
                                                     <property name="show">1</property>
                                                     <property name="size"></property>
+                                                    <property name="style"></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">wxTAB_TRAVERSAL</property>
+                                                    <property name="window_style"></property>
                                                     <event name="OnChar"></event>
                                                     <event name="OnEnterWindow"></event>
                                                     <event name="OnEraseBackground"></event>
@@ -2114,6 +2622,8 @@
                                                     <event name="OnMotion"></event>
                                                     <event name="OnMouseEvents"></event>
                                                     <event name="OnMouseWheel"></event>
+                                                    <event name="OnNotebookPageChanged"></event>
+                                                    <event name="OnNotebookPageChanging"></event>
                                                     <event name="OnPaint"></event>
                                                     <event name="OnRightDClick"></event>
                                                     <event name="OnRightDown"></event>
@@ -2121,4048 +2631,84 @@
                                                     <event name="OnSetFocus"></event>
                                                     <event name="OnSize"></event>
                                                     <event name="OnUpdateUI"></event>
-                                                    <object class="wxFlexGridSizer" expanded="0">
-                                                        <property name="cols">2</property>
-                                                        <property name="flexible_direction">wxBOTH</property>
-                                                        <property name="growablecols">0</property>
-                                                        <property name="growablerows"></property>
-                                                        <property name="hgap">0</property>
-                                                        <property name="minimum_size"></property>
-                                                        <property name="name">fgSizer6</property>
-                                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
-                                                        <property name="permission">none</property>
-                                                        <property name="rows">0</property>
-                                                        <property name="vgap">0</property>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">DC [V/A]</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">m_staticText10</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></property>
-                                                                <property name="min_size"></property>
-                                                                <property name="minimize_button">0</property>
-                                                                <property name="minimum_size">200,-1</property>
-                                                                <property name="moveable">1</property>
-                                                                <property name="name">m_genDc</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">AC magnitude [V/A]</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">m_staticText11</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_genAcMag</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">AC phase [rad]</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">m_staticText12</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_genAcPhase</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                    </object>
-                                                </object>
-                                            </object>
-                                            <object class="notebookpage" expanded="0">
-                                                <property name="bitmap"></property>
-                                                <property name="label">Pulse</property>
-                                                <property name="select">0</property>
-                                                <object class="wxPanel" expanded="0">
-                                                    <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_name"></property>
-                                                    <property name="aui_position"></property>
-                                                    <property name="aui_row"></property>
-                                                    <property name="best_size"></property>
-                                                    <property name="bg"></property>
-                                                    <property name="caption"></property>
-                                                    <property name="caption_visible">1</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="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">m_pwrPulse</property>
-                                                    <property name="pane_border">1</property>
-                                                    <property name="pane_position"></property>
-                                                    <property name="pane_size"></property>
-                                                    <property name="permission">protected</property>
-                                                    <property name="pin_button">1</property>
-                                                    <property name="pos"></property>
-                                                    <property name="resize">Resizable</property>
-                                                    <property name="show">1</property>
-                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
-                                                    <object class="wxFlexGridSizer" expanded="0">
-                                                        <property name="cols">2</property>
-                                                        <property name="flexible_direction">wxBOTH</property>
-                                                        <property name="growablecols">0</property>
-                                                        <property name="growablerows"></property>
-                                                        <property name="hgap">0</property>
-                                                        <property name="minimum_size"></property>
-                                                        <property name="name">fgSizer7</property>
-                                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
-                                                        <property name="permission">none</property>
-                                                        <property name="rows">0</property>
-                                                        <property name="vgap">0</property>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Initial value [V/A]</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">m_staticText13</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></property>
-                                                                <property name="min_size"></property>
-                                                                <property name="minimize_button">0</property>
-                                                                <property name="minimum_size">200,-1</property>
-                                                                <property name="moveable">1</property>
-                                                                <property name="name">m_pulseInit</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Pulsed value [V/A]</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">m_staticText14</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_pulseNominal</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Delay time [s]</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">m_staticText15</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_pulseDelay</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Rise time [s]</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">m_staticText16</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_pulseRise</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Fall time [s]</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">m_staticText17</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_pulseFall</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Pulse width [s]</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">m_staticText18</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_pulseWidth</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Period [s]</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">m_staticText20</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_pulsePeriod</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                    </object>
-                                                </object>
-                                            </object>
-                                            <object class="notebookpage" expanded="0">
-                                                <property name="bitmap"></property>
-                                                <property name="label">Sinusoidal</property>
-                                                <property name="select">0</property>
-                                                <object class="wxPanel" expanded="0">
-                                                    <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_name"></property>
-                                                    <property name="aui_position"></property>
-                                                    <property name="aui_row"></property>
-                                                    <property name="best_size"></property>
-                                                    <property name="bg"></property>
-                                                    <property name="caption"></property>
-                                                    <property name="caption_visible">1</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="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">m_pwrSin</property>
-                                                    <property name="pane_border">1</property>
-                                                    <property name="pane_position"></property>
-                                                    <property name="pane_size"></property>
-                                                    <property name="permission">protected</property>
-                                                    <property name="pin_button">1</property>
-                                                    <property name="pos"></property>
-                                                    <property name="resize">Resizable</property>
-                                                    <property name="show">1</property>
-                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
-                                                    <object class="wxFlexGridSizer" expanded="0">
-                                                        <property name="cols">2</property>
-                                                        <property name="flexible_direction">wxBOTH</property>
-                                                        <property name="growablecols">0</property>
-                                                        <property name="growablerows"></property>
-                                                        <property name="hgap">0</property>
-                                                        <property name="minimum_size"></property>
-                                                        <property name="name">fgSizer8</property>
-                                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
-                                                        <property name="permission">none</property>
-                                                        <property name="rows">0</property>
-                                                        <property name="vgap">0</property>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">DC offset [V/A]</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">m_staticText21</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></property>
-                                                                <property name="min_size"></property>
-                                                                <property name="minimize_button">0</property>
-                                                                <property name="minimum_size">200,-1</property>
-                                                                <property name="moveable">1</property>
-                                                                <property name="name">m_sinOffset</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Amplitude [V/A]</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">m_staticText22</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_sinAmplitude</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Frequency [Hz]</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">m_staticText23</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_sinFreq</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Delay [s]</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">m_staticText24</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_sinDelay</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Damping factor [1/s]</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">m_staticText25</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_sinDampFactor</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                    </object>
-                                                </object>
-                                            </object>
-                                            <object class="notebookpage" expanded="0">
-                                                <property name="bitmap"></property>
-                                                <property name="label">Exponential</property>
-                                                <property name="select">0</property>
-                                                <object class="wxPanel" expanded="0">
-                                                    <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_name"></property>
-                                                    <property name="aui_position"></property>
-                                                    <property name="aui_row"></property>
-                                                    <property name="best_size"></property>
-                                                    <property name="bg"></property>
-                                                    <property name="caption"></property>
-                                                    <property name="caption_visible">1</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="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">m_pwrExp</property>
-                                                    <property name="pane_border">1</property>
-                                                    <property name="pane_position"></property>
-                                                    <property name="pane_size"></property>
-                                                    <property name="permission">protected</property>
-                                                    <property name="pin_button">1</property>
-                                                    <property name="pos"></property>
-                                                    <property name="resize">Resizable</property>
-                                                    <property name="show">1</property>
-                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
-                                                    <object class="wxFlexGridSizer" expanded="0">
-                                                        <property name="cols">2</property>
-                                                        <property name="flexible_direction">wxBOTH</property>
-                                                        <property name="growablecols">0</property>
-                                                        <property name="growablerows"></property>
-                                                        <property name="hgap">0</property>
-                                                        <property name="minimum_size"></property>
-                                                        <property name="name">fgSizer9</property>
-                                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
-                                                        <property name="permission">none</property>
-                                                        <property name="rows">0</property>
-                                                        <property name="vgap">0</property>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Initial value [V/A]</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">m_staticText26</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></property>
-                                                                <property name="min_size"></property>
-                                                                <property name="minimize_button">0</property>
-                                                                <property name="minimum_size">200,-1</property>
-                                                                <property name="moveable">1</property>
-                                                                <property name="name">m_expInit</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Pulsed value [V/A]</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">m_staticText27</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_expPulsed</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Rise delay time [s]</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">m_staticText28</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_expRiseDelay</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Rise time constant [s]</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">m_staticText29</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_expRiseConst</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Fall delay time [s]</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">m_staticText30</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_expFallDelay</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxStaticText" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="label">Fall time constant [s]</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">m_staticText31</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></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"></property>
-                                                                <property name="wrap">-1</property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxTextCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_expFallConst</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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="value"></property>
-                                                                <property name="window_extra_style"></property>
-                                                                <property name="window_name"></property>
-                                                                <property name="window_style"></property>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnText"></event>
-                                                                <event name="OnTextEnter"></event>
-                                                                <event name="OnTextMaxLen"></event>
-                                                                <event name="OnTextURL"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                    </object>
-                                                </object>
-                                            </object>
-                                            <object class="notebookpage" expanded="0">
-                                                <property name="bitmap"></property>
-                                                <property name="label">PWL</property>
-                                                <property name="select">0</property>
-                                                <object class="wxPanel" expanded="0">
-                                                    <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_name"></property>
-                                                    <property name="aui_position"></property>
-                                                    <property name="aui_row"></property>
-                                                    <property name="best_size"></property>
-                                                    <property name="bg"></property>
-                                                    <property name="caption"></property>
-                                                    <property name="caption_visible">1</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="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">m_pwrPwl</property>
-                                                    <property name="pane_border">1</property>
-                                                    <property name="pane_position"></property>
-                                                    <property name="pane_size"></property>
-                                                    <property name="permission">protected</property>
-                                                    <property name="pin_button">1</property>
-                                                    <property name="pos"></property>
-                                                    <property name="resize">Resizable</property>
-                                                    <property name="show">1</property>
-                                                    <property name="size"></property>
-                                                    <property name="subclass"></property>
-                                                    <property name="toolbar_pane">0</property>
-                                                    <property name="tooltip">Piece-wise linear</property>
-                                                    <property name="window_extra_style"></property>
-                                                    <property name="window_name"></property>
-                                                    <property name="window_style">wxTAB_TRAVERSAL</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
-                                                    <object class="wxFlexGridSizer" expanded="0">
-                                                        <property name="cols">2</property>
-                                                        <property name="flexible_direction">wxBOTH</property>
-                                                        <property name="growablecols">0</property>
-                                                        <property name="growablerows">1</property>
-                                                        <property name="hgap">0</property>
-                                                        <property name="minimum_size"></property>
-                                                        <property name="name">fgSizer15</property>
-                                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_ALL</property>
-                                                        <property name="permission">none</property>
-                                                        <property name="rows">0</property>
-                                                        <property name="vgap">0</property>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxEXPAND</property>
-                                                            <property name="proportion">1</property>
+                                                    <object class="notebookpage" expanded="0">
+                                                        <property name="bitmap"></property>
+                                                        <property name="label">Pulse</property>
+                                                        <property name="select">1</property>
+                                                        <object class="wxPanel" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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">m_pwrPulse</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
                                                             <object class="wxFlexGridSizer" expanded="0">
                                                                 <property name="cols">2</property>
                                                                 <property name="flexible_direction">wxBOTH</property>
@@ -6170,7 +2716,7 @@
                                                                 <property name="growablerows"></property>
                                                                 <property name="hgap">0</property>
                                                                 <property name="minimum_size"></property>
-                                                                <property name="name">fgSizer10</property>
+                                                                <property name="name">fgSizer7</property>
                                                                 <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
                                                                 <property name="permission">none</property>
                                                                 <property name="rows">0</property>
@@ -6207,7 +2753,7 @@
                                                                         <property name="gripper">0</property>
                                                                         <property name="hidden">0</property>
                                                                         <property name="id">wxID_ANY</property>
-                                                                        <property name="label">Time [s]</property>
+                                                                        <property name="label">Initial value [V/A]</property>
                                                                         <property name="max_size"></property>
                                                                         <property name="maximize_button">0</property>
                                                                         <property name="maximum_size"></property>
@@ -6215,7 +2761,7 @@
                                                                         <property name="minimize_button">0</property>
                                                                         <property name="minimum_size"></property>
                                                                         <property name="moveable">1</property>
-                                                                        <property name="name">m_staticText34</property>
+                                                                        <property name="name">m_staticText13</property>
                                                                         <property name="pane_border">1</property>
                                                                         <property name="pane_position"></property>
                                                                         <property name="pane_size"></property>
@@ -6296,9 +2842,9 @@
                                                                         <property name="maxlength"></property>
                                                                         <property name="min_size"></property>
                                                                         <property name="minimize_button">0</property>
-                                                                        <property name="minimum_size">200,-1</property>
+                                                                        <property name="minimum_size">100,-1</property>
                                                                         <property name="moveable">1</property>
-                                                                        <property name="name">m_pwlTime</property>
+                                                                        <property name="name">m_pulseInit</property>
                                                                         <property name="pane_border">1</property>
                                                                         <property name="pane_position"></property>
                                                                         <property name="pane_size"></property>
@@ -6381,7 +2927,7 @@
                                                                         <property name="gripper">0</property>
                                                                         <property name="hidden">0</property>
                                                                         <property name="id">wxID_ANY</property>
-                                                                        <property name="label">Value [V/A]</property>
+                                                                        <property name="label">Pulsed value [V/A]</property>
                                                                         <property name="max_size"></property>
                                                                         <property name="maximize_button">0</property>
                                                                         <property name="maximum_size"></property>
@@ -6389,7 +2935,7 @@
                                                                         <property name="minimize_button">0</property>
                                                                         <property name="minimum_size"></property>
                                                                         <property name="moveable">1</property>
-                                                                        <property name="name">m_staticText35</property>
+                                                                        <property name="name">m_staticText14</property>
                                                                         <property name="pane_border">1</property>
                                                                         <property name="pane_position"></property>
                                                                         <property name="pane_size"></property>
@@ -6472,7 +3018,877 @@
                                                                         <property name="minimize_button">0</property>
                                                                         <property name="minimum_size"></property>
                                                                         <property name="moveable">1</property>
-                                                                        <property name="name">m_pwlValue</property>
+                                                                        <property name="name">m_pulseNominal</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Delay time [s]</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">m_staticText15</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_pulseDelay</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Rise time [s]</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">m_staticText16</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_pulseRise</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Fall time [s]</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">m_staticText17</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_pulseFall</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Pulse width [s]</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">m_staticText18</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_pulseWidth</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Period [s]</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">m_staticText20</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_pulsePeriod</property>
                                                                         <property name="pane_border">1</property>
                                                                         <property name="pane_position"></property>
                                                                         <property name="pane_size"></property>
@@ -6525,688 +3941,3247 @@
                                                                 </object>
                                                             </object>
                                                         </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxButton" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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">0</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="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="label">Add</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>
+                                                    </object>
+                                                    <object class="notebookpage" expanded="0">
+                                                        <property name="bitmap"></property>
+                                                        <property name="label">Sinusoidal</property>
+                                                        <property name="select">0</property>
+                                                        <object class="wxPanel" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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">m_pwrSin</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                            <object class="wxFlexGridSizer" expanded="0">
+                                                                <property name="cols">2</property>
+                                                                <property name="flexible_direction">wxBOTH</property>
+                                                                <property name="growablecols">0</property>
+                                                                <property name="growablerows"></property>
+                                                                <property name="hgap">0</property>
                                                                 <property name="minimum_size"></property>
-                                                                <property name="moveable">1</property>
-                                                                <property name="name">m_pwlAddButton</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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>
-                                                                <event name="OnButtonClick">onPwlAdd</event>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALL|wxEXPAND</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxListCtrl" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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="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">200,-1</property>
-                                                                <property name="moveable">1</property>
-                                                                <property name="name">m_pwlValList</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style">wxLC_REPORT|wxLC_SINGLE_SEL</property>
-                                                                <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>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnListBeginDrag"></event>
-                                                                <event name="OnListBeginLabelEdit"></event>
-                                                                <event name="OnListBeginRDrag"></event>
-                                                                <event name="OnListCacheHint"></event>
-                                                                <event name="OnListColBeginDrag"></event>
-                                                                <event name="OnListColClick"></event>
-                                                                <event name="OnListColDragging"></event>
-                                                                <event name="OnListColEndDrag"></event>
-                                                                <event name="OnListColRightClick"></event>
-                                                                <event name="OnListDeleteAllItems"></event>
-                                                                <event name="OnListDeleteItem"></event>
-                                                                <event name="OnListEndLabelEdit"></event>
-                                                                <event name="OnListInsertItem"></event>
-                                                                <event name="OnListItemActivated"></event>
-                                                                <event name="OnListItemDeselected"></event>
-                                                                <event name="OnListItemFocused"></event>
-                                                                <event name="OnListItemMiddleClick"></event>
-                                                                <event name="OnListItemRightClick"></event>
-                                                                <event name="OnListItemSelected"></event>
-                                                                <event name="OnListKeyDown"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
-                                                            </object>
-                                                        </object>
-                                                        <object class="sizeritem" expanded="0">
-                                                            <property name="border">5</property>
-                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                                            <property name="proportion">0</property>
-                                                            <object class="wxButton" expanded="0">
-                                                                <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_name"></property>
-                                                                <property name="aui_position"></property>
-                                                                <property name="aui_row"></property>
-                                                                <property name="best_size"></property>
-                                                                <property name="bg"></property>
-                                                                <property name="caption"></property>
-                                                                <property name="caption_visible">1</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">0</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="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="label">Remove</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">m_pwlRemoveBtn</property>
-                                                                <property name="pane_border">1</property>
-                                                                <property name="pane_position"></property>
-                                                                <property name="pane_size"></property>
-                                                                <property name="permission">protected</property>
-                                                                <property name="pin_button">1</property>
-                                                                <property name="pos"></property>
-                                                                <property name="resize">Resizable</property>
-                                                                <property name="show">1</property>
-                                                                <property name="size"></property>
-                                                                <property name="style"></property>
-                                                                <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>
-                                                                <event name="OnButtonClick">onPwlRemove</event>
-                                                                <event name="OnChar"></event>
-                                                                <event name="OnEnterWindow"></event>
-                                                                <event name="OnEraseBackground"></event>
-                                                                <event name="OnKeyDown"></event>
-                                                                <event name="OnKeyUp"></event>
-                                                                <event name="OnKillFocus"></event>
-                                                                <event name="OnLeaveWindow"></event>
-                                                                <event name="OnLeftDClick"></event>
-                                                                <event name="OnLeftDown"></event>
-                                                                <event name="OnLeftUp"></event>
-                                                                <event name="OnMiddleDClick"></event>
-                                                                <event name="OnMiddleDown"></event>
-                                                                <event name="OnMiddleUp"></event>
-                                                                <event name="OnMotion"></event>
-                                                                <event name="OnMouseEvents"></event>
-                                                                <event name="OnMouseWheel"></event>
-                                                                <event name="OnPaint"></event>
-                                                                <event name="OnRightDClick"></event>
-                                                                <event name="OnRightDown"></event>
-                                                                <event name="OnRightUp"></event>
-                                                                <event name="OnSetFocus"></event>
-                                                                <event name="OnSize"></event>
-                                                                <event name="OnUpdateUI"></event>
+                                                                <property name="name">fgSizer8</property>
+                                                                <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                                                <property name="permission">none</property>
+                                                                <property name="rows">0</property>
+                                                                <property name="vgap">0</property>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">DC offset [V/A]</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">m_staticText21</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></property>
+                                                                        <property name="min_size"></property>
+                                                                        <property name="minimize_button">0</property>
+                                                                        <property name="minimum_size">100,-1</property>
+                                                                        <property name="moveable">1</property>
+                                                                        <property name="name">m_sinOffset</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Amplitude [V/A]</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">m_staticText22</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_sinAmplitude</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Frequency [Hz]</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">m_staticText23</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_sinFreq</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Delay [s]</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">m_staticText24</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_sinDelay</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Damping factor [1/s]</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">m_staticText25</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_sinDampFactor</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
                                                             </object>
                                                         </object>
                                                     </object>
-                                                </object>
-                                            </object>
-                                            <object class="notebookpage" expanded="0">
-                                                <property name="bitmap"></property>
-                                                <property name="label">FM</property>
-                                                <property name="select">0</property>
-                                                <object class="wxPanel" expanded="0">
-                                                    <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_name"></property>
-                                                    <property name="aui_position"></property>
-                                                    <property name="aui_row"></property>
-                                                    <property name="best_size"></property>
-                                                    <property name="bg"></property>
-                                                    <property name="caption"></property>
-                                                    <property name="caption_visible">1</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="fg"></property>
-                                                    <property name="floatable">1</property>
-                                                    <property name="font"></property>
-                                                    <property name="gripper">0</property>
-                                                    <property name="hidden">1</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">m_pwrFm</property>
-                                                    <property name="pane_border">1</property>
-                                                    <property name="pane_position"></property>
-                                                    <property name="pane_size"></property>
-                                                    <property name="permission">protected</property>
-                                                    <property name="pin_button">1</property>
-                                                    <property name="pos"></property>
-                                                    <property name="resize">Resizable</property>
-                                                    <property name="show">1</property>
-                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
-                                                </object>
-                                            </object>
-                                            <object class="notebookpage" expanded="0">
-                                                <property name="bitmap"></property>
-                                                <property name="label">AM</property>
-                                                <property name="select">0</property>
-                                                <object class="wxPanel" expanded="0">
-                                                    <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_name"></property>
-                                                    <property name="aui_position"></property>
-                                                    <property name="aui_row"></property>
-                                                    <property name="best_size"></property>
-                                                    <property name="bg"></property>
-                                                    <property name="caption"></property>
-                                                    <property name="caption_visible">1</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="fg"></property>
-                                                    <property name="floatable">1</property>
-                                                    <property name="font"></property>
-                                                    <property name="gripper">0</property>
-                                                    <property name="hidden">1</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">m_pwrAm</property>
-                                                    <property name="pane_border">1</property>
-                                                    <property name="pane_position"></property>
-                                                    <property name="pane_size"></property>
-                                                    <property name="permission">protected</property>
-                                                    <property name="pin_button">1</property>
-                                                    <property name="pos"></property>
-                                                    <property name="resize">Resizable</property>
-                                                    <property name="show">1</property>
-                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
-                                                </object>
-                                            </object>
-                                            <object class="notebookpage" expanded="0">
-                                                <property name="bitmap"></property>
-                                                <property name="label">Transient noise</property>
-                                                <property name="select">0</property>
-                                                <object class="wxPanel" expanded="0">
-                                                    <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_name"></property>
-                                                    <property name="aui_position"></property>
-                                                    <property name="aui_row"></property>
-                                                    <property name="best_size"></property>
-                                                    <property name="bg"></property>
-                                                    <property name="caption"></property>
-                                                    <property name="caption_visible">1</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="fg"></property>
-                                                    <property name="floatable">1</property>
-                                                    <property name="font"></property>
-                                                    <property name="gripper">0</property>
-                                                    <property name="hidden">1</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">m_pwrTransNoise</property>
-                                                    <property name="pane_border">1</property>
-                                                    <property name="pane_position"></property>
-                                                    <property name="pane_size"></property>
-                                                    <property name="permission">protected</property>
-                                                    <property name="pin_button">1</property>
-                                                    <property name="pos"></property>
-                                                    <property name="resize">Resizable</property>
-                                                    <property name="show">1</property>
-                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
-                                                </object>
-                                            </object>
-                                            <object class="notebookpage" expanded="0">
-                                                <property name="bitmap"></property>
-                                                <property name="label">Random</property>
-                                                <property name="select">0</property>
-                                                <object class="wxPanel" expanded="0">
-                                                    <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_name"></property>
-                                                    <property name="aui_position"></property>
-                                                    <property name="aui_row"></property>
-                                                    <property name="best_size"></property>
-                                                    <property name="bg"></property>
-                                                    <property name="caption"></property>
-                                                    <property name="caption_visible">1</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="fg"></property>
-                                                    <property name="floatable">1</property>
-                                                    <property name="font"></property>
-                                                    <property name="gripper">0</property>
-                                                    <property name="hidden">1</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">m_pwrRandom</property>
-                                                    <property name="pane_border">1</property>
-                                                    <property name="pane_position"></property>
-                                                    <property name="pane_size"></property>
-                                                    <property name="permission">protected</property>
-                                                    <property name="pin_button">1</property>
-                                                    <property name="pos"></property>
-                                                    <property name="resize">Resizable</property>
-                                                    <property name="show">1</property>
-                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
-                                                </object>
-                                            </object>
-                                            <object class="notebookpage" expanded="0">
-                                                <property name="bitmap"></property>
-                                                <property name="label">External data</property>
-                                                <property name="select">0</property>
-                                                <object class="wxPanel" expanded="0">
-                                                    <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_name"></property>
-                                                    <property name="aui_position"></property>
-                                                    <property name="aui_row"></property>
-                                                    <property name="best_size"></property>
-                                                    <property name="bg"></property>
-                                                    <property name="caption"></property>
-                                                    <property name="caption_visible">1</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="fg"></property>
-                                                    <property name="floatable">1</property>
-                                                    <property name="font"></property>
-                                                    <property name="gripper">0</property>
-                                                    <property name="hidden">1</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">m_pwrExtData</property>
-                                                    <property name="pane_border">1</property>
-                                                    <property name="pane_position"></property>
-                                                    <property name="pane_size"></property>
-                                                    <property name="permission">protected</property>
-                                                    <property name="pin_button">1</property>
-                                                    <property name="pos"></property>
-                                                    <property name="resize">Resizable</property>
-                                                    <property name="show">1</property>
-                                                    <property name="size"></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">wxTAB_TRAVERSAL</property>
-                                                    <event name="OnChar"></event>
-                                                    <event name="OnEnterWindow"></event>
-                                                    <event name="OnEraseBackground"></event>
-                                                    <event name="OnKeyDown"></event>
-                                                    <event name="OnKeyUp"></event>
-                                                    <event name="OnKillFocus"></event>
-                                                    <event name="OnLeaveWindow"></event>
-                                                    <event name="OnLeftDClick"></event>
-                                                    <event name="OnLeftDown"></event>
-                                                    <event name="OnLeftUp"></event>
-                                                    <event name="OnMiddleDClick"></event>
-                                                    <event name="OnMiddleDown"></event>
-                                                    <event name="OnMiddleUp"></event>
-                                                    <event name="OnMotion"></event>
-                                                    <event name="OnMouseEvents"></event>
-                                                    <event name="OnMouseWheel"></event>
-                                                    <event name="OnPaint"></event>
-                                                    <event name="OnRightDClick"></event>
-                                                    <event name="OnRightDown"></event>
-                                                    <event name="OnRightUp"></event>
-                                                    <event name="OnSetFocus"></event>
-                                                    <event name="OnSize"></event>
-                                                    <event name="OnUpdateUI"></event>
+                                                    <object class="notebookpage" expanded="0">
+                                                        <property name="bitmap"></property>
+                                                        <property name="label">Exponential</property>
+                                                        <property name="select">0</property>
+                                                        <object class="wxPanel" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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">m_pwrExp</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                            <object class="wxFlexGridSizer" expanded="0">
+                                                                <property name="cols">2</property>
+                                                                <property name="flexible_direction">wxBOTH</property>
+                                                                <property name="growablecols">0</property>
+                                                                <property name="growablerows"></property>
+                                                                <property name="hgap">0</property>
+                                                                <property name="minimum_size"></property>
+                                                                <property name="name">fgSizer9</property>
+                                                                <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                                                <property name="permission">none</property>
+                                                                <property name="rows">0</property>
+                                                                <property name="vgap">0</property>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Initial value [V/A]</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">m_staticText26</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></property>
+                                                                        <property name="min_size"></property>
+                                                                        <property name="minimize_button">0</property>
+                                                                        <property name="minimum_size">100,-1</property>
+                                                                        <property name="moveable">1</property>
+                                                                        <property name="name">m_expInit</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Pulsed value [V/A]</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">m_staticText27</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_expPulsed</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Rise delay time [s]</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">m_staticText28</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_expRiseDelay</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Rise time constant [s]</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">m_staticText29</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_expRiseConst</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Fall delay time [s]</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">m_staticText30</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_expFallDelay</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxStaticText" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="label">Fall time constant [s]</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">m_staticText31</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></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"></property>
+                                                                        <property name="wrap">-1</property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxTextCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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="maxlength"></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">m_expFallConst</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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="value"></property>
+                                                                        <property name="window_extra_style"></property>
+                                                                        <property name="window_name"></property>
+                                                                        <property name="window_style"></property>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnText"></event>
+                                                                        <event name="OnTextEnter"></event>
+                                                                        <event name="OnTextMaxLen"></event>
+                                                                        <event name="OnTextURL"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                            </object>
+                                                        </object>
+                                                    </object>
+                                                    <object class="notebookpage" expanded="0">
+                                                        <property name="bitmap"></property>
+                                                        <property name="label">Piece-wise Linear</property>
+                                                        <property name="select">0</property>
+                                                        <object class="wxPanel" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="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">m_pwrPwl</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></property>
+                                                            <property name="subclass"></property>
+                                                            <property name="toolbar_pane">0</property>
+                                                            <property name="tooltip">Piece-wise linear</property>
+                                                            <property name="window_extra_style"></property>
+                                                            <property name="window_name"></property>
+                                                            <property name="window_style">wxTAB_TRAVERSAL</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                            <object class="wxFlexGridSizer" expanded="0">
+                                                                <property name="cols">2</property>
+                                                                <property name="flexible_direction">wxBOTH</property>
+                                                                <property name="growablecols">0</property>
+                                                                <property name="growablerows">1</property>
+                                                                <property name="hgap">0</property>
+                                                                <property name="minimum_size"></property>
+                                                                <property name="name">fgSizer15</property>
+                                                                <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_ALL</property>
+                                                                <property name="permission">none</property>
+                                                                <property name="rows">0</property>
+                                                                <property name="vgap">0</property>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxEXPAND</property>
+                                                                    <property name="proportion">1</property>
+                                                                    <object class="wxFlexGridSizer" expanded="0">
+                                                                        <property name="cols">2</property>
+                                                                        <property name="flexible_direction">wxBOTH</property>
+                                                                        <property name="growablecols">0</property>
+                                                                        <property name="growablerows"></property>
+                                                                        <property name="hgap">0</property>
+                                                                        <property name="minimum_size"></property>
+                                                                        <property name="name">fgSizer10</property>
+                                                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                                                                        <property name="permission">none</property>
+                                                                        <property name="rows">0</property>
+                                                                        <property name="vgap">0</property>
+                                                                        <object class="sizeritem" expanded="0">
+                                                                            <property name="border">5</property>
+                                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                            <property name="proportion">0</property>
+                                                                            <object class="wxStaticText" expanded="0">
+                                                                                <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_name"></property>
+                                                                                <property name="aui_position"></property>
+                                                                                <property name="aui_row"></property>
+                                                                                <property name="best_size"></property>
+                                                                                <property name="bg"></property>
+                                                                                <property name="caption"></property>
+                                                                                <property name="caption_visible">1</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="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="label">Time [s]</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">m_staticText34</property>
+                                                                                <property name="pane_border">1</property>
+                                                                                <property name="pane_position"></property>
+                                                                                <property name="pane_size"></property>
+                                                                                <property name="permission">protected</property>
+                                                                                <property name="pin_button">1</property>
+                                                                                <property name="pos"></property>
+                                                                                <property name="resize">Resizable</property>
+                                                                                <property name="show">1</property>
+                                                                                <property name="size"></property>
+                                                                                <property name="style"></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"></property>
+                                                                                <property name="wrap">-1</property>
+                                                                                <event name="OnChar"></event>
+                                                                                <event name="OnEnterWindow"></event>
+                                                                                <event name="OnEraseBackground"></event>
+                                                                                <event name="OnKeyDown"></event>
+                                                                                <event name="OnKeyUp"></event>
+                                                                                <event name="OnKillFocus"></event>
+                                                                                <event name="OnLeaveWindow"></event>
+                                                                                <event name="OnLeftDClick"></event>
+                                                                                <event name="OnLeftDown"></event>
+                                                                                <event name="OnLeftUp"></event>
+                                                                                <event name="OnMiddleDClick"></event>
+                                                                                <event name="OnMiddleDown"></event>
+                                                                                <event name="OnMiddleUp"></event>
+                                                                                <event name="OnMotion"></event>
+                                                                                <event name="OnMouseEvents"></event>
+                                                                                <event name="OnMouseWheel"></event>
+                                                                                <event name="OnPaint"></event>
+                                                                                <event name="OnRightDClick"></event>
+                                                                                <event name="OnRightDown"></event>
+                                                                                <event name="OnRightUp"></event>
+                                                                                <event name="OnSetFocus"></event>
+                                                                                <event name="OnSize"></event>
+                                                                                <event name="OnUpdateUI"></event>
+                                                                            </object>
+                                                                        </object>
+                                                                        <object class="sizeritem" expanded="0">
+                                                                            <property name="border">5</property>
+                                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                                            <property name="proportion">0</property>
+                                                                            <object class="wxTextCtrl" expanded="0">
+                                                                                <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_name"></property>
+                                                                                <property name="aui_position"></property>
+                                                                                <property name="aui_row"></property>
+                                                                                <property name="best_size"></property>
+                                                                                <property name="bg"></property>
+                                                                                <property name="caption"></property>
+                                                                                <property name="caption_visible">1</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="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="maxlength"></property>
+                                                                                <property name="min_size"></property>
+                                                                                <property name="minimize_button">0</property>
+                                                                                <property name="minimum_size">100,-1</property>
+                                                                                <property name="moveable">1</property>
+                                                                                <property name="name">m_pwlTime</property>
+                                                                                <property name="pane_border">1</property>
+                                                                                <property name="pane_position"></property>
+                                                                                <property name="pane_size"></property>
+                                                                                <property name="permission">protected</property>
+                                                                                <property name="pin_button">1</property>
+                                                                                <property name="pos"></property>
+                                                                                <property name="resize">Resizable</property>
+                                                                                <property name="show">1</property>
+                                                                                <property name="size"></property>
+                                                                                <property name="style"></property>
+                                                                                <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="value"></property>
+                                                                                <property name="window_extra_style"></property>
+                                                                                <property name="window_name"></property>
+                                                                                <property name="window_style"></property>
+                                                                                <event name="OnChar"></event>
+                                                                                <event name="OnEnterWindow"></event>
+                                                                                <event name="OnEraseBackground"></event>
+                                                                                <event name="OnKeyDown"></event>
+                                                                                <event name="OnKeyUp"></event>
+                                                                                <event name="OnKillFocus"></event>
+                                                                                <event name="OnLeaveWindow"></event>
+                                                                                <event name="OnLeftDClick"></event>
+                                                                                <event name="OnLeftDown"></event>
+                                                                                <event name="OnLeftUp"></event>
+                                                                                <event name="OnMiddleDClick"></event>
+                                                                                <event name="OnMiddleDown"></event>
+                                                                                <event name="OnMiddleUp"></event>
+                                                                                <event name="OnMotion"></event>
+                                                                                <event name="OnMouseEvents"></event>
+                                                                                <event name="OnMouseWheel"></event>
+                                                                                <event name="OnPaint"></event>
+                                                                                <event name="OnRightDClick"></event>
+                                                                                <event name="OnRightDown"></event>
+                                                                                <event name="OnRightUp"></event>
+                                                                                <event name="OnSetFocus"></event>
+                                                                                <event name="OnSize"></event>
+                                                                                <event name="OnText"></event>
+                                                                                <event name="OnTextEnter"></event>
+                                                                                <event name="OnTextMaxLen"></event>
+                                                                                <event name="OnTextURL"></event>
+                                                                                <event name="OnUpdateUI"></event>
+                                                                            </object>
+                                                                        </object>
+                                                                        <object class="sizeritem" expanded="0">
+                                                                            <property name="border">5</property>
+                                                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                            <property name="proportion">0</property>
+                                                                            <object class="wxStaticText" expanded="0">
+                                                                                <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_name"></property>
+                                                                                <property name="aui_position"></property>
+                                                                                <property name="aui_row"></property>
+                                                                                <property name="best_size"></property>
+                                                                                <property name="bg"></property>
+                                                                                <property name="caption"></property>
+                                                                                <property name="caption_visible">1</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="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="label">Value [V/A]</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">m_staticText35</property>
+                                                                                <property name="pane_border">1</property>
+                                                                                <property name="pane_position"></property>
+                                                                                <property name="pane_size"></property>
+                                                                                <property name="permission">protected</property>
+                                                                                <property name="pin_button">1</property>
+                                                                                <property name="pos"></property>
+                                                                                <property name="resize">Resizable</property>
+                                                                                <property name="show">1</property>
+                                                                                <property name="size"></property>
+                                                                                <property name="style"></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"></property>
+                                                                                <property name="wrap">-1</property>
+                                                                                <event name="OnChar"></event>
+                                                                                <event name="OnEnterWindow"></event>
+                                                                                <event name="OnEraseBackground"></event>
+                                                                                <event name="OnKeyDown"></event>
+                                                                                <event name="OnKeyUp"></event>
+                                                                                <event name="OnKillFocus"></event>
+                                                                                <event name="OnLeaveWindow"></event>
+                                                                                <event name="OnLeftDClick"></event>
+                                                                                <event name="OnLeftDown"></event>
+                                                                                <event name="OnLeftUp"></event>
+                                                                                <event name="OnMiddleDClick"></event>
+                                                                                <event name="OnMiddleDown"></event>
+                                                                                <event name="OnMiddleUp"></event>
+                                                                                <event name="OnMotion"></event>
+                                                                                <event name="OnMouseEvents"></event>
+                                                                                <event name="OnMouseWheel"></event>
+                                                                                <event name="OnPaint"></event>
+                                                                                <event name="OnRightDClick"></event>
+                                                                                <event name="OnRightDown"></event>
+                                                                                <event name="OnRightUp"></event>
+                                                                                <event name="OnSetFocus"></event>
+                                                                                <event name="OnSize"></event>
+                                                                                <event name="OnUpdateUI"></event>
+                                                                            </object>
+                                                                        </object>
+                                                                        <object class="sizeritem" expanded="0">
+                                                                            <property name="border">5</property>
+                                                                            <property name="flag">wxALL|wxEXPAND</property>
+                                                                            <property name="proportion">0</property>
+                                                                            <object class="wxTextCtrl" expanded="0">
+                                                                                <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_name"></property>
+                                                                                <property name="aui_position"></property>
+                                                                                <property name="aui_row"></property>
+                                                                                <property name="best_size"></property>
+                                                                                <property name="bg"></property>
+                                                                                <property name="caption"></property>
+                                                                                <property name="caption_visible">1</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="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="maxlength"></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">m_pwlValue</property>
+                                                                                <property name="pane_border">1</property>
+                                                                                <property name="pane_position"></property>
+                                                                                <property name="pane_size"></property>
+                                                                                <property name="permission">protected</property>
+                                                                                <property name="pin_button">1</property>
+                                                                                <property name="pos"></property>
+                                                                                <property name="resize">Resizable</property>
+                                                                                <property name="show">1</property>
+                                                                                <property name="size"></property>
+                                                                                <property name="style"></property>
+                                                                                <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="value"></property>
+                                                                                <property name="window_extra_style"></property>
+                                                                                <property name="window_name"></property>
+                                                                                <property name="window_style"></property>
+                                                                                <event name="OnChar"></event>
+                                                                                <event name="OnEnterWindow"></event>
+                                                                                <event name="OnEraseBackground"></event>
+                                                                                <event name="OnKeyDown"></event>
+                                                                                <event name="OnKeyUp"></event>
+                                                                                <event name="OnKillFocus"></event>
+                                                                                <event name="OnLeaveWindow"></event>
+                                                                                <event name="OnLeftDClick"></event>
+                                                                                <event name="OnLeftDown"></event>
+                                                                                <event name="OnLeftUp"></event>
+                                                                                <event name="OnMiddleDClick"></event>
+                                                                                <event name="OnMiddleDown"></event>
+                                                                                <event name="OnMiddleUp"></event>
+                                                                                <event name="OnMotion"></event>
+                                                                                <event name="OnMouseEvents"></event>
+                                                                                <event name="OnMouseWheel"></event>
+                                                                                <event name="OnPaint"></event>
+                                                                                <event name="OnRightDClick"></event>
+                                                                                <event name="OnRightDown"></event>
+                                                                                <event name="OnRightUp"></event>
+                                                                                <event name="OnSetFocus"></event>
+                                                                                <event name="OnSize"></event>
+                                                                                <event name="OnText"></event>
+                                                                                <event name="OnTextEnter"></event>
+                                                                                <event name="OnTextMaxLen"></event>
+                                                                                <event name="OnTextURL"></event>
+                                                                                <event name="OnUpdateUI"></event>
+                                                                            </object>
+                                                                        </object>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxButton" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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">0</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="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="label">Add</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">m_pwlAddButton</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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>
+                                                                        <event name="OnButtonClick">onPwlAdd</event>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxListCtrl" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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="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">200,-1</property>
+                                                                        <property name="moveable">1</property>
+                                                                        <property name="name">m_pwlValList</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style">wxLC_REPORT|wxLC_SINGLE_SEL</property>
+                                                                        <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>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnListBeginDrag"></event>
+                                                                        <event name="OnListBeginLabelEdit"></event>
+                                                                        <event name="OnListBeginRDrag"></event>
+                                                                        <event name="OnListCacheHint"></event>
+                                                                        <event name="OnListColBeginDrag"></event>
+                                                                        <event name="OnListColClick"></event>
+                                                                        <event name="OnListColDragging"></event>
+                                                                        <event name="OnListColEndDrag"></event>
+                                                                        <event name="OnListColRightClick"></event>
+                                                                        <event name="OnListDeleteAllItems"></event>
+                                                                        <event name="OnListDeleteItem"></event>
+                                                                        <event name="OnListEndLabelEdit"></event>
+                                                                        <event name="OnListInsertItem"></event>
+                                                                        <event name="OnListItemActivated"></event>
+                                                                        <event name="OnListItemDeselected"></event>
+                                                                        <event name="OnListItemFocused"></event>
+                                                                        <event name="OnListItemMiddleClick"></event>
+                                                                        <event name="OnListItemRightClick"></event>
+                                                                        <event name="OnListItemSelected"></event>
+                                                                        <event name="OnListKeyDown"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                                <object class="sizeritem" expanded="0">
+                                                                    <property name="border">5</property>
+                                                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                                                                    <property name="proportion">0</property>
+                                                                    <object class="wxButton" expanded="0">
+                                                                        <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_name"></property>
+                                                                        <property name="aui_position"></property>
+                                                                        <property name="aui_row"></property>
+                                                                        <property name="best_size"></property>
+                                                                        <property name="bg"></property>
+                                                                        <property name="caption"></property>
+                                                                        <property name="caption_visible">1</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">0</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="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="label">Remove</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">m_pwlRemoveBtn</property>
+                                                                        <property name="pane_border">1</property>
+                                                                        <property name="pane_position"></property>
+                                                                        <property name="pane_size"></property>
+                                                                        <property name="permission">protected</property>
+                                                                        <property name="pin_button">1</property>
+                                                                        <property name="pos"></property>
+                                                                        <property name="resize">Resizable</property>
+                                                                        <property name="show">1</property>
+                                                                        <property name="size"></property>
+                                                                        <property name="style"></property>
+                                                                        <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>
+                                                                        <event name="OnButtonClick">onPwlRemove</event>
+                                                                        <event name="OnChar"></event>
+                                                                        <event name="OnEnterWindow"></event>
+                                                                        <event name="OnEraseBackground"></event>
+                                                                        <event name="OnKeyDown"></event>
+                                                                        <event name="OnKeyUp"></event>
+                                                                        <event name="OnKillFocus"></event>
+                                                                        <event name="OnLeaveWindow"></event>
+                                                                        <event name="OnLeftDClick"></event>
+                                                                        <event name="OnLeftDown"></event>
+                                                                        <event name="OnLeftUp"></event>
+                                                                        <event name="OnMiddleDClick"></event>
+                                                                        <event name="OnMiddleDown"></event>
+                                                                        <event name="OnMiddleUp"></event>
+                                                                        <event name="OnMotion"></event>
+                                                                        <event name="OnMouseEvents"></event>
+                                                                        <event name="OnMouseWheel"></event>
+                                                                        <event name="OnPaint"></event>
+                                                                        <event name="OnRightDClick"></event>
+                                                                        <event name="OnRightDown"></event>
+                                                                        <event name="OnRightUp"></event>
+                                                                        <event name="OnSetFocus"></event>
+                                                                        <event name="OnSize"></event>
+                                                                        <event name="OnUpdateUI"></event>
+                                                                    </object>
+                                                                </object>
+                                                            </object>
+                                                        </object>
+                                                    </object>
+                                                    <object class="notebookpage" expanded="0">
+                                                        <property name="bitmap"></property>
+                                                        <property name="label">FM</property>
+                                                        <property name="select">0</property>
+                                                        <object class="wxPanel" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="fg"></property>
+                                                            <property name="floatable">1</property>
+                                                            <property name="font"></property>
+                                                            <property name="gripper">0</property>
+                                                            <property name="hidden">1</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">m_pwrFm</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="notebookpage" expanded="0">
+                                                        <property name="bitmap"></property>
+                                                        <property name="label">AM</property>
+                                                        <property name="select">0</property>
+                                                        <object class="wxPanel" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="fg"></property>
+                                                            <property name="floatable">1</property>
+                                                            <property name="font"></property>
+                                                            <property name="gripper">0</property>
+                                                            <property name="hidden">1</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">m_pwrAm</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="notebookpage" expanded="0">
+                                                        <property name="bitmap"></property>
+                                                        <property name="label">Transient noise</property>
+                                                        <property name="select">0</property>
+                                                        <object class="wxPanel" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="fg"></property>
+                                                            <property name="floatable">1</property>
+                                                            <property name="font"></property>
+                                                            <property name="gripper">0</property>
+                                                            <property name="hidden">1</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">m_pwrTransNoise</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="notebookpage" expanded="0">
+                                                        <property name="bitmap"></property>
+                                                        <property name="label">Random</property>
+                                                        <property name="select">0</property>
+                                                        <object class="wxPanel" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="fg"></property>
+                                                            <property name="floatable">1</property>
+                                                            <property name="font"></property>
+                                                            <property name="gripper">0</property>
+                                                            <property name="hidden">1</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">m_pwrRandom</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
+                                                    <object class="notebookpage" expanded="0">
+                                                        <property name="bitmap"></property>
+                                                        <property name="label">External data</property>
+                                                        <property name="select">0</property>
+                                                        <object class="wxPanel" expanded="0">
+                                                            <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_name"></property>
+                                                            <property name="aui_position"></property>
+                                                            <property name="aui_row"></property>
+                                                            <property name="best_size"></property>
+                                                            <property name="bg"></property>
+                                                            <property name="caption"></property>
+                                                            <property name="caption_visible">1</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="fg"></property>
+                                                            <property name="floatable">1</property>
+                                                            <property name="font"></property>
+                                                            <property name="gripper">0</property>
+                                                            <property name="hidden">1</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">m_pwrExtData</property>
+                                                            <property name="pane_border">1</property>
+                                                            <property name="pane_position"></property>
+                                                            <property name="pane_size"></property>
+                                                            <property name="permission">protected</property>
+                                                            <property name="pin_button">1</property>
+                                                            <property name="pos"></property>
+                                                            <property name="resize">Resizable</property>
+                                                            <property name="show">1</property>
+                                                            <property name="size"></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">wxTAB_TRAVERSAL</property>
+                                                            <event name="OnChar"></event>
+                                                            <event name="OnEnterWindow"></event>
+                                                            <event name="OnEraseBackground"></event>
+                                                            <event name="OnKeyDown"></event>
+                                                            <event name="OnKeyUp"></event>
+                                                            <event name="OnKillFocus"></event>
+                                                            <event name="OnLeaveWindow"></event>
+                                                            <event name="OnLeftDClick"></event>
+                                                            <event name="OnLeftDown"></event>
+                                                            <event name="OnLeftUp"></event>
+                                                            <event name="OnMiddleDClick"></event>
+                                                            <event name="OnMiddleDown"></event>
+                                                            <event name="OnMiddleUp"></event>
+                                                            <event name="OnMotion"></event>
+                                                            <event name="OnMouseEvents"></event>
+                                                            <event name="OnMouseWheel"></event>
+                                                            <event name="OnPaint"></event>
+                                                            <event name="OnRightDClick"></event>
+                                                            <event name="OnRightDown"></event>
+                                                            <event name="OnRightUp"></event>
+                                                            <event name="OnSetFocus"></event>
+                                                            <event name="OnSize"></event>
+                                                            <event name="OnUpdateUI"></event>
+                                                        </object>
+                                                    </object>
                                                 </object>
                                             </object>
                                         </object>
diff --git a/eeschema/dialogs/dialog_spice_model_base.h b/eeschema/dialogs/dialog_spice_model_base.h
index d9588b6fa6..b6af962b35 100644
--- a/eeschema/dialogs/dialog_spice_model_base.h
+++ b/eeschema/dialogs/dialog_spice_model_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 24 2016)
+// C++ code generated with wxFormBuilder (version Jul 17 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -28,6 +28,7 @@ class DIALOG_SHIM;
 #include <wx/image.h>
 #include <wx/icon.h>
 #include <wx/button.h>
+#include <wx/statbox.h>
 #include <wx/listctrl.h>
 #include <wx/notebook.h>
 #include <wx/radiobox.h>
@@ -66,14 +67,13 @@ class DIALOG_SPICE_MODEL_BASE : public DIALOG_SHIM
 		wxTextCtrl* m_icLib;
 		wxButton* m_icSelectLib;
 		wxPanel* m_power;
-		wxNotebook* m_powerNotebook;
-		wxPanel* m_pwrGeneric;
 		wxStaticText* m_staticText10;
 		wxTextCtrl* m_genDc;
 		wxStaticText* m_staticText11;
 		wxTextCtrl* m_genAcMag;
 		wxStaticText* m_staticText12;
 		wxTextCtrl* m_genAcPhase;
+		wxNotebook* m_powerNotebook;
 		wxPanel* m_pwrPulse;
 		wxStaticText* m_staticText13;
 		wxTextCtrl* m_pulseInit;
@@ -143,7 +143,7 @@ class DIALOG_SPICE_MODEL_BASE : public DIALOG_SHIM
 	
 	public:
 		
-		DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 425,630 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+		DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 410,705 ), long style = wxDEFAULT_DIALOG_STYLE ); 
 		~DIALOG_SPICE_MODEL_BASE();
 	
 };

From 06287e4986afea0727b198fa10e993ed8c3c012a Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:09 +0200
Subject: [PATCH 160/197] Display an error message for unannotated schematics

---
 .../netlist_exporter_pspice.cpp               | 19 ++++++++++++++++--
 .../netlist_exporter_pspice.h                 |  8 +++++++-
 eeschema/sim/sim_plot_frame.cpp               | 20 +++++++++++++++----
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index d8f96d097a..174fbffffe 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -52,7 +52,8 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* aFormatter, unsigned aCtl
     // Netlist options
     const bool useNetcodeAsNetName = aCtl & NET_USE_NETCODES_AS_NETNAMES;
 
-    ProcessNetlist( aCtl );
+    if( !ProcessNetlist( aCtl ) )
+        return false;
 
     aFormatter->Print( 0, ".title KiCad schematic\n" );
 
@@ -234,10 +235,12 @@ wxString NETLIST_EXPORTER_PSPICE::GetSpiceFieldDefVal( SPICE_FIELD aField,
 }
 
 
-void NETLIST_EXPORTER_PSPICE::ProcessNetlist( unsigned aCtl )
+bool NETLIST_EXPORTER_PSPICE::ProcessNetlist( unsigned aCtl )
 {
     const wxString      delimiters( "{:,; }" );
     SCH_SHEET_LIST      sheetList( g_RootSheet );
+    // Set of reference names, to check for duplications
+    std::set<wxString>  refNames;
 
     // Prepare list of nets generation (not used here, but...
     for( unsigned ii = 0; ii < m_masterList->size(); ii++ )
@@ -275,6 +278,16 @@ void NETLIST_EXPORTER_PSPICE::ProcessNetlist( unsigned aCtl )
             spiceItem.m_model = GetSpiceField( SF_MODEL, comp, aCtl );
             spiceItem.m_refName = comp->GetRef( &sheetList[sheet_idx] );
 
+            // Duplicate references will result in simulation errors
+            if( refNames.count( spiceItem.m_refName ) )
+            {
+                DisplayError( NULL, wxT( "There are duplicate components. "
+                            "You need to annotate schematics first." ) );
+                return false;
+            }
+
+            refNames.insert( spiceItem.m_refName );
+
             // Check to see if component should be removed from Spice netlist
             spiceItem.m_enabled = StringToBool( GetSpiceField( SF_ENABLED, comp, aCtl ) );
 
@@ -326,6 +339,8 @@ void NETLIST_EXPORTER_PSPICE::ProcessNetlist( unsigned aCtl )
             m_spiceItems.push_back( spiceItem );
         }
     }
+
+    return true;
 }
 
 
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index d0407912fc..44d4ed6d10 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -113,7 +113,13 @@ public:
 
     bool Format( OUTPUTFORMATTER* aFormatter, unsigned aCtl );
 
-    void ProcessNetlist( unsigned aCtl );
+    /**
+     * @brief Processes the netlist to create net mapping and a list of SPICE_ITEMs.
+     * It is automatically called by WriteNetlist(), but might be used separately,
+     * if only net mapping and the list of SPICE_ITEMs are required.
+     * @return True if successful.
+     */
+    bool ProcessNetlist( unsigned aCtl );
 
     const NET_INDEX_MAP& GetNetIndexMap() const
     {
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index d3f0f7b6c1..772a6c365e 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -150,11 +150,16 @@ void SIM_PLOT_FRAME::StartSimulation()
 
     updateNetlistExporter();
     m_exporter->SetSimCommand( m_settingsDlg.GetSimCommand() );
-    m_exporter->Format( &formatter, m_settingsDlg.GetNetlistOptions() );
+
+    if( !m_exporter->Format( &formatter, m_settingsDlg.GetNetlistOptions() ) )
+    {
+        DisplayError( this, wxT( "There were errors during netlist export, aborted." ) );
+        return;
+    }
 
     if( m_exporter->GetSimType() == ST_UNKNOWN )
     {
-        DisplayInfoMessage( this, wxT( "You need to select the simulation settings first" ) );
+        DisplayInfoMessage( this, wxT( "You need to select the simulation settings first." ) );
         return;
     }
 
@@ -647,8 +652,15 @@ void SIM_PLOT_FRAME::onSimulate( wxCommandEvent& event )
 
 void SIM_PLOT_FRAME::onSettings( wxCommandEvent& event )
 {
+    // Initial processing is required to e.g. display a list of power sources
     updateNetlistExporter();
-    m_exporter->ProcessNetlist( NET_ALL_FLAGS );
+
+    if( !m_exporter->ProcessNetlist( NET_ALL_FLAGS ) )
+    {
+        DisplayError( this, wxT( "There were errors during netlist export, aborted." ) );
+        return;
+    }
+
     m_settingsDlg.SetNetlistExporter( m_exporter.get() );
     m_settingsDlg.ShowModal();
 }
@@ -660,7 +672,7 @@ void SIM_PLOT_FRAME::onAddSignal( wxCommandEvent& event )
 
     if( !plotPanel || !m_exporter || plotPanel->GetType() != m_exporter->GetSimType() )
     {
-        DisplayInfoMessage( this, wxT( "You need to run simulation first" ) );
+        DisplayInfoMessage( this, wxT( "You need to run simulation first." ) );
         return;
     }
 

From 672fd76995530b1e916aadb0756aa4081cb03ea5 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:09 +0200
Subject: [PATCH 161/197] Remove tuners for components that were removed

---
 .../netlist_exporter_pspice.h                 | 31 ++++++++---------
 eeschema/sim/sim_plot_frame.cpp               | 33 +++++++++++++++++--
 eeschema/sim/sim_plot_frame.h                 |  8 ++++-
 3 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.h b/eeschema/netlist_exporters/netlist_exporter_pspice.h
index 44d4ed6d10..f20db37c85 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.h
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.h
@@ -63,6 +63,22 @@ enum SPICE_PRIMITIVE {
 
 /// @todo add NET_ADJUST_INCLUDE_PATHS & NET_ADJUST_PASSIVE_VALS checkboxes in the netlist export dialog
 
+struct SPICE_ITEM
+{
+    SCH_COMPONENT* m_parent;
+    wxChar m_primitive;
+    wxString m_model;
+    wxString m_refName;
+    bool m_enabled;
+
+    ///> Array containing Standard Pin Name
+    std::vector<NETLIST_OBJECT*> m_pins;
+
+    ///> Numeric indices into m_SortedComponentPinList
+    std::vector<int> m_pinSequence;
+};
+
+
 /**
  * Class NETLIST_EXPORTER_PSPICE
  * generates a PSPICE compatible netlist
@@ -80,21 +96,6 @@ public:
     {
     }
 
-    struct SPICE_ITEM
-    {
-        SCH_COMPONENT* m_parent;
-        wxChar m_primitive;
-        wxString m_model;
-        wxString m_refName;
-        bool m_enabled;
-
-        ///> Array containing Standard Pin Name
-        std::vector<NETLIST_OBJECT*> m_pins;
-
-        ///> Numeric indices into m_SortedComponentPinList
-        std::vector<int> m_pinSequence;
-    };
-
     typedef std::list<SPICE_ITEM> SPICE_ITEM_LIST;
 
     ///> Net name to node number mapping
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 772a6c365e..8fb6b87fd7 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -172,6 +172,7 @@ void SIM_PLOT_FRAME::StartSimulation()
     m_simulator->SetReporter( new SIM_THREAD_REPORTER( this ) );
     m_simulator->Init();
     m_simulator->LoadNetlist( formatter.GetString() );
+    updateTuners();
     applyTuners();
     m_simulator->Run();
 
@@ -260,9 +261,11 @@ void SIM_PLOT_FRAME::AddTuner( SCH_COMPONENT* aComponent )
 }
 
 
-void SIM_PLOT_FRAME::RemoveTuner( TUNER_SLIDER* aTuner )
+void SIM_PLOT_FRAME::RemoveTuner( TUNER_SLIDER* aTuner, bool aErase )
 {
-    m_tuners.remove( aTuner );
+    if( aErase )
+        m_tuners.remove( aTuner );
+
     aTuner->Destroy();
     m_sidePanel->Layout();
 }
@@ -433,6 +436,32 @@ void SIM_PLOT_FRAME::updateCursors()
 }
 
 
+void SIM_PLOT_FRAME::updateTuners()
+{
+    const auto& spiceItems = m_exporter->GetSpiceItems();
+
+    for( auto it = m_tuners.begin(); it != m_tuners.end(); /* iteration inside the loop */ )
+    {
+        const wxString& ref = (*it)->GetComponentName();
+
+        if( std::find_if( spiceItems.begin(), spiceItems.end(), [&]( const SPICE_ITEM& item )
+                {
+                    return item.m_refName == ref;
+                }) == spiceItems.end() )
+        {
+            // The component does not exist anymore, remove the associated tuner
+            TUNER_SLIDER* tuner = *it;
+            it = m_tuners.erase( it );
+            RemoveTuner( tuner, false );
+        }
+        else
+        {
+            ++it;
+        }
+    }
+}
+
+
 void SIM_PLOT_FRAME::applyTuners()
 {
     for( auto& tuner : m_tuners )
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 490196b426..07b8ac961e 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -131,7 +131,7 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         void AddCurrentPlot( const wxString& aDeviceName, const wxString& aParam );
 
         void AddTuner( SCH_COMPONENT* aComponent );
-        void RemoveTuner( TUNER_SLIDER* aTuner );
+        void RemoveTuner( TUNER_SLIDER* aTuner, bool aErase = true );
 
         SIM_PLOT_PANEL* CurrentPlot() const;
 
@@ -172,6 +172,12 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
          */
         void updateCursors();
 
+        /**
+         * @brief Filters out tuners for components that do not exist anymore.
+         * Decisions are based on the current NETLIST_EXPORTER data.
+         */
+        void updateTuners();
+
         /**
          * @brief Applies component values specified using tunder sliders to the current netlist.
          */

From ed8f55533150bbe9e3c62a84bcf52acf9c878c92 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:09 +0200
Subject: [PATCH 162/197] Remove plots that are invalid after component removal

---
 eeschema/sim/sim_plot_frame.cpp | 31 ++++++++++++++++++++++++-------
 eeschema/sim/sim_plot_frame.h   |  3 ++-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 8fb6b87fd7..684fe99dd7 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -316,14 +316,17 @@ void SIM_PLOT_FRAME::addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const
 }
 
 
-void SIM_PLOT_FRAME::removePlot( const wxString& aPlotName )
+void SIM_PLOT_FRAME::removePlot( const wxString& aPlotName, bool aErase )
 {
     SIM_PLOT_PANEL* plotPanel = CurrentPlot();
-    auto& traceMap = m_plots[plotPanel].m_traces;
-    auto traceIt = traceMap.find( aPlotName );
 
-    wxASSERT( traceIt != traceMap.end() );
-    traceMap.erase( traceIt );
+    if( aErase )
+    {
+        auto& traceMap = m_plots[plotPanel].m_traces;
+        auto traceIt = traceMap.find( aPlotName );
+        wxASSERT( traceIt != traceMap.end() );
+        traceMap.erase( traceIt );
+    }
 
     wxASSERT( plotPanel->IsShown( aPlotName ) );
     plotPanel->DeleteTrace( aPlotName );
@@ -799,9 +802,22 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
     // If there are any signals plotted, update them
     if( SIM_PLOT_PANEL::IsPlottable( simType ) )
     {
-        for( const auto& trace : m_plots[plotPanel].m_traces )
-            updatePlot( trace.second, plotPanel );
+        TRACE_MAP& traceMap = m_plots[plotPanel].m_traces;
 
+        for( auto it = traceMap.begin(); it != traceMap.end(); /* iteration occurs in the loop */)
+        {
+            if( !updatePlot( it->second, plotPanel ) )
+            {
+                removePlot( it->first, false );
+                it = traceMap.erase( it );       // remove a plot that does not exist anymore
+            }
+            else
+            {
+                ++it;
+            }
+        }
+
+        updateSignalList();
         plotPanel->UpdateAll();
         plotPanel->ResetScales();
     }
@@ -811,6 +827,7 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
         for( const auto& net : m_exporter->GetNetIndexMap() )
         {
             int node = net.second;
+
             if( node > 0 )
                 m_simulator->Command( wxString::Format( "print v(%d)", node ).ToStdString() );
         }
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 07b8ac961e..4e1bce9d83 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -148,8 +148,9 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         /**
          * @brief Removes a plot with a specific title.
          * @param aPlotName is the full plot title (e.g. I(Net-C1-Pad1)).
+         * @param aErase decides if plot should be removed from corresponding TRACE_MAP (see m_plots).
          */
-        void removePlot( const wxString& aPlotName );
+        void removePlot( const wxString& aPlotName, bool aErase = true );
 
         void updateNetlistExporter();
 

From fb564206549559c7af7bf05c49fa72631f20d990 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:10 +0200
Subject: [PATCH 163/197] Do not store Spice vector names, but regenerate them

---
 eeschema/sim/sim_plot_frame.cpp | 6 ++----
 eeschema/sim/sim_plot_frame.h   | 8 --------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 684fe99dd7..b3e405cf5a 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -88,9 +88,6 @@ TRACE_DESC::TRACE_DESC( const NETLIST_EXPORTER_PSPICE_SIM& aExporter, const wxSt
         SIM_PLOT_TYPE aType, const wxString& aParam )
     : m_name( aName ), m_type( aType ), m_param( aParam )
 {
-    // Spice vector generation
-    m_spiceVector = aExporter.GetSpiceVector( aName, aType, aParam );
-
     // Title generation
     m_title = wxString::Format( "%s(%s)", aParam, aName );
 
@@ -350,7 +347,8 @@ bool SIM_PLOT_FRAME::updatePlot( const TRACE_DESC& aDescriptor, SIM_PLOT_PANEL*
         return false;
 
     SIM_TYPE simType = m_exporter->GetSimType();
-    wxString spiceVector = aDescriptor.GetSpiceVector();
+    wxString spiceVector = m_exporter->GetSpiceVector( aDescriptor.GetName(),
+            aDescriptor.GetType(), aDescriptor.GetParam() );
 
     if( !SIM_PLOT_PANEL::IsPlottable( simType ) )
     {
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 4e1bce9d83..c778407da4 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -83,11 +83,6 @@ public:
         return m_type;
     }
 
-    const wxString& GetSpiceVector() const
-    {
-        return m_spiceVector;
-    }
-
 private:
     // Three basic parameters
     ///> Name of the measured net/device
@@ -102,9 +97,6 @@ private:
     // Generated data
     ///> Title displayed in the signal list/plot legend
     wxString m_title;
-
-    ///> Spice vector name
-    wxString m_spiceVector;
 };
 
 /** Implementing SIM_PLOT_FRAME_BASE */

From 02e4252fcdd92ba89d51ba7a97d7eca7b495f57c Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:10 +0200
Subject: [PATCH 164/197] A few fixes for DIALOG_SIM_SETTINGS

---
 eeschema/dialogs/dialog_sim_settings.cpp | 54 ++++++++++++++----------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp
index 190c128329..f5cbccaf5e 100644
--- a/eeschema/dialogs/dialog_sim_settings.cpp
+++ b/eeschema/dialogs/dialog_sim_settings.cpp
@@ -216,6 +216,7 @@ bool DIALOG_SIM_SETTINGS::TransferDataFromWindow()
         return false;
     }
 
+    m_simCommand.Trim();
     updateNetlistOpts();
 
     return true;
@@ -319,36 +320,43 @@ bool DIALOG_SIM_SETTINGS::parseCommand( const wxString& aCommand )
             else
                 return false;
 
+            // If the fields below are empty, it will be caught by the exception handler
             m_acPointsNumber->SetValue( tokenizer.GetNextToken() );
             m_acFreqStart->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
             m_acFreqStop->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
-
-            // Check required fields
-            if( empty( m_acPointsNumber ) || empty( m_acFreqStart ) || empty( m_acFreqStop ) )
-                return false;
         }
 
         else if( tkn == ".dc" )
         {
             m_simPages->SetSelection( m_simPages->FindPage( m_pgDC ) );
 
-            m_dcSource1->SetValue( tokenizer.GetNextToken() );
-            m_dcStart1->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
-            m_dcStop1->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
-            m_dcIncr1->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+            tkn = tokenizer.GetNextToken();
 
-            // Check the 'Enabled' field, if all values are filled
-            m_dcEnable1->SetValue( !empty( m_dcSource1 ) && !empty( m_dcStart1 )
-                    && !empty( m_dcStop1 ) && !empty( m_dcIncr1 ) );
+            if( !tkn.IsEmpty() )
+            {
+                m_dcSource1->SetValue( tkn );
+                m_dcStart1->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+                m_dcStop1->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+                m_dcIncr1->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
 
-            m_dcSource2->SetValue( tokenizer.GetNextToken() );
-            m_dcStart2->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
-            m_dcStop2->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
-            m_dcIncr2->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+                // Check the 'Enabled' field, if all values are filled
+                m_dcEnable1->SetValue( !empty( m_dcSource1 ) && !empty( m_dcStart1 )
+                        && !empty( m_dcStop1 ) && !empty( m_dcIncr1 ) );
+            }
 
-            // Check the 'Enabled' field, if all values are filled
-            m_dcEnable2->SetValue( !empty( m_dcSource2 ) && !empty( m_dcStart2 )
-                    && !empty( m_dcStop2 ) && !empty( m_dcIncr2 ) );
+            tkn = tokenizer.GetNextToken();
+
+            if( !tkn.IsEmpty() )
+            {
+                m_dcSource2->SetValue( tkn );
+                m_dcStart2->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+                m_dcStop2->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+                m_dcIncr2->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
+
+                // Check the 'Enabled' field, if all values are filled
+                m_dcEnable2->SetValue( !empty( m_dcSource2 ) && !empty( m_dcStart2 )
+                        && !empty( m_dcStop2 ) && !empty( m_dcIncr2 ) );
+            }
 
             // Check if the directive is complete
             if( !m_dcEnable1->IsChecked() || !m_dcEnable2->IsChecked() )
@@ -359,13 +367,15 @@ bool DIALOG_SIM_SETTINGS::parseCommand( const wxString& aCommand )
         {
             m_simPages->SetSelection( m_simPages->FindPage( m_pgTransient ) );
 
+            // If the fields below are empty, it will be caught by the exception handler
             m_transStep->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
             m_transFinal->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
-            m_transInitial->SetValue( SPICE_VALUE( tokenizer.GetNextToken() ).ToSpiceString() );
 
-            // Check required fields
-            if( empty( m_transStep ) || empty( m_transFinal ) )
-                return false;
+            // Initial time is an optional field
+            tkn = tokenizer.GetNextToken();
+
+            if( !tkn.IsEmpty() )
+                m_transInitial->SetValue( SPICE_VALUE( tkn ).ToSpiceString() );
         }
 
         // Custom directives

From 01d18bad977970d64c4d422f925861233785055c Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:10 +0200
Subject: [PATCH 165/197] Save simulation command directive for every plot

---
 eeschema/sim/sim_plot_frame.cpp | 63 ++++++++++++++++++++++++++-------
 eeschema/sim/sim_plot_frame.h   |  5 +++
 2 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index b3e405cf5a..a40ccfba30 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -99,7 +99,7 @@ TRACE_DESC::TRACE_DESC( const NETLIST_EXPORTER_PSPICE_SIM& aExporter, const wxSt
 
 
 SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
-    : SIM_PLOT_FRAME_BASE( aParent ), m_settingsDlg( this )
+    : SIM_PLOT_FRAME_BASE( aParent ), m_settingsDlg( this ), m_lastSimPlot( nullptr )
 {
     SetKiway( this, aKiway );
 
@@ -142,11 +142,13 @@ SIM_PLOT_FRAME::~SIM_PLOT_FRAME()
 void SIM_PLOT_FRAME::StartSimulation()
 {
     STRING_FORMATTER formatter;
+    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
 
     m_simConsole->Clear();
-
     updateNetlistExporter();
-    m_exporter->SetSimCommand( m_settingsDlg.GetSimCommand() );
+
+    if( plotPanel )
+        m_exporter->SetSimCommand( m_plots[plotPanel].m_simCommand );
 
     if( !m_exporter->Format( &formatter, m_settingsDlg.GetNetlistOptions() ) )
     {
@@ -192,7 +194,7 @@ bool SIM_PLOT_FRAME::IsSimulationRunning()
 
 SIM_PLOT_PANEL* SIM_PLOT_FRAME::NewPlotPanel( SIM_TYPE aSimType )
 {
-    SIM_PLOT_PANEL* plot = new SIM_PLOT_PANEL( aSimType, m_plotNotebook, wxID_ANY );
+    SIM_PLOT_PANEL* plotPanel = new SIM_PLOT_PANEL( aSimType, m_plotNotebook, wxID_ANY );
 
     if( m_welcomePanel )
     {
@@ -200,10 +202,12 @@ SIM_PLOT_PANEL* SIM_PLOT_FRAME::NewPlotPanel( SIM_TYPE aSimType )
         m_welcomePanel = nullptr;
     }
 
-    m_plotNotebook->AddPage( plot, wxString::Format( wxT( "Plot%u" ),
+    m_plotNotebook->AddPage( plotPanel, wxString::Format( wxT( "Plot%u" ),
             (unsigned int) m_plotNotebook->GetPageCount() + 1 ), true );
 
-    return plot;
+    m_plots[plotPanel] = PLOT_INFO();
+
+    return plotPanel;
 }
 
 
@@ -501,7 +505,14 @@ void SIM_PLOT_FRAME::menuNewPlot( wxCommandEvent& aEvent )
     SIM_TYPE type = m_exporter->GetSimType();
 
     if( SIM_PLOT_PANEL::IsPlottable( type ) )
-        NewPlotPanel( type );
+    {
+        SIM_PLOT_PANEL* prevPlot = CurrentPlot();
+        SIM_PLOT_PANEL* newPlot = NewPlotPanel( type );
+
+        // If the previous plot had the same type, copy the simulation command
+        if( prevPlot )
+            m_plots[newPlot].m_simCommand = m_plots[prevPlot].m_simCommand;
+    }
 }
 
 
@@ -682,6 +693,8 @@ void SIM_PLOT_FRAME::onSimulate( wxCommandEvent& event )
 
 void SIM_PLOT_FRAME::onSettings( wxCommandEvent& event )
 {
+    SIM_PLOT_PANEL* plotPanel = CurrentPlot();
+
     // Initial processing is required to e.g. display a list of power sources
     updateNetlistExporter();
 
@@ -691,8 +704,24 @@ void SIM_PLOT_FRAME::onSettings( wxCommandEvent& event )
         return;
     }
 
+    if( plotPanel )
+        m_settingsDlg.SetSimCommand( m_plots[plotPanel].m_simCommand );
+
     m_settingsDlg.SetNetlistExporter( m_exporter.get() );
-    m_settingsDlg.ShowModal();
+
+    if( m_settingsDlg.ShowModal() == wxID_OK )
+    {
+        wxString newCommand = m_settingsDlg.GetSimCommand();
+        SIM_TYPE newSimType = NETLIST_EXPORTER_PSPICE_SIM::CommandToSimType( newCommand );
+
+        // If it is a new simulation type, open a new plot
+        if( !plotPanel || ( plotPanel && plotPanel->GetType() != newSimType ) )
+        {
+            plotPanel = NewPlotPanel( newSimType );
+        }
+
+        m_plots[plotPanel].m_simCommand = newCommand;
+    }
 }
 
 
@@ -841,10 +870,20 @@ void SIM_PLOT_FRAME::onSimUpdate( wxCommandEvent& aEvent )
     if( IsSimulationRunning() )
         StopSimulation();
 
-    m_simConsole->Clear();
-    // Do not export netlist, it is already stored in the simulator
-    applyTuners();
-    m_simulator->Run();
+    if( CurrentPlot() != m_lastSimPlot )
+    {
+        // We need to rerun simulation, as the simulator currently stores
+        // results for another plot
+        StartSimulation();
+    }
+    else
+    {
+        // Incremental update
+        m_simConsole->Clear();
+        // Do not export netlist, it is already stored in the simulator
+        applyTuners();
+        m_simulator->Run();
+    }
 }
 
 
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index c778407da4..0f6630b92a 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -235,6 +235,9 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
         {
             ///> Map of the traces displayed on the plot
             TRACE_MAP m_traces;
+
+            ///> Spice directive used to execute the simulation
+            wxString m_simCommand;
         };
 
         ///> Map of plot panels and associated data
@@ -266,6 +269,8 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
                 };
         };
 
+        ///> Panel that was used as the most recent one for simulations
+        SIM_PLOT_PANEL* m_lastSimPlot;
 };
 
 // Commands

From b20f941bd003b349db44c0cb3ea1a6f6eadb0aa4 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:10 +0200
Subject: [PATCH 166/197] sim: hopefully final version of plot axis unit/suffix
 handling.

---
 common/widgets/mathplot.cpp     |  64 +++---------
 eeschema/sim/sim_plot_panel.cpp | 172 +++++++++++++++++++++-----------
 include/widgets/mathplot.h      |  25 +++--
 3 files changed, 141 insertions(+), 120 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index 7758b8048b..e8076ae393 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -818,39 +818,21 @@ void mpScaleX::recalculateTicks ( wxDC & dc, mpWindow & w )
     updateTickLabels( dc, w );
 }
 
-int countDecimalDigits ( double x )
-{
-    int k = (int) ( ( x - floor(x)) * 1000000000.0 );
-    int n = 0;
-
-    while(k && ((k % 10) == 0 || (k % 10) == 9))
-    {
-        k /= 10;
-    }
-
-    n = 0;
-
-    while (k != 0)
-    {
-        n++;
-        k /= 10;
-    }
-
-    return n;
-}
-
 
+#if 0
 int mpScaleBase::getLabelDecimalDigits(int maxDigits)
 {
     int m = 0;
+
     for( auto l: m_tickLabels )
     {
-        m = std::max ( countDecimalDigits ( l.pos ), m );
+        int k = countDecimalDigits ( l.pos );
+        m = std::max ( k, m );
     }
 
     return std::min(m, maxDigits);
 }
-
+#endif
 
 void mpScaleBase::computeLabelExtents ( wxDC & dc, mpWindow & w )
 {
@@ -871,25 +853,14 @@ void mpScaleBase::computeLabelExtents ( wxDC & dc, mpWindow & w )
 
 void mpScaleBase::updateTickLabels( wxDC & dc, mpWindow & w )
 {
-    int sigDigits = 0;
-
-    for ( auto l : m_tickLabels )
-        sigDigits = std::max( sigDigits, countDecimalDigits( l.pos ) );
-
-    //printf("sigDigits: %d\n",sigDigits);
-
-    for ( auto &l : m_tickLabels )
-    {
-        l.label = formatLabel ( l.pos, sigDigits );
-        l.visible = true;
-    }
 
+    formatLabels();
     computeLabelExtents(dc, w);
 
-    int gap = IsHorizontal() ? m_maxLabelWidth + 10 : m_maxLabelHeight + 5;
+//    int gap = IsHorizontal() ? m_maxLabelWidth + 10 : m_maxLabelHeight + 5;
 
-    if ( m_tickLabels.size() <= 2)
-        return;
+    //if ( m_tickLabels.size() <= 2)
+    //    return;
 
 /*
     fixme!
@@ -1006,11 +977,14 @@ void mpScaleY::computeSlaveTicks( mpWindow& w )
 
                     double m;
 
+                    m_absVisibleMaxV = 0;
+
                     for (unsigned int i = 0; i < m_masterScale->m_tickValues.size(); i++)
                     {
                         m = TransformFromPlot ( m_masterScale->TransformToPlot(m_masterScale->m_tickValues[i]) );
                         m_tickValues.push_back(m);
                         m_tickLabels.push_back( TickLabel (m) );
+                        m_absVisibleMaxV = std::max(m_absVisibleMaxV, fabs(m));
                     }
 
 }
@@ -1035,6 +1009,7 @@ void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
 
     m_absVisibleMaxV = std::max(std::abs(minVvis), std::abs(maxVvis));
 
+
     m_tickValues.clear();
     m_tickLabels.clear();
 
@@ -1412,24 +1387,13 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
         // Draw line
         dc.DrawLine( orgx, minYpx, orgx, maxYpx);
 
-        // To cut the axis line when draw outside margin is false, use this code
-        /* if (m_drawOutsideMargins == true)
-           dc.DrawLine( orgx, 0, orgx, extend);
-           else
-           dc.DrawLine( orgx, w.GetMarginTop(), orgx, w.GetScrY() - w.GetMarginBottom()); */
-
-        const double dig  = floor( log( 128.0 / w.GetScaleY() ) / mpLN10 );
-        //const double step = exp( mpLN10 * dig);
-        //const double end  = w.GetPosY() + (double)extend / w.GetScaleY();
 
         wxCoord tx, ty;
         wxString s;
         wxString fmt;
-        int tmp = (int)dig;
         int n=0;
 
 
-        tmp=65536;
         int labelW = 0;
         // Before staring cycle, calculate label height
         int labelHeigth = 0;
@@ -1724,6 +1688,7 @@ void mpWindow::OnMouseMove(wxMouseEvent     &event)
             }
             UpdateAll();
         } else {
+            #if 0
             wxLayerList::iterator li;
             for (li = m_layers.begin(); li != m_layers.end(); li++) {
                 if ((*li)->IsInfo() && (*li)->IsVisible()) {
@@ -1733,6 +1698,7 @@ void mpWindow::OnMouseMove(wxMouseEvent     &event)
                     RefreshRect(tmpLyr->GetRectangle());
                 }
             }
+            #endif
             /* if (m_coordTooltip) {
                wxString toolTipContent;
                toolTipContent.Printf(_("X = %f\nY = %f"), p2x(event.GetX()), p2y(event.GetY()));
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index e6464e2b35..4bdb7812d6 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -45,10 +45,13 @@ static wxString formatFloat (double x, int nDigits)
     return rv;
 }
 
-static wxString formatSI ( double x, const wxString& unit, int decimalDigits, double maxValue = 0.0, bool lockSuffix = false, char suffix = 0 )
+static void getSISuffix ( double x, const wxString& unit, int& power, wxString& suffix )
 {
     const int n_powers = 11;
-    const struct { double exponent; char suffix; } powers[] = {
+    const struct {
+        double exponent;
+        char suffix;
+    } powers[] = {
         {-18,'a'},
         {-15,'f'},
         {-12,'p'},
@@ -63,62 +66,109 @@ static wxString formatSI ( double x, const wxString& unit, int decimalDigits, do
         {15, 'P'}
     };
 
-    if ( x== 0.0)
-    {
-        return wxT("0") + unit;
-    }
+    power = 0;
+    suffix = unit;
+
+    if (x == 0.0)
+        return;
 
     for ( int i = 0; i <n_powers - 1;i++)
     {
         double r_cur = pow(10, powers[i].exponent);
-        bool rangeHit;
 
-        if (maxValue != 0.0)
-           rangeHit = fabs(maxValue) >= r_cur && fabs(maxValue) < r_cur * 1000.0 ;
-       else
-           rangeHit = fabs(x) >= r_cur && fabs(x) < r_cur * 1000.0 ;
-
-        if( (!lockSuffix && rangeHit) || (lockSuffix && suffix == powers[i].suffix ) )
+        if( fabs(x) >= r_cur && fabs(x) < r_cur * 1000.0 )
         {
-            double v = x / r_cur;
-            wxString rv;
-
-            rv = formatFloat ( v, decimalDigits );
-
-            if(powers[i].suffix)
-                rv += powers[i].suffix;
-            rv += unit;
-
-            return rv;
+            power = powers[i].exponent;
+            if ( powers[i].suffix )
+                suffix = wxString(powers[i].suffix) + unit;
+            else
+                suffix = unit;
+            return;
         }
     }
 
-    return wxT("?");
+}
+
+static int countDecimalDigits ( double x, int maxDigits )
+{
+    int64_t k = (int) ( ( x - floor(x)) * pow ( 10.0, (double) maxDigits ));
+    int n = 0;
+
+    while(k && ((k % 10LL) == 0LL || (k % 10LL) == 9LL))
+    {
+        k /= 10LL;
+    }
+
+    n = 0;
+
+    while (k != 0LL)
+    {
+        n++;
+        k /= 10LL;
+    }
+
+    return n;
 }
 
 
-class FREQUENCY_LIN_SCALE : public mpScaleX
+static void formatSILabels( mpScaleBase *scale, const wxString& aUnit, int nDigits )
 {
-public:
-    FREQUENCY_LIN_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
-        mpScaleX( name, flags, ticks ,type ) {};
+    double maxVis = scale->AbsVisibleMaxValue();
 
-    const wxString formatLabel( double value, int nDigits )
+    wxString suffix;
+    int power, digits = 0;
+
+    getSISuffix( maxVis, aUnit, power, suffix);
+
+    double sf = pow(10.0, power);
+
+    for ( auto &l : scale->TickLabels() )
     {
-        return formatSI ( value, wxT("Hz"), std::min(nDigits, 2) );
-    }
-};
+        int k = countDecimalDigits( l.pos / sf, nDigits );
 
+        digits = std::max(digits, k);
+    }
+
+    for ( auto &l : scale->TickLabels() )
+    {
+        l.label = formatFloat ( l.pos / sf, digits ) + suffix;
+        l.visible = true;
+    }
+}
 
 class FREQUENCY_LOG_SCALE : public mpScaleXLog
 {
 public:
-    FREQUENCY_LOG_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
-        mpScaleXLog( name, flags, ticks ,type ) {};
+    FREQUENCY_LOG_SCALE(wxString name, int flags) :
+        mpScaleXLog( name, flags ) {};
 
-    const wxString formatLabel( double value, int nDigits )
+    void formatLabels()
     {
-        return formatSI ( value, wxT("Hz"), std::min(nDigits, 2) );
+        const wxString unit = wxT("Hz");
+        wxString suffix;
+        int power;
+
+        for ( auto &l : TickLabels() )
+        {
+            getSISuffix( l.pos, unit, power, suffix);
+            double sf = pow(10.0, power);
+            int k = countDecimalDigits( l.pos / sf, 3 );
+
+            l.label = formatFloat ( l.pos / sf, k ) + suffix;
+            l.visible = true;
+        }
+    }
+};
+
+class FREQUENCY_LIN_SCALE : public mpScaleX
+{
+public:
+    FREQUENCY_LIN_SCALE(wxString name, int flags) :
+        mpScaleX( name, flags, false , 0 ) {};
+
+    void formatLabels()
+    {
+        formatSILabels( this, wxT("Hz"), 3 );
     }
 };
 
@@ -126,72 +176,74 @@ public:
 class TIME_SCALE : public mpScaleX
 {
 public:
-    TIME_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
-        mpScaleX ( name, flags, ticks ,type ) {};
+    TIME_SCALE(wxString name, int flags) :
+        mpScaleX ( name, flags, false, 0) {};
 
-    const wxString formatLabel( double value, int nDigits )
+    void formatLabels()
     {
-        return formatSI ( value, wxT("s"), std::min(nDigits, 3), AbsVisibleMaxValue() );
+        formatSILabels( this, wxT("s"), 3 );
     }
 };
 
 class VOLTAGE_SCALE_X : public mpScaleX
 {
 public:
-    VOLTAGE_SCALE_X(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
-        mpScaleX ( name, flags, ticks, type ) {};
+    VOLTAGE_SCALE_X(wxString name, int flags) :
+        mpScaleX ( name, flags, false, 0 ) {};
 
-    const wxString formatLabel( double value, int nDigits )
+    void formatLabels()
     {
-        return formatSI ( value, wxT("V"), std::min(nDigits, 3), AbsVisibleMaxValue() );
+        formatSILabels( this, wxT("V"), 3 );
     }
 };
 
 class GAIN_SCALE : public mpScaleY
 {
 public:
-    GAIN_SCALE(wxString name, int flags,  bool ticks = false, unsigned int type = 0) :
-        mpScaleY ( name, flags, ticks ) {};
+    GAIN_SCALE( wxString name, int flags ) :
+        mpScaleY ( name, flags, false) {};
 
-    const wxString formatLabel( double value, int nDigits )
+    void formatLabels()
     {
-        return formatSI ( value, wxT("dB"), std::min(nDigits, 1), AbsVisibleMaxValue(), true, 0 );
+        formatSILabels( this, wxT("dB"), 3 );
     }
+
 };
 
 class PHASE_SCALE : public mpScaleY
 {
 public:
-    PHASE_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
-        mpScaleY ( name, flags, ticks ) {};
+    PHASE_SCALE(wxString name, int flags) :
+        mpScaleY ( name, flags, false ) {};
 
-    const wxString formatLabel( double value, int nDigits )
+    void formatLabels()
     {
-        return formatSI ( value, wxT("\u00B0"), std::min(nDigits, 1), AbsVisibleMaxValue(), true, 0 );
+        formatSILabels( this, wxT("\u00B0"), 3 );
     }
 };
 
 class VOLTAGE_SCALE_Y : public mpScaleY
 {
 public:
-    VOLTAGE_SCALE_Y(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
-        mpScaleY ( name, flags, ticks ) {};
+    VOLTAGE_SCALE_Y(wxString name, int flags) :
+        mpScaleY ( name, flags, false ) {};
 
-    const wxString formatLabel( double value, int nDigits )
+    void formatLabels()
     {
-        return formatSI ( value, wxT("V"), std::min(nDigits, 3), AbsVisibleMaxValue() );
+        formatSILabels( this, wxT("V"), 3 );
     }
+
 };
 
 class CURRENT_SCALE : public mpScaleY
 {
 public:
-    CURRENT_SCALE(wxString name, int flags, bool ticks = false, unsigned int type = 0) :
-        mpScaleY ( name, flags, ticks ) {};
+    CURRENT_SCALE(wxString name, int flags ) :
+        mpScaleY ( name, flags, false ) {};
 
-    const wxString formatLabel( double value, int nDigits )
+    void formatLabels()
     {
-        return formatSI ( value, wxT("A"), std::min(nDigits, 3), AbsVisibleMaxValue() );
+        formatSILabels( this, wxT("A"), 3 );
     }
 };
 
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index 2b4e7a6377..1f8c18f7db 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -764,6 +764,18 @@ public:
     virtual double TransformToPlot ( double x ) { return 0.0; };
     virtual double TransformFromPlot (double xplot ){ return 0.0; };
 
+    struct TickLabel {
+        TickLabel( double pos_=0.0, const wxString& label_ = wxT("") ) :
+            pos ( pos_ ),
+            label ( label_ ) {};
+        double pos;
+        wxString label;
+        int pixelPos;
+        bool visible;
+    };
+
+    std::vector<TickLabel>& TickLabels() { return m_tickLabels; };
+
 
 
 protected:
@@ -771,7 +783,7 @@ protected:
     void updateTickLabels( wxDC & dc, mpWindow & w );
     void computeLabelExtents ( wxDC & dc, mpWindow & w );
 
-    virtual int getLabelDecimalDigits(int maxDigits);
+    //virtual int getLabelDecimalDigits(int maxDigits);
     virtual void getVisibleDataRange ( mpWindow& w, double &minV, double& maxV) {};
     virtual void recalculateTicks ( wxDC & dc, mpWindow & w ) {};
 
@@ -786,6 +798,7 @@ protected:
     }
 
     virtual const wxString formatLabel( double value, int nDigits ) { return wxT(""); }
+    virtual void formatLabels( ) { };
 
     virtual double getTickPos( int n )
     {
@@ -803,16 +816,6 @@ protected:
     }
 
 
-    struct TickLabel {
-        TickLabel( double pos_=0.0, const wxString& label_ = wxT("") ) :
-            pos ( pos_ ),
-            label ( label_ ) {};
-        double pos;
-        wxString label;
-        int pixelPos;
-        bool visible;
-    };
-
 
     std::vector<double> m_tickValues;
     std::vector<TickLabel> m_tickLabels;

From 4ecc17385d812648a83c8ac1df4600225e326acc Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:12 +0200
Subject: [PATCH 167/197] sim: more examples

---
 demos/simulation/laser_driver/ad8009.lib      | 123 ++++++
 demos/simulation/laser_driver/fzt1049a.lib    |   1 +
 demos/simulation/laser_driver/laser.lib       |   1 +
 .../laser_driver/laser_driver-cache.lib       | 164 ++++++++
 .../simulation/laser_driver/laser_driver.pro  |  62 +++
 .../simulation/laser_driver/laser_driver.sch  | 398 ++++++++++++++++++
 6 files changed, 749 insertions(+)
 create mode 100644 demos/simulation/laser_driver/ad8009.lib
 create mode 100644 demos/simulation/laser_driver/fzt1049a.lib
 create mode 100644 demos/simulation/laser_driver/laser.lib
 create mode 100644 demos/simulation/laser_driver/laser_driver-cache.lib
 create mode 100644 demos/simulation/laser_driver/laser_driver.pro
 create mode 100644 demos/simulation/laser_driver/laser_driver.sch

diff --git a/demos/simulation/laser_driver/ad8009.lib b/demos/simulation/laser_driver/ad8009.lib
new file mode 100644
index 0000000000..3040cf5cd5
--- /dev/null
+++ b/demos/simulation/laser_driver/ad8009.lib
@@ -0,0 +1,123 @@
+* Node assignments
+*                non-inverting input
+*                | inverting input
+*                | | positive supply
+*                | | |  negative supply
+*                | | |  |  output
+*                | | |  |  |
+.SUBCKT AD8009 1 2 99 50 28
+
+* input stage *
+
+q1 50 3 5 qp1
+q2 99 5 4 qn1
+q3 99 3 6 qn2
+q4 50 6 4 qp2
+i1 99 5 1.625e-3
+i2 6 50 1.625e-3
+cin1 1 98 2.6e-12
+cin2 2 98 1e-12
+v1 4 2 0
+
+* input error sources *
+
+eos 3 1 poly(1) 20 98 2e-3 1
+fbn 2 98 poly(1) vnoise3 50e-6 1e-3
+fbp 1 98 poly(1) vnoise3 50e-6 1e-3
+
+* slew limiting stage *
+
+fsl 98 16 v1 1
+dsl1 98 16 d1
+dsl2 16 98 d1
+dsl3 16 17 d1
+dsl4 17 16 d1
+rsl  17 18 0.22
+vsl  18 98 0
+
+* gain stage *
+
+f1 98 7 vsl 2
+rgain 7 98 2.5e5
+cgain 7 98 1.25e-12
+dcl1 7 8 d1
+dcl2 9 7 d1
+vcl1 99 8 1.83
+vcl2 9 50 1.83
+
+gcm 98 7 poly(2) 98 0 30 0 0 1e-5 1e-5
+
+* second pole *
+
+epole 14 98 7 98 1
+rpole 14 15 1
+cpole 15 98 2e-10
+
+* reference stage *
+
+eref 98 0 poly(2) 99 0 50 0 0 0.5 0.5 
+
+ecmref 30 0 poly(2) 1 0 2 0 0 0.5 0.5
+
+* vnoise stage *
+
+rnoise1 19 98 4.6e-3
+vnoise1 19 98 0
+vnoise2 21 98 0.53
+dnoise1 21 19 dn
+
+fnoise1 20 98 vnoise1 1
+rnoise2 20 98 1
+
+* inoise stage *
+
+rnoise3 22 98 8.18e-6
+vnoise3 22 98 0
+vnoise4 24 98 0.575
+dnoise2 24 22 dn
+
+fnoise2 23 98 vnoise3 1
+rnoise4 23 98 1
+
+* buffer stage *
+
+gbuf 98 13 15 98 1e-2
+rbuf 98 13 1e2
+
+* output current reflected to supplies *
+
+fcurr 98 40 voc 1
+vcur1 26 98 0
+vcur2 98 27 0
+dcur1 40 26 d1
+dcur2 27 40 d1
+
+* output stage *
+
+vo1 99 90 0
+vo2 91 50 0
+fout1 0 99 poly(2) vo1 vcur1 -9.27e-3 1 -1
+fout2 50 0 poly(2) vo2 vcur2 -9.27e-3 1 -1 
+gout1 90 10 13 99 0.5
+gout2 91 10 13 50 0.5
+rout1 10 90 2
+rout2 10 91 2
+voc 10 28 0
+rout3 28 98 1e6
+dcl3 13 11 d1
+dcl4 12 13 d1
+vcl3 11 10 -0.445
+vcl4 10 12 -0.445
+
+.model qp1 pnp()
+.model qp2 pnp()
+.model qn1 npn()
+.model qn2 npn()
+.model d1  d()
+.model dn  d(af=1 kf=1e-8)
+.ends
+
+
+
+
+
diff --git a/demos/simulation/laser_driver/fzt1049a.lib b/demos/simulation/laser_driver/fzt1049a.lib
new file mode 100644
index 0000000000..9aed971439
--- /dev/null
+++ b/demos/simulation/laser_driver/fzt1049a.lib
@@ -0,0 +1 @@
+.model     FZT1049A  NPN IS=1.5E-12  NF=1.0  BF=600  IKF=7.5  VAF=100               ISE=0.9E-13  NE=1.25  NR=1.0  BR=150  IKR=3  VAR=15               ISC=5.0E-13  NC=1.76  RB=0.1  RE=0.018  RC=0.007               CJC=136E-12  CJE=550E-12  MJC=0.352  MJE=0.36          VJC=0.554   VJE=0.726  TF=400E-12  TR=6.9E-9
\ No newline at end of file
diff --git a/demos/simulation/laser_driver/laser.lib b/demos/simulation/laser_driver/laser.lib
new file mode 100644
index 0000000000..74a28f31a0
--- /dev/null
+++ b/demos/simulation/laser_driver/laser.lib
@@ -0,0 +1 @@
+.model LASER D(Is=1e-22 Rs=6 N=1.5 Cjo=50p Xti=100 Iave=160m Vpk=5)
\ No newline at end of file
diff --git a/demos/simulation/laser_driver/laser_driver-cache.lib b/demos/simulation/laser_driver/laser_driver-cache.lib
new file mode 100644
index 0000000000..7acac78e16
--- /dev/null
+++ b/demos/simulation/laser_driver/laser_driver-cache.lib
@@ -0,0 +1,164 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# C
+#
+DEF C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ C?
+ C_????_*
+ C_????
+ SMD*_c
+ Capacitor*
+ Capacitors_ThroughHole:C_Radial_D10_L13_P5
+ Capacitors_SMD:C_0805
+ Capacitors_SMD:C_1206
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 40 40 1 1 P
+X ~ 2 0 -150 110 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# Generic_Opamp
+#
+DEF Generic_Opamp U 0 20 Y Y 1 F N
+F0 "U" 0 250 50 H V L CNN
+F1 "Generic_Opamp" 0 150 50 H V L CNN
+F2 "" -100 -100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+P 4 0 1 10 -200 200 200 0 -200 -200 -200 200 f
+X + 1 -300 100 100 R 50 50 1 1 I
+X - 2 -300 -100 100 R 50 50 1 1 I
+X V+ 3 -100 300 150 D 50 50 1 1 W
+X V- 4 -100 -300 150 U 50 50 1 1 W
+X ~ 5 300 0 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# LED
+#
+DEF LED D 0 40 Y N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "LED" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ LED-*
+ LED_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -50 50 -50 -50 N
+P 3 0 1 0 -80 -25 -125 -65 -120 -40 N
+P 3 0 1 0 -65 -40 -110 -80 -105 -55 N
+P 3 0 1 0 50 50 -50 0 50 -50 F
+X K 1 -200 0 150 R 40 40 1 1 P
+X A 2 200 0 150 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Q_NPN_CBE
+#
+DEF Q_NPN_CBE Q 0 0 Y N 1 F N
+F0 "Q" 300 50 50 H V R CNN
+F1 "Q_NPN_CBE" 600 -50 50 H V R CNN
+F2 "" 200 100 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
+X C 1 100 200 100 D 50 50 1 1 P
+X B 2 -200 0 225 R 50 50 1 1 I
+X E 3 100 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# VDD
+#
+DEF VDD #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VDD" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C 0 75 25 0 1 0 N
+P 2 0 1 0 0 0 0 50 N
+X VDD 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# VSOURCE
+#
+DEF ~VSOURCE V 0 40 Y Y 1 F N
+F0 "V" 200 200 50 H V C CNN
+F1 "VSOURCE" 250 100 50 H I C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+F4 "Value" 0 0 60 H I C CNN "Fieldname"
+F5 "V" 0 0 60 H I C CNN "Spice_Primitive"
+F6 "1 2" -300 200 60 H I C CNN "Spice_Node_Sequence"
+DRAW
+C 0 0 100 0 1 0 N
+P 2 0 1 0 0 -75 0 75 N
+P 4 0 1 0 0 75 -25 25 25 25 0 75 F
+X ~ 1 0 200 100 D 50 50 1 1 I
+X ~ 2 0 -200 100 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# VSS
+#
+DEF VSS #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "VSS" 0 150 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+C 0 75 25 0 1 0 N
+P 2 0 1 0 0 0 0 50 N
+X VSS 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/demos/simulation/laser_driver/laser_driver.pro b/demos/simulation/laser_driver/laser_driver.pro
new file mode 100644
index 0000000000..2618b4a71e
--- /dev/null
+++ b/demos/simulation/laser_driver/laser_driver.pro
@@ -0,0 +1,62 @@
+update=wto, 19 lip 2016, 23:56:07
+version=1
+last_client=eeschema
+[general]
+version=1
+RootSch=
+BoardNm=
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[eeschema]
+version=1
+LibDir=../../../../kicad-library/library
+[eeschema/libraries]
+LibName1=power
+LibName2=device
+LibName3=transistors
+LibName4=conn
+LibName5=linear
+LibName6=regul
+LibName7=74xx
+LibName8=cmos4000
+LibName9=adc-dac
+LibName10=memory
+LibName11=xilinx
+LibName12=microcontrollers
+LibName13=dsp
+LibName14=microchip
+LibName15=analog_switches
+LibName16=motorola
+LibName17=texas
+LibName18=intel
+LibName19=audio
+LibName20=interface
+LibName21=digital-audio
+LibName22=philips
+LibName23=display
+LibName24=cypress
+LibName25=siliconi
+LibName26=opto
+LibName27=atmel
+LibName28=contrib
+LibName29=valves
diff --git a/demos/simulation/laser_driver/laser_driver.sch b/demos/simulation/laser_driver/laser_driver.sch
new file mode 100644
index 0000000000..64858a3c0b
--- /dev/null
+++ b/demos/simulation/laser_driver/laser_driver.sch
@@ -0,0 +1,398 @@
+EESchema Schematic File Version 2
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:laser_driver-cache
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L VSOURCE V1
+U 1 1 57336052
+P 2650 3550
+F 0 "V1" H 2778 3596 50  0000 L CNN
+F 1 "AC 1" H 2778 3505 50  0000 L CNN
+F 2 "" H 2650 3550 50  0000 C CNN
+F 3 "" H 2650 3550 50  0000 C CNN
+F 4 "Value" H 2650 3550 60  0001 C CNN "Fieldname"
+F 5 "V" H 2650 3550 60  0001 C CNN "Spice_Primitive"
+F 6 "pulse(0 3 100n 1n 1n 20n 100n )" H 2650 3550 60  0001 C CNN "Spice_Model"
+F 7 "Y" H 2650 3550 60  0001 C CNN "Spice_Netlist_Enabled"
+	1    2650 3550
+	1    0    0    -1  
+$EndComp
+Text Notes 3150 5400 0    60   ~ 0
+.tran 10p 150n\n
+$Comp
+L Generic_Opamp U1
+U 1 1 5788FF9F
+P 5050 3500
+F 0 "U1" H 5391 3546 50  0000 L CNN
+F 1 "AD8009" H 5391 3455 50  0000 L CNN
+F 2 "" H 4950 3400 50  0000 C CNN
+F 3 "" H 5050 3500 50  0000 C CNN
+F 4 "Value" H 5050 3500 60  0001 C CNN "Fieldname"
+F 5 "X" H 5050 3500 60  0001 C CNN "Spice_Primitive"
+F 6 "ad8009" H 5050 3500 60  0001 C CNN "Spice_Model"
+F 7 "Y" H 5050 3500 60  0001 C CNN "Spice_Netlist_Enabled"
+F 8 "ad8009.lib" H 5050 3500 60  0001 C CNN "Spice_Lib_File"
+	1    5050 3500
+	1    0    0    -1  
+$EndComp
+$Comp
+L VSOURCE V2
+U 1 1 578900BA
+P 9650 1900
+F 0 "V2" H 9778 1946 50  0000 L CNN
+F 1 "DC 10" H 9778 1855 50  0000 L CNN
+F 2 "" H 9650 1900 50  0000 C CNN
+F 3 "" H 9650 1900 50  0000 C CNN
+F 4 "Value" H 9650 1900 60  0001 C CNN "Fieldname"
+F 5 "V" H 9650 1900 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 9350 2100 60  0001 C CNN "Spice_Node_Sequence"
+	1    9650 1900
+	1    0    0    -1  
+$EndComp
+$Comp
+L VSOURCE V3
+U 1 1 57890232
+P 9650 2300
+F 0 "V3" H 9778 2346 50  0000 L CNN
+F 1 "DC 10" H 9778 2255 50  0000 L CNN
+F 2 "" H 9650 2300 50  0000 C CNN
+F 3 "" H 9650 2300 50  0000 C CNN
+F 4 "Value" H 9650 2300 60  0001 C CNN "Fieldname"
+F 5 "V" H 9650 2300 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 9350 2500 60  0001 C CNN "Spice_Node_Sequence"
+	1    9650 2300
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR7
+U 1 1 578902D2
+P 9400 2100
+F 0 "#PWR7" H 9400 1850 50  0001 C CNN
+F 1 "GND" H 9405 1927 50  0000 C CNN
+F 2 "" H 9400 2100 50  0000 C CNN
+F 3 "" H 9400 2100 50  0000 C CNN
+	1    9400 2100
+	1    0    0    -1  
+$EndComp
+$Comp
+L VDD #PWR8
+U 1 1 578903C0
+P 9650 1700
+F 0 "#PWR8" H 9650 1550 50  0001 C CNN
+F 1 "VDD" H 9667 1873 50  0000 C CNN
+F 2 "" H 9650 1700 50  0000 C CNN
+F 3 "" H 9650 1700 50  0000 C CNN
+	1    9650 1700
+	1    0    0    -1  
+$EndComp
+$Comp
+L VSS #PWR9
+U 1 1 578903E2
+P 9650 2500
+F 0 "#PWR9" H 9650 2350 50  0001 C CNN
+F 1 "VSS" H 9668 2673 50  0000 C CNN
+F 2 "" H 9650 2500 50  0000 C CNN
+F 3 "" H 9650 2500 50  0000 C CNN
+	1    9650 2500
+	-1   0    0    1   
+$EndComp
+$Comp
+L VDD #PWR3
+U 1 1 57890425
+P 4950 3200
+F 0 "#PWR3" H 4950 3050 50  0001 C CNN
+F 1 "VDD" H 4967 3373 50  0000 C CNN
+F 2 "" H 4950 3200 50  0000 C CNN
+F 3 "" H 4950 3200 50  0000 C CNN
+	1    4950 3200
+	1    0    0    -1  
+$EndComp
+$Comp
+L VSS #PWR4
+U 1 1 57890453
+P 4950 3800
+F 0 "#PWR4" H 4950 3650 50  0001 C CNN
+F 1 "VSS" H 4968 3973 50  0000 C CNN
+F 2 "" H 4950 3800 50  0000 C CNN
+F 3 "" H 4950 3800 50  0000 C CNN
+	1    4950 3800
+	-1   0    0    1   
+$EndComp
+$Comp
+L C C2
+U 1 1 5789085B
+P 6800 4000
+F 0 "C2" H 6915 4046 50  0000 L CNN
+F 1 "1p" H 6915 3955 50  0000 L CNN
+F 2 "" H 6838 3850 50  0000 C CNN
+F 3 "" H 6800 4000 50  0000 C CNN
+F 4 "Value" H 6800 4000 60  0001 C CNN "Fieldname"
+F 5 "C" H 6800 4000 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 6800 4000 60  0001 C CNN "SpiceMapping"
+	1    6800 4000
+	-1   0    0    1   
+$EndComp
+$Comp
+L R R5
+U 1 1 578EA6D8
+P 6400 4000
+F 0 "R5" V 6193 4000 50  0000 C CNN
+F 1 "2,5" V 6284 4000 50  0000 C CNN
+F 2 "" V 6330 4000 50  0000 C CNN
+F 3 "" H 6400 4000 50  0000 C CNN
+F 4 "Value" H 6400 4000 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 6400 4000 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 6400 4000 60  0001 C CNN "Spice_Primitive"
+	1    6400 4000
+	-1   0    0    1   
+$EndComp
+$Comp
+L R R1
+U 1 1 578EA7EE
+P 4150 3600
+F 0 "R1" V 3943 3600 50  0000 C CNN
+F 1 "220" V 4034 3600 50  0000 C CNN
+F 2 "" V 4080 3600 50  0000 C CNN
+F 3 "" H 4150 3600 50  0000 C CNN
+F 4 "Value" H 4150 3600 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 4150 3600 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 4150 3600 60  0001 C CNN "Spice_Primitive"
+	1    4150 3600
+	0    1    1    0   
+$EndComp
+$Comp
+L R R3
+U 1 1 578EA8B4
+P 5400 4150
+F 0 "R3" V 5193 4150 50  0000 C CNN
+F 1 "220" V 5284 4150 50  0000 C CNN
+F 2 "" V 5330 4150 50  0000 C CNN
+F 3 "" H 5400 4150 50  0000 C CNN
+F 4 "Value" H 5400 4150 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 5400 4150 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 5400 4150 60  0001 C CNN "Spice_Primitive"
+	1    5400 4150
+	0    1    1    0   
+$EndComp
+$Comp
+L C C1
+U 1 1 578EB076
+P 5400 4400
+F 0 "C1" H 5515 4446 50  0000 L CNN
+F 1 "1p" H 5515 4355 50  0000 L CNN
+F 2 "" H 5438 4250 50  0000 C CNN
+F 3 "" H 5400 4400 50  0000 C CNN
+F 4 "Value" H 5400 4400 60  0001 C CNN "Fieldname"
+F 5 "C" H 5400 4400 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 5400 4400 60  0001 C CNN "SpiceMapping"
+	1    5400 4400
+	0    -1   -1   0   
+$EndComp
+$Comp
+L LED D1
+U 1 1 578EB1E8
+P 6400 4900
+F 0 "D1" V 6446 4792 50  0000 R CNN
+F 1 "laser diode" V 6355 4792 50  0000 R CNN
+F 2 "" H 6400 4900 50  0000 C CNN
+F 3 "" H 6400 4900 50  0000 C CNN
+F 4 "qtlp690c" H 6400 4900 60  0001 C CNN "Fieldname"
+F 5 "D" H 6400 4900 60  0001 C CNN "Spice_Primitive"
+F 6 "laser" H 6400 4900 60  0001 C CNN "Spice_Model"
+F 7 "Y" H 6400 4900 60  0001 C CNN "Spice_Netlist_Enabled"
+F 8 "laser.lib" H 6400 4900 60  0001 C CNN "Spice_Lib_File"
+F 9 "2 1" V 6400 4900 60  0001 C CNN "Spice_Node_Sequence"
+	1    6400 4900
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR6
+U 1 1 578EB42D
+P 6400 5100
+F 0 "#PWR6" H 6400 4850 50  0001 C CNN
+F 1 "GND" H 6405 4927 50  0000 C CNN
+F 2 "" H 6400 5100 50  0000 C CNN
+F 3 "" H 6400 5100 50  0000 C CNN
+	1    6400 5100
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R4
+U 1 1 578EBA35
+P 6150 2900
+F 0 "R4" V 5943 2900 50  0000 C CNN
+F 1 "220" V 6034 2900 50  0000 C CNN
+F 2 "" V 6080 2900 50  0000 C CNN
+F 3 "" H 6150 2900 50  0000 C CNN
+F 4 "Value" H 6150 2900 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 6150 2900 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 6150 2900 60  0001 C CNN "Spice_Primitive"
+	1    6150 2900
+	0    1    1    0   
+$EndComp
+$Comp
+L R R2
+U 1 1 578EBB39
+P 4350 2900
+F 0 "R2" V 4143 2900 50  0000 C CNN
+F 1 "160" V 4234 2900 50  0000 C CNN
+F 2 "" V 4280 2900 50  0000 C CNN
+F 3 "" H 4350 2900 50  0000 C CNN
+F 4 "Value" H 4350 2900 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 4350 2900 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 4350 2900 60  0001 C CNN "Spice_Primitive"
+	1    4350 2900
+	0    1    1    0   
+$EndComp
+$Comp
+L GND #PWR2
+U 1 1 578EBBE4
+P 4000 3600
+F 0 "#PWR2" H 4000 3350 50  0001 C CNN
+F 1 "GND" H 4005 3427 50  0000 C CNN
+F 2 "" H 4000 3600 50  0000 C CNN
+F 3 "" H 4000 3600 50  0000 C CNN
+	1    4000 3600
+	0    1    1    0   
+$EndComp
+$Comp
+L VDD #PWR5
+U 1 1 578EBCE4
+P 6400 3300
+F 0 "#PWR5" H 6400 3150 50  0001 C CNN
+F 1 "VDD" H 6417 3473 50  0000 C CNN
+F 2 "" H 6400 3300 50  0000 C CNN
+F 3 "" H 6400 3300 50  0000 C CNN
+	1    6400 3300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9650 2100 9400 2100
+Wire Wire Line
+	5350 3500 6100 3500
+Wire Wire Line
+	4300 3600 4750 3600
+Wire Wire Line
+	4500 4150 5250 4150
+Wire Wire Line
+	4500 4150 4500 3600
+Connection ~ 4500 3600
+Wire Wire Line
+	6400 4150 6400 4700
+Wire Wire Line
+	6800 4350 6800 4150
+Connection ~ 6400 4350
+Wire Wire Line
+	5900 4150 5900 3750
+Wire Wire Line
+	5550 4150 5900 4150
+Wire Wire Line
+	5100 4400 5250 4400
+Wire Wire Line
+	5100 4150 5100 4400
+Connection ~ 5100 4150
+Wire Wire Line
+	5550 4400 5750 4400
+Wire Wire Line
+	5750 4400 5750 4150
+Connection ~ 5750 4150
+Wire Wire Line
+	6400 4350 7000 4350
+Wire Wire Line
+	4500 2900 6000 2900
+Wire Wire Line
+	6300 2900 7000 2900
+Wire Wire Line
+	4650 3400 4650 2900
+Connection ~ 4650 2900
+Wire Wire Line
+	4750 3400 4650 3400
+Wire Wire Line
+	4200 2900 2650 2900
+Wire Wire Line
+	2650 2900 2650 3350
+$Comp
+L GND #PWR1
+U 1 1 578EC19D
+P 2650 4200
+F 0 "#PWR1" H 2650 3950 50  0001 C CNN
+F 1 "GND" H 2655 4027 50  0000 C CNN
+F 2 "" H 2650 4200 50  0000 C CNN
+F 3 "" H 2650 4200 50  0000 C CNN
+	1    2650 4200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2650 4200 2650 3750
+Text Label 3650 2900 0    60   ~ 0
+in
+Wire Wire Line
+	7000 2900 7000 4350
+Connection ~ 6800 4350
+$Comp
+L Q_NPN_CBE Q1
+U 1 1 578EADCC
+P 6300 3500
+F 0 "Q1" H 6600 3550 50  0000 R CNN
+F 1 "fzt1049a" H 6900 3450 50  0000 R CNN
+F 2 "" H 6500 3600 50  0000 C CNN
+F 3 "" H 6300 3500 50  0000 C CNN
+F 4 "Value" H 6300 3500 60  0001 C CNN "Fieldname"
+F 5 "Q" H 6300 3500 60  0001 C CNN "Spice_Primitive"
+F 6 "fzt1049a" H 6300 3500 60  0001 C CNN "Spice_Model"
+F 7 "Y" H 6300 3500 60  0001 C CNN "Spice_Netlist_Enabled"
+F 8 "fzt1049a.lib" H 6300 3500 60  0001 C CNN "Spice_Lib_File"
+	1    6300 3500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6400 3700 6400 3850
+Wire Wire Line
+	5900 3750 6800 3750
+Wire Wire Line
+	6800 3750 6800 3850
+Connection ~ 6400 3750
+Text Label 6550 4350 0    60   ~ 0
+out
+$EndSCHEMATC

From 7b81516b6150dbd3470fe82063c53dc95d905b35 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:12 +0200
Subject: [PATCH 168/197] Fixed SIM_PLOT_FRAME::CurrentPlot()

---
 eeschema/sim/sim_plot_frame.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index a40ccfba30..617b8ee73b 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -274,7 +274,9 @@ void SIM_PLOT_FRAME::RemoveTuner( TUNER_SLIDER* aTuner, bool aErase )
 
 SIM_PLOT_PANEL* SIM_PLOT_FRAME::CurrentPlot() const
 {
-    return static_cast<SIM_PLOT_PANEL*>( m_plotNotebook->GetCurrentPage() );
+    wxWindow* curPage = m_plotNotebook->GetCurrentPage();
+
+    return ( curPage == m_welcomePanel ) ? nullptr : static_cast<SIM_PLOT_PANEL*>( curPage );
 }
 
 

From 67e283c3af9141bc67d8d9611d07e048fc14cab1 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:12 +0200
Subject: [PATCH 169/197] Removed 'Lock aspect' from wxMathPlot widget context
 menu

---
 common/widgets/mathplot.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index e8076ae393..22f643ed96 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -1558,7 +1558,7 @@ mpWindow::mpWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const w
     m_popmenu.Append( mpID_FIT,        _("Fit"),         _("Set plot view to show all items"));
     m_popmenu.Append( mpID_ZOOM_IN,    _("Zoom in"),     _("Zoom in plot view."));
     m_popmenu.Append( mpID_ZOOM_OUT,   _("Zoom out"),    _("Zoom out plot view."));
-    m_popmenu.AppendCheckItem( mpID_LOCKASPECT, _("Lock aspect"), _("Lock horizontal and vertical zoom aspect."));
+    //m_popmenu.AppendCheckItem( mpID_LOCKASPECT, _("Lock aspect"), _("Lock horizontal and vertical zoom aspect."));
     //m_popmenu.Append( mpID_HELP_MOUSE,   _("Show mouse commands..."),    _("Show help about the mouse commands."));
 
     m_layers.clear();

From ca13dc93b140b3fdcbe43f92a6b2dc6a8e167074 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:12 +0200
Subject: [PATCH 170/197] Support for simulation workbooks

---
 eeschema/sim/sim_plot_frame.cpp | 129 +++++++++++++++++++++++++++++++-
 eeschema/sim/sim_plot_frame.h   |  16 ++++
 2 files changed, 143 insertions(+), 2 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 617b8ee73b..10331fa4ed 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -300,9 +300,11 @@ void SIM_PLOT_FRAME::addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const
 
     if( xAxisType == SPT_LIN_FREQUENCY || xAxisType == SPT_LOG_FREQUENCY )
     {
+        int baseType = descriptor.GetType() & ~( SPT_AC_MAG | SPT_AC_PHASE );
+
         // Add two plots: magnitude & phase
-        TRACE_DESC mag_desc( *m_exporter, descriptor, descriptor.GetType() | SPT_AC_MAG );
-        TRACE_DESC phase_desc( *m_exporter, descriptor, descriptor.GetType() | SPT_AC_PHASE );
+        TRACE_DESC mag_desc( *m_exporter, descriptor, (SIM_PLOT_TYPE)( baseType | SPT_AC_MAG ) );
+        TRACE_DESC phase_desc( *m_exporter, descriptor, (SIM_PLOT_TYPE)( baseType | SPT_AC_PHASE ) );
 
         updated |= updatePlot( mag_desc, plotPanel );
         updated |= updatePlot( phase_desc, plotPanel );
@@ -481,6 +483,103 @@ void SIM_PLOT_FRAME::applyTuners()
 }
 
 
+bool SIM_PLOT_FRAME::loadWorkbook( const wxString& aPath )
+{
+    m_plots.clear();
+    m_plotNotebook->DeleteAllPages();
+
+    wxTextFile file( aPath );
+
+    if( !file.Open() )
+        return false;
+
+    long plotsCount;
+
+    if( !file.GetFirstLine().ToLong( &plotsCount ) )        // GetFirstLine instead of GetNextLine
+        return false;
+
+    for( long i = 0; i < plotsCount; ++i )
+    {
+        long plotType, tracesCount;
+
+        if( !file.GetNextLine().ToLong( &plotType ) )
+            return false;
+
+        SIM_PLOT_PANEL* plotPanel = NewPlotPanel( (SIM_TYPE) plotType );
+        m_plots[plotPanel].m_simCommand = file.GetNextLine();
+        StartSimulation();
+
+        // Perform simulation, so plots can be added with values
+        do
+        {
+            wxThread::This()->Sleep( 50 );
+        }
+        while( IsSimulationRunning() );
+
+        if( !file.GetNextLine().ToLong( &tracesCount ) )
+            return false;
+
+        for( long j = 0; j < tracesCount; ++j )
+        {
+            long traceType;
+            wxString name, param;
+
+            if( !file.GetNextLine().ToLong( &traceType ) )
+                return false;
+
+            name = file.GetNextLine();
+            param = file.GetNextLine();
+
+            if( name.IsEmpty() || param.IsEmpty() )
+                return false;
+
+            addPlot( name, (SIM_PLOT_TYPE) traceType, param );
+        }
+    }
+
+    return true;
+}
+
+
+bool SIM_PLOT_FRAME::saveWorkbook( const wxString& aPath )
+{
+    wxTextFile file( aPath );
+
+    if( file.Exists() )
+    {
+        if( !file.Open() )
+            return false;
+
+        file.Clear();
+    }
+    else
+    {
+        file.Create();
+    }
+
+    file.AddLine( wxString::Format( "%lu", m_plots.size() ) );
+
+    for( const auto& plot : m_plots )
+    {
+        file.AddLine( wxString::Format( "%d", plot.first->GetType() ) );
+        file.AddLine( plot.second.m_simCommand );
+        file.AddLine( wxString::Format( "%lu", plot.second.m_traces.size() ) );
+
+        for( const auto& trace : plot.second.m_traces )
+        {
+            file.AddLine( wxString::Format( "%d", trace.second.GetType() ) );
+            file.AddLine( trace.second.GetName() );
+            file.AddLine( trace.second.GetParam() );
+        }
+    }
+
+    bool res = file.Write();
+    file.Close();
+
+    return res;
+}
+
+
 SIM_PLOT_TYPE SIM_PLOT_FRAME::GetXAxisType( SIM_TYPE aType ) const
 {
     switch( aType )
@@ -518,6 +617,32 @@ void SIM_PLOT_FRAME::menuNewPlot( wxCommandEvent& aEvent )
 }
 
 
+void SIM_PLOT_FRAME::menuOpenWorkbook( wxCommandEvent& event )
+{
+    wxFileDialog openDlg( this, wxT( "Open simulation workbook" ), "", "",
+            "Workbook file (*.wbk)|*.wbk", wxFD_OPEN | wxFD_FILE_MUST_EXIST );
+
+    if( openDlg.ShowModal() == wxID_CANCEL )
+        return;
+
+    if( !loadWorkbook( openDlg.GetPath() ) )
+        DisplayError( this, wxT( "There was an error while opening the workbook file" ) );
+}
+
+
+void SIM_PLOT_FRAME::menuSaveWorkbook( wxCommandEvent& event )
+{
+    wxFileDialog saveDlg( this, wxT( "Save simulation workbook" ), "", "",
+                "Workbook file (*.wbk)|*.wbk", wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
+
+    if( saveDlg.ShowModal() == wxID_CANCEL )
+        return;
+
+    if( !saveWorkbook( saveDlg.GetPath() ) )
+        DisplayError( this, wxT( "There was an error while saving the workbook file" ) );
+}
+
+
 void SIM_PLOT_FRAME::menuSaveImage( wxCommandEvent& event )
 {
     wxFileDialog saveDlg( this, wxT( "Save plot as image" ), "", "",
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index 0f6630b92a..adae18328d 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -176,10 +176,26 @@ class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
          */
         void applyTuners();
 
+        /**
+         * @brief Loads plot settings from a file.
+         * @param aPath is the file name.
+         * @return True if successful.
+         */
+        bool loadWorkbook( const wxString& aPath );
+
+        /**
+         * @brief Saves plot settings to a file.
+         * @param aPath is the file name.
+         * @return True if successful.
+         */
+        bool saveWorkbook( const wxString& aPath );
+
         SIM_PLOT_TYPE GetXAxisType( SIM_TYPE aType ) const;
 
         // Menu handlers
         void menuNewPlot( wxCommandEvent& aEvent ) override;
+        void menuOpenWorkbook( wxCommandEvent& event ) override;
+        void menuSaveWorkbook( wxCommandEvent& event ) override;
 
         void menuExit( wxCommandEvent& event ) override
         {

From 2c576afdf38dfd3efb629bfd1f072c5b31f45296 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:13 +0200
Subject: [PATCH 171/197] Fixed menu entries

---
 eeschema/sim/sim_plot_frame.cpp      |  6 +++++
 eeschema/sim/sim_plot_frame_base.cpp | 25 ++++----------------
 eeschema/sim/sim_plot_frame_base.fbp | 34 ++++++++++++++--------------
 eeschema/sim/sim_plot_frame_base.h   |  5 ++++
 4 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 10331fa4ed..dc92a9f7a3 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -129,6 +129,12 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     Connect( m_toolTune->GetId(), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME::onTune ), NULL, this );
     Connect( m_toolSettings->GetId(), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME::onSettings ), NULL, this );
 
+    Bind( wxEVT_COMMAND_MENU_SELECTED, &SIM_PLOT_FRAME::onSimulate,  this, m_runSimulation->GetId() );
+    Bind( wxEVT_COMMAND_MENU_SELECTED, &SIM_PLOT_FRAME::onAddSignal, this, m_addSignals->GetId() );
+    Bind( wxEVT_COMMAND_MENU_SELECTED, &SIM_PLOT_FRAME::onProbe,     this, m_probeSignals->GetId() );
+    Bind( wxEVT_COMMAND_MENU_SELECTED, &SIM_PLOT_FRAME::onTune,      this, m_tuneValue->GetId() );
+    Bind( wxEVT_COMMAND_MENU_SELECTED, &SIM_PLOT_FRAME::onSettings,  this, m_settings->GetId() );
+
     m_toolBar->Realize();
     m_plotNotebook->SetPageText(0, _("Welcome!") );
 }
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index a227c96e9e..9febb8fecf 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -48,29 +48,24 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_mainMenu->Append( m_fileMenu, _("File") ); 
 	
 	m_simulationMenu = new wxMenu();
-	wxMenuItem* m_runSimulation;
-	m_runSimulation = new wxMenuItem( m_simulationMenu, wxID_NEW, wxString( _("Run Simulation") ) , wxEmptyString, wxITEM_NORMAL );
+	m_runSimulation = new wxMenuItem( m_simulationMenu, wxID_ANY, wxString( _("Run Simulation") ) , wxEmptyString, wxITEM_NORMAL );
 	m_simulationMenu->Append( m_runSimulation );
 	
 	m_simulationMenu->AppendSeparator();
 	
-	wxMenuItem* m_addSignals;
-	m_addSignals = new wxMenuItem( m_simulationMenu, wxID_OPEN, wxString( _("Add signals...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_addSignals = new wxMenuItem( m_simulationMenu, wxID_ANY, wxString( _("Add signals...") ) , wxEmptyString, wxITEM_NORMAL );
 	m_simulationMenu->Append( m_addSignals );
 	
-	wxMenuItem* m_probeSignals;
-	m_probeSignals = new wxMenuItem( m_simulationMenu, wxID_SAVE, wxString( _("Probe from schematics") ) , wxEmptyString, wxITEM_NORMAL );
+	m_probeSignals = new wxMenuItem( m_simulationMenu, wxID_ANY, wxString( _("Probe from schematics") ) , wxEmptyString, wxITEM_NORMAL );
 	m_simulationMenu->Append( m_probeSignals );
 	
-	wxMenuItem* m_tuneValue;
 	m_tuneValue = new wxMenuItem( m_simulationMenu, wxID_ANY, wxString( _("Tune component value") ) , wxEmptyString, wxITEM_NORMAL );
 	m_simulationMenu->Append( m_tuneValue );
 	
 	m_simulationMenu->AppendSeparator();
 	
-	wxMenuItem* m_exitSim1;
-	m_exitSim1 = new wxMenuItem( m_simulationMenu, wxID_CLOSE, wxString( _("Settings...") ) , wxEmptyString, wxITEM_NORMAL );
-	m_simulationMenu->Append( m_exitSim1 );
+	m_settings = new wxMenuItem( m_simulationMenu, wxID_ANY, wxString( _("Settings...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_simulationMenu->Append( m_settings );
 	
 	m_mainMenu->Append( m_simulationMenu, _("Simulation") ); 
 	
@@ -233,11 +228,6 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	this->Connect( m_saveImage->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveImage ) );
 	this->Connect( m_saveCsv->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveCsv ) );
 	this->Connect( m_exitSim->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) );
-	this->Connect( m_runSimulation->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuNewPlot ) );
-	this->Connect( m_addSignals->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuOpenWorkbook ) );
-	this->Connect( m_probeSignals->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveWorkbook ) );
-	this->Connect( m_tuneValue->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveImage ) );
-	this->Connect( m_exitSim1->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) );
 	this->Connect( m_zoomIn->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomIn ) );
 	this->Connect( m_zoomOut->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomOut ) );
 	this->Connect( m_zoomFit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ) );
@@ -260,11 +250,6 @@ SIM_PLOT_FRAME_BASE::~SIM_PLOT_FRAME_BASE()
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveImage ) );
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveCsv ) );
 	this->Disconnect( wxID_CLOSE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) );
-	this->Disconnect( wxID_NEW, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuNewPlot ) );
-	this->Disconnect( wxID_OPEN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuOpenWorkbook ) );
-	this->Disconnect( wxID_SAVE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveWorkbook ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuSaveImage ) );
-	this->Disconnect( wxID_CLOSE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuExit ) );
 	this->Disconnect( wxID_ZOOM_IN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomIn ) );
 	this->Disconnect( wxID_ZOOM_OUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomOut ) );
 	this->Disconnect( wxID_ZOOM_FIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( SIM_PLOT_FRAME_BASE::menuZoomFit ) );
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index 793009961f..7aa7be9adb 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -133,7 +133,7 @@
                 <event name="OnSetFocus"></event>
                 <event name="OnSize"></event>
                 <event name="OnUpdateUI"></event>
-                <object class="wxMenu" expanded="0">
+                <object class="wxMenu" expanded="1">
                     <property name="label">File</property>
                     <property name="name">m_fileMenu</property>
                     <property name="permission">protected</property>
@@ -240,7 +240,7 @@
                         <event name="OnUpdateUI"></event>
                     </object>
                 </object>
-                <object class="wxMenu" expanded="0">
+                <object class="wxMenu" expanded="1">
                     <property name="label">Simulation</property>
                     <property name="name">m_simulationMenu</property>
                     <property name="permission">protected</property>
@@ -249,14 +249,14 @@
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
                         <property name="help"></property>
-                        <property name="id">wxID_NEW</property>
+                        <property name="id">wxID_ANY</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Run Simulation</property>
                         <property name="name">m_runSimulation</property>
-                        <property name="permission">none</property>
+                        <property name="permission">protected</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection">menuNewPlot</event>
+                        <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
                     </object>
                     <object class="separator" expanded="0">
@@ -268,14 +268,14 @@
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
                         <property name="help"></property>
-                        <property name="id">wxID_OPEN</property>
+                        <property name="id">wxID_ANY</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Add signals...</property>
                         <property name="name">m_addSignals</property>
-                        <property name="permission">none</property>
+                        <property name="permission">protected</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection">menuOpenWorkbook</event>
+                        <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
                     </object>
                     <object class="wxMenuItem" expanded="0">
@@ -283,14 +283,14 @@
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
                         <property name="help"></property>
-                        <property name="id">wxID_SAVE</property>
+                        <property name="id">wxID_ANY</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Probe from schematics</property>
                         <property name="name">m_probeSignals</property>
-                        <property name="permission">none</property>
+                        <property name="permission">protected</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection">menuSaveWorkbook</event>
+                        <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
                     </object>
                     <object class="wxMenuItem" expanded="0">
@@ -302,10 +302,10 @@
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Tune component value</property>
                         <property name="name">m_tuneValue</property>
-                        <property name="permission">none</property>
+                        <property name="permission">protected</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection">menuSaveImage</event>
+                        <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
                     </object>
                     <object class="separator" expanded="0">
@@ -317,14 +317,14 @@
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
                         <property name="help"></property>
-                        <property name="id">wxID_CLOSE</property>
+                        <property name="id">wxID_ANY</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Settings...</property>
-                        <property name="name">m_exitSim1</property>
-                        <property name="permission">none</property>
+                        <property name="name">m_settings</property>
+                        <property name="permission">protected</property>
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection">menuExit</event>
+                        <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
                     </object>
                 </object>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index aad625bb50..7e2f63b2ad 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -49,6 +49,11 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 		wxMenuBar* m_mainMenu;
 		wxMenu* m_fileMenu;
 		wxMenu* m_simulationMenu;
+		wxMenuItem* m_runSimulation;
+		wxMenuItem* m_addSignals;
+		wxMenuItem* m_probeSignals;
+		wxMenuItem* m_tuneValue;
+		wxMenuItem* m_settings;
 		wxMenu* m_viewMenu;
 		wxBoxSizer* m_sizer1;
 		wxToolBar* m_toolBar;

From 22f5bceda0e79bdd380b7370d72bee4f00bdd12b Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:13 +0200
Subject: [PATCH 172/197] Removed obsolete sim demo folder.

---
 demos/sim/device.dcm   |  572 -------
 demos/sim/device.lib   | 3585 ----------------------------------------
 demos/sim/diodes.lib   |    6 -
 demos/sim/power.dcm    |  234 ---
 demos/sim/power.lib    |  936 -----------
 demos/sim/pspice.dcm   |   16 -
 demos/sim/pspice.lib   |  204 ---
 demos/sim/sim_test.sch |  154 --
 8 files changed, 5707 deletions(-)
 delete mode 100644 demos/sim/device.dcm
 delete mode 100644 demos/sim/device.lib
 delete mode 100644 demos/sim/diodes.lib
 delete mode 100644 demos/sim/power.dcm
 delete mode 100644 demos/sim/power.lib
 delete mode 100644 demos/sim/pspice.dcm
 delete mode 100644 demos/sim/pspice.lib
 delete mode 100644 demos/sim/sim_test.sch

diff --git a/demos/sim/device.dcm b/demos/sim/device.dcm
deleted file mode 100644
index cd74c88cf5..0000000000
--- a/demos/sim/device.dcm
+++ /dev/null
@@ -1,572 +0,0 @@
-EESchema-DOCLIB  Version 2.0
-#
-$CMP C
-D Unpolarized capacitor
-$ENDCMP
-#
-$CMP CP
-D Polarised capacitor
-$ENDCMP
-#
-$CMP CP1
-D Polarised capacitor
-$ENDCMP
-#
-$CMP CP1_Small
-D Polarised capacitor
-$ENDCMP
-#
-$CMP CP_Small
-D Polarised capacitor
-$ENDCMP
-#
-$CMP CTRIM
-D Variable capacitor
-K trimmer
-$ENDCMP
-#
-$CMP C_Small
-D Unpolarized capacitor
-$ENDCMP
-#
-$CMP Coded_Switch
-D 4 bits rotary switch
-K Rotary, Hex
-$ENDCMP
-#
-$CMP Crystal
-D Two pin crystal
-K Quartz, Ceramic, Filter, Resonator
-$ENDCMP
-#
-$CMP Crystal_Small
-D Two pin crystal
-K Quartz, Resonator, Ceramic, Filter
-$ENDCMP
-#
-$CMP D
-D Diode
-$ENDCMP
-#
-$CMP DUAL_POT
-D Potentionmetre
-K R
-$ENDCMP
-#
-$CMP D_Schottky
-D Diode schottky
-$ENDCMP
-#
-$CMP D_Schottky_Small
-D Diode Schottky
-$ENDCMP
-#
-$CMP D_Schottky_x2_ACom_AKK
-D Double diode Schottky (Serie)
-K DEV DIODE
-$ENDCMP
-#
-$CMP D_Schottky_x2_ACom_KAK
-D Double diode Schottky (Serie)
-K DEV DIODE
-$ENDCMP
-#
-$CMP D_Schottky_x2_ACom_KKA
-D Double diode Schottky (Serie)
-K DEV DIODE
-$ENDCMP
-#
-$CMP D_Schottky_x2_KCom_AAK
-D Double diode Schottky (Serie)
-K DEV DIODE
-$ENDCMP
-#
-$CMP D_Schottky_x2_KCom_AKA
-D Double diode Schottky (Serie)
-K DEV DIODE
-$ENDCMP
-#
-$CMP D_Schottky_x2_KCom_KAA
-D Double diode Schottky (Serie)
-K DEV DIODE
-$ENDCMP
-#
-$CMP D_Schottky_x2_Serial_ACK
-D Double diode Schottky (Serie)
-K DEV DIODE
-$ENDCMP
-#
-$CMP D_Schottky_x2_Serial_AKC
-D Double diode Schottky (Serie)
-K DEV DIODE
-$ENDCMP
-#
-$CMP D_Schottky_x2_Serial_CAK
-D Double diode Schottky (Serie)
-K DEV DIODE
-$ENDCMP
-#
-$CMP D_Schottky_x2_Serial_CKA
-D Double diode Schottky (Serie)
-K DEV DIODE
-$ENDCMP
-#
-$CMP D_Schottky_x2_Serial_KAC
-D Double diode Schottky (Serie)
-K DEV DIODE
-$ENDCMP
-#
-$CMP D_Schottky_x2_Serial_KCA
-D Double diode Schottky (Serie)
-K DEV DIODE
-$ENDCMP
-#
-$CMP D_Small
-D Diode
-$ENDCMP
-#
-$CMP Darl_NPN
-D Darlington NPN transistor
-K Q
-$ENDCMP
-#
-$CMP Diode_Bridge
-D Diode bridge
-K Graetz
-$ENDCMP
-#
-$CMP EMI_FILTER
-D Filtre EMI
-K EMI
-$ENDCMP
-#
-$CMP EMI_FILTER2
-D Filtre EMI
-K EMI
-$ENDCMP
-#
-$CMP FILTER
-D Filtre EMI
-K EMI
-$ENDCMP
-#
-$CMP FP_Small
-D Fuse polarised
-$ENDCMP
-#
-$CMP F_Small
-D Fuse
-$ENDCMP
-#
-$CMP Jumper_NC_Small
-D Jumper normally close
-K Jumper, Link
-$ENDCMP
-#
-$CMP Jumper_NO_Small
-D Jumper normally open
-K Jumper, Link
-$ENDCMP
-#
-$CMP LED
-K LED
-$ENDCMP
-#
-$CMP LED_RABG
-D Common Anode RGB LED
-K RGB LED
-$ENDCMP
-#
-$CMP LED_RCBG
-D Common Cathode RGB LED
-K RGB LED
-$ENDCMP
-#
-$CMP LED_RGB
-D LED RGB 6 pins
-$ENDCMP
-#
-$CMP LED_RGB_EP
-D LED RGB 6 pins, exposed pad
-$ENDCMP
-#
-$CMP L_Small
-D Inductor
-$ENDCMP
-#
-$CMP Led_RGB_CA
-D Common Anode RGB LED
-K RGB LED
-$ENDCMP
-#
-$CMP Led_Small
-D Led
-$ENDCMP
-#
-$CMP Led_x2
-D DOUBLE type Bicolore
-K LED
-$ENDCMP
-#
-$CMP PHOTORESISTOR
-D Photo resistor
-$ENDCMP
-#
-$CMP POT
-D Potentionmetre
-K R
-$ENDCMP
-#
-$CMP Q_NIGBT_CEG
-D Transistor N-IGBT (general)
-K igbt n-igbt transistor
-$ENDCMP
-#
-$CMP Q_NIGBT_CGE
-D Transistor N-IGBT (general)
-K igbt n-igbt transistor
-$ENDCMP
-#
-$CMP Q_NIGBT_ECG
-D Transistor N-IGBT (general)
-K igbt n-igbt transistor
-$ENDCMP
-#
-$CMP Q_NIGBT_ECGC
-D Transistor N-IGBT, collector connected to mounting plane (general)
-K igbt n-igbt transistor
-$ENDCMP
-#
-$CMP Q_NIGBT_EGC
-D Transistor N-IGBT (general)
-K igbt n-igbt transistor
-$ENDCMP
-#
-$CMP Q_NIGBT_GCE
-D Transistor N-IGBT (general)
-K igbt n-igbt transistor
-$ENDCMP
-#
-$CMP Q_NIGBT_GCEC
-D Transistor N-IGBT, collector connected to mounting plane (general)
-K igbt n-igbt transistor
-$ENDCMP
-#
-$CMP Q_NIGBT_GEC
-D Transistor N-IGBT (general)
-K igbt n-igbt transistor
-$ENDCMP
-#
-$CMP Q_NJFET_DGS
-D Transistor N-JFET (general)
-K njfet n-jfet transistor
-$ENDCMP
-#
-$CMP Q_NJFET_DSG
-D Transistor N-JFET (general)
-K njfet n-jfet transistor
-$ENDCMP
-#
-$CMP Q_NJFET_GDS
-D Transistor N-JFET (general)
-K njfet n-jfet transistor
-$ENDCMP
-#
-$CMP Q_NJFET_GSD
-D Transistor N-JFET (general)
-K njfet n-jfet transistor
-$ENDCMP
-#
-$CMP Q_NJFET_SDG
-D Transistor N-JFET (general)
-K njfet n-jfet transistor
-$ENDCMP
-#
-$CMP Q_NJFET_SGD
-D Transistor N-JFET (general)
-K njfet n-jfet transistor
-$ENDCMP
-#
-$CMP Q_NMOS_DGS
-D Transistor N-MOSFET (general)
-K nmos n-mos n-mosfet transistor
-$ENDCMP
-#
-$CMP Q_NMOS_DSG
-D Transistor N-MOSFET (general)
-K nmos n-mos n-mosfet transistor
-$ENDCMP
-#
-$CMP Q_NMOS_GDS
-D Transistor N-MOSFET (general)
-K nmos n-mos n-mosfet transistor
-$ENDCMP
-#
-$CMP Q_NMOS_GDSD
-D Transistor N-MOSFET, collector connected to mounting plane (general)
-K nmos n-mos n-mosfet transistor
-$ENDCMP
-#
-$CMP Q_NMOS_GSD
-D Transistor N-MOSFET (general)
-K nmos n-mos n-mosfet transistor
-$ENDCMP
-#
-$CMP Q_NMOS_SDG
-D Transistor N-MOSFET (general)
-K nmos n-mos n-mosfet transistor
-$ENDCMP
-#
-$CMP Q_NMOS_SDGD
-D Transistor N-MOSFET, collector connected to mounting plane (general)
-K nmos n-mos n-mosfet transistor
-$ENDCMP
-#
-$CMP Q_NMOS_SGD
-D Transistor N-MOSFET (general)
-K nmos n-mos n-mosfet transistor
-$ENDCMP
-#
-$CMP Q_NPN_BCE
-D Transistor NPN (general)
-K npn transistor
-$ENDCMP
-#
-$CMP Q_NPN_BCEC
-D Transistor NPN, collector connected to mounting plane (general)
-K npn transistor
-$ENDCMP
-#
-$CMP Q_NPN_BEC
-D Transistor NPN (general)
-K npn transistor
-$ENDCMP
-#
-$CMP Q_NPN_CBE
-D Transistor NPN (general)
-K npn transistor
-$ENDCMP
-#
-$CMP Q_NPN_CEB
-D Transistor NPN (general)
-K npn transistor
-$ENDCMP
-#
-$CMP Q_NPN_EBC
-D Transistor NPN (general)
-K npn transistor
-$ENDCMP
-#
-$CMP Q_NPN_ECB
-D Transistor NPN (general)
-K npn transistor
-$ENDCMP
-#
-$CMP Q_NPN_ECBC
-D Transistor NPN, collector connected to mounting plane (general)
-K npn transistor
-$ENDCMP
-#
-$CMP Q_PJFET_DGS
-D Transistor P-JFET (general)
-K pjfet p-jfet transistor
-$ENDCMP
-#
-$CMP Q_PJFET_DSG
-D Transistor P-JFET (general)
-K pjfet p-jfet transistor
-$ENDCMP
-#
-$CMP Q_PJFET_GDS
-D Transistor P-JFET (general)
-K pjfet p-jfet transistor
-$ENDCMP
-#
-$CMP Q_PJFET_GSD
-D Transistor P-JFET (general)
-K pjfet p-jfet transistor
-$ENDCMP
-#
-$CMP Q_PJFET_SDG
-D Transistor P-JFET (general)
-K pjfet p-jfet transistor
-$ENDCMP
-#
-$CMP Q_PJFET_SGD
-D Transistor P-JFET (general)
-K pjfet p-jfet transistor
-$ENDCMP
-#
-$CMP Q_PMOS_DGS
-D Transistor P-MOSFET (general)
-K pmos p-mos p-mosfet transistor
-$ENDCMP
-#
-$CMP Q_PMOS_DSG
-D Transistor P-MOSFET (general)
-K pmos p-mos p-mosfet transistor
-$ENDCMP
-#
-$CMP Q_PMOS_GDS
-D Transistor P-MOSFET (general)
-K pmos p-mos p-mosfet transistor
-$ENDCMP
-#
-$CMP Q_PMOS_GDSD
-D Transistor P-MOSFET, collector connected to mounting plane (general)
-K pmos p-mos p-mosfet transistor
-$ENDCMP
-#
-$CMP Q_PMOS_GSD
-D Transistor P-MOSFET (general)
-K pmos p-mos p-mosfet transistor
-$ENDCMP
-#
-$CMP Q_PMOS_SDG
-D Transistor P-MOSFET (general)
-K pmos p-mos p-mosfet transistor
-$ENDCMP
-#
-$CMP Q_PMOS_SDGD
-D Transistor P-MOSFET, collector connected to mounting plane (general)
-K pmos p-mos p-mosfet transistor
-$ENDCMP
-#
-$CMP Q_PMOS_SGD
-D Transistor P-MOSFET (general)
-K pmos p-mos p-mosfet transistor
-$ENDCMP
-#
-$CMP Q_PNP_BCE
-D Transistor PNP (general)
-K pnp transistor
-$ENDCMP
-#
-$CMP Q_PNP_BCEC
-D Transistor PNP, collector connected to mounting plane (general)
-K pnp transistor
-$ENDCMP
-#
-$CMP Q_PNP_BEC
-D Transistor PNP (general)
-K pnp transistor
-$ENDCMP
-#
-$CMP Q_PNP_CBE
-D Transistor PNP (general)
-K pnp transistor
-$ENDCMP
-#
-$CMP Q_PNP_CEB
-D Transistor PNP (general)
-K pnp transistor
-$ENDCMP
-#
-$CMP Q_PNP_EBC
-D Transistor PNP (general)
-K pnp transistor
-$ENDCMP
-#
-$CMP Q_PNP_ECB
-D Transistor PNP (general)
-K pnp transistor
-$ENDCMP
-#
-$CMP Q_PNP_ECBC
-D Transistor PNP, collector connected to mounting plane (general)
-K pnp transistor
-$ENDCMP
-#
-$CMP R
-D Resistor
-K R DEV
-$ENDCMP
-#
-$CMP RR8
-D 8 resistors
-K R DEV
-$ENDCMP
-#
-$CMP R_PACK4
-D 4 resistors Pack
-K R DEV
-$ENDCMP
-#
-$CMP R_PACK8
-D 8 resistors Pack
-K R DEV
-$ENDCMP
-#
-$CMP R_Small
-D Resistor
-$ENDCMP
-#
-$CMP SCHDPAK
-D Diode schotty - cms
-K DIODE SCHOTTKY CMS
-$ENDCMP
-#
-$CMP SCR
-D Thyristor
-$ENDCMP
-#
-$CMP SP3T
-D 3 position switch, SP3T
-K switch SP3T
-$ENDCMP
-#
-$CMP SPST
-D Interrupteur simple
-K switch
-$ENDCMP
-#
-$CMP SWITCH_INV
-D inverseur
-K switch
-$ENDCMP
-#
-$CMP SWITCH_INV_MSM
-D Switch inverseur M S M
-K switch
-$ENDCMP
-#
-$CMP SW_PUSH
-D Button
-K Switch
-$ENDCMP
-#
-$CMP Switch_DPST
-D Double Pole Single Throw (DPST) Switch
-K switch
-$ENDCMP
-#
-$CMP Switch_SPDT_x2
-D Double Single Pole Double Throw (SPDT) switch
-$ENDCMP
-#
-$CMP THERMISTOR
-D Resistance
-K R DEV
-$ENDCMP
-#
-$CMP THYRISTOR
-D Diode simple
-K DEV DIODE
-$ENDCMP
-#
-$CMP TVS
-D Transient voltage suppressor diode (bi-directional)
-K DEV TVS TRANSIENT SUPPROESSOR ESD
-$ENDCMP
-#
-$CMP VR
-D VARISTANCE
-K VR  DEV
-$ENDCMP
-#
-$CMP ZENER
-D Diode zener
-K DEV DIODE
-$ENDCMP
-#
-#End Doc Library
diff --git a/demos/sim/device.lib b/demos/sim/device.lib
deleted file mode 100644
index 8ac1269f1e..0000000000
--- a/demos/sim/device.lib
+++ /dev/null
@@ -1,3585 +0,0 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# Battery
-#
-DEF Battery BT 0 0 N Y 1 F N
-F0 "BT" 100 50 50 H V L CNN
-F1 "Battery" 100 -50 50 H V L CNN
-F2 "" 0 40 50 V V C CNN
-F3 "" 0 40 50 V V C CNN
-DRAW
-P 2 0 1 10 20 95 60 95 N
-P 2 0 1 10 40 115 40 75 N
-S -90 -7 90 -17 0 1 0 F
-S -90 50 90 40 0 1 0 F
-S -62 -30 58 -50 0 1 0 F
-S -62 27 58 7 0 1 0 F
-X ~ 1 0 150 100 D 50 50 1 1 P
-X ~ 2 0 -150 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# C
-#
-DEF C C 0 10 N Y 1 F N
-F0 "C" 25 100 50 H V L CNN
-F1 "C" 25 -100 50 H V L CNN
-F2 "" 38 -150 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- C?
- C_????_*
- C_????
- SMD*_c
- Capacitor*
-$ENDFPLIST
-DRAW
-P 2 0 1 20 -80 -30 80 -30 N
-P 2 0 1 20 -80 30 80 30 N
-X ~ 1 0 150 110 D 40 40 1 1 P
-X ~ 2 0 -150 110 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CP
-#
-DEF CP C 0 10 N Y 1 F N
-F0 "C" 25 100 50 H V L CNN
-F1 "CP" 25 -100 50 H V L CNN
-F2 "" 38 -150 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- CP*
- C_Axial*
- C_Radial*
- TantalC*
- C*elec
- c_elec*
- SMD*_Pol
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -70 90 -30 90 N
-P 2 0 1 0 -50 110 -50 70 N
-S -90 20 -90 40 0 1 0 N
-S -90 20 90 20 0 1 0 N
-S 90 -20 -90 -40 0 1 0 F
-S 90 40 -90 40 0 1 0 N
-S 90 40 90 20 0 1 0 N
-X ~ 1 0 150 110 D 40 40 1 1 P
-X ~ 2 0 -150 110 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CP1
-#
-DEF CP1 C 0 10 N N 1 F N
-F0 "C" 25 100 50 H V L CNN
-F1 "CP1" 25 -100 50 H V L CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- SMD*_Pol
- C_Axial*
- C_Radial*
- c_elec*
- C*elec
- TantalC*
- CP*
-$ENDFPLIST
-DRAW
-P 2 0 1 20 -80 30 80 30 N
-P 2 0 1 0 -70 90 -30 90 N
-P 2 0 1 0 -50 70 -50 110 N
-A 0 -150 128 1287 513 0 1 20 N -80 -50 80 -50
-X ~ 1 0 150 110 D 40 40 1 1 P
-X ~ 2 0 -150 130 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CP1_Small
-#
-DEF CP1_Small C 0 10 N N 1 F N
-F0 "C" 10 70 50 H V L CNN
-F1 "CP1_Small" 10 -80 50 H V L CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- CP*
- C_Axial*
- C_Radial*
- TantalC*
- C*elec
- c_elec*
- SMD*_Pol
-$ENDFPLIST
-DRAW
-P 2 0 1 12 -60 20 60 20 N
-P 2 0 1 0 -50 60 -30 60 N
-P 2 0 1 0 -40 50 -40 70 N
-A 0 -140 125 1186 614 0 1 12 N -60 -30 60 -30
-X ~ 1 0 100 80 D 40 40 1 1 P
-X ~ 2 0 -100 80 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CP_Small
-#
-DEF CP_Small C 0 10 N N 1 F N
-F0 "C" 10 70 50 H V L CNN
-F1 "CP_Small" 10 -80 50 H V L CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- CP*
- C_Axial*
- C_Radial*
- TantalC*
- C*elec
- c_elec*
- SMD*_Pol
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -50 60 -30 60 N
-P 2 0 1 0 -40 50 -40 70 N
-S -60 -12 60 -27 0 1 0 F
-S -60 27 60 12 0 1 0 N
-X ~ 1 0 100 73 D 40 40 1 1 P
-X ~ 2 0 -100 73 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CRYSTAL_SMD
-#
-DEF CRYSTAL_SMD X 0 40 Y N 1 F N
-F0 "X" 0 90 50 H V C CNN
-F1 "CRYSTAL_SMD" 30 -110 50 H V L CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -70 -70 70 -70 N
-P 2 0 1 16 -70 50 -70 -50 N
-P 2 0 1 16 70 50 70 -50 N
-P 5 0 1 12 -40 40 40 40 40 -40 -40 -40 -40 40 f
-X 1 1 -200 0 130 R 25 20 1 1 P
-X 2 2 200 0 130 L 25 20 1 1 P
-X case 3 0 -100 30 U 25 20 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CTRIM
-#
-DEF CTRIM C 0 10 N N 1 F N
-F0 "C" 60 -80 50 H V C CNN
-F1 "CTRIM" 120 -140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 20 -80 -30 80 -30 N
-P 2 0 1 20 -80 30 80 30 N
-P 2 0 1 12 50 100 -50 -100 N
-P 2 0 1 12 50 100 20 90 N
-P 2 0 1 12 50 100 60 70 N
-X ~ 1 0 150 120 D 40 40 1 1 P
-X ~ 2 0 -150 120 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# C_Small
-#
-DEF C_Small C 0 10 N N 1 F N
-F0 "C" 10 70 50 H V L CNN
-F1 "C_Small" 10 -80 50 H V L CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- C?
- C_????_*
- C_????
- SMD*_c
- Capacitor*
-$ENDFPLIST
-DRAW
-P 2 0 1 13 -60 -20 60 -20 N
-P 2 0 1 12 -60 20 60 20 N
-X ~ 1 0 100 75 D 40 40 1 1 P
-X ~ 2 0 -100 80 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Coded_Switch
-#
-DEF Coded_Switch SW 0 40 Y Y 1 F N
-F0 "SW" 100 350 50 H V C CNN
-F1 "Coded_Switch" 0 -349 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 11 0 1 0 -10 -100 -10 80 -30 60 -50 60 0 110 50 60 30 60 10 80 10 -100 -10 -100 -10 -100 N
-S 300 300 -300 -300 0 1 0 f
-C 0 0 150 0 1 0 N
-X CM 1 600 250 300 L 50 50 1 1 P
-X D0 2 600 50 300 L 50 50 1 1 P
-X D1 3 600 -50 300 L 50 50 1 1 P
-X D2 4 600 -150 300 L 50 50 1 1 P
-X D3 5 600 -250 300 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Crystal
-#
-DEF Crystal Y 0 40 N N 1 F N
-F0 "Y" 0 150 50 H V C CNN
-F1 "Crystal" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- Crystal_*
-$ENDFPLIST
-DRAW
-P 2 0 1 12 -100 -50 -100 50 N
-P 2 0 1 12 100 -50 100 50 N
-S -50 100 50 -100 0 1 12 N
-X 1 1 -150 0 50 R 40 40 1 1 P
-X 2 2 150 0 50 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Crystal_Small
-#
-DEF Crystal_Small Y 0 40 N N 1 F N
-F0 "Y" 0 100 50 H V C CNN
-F1 "Crystal_Small" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- Crystal_
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -50 -30 -50 30 N
-P 2 0 1 0 50 -30 50 30 N
-S -30 -60 30 60 0 1 0 N
-X 1 1 -100 0 50 R 40 40 1 1 P
-X 2 2 100 0 50 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# D
-#
-DEF D D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- Diode_*
- D-Pak_TO252AA
- *SingleDiode
- *_Diode_*
- *SingleDiode*
-$ENDFPLIST
-DRAW
-P 2 0 1 6 -50 50 -50 -50 N
-P 3 0 1 0 50 50 -50 0 50 -50 F
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# DUAL_POT
-#
-DEF DUAL_POT RV 0 40 Y N 1 F N
-F0 "RV" 160 310 50 H V C CNN
-F1 "DUAL_POT" 290 -300 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 4 0 1 0 200 200 80 200 80 200 80 200 N
-P 5 0 1 0 80 -220 80 -180 50 -200 80 -220 80 -220 N
-P 5 0 1 0 150 -200 100 -180 130 -150 150 -200 150 -200 N
-P 5 0 1 0 200 -200 80 -200 80 -200 80 -200 80 -200 N
-P 6 0 1 0 80 180 80 220 50 200 80 180 80 180 80 180 N
-P 6 0 1 0 110 160 100 150 100 -150 110 -160 110 -160 110 -160 N
-P 6 0 1 0 150 200 100 180 130 150 150 200 150 200 150 200 N
-T 0 -20 -100 30 0 0 0 H Normal 0 C C
-T 0 -20 300 30 0 0 0 H Normal 0 C C
-T 0 -20 -300 30 0 0 0 L Normal 0 C C
-T 0 -20 100 30 0 0 0 L Normal 0 C C
-S -100 250 -100 250 0 1 0 N
-S -100 250 -100 250 0 1 0 N
-S -100 250 -100 250 0 1 0 N
-S -100 250 -100 250 0 1 0 N
-S -50 -50 50 -350 0 1 0 N
-S -50 350 50 50 0 1 0 N
-X 1 1 -150 300 100 R 40 40 1 1 P
-X 2 2 300 200 100 L 40 40 1 1 P
-X 3 3 -150 100 100 R 40 40 1 1 P
-X ~ 4 -150 -100 100 R 40 40 1 1 P
-X ~ 5 300 -200 100 L 40 40 1 1 P
-X ~ 6 -150 -300 100 R 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky
-#
-DEF D_Schottky D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D_Schottky" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- D-Pak_TO252AA
- Diode_*
- *SingleDiode
- *SingleDiode*
- *_Diode_*
-$ENDFPLIST
-DRAW
-P 3 0 1 0 50 50 -50 0 50 -50 F
-P 6 0 1 8 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_Small
-#
-DEF D_Schottky_Small D 0 10 N N 1 F N
-F0 "D" -50 80 50 H V L CNN
-F1 "D_Schottky_Small" -280 -80 50 H V L CNN
-F2 "" 0 0 50 V V C CNN
-F3 "" 0 0 50 V V C CNN
-$FPLIST
- Diode_*
- D-Pak_TO252AA
- *SingleDiode
- *SingleDiode*
- *_Diode_*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -30 -40 -30 40 N
-P 3 0 1 0 -30 -40 -20 -40 -20 -30 N
-P 3 0 1 0 -30 40 -40 40 -40 30 N
-P 4 0 1 0 30 -40 -30 0 30 40 30 -40 F
-X K 1 -100 0 70 R 50 50 1 1 P
-X A 2 100 0 70 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_ACom_AKK
-#
-DEF D_Schottky_x2_ACom_AKK D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_ACom_AKK" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -150 50 -150 -50 -150 -50 N
-P 3 0 1 10 -50 0 50 0 50 0 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -150 50 -170 50 -170 40 -170 40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -130 -40 -130 -50 -150 -50 -150 -50 -150 -50 N
-P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X A 1 0 -200 100 U 50 50 0 1 P
-X K 2 -300 0 150 R 50 50 0 1 P
-X K 3 300 0 150 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_ACom_KAK
-#
-DEF D_Schottky_x2_ACom_KAK D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_ACom_KAK" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -150 50 -150 -50 -150 -50 N
-P 3 0 1 10 -50 0 50 0 50 0 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -150 50 -170 50 -170 40 -170 40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -130 -40 -130 -50 -150 -50 -150 -50 -150 -50 N
-P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X K 1 -300 0 150 R 50 50 0 1 P
-X A 2 0 -200 100 U 50 50 0 1 P
-X K 3 300 0 150 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_ACom_KKA
-#
-DEF D_Schottky_x2_ACom_KKA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_ACom_KKA" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -150 50 -150 -50 -150 -50 N
-P 3 0 1 10 -50 0 50 0 50 0 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -150 50 -170 50 -170 40 -170 40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -130 -40 -130 -50 -150 -50 -150 -50 -150 -50 N
-P 6 0 1 10 -50 -50 -150 0 -50 50 -50 -50 -50 -50 -50 -50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X K 1 -300 0 150 R 50 50 0 1 P
-X K 2 300 0 150 L 50 50 0 1 P
-X A 3 0 -200 100 U 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_KCom_AAK
-#
-DEF D_Schottky_x2_KCom_AAK D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_KCom_AAK" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 -50 0 50 0 50 0 N
-P 3 0 1 10 50 -50 50 50 50 50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 50 -50 70 -50 70 -40 70 -40 N
-P 4 0 1 10 50 50 30 50 30 40 30 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
-X A 1 -300 0 150 R 50 50 0 1 P
-X A 2 300 0 150 L 50 50 0 1 P
-X K 3 0 -200 100 U 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_KCom_AKA
-#
-DEF D_Schottky_x2_KCom_AKA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_KCom_AKA" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 -50 0 50 0 50 0 N
-P 3 0 1 10 50 -50 50 50 50 50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 50 -50 70 -50 70 -40 70 -40 N
-P 4 0 1 10 50 50 30 50 30 40 30 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
-X A 1 -300 0 150 R 50 50 0 1 P
-X K 2 0 -200 100 U 50 50 0 1 P
-X A 3 300 0 150 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_KCom_KAA
-#
-DEF D_Schottky_x2_KCom_KAA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_KCom_KAA" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 -50 0 50 0 50 0 N
-P 3 0 1 10 50 -50 50 50 50 50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 50 -50 70 -50 70 -40 70 -40 N
-P 4 0 1 10 50 50 30 50 30 40 30 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 150 -50 50 0 150 50 150 -50 150 -50 150 -50 N
-X K 1 0 -200 100 U 50 50 0 1 P
-X A 2 -300 0 150 R 50 50 0 1 P
-X A 3 300 0 150 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_Serial_ACK
-#
-DEF D_Schottky_x2_Serial_ACK D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_Serial_ACK" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 0 250 0 300 0 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 -50 0 50 0 50 0 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X A 1 -300 0 150 R 50 50 0 1 P
-X common 2 0 -200 100 U 50 50 0 1 P
-X K 3 300 0 150 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_Serial_AKC
-#
-DEF D_Schottky_x2_Serial_AKC D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_Serial_AKC" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 0 250 0 300 0 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 -50 0 50 0 50 0 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X A 1 -300 0 150 R 50 50 0 1 P
-X K 2 300 0 150 L 50 50 0 1 P
-X common 3 0 -200 100 U 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_Serial_CAK
-#
-DEF D_Schottky_x2_Serial_CAK D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_Serial_CAK" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 -50 0 50 0 50 0 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X common 1 0 -200 100 U 50 50 0 1 P
-X A 2 -300 0 150 R 50 50 0 1 P
-X K 3 300 0 150 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_Serial_CKA
-#
-DEF D_Schottky_x2_Serial_CKA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_Serial_CKA" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 -50 0 50 0 50 0 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X common 1 0 -200 100 U 50 50 0 1 P
-X K 2 300 0 150 L 50 50 0 1 P
-X A 3 -300 0 150 R 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_Serial_KAC
-#
-DEF D_Schottky_x2_Serial_KAC D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_Serial_KAC" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 0 0 -100 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 -50 0 50 0 50 0 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X K 1 300 0 150 L 50 50 0 1 P
-X A 2 -300 0 150 R 50 50 0 1 P
-X common 3 0 -200 100 U 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Schottky_x2_Serial_KCA
-#
-DEF D_Schottky_x2_Serial_KCA D 0 30 Y N 1 F N
-F0 "D" 50 -100 50 H V C CNN
-F1 "D_Schottky_x2_Serial_KCA" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 0 0 -100 N
-P 2 0 1 0 250 0 300 0 N
-P 3 0 1 10 -50 -50 -50 50 -50 50 N
-P 3 0 1 10 -50 0 50 0 50 0 N
-P 3 0 1 10 150 50 150 -50 150 -50 N
-P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N
-P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N
-P 4 0 1 10 150 50 130 50 130 40 130 40 N
-P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N
-P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
-P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N
-X K 1 300 0 150 L 50 50 0 1 P
-X common 2 0 -200 100 U 50 50 0 1 P
-X A 3 -300 0 150 R 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# D_Small
-#
-DEF D_Small D 0 10 N N 1 F N
-F0 "D" -50 80 50 H V L CNN
-F1 "D_Small" -150 -80 50 H V L CNN
-F2 "" 0 0 50 V V C CNN
-F3 "" 0 0 50 V V C CNN
-$FPLIST
- Diode_*
- D-Pak_TO252AA
- *SingleDiode
- *SingleDiode*
- *_Diode_*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -30 -40 -30 40 N
-P 4 0 1 0 30 -40 -30 0 30 40 30 -40 F
-X K 1 -100 0 70 R 50 50 1 1 P
-X A 2 100 0 70 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Darl_NPN
-#
-DEF Darl_NPN Q 0 10 Y Y 1 F N
-F0 "Q" 0 200 50 H V C CNN
-F1 "Darl_NPN" -200 -150 50 H V C CNN
-F2 "" 0 -50 50 H V C CNN
-F3 "" 0 -50 50 H V C CNN
-$FPLIST
- OldSowjetaera_Transistor*
- Q_*
- Transistor_*
- SO-8_PowerPAK_Vishay_Single
- VLM0806_Housing
- VLM0806_Housing*
- powermite3
- sc70
- sc70*
- sot*
- TO-220_Bipolar*
- TO-220_Neutral123
- TO-247_Horizontal_Neutral123
-$ENDFPLIST
-DRAW
-P 2 0 0 0 -150 -100 -150 100 N
-P 2 0 0 0 50 0 50 -200 N
-P 2 0 1 0 50 -100 150 -200 N
-P 3 0 1 0 -150 0 -50 -100 50 -100 N
-P 3 0 1 0 -150 0 -50 100 150 100 N
-P 3 0 1 0 -50 -100 -65 -20 -130 -90 F
-P 3 0 1 0 50 -100 150 0 150 100 N
-P 3 0 1 0 150 -200 135 -120 70 -185 F
-X ~ 1 150 -300 100 U 40 40 1 1 P
-X ~ 2 -250 0 100 R 40 40 1 1 I
-X ~ 3 150 200 100 D 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Diode_Bridge
-#
-DEF Diode_Bridge D 0 50 Y Y 1 F N
-F0 "D" -250 300 50 H V C CNN
-F1 "Diode_Bridge" 350 -350 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 0 0  -300 0  -200 -100 N
-P 2 0 0 0  -300 0  -200 100 N
-P 2 0 0 8  -150 -250  -50 -150 N
-P 2 0 0 8  -150 250  -50 150 N
-P 2 0 0 0  0 -300  -100 -200 N
-P 2 0 0 0  0 -300  100 -200 N
-P 2 0 0 0  0 300  -100 200 N
-P 2 0 0 0  0 300  100 200 N
-P 2 0 0 8  150 -50  250 -150 N
-P 2 0 0 8  150 50  250 150 N
-P 2 0 0 0  300 0  200 -100 N
-P 2 0 0 0  300 0  200 100 N
-P 4 0 0 0  -250 -150  -150 -50  -100 -200  -250 -150 F
-P 4 0 0 0  -150 50  -250 150  -100 200  -150 50 F
-P 4 0 0 0  50 -150  150 -250  200 -100  50 -150 F
-P 4 0 0 0  50 150  150 250  200 100  50 150 F
-X - 1 -400 0 100 R 50 50 1 1 I
-X ~ 2 0 -400 100 U 50 50 1 1 I
-X + 3 400 0 100 L 50 50 1 1 I
-X ~ 4 0 400 100 D 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# EMI_FILTER
-#
-DEF EMI_FILTER FI 0 40 Y N 1 F N
-F0 "FI" 150 150 50 H V C CNN
-F1 "EMI_FILTER" 400 -148 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 0 -260 -80 260 -80 260 -80 N
-P 5 0 1 0 -260 -40 260 -40 260 -40 260 -40 260 -40 N
-A -250 0 50 1 1799 0 1 0 N -200 0 -300 0
-A -150 0 50 1 1799 0 1 0 N -100 0 -200 0
-A -50 0 50 1 1799 0 1 0 N 0 0 -100 0
-A 0 0 0 0 0 0 1 0 N 0 0 0 0
-A 50 0 50 1 1799 0 1 0 N 100 0 0 0
-A 150 0 50 1 1799 0 1 0 N 200 0 100 0
-A 250 0 50 1 1799 0 1 0 N 300 0 200 0
-X VI 1 -450 0 150 R 40 40 1 1 P
-X GND 2 0 -250 170 U 40 40 1 1 P
-X VO 3 450 0 150 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# EMI_FILTER2
-#
-DEF EMI_FILTER2 FI 0 40 Y N 1 F N
-F0 "FI" 0 100 50 H V C CNN
-F1 "EMI_FILTER2" 50 -150 50 H V L CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 4 0 1 0 -150 -80 150 -80 150 -80 150 -80 N
-P 4 0 1 0 -150 -30 150 -30 150 -30 150 -30 N
-A -150 0 50 1 1799 0 1 0 N -100 0 -200 0
-A -50 0 50 1 1799 0 1 0 N 0 0 -100 0
-A 0 0 0 0 0 0 1 0 N 0 0 0 0
-A 50 0 50 1 1799 0 1 0 N 100 0 0 0
-A 150 0 50 1 1799 0 1 0 N 200 0 100 0
-X VI 1 -350 0 150 R 40 40 1 1 P
-X GND 2 0 -250 170 U 40 40 1 1 P
-X VO 3 350 0 150 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# FILTER
-#
-DEF FILTER FB 0 40 Y N 1 F N
-F0 "FB" 0 150 50 H V C CNN
-F1 "FILTER" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-S -225 75 225 -50 0 1 0 N
-A -150 0 50 1 1799 0 1 0 N -100 0 -200 0
-A -50 0 50 1 1799 0 1 0 N 0 0 -100 0
-A 0 0 0 0 0 0 1 0 N 0 0 0 0
-A 50 0 50 1 1799 0 1 0 N 100 0 0 0
-A 150 0 50 1 1799 0 1 0 N 200 0 100 0
-X 1 1 -350 0 150 R 40 40 1 1 P
-X 2 2 350 0 150 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# FP_Small
-#
-DEF FP_Small F 0 10 N N 1 F N
-F0 "F" -40 60 50 H V L CNN
-F1 "FP_Small" -120 -60 50 H V L CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- CP*
- SM*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -50 0 50 0 N
-S -50 20 -30 -20 0 1 0 F
-S -50 20 50 -20 0 1 0 N
-X ~ 1 -100 0 50 R 40 40 1 1 W
-X ~ 2 100 0 50 L 40 40 1 1 w
-ENDDRAW
-ENDDEF
-#
-# FUSE
-#
-DEF FUSE F 0 10 Y Y 1 F N
-F0 "F" 100 50 50 H V C CNN
-F1 "FUSE" -100 -50 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-A -75 0 75 1 1799 0 1 0 N 0 0 -150 0
-A 75 0 75 -1799 -1 0 1 0 N 0 0 150 0
-X ~ 1 -250 0 100 R 40 40 1 1 I
-X ~ 2 250 0 100 L 40 40 1 1 I
-ENDDRAW
-ENDDEF
-#
-# F_Small
-#
-DEF F_Small F 0 10 N N 1 F N
-F0 "F" -40 60 50 H V L CNN
-F1 "F_Small" -120 -60 50 H V L CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- CP*
- SM*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -50 0 50 0 N
-S -50 20 50 -20 0 1 0 N
-X ~ 1 -100 0 50 R 40 40 1 1 P
-X ~ 2 100 0 50 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# HCPLXX
-#
-DEF HCPLXX U 0 10 Y Y 1 F N
-F0 "U" 0 550 50 H V C CNN
-F1 "HCPLXX" 0 -550 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 0 0 -250 -50 -50 -50 N
-P 2 0 0 0 -100 -100 -50 -150 N
-P 2 0 0 0 -100 -100 -50 -150 N
-P 2 0 0 0 -100 -100 0 -150 N
-P 2 0 0 0 -100 -100 0 -150 N
-P 3 0 0 0 -50 -150 -50 -150 -100 -150 N
-P 3 0 0 0 -50 -150 -50 -150 -100 -150 N
-P 3 0 0 0 -50 -100 0 -150 -50 -100 N
-P 3 0 0 0 -50 -100 0 -150 -50 -100 N
-P 2 0 1 0 200 -150 200 -350 N
-P 2 0 1 0 200 200 200 200 F
-P 3 0 1 0 -350 200 -150 200 -150 100 N
-P 3 0 1 0 -250 100 -50 100 -150 -50 F
-P 3 0 1 0 -150 -50 -150 -150 -350 -150 N
-P 3 0 1 0 50 300 250 300 250 300 f
-P 3 0 1 0 200 -250 300 -350 350 -350 N
-P 3 0 1 0 200 -250 300 -150 350 -150 N
-P 3 0 1 0 300 -350 295 -300 250 -345 F
-P 4 0 1 0 50 150 250 150 150 300 150 300 F
-P 4 0 1 0 150 50 150 400 350 400 350 400 N
-P 4 0 1 0 200 -250 150 -250 150 50 350 50 N
-S -350 500 350 -500 0 1 0 N
-X NC 1 -550 400 200 R 50 50 1 1 U
-X ~ 2 -550 200 200 R 50 50 1 1 I
-X ~ 3 -550 -150 200 R 50 50 1 1 O
-X NC 4 -550 -350 200 R 50 50 1 1 I
-X ~ 5 550 -350 200 L 50 50 1 1 I
-X ~ 6 550 -150 200 L 50 50 1 1 I
-X ~ 7 550 50 200 L 50 50 1 1 U
-X ~ 8 550 400 200 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# HEATSINK
-#
-DEF HEATSINK HS 0 40 Y Y 1 F N
-F0 "HS" 0 200 50 H V C CNN
-F1 "HEATSINK" 0 -50 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 10 0 1 0 -25 50 -50 50 -50 150 -75 150 -75 50 -100 50 -100 150 -125 150 -125 0 -50 0 N
-P 13 0 1 0 -25 50 -25 150 0 150 0 50 25 50 25 150 50 150 50 50 75 50 75 150 100 150 100 0 -50 0 N
-ENDDRAW
-ENDDEF
-#
-# INDUCTOR
-#
-DEF INDUCTOR L 0 40 N N 1 F N
-F0 "L" -50 0 50 V V C CNN
-F1 "INDUCTOR" 100 0 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- Choke_*
- *Coil*
-$ENDFPLIST
-DRAW
-A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
-A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
-A 0 51 51 -889 889 0 1 0 N 1 1 1 102
-A 0 148 48 -889 889 0 1 0 N 1 101 1 196
-X 1 1 0 300 100 D 50 50 1 1 P
-X 2 2 0 -300 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# INDUCTOR_SMALL
-#
-DEF INDUCTOR_SMALL L 0 0 N N 1 F N
-F0 "L" 0 100 50 H V C CNN
-F1 "INDUCTOR_SMALL" 0 -50 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- Choke_*
- *Coil*
-$ENDFPLIST
-DRAW
-A -150 0 50 1 1799 0 1 0 N -100 0 -200 0
-A -50 0 50 1 1799 0 1 0 N 0 0 -100 0
-A 50 0 50 1 1799 0 1 0 N 100 0 0 0
-A 150 0 50 1 1799 0 1 0 N 200 0 100 0
-X 1 1 -250 0 50 R 30 30 1 1 I
-X 2 2 250 0 50 L 30 30 1 1 I
-ENDDRAW
-ENDDEF
-#
-# JACK_2P
-#
-DEF JACK_2P J 0 40 Y Y 1 F N
-F0 "J" -350 -200 50 H V C CNN
-F1 "JACK_2P" -150 250 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 0 150 0 300 0 300 0 N
-P 4 0 1 0 0 -100 -50 -50 -100 -100 -100 -100 N
-P 4 0 1 0 0 -100 300 -100 300 -100 300 -100 N
-P 4 0 1 0 50 -50 100 -100 150 -50 150 -50 N
-P 4 0 1 0 150 0 100 0 100 -100 100 -100 N
-P 5 0 1 0 300 150 -250 150 -300 100 -350 150 -350 150 N
-S -450 150 -400 -100 0 1 0 F
-S 300 -150 -400 200 0 1 0 N
-X ~ 1 450 -100 150 L 50 50 1 1 P
-X ~ 2 450 0 150 L 50 50 1 1 P
-X ~ 3 450 150 150 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# JUMPER
-#
-DEF JUMPER JP 0 30 Y N 1 F N
-F0 "JP" 0 150 50 H V C CNN
-F1 "JUMPER" 0 -80 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-C -100 0 35 0 1 0 N
-C 100 0 35 0 1 0 N
-A 0 -26 125 1426 373 0 1 0 N -98 50 99 50
-X 1 1 -300 0 165 R 50 50 0 1 P
-X 2 2 300 0 165 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# JUMPER3
-#
-DEF JUMPER3 JP 0 30 Y N 1 F N
-F0 "JP" 50 -100 50 H V L CNN
-F1 "JUMPER3" 0 100 50 H V C BNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-C -120 0 35 0 1 0 N
-C 0 0 36 0 1 0 N
-C 120 0 35 0 1 0 N
-A -60 10 64 386 1413 0 1 0 N -10 50 -110 50
-A 60 10 64 386 1413 0 1 0 N 110 50 10 50
-X 1 1 -250 0 95 R 40 40 0 1 P
-X 2 2 0 -100 60 U 40 40 0 1 P
-X 3 3 250 0 95 L 40 40 0 1 P
-ENDDRAW
-ENDDEF
-#
-# Jumper_NC_Small
-#
-DEF ~Jumper_NC_Small JP 0 30 N N 1 F N
-F0 "JP" 0 80 50 H V C CNN
-F1 "Jumper_NC_Small" 10 -60 50 H I C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-C -40 0 20 0 1 0 N
-C 40 0 20 0 1 0 N
-A 0 -10 57 450 1350 0 1 0 N 40 30 -40 30
-X 1 1 -100 0 40 R 50 50 0 1 P
-X 2 2 100 0 40 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# Jumper_NO_Small
-#
-DEF ~Jumper_NO_Small JP 0 30 N N 1 F N
-F0 "JP" 0 80 50 H V C CNN
-F1 "Jumper_NO_Small" 10 -60 50 H I C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-C -40 0 20 0 1 0 N
-C 40 0 20 0 1 0 N
-X 1 1 -100 0 40 R 50 50 0 1 P
-X 2 2 100 0 40 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# LED
-#
-DEF LED D 0 40 Y N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "LED" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- LED-*
- LED_*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -50 50 -50 -50 N
-P 3 0 1 0 -80 -25 -125 -65 -120 -40 N
-P 3 0 1 0 -65 -40 -110 -80 -105 -55 N
-P 3 0 1 0 50 50 -50 0 50 -50 F
-X K 1 -200 0 150 R 40 40 1 1 P
-X A 2 200 0 150 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# LED_RABG
-#
-DEF LED_RABG D 0 50 Y N 1 F N
-F0 "D" 75 350 50 H V C CNN
-F1 "LED_RABG" 25 -350 50 H V C CNN
-F2 "" -50 -50 50 H V C CNN
-F3 "" -50 -50 50 H V C CNN
-DRAW
-P 2 0 1 0 -75 -200 -150 -200 N
-P 2 0 1 0 -75 -150 -75 -250 N
-P 2 0 1 0 -75 0 -150 0 N
-P 2 0 1 0 -75 200 -150 200 N
-P 2 0 1 0 25 0 150 0 N
-P 3 0 1 0 -75 50 -75 -50 -75 -50 N
-P 3 0 1 0 -75 250 -75 150 -75 150 N
-P 4 0 1 0 -78 -116 -98 -116 -78 -126 -78 -126 N
-P 4 0 1 0 -65 80 -85 80 -65 70 -65 70 N
-P 4 0 1 0 -65 280 -85 280 -65 270 -65 270 N
-P 4 0 1 0 25 200 75 200 75 -200 25 -200 N
-P 5 0 1 0 -5 -150 -55 -140 -45 -130 -85 -120 -85 -120 N
-P 5 0 1 0 25 -150 25 -250 -75 -200 25 -150 25 -150 F
-P 6 0 1 0 -5 50 -55 60 -45 70 -85 80 -85 80 -85 80 N
-P 6 0 1 0 -5 250 -55 260 -45 270 -85 280 -85 280 -85 280 N
-P 6 0 1 0 25 50 25 -50 -75 0 25 50 25 50 25 50 F
-P 6 0 1 0 25 250 25 150 -75 200 25 250 25 250 25 250 F
-S 25 -50 25 50 0 1 0 N
-S 25 50 25 50 0 1 0 N
-S 25 150 25 250 0 1 0 N
-S 25 250 25 250 0 1 0 N
-S 150 300 -150 -300 0 1 0 f
-X RED_CATHODE 1 -300 200 150 R 50 50 1 1 P
-X COMMON_ANODE 2 300 0 150 L 50 50 1 1 P
-X BLUE_CATHODE 3 -300 -200 150 R 50 50 1 1 P
-X GREEN_CATHODE 4 -300 0 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# LED_RCBG
-#
-DEF LED_RCBG D 0 50 Y N 1 F N
-F0 "D" 0 350 50 H V C CNN
-F1 "LED_RCBG" 0 -350 50 H V C CNN
-F2 "" 0 -50 50 H V C CNN
-F3 "" 0 -50 50 H V C CNN
-DRAW
-P 2 0 1 0 -25 -150 -25 -250 N
-P 2 0 1 0 -25 0 -150 0 N
-P 2 0 1 0 75 -200 150 -200 N
-P 2 0 1 0 75 0 150 0 N
-P 2 0 1 0 75 200 150 200 N
-P 3 0 1 0 -25 50 -25 -50 -25 -50 N
-P 3 0 1 0 -25 250 -25 150 -25 150 N
-P 4 0 1 0 -28 -116 -48 -116 -28 -126 -28 -126 N
-P 4 0 1 0 -25 200 -75 200 -75 -200 -25 -200 N
-P 4 0 1 0 -15 80 -35 80 -15 70 -15 70 N
-P 4 0 1 0 -15 280 -35 280 -15 270 -15 270 N
-P 5 0 1 0 45 -150 -5 -140 5 -130 -35 -120 -35 -120 N
-P 5 0 1 0 75 -150 75 -250 -25 -200 75 -150 75 -150 F
-P 6 0 1 0 45 50 -5 60 5 70 -35 80 -35 80 -35 80 N
-P 6 0 1 0 45 250 -5 260 5 270 -35 280 -35 280 -35 280 N
-P 6 0 1 0 75 50 75 -50 -25 0 75 50 75 50 75 50 F
-P 6 0 1 0 75 250 75 150 -25 200 75 250 75 250 75 250 F
-S 75 -50 75 50 0 1 0 N
-S 75 50 75 50 0 1 0 N
-S 75 150 75 250 0 1 0 N
-S 75 250 75 250 0 1 0 N
-S 150 300 -150 -300 0 1 0 f
-X RED_ANODE 1 300 200 150 L 50 50 1 1 P
-X COMMON_CATHODE 2 -300 0 150 R 50 50 1 1 P
-X BLUE_ANODE 3 300 -200 150 L 50 50 1 1 P
-X GREEN_ANODE 4 300 0 150 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# LED_RGB
-#
-DEF LED_RGB D 0 0 Y Y 1 F N
-F0 "D" 0 425 50 H V C CNN
-F1 "LED_RGB" 0 350 50 H V C CNN
-F2 "" 0 -50 50 H V C CNN
-F3 "" 0 -50 50 H V C CNN
-DRAW
-P 2 0 1 0 -50 -200 -100 -200 N
-P 2 0 1 0 -50 -150 -50 -250 N
-P 2 0 1 0 -50 0 -100 0 N
-P 2 0 1 0 -50 200 -100 200 N
-P 2 0 1 0 50 -200 100 -200 N
-P 2 0 1 0 50 0 100 0 N
-P 2 0 1 0 50 200 100 200 N
-P 3 0 1 0 -50 50 -50 -50 -50 -50 N
-P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 -53 -116 -73 -116 -53 -126 -53 -126 N
-P 4 0 1 0 -40 80 -60 80 -40 70 -40 70 N
-P 4 0 1 0 -40 280 -60 280 -40 270 -40 270 N
-P 5 0 1 0 20 -150 -30 -140 -20 -130 -60 -120 -60 -120 N
-P 5 0 1 0 50 -150 50 -250 -50 -200 50 -150 50 -150 F
-P 6 0 1 0 20 50 -30 60 -20 70 -60 80 -60 80 -60 80 N
-P 6 0 1 0 20 250 -30 260 -20 270 -60 280 -60 280 -60 280 N
-P 6 0 1 0 50 50 50 -50 -50 0 50 50 50 50 50 50 F
-P 6 0 1 0 50 250 50 150 -50 200 50 250 50 250 50 250 F
-T 0 -75 -250 50 0 0 0 B Normal 0 C C
-T 0 -75 -50 50 0 0 0 G Normal 0 C C
-T 0 -75 150 50 0 0 0 R Normal 0 C C
-S 50 -50 50 50 0 1 0 N
-S 50 50 50 50 0 1 0 N
-S 50 150 50 250 0 1 0 N
-S 50 250 50 250 0 1 0 N
-S 100 300 -100 -300 0 1 0 f
-X RC 1 -200 200 100 R 50 50 1 1 P
-X GC 2 -200 0 100 R 50 50 1 1 P
-X BC 3 -200 -200 100 R 50 50 1 1 P
-X BA 4 200 -200 100 L 50 50 1 1 P
-X GA 5 200 0 100 L 50 50 1 1 P
-X RA 6 200 200 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# LED_RGB_EP
-#
-DEF LED_RGB_EP D 0 0 Y Y 1 F N
-F0 "D" 0 450 50 H V C CNN
-F1 "LED_RGB_EP" 0 350 50 H V C CNN
-F2 "" 0 -50 50 H V C CNN
-F3 "" 0 -50 50 H V C CNN
-DRAW
-P 2 0 1 0 -50 -200 -100 -200 N
-P 2 0 1 0 -50 -150 -50 -250 N
-P 2 0 1 0 -50 0 -100 0 N
-P 2 0 1 0 -50 200 -100 200 N
-P 2 0 1 0 50 -200 100 -200 N
-P 2 0 1 0 50 200 100 200 N
-P 2 0 1 0 100 0 50 0 N
-P 3 0 1 0 -50 50 -50 -50 -50 -50 N
-P 3 0 1 0 -50 250 -50 150 -50 150 N
-P 4 0 1 0 -53 -116 -73 -116 -53 -126 -53 -126 N
-P 4 0 1 0 -40 80 -60 80 -40 70 -40 70 N
-P 4 0 1 0 -40 280 -60 280 -40 270 -40 270 N
-P 5 0 1 0 20 -150 -30 -140 -20 -130 -60 -120 -60 -120 N
-P 5 0 1 0 50 -150 50 -250 -50 -200 50 -150 50 -150 F
-P 6 0 1 0 20 50 -30 60 -20 70 -60 80 -60 80 -60 80 N
-P 6 0 1 0 20 250 -30 260 -20 270 -60 280 -60 280 -60 280 N
-P 6 0 1 0 50 50 50 -50 -50 0 50 50 50 50 50 50 F
-P 6 0 1 0 50 250 50 150 -50 200 50 250 50 250 50 250 F
-T 0 -75 -250 50 0 0 0 B Normal 0 C C
-T 0 -75 -50 50 0 0 0 G Normal 0 C C
-T 0 -75 150 50 0 0 0 R Normal 0 C C
-S 50 -50 50 50 0 1 0 N
-S 50 50 50 50 0 1 0 N
-S 50 150 50 250 0 1 0 N
-S 50 250 50 250 0 1 0 N
-S 100 300 -100 -300 0 1 0 f
-X RC 1 -200 200 100 R 50 50 1 1 P
-X GC 2 -200 0 100 R 50 50 1 1 P
-X BC 3 -200 -200 100 R 50 50 1 1 P
-X BA 4 200 -200 100 L 50 50 1 1 P
-X GA 5 200 0 100 L 50 50 1 1 P
-X RA 6 200 200 100 L 50 50 1 1 P
-X ~ PAD 0 -500 200 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# LIGNE_A_RETARD
-#
-DEF LIGNE_A_RETARD L 0 40 Y N 1 F N
-F0 "L" 0 100 50 H V C CNN
-F1 "LIGNE_A_RETARD" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -100 200 -100 -200 N
-A 0 -150 50 899 1 0 1 0 N 0 -100 50 -150
-A 0 -150 50 -1 -899 0 1 0 N 50 -150 0 -199
-A 0 -50 50 899 1 0 1 0 N 0 0 50 -50
-A 0 -50 50 -1 -899 0 1 0 N 50 -50 0 -99
-A 0 50 50 899 1 0 1 0 N 0 100 50 50
-A 0 50 50 -1 -899 0 1 0 N 50 50 0 1
-A 0 150 50 899 1 0 1 0 N 0 200 50 150
-A 0 150 50 -1 -899 0 1 0 N 50 150 0 101
-X 1 1 0 300 100 D 50 50 1 1 P
-X 2 2 0 -300 100 U 50 50 1 1 P
-X COMMUN 3 -200 0 100 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# L_Small
-#
-DEF L_Small L 0 10 N N 1 F N
-F0 "L" 30 40 50 H V L CNN
-F1 "L_Small" 30 -40 50 H V L CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- Choke_*
- *Coil*
-$ENDFPLIST
-DRAW
-A 0 -60 20 -899 899 0 1 0 N 0 -80 0 -40
-A 0 -20 20 -899 899 0 1 0 N 0 -40 0 0
-A 0 20 20 -899 899 0 1 0 N 0 0 0 40
-A 0 60 20 -899 899 0 1 0 N 0 40 0 80
-X ~ 1 0 100 20 D 40 40 1 1 P
-X ~ 2 0 -100 20 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Led_RGB_CA
-#
-DEF Led_RGB_CA D 0 50 Y N 1 F N
-F0 "D" 0 350 50 H V C CNN
-F1 "Led_RGB_CA" 0 -350 50 H V C CNN
-F2 "" -45 -50 50 H V C CNN
-F3 "" -45 -50 50 H V C CNN
-DRAW
-P 2 0 1 0 -70 -200 -100 -200 N
-P 2 0 1 0 -70 -150 -70 -250 N
-P 2 0 1 0 -70 0 -100 0 N
-P 2 0 1 0 -70 200 -100 200 N
-P 2 0 1 0 100 0 30 0 N
-P 3 0 1 0 -70 50 -70 -50 -70 -50 N
-P 3 0 1 0 -70 250 -70 150 -70 150 N
-P 4 0 1 0 -73 -116 -93 -116 -73 -126 -73 -126 N
-P 4 0 1 0 -60 80 -80 80 -60 70 -60 70 N
-P 4 0 1 0 -60 280 -80 280 -60 270 -60 270 N
-P 4 0 1 0 30 200 70 200 70 -200 30 -200 N
-P 5 0 1 0 0 -150 -50 -140 -40 -130 -80 -120 -80 -120 N
-P 5 0 1 0 30 -150 30 -250 -70 -200 30 -150 30 -150 F
-P 6 0 1 0 0 50 -50 60 -40 70 -80 80 -80 80 -80 80 N
-P 6 0 1 0 0 250 -50 260 -40 270 -80 280 -80 280 -80 280 N
-P 6 0 1 0 30 50 30 -50 -70 0 30 50 30 50 30 50 F
-P 6 0 1 0 30 250 30 150 -70 200 30 250 30 250 30 250 F
-T 0 0 -120 25 0 0 0 B Normal 0 C C
-T 0 0 80 25 0 0 0 G Normal 0 C C
-T 0 0 280 25 0 0 0 R Normal 0 C C
-S 30 -50 30 50 0 1 0 N
-S 30 50 30 50 0 1 0 N
-S 30 150 30 250 0 1 0 N
-S 30 250 30 250 0 1 0 N
-S 100 300 -100 -300 0 1 0 f
-X ~ 1 200 0 100 L 50 50 1 1 P
-X R 2 -200 200 100 R 50 50 1 1 P
-X G 3 -200 0 100 R 50 50 1 1 P
-X B 4 -200 -200 100 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Led_Small
-#
-DEF Led_Small D 0 10 N N 1 F N
-F0 "D" -50 125 50 H V L CNN
-F1 "Led_Small" -175 -100 50 H V L CNN
-F2 "" 0 0 50 V V C CNN
-F3 "" 0 0 50 V V C CNN
-$FPLIST
- LED-*
- LED_*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -30 -40 -30 40 N
-P 4 0 1 0 30 -40 -30 0 30 40 30 -40 F
-P 5 0 1 0 0 30 -20 50 -10 50 -20 50 -20 40 N
-P 5 0 1 0 20 50 0 70 10 70 0 70 0 60 N
-X K 1 -100 0 70 R 40 40 1 1 P
-X A 2 100 0 70 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Led_x2
-#
-DEF Led_x2 D 0 0 Y Y 1 F N
-F0 "D" 0 225 50 H V C CNN
-F1 "Led_x2" 0 -250 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -180 0 -100 0 N
-P 2 0 1 0 0 -50 0 -150 N
-P 2 0 1 0 0 150 0 50 N
-P 2 0 1 0 150 -100 100 -100 N
-P 2 0 1 0 150 100 100 100 N
-P 3 0 1 0 -30 -125 -75 -165 -70 -140 N
-P 3 0 1 0 -30 75 -75 35 -70 60 N
-P 3 0 1 0 -15 -140 -60 -180 -55 -155 N
-P 3 0 1 0 -15 60 -60 20 -55 45 N
-P 3 0 1 0 100 -50 0 -100 100 -150 F
-P 3 0 1 0 100 150 0 100 100 50 F
-P 4 0 1 0 0 100 -100 100 -100 -100 0 -100 N
-C 0 0 180 0 1 0 N
-X A1 1 300 100 150 L 40 40 1 1 I
-X K 2 -300 0 120 R 40 40 1 1 I
-X A2 3 300 -100 150 L 40 40 1 1 I
-ENDDRAW
-ENDDEF
-#
-# OPTO_NPN
-#
-DEF OPTO_NPN Q 0 0 Y Y 1 F N
-F0 "Q" 150 50 50 H V L CNN
-F1 "OPTO_NPN" 150 -100 50 H V L CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 0 75 -75 N
-P 2 0 1 0 0 0 100 100 N
-P 2 0 1 0 0 100 0 -100 N
-P 5 0 1 0 -30 -50 -30 -30 -50 -50 -30 -50 -30 -50 N
-P 5 0 1 0 50 -100 100 -100 100 -50 50 -100 50 -100 N
-P 6 0 1 0 -110 10 -70 -30 -70 -10 -30 -50 -30 -50 -30 -50 N
-P 6 0 1 0 -110 80 -70 40 -70 60 -30 20 -30 20 -30 20 N
-P 6 0 1 0 -30 20 -30 40 -50 20 -30 20 -30 20 -30 20 N
-X E 1 100 -200 100 U 40 40 1 1 P
-X C 3 100 200 100 D 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# PHDARL
-#
-DEF PHDARL U 0 10 Y Y 1 F N
-F0 "U" 10 320 50 H V C CNN
-F1 "PHDARL" 10 -320 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 0 0 -350 -50 -150 -50 N
-P 2 0 0 0 -200 -100 -150 -150 N
-P 2 0 0 0 -200 -100 -100 -150 N
-P 2 0 0 0 50 150 50 -50 N
-P 2 0 0 0 150 -50 100 -100 N
-P 2 0 0 0 200 -100 250 -100 N
-P 2 0 0 0 250 0 250 -200 N
-P 2 0 0 0 250 0 250 -200 N
-P 3 0 0 0 -150 -150 -150 -150 -200 -150 N
-P 3 0 0 0 -150 -100 -100 -150 -150 -100 N
-P 3 0 0 0 50 50 150 150 350 150 N
-P 3 0 0 0 100 -100 150 -100 150 -50 N
-P 3 0 0 0 250 -100 350 0 350 150 N
-P 4 0 0 0 -350 100 -150 100 -250 -50 -350 100 N
-P 4 0 0 0 50 0 150 -100 150 -100 200 -100 N
-P 3 0 1 0 -400 -200 -250 -200 -250 -50 N
-P 3 0 1 0 -400 200 -250 200 -250 100 N
-P 3 0 1 0 250 -100 350 -200 400 -200 N
-P 3 0 1 0 350 150 350 200 400 200 N
-S -400 250 400 -250 0 1 0 N
-X ~ 1 -600 200 200 R 50 50 1 1 I
-X ~ 2 -600 -200 200 R 50 50 1 1 I
-X ~ 4 600 -200 200 L 50 50 1 1 P
-X ~ 5 600 200 200 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# PHOTORESISTOR
-#
-DEF PHOTORESISTOR U 0 0 Y Y 1 F N
-F0 "U" 10 320 50 H V C CNN
-F1 "PHOTORESISTOR" 10 -320 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 0 0 -350 -50 -150 -50 N
-P 2 0 0 0 -200 -100 -150 -150 N
-P 2 0 0 0 -200 -100 -100 -150 N
-P 3 0 0 0 -150 -150 -150 -150 -200 -150 N
-P 3 0 0 0 -150 -100 -100 -150 -150 -100 N
-P 4 0 0 0 -350 100 -150 100 -250 -50 -350 100 N
-P 2 0 1 0 250 -150 250 -150 N
-P 3 0 1 0 -400 -200 -250 -200 -250 -50 N
-P 3 0 1 0 -400 200 -250 200 -250 100 N
-P 4 0 1 0 400 -200 250 -200 250 -150 250 -150 N
-P 5 0 1 0 400 200 250 200 250 150 250 150 250 150 N
-P 10 0 1 0 250 150 220 120 270 70 220 20 270 -30 220 -80 270 -130 250 -150 250 -150 250 -150 N
-S -400 250 400 -250 0 1 0 N
-X A 1 -600 200 200 R 50 50 1 1 I
-X K 2 -600 -200 200 R 50 50 1 1 I
-X Rh 3 600 200 200 L 50 50 1 1 P
-X Rl 4 600 -200 200 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# PHTRANS
-#
-DEF PHTRANS U 0 10 Y Y 1 F N
-F0 "U" -50 350 50 H V C CNN
-F1 "PHTRANS" -50 -350 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 0 0 -250 -50 -50 -50 N
-P 2 0 0 0 -100 -100 -50 -150 N
-P 2 0 0 0 -100 -100 -50 -150 N
-P 2 0 0 0 -100 -100 0 -150 N
-P 2 0 0 0 -100 -100 0 -150 N
-P 3 0 0 0 -50 -150 -50 -150 -100 -150 N
-P 3 0 0 0 -50 -150 -50 -150 -100 -150 N
-P 3 0 0 0 -50 -100 0 -150 -50 -100 N
-P 3 0 0 0 -50 -100 0 -150 -50 -100 N
-P 2 0 1 0 200 0 200 -200 N
-P 3 0 1 0 -350 200 -150 200 -150 100 N
-P 3 0 1 0 -250 100 -50 100 -150 -50 F
-P 3 0 1 0 -150 -50 -150 -150 -350 -150 N
-P 3 0 1 0 200 -100 300 -200 350 -200 N
-P 3 0 1 0 200 -100 300 0 350 0 N
-P 3 0 1 0 300 -200 295 -150 250 -195 F
-P 4 0 1 0 200 -100 150 -100 150 200 350 200 N
-S 350 -250 -350 250 0 1 0 N
-X ~ 1 -550 200 200 R 50 50 1 1 I
-X ~ 2 -550 -150 200 R 50 50 1 1 I
-X ~ 4 550 -200 200 L 50 50 1 1 I
-X ~ 5 550 0 200 L 50 50 1 1 I
-X ~ 6 550 200 200 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# PICO7
-#
-DEF PICO7 T 0 40 Y N 1 F N
-F0 "T" -250 -350 50 H V C CNN
-F1 "PICO7" 0 550 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -20 -400 -20 400 N
-P 2 0 1 0 20 400 20 -400 N
-A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
-A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
-A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
-A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
-A -100 50 50 899 1 0 1 0 N -100 100 -50 50
-A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
-A -100 150 50 899 1 0 1 0 N -100 200 -50 150
-A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
-A 100 -350 50 899 -1799 0 1 0 N 100 -300 51 -350
-A 100 -350 50 1799 -899 0 1 0 N 51 -350 100 -399
-A 100 -250 50 899 -1799 0 1 0 N 100 -200 51 -250
-A 100 -250 50 1799 -899 0 1 0 N 51 -250 100 -299
-A 100 -150 50 899 -1799 0 1 0 N 100 -100 51 -150
-A 100 -150 50 1799 -899 0 1 0 N 51 -150 100 -199
-A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
-A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
-A 100 250 50 899 -1799 0 1 0 N 100 300 51 250
-A 100 250 50 1799 -899 0 1 0 N 51 250 100 201
-A 100 350 50 899 -1799 0 1 0 N 100 400 51 350
-A 100 350 50 1799 -899 0 1 0 N 51 350 100 301
-X SA RD 400 400 300 L 50 50 1 1 P
-X AA YE -400 200 300 R 50 50 1 1 P
-X SC WH 400 -100 300 L 50 50 1 1 P
-X SD BK 400 -400 300 L 50 50 1 1 P
-X AB BL -400 -200 300 R 50 50 1 1 P
-X ~ BR 0 -650 300 U 50 50 1 1 P
-X SB GR 400 100 300 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# POT
-#
-DEF POT RV 0 40 Y N 1 F N
-F0 "RV" 0 -80 50 H V C CNN
-F1 "POT" 0 0 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 0 0 40 -20 60 20 60 F
-S -100 40 100 -40 0 1 0 N
-X 1 1 -150 0 50 R 40 40 1 1 P
-X 2 2 0 150 100 D 40 40 1 1 P
-X 3 3 150 0 50 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Photores
-#
-DEF Photores R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "Photores" 210 0 50 V V C TNN
-F2 "" -70 0 50 V V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- R?
- R?-*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -180 90 -280 190 N
-P 2 0 1 0 -180 90 -210 90 N
-P 2 0 1 0 -180 90 -180 120 N
-P 2 0 1 0 -140 140 -240 240 N
-P 2 0 1 0 -140 140 -240 240 N
-P 2 0 1 0 -140 140 -240 240 N
-P 2 0 1 0 -140 140 -240 240 N
-P 2 0 1 0 -140 140 -240 240 N
-P 2 0 1 0 -140 140 -240 240 N
-P 2 0 1 0 -140 140 -240 240 N
-P 2 0 1 0 -140 140 -240 240 N
-P 2 0 1 0 -140 140 -170 140 N
-P 2 0 1 0 -140 140 -170 140 N
-P 2 0 1 0 -140 140 -170 140 N
-P 2 0 1 0 -140 140 -170 140 N
-P 2 0 1 0 -140 140 -170 140 N
-P 2 0 1 0 -140 140 -170 140 N
-P 2 0 1 0 -140 140 -170 140 N
-P 2 0 1 0 -140 140 -170 140 N
-P 2 0 1 0 -140 140 -140 170 N
-P 2 0 1 0 -140 140 -140 170 N
-P 2 0 1 0 -140 140 -140 170 N
-P 2 0 1 0 -140 140 -140 170 N
-P 2 0 1 0 -140 140 -140 170 N
-P 2 0 1 0 -140 140 -140 170 N
-P 2 0 1 0 -140 140 -140 170 N
-P 2 0 1 0 -140 140 -140 170 N
-S -40 150 40 -150 0 1 12 N
-C 0 0 180 0 1 0 N
-X ~ 1 0 250 100 D 50 50 1 1 P
-X ~ 2 0 -250 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# QUARTZCMS4
-#
-DEF QUARTZCMS4 X 0 40 Y N 1 F N
-F0 "X" 0 150 50 H V C CNN
-F1 "QUARTZCMS4" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -100 100 -100 -100 N
-P 2 0 1 0 100 100 100 -100 N
-P 5 0 1 0 -50 50 50 50 50 -50 -50 -50 -50 50 N
-X 1 1 -300 0 200 R 40 40 1 1 P
-X 3 3 300 0 200 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NIGBT_CEG
-#
-DEF Q_NIGBT_CEG Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NIGBT_CEG" 750 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 10 30 -40 30 -80 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 10 30 80 30 40 N
-P 2 0 1 0 100 -95 30 -60 N
-P 2 0 1 0 100 -35 30 0 N
-P 2 0 1 0 100 95 30 60 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
-P 4 0 1 0 85 75 75 95 40 65 85 75 F
-C 50 0 111 0 1 10 N
-X C 1 100 200 100 D 50 50 1 1 P
-X E 2 100 -200 100 U 50 50 1 1 P
-X G 3 -200 0 210 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Q_NIGBT_CGE
-#
-DEF Q_NIGBT_CGE Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NIGBT_CGE" 750 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 10 30 -40 30 -80 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 10 30 80 30 40 N
-P 2 0 1 0 100 -95 30 -60 N
-P 2 0 1 0 100 -35 30 0 N
-P 2 0 1 0 100 95 30 60 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
-P 4 0 1 0 85 75 75 95 40 65 85 75 F
-C 50 0 111 0 1 10 N
-X C 1 100 200 100 D 50 50 1 1 P
-X G 2 -200 0 210 R 50 50 1 1 I
-X E 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NIGBT_ECG
-#
-DEF Q_NIGBT_ECG Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NIGBT_ECG" 750 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 10 30 -40 30 -80 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 10 30 80 30 40 N
-P 2 0 1 0 100 -95 30 -60 N
-P 2 0 1 0 100 -35 30 0 N
-P 2 0 1 0 100 95 30 60 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
-P 4 0 1 0 85 75 75 95 40 65 85 75 F
-C 50 0 111 0 1 10 N
-X E 1 100 -200 100 U 50 50 1 1 P
-X C 2 100 200 100 D 50 50 1 1 P
-X G 3 -200 0 210 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Q_NIGBT_ECGC
-#
-DEF Q_NIGBT_ECGC Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NIGBT_ECGC" 700 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 10 30 -40 30 -80 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 10 30 80 30 40 N
-P 2 0 1 0 100 -95 30 -60 N
-P 2 0 1 0 100 -35 30 0 N
-P 2 0 1 0 100 95 30 60 N
-P 2 0 1 0 100 100 200 100 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
-P 4 0 1 0 85 75 75 95 40 65 85 75 F
-C 50 0 111 0 1 10 N
-X E 1 100 -200 100 U 50 50 1 1 P
-X C 2 100 200 100 D 50 50 1 1 P
-X G 3 -200 0 210 R 50 50 1 1 I
-X C 4 200 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NIGBT_EGC
-#
-DEF Q_NIGBT_EGC Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NIGBT_EGC" 750 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 10 30 -40 30 -80 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 10 30 80 30 40 N
-P 2 0 1 0 100 -95 30 -60 N
-P 2 0 1 0 100 -35 30 0 N
-P 2 0 1 0 100 95 30 60 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
-P 4 0 1 0 85 75 75 95 40 65 85 75 F
-C 50 0 111 0 1 10 N
-X E 1 100 -200 100 U 50 50 1 1 P
-X G 2 -200 0 210 R 50 50 1 1 I
-X C 3 100 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NIGBT_GCE
-#
-DEF Q_NIGBT_GCE Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NIGBT_GCE" 750 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 10 30 -40 30 -80 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 10 30 80 30 40 N
-P 2 0 1 0 100 -95 30 -60 N
-P 2 0 1 0 100 -35 30 0 N
-P 2 0 1 0 100 95 30 60 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
-P 4 0 1 0 85 75 75 95 40 65 85 75 F
-C 50 0 111 0 1 10 N
-X G 1 -200 0 210 R 50 50 1 1 I
-X C 2 100 200 100 D 50 50 1 1 P
-X E 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NIGBT_GCEC
-#
-DEF Q_NIGBT_GCEC Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NIGBT_GCEC" 700 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 10 30 -40 30 -80 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 10 30 80 30 40 N
-P 2 0 1 0 100 -95 30 -60 N
-P 2 0 1 0 100 -35 30 0 N
-P 2 0 1 0 100 95 30 60 N
-P 2 0 1 0 100 100 200 100 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
-P 4 0 1 0 85 75 75 95 40 65 85 75 F
-C 50 0 111 0 1 10 N
-X G 1 -200 0 210 R 50 50 1 1 I
-X C 2 100 200 100 D 50 50 1 1 P
-X E 3 100 -200 100 U 50 50 1 1 P
-X C 4 200 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NIGBT_GEC
-#
-DEF Q_NIGBT_GEC Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NIGBT_GEC" 750 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 10 30 -40 30 -80 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 10 30 80 30 40 N
-P 2 0 1 0 100 -95 30 -60 N
-P 2 0 1 0 100 -35 30 0 N
-P 2 0 1 0 100 95 30 60 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 85 -75 75 -95 40 -65 85 -75 F
-P 4 0 1 0 85 75 75 95 40 65 85 75 F
-C 50 0 111 0 1 10 N
-X G 1 -200 0 210 R 50 50 1 1 I
-X E 2 100 -200 100 U 50 50 1 1 P
-X C 3 100 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NJFET_DGS
-#
-DEF Q_NJFET_DGS Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NJFET_DGS" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 3 0 1 0 100 -100 100 -50 10 -50 N
-P 3 0 1 0 100 100 100 55 10 55 N
-P 4 0 1 0 0 0 -40 15 -40 -15 0 0 F
-C 50 0 111 0 1 10 N
-X D 1 100 200 100 D 50 50 1 1 P
-X G 2 -200 0 210 R 50 50 1 1 I
-X S 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NJFET_DSG
-#
-DEF Q_NJFET_DSG Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NJFET_DSG" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 3 0 1 0 100 -100 100 -50 10 -50 N
-P 3 0 1 0 100 100 100 55 10 55 N
-P 4 0 1 0 0 0 -40 15 -40 -15 0 0 F
-C 50 0 111 0 1 10 N
-X D 1 100 200 100 D 50 50 1 1 P
-X S 2 100 -200 100 U 50 50 1 1 P
-X G 3 -200 0 210 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Q_NJFET_GDS
-#
-DEF Q_NJFET_GDS Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NJFET_GDS" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 3 0 1 0 100 -100 100 -50 10 -50 N
-P 3 0 1 0 100 100 100 55 10 55 N
-P 4 0 1 0 0 0 -40 15 -40 -15 0 0 F
-C 50 0 111 0 1 10 N
-X G 1 -200 0 210 R 50 50 1 1 I
-X D 2 100 200 100 D 50 50 1 1 P
-X S 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NJFET_GSD
-#
-DEF Q_NJFET_GSD Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NJFET_GSD" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 3 0 1 0 100 -100 100 -50 10 -50 N
-P 3 0 1 0 100 100 100 55 10 55 N
-P 4 0 1 0 0 0 -40 15 -40 -15 0 0 F
-C 50 0 111 0 1 10 N
-X G 1 -200 0 210 R 50 50 1 1 I
-X S 2 100 -200 100 U 50 50 1 1 P
-X D 3 100 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NJFET_SDG
-#
-DEF Q_NJFET_SDG Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NJFET_SDG" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 3 0 1 0 100 -100 100 -50 10 -50 N
-P 3 0 1 0 100 100 100 55 10 55 N
-P 4 0 1 0 0 0 -40 15 -40 -15 0 0 F
-C 50 0 111 0 1 10 N
-X S 1 100 -200 100 U 50 50 1 1 P
-X D 2 100 200 100 D 50 50 1 1 P
-X G 3 -200 0 210 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Q_NJFET_SGD
-#
-DEF Q_NJFET_SGD Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NJFET_SGD" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 3 0 1 0 100 -100 100 -50 10 -50 N
-P 3 0 1 0 100 100 100 55 10 55 N
-P 4 0 1 0 0 0 -40 15 -40 -15 0 0 F
-C 50 0 111 0 1 10 N
-X S 1 100 -200 100 U 50 50 1 1 P
-X G 2 -200 0 210 R 50 50 1 1 I
-X D 3 100 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NMOS_DGS
-#
-DEF Q_NMOS_DGS Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NMOS_DGS" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 40 0 80 15 80 -15 40 0 F
-C 50 0 111 0 1 10 N
-X D 1 100 200 100 D 50 50 1 1 P
-X G 2 -200 0 210 R 50 50 1 1 I
-X S 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NMOS_DSG
-#
-DEF Q_NMOS_DSG Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NMOS_DSG" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 40 0 80 15 80 -15 40 0 F
-C 50 0 111 0 1 10 N
-X D 1 100 200 100 D 50 50 1 1 P
-X S 2 100 -200 100 U 50 50 1 1 P
-X G 3 -200 0 210 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Q_NMOS_GDS
-#
-DEF Q_NMOS_GDS Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NMOS_GDS" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 40 0 80 15 80 -15 40 0 F
-C 50 0 111 0 1 10 N
-X G 1 -200 0 210 R 50 50 1 1 I
-X D 2 100 200 100 D 50 50 1 1 P
-X S 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NMOS_GDSD
-#
-DEF Q_NMOS_GDSD Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NMOS_GDSD" 700 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 2 0 1 0 100 100 200 100 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 40 0 80 15 80 -15 40 0 F
-C 50 0 111 0 1 10 N
-X G 1 -200 0 210 R 50 50 1 1 I
-X D 2 100 200 100 D 50 50 1 1 P
-X S 3 100 -200 100 U 50 50 1 1 P
-X D 4 200 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NMOS_GSD
-#
-DEF Q_NMOS_GSD Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NMOS_GSD" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 40 0 80 15 80 -15 40 0 F
-C 50 0 111 0 1 10 N
-X G 1 -200 0 210 R 50 50 1 1 I
-X S 2 100 -200 100 U 50 50 1 1 P
-X D 3 100 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NMOS_SDG
-#
-DEF Q_NMOS_SDG Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NMOS_SDG" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 40 0 80 15 80 -15 40 0 F
-C 50 0 111 0 1 10 N
-X S 1 100 -200 100 U 50 50 1 1 P
-X D 2 100 200 100 D 50 50 1 1 P
-X G 3 -200 0 210 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Q_NMOS_SDGD
-#
-DEF Q_NMOS_SDGD Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NMOS_SDGD" 700 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 2 0 1 0 100 100 200 100 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 40 0 80 15 80 -15 40 0 F
-C 50 0 111 0 1 10 N
-X S 1 100 -200 100 U 50 50 1 1 P
-X D 2 100 200 100 D 50 50 1 1 P
-X G 3 -200 0 210 R 50 50 1 1 I
-X D 4 200 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NMOS_SGD
-#
-DEF Q_NMOS_SGD Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NMOS_SGD" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 40 0 80 15 80 -15 40 0 F
-C 50 0 111 0 1 10 N
-X S 1 100 -200 100 U 50 50 1 1 P
-X G 2 -200 0 210 R 50 50 1 1 I
-X D 3 100 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NPN_BCE
-#
-DEF Q_NPN_BCE Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NPN_BCE" 600 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
-C 50 0 111 0 1 10 N
-X B 1 -200 0 225 R 50 50 1 1 I
-X C 2 100 200 100 D 50 50 1 1 P
-X E 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NPN_BCEC
-#
-DEF Q_NPN_BCEC Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NPN_BCEC" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 2 0 1 0 100 100 200 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
-C 50 0 111 0 1 10 N
-X B 1 -200 0 225 R 50 50 1 1 I
-X C 2 100 200 100 D 50 50 1 1 P
-X E 3 100 -200 100 U 50 50 1 1 P
-X C 4 200 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NPN_BEC
-#
-DEF Q_NPN_BEC Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NPN_BEC" 600 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
-C 50 0 111 0 1 10 N
-X B 1 -200 0 225 R 50 50 1 1 I
-X E 2 100 -200 100 U 50 50 1 1 P
-X C 3 100 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NPN_CBE
-#
-DEF Q_NPN_CBE Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NPN_CBE" 600 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
-C 50 0 111 0 1 10 N
-X C 1 100 200 100 D 50 50 1 1 P
-X B 2 -200 0 225 R 50 50 1 1 I
-X E 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NPN_CEB
-#
-DEF Q_NPN_CEB Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NPN_CEB" 600 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
-C 50 0 111 0 1 10 N
-X C 1 100 200 100 D 50 50 1 1 P
-X E 2 100 -200 100 U 50 50 1 1 P
-X B 3 -200 0 225 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Q_NPN_EBC
-#
-DEF Q_NPN_EBC Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NPN_EBC" 600 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
-C 50 0 111 0 1 10 N
-X E 1 100 -200 100 U 50 50 1 1 P
-X B 2 -200 0 225 R 50 50 1 1 P
-X C 3 100 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NPN_ECB
-#
-DEF Q_NPN_ECB Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NPN_ECB" 600 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
-C 50 0 111 0 1 10 N
-X E 1 100 -200 100 U 50 50 1 1 P
-X C 2 100 200 100 D 50 50 1 1 P
-X B 3 -200 0 225 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_NPN_ECBC
-#
-DEF Q_NPN_ECBC Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_NPN_ECBC" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 2 0 1 0 100 100 200 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
-C 50 0 111 0 1 10 N
-X E 1 100 -200 100 U 50 50 1 1 P
-X C 2 100 200 100 D 50 50 1 1 P
-X B 3 -200 0 225 R 50 50 1 1 P
-X C 4 200 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PJFET_DGS
-#
-DEF Q_PJFET_DGS Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PJFET_DGS" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 3 0 1 0 100 -100 100 -50 10 -50 N
-P 3 0 1 0 100 100 100 55 10 55 N
-P 4 0 1 0 -45 0 -5 15 -5 -15 -45 0 F
-C 50 0 111 0 1 10 N
-X D 1 100 200 100 D 50 50 1 1 P
-X G 2 -200 0 210 R 50 50 1 1 I
-X S 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PJFET_DSG
-#
-DEF Q_PJFET_DSG Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PJFET_DSG" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 3 0 1 0 100 -100 100 -50 10 -50 N
-P 3 0 1 0 100 100 100 55 10 55 N
-P 4 0 1 0 -45 0 -5 15 -5 -15 -45 0 F
-C 50 0 111 0 1 10 N
-X D 1 100 200 100 D 50 50 1 1 P
-X S 2 100 -200 100 U 50 50 1 1 P
-X G 3 -200 0 210 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Q_PJFET_GDS
-#
-DEF Q_PJFET_GDS Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PJFET_GDS" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 3 0 1 0 100 -100 100 -50 10 -50 N
-P 3 0 1 0 100 100 100 55 10 55 N
-P 4 0 1 0 -45 0 -5 15 -5 -15 -45 0 F
-C 50 0 111 0 1 10 N
-X G 1 -200 0 210 R 50 50 1 1 I
-X D 2 100 200 100 D 50 50 1 1 P
-X S 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PJFET_GSD
-#
-DEF Q_PJFET_GSD Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PJFET_GSD" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 3 0 1 0 100 -100 100 -50 10 -50 N
-P 3 0 1 0 100 100 100 55 10 55 N
-P 4 0 1 0 -45 0 -5 15 -5 -15 -45 0 F
-C 50 0 111 0 1 10 N
-X G 1 -200 0 210 R 50 50 1 1 I
-X S 2 100 -200 100 U 50 50 1 1 P
-X D 3 100 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PJFET_SDG
-#
-DEF Q_PJFET_SDG Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PJFET_SDG" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 3 0 1 0 100 -100 100 -50 10 -50 N
-P 3 0 1 0 100 100 100 55 10 55 N
-P 4 0 1 0 -45 0 -5 15 -5 -15 -45 0 F
-C 50 0 111 0 1 10 N
-X S 1 100 -200 100 U 50 50 1 1 P
-X D 2 100 200 100 D 50 50 1 1 P
-X G 3 -200 0 210 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Q_PJFET_SGD
-#
-DEF Q_PJFET_SGD Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PJFET_SGD" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 3 0 1 0 100 -100 100 -50 10 -50 N
-P 3 0 1 0 100 100 100 55 10 55 N
-P 4 0 1 0 -45 0 -5 15 -5 -15 -45 0 F
-C 50 0 111 0 1 10 N
-X S 1 100 -200 100 U 50 50 1 1 P
-X G 2 -200 0 210 R 50 50 1 1 I
-X D 3 100 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PMOS_DGS
-#
-DEF Q_PMOS_DGS Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PMOS_DGS" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 90 0 50 -15 50 15 90 0 F
-C 50 0 111 0 1 10 N
-X D 1 100 200 100 D 50 50 1 1 P
-X G 2 -200 0 210 R 50 50 1 1 I
-X S 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PMOS_DSG
-#
-DEF Q_PMOS_DSG Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PMOS_DSG" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 90 0 50 -15 50 15 90 0 F
-C 50 0 111 0 1 10 N
-X D 1 100 200 100 D 50 50 1 1 P
-X S 2 100 -200 100 U 50 50 1 1 P
-X G 3 -200 0 210 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Q_PMOS_GDS
-#
-DEF Q_PMOS_GDS Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PMOS_GDS" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 90 0 50 -15 50 15 90 0 F
-C 50 0 111 0 1 10 N
-X G 1 -200 0 210 R 50 50 1 1 I
-X D 2 100 200 100 D 50 50 1 1 P
-X S 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PMOS_GDSD
-#
-DEF Q_PMOS_GDSD Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PMOS_GDSD" 700 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 2 0 1 0 200 100 100 100 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 90 0 50 -15 50 15 90 0 F
-C 50 0 111 0 1 10 N
-X G 1 -200 0 210 R 50 50 1 1 I
-X D 2 100 200 100 D 50 50 1 1 P
-X S 3 100 -200 100 U 50 50 1 1 P
-X D 4 200 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PMOS_GSD
-#
-DEF Q_PMOS_GSD Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PMOS_GSD" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 90 0 50 -15 50 15 90 0 F
-C 50 0 111 0 1 10 N
-X G 1 -200 0 210 R 50 50 1 1 I
-X S 2 100 -200 100 U 50 50 1 1 P
-X D 3 100 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PMOS_SDG
-#
-DEF Q_PMOS_SDG Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PMOS_SDG" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 90 0 50 -15 50 15 90 0 F
-C 50 0 111 0 1 10 N
-X S 1 100 -200 100 U 50 50 1 1 P
-X D 2 100 200 100 D 50 50 1 1 P
-X G 3 -200 0 210 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Q_PMOS_SDGD
-#
-DEF Q_PMOS_SDGD Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PMOS_SDGD" 700 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 2 0 1 0 200 100 100 100 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 90 0 50 -15 50 15 90 0 F
-C 50 0 111 0 1 10 N
-X S 1 100 -200 100 U 50 50 1 1 P
-X D 2 100 200 100 D 50 50 1 1 P
-X G 3 -200 0 210 R 50 50 1 1 I
-X D 4 200 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PMOS_SGD
-#
-DEF Q_PMOS_SGD Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PMOS_SGD" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 90 0 50 -15 50 15 90 0 F
-C 50 0 111 0 1 10 N
-X S 1 100 -200 100 U 50 50 1 1 P
-X G 2 -200 0 210 R 50 50 1 1 I
-X D 3 100 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PNP_BCE
-#
-DEF Q_PNP_BCE Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PNP_BCE" 600 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
-C 50 0 111 0 1 10 N
-X B 1 -200 0 225 R 50 50 1 1 I
-X C 2 100 200 100 D 50 50 1 1 P
-X E 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PNP_BCEC
-#
-DEF Q_PNP_BCEC Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PNP_BCEC" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 2 0 1 0 200 100 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
-C 50 0 111 0 1 10 N
-X B 1 -200 0 225 R 50 50 1 1 I
-X C 2 100 200 100 D 50 50 1 1 P
-X E 3 100 -200 100 U 50 50 1 1 P
-X C 4 200 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PNP_BEC
-#
-DEF Q_PNP_BEC Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PNP_BEC" 600 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
-C 50 0 111 0 1 10 N
-X B 1 -200 0 225 R 50 50 1 1 I
-X E 2 100 -200 100 U 50 50 1 1 P
-X C 3 100 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PNP_CBE
-#
-DEF Q_PNP_CBE Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PNP_CBE" 600 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
-C 50 0 111 0 1 10 N
-X C 1 100 200 100 D 50 50 1 1 P
-X B 2 -200 0 225 R 50 50 1 1 I
-X E 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PNP_CEB
-#
-DEF Q_PNP_CEB Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PNP_CEB" 600 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
-C 50 0 111 0 1 10 N
-X C 1 100 200 100 D 50 50 1 1 P
-X E 2 100 -200 100 U 50 50 1 1 P
-X B 3 -200 0 225 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Q_PNP_EBC
-#
-DEF Q_PNP_EBC Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PNP_EBC" 600 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
-C 50 0 111 0 1 10 N
-X E 1 100 -200 100 U 50 50 1 1 P
-X B 2 -200 0 225 R 50 50 1 1 I
-X C 3 100 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Q_PNP_ECB
-#
-DEF Q_PNP_ECB Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PNP_ECB" 600 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
-C 50 0 111 0 1 10 N
-X E 1 100 -200 100 U 50 50 1 1 P
-X C 2 100 200 100 D 50 50 1 1 P
-X B 3 -200 0 225 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Q_PNP_ECBC
-#
-DEF Q_PNP_ECBC Q 0 0 Y N 1 F N
-F0 "Q" 300 50 50 H V R CNN
-F1 "Q_PNP_ECBC" 650 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 25 25 100 100 N
-P 2 0 1 0 200 100 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 90 -70 70 -90 50 -50 90 -70 90 -70 F
-C 50 0 111 0 1 10 N
-X E 1 100 -200 100 U 50 50 1 1 P
-X C 2 100 200 100 D 50 50 1 1 P
-X B 3 -200 0 225 R 50 50 1 1 I
-X C 4 200 200 100 D 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# R
-#
-DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
-F2 "" -70 0 50 V V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- R_*
- Resistor_*
-$ENDFPLIST
-DRAW
-S -40 -100 40 100 0 1 10 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# RELAY_2RT
-#
-DEF RELAY_2RT K 0 40 Y N 1 F N
-F0 "K" -50 400 50 H V C CNN
-F1 "RELAY_2RT" 150 -500 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -100 -350 -90 -350 N
-P 2 0 1 0 -100 -250 -50 -250 N
-P 2 0 1 0 -100 -50 50 -50 N
-P 2 0 1 0 -90 -350 -70 -369 N
-P 2 0 1 0 -90 -319 -90 -300 N
-P 2 0 1 0 -80 -330 -90 -319 N
-P 2 0 1 0 -80 -290 -90 -300 N
-P 2 0 1 0 -70 -369 -50 -369 N
-P 2 0 1 0 -50 -410 -50 -209 N
-P 2 0 1 0 -50 -330 -80 -330 N
-P 2 0 1 0 -50 -330 0 -330 N
-P 2 0 1 0 -50 -290 -80 -290 N
-P 2 0 1 0 -50 -250 0 -250 N
-P 2 0 1 0 -50 -209 0 -209 N
-P 2 0 1 0 0 -410 -50 -410 N
-P 2 0 1 0 0 -369 -50 -369 N
-P 2 0 1 0 0 -369 29 -369 N
-P 2 0 1 0 0 -330 29 -330 N
-P 2 0 1 0 0 -290 -50 -290 N
-P 2 0 1 0 0 -290 29 -290 N
-P 2 0 1 0 0 -250 29 -250 N
-P 2 0 1 0 0 -209 0 -410 N
-P 2 0 1 0 10 -119 89 -119 N
-P 2 0 1 0 10 -9 89 -9 N
-P 2 0 1 0 10 180 50 221 N
-P 2 0 1 0 10 290 39 290 N
-P 2 0 1 0 29 -369 39 -360 N
-P 2 0 1 0 29 -330 39 -340 N
-P 2 0 1 0 29 -290 39 -280 N
-P 2 0 1 0 29 -250 39 -259 N
-P 2 0 1 0 39 -360 39 -340 N
-P 2 0 1 0 39 -259 39 -280 N
-P 2 0 1 0 39 261 10 290 N
-P 2 0 1 0 39 261 50 250 N
-P 2 0 1 0 39 290 89 290 N
-P 2 0 1 0 50 -150 50 -130 N
-P 2 0 1 0 50 -130 50 -119 N
-P 2 0 1 0 50 -80 10 -119 N
-P 2 0 1 0 50 -50 10 -9 N
-P 2 0 1 0 50 -50 100 -50 N
-P 2 0 1 0 50 50 50 -9 N
-P 2 0 1 0 50 50 100 50 N
-P 2 0 1 0 50 150 50 180 N
-P 2 0 1 0 50 150 100 150 N
-P 2 0 1 0 50 221 89 180 N
-P 2 0 1 0 50 250 -100 250 N
-P 2 0 1 0 50 250 60 250 N
-P 2 0 1 0 50 350 50 290 N
-P 2 0 1 0 50 350 100 350 N
-P 2 0 1 0 60 250 100 250 N
-P 2 0 1 0 89 -119 50 -80 N
-P 2 0 1 0 89 -9 50 -50 N
-P 2 0 1 0 89 180 10 180 N
-P 2 0 1 0 89 290 50 250 N
-P 2 0 1 0 100 -150 50 -150 N
-X T1 1 400 -150 300 L 50 50 1 1 P
-X R1 3 400 50 300 L 50 50 1 1 P
-X C1 5 -400 -50 300 R 50 50 1 1 P
-X 8 8 -400 -250 300 R 50 50 1 1 I
-X 9 9 -400 -350 300 R 50 50 1 1 I
-X C2 12 -400 250 300 R 50 50 1 1 P
-X R2 14 400 350 300 L 50 50 1 1 P
-X T2 16 400 150 300 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# RR8
-#
-DEF RR8 RR 0 40 Y N 1 F N
-F0 "RR" 50 550 50 H V C CNN
-F1 "RR8" 30 0 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 -50 -400 -50 500 50 500 100 450 100 -400 -50 -400 N
-X COM 1 -350 450 300 R 50 50 1 1 P I
-X 2 2 -350 350 300 R 50 50 1 1 P I
-X 3 3 -350 250 300 R 50 50 1 1 P I
-X 4 4 -350 150 300 R 50 50 1 1 P I
-X 5 5 -350 50 300 R 50 50 1 1 P I
-X 6 6 -350 -50 300 R 50 50 1 1 P I
-X 7 7 -350 -150 300 R 50 50 1 1 P I
-X 8 8 -350 -250 300 R 50 50 1 1 P I
-X 9 9 -350 -350 300 R 50 50 1 1 P I
-ENDDRAW
-ENDDEF
-#
-# RR9
-#
-DEF RR9 RR 0 40 Y N 1 F N
-F0 "RR" 50 600 50 H V C CNN
-F1 "RR9" 30 0 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 -50 -450 -50 550 50 550 100 500 100 -450 -50 -450 N
-X COM 1 -350 500 300 R 50 50 1 1 P I
-X 2 2 -350 400 300 R 50 50 1 1 P I
-X 3 3 -350 300 300 R 50 50 1 1 P I
-X 4 4 -350 200 300 R 50 50 1 1 P I
-X 5 5 -350 100 300 R 50 50 1 1 P I
-X 6 6 -350 0 300 R 50 50 1 1 P I
-X 7 7 -350 -100 300 R 50 50 1 1 P I
-X 8 8 -350 -200 300 R 50 50 1 1 P I
-X 9 9 -350 -300 300 R 50 50 1 1 P I
-X 10 10 -350 -400 300 R 50 50 1 1 P I
-ENDDRAW
-ENDDEF
-#
-# RVAR
-#
-DEF RVAR R 0 0 N Y 1 F N
-F0 "R" 80 -50 50 V V C CNN
-F1 "RVAR" -80 60 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -70 -120 80 120 N
-P 3 0 1 0 80 90 80 120 50 110 F
-S -40 150 40 -150 0 1 0 N
-X ~ 1 0 250 100 D 50 50 1 1 P
-X ~ 2 0 -250 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# R_PACK4
-#
-DEF R_PACK4 RP 0 20 Y N 1 F N
-F0 "RP" 0 450 50 H V C CNN
-F1 "R_PACK4" 0 -50 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 5 0 1 0 -100 400 -100 0 100 0 100 400 -100 400 N
-P 7 0 1 0 -100 50 -80 70 -40 30 0 70 40 30 80 70 100 50 N
-P 7 0 1 0 -100 150 -80 170 -40 130 0 170 40 130 80 170 100 150 N
-P 7 0 1 0 -100 250 -80 270 -40 230 0 270 40 230 80 270 100 250 N
-P 7 0 1 0 -100 350 -80 370 -40 330 0 370 40 330 80 370 100 350 N
-X P1 1 -200 350 100 R 40 40 1 1 P
-X P2 2 -200 250 100 R 40 40 1 1 P
-X P3 3 -200 150 100 R 40 40 1 1 P
-X P4 4 -200 50 100 R 40 40 1 1 P
-X R4 5 200 50 100 L 40 40 1 1 P
-X R3 6 200 150 100 L 40 40 1 1 P
-X R2 7 200 250 100 L 40 40 1 1 P
-X R1 8 200 350 100 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# R_PACK8
-#
-DEF R_PACK8 RP 0 20 Y N 1 F N
-F0 "RP" 0 450 50 H V C CNN
-F1 "R_PACK8" 0 -450 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 7 0 1 0 -100 -350 -80 -330 -40 -370 0 -330 40 -370 80 -330 100 -350 N
-P 7 0 1 0 -100 -250 -80 -230 -40 -270 0 -230 40 -270 80 -230 100 -250 N
-P 7 0 1 0 -100 -150 -80 -130 -40 -170 0 -130 40 -170 80 -130 100 -150 N
-P 7 0 1 0 -100 -50 -80 -30 -40 -70 0 -30 40 -70 80 -30 100 -50 N
-P 7 0 1 0 -100 50 -80 70 -40 30 0 70 40 30 80 70 100 50 N
-P 7 0 1 0 -100 150 -80 170 -40 130 0 170 40 130 80 170 100 150 N
-P 7 0 1 0 -100 250 -80 270 -40 230 0 270 40 230 80 270 100 250 N
-P 7 0 1 0 -100 350 -80 370 -40 330 0 370 40 330 80 370 100 350 N
-S -100 400 100 -400 0 1 0 N
-X P1 1 -200 350 100 R 40 40 1 1 P
-X P2 2 -200 250 100 R 40 40 1 1 P
-X P3 3 -200 150 100 R 40 40 1 1 P
-X P4 4 -200 50 100 R 40 40 1 1 P
-X P5 5 -200 -50 100 R 40 40 1 1 P
-X P6 6 -200 -150 100 R 40 40 1 1 P
-X P7 7 -200 -250 100 R 40 40 1 1 P
-X P8 8 -200 -350 100 R 40 40 1 1 P
-X R8 9 200 -350 100 L 40 40 1 1 P
-X R7 10 200 -250 100 L 40 40 1 1 P
-X R6 11 200 -150 100 L 40 40 1 1 P
-X R5 12 200 -50 100 L 40 40 1 1 P
-X R4 13 200 50 100 L 40 40 1 1 P
-X R3 14 200 150 100 L 40 40 1 1 P
-X R2 15 200 250 100 L 40 40 1 1 P
-X R1 16 200 350 100 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# R_Small
-#
-DEF R_Small R 0 10 N N 1 F N
-F0 "R" 30 20 50 H V L CNN
-F1 "R_Small" 30 -40 50 H V L CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- Resistor_*
- R_*
-$ENDFPLIST
-DRAW
-S -30 70 30 -70 0 1 8 N
-X ~ 1 0 100 30 D 40 40 1 1 P
-X ~ 2 0 -100 30 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# SCHDPAK
-#
-DEF SCHDPAK D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "SCHDPAK" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 100 0 50 0 N
-P 2 0 1 0 100 50 100 -50 N
-P 3 0 1 0 50 50 -50 0 50 -50 F
-P 6 0 1 0 -75 25 -75 50 -50 50 -50 -50 -25 -50 -25 -25 N
-X A 1 200 -50 100 L 40 40 1 1 P
-X K 2 -200 0 150 R 40 40 1 1 P
-X A 3 200 50 100 L 40 40 1 1 I
-ENDDRAW
-ENDDEF
-#
-# SCR
-#
-DEF SCR U 0 10 Y N 1 F N
-F0 "U" 150 250 50 H V C CNN
-F1 "SCR" 150 -350 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 0 0 -200 -150 200 -150 N
-P 2 0 1 0 0 -150 -200 -400 N
-P 3 0 1 0 -150 100 150 100 0 -150 F
-X K 1 0 -550 400 U 50 50 1 1 I
-X G 2 -350 -400 150 R 50 50 1 1 I
-X A 3 0 400 300 D 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# SP3T
-#
-DEF SP3T SW 0 0 N Y 1 F N
-F0 "SW" -100 150 50 H V C CNN
-F1 "SP3T" -100 -100 50 H V C CNN
-F2 "" -625 175 50 H V C CNN
-F3 "" -625 175 50 H V C CNN
-$FPLIST
- SW*
- SP3T*
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -100 0 100 100 N
-C -125 0 25 0 1 0 N
-C 125 -100 25 0 1 0 N
-C 125 0 25 0 1 0 N
-C 125 100 25 0 1 0 N
-X 1 1 300 100 150 L 50 50 1 1 P
-X 2 2 300 0 150 L 50 50 1 1 P
-X 3 3 -300 0 150 R 50 50 1 1 P
-X 4 4 300 -100 150 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# SPEAKER
-#
-DEF SPEAKER SP 0 0 N Y 1 F N
-F0 "SP" -100 250 50 H V C CNN
-F1 "SPEAKER" -100 -250 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 4 0 0 0 100 150 250 300 250 -300 100 -150 N
-P 5 0 0 0 -100 150 100 150 100 -150 -100 -150 -100 150 F
-X 1 1 -300 100 200 R 40 40 1 1 I
-X 2 2 -300 -100 200 R 40 40 1 1 I
-ENDDRAW
-ENDDEF
-#
-# SPST
-#
-DEF SPST SW 0 0 N Y 1 F N
-F0 "SW" 0 100 50 H V C CNN
-F1 "SPST" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 0 0 -100 0 100 100 N
-C -150 0 50 0 0 0 N
-C 150 0 50 0 0 0 N
-X 1 1 -500 0 300 R 50 50 1 1 I
-X 2 2 500 0 300 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# SWITCH_INV
-#
-DEF SWITCH_INV SW 0 0 N Y 1 F N
-F0 "SW" -200 150 50 H V C CNN
-F1 "SWITCH_INV" -150 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -100 0 150 50 N
-C -150 0 50 0 0 0 N
-C 150 -100 50 0 0 0 N
-C 150 100 50 0 1 0 N
-X 1 1 500 100 300 L 50 50 1 1 P
-X 2 2 -500 0 300 R 50 50 1 1 P
-X 3 3 500 -100 300 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# SWITCH_INV_MSM
-#
-DEF SWITCH_INV_MSM SW 0 0 N Y 1 F N
-F0 "SW" -199 150 50 H V C CNN
-F1 "SWITCH_INV_MSM" -250 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 5 0 1 0 -100 0 120 0 120 0 120 0 120 0 N
-C -150 0 50 0 0 0 N
-C 150 -100 50 0 0 0 N
-C 150 100 50 0 1 0 N
-C 170 0 40 0 1 0 N
-X 1 1 500 100 300 L 50 50 1 1 P
-X 2 2 -500 0 300 R 50 50 1 1 P
-X 3 3 500 -100 300 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# SW_PUSH
-#
-DEF SW_PUSH SW 0 40 N N 1 F N
-F0 "SW" 150 110 50 H V C CNN
-F1 "SW_PUSH" 0 -80 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 4 0 1 0 -40 60 -30 90 30 90 40 60 N
-S -170 50 170 60 0 1 0 N
-X 1 1 -300 0 200 R 50 50 0 1 P I
-X 2 2 300 0 200 L 50 50 0 1 P I
-ENDDRAW
-ENDDEF
-#
-# SW_PUSH_SMALL
-#
-DEF SW_PUSH_SMALL SW 0 40 N N 1 F N
-F0 "SW" 150 110 50 H V C CNN
-F1 "SW_PUSH_SMALL" 0 -79 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 0 -100 100 -60 60 -60 60 N
-P 4 0 1 0 60 -60 100 -100 100 -100 100 -100 N
-P 6 0 1 0 -10 60 10 70 70 10 60 -10 60 -10 60 -10 N
-P 7 0 1 0 -50 80 80 -50 90 -40 -40 90 -50 80 -50 80 -50 80 N
-C -60 60 10 0 1 0 N
-C 60 -60 10 0 1 0 N
-X 1 1 -100 100 0 R 50 50 0 1 P
-X 2 2 100 -100 0 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# Switch_DPST
-#
-DEF Switch_DPST SW 0 0 N Y 1 F N
-F0 "SW" 300 50 50 H V C CNN
-F1 "Switch_DPST" 300 -50 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 0 0 -100 -200 100 -100 N
-P 2 0 0 0 -100 200 100 300 N
-P 2 0 0 0 0 250 0 -150 N
-C -150 -200 50 0 0 0 N
-C -150 200 50 0 0 0 N
-C 150 -200 50 0 0 0 N
-C 150 200 50 0 0 0 N
-X 1 1 -300 -200 100 R 50 50 1 1 I
-X 2 2 300 -200 100 L 50 50 1 1 I
-X 3 3 -300 200 100 R 50 50 1 1 I
-X 4 4 300 200 100 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Switch_SPDT_x2
-#
-DEF Switch_SPDT_x2 SW 0 0 Y Y 2 F N
-F0 "SW" -200 150 50 H V C CNN
-F1 "Switch_SPDT_x2" -250 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -100 0 150 50 N
-C -150 0 50 0 0 0 N
-C 150 -100 50 0 0 0 N
-C 150 100 50 0 1 0 N
-X A 1 300 100 100 L 50 50 1 1 P
-X B 2 -300 0 100 R 50 50 1 1 P
-X C 3 300 -100 100 L 50 50 1 1 P
-X A 4 300 100 100 L 50 50 2 1 P
-X B 5 -300 0 100 R 50 50 2 1 P
-X C 6 300 -100 100 L 50 50 2 1 P
-ENDDRAW
-ENDDEF
-#
-# TEMPLATE
-#
-DEF TEMPLATE J 0 40 N N 1 F N
-F0 "J" 160 210 50 H V L BNN
-F1 "TEMPLATE" 150 100 50 H V L BNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-S 0 100 100 120 0 1 0 F
-S 90 210 10 120 0 1 0 F
-X ~ 1 0 0 100 U 50 50 1 1 U
-X ~ 2 100 0 100 U 50 50 1 1 U
-ENDDRAW
-ENDDEF
-#
-# THERMISTOR
-#
-DEF THERMISTOR TH 0 0 N Y 1 F N
-F0 "TH" 100 50 50 V V C CNN
-F1 "THERMISTOR" -100 0 50 V V C BNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- R?
- SM0603
- SM0805
-$ENDFPLIST
-DRAW
-P 5 0 1 0 -75 125 -75 75 75 -75 75 -125 75 -125 N
-T 900 75 -150 60 0 0 1 - Normal 0 C C
-S -40 150 40 -150 0 1 8 N
-X ~ 1 0 250 100 D 50 50 1 1 P
-X ~ 2 0 -250 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# THYRISTOR
-#
-DEF THYRISTOR T 0 40 N N 1 F N
-F0 "T" 0 100 50 H V C CNN
-F1 "THYRISTOR" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -50 50 -50 -50 N
-P 3 0 1 0 50 50 -50 0 50 -50 F
-P 4 0 1 0 -50 0 -100 50 -100 50 -100 50 N
-X A A 200 0 150 L 50 50 1 1 P
-X G G -100 100 50 D 50 50 1 1 P
-X K K -200 0 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# TR1-SO8
-#
-DEF TR1-SO8 T 0 40 Y N 1 F N
-F0 "T" 0 250 50 H V C CNN
-F1 "TR1-SO8" 0 -300 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-ALIAS TRANSFO-SO8
-DRAW
-P 2 0 1 0 -25 200 -25 -200 N
-P 2 0 1 0 25 -200 25 200 N
-A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
-A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
-A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
-A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
-A -100 50 50 899 1 0 1 0 N -100 100 -50 50
-A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
-A -100 150 50 899 1 0 1 0 N -100 200 -50 150
-A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
-A 100 -50 50 899 -1799 0 1 0 N 100 0 51 -50
-A 100 -50 50 1799 -899 0 1 0 N 51 -50 100 -99
-A 100 50 50 899 -1799 0 1 0 N 100 100 51 50
-A 100 50 50 1799 -899 0 1 0 N 51 50 100 1
-A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
-A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
-A 101 -150 50 910 -1799 0 1 0 N 101 -100 52 -150
-A 101 -150 50 -912 -1799 0 1 0 N 101 -199 52 -150
-X AA 1 -300 200 200 R 50 50 1 1 P
-X AB 4 -300 -200 200 R 50 50 1 1 P
-X SA 5 300 -200 200 L 50 50 1 1 P
-X SB 8 300 200 200 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# TRANSFO
-#
-DEF TRANSFO T 0 40 Y N 1 F N
-F0 "T" 0 250 50 H V C CNN
-F1 "TRANSFO" 0 -300 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -25 200 -25 -200 N
-P 2 0 1 0 25 -200 25 200 N
-A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
-A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
-A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
-A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
-A -100 50 50 899 1 0 1 0 N -100 100 -50 50
-A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
-A -100 150 50 899 1 0 1 0 N -100 200 -50 150
-A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
-A 100 -50 50 899 -1799 0 1 0 N 100 0 51 -50
-A 100 -50 50 1799 -899 0 1 0 N 51 -50 100 -99
-A 100 50 50 899 -1799 0 1 0 N 100 100 51 50
-A 100 50 50 1799 -899 0 1 0 N 51 50 100 1
-A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
-A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
-A 101 -150 50 910 -1799 0 1 0 N 101 -100 52 -150
-A 101 -150 50 -912 -1799 0 1 0 N 101 -199 52 -150
-X AA 1 -400 200 300 R 50 50 1 1 P
-X AB 2 -400 -200 300 R 50 50 1 1 P
-X SA 3 400 -200 300 L 50 50 1 1 P
-X SB 4 400 200 300 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# TRANSFO-AUDIO
-#
-DEF TRANSFO-AUDIO T 0 40 Y N 1 F N
-F0 "T" 0 460 50 H V C CNN
-F1 "TRANSFO-AUDIO" 10 370 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -25 200 -25 -200 N
-P 2 0 1 0 25 -200 25 200 N
-P 9 0 1 0 -150 250 -100 300 100 300 150 250 150 -250 100 -300 -100 -300 -150 -250 -150 250 N
-A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
-A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
-A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
-A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
-A -100 50 50 899 1 0 1 0 N -100 100 -50 50
-A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
-A -100 150 50 899 1 0 1 0 N -100 200 -50 150
-A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
-A 100 -50 50 899 -1799 0 1 0 N 100 0 51 -50
-A 100 -50 50 1799 -899 0 1 0 N 51 -50 100 -99
-A 100 50 50 899 -1799 0 1 0 N 100 100 51 50
-A 100 50 50 1799 -899 0 1 0 N 51 50 100 1
-A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
-A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
-A 101 -150 50 910 -1799 0 1 0 N 101 -100 52 -150
-A 101 -150 50 -912 -1799 0 1 0 N 101 -199 52 -150
-X ~ 0 0 -400 100 U 50 50 1 1 I
-X AA 1 -400 200 300 R 50 50 1 1 P
-X AB 2 -400 -200 300 R 50 50 1 1 P
-X SA 3 400 -200 300 L 50 50 1 1 P
-X SB 4 400 200 300 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# TRANSFO2
-#
-DEF TRANSFO2 T 0 40 Y N 1 F N
-F0 "T" 0 500 50 H V C CNN
-F1 "TRANSFO2" 0 -500 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -20 -400 -20 400 N
-P 2 0 1 0 20 400 20 -400 N
-A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
-A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
-A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
-A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
-A -100 50 50 899 1 0 1 0 N -100 100 -50 50
-A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
-A -100 150 50 899 1 0 1 0 N -100 200 -50 150
-A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
-A 100 -350 50 899 -1799 0 1 0 N 100 -300 51 -350
-A 100 -350 50 1799 -899 0 1 0 N 51 -350 100 -399
-A 100 -250 50 899 -1799 0 1 0 N 100 -200 51 -250
-A 100 -250 50 1799 -899 0 1 0 N 51 -250 100 -299
-A 100 -150 50 899 -1799 0 1 0 N 100 -100 51 -150
-A 100 -150 50 1799 -899 0 1 0 N 51 -150 100 -199
-A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
-A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
-A 100 250 50 899 -1799 0 1 0 N 100 300 51 250
-A 100 250 50 1799 -899 0 1 0 N 51 250 100 201
-A 100 350 50 899 -1799 0 1 0 N 100 400 51 350
-A 100 350 50 1799 -899 0 1 0 N 51 350 100 301
-X AA 1 -400 200 300 R 50 50 1 1 P
-X AB 2 -400 -200 300 R 50 50 1 1 P
-X SA 3 400 400 300 L 50 50 1 1 P
-X SB 4 400 100 300 L 50 50 1 1 P
-X SC 5 400 -100 300 L 50 50 1 1 P
-X SD 6 400 -400 300 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# TRANSFO4
-#
-DEF TRANSFO4 T 0 40 Y N 1 F N
-F0 "T" 0 250 50 H V C CNN
-F1 "TRANSFO4" 0 -300 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -25 200 -25 -200 N
-P 2 0 1 0 25 -200 25 200 N
-A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
-A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
-A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
-A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
-A -100 50 50 899 1 0 1 0 N -100 100 -50 50
-A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
-A -100 150 50 899 1 0 1 0 N -100 200 -50 150
-A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
-A 100 -50 50 899 -1799 0 1 0 N 100 0 51 -50
-A 100 -50 50 1799 -899 0 1 0 N 51 -50 100 -99
-A 100 50 50 899 -1799 0 1 0 N 100 100 51 50
-A 100 50 50 1799 -899 0 1 0 N 51 50 100 1
-A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
-A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
-A 101 -150 50 910 -1799 0 1 0 N 101 -100 52 -150
-A 101 -150 50 -912 -1799 0 1 0 N 101 -199 52 -150
-X PR1 1 -400 200 300 R 50 50 1 1 P
-X PM 2 -400 0 300 R 50 50 1 1 P
-X PR2 3 -400 -200 300 R 50 50 1 1 P
-X S1 4 400 -200 300 L 50 50 1 1 P
-X S2 5 400 200 300 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# TRANSFO_3
-#
-DEF TRANSFO_3 T 0 40 Y N 1 F N
-F0 "T" 0 500 50 H V C CNN
-F1 "TRANSFO_3" 0 -500 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -20 -400 -20 400 N
-P 2 0 1 0 20 400 20 -400 N
-A -100 -150 50 899 1 0 1 0 N -100 -100 -50 -150
-A -100 -150 50 -1 -899 0 1 0 N -50 -150 -100 -199
-A -100 -50 50 899 1 0 1 0 N -100 0 -50 -50
-A -100 -50 50 -1 -899 0 1 0 N -50 -50 -100 -99
-A -100 50 50 899 1 0 1 0 N -100 100 -50 50
-A -100 50 50 -1 -899 0 1 0 N -50 50 -100 1
-A -100 150 50 899 1 0 1 0 N -100 200 -50 150
-A -100 150 50 -1 -899 0 1 0 N -50 150 -100 101
-A 100 -350 50 899 -1799 0 1 0 N 100 -300 51 -350
-A 100 -350 50 1799 -899 0 1 0 N 51 -350 100 -399
-A 100 -250 50 899 -1799 0 1 0 N 100 -200 51 -250
-A 100 -250 50 1799 -899 0 1 0 N 51 -250 100 -299
-A 100 -150 50 899 -1799 0 1 0 N 100 -100 51 -150
-A 100 -150 50 1799 -899 0 1 0 N 51 -150 100 -199
-A 100 150 50 899 -1799 0 1 0 N 100 200 51 150
-A 100 150 50 1799 -899 0 1 0 N 51 150 100 101
-A 100 250 50 899 -1799 0 1 0 N 100 300 51 250
-A 100 250 50 1799 -899 0 1 0 N 51 250 100 201
-A 100 350 50 899 -1799 0 1 0 N 100 400 51 350
-A 100 350 50 1799 -899 0 1 0 N 51 350 100 301
-X IN+ 1 -400 200 300 R 50 50 1 1 P
-X PM 2 -400 0 300 R 50 50 1 1 P
-X IN- 3 -400 -200 300 R 50 50 1 1 P
-X OUT1A 4 400 400 300 L 50 50 1 1 P
-X OUT1B 5 400 100 300 L 50 50 1 1 P
-X OUT2A 6 400 -100 300 L 50 50 1 1 P
-X OUT2B 7 400 -400 300 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# TRIAC
-#
-DEF TRIAC U 0 10 Y Y 1 F N
-F0 "U" -250 350 50 H V C CNN
-F1 "TRIAC" -300 -250 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -300 -50 0 -50 N
-P 2 0 1 0 -150 -50 -300 -200 N
-P 2 0 1 0 0 200 300 200 N
-P 3 0 1 0 -300 200 -150 -50 0 200 F
-P 3 0 1 0 150 200 0 -50 300 -50 F
-X ~ 1 0 -250 200 U 50 50 1 1 P
-X ~ 2 0 400 200 D 50 50 1 1 P
-X ~ 3 -500 -200 200 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# TST
-#
-DEF TST P 0 40 N N 1 F N
-F0 "P" 0 300 50 H V C BNN
-F1 "TST" 0 250 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 200 -50 150 0 100 50 150 0 200 0 200 N
-X ~ 1 0 0 100 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# TVS
-#
-DEF TVS D 0 40 Y Y 1 F N
-F0 "D" 0 150 50 H V C CNN
-F1 "TVS" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 12 0 50 0 -50 N
-P 4 0 1 0 -100 50 -100 -50 0 0 -100 50 F
-P 4 0 1 0 0 0 100 50 100 -50 0 0 F
-X ~ 1 -300 0 300 R 50 50 1 1 P
-X ~ 2 300 0 300 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# VARICAP
-#
-DEF VARICAP D 0 40 Y N 1 F N
-F0 "D" 0 130 50 H V C CNN
-F1 "VARICAP" 0 -120 50 H V C TNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -150 0 -61 0 N
-P 2 0 1 0 -120 -100 70 70 N
-P 2 0 1 0 50 -90 50 90 N
-P 2 0 1 0 109 0 150 0 N
-P 2 0 1 0 110 -90 110 90 N
-P 3 0 1 0 -60 90 -60 -90 50 0 F
-P 3 0 1 0 90 90 50 90 85 50 F
-X ANODE 1 -250 0 100 R 50 50 1 1 P
-X CATHODE 2 250 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# VR
-#
-DEF VR VR 0 0 N Y 1 F N
-F0 "VR" 60 -46 50 V V C TNN
-F1 "VR" 0 0 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 5 0 1 0 -60 -100 -60 -60 60 60 60 100 60 100 N
-S -40 150 40 -150 0 1 0 N
-X ~ 1 0 250 100 D 50 50 1 1 P
-X ~ 2 0 -250 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# ZENER
-#
-DEF ZENER D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "ZENER" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- D?
- SO*
- SM*
-$ENDFPLIST
-DRAW
-P 5 0 1 8 -70 50 -50 30 -50 -30 -30 -50 -30 -50 N
-P 5 0 1 0 -50 0 50 50 50 -50 -50 0 -50 0 F
-X K 1 -200 0 150 R 50 50 1 1 P
-X A 2 200 0 150 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# ZENERsmall
-#
-DEF ZENERsmall D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "ZENERsmall" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- D?
- SO*
- SM*
-$ENDFPLIST
-DRAW
-P 4 0 1 8 -60 40 -40 20 -40 -20 -20 -40 N
-P 4 0 1 0 40 40 -40 0 40 -40 40 40 F
-X K 1 -100 0 60 R 40 40 1 1 P
-X A 2 100 0 60 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/demos/sim/diodes.lib b/demos/sim/diodes.lib
deleted file mode 100644
index 3f277af53f..0000000000
--- a/demos/sim/diodes.lib
+++ /dev/null
@@ -1,6 +0,0 @@
-* Copyright © 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Linear Technology Corporation.   All rights reserved.
-*
-* Mike Engelhardt
-*
-.model 1N914 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75)
-.model 1N4148 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75)
\ No newline at end of file
diff --git a/demos/sim/power.dcm b/demos/sim/power.dcm
deleted file mode 100644
index 58f6869757..0000000000
--- a/demos/sim/power.dcm
+++ /dev/null
@@ -1,234 +0,0 @@
-EESchema-DOCLIB  Version 2.0
-#
-$CMP +12C
-K POWER, PWR
-$ENDCMP
-#
-$CMP +12L
-K POWER, PWR
-$ENDCMP
-#
-$CMP +12LF
-K POWER, PWR
-$ENDCMP
-#
-$CMP +12P
-K POWER, PWR
-$ENDCMP
-#
-$CMP +12V
-K POWER, PWR
-$ENDCMP
-#
-$CMP +12VA
-K POWER, PWR
-$ENDCMP
-#
-$CMP +15V
-K POWER, PWR
-$ENDCMP
-#
-$CMP +1V1
-K POWER, PWR
-$ENDCMP
-#
-$CMP +1V2
-K POWER, PWR
-$ENDCMP
-#
-$CMP +1V5
-K POWER, PWR
-$ENDCMP
-#
-$CMP +1V8
-K POWER, PWR
-$ENDCMP
-#
-$CMP +24V
-K POWER, PWR
-$ENDCMP
-#
-$CMP +2V5
-K POWER, PWR
-$ENDCMP
-#
-$CMP +36V
-K POWER, PWR
-$ENDCMP
-#
-$CMP +3V3
-K POWER, PWR
-$ENDCMP
-#
-$CMP +48V
-K POWER, PWR
-$ENDCMP
-#
-$CMP +5C
-K POWER, PWR
-$ENDCMP
-#
-$CMP +5F
-K POWER, PWR
-$ENDCMP
-#
-$CMP +5P
-K POWER, PWR
-$ENDCMP
-#
-$CMP +5V
-K POWER, PWR
-$ENDCMP
-#
-$CMP +5VA
-K POWER, PWR
-$ENDCMP
-#
-$CMP +5VD
-K POWER, PWR
-$ENDCMP
-#
-$CMP +5VL
-K POWER, PWR
-$ENDCMP
-#
-$CMP +5VP
-K POWER, PWR
-$ENDCMP
-#
-$CMP +6V
-K POWER, PWR
-$ENDCMP
-#
-$CMP +8V
-K POWER, PWR
-$ENDCMP
-#
-$CMP +9V
-K POWER, PWR
-$ENDCMP
-#
-$CMP +9VA
-K POWER, PWR
-$ENDCMP
-#
-$CMP +BATT
-K POWER, PWR
-$ENDCMP
-#
-$CMP -10V
-K POWER, PWR
-$ENDCMP
-#
-$CMP -12V
-K POWER, PWR
-$ENDCMP
-#
-$CMP -12VA
-K POWER, PWR
-$ENDCMP
-#
-$CMP -15V
-K POWER, PWR
-$ENDCMP
-#
-$CMP -24V
-K POWER, PWR
-$ENDCMP
-#
-$CMP -36V
-K POWER, PWR
-$ENDCMP
-#
-$CMP -48V
-K POWER, PWR
-$ENDCMP
-#
-$CMP -5V
-K POWER, PWR
-$ENDCMP
-#
-$CMP -5VA
-K POWER, PWR
-$ENDCMP
-#
-$CMP -6V
-K POWER, PWR
-$ENDCMP
-#
-$CMP -8V
-K POWER, PWR
-$ENDCMP
-#
-$CMP -9VA
-K POWER, PWR
-$ENDCMP
-#
-$CMP Earth
-D Ground
-K POWER, PWR, GND, GROUND
-$ENDCMP
-#
-$CMP Earth_Clean
-D Clean Earth
-K POWER, PWR, GND, GROUND, CLEAN, SIGNAL
-$ENDCMP
-#
-$CMP Earth_Protective
-D Protective Earth
-K POWER, PWR, EARTH, PROTECTIVE, GND, GROUND, PE
-$ENDCMP
-#
-$CMP GND
-K POWER, PWR
-$ENDCMP
-#
-$CMP GNDA
-K POWER, PWR
-$ENDCMP
-#
-$CMP GNDD
-K POWER, PWR
-$ENDCMP
-#
-$CMP GNDPWR
-K POWER, PWR
-$ENDCMP
-#
-$CMP GNDREF
-K POWER, PWR
-$ENDCMP
-#
-$CMP VAA
-K POWER, PWR
-$ENDCMP
-#
-$CMP VCC
-K POWER, PWR
-$ENDCMP
-#
-$CMP VCOM
-K POWER, PWR
-$ENDCMP
-#
-$CMP VDD
-K POWER, PWR
-$ENDCMP
-#
-$CMP VEE
-K POWER, PWR
-$ENDCMP
-#
-$CMP VMEM
-K POWER, PWR
-$ENDCMP
-#
-$CMP VPP
-K POWER, PWR
-$ENDCMP
-#
-$CMP VSS
-K POWER, PWR
-$ENDCMP
-#
-#End Doc Library
diff --git a/demos/sim/power.lib b/demos/sim/power.lib
deleted file mode 100644
index 17a023b4b1..0000000000
--- a/demos/sim/power.lib
+++ /dev/null
@@ -1,936 +0,0 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# +12C
-#
-DEF +12C #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+12C" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +12C 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +12L
-#
-DEF +12L #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+12L" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +12L 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +12LF
-#
-DEF +12LF #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+12LF" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +12LF 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +12P
-#
-DEF +12P #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+12P" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +12P 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +12V
-#
-DEF +12V #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+12V" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +12V 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +12VA
-#
-DEF +12VA #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+12VA" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +12VA 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +15V
-#
-DEF +15V #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+15V" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +15V 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +1V0
-#
-DEF +1V0 #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+1V0" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +1V0 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +1V1
-#
-DEF +1V1 #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+1V1" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +1V1 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +1V2
-#
-DEF +1V2 #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+1V2" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +1V2 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +1V35
-#
-DEF +1V35 #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+1V35" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +1V35 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +1V5
-#
-DEF +1V5 #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+1V5" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +1V5 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +1V8
-#
-DEF +1V8 #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+1V8" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +1V8 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +24V
-#
-DEF +24V #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+24V" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +24V 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +2V5
-#
-DEF +2V5 #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+2V5" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +2V5 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +3.3VADC
-#
-DEF +3.3VADC #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 150 -50 50 H I C CNN
-F1 "+3.3VADC" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 0 0 0 0 40 0 40 N
-P 6 0 1 0 0 40 20 20 0 70 -20 20 0 40 0 40 N
-X +3.3VADC 1 0 0 0 U 50 50 0 0 W N
-ENDDRAW
-ENDDEF
-#
-# +3.3VDAC
-#
-DEF +3.3VDAC #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 150 -50 50 H I C CNN
-F1 "+3.3VDAC" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 0 0 0 0 40 0 40 N
-P 6 0 1 0 0 40 20 20 0 70 -20 20 0 40 0 40 N
-X +3.3VDAC 1 0 0 0 U 50 50 0 0 W N
-ENDDRAW
-ENDDEF
-#
-# +3.3VP
-#
-DEF +3.3VP #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 150 -50 50 H I C CNN
-F1 "+3.3VP" 0 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 0 0 0 0 40 0 40 N
-P 7 0 1 0 20 30 0 40 -20 30 -10 70 10 70 20 30 20 30 N
-X +3.3VP 1 0 0 0 U 50 50 0 0 W N
-ENDDRAW
-ENDDEF
-#
-# +36V
-#
-DEF +36V #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+36V" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +36V 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +3V3
-#
-DEF +3V3 #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+3V3" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-ALIAS +3.3V
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +3V3 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +48V
-#
-DEF +48V #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+48V" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +48V 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +5C
-#
-DEF +5C #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+5C" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +5C 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +5F
-#
-DEF +5F #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+5F" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +5F 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +5P
-#
-DEF +5P #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+5P" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +5P 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +5V
-#
-DEF +5V #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+5V" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +5V 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +5VA
-#
-DEF +5VA #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+5VA" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +5VA 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +5VD
-#
-DEF +5VD #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+5VD" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +5VD 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +5VL
-#
-DEF +5VL #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+5VL" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +5VL 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +5VP
-#
-DEF +5VP #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+5VP" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +5VP 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +6V
-#
-DEF +6V #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+6V" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +6V 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +8V
-#
-DEF +8V #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+8V" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +8V 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +9V
-#
-DEF +9V #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+9V" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +9V 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +9VA
-#
-DEF +9VA #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -125 50 H I C CNN
-F1 "+9VA" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +9VA 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# +BATT
-#
-DEF +BATT #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+BATT" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +BATT 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# -10V
-#
-DEF -10V #PWR 0 0 Y Y 1 F N
-F0 "#PWR" 0 100 50 H I C CNN
-F1 "-10V" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
-X -10V 1 0 0 0 U 50 50 0 0 W N
-ENDDRAW
-ENDDEF
-#
-# -12V
-#
-DEF -12V #PWR 0 0 Y Y 1 F N
-F0 "#PWR" 0 100 50 H I C CNN
-F1 "-12V" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
-X -12V 1 0 0 0 U 50 50 0 0 W N
-ENDDRAW
-ENDDEF
-#
-# -12VA
-#
-DEF -12VA #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "-12VA" 0 140 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X -12VA 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# -15V
-#
-DEF -15V #PWR 0 0 Y Y 1 F N
-F0 "#PWR" 0 100 50 H I C CNN
-F1 "-15V" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
-X -15V 1 0 0 0 U 50 50 0 0 W N
-ENDDRAW
-ENDDEF
-#
-# -24V
-#
-DEF -24V #PWR 0 0 Y Y 1 F N
-F0 "#PWR" 0 100 50 H I C CNN
-F1 "-24V" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
-X -24V 1 0 0 0 U 50 50 0 0 W N
-ENDDRAW
-ENDDEF
-#
-# -36V
-#
-DEF -36V #PWR 0 0 Y Y 1 F N
-F0 "#PWR" 0 100 50 H I C CNN
-F1 "-36V" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
-X -36V 1 0 0 0 U 50 50 0 0 W N
-ENDDRAW
-ENDDEF
-#
-# -48V
-#
-DEF -48V #PWR 0 0 Y Y 1 F N
-F0 "#PWR" 0 100 50 H I C CNN
-F1 "-48V" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
-X -48V 1 0 0 0 U 50 50 0 0 W N
-ENDDRAW
-ENDDEF
-#
-# -5V
-#
-DEF -5V #PWR 0 0 Y Y 1 F N
-F0 "#PWR" 0 100 50 H I C CNN
-F1 "-5V" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
-X -5V 1 0 0 0 U 50 50 0 0 W N
-ENDDRAW
-ENDDEF
-#
-# -5VA
-#
-DEF -5VA #PWR 0 0 Y Y 1 F N
-F0 "#PWR" 0 100 50 H I C CNN
-F1 "-5VA" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
-X -5VA 1 0 0 0 U 50 50 0 0 W N
-ENDDRAW
-ENDDEF
-#
-# -6V
-#
-DEF -6V #PWR 0 0 Y Y 1 F N
-F0 "#PWR" 0 100 50 H I C CNN
-F1 "-6V" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
-X -6V 1 0 0 0 U 50 50 0 0 W N
-ENDDRAW
-ENDDEF
-#
-# -8V
-#
-DEF -8V #PWR 0 0 Y Y 1 F N
-F0 "#PWR" 0 100 50 H I C CNN
-F1 "-8V" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
-X -8V 1 0 0 0 U 50 50 0 0 W N
-ENDDRAW
-ENDDEF
-#
-# -9VA
-#
-DEF -9VA #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -125 50 H I C CNN
-F1 "-9VA" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 0 0 100 N
-P 4 0 1 0 30 50 -30 50 0 100 30 50 F
-X -9VA 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# Earth
-#
-DEF ~Earth #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "Earth" 0 -150 50 H I C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -25 -75 25 -75 N
-P 2 0 1 0 -5 -100 5 -100 N
-P 2 0 1 0 0 -50 0 0 N
-P 2 0 1 0 50 -50 -50 -50 N
-X Earth 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# Earth_Clean
-#
-DEF ~Earth_Clean #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 250 0 50 H I C CNN
-F1 "Earth_Clean" 300 -150 50 H I C CNN
-F2 "" 0 -50 50 H V C CNN
-F3 "" 0 -50 50 H V C CNN
-DRAW
-A 0 -150 100 1 1799 0 1 0 N 100 -150 -100 -150
-P 2 0 1 0 -25 -125 25 -125 N
-P 2 0 1 0 -5 -150 5 -150 N
-P 2 0 1 0 0 -100 0 0 N
-P 2 0 1 0 50 -100 -50 -100 N
-X Earth_Clean 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# Earth_Protective
-#
-DEF ~Earth_Protective #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 250 -250 50 H I C CNN
-F1 "Earth_Protective" 450 -150 50 H I C CNN
-F2 "" 0 -100 50 H V C CNN
-F3 "" 0 -100 50 H V C CNN
-DRAW
-C 0 -150 100 0 1 0 N
-P 2 0 1 0 -25 -175 25 -175 N
-P 2 0 1 0 -5 -200 5 -200 N
-P 2 0 1 0 0 -150 0 0 N
-P 2 0 1 0 50 -150 -50 -150 N
-X Earth_Protective 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# GND
-#
-DEF GND #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "GND" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
-X GND 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# GNDA
-#
-DEF GNDA #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "GNDA" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
-X GNDA 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# GNDD
-#
-DEF GNDD #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "GNDD" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
-X GNDD 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# GNDPWR
-#
-DEF GNDPWR #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -200 50 H I C CNN
-F1 "GNDPWR" 0 -130 50 H V C CNN
-F2 "" 0 -50 50 H V C CNN
-F3 "" 0 -50 50 H V C CNN
-DRAW
-P 2 0 1 0 0 -50 0 0 N
-P 3 0 1 8 -40 -50 -50 -80 -50 -80 N
-P 3 0 1 8 -20 -50 -30 -80 -30 -80 N
-P 3 0 1 8 0 -50 -10 -80 -10 -80 N
-P 3 0 1 8 20 -50 10 -80 10 -80 N
-P 3 0 1 8 40 -50 -40 -50 -40 -50 N
-P 4 0 1 8 40 -50 30 -80 30 -80 30 -80 N
-X GNDPWR 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# GNDREF
-#
-DEF GNDREF #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "GNDREF" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -25 -75 25 -75 N
-P 2 0 1 0 -5 -100 5 -100 N
-P 2 0 1 0 0 -50 0 0 N
-P 2 0 1 0 50 -50 -50 -50 N
-X GNDREF 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# HT
-#
-DEF HT #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 120 50 H I C CNN
-F1 "HT" 0 90 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 3 0 1 0 0 0 0 40 0 40 N
-P 6 0 1 0 0 40 20 20 0 70 -20 20 0 40 0 40 N
-X HT 1 0 0 0 U 50 50 0 0 W N
-ENDDRAW
-ENDDEF
-#
-# PWR_FLAG
-#
-DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 95 50 H I C CNN
-F1 "PWR_FLAG" 0 180 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 50 -75 100 0 150 75 100 0 50 N
-X pwr 1 0 0 0 U 50 50 0 0 w
-ENDDRAW
-ENDDEF
-#
-# VAA
-#
-DEF VAA #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "VAA" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-C 0 75 25 0 1 0 N
-P 2 0 1 0 0 0 0 50 N
-X VAA 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# VCC
-#
-DEF VCC #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "VCC" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-C 0 75 25 0 1 0 N
-P 2 0 1 0 0 0 0 50 N
-X VCC 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# VCOM
-#
-DEF VCOM #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "VCOM" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-C 0 75 25 0 1 0 N
-P 2 0 1 0 0 0 0 50 N
-X VCOM 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# VDD
-#
-DEF VDD #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "VDD" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-C 0 75 25 0 1 0 N
-P 2 0 1 0 0 0 0 50 N
-X VDD 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# VEE
-#
-DEF VEE #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "VEE" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-C 0 75 25 0 1 0 N
-P 2 0 1 0 0 0 0 50 N
-X VEE 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# VMEM
-#
-DEF VMEM #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "VMEM" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X VMEM 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# VPP
-#
-DEF VPP #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "VPP" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X VPP 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# VSS
-#
-DEF VSS #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "VSS" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-C 0 75 25 0 1 0 N
-P 2 0 1 0 0 0 0 50 N
-X VSS 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/demos/sim/pspice.dcm b/demos/sim/pspice.dcm
deleted file mode 100644
index a12d4ba99d..0000000000
--- a/demos/sim/pspice.dcm
+++ /dev/null
@@ -1,16 +0,0 @@
-EESchema-DOCLIB  Version 2.0
-#
-$CMP R
-D Resistance
-K R DEV
-$ENDCMP
-#
-$CMP VSOURCE
-D Spice Voltage Source
-$ENDCMP
-#
-$CMP Value
-D Spice Voltage Source
-$ENDCMP
-#
-#End Doc Library
diff --git a/demos/sim/pspice.lib b/demos/sim/pspice.lib
deleted file mode 100644
index 56df072b1f..0000000000
--- a/demos/sim/pspice.lib
+++ /dev/null
@@ -1,204 +0,0 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# 0
-#
-DEF 0 #GND 0 0 Y Y 1 F P
-F0 "#GND" 0 -100 50 H I C CNN
-F1 "0" 0 -70 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 4 0 1 0 -50 0 0 -50 50 0 -50 0 N
-X 0 1 0 0 0 R 40 40 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# CAP
-#
-DEF CAP C 0 10 Y Y 1 F N
-F0 "C" 100 150 50 V V C CNN
-F1 "CAP" 100 -150 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-ALIAS C
-DRAW
-P 2 0 1 0 -150 -50 150 -50 N
-P 2 0 1 0 -150 50 150 50 N
-X ~ 1 0 250 200 D 40 40 1 1 P
-X ~ 2 0 -250 200 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# DIODE
-#
-DEF DIODE D 0 40 Y N 1 F N
-F0 "D" 0 150 50 H V C CNN
-F1 "DIODE" 0 -175 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 -75 100 -75 -100 N
-P 3 0 1 0 75 100 75 -100 -75 0 F
-X K 1 -200 0 150 R 50 50 1 1 I
-X A 2 200 0 150 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# INDUCTOR
-#
-DEF INDUCTOR L 0 0 N Y 1 F N
-F0 "L" 0 100 50 H V C CNN
-F1 "INDUCTOR" 0 -50 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-A -150 0 50 1 1799 0 1 0 N -100 0 -200 0
-A -50 0 50 1 1799 0 1 0 N 0 0 -100 0
-A 50 0 50 1 1799 0 1 0 N 100 0 0 0
-A 150 0 50 1 1799 0 1 0 N 200 0 100 0
-X 1 1 -250 0 50 R 30 30 1 1 I
-X 2 2 250 0 50 L 30 30 1 1 I
-ENDDRAW
-ENDDEF
-#
-# ISOURCE
-#
-DEF ISOURCE I 0 40 Y Y 1 F N
-F0 "I" 0 -180 50 H V C CNN
-F1 "ISOURCE" 10 170 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-C 0 -150 250 0 1 0 N
-C 0 150 250 0 1 0 N
-T 0 -320 -10 100 0 0 1 I Normal 0 C C
-P 2 0 1 0 -350 -200 -350 200 F
-P 3 0 1 0 -400 200 -350 300 -300 200 F
-X E1 1 0 700 300 D 50 50 1 1 I
-X E2 2 0 -700 300 U 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# QNPN
-#
-DEF QNPN Q 0 0 Y Y 1 F N
-F0 "Q" -100 300 50 H V C CNN
-F1 "QNPN" -100 200 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 0 0 0 0 150 -150 N
-P 4 0 0 0 150 -150 150 -50 50 -150 150 -150 F
-P 2 0 1 0 0 -150 0 150 N
-P 2 0 1 0 0 0 150 150 N
-P 4 0 1 0 -100 -150 0 -150 0 -150 0 -150 N
-X C 1 150 350 200 D 40 40 1 1 P
-X B 2 -300 0 300 R 40 40 1 1 I
-X E 3 150 -350 200 U 40 40 1 1 P
-X Substrat 4 -100 -350 200 U 50 20 1 1 I
-ENDDRAW
-ENDDEF
-#
-# QPNP
-#
-DEF QPNP Q 0 0 Y Y 1 F N
-F0 "Q" -100 300 50 H V C CNN
-F1 "QPNP" -100 200 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-P 2 0 1 0 0 -150 0 150 N
-P 2 0 1 0 0 0 150 -150 N
-P 2 0 1 0 0 0 150 150 N
-P 3 0 1 0 -100 -150 0 -150 0 -150 N
-P 4 0 1 0 120 -180 180 -120 85 -85 120 -180 F
-X C 1 150 350 200 D 40 40 1 1 C
-X B 2 -300 0 300 R 40 40 1 1 I
-X E 3 150 -350 200 U 40 40 1 1 E
-X Substrat 4 -100 -350 200 U 50 20 1 1 I
-ENDDRAW
-ENDDEF
-#
-# R
-#
-DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-S -40 150 40 -150 0 1 0 N
-X ~ 1 0 250 100 D 50 50 1 1 P
-X ~ 2 0 -250 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# SPICE_DIRECTIVE
-#
-DEF ~SPICE_DIRECTIVE X 0 40 Y Y 1 F N
-F0 "X" 0 0 60 H I C CNN
-F1 "SPICE_DIRECTIVE" -75 300 60 H I C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-T 0 450 0 60 0 0 0 SPICE~Command Normal 0 C C
-P 5 0 0 0 50 -50 850 -50 850 50 50 50 50 -50 N
-ENDDRAW
-ENDDEF
-#
-# SPICE_PROBE
-#
-DEF ~SPICE_PROBE U 0 40 N N 1 F N
-F0 "U" 0 0 60 H I C CNN
-F1 "SPICE_PROBE" 0 0 60 H I C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 2 0 0 0 -61 148 -63 165 N
-P 3 0 0 0 -61 167 -55 170 -45 156 N
-P 4 0 0 0 -1 1 -20 46 -9 50 1 1 F
-P 6 0 0 0 -10 49 6 55 -33 158 -71 142 -32 42 -19 46 N
-P 11 0 0 0 -61 169 -63 179 -61 188 -52 190 -42 189 -42 183 -47 181 -52 184 -57 189 -62 199 -63 202 N
-X ~ 1 0 0 0 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# VSOURCE
-#
-DEF ~VSOURCE V 0 40 Y Y 1 F N
-F0 "V" 200 200 50 H V C CNN
-F1 "VSOURCE" 250 100 50 H I C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-F4 "Value" 0 0 60 H I C CNN "Fieldname"
-F5 "V" 0 0 60 H I C CNN "Spice_Primitive"
-F6 "1 2" -300 200 60 H I C CNN "Spice_Node_Sequence"
-DRAW
-C 0 0 100 0 1 0 N
-P 2 0 1 0 0 -75 0 75 N
-P 4 0 1 0 0 75 -25 25 25 25 0 75 F
-X ~ 1 0 200 100 D 50 50 1 1 I
-X ~ 2 0 -200 100 U 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Value
-#
-DEF Value V 0 40 Y Y 1 F N
-F0 "V" 200 200 50 H V C CNN
-F1 "Value" 250 100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-F4 "V" 0 0 60 H I C CNN "SpicePrimitive"
-F5 "1 2" -300 200 60 H I C CNN "SpicePinMapping"
-DRAW
-C 0 0 100 0 1 0 N
-P 2 0 1 0 0 -75 0 75 N
-P 4 0 1 0 0 75 -25 25 25 25 0 75 F
-X ~ 1 0 200 100 D 50 50 1 1 I
-X ~ 2 0 -200 100 U 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-#End Library
diff --git a/demos/sim/sim_test.sch b/demos/sim/sim_test.sch
deleted file mode 100644
index 01afdb89f2..0000000000
--- a/demos/sim/sim_test.sch
+++ /dev/null
@@ -1,154 +0,0 @@
-EESchema Schematic File Version 2
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:pspice
-LIBS:sim_test-cache
-EELAYER 25 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 1
-Title ""
-Date ""
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L VSOURCE V1
-U 1 1 57336052
-P 4400 4050
-F 0 "V1" H 4528 4096 50  0000 L CNN
-F 1 "5V" H 4528 4005 50  0000 L CNN
-F 2 "" H 4400 4050 50  0000 C CNN
-F 3 "" H 4400 4050 50  0000 C CNN
-F 4 "Value" H 4400 4050 60  0001 C CNN "Fieldname"
-	1    4400 4050
-	-1   0    0    1   
-$EndComp
-$Comp
-L GND #PWR1
-U 1 1 573360D3
-P 4400 4350
-F 0 "#PWR1" H 4400 4100 50  0001 C CNN
-F 1 "GND" H 4405 4177 50  0000 C CNN
-F 2 "" H 4400 4350 50  0000 C CNN
-F 3 "" H 4400 4350 50  0000 C CNN
-	1    4400 4350
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	4400 4350 4400 4250
-Wire Wire Line
-	4400 4300 5750 4300
-Connection ~ 4400 4300
-$Comp
-L R R1
-U 1 1 573360F5
-P 4650 3700
-F 0 "R1" V 4443 3700 50  0000 C CNN
-F 1 "10k" V 4534 3700 50  0000 C CNN
-F 2 "" V 4580 3700 50  0000 C CNN
-F 3 "" H 4650 3700 50  0000 C CNN
-	1    4650 3700
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	4500 3700 4400 3700
-Wire Wire Line
-	4400 3700 4400 3850
-Wire Wire Line
-	4800 3700 4950 3700
-$Comp
-L D D1
-U 1 1 573361B8
-P 5100 3700
-F 0 "D1" H 5100 3485 50  0000 C CNN
-F 1 "1N4148" H 5100 3576 50  0000 C CNN
-F 2 "" H 5100 3700 50  0000 C CNN
-F 3 "" H 5100 3700 50  0000 C CNN
-F 4 "D" H 5100 3700 60  0001 C CNN "Spice_Primitive"
-F 5 "1n914" H 5100 3700 60  0001 C CNN "Spice_Model"
-F 6 "Y" H 5100 3700 60  0001 C CNN "Spice_Netlist_Enabled"
-F 7 "/home/orson/workspace/kicad/demos/sim/diodes.lib" H 5100 3700 60  0001 C CNN "Spice_Lib_File"
-	1    5100 3700
-	-1   0    0    1   
-$EndComp
-$Comp
-L C C1
-U 1 1 5733628F
-P 5400 4000
-F 0 "C1" H 5515 4046 50  0000 L CNN
-F 1 "100n" H 5515 3955 50  0000 L CNN
-F 2 "" H 5438 3850 50  0000 C CNN
-F 3 "" H 5400 4000 50  0000 C CNN
-	1    5400 4000
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R2
-U 1 1 573362F7
-P 5750 4000
-F 0 "R2" H 5680 3954 50  0000 R CNN
-F 1 "1Meg" H 5680 4045 50  0000 R CNN
-F 2 "" V 5680 4000 50  0000 C CNN
-F 3 "" H 5750 4000 50  0000 C CNN
-	1    5750 4000
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	5250 3700 5750 3700
-Wire Wire Line
-	5750 3700 5750 3850
-Wire Wire Line
-	5400 3850 5400 3700
-Connection ~ 5400 3700
-Wire Wire Line
-	5400 4300 5400 4150
-Wire Wire Line
-	5750 4300 5750 4150
-Connection ~ 5400 4300
-Text Notes 4300 3150 0    60   ~ 0
-.op
-$Comp
-L +12V #PWR?
-U 1 1 5787B2A9
-P 6650 3300
-F 0 "#PWR?" H 6650 3150 50  0001 C CNN
-F 1 "+12V" H 6665 3473 50  0000 C CNN
-F 2 "" H 6650 3300 50  0000 C CNN
-F 3 "" H 6650 3300 50  0000 C CNN
-	1    6650 3300
-	1    0    0    -1  
-$EndComp
-$EndSCHEMATC

From 6d7a7a323344d05a5a06798ba02a4b327f57edfc Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:13 +0200
Subject: [PATCH 173/197] KICAD_SPICE CMake flag

---
 CMakeLists.txt                                |  14 +-
 eeschema/CMakeLists.txt                       |  44 +--
 .../dialog_edit_component_in_schematic.cpp    |   8 +
 eeschema/eeschema.cpp                         |   2 +
 eeschema/menubar.cpp                          |   2 +
 eeschema/ngspice/sharedspice.h                | 328 ------------------
 eeschema/onleftclick.cpp                      |   2 +
 eeschema/schedit.cpp                          |   2 +
 eeschema/schframe.cpp                         |   4 +-
 9 files changed, 49 insertions(+), 357 deletions(-)
 delete mode 100644 eeschema/ngspice/sharedspice.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11b1792ac2..2ee40e3079 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,7 @@ endif()
 
 
 # Add option to add user directories for linker, if any
-LINK_DIRECTORIES( ${LINK_DIRECTORIES_PATH} /usr/local/lib )
+LINK_DIRECTORIES( ${LINK_DIRECTORIES_PATH} )
 
 if( UNIX )
     set( KICAD_USER_CONFIG_DIR $ENV{HOME} CACHE PATH "Location of user specific KiCad config files" )
@@ -251,6 +251,10 @@ if( KICAD_SCRIPTING_WXPYTHON )
     add_definitions( -DKICAD_SCRIPTING_WXPYTHON )
 endif()
 
+if( KICAD_SPICE )
+    add_definitions( -DKICAD_SPICE )
+endif()
+
 if( USE_WX_GRAPHICS_CONTEXT OR APPLE )
     add_definitions( -DUSE_WX_GRAPHICS_CONTEXT )
 endif()
@@ -437,9 +441,7 @@ add_definitions( -DWX_COMPATIBILITY )
 # See line 41 of CMakeModules/FindwxWidgets.cmake
 set( wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --static=no )
 
-find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml stc richtext REQUIRED )
-
-
+find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml stc REQUIRED )
 
 # Include wxWidgets macros.
 include( ${wxWidgets_USE_FILE} )
@@ -520,10 +522,6 @@ set( INC_AFTER
     )
 
 
-#if ( KICAD_SPICE )
-#find_package(MathGL2 2.1 COMPONENTS wx REQUIRED )
-#endif ()
-
 # Find Python and other scripting resources
 if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES )
     # force a python version < 3.0
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 3d32a8f3ff..d582c7c31f 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories(
     ./widgets
     ../common
     ../common/dialogs
-    ./ngspice
     ${INC_AFTER}
     )
 
@@ -177,23 +176,6 @@ set( EESCHEMA_SRCS
     viewlib_frame.cpp
     viewlibs.cpp
 
-    sim/simulate.cpp
-    sim/sim_plot_frame_base.cpp
-    sim/sim_plot_frame.cpp
-    sim/sim_plot_panel.cpp
-    sim/spice_simulator.cpp
-    sim/spice_value.cpp
-    sim/ngspice.cpp
-    sim/netlist_exporter_pspice_sim.cpp
-    dialogs/dialog_signal_list.cpp
-    dialogs/dialog_signal_list_base.cpp
-    dialogs/dialog_sim_settings.cpp
-    dialogs/dialog_sim_settings_base.cpp
-    dialogs/dialog_spice_model.cpp
-    dialogs/dialog_spice_model_base.cpp
-    widgets/tuner_slider.cpp
-    widgets/tuner_slider_base.cpp
-
     netlist_exporters/netlist_exporter.cpp
     netlist_exporters/netlist_exporter_cadstar.cpp
     netlist_exporters/netlist_exporter_generic.cpp
@@ -212,6 +194,29 @@ set( EESCHEMA_COMMON_SRCS
     )
 
 
+if( KICAD_SPICE )
+    set( EESCHEMA_SRCS 
+        ${EESCHEMA_SRCS}
+        sim/simulate.cpp
+        sim/sim_plot_frame_base.cpp
+        sim/sim_plot_frame.cpp
+        sim/sim_plot_panel.cpp
+        sim/spice_simulator.cpp
+        sim/spice_value.cpp
+        sim/ngspice.cpp
+        sim/netlist_exporter_pspice_sim.cpp
+        dialogs/dialog_signal_list.cpp
+        dialogs/dialog_signal_list_base.cpp
+        dialogs/dialog_sim_settings.cpp
+        dialogs/dialog_sim_settings_base.cpp
+        dialogs/dialog_spice_model.cpp
+        dialogs/dialog_spice_model_base.cpp
+        widgets/tuner_slider.cpp
+        widgets/tuner_slider_base.cpp
+    )
+endif()
+
+
 if( MINGW )
     # EESCHEMA_RESOURCES variable is set by the macro.
     mingw_resource_compiler( eeschema )
@@ -259,7 +264,6 @@ add_executable( eeschema WIN32 MACOSX_BUNDLE
 set_source_files_properties( ../common/single_top.cpp PROPERTIES
     COMPILE_DEFINITIONS "TOP_FRAME=FRAME_SCH;PGM_DATA_FILE_EXT=\"sch\";BUILD_KIWAY_DLL"
     )
-
 target_link_libraries( eeschema
     #singletop  # replaces common, giving us restrictive control and link warnings.
     # There's way too much crap coming in from common yet.
@@ -280,7 +284,7 @@ target_link_libraries( eeschema_kiface
     gal
     ${wxWidgets_LIBRARIES}
     ${GDI_PLUS_LIBRARIES}
-)
+    )
 set_target_properties( eeschema_kiface PROPERTIES
     # Decorate OUTPUT_NAME with PREFIX and SUFFIX, creating something like
     # _eeschema.so, _eeschema.dll, or _eeschema.kiface
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
index 6cbb0f77ba..fd51fffb28 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
@@ -46,8 +46,10 @@
 #include <sch_validators.h>
 
 #include <dialog_edit_component_in_schematic_fbp.h>
+#ifdef KICAD_SPICE
 #include <dialog_spice_model.h>
 #include <netlist_exporter_pspice.h>
+#endif /* KICAD_SPICE */
 
 
 /**
@@ -191,6 +193,10 @@ void SCH_EDIT_FRAME::EditComponent( SCH_COMPONENT* aComponent )
 DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( wxWindow* aParent ) :
     DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( aParent )
 {
+#ifndef KICAD_SPICE
+    spiceFieldsButton->Hide();
+#endif /* not KICAD_SPICE */
+
     m_parent = (SCH_EDIT_FRAME*) aParent;
 
     m_cmp = NULL;
@@ -290,11 +296,13 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnSelectChipName( wxCommandEvent& event
 
 void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::EditSpiceModel( wxCommandEvent& event )
 {
+#ifdef KICAD_SPICE
     setSelectedFieldNdx( 0 );
     DIALOG_SPICE_MODEL dialog( this, *m_cmp, m_FieldsBuf );
 
     if( dialog.ShowModal() == wxID_OK )
         updateDisplay();
+#endif /* KICAD_SPICE */
 }
 
 
diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp
index 378c51fb75..e9bbfbf34f 100644
--- a/eeschema/eeschema.cpp
+++ b/eeschema/eeschema.cpp
@@ -95,12 +95,14 @@ static struct IFACE : public KIFACE_I
             }
             break;
 
+#ifdef KICAD_SPICE
         case FRAME_SIMULATOR:
             {
                 SIM_PLOT_FRAME* frame = new SIM_PLOT_FRAME( aKiway, aParent );
                 return frame;
             }
             break;
+#endif /* KICAD_SPICE */
 
         case FRAME_SCH_VIEWER:
         case FRAME_SCH_VIEWER_MODAL:
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index 0d9feb2ddb..1ce03e7456 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -494,11 +494,13 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
 
     toolsMenu->AppendSeparator();
 
+#ifdef KICAD_SPICE
     // Simulator
     AddMenuItem( toolsMenu,
                  ID_SIM_SHOW,
                  _("Simula&tor"), _( "Simulate the circuit" ),
                  wxNullBitmap );
+#endif /* KICAD_SPICE */
 
     // Help Menu:
     wxMenu* helpMenu = new wxMenu;
diff --git a/eeschema/ngspice/sharedspice.h b/eeschema/ngspice/sharedspice.h
deleted file mode 100644
index d0f4711686..0000000000
--- a/eeschema/ngspice/sharedspice.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/* header file for shared ngspice */
-/* Copyright 2013 Holger Vogt */
-/* Modified BSD license */
-
-/*
-Interface between a calling program (caller) and ngspice.dll (ngspice.so)
-
-**
-ngSpice_Init(SendChar*, SendStat*, ControlledExit*,
-             SendData*, SendInitData*, BGThreadRunning*, void*)
-After caller has loaded ngspice.dll, the simulator has to be initialized
-by calling ngSpice_Init(). Address pointers of several callback functions
-defined in the caller are sent to ngspice.dll.
-
-Callback funtion typedefs
-SendChar       typedef of callback function for reading printf, fprintf, fputs
-SendStat       typedef of callback function for reading status string and precent value
-ControlledExit typedef of callback function for tranferring a signal upon
-               ngspice controlled_exit to caller. May be used by caller
-               to detach ngspice.dll.
-SendData       typedef of callback function for sending an array of structs containing
-               data values of all vectors in the current plot (simulation output)
-SendInitData   typedef of callback function for sending an array of structs containing info on
-               all vectors in the current plot (immediately before simulation starts)
-BGThreadRunning typedef of callback function for sending a boolean signal (true if thread
-                is running)
-
-The void pointer may contain the object address of the calling
-function ('self' or 'this' pointer), so that the answer may be directed
-to a calling object. Callback functions are defined in the global section.
-
-**
-ngSpice_Command(char*)
-Send a valid command (see the control or interactive commands) from caller
-to ngspice.dll. Will be executed immediately (as if in interactive mode).
-Some commands are rejected (e.g. 'plot', because there is no graphics interface).
-Command 'quit' will remove internal data, and then send a notice to caller via
-ngexit().
-
-**
-ngGet_Vec_Info(char*)
-receives the name of a vector (may be in the form 'vectorname' or
-<plotname>.vectorname) and returns a pointer to a vector_info struct.
-The caller may then directly assess the vector data (but probably should
-not modify them).
-
-**
-ngSpice_Circ(char**)
-sends an array of null-terminated char* to ngspice.dll. Each char* contains a
-single line of a circuit (each line like in an input file **.sp). The last
-entry to char** has to be NULL. Upon receiving the arry, ngspice.dll will
-immediately parse the input and set up the circuit structure (as if received
-the circuit from a file by the 'source' command.
-
-**
-char* ngSpice_CurPlot();
-returns to the caller a pointer to the name of the current plot
-
-**
-char** ngSpice_AllPlots()
-returns to the caller a pointer to an array of all plots (by their typename)
-
-**
-char** ngSpice_AllVecs(char*);
-returns to the caller a pointer to an array of vector names in the plot
-named by the string in the argument.
-
-**
-Additional basics:
-No memory mallocing and freeing across the interface:
-Memory allocated in ngspice.dll has to be freed in ngspice.dll.
-Memory allocated in the calling program has to be freed only there.
-
-ngspice.dll should never call exit() directly, but handle either the 'quit'
-request to the caller or an request for exiting upon error,
-done by callback function ngexit().
-*/
-
-#ifndef NGSPICE_DLL_H
-#define NGSPICE_DLL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__CYGWIN__)
-  #ifdef SHARED_MODULE
-    #define IMPEXP __declspec(dllexport)
-  #else
-    #define IMPEXP __declspec(dllimport)
-  #endif
-#else
-  /* use with gcc flag -fvisibility=hidden */
-  #if __GNUC__ >= 4
-    #define IMPEXP __attribute__ ((visibility ("default")))
-    #define IMPEXPLOCAL  __attribute__ ((visibility ("hidden")))
-  #else
-    #define IMPEXP
-    #define IMPEXP_LOCAL
-  #endif
-#endif
-
-/* required only if header is used by the caller,
-   is already defined in ngspice.dll */
-#ifndef ngspice_NGSPICE_H
-/* Complex numbers. */
-struct ngcomplex {
-    double cx_real;
-    double cx_imag;
-} ;
-
-typedef struct ngcomplex ngcomplex_t;
-#endif
-
-/* vector info obtained from any vector in ngspice.dll.
-   Allows direct access to the ngspice internal vector structure,
-   as defined in include/ngspice/devc.h . */
-typedef struct vector_info {
-    char *v_name;		/* Same as so_vname. */
-    int v_type;			/* Same as so_vtype. */
-    short v_flags;		/* Flags (a combination of VF_*). */
-    double *v_realdata;		/* Real data. */
-    ngcomplex_t *v_compdata;	/* Complex data. */
-    int v_length;		/* Length of the vector. */
-} vector_info, *pvector_info;
-
-typedef struct vecvalues {
-    char* name;        /* name of a specific vector */
-    double creal;      /* actual data value */
-    double cimag;      /* actual data value */
-    bool is_scale;     /* if 'name' is the scale vector */
-    bool is_complex;   /* if the data are complex numbers */
-} vecvalues, *pvecvalues;
-
-typedef struct vecvaluesall {
-    int veccount;      /* number of vectors in plot */
-    int vecindex;      /* index of actual set of vectors. i.e. the number of accepted data points */
-    pvecvalues *vecsa; /* values of actual set of vectors, indexed from 0 to veccount - 1 */
-} vecvaluesall, *pvecvaluesall;
-
-/* info for a specific vector */
-typedef struct vecinfo
-{
-    int number;     /* number of vector, as postion in the linked list of vectors, starts with 0 */
-    char *vecname;  /* name of the actual vector */
-    bool is_real;   /* TRUE if the actual vector has real data */
-    void *pdvec;    /* a void pointer to struct dvec *d, the actual vector */
-    void *pdvecscale; /* a void pointer to struct dvec *ds, the scale vector */
-} vecinfo, *pvecinfo;
-
-/* info for the current plot */
-typedef struct vecinfoall
-{
-    /* the plot */
-    char *name;
-    char *title;
-    char *date;
-    char *type;
-    int veccount;
-
-    /* the data as an array of vecinfo with length equal to the number of vectors in the plot */
-    pvecinfo *vecs;
-
-} vecinfoall, *pvecinfoall;
-
-
-/* callback functions
-addresses received from caller with ngSpice_Init() function
-*/
-/* sending output from stdout, stderr to caller */
-typedef int (SendChar)(char*, int, void*);
-/*
-   char* string to be sent to caller output
-   int   identification number of calling ngspice shared lib
-   void* return pointer received from caller, e.g. pointer to object having sent the request
-*/
-/* sending simulation status to caller */
-typedef int (SendStat)(char*, int, void*);
-/*
-   char* simulation status and value (in percent) to be sent to caller
-   int   identification number of calling ngspice shared lib
-   void* return pointer received from caller
-*/
-/* asking for controlled exit */
-typedef int (ControlledExit)(int, bool, bool, int, void*);
-/*
-   int   exit status
-   bool  if true: immediate unloading dll, if false: just set flag, unload is done when function has returned
-   bool  if true: exit upon 'quit', if false: exit due to ngspice.dll error
-   int   identification number of calling ngspice shared lib
-   void* return pointer received from caller
-*/
-/* send back actual vector data */
-typedef int (SendData)(pvecvaluesall, int, int, void*);
-/*
-   vecvaluesall* pointer to array of structs containing actual values from all vectors
-   int           number of structs (one per vector)
-   int           identification number of calling ngspice shared lib
-   void*         return pointer received from caller
-*/
-
-/* send back initailization vector data */
-typedef int (SendInitData)(pvecinfoall, int, void*);
-/*
-   vecinfoall* pointer to array of structs containing data from all vectors right after initialization
-   int         identification number of calling ngspice shared lib
-   void*       return pointer received from caller
-*/
-
-/* indicate if background thread is running */
-typedef int (BGThreadRunning)(bool, int, void*);
-/*
-   bool        true if background thread is running
-   int         identification number of calling ngspice shared lib
-   void*       return pointer received from caller
-*/
-
-/* callback functions
-   addresses received from caller with ngSpice_Init_Sync() function
-*/
-
-/* ask for VSRC EXTERNAL value */
-typedef int (GetVSRCData)(double*, double, char*, int, void*);
-/*
-   double*     return voltage value
-   double      actual time
-   char*       node name
-   int         identification number of calling ngspice shared lib
-   void*       return pointer received from caller
-*/
-
-/* ask for ISRC EXTERNAL value */
-typedef int (GetISRCData)(double*, double, char*, int, void*);
-/*
-   double*     return current value
-   double      actual time
-   char*       node name
-   int         identification number of calling ngspice shared lib
-   void*       return pointer received from caller
-*/
-
-/* ask for new delta time depending on synchronization requirements */
-typedef int (GetSyncData)(double, double*, double, int, int, int, void*);
-/*
-   double      actual time (ckt->CKTtime)
-   double*     delta time (ckt->CKTdelta)
-   double      old delta time (olddelta)
-   int         redostep (as set by ngspice)
-   int         identification number of calling ngspice shared lib
-   int         location of call for synchronization in dctran.c
-   void*       return pointer received from caller
-*/
-
-/* ngspice initialization,
-printfcn: pointer to callback function for reading printf, fprintf
-statfcn: pointer to callback function for the status string and percent value
-ControlledExit: pointer to callback function for setting a 'quit' signal in caller
-SendData: pointer to callback function for returning data values of all current output vectors
-SendInitData: pointer to callback function for returning information of all output vectors just initialized
-BGThreadRunning: pointer to callback function indicating if workrt thread is running
-userData: pointer to user-defined data, will not be modified, but
-          handed over back to caller during Callback, e.g. address of calling object */
-IMPEXP
-int  ngSpice_Init(SendChar* printfcn, SendStat* statfcn, ControlledExit* ngexit,
-                  SendData* sdata, SendInitData* sinitdata, BGThreadRunning* bgtrun, void* userData);
-
-/* initialization of synchronizing functions
-vsrcdat: pointer to callback function for retrieving a voltage source value from caller
-isrcdat: pointer to callback function for retrieving a current source value from caller
-syncdat: pointer to callback function for synchronization
-ident: pointer to integer unique to this shared library (defaults to 0)
-userData: pointer to user-defined data, will not be modified, but
-          handed over back to caller during Callback, e.g. address of calling object.
-          If NULL is sent here, userdata info from ngSpice_Init() will be kept, otherwise
-          userdata will be overridden by new value from here.
-*/
-IMPEXP
-int  ngSpice_Init_Sync(GetVSRCData *vsrcdat, GetISRCData *isrcdat, GetSyncData *syncdat, int *ident, void *userData);
-
-/* Caller may send ngspice commands to ngspice.dll.
-Commands are executed immediately */
-IMPEXP
-int  ngSpice_Command(char* command);
-
-
-/* get info about a vector */
-IMPEXP
-pvector_info ngGet_Vec_Info(char* vecname);
-
-
-/* send a circuit to ngspice.dll
-   The circuit description is a dynamic array
-   of char*. Each char* corresponds to a single circuit
-   line. The last entry of the array has to be a NULL */
-IMPEXP
-int ngSpice_Circ(char** circarray);
-
-
-/* return to the caller a pointer to the name of the current plot */
-IMPEXP
-char* ngSpice_CurPlot(void);
-
-
-/* return to the caller a pointer to an array of all plots created
-so far by ngspice.dll */
-IMPEXP
-char** ngSpice_AllPlots(void);
-
-
-/* return to the caller a pointer to an array of vector names in the plot
-named by plotname */
-IMPEXP
-char** ngSpice_AllVecs(char* plotname);
-
-/* returns TRUE if ngspice is running in a second (background) thread */
-IMPEXP
-bool ngSpice_running(void);
-
-/* set a breakpoint in ngspice */
-IMPEXP
-bool ngSpice_SetBkpt(double time);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/eeschema/onleftclick.cpp b/eeschema/onleftclick.cpp
index a35baab2d9..6d7c89e92e 100644
--- a/eeschema/onleftclick.cpp
+++ b/eeschema/onleftclick.cpp
@@ -325,6 +325,7 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
         }
         break;
 
+#ifdef KICAD_SPICE
     case ID_SIM_PROBE:
         {
             const KICAD_T wiresAndComponents[] = { SCH_LINE_T, SCH_COMPONENT_T, SCH_SHEET_PIN_T };
@@ -372,6 +373,7 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
                 simFrame->AddTuner( static_cast<SCH_COMPONENT*>( item ) );
         }
         break;
+#endif /* KICAD_SPICE */
 
     default:
         SetToolID( ID_NO_TOOL_SELECTED, m_canvas->GetDefaultCursor(), wxEmptyString );
diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp
index 10917ff499..64df7eecdc 100644
--- a/eeschema/schedit.cpp
+++ b/eeschema/schedit.cpp
@@ -609,6 +609,7 @@ void SCH_EDIT_FRAME::OnSelectTool( wxCommandEvent& aEvent )
         SetToolID( id, wxCURSOR_BULLSEYE, _( "Delete item" ) );
         break;
 
+#ifdef KICAD_SPICE
     case ID_SIM_PROBE:
         SetToolID( id, -1, _( "Add a simulator probe" ) );
         m_canvas->SetCursor( CURSOR_PROBE );
@@ -618,6 +619,7 @@ void SCH_EDIT_FRAME::OnSelectTool( wxCommandEvent& aEvent )
         SetToolID( id, -1, _( "Select a value to be tuned" ) );
         m_canvas->SetCursor( CURSOR_TUNE );
         break;
+#endif /* KICAD_SPICE */
 
     default:
         SetRepeatItem( NULL );
diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp
index cd26bf7051..344342fb1c 100644
--- a/eeschema/schframe.cpp
+++ b/eeschema/schframe.cpp
@@ -264,7 +264,6 @@ BEGIN_EVENT_TABLE( SCH_EDIT_FRAME, EDA_DRAW_FRAME )
     EVT_TOOL( ID_GET_ERC, SCH_EDIT_FRAME::OnErc )
     EVT_TOOL( ID_GET_NETLIST, SCH_EDIT_FRAME::OnCreateNetlist )
     EVT_TOOL( ID_UPDATE_PCB_FROM_SCH, SCH_EDIT_FRAME::OnUpdatePCB )
-    EVT_TOOL( ID_SIM_SHOW, SCH_EDIT_FRAME::OnSimulate )
     EVT_TOOL( ID_GET_TOOLS, SCH_EDIT_FRAME::OnCreateBillOfMaterials )
     EVT_TOOL( ID_FIND_ITEMS, SCH_EDIT_FRAME::OnFindItems )
     EVT_TOOL( wxID_REPLACE, SCH_EDIT_FRAME::OnFindItems )
@@ -281,8 +280,11 @@ BEGIN_EVENT_TABLE( SCH_EDIT_FRAME, EDA_DRAW_FRAME )
     EVT_TOOL_RANGE( ID_SCHEMATIC_VERTICAL_TOOLBAR_START, ID_SCHEMATIC_VERTICAL_TOOLBAR_END,
                     SCH_EDIT_FRAME::OnSelectTool )
 
+#ifdef KICAD_SPICE
+    EVT_TOOL( ID_SIM_SHOW, SCH_EDIT_FRAME::OnSimulate )
     EVT_TOOL( ID_SIM_PROBE, SCH_EDIT_FRAME::OnSelectTool )
     EVT_TOOL( ID_SIM_TUNE, SCH_EDIT_FRAME::OnSelectTool )
+#endif /* KICAD_SPICE */
 
     EVT_MENU( ID_CANCEL_CURRENT_COMMAND, SCH_EDIT_FRAME::OnCancelCurrentCommand )
     EVT_MENU( ID_SCH_DRAG_ITEM, SCH_EDIT_FRAME::OnDragItem )

From ca36f15feecc8c702aec3d06c28052de5fcfe5ef Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:14 +0200
Subject: [PATCH 174/197] Temporary disable cursor centering

---
 eeschema/sim/sim_plot_panel.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 4bdb7812d6..75fab4a0e6 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -548,8 +548,8 @@ void SIM_PLOT_PANEL::EnableCursor( const wxString& aName, bool aEnable )
     if( aEnable )
     {
         CURSOR* c = new CURSOR( t );
-        int plotCenter = GetMarginLeft() + ( GetXScreen() - GetMarginLeft() - GetMarginRight() ) / 2;
-        c->Move( wxPoint( plotCenter, 0 ) );
+        //int plotCenter = GetMarginLeft() + ( GetXScreen() - GetMarginLeft() - GetMarginRight() ) / 2;
+        //c->Move( wxPoint( plotCenter, 0 ) );
         t->SetCursor( c );
         AddLayer( c );
     }

From 2b041425e5783a54e800651828e8f6ad5a508b6b Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:14 +0200
Subject: [PATCH 175/197] Resized Spice model dialog

---
 eeschema/dialogs/dialog_spice_model_base.cpp | 2 +-
 eeschema/dialogs/dialog_spice_model_base.fbp | 2 +-
 eeschema/dialogs/dialog_spice_model_base.h   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eeschema/dialogs/dialog_spice_model_base.cpp b/eeschema/dialogs/dialog_spice_model_base.cpp
index fa9d1ecccd..db1eefd828 100644
--- a/eeschema/dialogs/dialog_spice_model_base.cpp
+++ b/eeschema/dialogs/dialog_spice_model_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul 17 2016)
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
diff --git a/eeschema/dialogs/dialog_spice_model_base.fbp b/eeschema/dialogs/dialog_spice_model_base.fbp
index d96240e766..4574086a82 100644
--- a/eeschema/dialogs/dialog_spice_model_base.fbp
+++ b/eeschema/dialogs/dialog_spice_model_base.fbp
@@ -44,7 +44,7 @@
             <property name="minimum_size"></property>
             <property name="name">DIALOG_SPICE_MODEL_BASE</property>
             <property name="pos"></property>
-            <property name="size">410,705</property>
+            <property name="size">497,719</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE</property>
             <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
             <property name="title"></property>
diff --git a/eeschema/dialogs/dialog_spice_model_base.h b/eeschema/dialogs/dialog_spice_model_base.h
index b6af962b35..158b0b1dfd 100644
--- a/eeschema/dialogs/dialog_spice_model_base.h
+++ b/eeschema/dialogs/dialog_spice_model_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul 17 2016)
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -143,7 +143,7 @@ class DIALOG_SPICE_MODEL_BASE : public DIALOG_SHIM
 	
 	public:
 		
-		DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 410,705 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+		DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 497,719 ), long style = wxDEFAULT_DIALOG_STYLE ); 
 		~DIALOG_SPICE_MODEL_BASE();
 	
 };

From e452992a6ce3374ff849c0aef5e3460cca2effb7 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:14 +0200
Subject: [PATCH 176/197] Cursor centering fix

---
 eeschema/sim/sim_plot_panel.cpp | 10 ++++++++--
 eeschema/sim/sim_plot_panel.h   | 12 ++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 75fab4a0e6..9245a5e2c6 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -298,8 +298,14 @@ void CURSOR::Plot( wxDC& aDC, mpWindow& aWindow )
         wxQueueEvent( aWindow.GetParent(), new wxCommandEvent( EVT_SIM_CURSOR_UPDATE ) );
     }
     else
+    {
+        m_updateRef = true;
+    }
+
+    if( m_updateRef )
     {
         UpdateReference();
+        m_updateRef = false;
     }
 
     // Line length in horizontal and vertical dimensions
@@ -548,8 +554,8 @@ void SIM_PLOT_PANEL::EnableCursor( const wxString& aName, bool aEnable )
     if( aEnable )
     {
         CURSOR* c = new CURSOR( t );
-        //int plotCenter = GetMarginLeft() + ( GetXScreen() - GetMarginLeft() - GetMarginRight() ) / 2;
-        //c->Move( wxPoint( plotCenter, 0 ) );
+        int plotCenter = GetMarginLeft() + ( GetXScreen() - GetMarginLeft() - GetMarginRight() ) / 2;
+        c->SetX( plotCenter );
         t->SetCursor( c );
         AddLayer( c );
     }
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index c88589abcd..bd337ab0ec 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -37,13 +37,21 @@ class CURSOR : public mpInfoLayer
 public:
     CURSOR( const TRACE* aTrace )
         : mpInfoLayer( wxRect( 0, 0, DRAG_MARGIN, DRAG_MARGIN ), wxTRANSPARENT_BRUSH ),
-        m_trace( aTrace ), m_updateRequired( true ), m_coords( 0.0, 0.0 ), m_window( nullptr )
+        m_trace( aTrace ), m_updateRequired( true ), m_updateRef( false ),
+        m_coords( 0.0, 0.0 ), m_window( nullptr )
     {
         SetDrawOutsideMargins( false );
     }
 
     void Plot( wxDC& aDC, mpWindow& aWindow ) override;
 
+    void SetX( int aX )
+    {
+        m_reference.x = 0;
+        m_updateRef = true;
+        Move( wxPoint( aX, 0 ) );
+    }
+
     void Update()
     {
         m_updateRequired = true;
@@ -66,7 +74,7 @@ public:
 
 private:
     const TRACE* m_trace;
-    bool m_updateRequired;
+    bool m_updateRequired, m_updateRef;
     wxRealPoint m_coords;
     mpWindow* m_window;
 

From 1930cd4d66ea215f5a46f9ceb90873bcc9b18262 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:14 +0200
Subject: [PATCH 177/197] sim: display labels on current scale when only
 currents are added to transient plot

---
 eeschema/sim/sim_plot_panel.cpp | 21 +++++++++++++++++++++
 eeschema/sim/sim_plot_panel.h   | 13 ++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 9245a5e2c6..7dda9938db 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -455,6 +455,25 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aName, int aPoints,
 
     if( addedNewEntry )
     {
+        if ( m_type == ST_TRANSIENT )
+        {
+            bool hasVoltageTraces = false;
+
+            for( auto t : m_traces )
+            {
+                if ( ! (t.second->GetFlags() & SPT_CURRENT ) )
+                {
+                    hasVoltageTraces = true;
+                    break;
+                }
+            }
+
+            if ( !hasVoltageTraces )
+                m_axis_y2->SetMasterScale( nullptr );
+            else
+                m_axis_y2->SetMasterScale( m_axis_y1 );
+        }
+
         // New entry
         t = new TRACE( aName );
         t->SetPen( wxPen( generateColor(), 2, wxSOLID ) );
@@ -497,6 +516,8 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aName, int aPoints,
     else
         t->SetScale( m_axis_x, m_axis_y1 );
 
+    t->SetFlags( aFlags );
+
     UpdateAll();
 
     return addedNewEntry;
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index bd337ab0ec..6db406a705 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -86,7 +86,7 @@ class TRACE : public mpFXYVector
 {
 public:
     TRACE( const wxString& aName ) :
-        mpFXYVector( aName ), m_cursor( nullptr )
+        mpFXYVector( aName ), m_cursor( nullptr ), m_flags(0)
         {
             SetContinuity( true );
             SetDrawOutsideMargins( false );
@@ -127,8 +127,19 @@ public:
         return m_cursor;
     }
 
+    void SetFlags ( int aFlags )
+    {
+        m_flags = aFlags;
+    }
+
+    int GetFlags() const
+    {
+        return m_flags;
+    }
+
 protected:
     CURSOR* m_cursor;
+    int m_flags;
 };
 
 

From 80d8dd72051316f170bb30b4cd4cfaebd5dcebc8 Mon Sep 17 00:00:00 2001
From: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:15 +0200
Subject: [PATCH 178/197] sim: default to decade frequency sweep for ac
 analysis

---
 eeschema/dialogs/dialog_sim_settings_base.cpp |  6 +++---
 eeschema/dialogs/dialog_sim_settings_base.fbp | 10 ++++------
 eeschema/dialogs/dialog_sim_settings_base.h   |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/eeschema/dialogs/dialog_sim_settings_base.cpp b/eeschema/dialogs/dialog_sim_settings_base.cpp
index c33376441e..2d5f2e86e4 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.cpp
+++ b/eeschema/dialogs/dialog_sim_settings_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 24 2016)
+// C++ code generated with wxFormBuilder (version Jun 17 2015)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -27,7 +27,7 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID
 	wxString m_acScaleChoices[] = { wxT("Decade"), wxT("Octave"), wxT("Linear") };
 	int m_acScaleNChoices = sizeof( m_acScaleChoices ) / sizeof( wxString );
 	m_acScale = new wxRadioBox( m_pgAC, wxID_ANY, wxT("Frequency scale"), wxDefaultPosition, wxDefaultSize, m_acScaleNChoices, m_acScaleChoices, 1, wxRA_SPECIFY_COLS );
-	m_acScale->SetSelection( 2 );
+	m_acScale->SetSelection( 0 );
 	m_acScale->Hide();
 	
 	bSizer3->Add( m_acScale, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
@@ -368,7 +368,7 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID
 	bSizer2->Add( m_staticText18, 0, wxALL, 5 );
 	
 	m_customTxt = new wxTextCtrl( m_pgCustom, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-	m_customTxt->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_customTxt->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 76, 90, 90, false, wxEmptyString ) );
 	
 	bSizer2->Add( m_customTxt, 1, wxALL|wxEXPAND, 5 );
 	
diff --git a/eeschema/dialogs/dialog_sim_settings_base.fbp b/eeschema/dialogs/dialog_sim_settings_base.fbp
index 00194907df..1fdf847b6c 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.fbp
+++ b/eeschema/dialogs/dialog_sim_settings_base.fbp
@@ -175,11 +175,11 @@
                         <event name="OnSetFocus"></event>
                         <event name="OnSize"></event>
                         <event name="OnUpdateUI"></event>
-                        <object class="notebookpage" expanded="0">
+                        <object class="notebookpage" expanded="1">
                             <property name="bitmap"></property>
                             <property name="label">AC</property>
                             <property name="select">1</property>
-                            <object class="wxPanel" expanded="0">
+                            <object class="wxPanel" expanded="1">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -253,7 +253,7 @@
                                 <event name="OnSetFocus"></event>
                                 <event name="OnSize"></event>
                                 <event name="OnUpdateUI"></event>
-                                <object class="wxBoxSizer" expanded="0">
+                                <object class="wxBoxSizer" expanded="1">
                                     <property name="minimum_size"></property>
                                     <property name="name">bSizer3</property>
                                     <property name="orient">wxVERTICAL</property>
@@ -318,7 +318,7 @@
                                             <property name="pin_button">1</property>
                                             <property name="pos"></property>
                                             <property name="resize">Resizable</property>
-                                            <property name="selection">2</property>
+                                            <property name="selection">0</property>
                                             <property name="show">1</property>
                                             <property name="size"></property>
                                             <property name="style">wxRA_SPECIFY_COLS</property>
@@ -1014,7 +1014,6 @@
                                             <property name="minimum_size"></property>
                                             <property name="name">sbSizer21</property>
                                             <property name="orient">wxVERTICAL</property>
-                                            <property name="parent">1</property>
                                             <property name="permission">none</property>
                                             <event name="OnUpdateUI"></event>
                                             <object class="sizeritem" expanded="0">
@@ -1831,7 +1830,6 @@
                                             <property name="minimum_size"></property>
                                             <property name="name">sbSizer2</property>
                                             <property name="orient">wxVERTICAL</property>
-                                            <property name="parent">1</property>
                                             <property name="permission">none</property>
                                             <event name="OnUpdateUI"></event>
                                             <object class="sizeritem" expanded="0">
diff --git a/eeschema/dialogs/dialog_sim_settings_base.h b/eeschema/dialogs/dialog_sim_settings_base.h
index bf1d09b1de..a8d62b4bba 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.h
+++ b/eeschema/dialogs/dialog_sim_settings_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 24 2016)
+// C++ code generated with wxFormBuilder (version Jun 17 2015)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!

From b2f60009a6ab1f941cd61d0d128503a2f8a1fe67 Mon Sep 17 00:00:00 2001
From: jp charras <jp.charras@wanadoo.fr>
Date: Thu, 11 Aug 2016 14:42:15 +0200
Subject: [PATCH 179/197] wxWidgets 3.1/Win7 fixes

---
 common/widgets/mathplot.cpp | 23 ++++++++++++-----------
 include/widgets/mathplot.h  |  3 ++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index 22f643ed96..040ab046fb 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -91,7 +91,7 @@ wxBitmap mpLayer::GetColourSquare(int side)
 {
     wxBitmap square(side, side, -1);
     wxColour filler = m_pen.GetColour();
-    wxBrush brush(filler, wxSOLID);
+    wxBrush brush(filler, wxBRUSHSTYLE_SOLID );
     wxMemoryDC dc;
     dc.SelectObject(square);
     dc.SetBackground(brush);
@@ -1236,14 +1236,14 @@ void mpScaleXBase::Plot(wxDC & dc, mpWindow & w)
                     else
                         dc.DrawLine( p, orgy, p, orgy+4);
                 } else { // draw grid dotted lines
-                    m_pen.SetStyle(wxDOT);
+                    m_pen.SetStyle(wxPENSTYLE_DOT);
                     dc.SetPen(m_pen);
                     if ((m_flags == mpALIGN_BOTTOM) && !m_drawOutsideMargins) {
                         //printf("d1");
-                        m_pen.SetStyle(wxDOT);
+                        m_pen.SetStyle(wxPENSTYLE_DOT);
                         dc.SetPen(m_pen);
                         dc.DrawLine( p, orgy+4, p, minYpx );
-                        m_pen.SetStyle(wxSOLID);
+                        m_pen.SetStyle(wxPENSTYLE_SOLID );
                         dc.SetPen(m_pen);
                         dc.DrawLine( p, orgy+4, p, orgy-4 );
                     } else {
@@ -1255,13 +1255,13 @@ void mpScaleXBase::Plot(wxDC & dc, mpWindow & w)
                             dc.DrawLine( p, minYpx, p, maxYpx ); //0/*-w.GetScrY()*/, p, w.GetScrY() );
                         }
                     }
-                    m_pen.SetStyle(wxSOLID);
+                    m_pen.SetStyle(wxPENSTYLE_SOLID );
                     dc.SetPen(m_pen);
                 }
             }
         }
 
-        m_pen.SetStyle(wxSOLID);
+        m_pen.SetStyle(wxPENSTYLE_SOLID );
         dc.SetPen(m_pen);
         dc.DrawLine( startPx, minYpx, endPx, minYpx );
         dc.DrawLine( startPx, maxYpx, endPx, maxYpx );
@@ -1419,7 +1419,7 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
                 } else {
                     dc.DrawLine( orgx-4, p, orgx+4, p);
 
-                    m_pen.SetStyle(wxDOT);
+                    m_pen.SetStyle(wxPENSTYLE_DOT);
                     dc.SetPen( m_pen);
                     if ((m_flags == mpALIGN_LEFT) && !m_drawOutsideMargins) {
                         dc.DrawLine( orgx-4, p, endPx, p);
@@ -1432,7 +1432,7 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
                             //dc.DrawLine( orgx-4/*-w.GetScrX()*/, p, w.GetScrX(), p);
                         }
                     }
-                    m_pen.SetStyle(wxSOLID);
+                    m_pen.SetStyle(wxPENSTYLE_SOLID );
                     dc.SetPen( m_pen);
                 }
                 // Print ticks labels
@@ -1671,7 +1671,7 @@ void mpWindow::OnMouseMove(wxMouseEvent     &event)
         if (event.m_leftDown) {
             if (m_movingInfoLayer == NULL) {
                 wxClientDC dc(this);
-                wxPen pen(m_fgColour, 1, wxDOT);
+                wxPen pen(m_fgColour, 1, wxPENSTYLE_DOT);
                 dc.SetPen(pen);
                 dc.SetBrush(*wxTRANSPARENT_BRUSH);
                 dc.DrawRectangle(m_mouseLClick.x, m_mouseLClick.y, event.GetX() - m_mouseLClick.x, event.GetY() - m_mouseLClick.y);
@@ -2265,7 +2265,7 @@ void mpWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 
     if(m_zooming)
     {
-        wxPen pen(m_fgColour, 1, wxDOT);
+        wxPen pen(m_fgColour, 1, wxPENSTYLE_DOT);
         trgDc->SetPen(pen);
         trgDc->SetBrush(*wxTRANSPARENT_BRUSH);
         trgDc->DrawRectangle(m_zoomRect);
@@ -2684,7 +2684,8 @@ void mpWindow::GetBoundingBox(double* bbox)
     bbox[3] = m_maxY;
 }
 
-bool mpWindow::SaveScreenshot(const wxString& filename, int type, wxSize imageSize, bool fit)
+bool mpWindow::SaveScreenshot( const wxString& filename, wxBitmapType type,
+                               wxSize imageSize, bool fit )
 {
     int sizeX, sizeY;
     int bk_scrX, bk_scrY;
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index 1f8c18f7db..170df50f1f 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -1301,7 +1301,8 @@ class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
           @param type image type to be saved: see wxImage output file types for flags
           @param imageSize Set a size for the output image. Default is the same as the screen size
           @param fit Decide whether to fit the plot into the size*/
-        bool SaveScreenshot(const wxString& filename, int type = wxBITMAP_TYPE_BMP, wxSize imageSize = wxDefaultSize, bool fit = false);
+        bool SaveScreenshot(const wxString& filename, wxBitmapType type = wxBITMAP_TYPE_BMP,
+                            wxSize imageSize = wxDefaultSize, bool fit = false);
 
         /** This value sets the zoom steps whenever the user clicks "Zoom in/out" or performs zoom with the mouse wheel.
          *  It must be a number above unity. This number is used for zoom in, and its inverse for zoom out. Set to 1.5 by default. */

From c9a1b45666b1db94d66dc5ab4703f8413614de5f Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:15 +0200
Subject: [PATCH 180/197] Fixed probe & tune cursors under Windows.

---
 eeschema/sim/simulate.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eeschema/sim/simulate.cpp b/eeschema/sim/simulate.cpp
index af151291c4..32a16a391f 100644
--- a/eeschema/sim/simulate.cpp
+++ b/eeschema/sim/simulate.cpp
@@ -107,6 +107,7 @@ public:
             wxBitmap probe_mask_bitmap( (const char*) cursor_probe_mask, 32, 32 );
             probe_bitmap.SetMask( new wxMask( probe_mask_bitmap ) );
             probe_image = new wxImage( probe_bitmap.ConvertToImage() );
+            probe_image->SetMaskColour( 255, 255, 255 );
             probe_image->SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_X, 0 );
             probe_image->SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_Y, 31 );
         }
@@ -124,6 +125,7 @@ public:
             wxBitmap tune_mask_bitmap( (const char*) cursor_tune_mask, 32, 32 );
             tune_bitmap.SetMask( new wxMask( tune_mask_bitmap ) );
             tune_image = new wxImage( tune_bitmap.ConvertToImage() );
+            tune_image->SetMaskColour( 255, 255, 255 );
             tune_image->SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_X, 0 );
             tune_image->SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_Y, 31 );
         }

From c78462c4f5d3b12d8f45e1b92cdebf64e05d5d5d Mon Sep 17 00:00:00 2001
From: Johannes Maibaum <jmaibaum@gmail.com>
Date: Thu, 11 Aug 2016 14:42:15 +0200
Subject: [PATCH 181/197] sim: Modifications to compile the simulator on OSX.

---
 eeschema/sim/ngspice.cpp        | 2 ++
 eeschema/sim/sim_plot_panel.cpp | 4 ++--
 eeschema/sim/simulate.cpp       | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 0c365c1ec2..62679d5370 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -37,6 +37,8 @@ NGSPICE::NGSPICE()
 {
 #ifdef __WINDOWS__
     m_dll = new wxDynamicLibrary( "libngspice-0.dll" );
+#elif __APPLE__
+    m_dll = new wxDynamicLibrary( "libngspice.dylib" );
 #else
     m_dll = new wxDynamicLibrary( "libngspice.so" );
 #endif
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 7dda9938db..4b40753db0 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -332,8 +332,8 @@ bool CURSOR::Inside( wxPoint& aPoint )
     if( !m_window )
         return false;
 
-    return ( std::abs( aPoint.x - m_window->x2p( m_trace->x2s( m_coords.x ) ) ) <= DRAG_MARGIN )
-        || ( std::abs( aPoint.y - m_window->y2p( m_trace->y2s( m_coords.y ) ) ) <= DRAG_MARGIN );
+    return ( std::abs( (double) aPoint.x - m_window->x2p( m_trace->x2s( m_coords.x ) ) ) <= DRAG_MARGIN )
+        || ( std::abs( (double) aPoint.y - m_window->y2p( m_trace->y2s( m_coords.y ) ) ) <= DRAG_MARGIN );
 }
 
 
diff --git a/eeschema/sim/simulate.cpp b/eeschema/sim/simulate.cpp
index 32a16a391f..c704995fb0 100644
--- a/eeschema/sim/simulate.cpp
+++ b/eeschema/sim/simulate.cpp
@@ -93,7 +93,7 @@ static const unsigned char cursor_tune_mask[] = {
    0x3c, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
    0x0e, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 };
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__) or defined(__WXMAC__)
 struct SIM_CURSORS_INIT
 {
 public:

From 46ecfd81399ae19f16bbd8e43bb7613460a2f951 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:16 +0200
Subject: [PATCH 182/197] Resized simulator dialogs

---
 eeschema/dialogs/dialog_signal_list_base.cpp  |  2 +-
 eeschema/dialogs/dialog_signal_list_base.fbp  |  2 +-
 eeschema/dialogs/dialog_sim_settings_base.cpp |  4 +-
 eeschema/dialogs/dialog_sim_settings_base.fbp |  4 +-
 eeschema/dialogs/dialog_sim_settings_base.h   |  4 +-
 eeschema/dialogs/dialog_spice_model_base.cpp  |  4 +-
 eeschema/dialogs/dialog_spice_model_base.fbp  |  6 +--
 eeschema/dialogs/dialog_spice_model_base.h    |  2 +-
 eeschema/sim/sim_plot_frame_base.cpp          |  4 +-
 eeschema/sim/sim_plot_frame_base.fbp          | 38 +++++++++----------
 eeschema/sim/sim_plot_frame_base.h            |  6 +--
 11 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/eeschema/dialogs/dialog_signal_list_base.cpp b/eeschema/dialogs/dialog_signal_list_base.cpp
index d07cb0323c..177f64c5ad 100644
--- a/eeschema/dialogs/dialog_signal_list_base.cpp
+++ b/eeschema/dialogs/dialog_signal_list_base.cpp
@@ -16,7 +16,7 @@ DIALOG_SIGNAL_LIST_BASE::DIALOG_SIGNAL_LIST_BASE( wxWindow* parent, wxWindowID i
 	wxBoxSizer* bSizer6;
 	bSizer6 = new wxBoxSizer( wxVERTICAL );
 	
-	m_signals = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_MULTIPLE|wxLB_NEEDED_SB|wxLB_SORT ); 
+	m_signals = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_NEEDED_SB|wxLB_SORT ); 
 	bSizer6->Add( m_signals, 1, wxALL|wxEXPAND, 5 );
 	
 	m_sdbSizer = new wxStdDialogButtonSizer();
diff --git a/eeschema/dialogs/dialog_signal_list_base.fbp b/eeschema/dialogs/dialog_signal_list_base.fbp
index 484ab18a7c..7c677737bd 100644
--- a/eeschema/dialogs/dialog_signal_list_base.fbp
+++ b/eeschema/dialogs/dialog_signal_list_base.fbp
@@ -143,7 +143,7 @@
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
                         <property name="size"></property>
-                        <property name="style">wxLB_MULTIPLE|wxLB_NEEDED_SB|wxLB_SORT</property>
+                        <property name="style">wxLB_EXTENDED|wxLB_NEEDED_SB|wxLB_SORT</property>
                         <property name="subclass"></property>
                         <property name="toolbar_pane">0</property>
                         <property name="tooltip"></property>
diff --git a/eeschema/dialogs/dialog_sim_settings_base.cpp b/eeschema/dialogs/dialog_sim_settings_base.cpp
index 2d5f2e86e4..64231f41a7 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.cpp
+++ b/eeschema/dialogs/dialog_sim_settings_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -368,7 +368,7 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID
 	bSizer2->Add( m_staticText18, 0, wxALL, 5 );
 	
 	m_customTxt = new wxTextCtrl( m_pgCustom, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-	m_customTxt->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 76, 90, 90, false, wxEmptyString ) );
+	m_customTxt->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 	
 	bSizer2->Add( m_customTxt, 1, wxALL|wxEXPAND, 5 );
 	
diff --git a/eeschema/dialogs/dialog_sim_settings_base.fbp b/eeschema/dialogs/dialog_sim_settings_base.fbp
index 1fdf847b6c..1312b87579 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.fbp
+++ b/eeschema/dialogs/dialog_sim_settings_base.fbp
@@ -44,7 +44,7 @@
             <property name="minimum_size"></property>
             <property name="name">DIALOG_SIM_SETTINGS_BASE</property>
             <property name="pos"></property>
-            <property name="size">445,677</property>
+            <property name="size">450,700</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE</property>
             <property name="subclass"></property>
             <property name="title">Simulation settings</property>
@@ -1014,6 +1014,7 @@
                                             <property name="minimum_size"></property>
                                             <property name="name">sbSizer21</property>
                                             <property name="orient">wxVERTICAL</property>
+                                            <property name="parent">1</property>
                                             <property name="permission">none</property>
                                             <event name="OnUpdateUI"></event>
                                             <object class="sizeritem" expanded="0">
@@ -1830,6 +1831,7 @@
                                             <property name="minimum_size"></property>
                                             <property name="name">sbSizer2</property>
                                             <property name="orient">wxVERTICAL</property>
+                                            <property name="parent">1</property>
                                             <property name="permission">none</property>
                                             <event name="OnUpdateUI"></event>
                                             <object class="sizeritem" expanded="0">
diff --git a/eeschema/dialogs/dialog_sim_settings_base.h b/eeschema/dialogs/dialog_sim_settings_base.h
index a8d62b4bba..c010e6aab5 100644
--- a/eeschema/dialogs/dialog_sim_settings_base.h
+++ b/eeschema/dialogs/dialog_sim_settings_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// C++ code generated with wxFormBuilder (version Jun 24 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -115,7 +115,7 @@ class DIALOG_SIM_SETTINGS_BASE : public wxDialog
 	
 	public:
 		
-		DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Simulation settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 445,677 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+		DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Simulation settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 450,700 ), long style = wxDEFAULT_DIALOG_STYLE ); 
 		~DIALOG_SIM_SETTINGS_BASE();
 	
 };
diff --git a/eeschema/dialogs/dialog_spice_model_base.cpp b/eeschema/dialogs/dialog_spice_model_base.cpp
index db1eefd828..c888c6f210 100644
--- a/eeschema/dialogs/dialog_spice_model_base.cpp
+++ b/eeschema/dialogs/dialog_spice_model_base.cpp
@@ -47,7 +47,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i
 	m_passive->SetSizer( fgSizer1 );
 	m_passive->Layout();
 	fgSizer1->Fit( m_passive );
-	m_notebook->AddPage( m_passive, _("Passive"), true );
+	m_notebook->AddPage( m_passive, _("Passive"), false );
 	m_semiconductor = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxFlexGridSizer* fgSizer3;
 	fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0 );
@@ -438,7 +438,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i
 	m_power->SetSizer( bSizer4 );
 	m_power->Layout();
 	bSizer4->Fit( m_power );
-	m_notebook->AddPage( m_power, _("Source"), false );
+	m_notebook->AddPage( m_power, _("Source"), true );
 	
 	bSizer1->Add( m_notebook, 1, wxEXPAND | wxALL, 5 );
 	
diff --git a/eeschema/dialogs/dialog_spice_model_base.fbp b/eeschema/dialogs/dialog_spice_model_base.fbp
index 4574086a82..7171827c58 100644
--- a/eeschema/dialogs/dialog_spice_model_base.fbp
+++ b/eeschema/dialogs/dialog_spice_model_base.fbp
@@ -44,7 +44,7 @@
             <property name="minimum_size"></property>
             <property name="name">DIALOG_SPICE_MODEL_BASE</property>
             <property name="pos"></property>
-            <property name="size">497,719</property>
+            <property name="size">500,768</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE</property>
             <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
             <property name="title"></property>
@@ -178,7 +178,7 @@
                         <object class="notebookpage" expanded="0">
                             <property name="bitmap"></property>
                             <property name="label">Passive</property>
-                            <property name="select">1</property>
+                            <property name="select">0</property>
                             <object class="wxPanel" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
@@ -1881,7 +1881,7 @@
                         <object class="notebookpage" expanded="1">
                             <property name="bitmap"></property>
                             <property name="label">Source</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>
diff --git a/eeschema/dialogs/dialog_spice_model_base.h b/eeschema/dialogs/dialog_spice_model_base.h
index 158b0b1dfd..e299d60baa 100644
--- a/eeschema/dialogs/dialog_spice_model_base.h
+++ b/eeschema/dialogs/dialog_spice_model_base.h
@@ -143,7 +143,7 @@ class DIALOG_SPICE_MODEL_BASE : public DIALOG_SHIM
 	
 	public:
 		
-		DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 497,719 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+		DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,768 ), long style = wxDEFAULT_DIALOG_STYLE ); 
 		~DIALOG_SPICE_MODEL_BASE();
 	
 };
diff --git a/eeschema/sim/sim_plot_frame_base.cpp b/eeschema/sim/sim_plot_frame_base.cpp
index 9febb8fecf..01127ab713 100644
--- a/eeschema/sim/sim_plot_frame_base.cpp
+++ b/eeschema/sim/sim_plot_frame_base.cpp
@@ -170,7 +170,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_panel5->SetSizer( m_sizer13 );
 	m_panel5->Layout();
 	m_sizer13->Fit( m_panel5 );
-	m_splitterConsole->SplitHorizontally( m_plotPanel, m_panel5, 0 );
+	m_splitterConsole->SplitHorizontally( m_plotPanel, m_panel5, 500 );
 	m_sizer11->Add( m_splitterConsole, 1, wxEXPAND, 5 );
 	
 	
@@ -212,7 +212,7 @@ SIM_PLOT_FRAME_BASE::SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id, const
 	m_sidePanel->SetSizer( m_sideSizer );
 	m_sidePanel->Layout();
 	m_sideSizer->Fit( m_sidePanel );
-	m_splitterPlot->SplitVertically( m_panel2, m_sidePanel, 0 );
+	m_splitterPlot->SplitVertically( m_panel2, m_sidePanel, 700 );
 	m_sizer1->Add( m_splitterPlot, 1, wxEXPAND, 5 );
 	
 	
diff --git a/eeschema/sim/sim_plot_frame_base.fbp b/eeschema/sim/sim_plot_frame_base.fbp
index 7aa7be9adb..9990183bf7 100644
--- a/eeschema/sim/sim_plot_frame_base.fbp
+++ b/eeschema/sim/sim_plot_frame_base.fbp
@@ -44,7 +44,7 @@
             <property name="minimum_size"></property>
             <property name="name">SIM_PLOT_FRAME_BASE</property>
             <property name="pos"></property>
-            <property name="size">1280,900</property>
+            <property name="size">1000,700</property>
             <property name="style">wxDEFAULT_FRAME_STYLE</property>
             <property name="subclass">KIWAY_PLAYER; kiway_player.h</property>
             <property name="title">Simulation Workbook</property>
@@ -88,7 +88,7 @@
             <event name="OnSetFocus"></event>
             <event name="OnSize"></event>
             <event name="OnUpdateUI"></event>
-            <object class="wxMenuBar" expanded="1">
+            <object class="wxMenuBar" expanded="0">
                 <property name="bg"></property>
                 <property name="context_help"></property>
                 <property name="context_menu">1</property>
@@ -133,7 +133,7 @@
                 <event name="OnSetFocus"></event>
                 <event name="OnSize"></event>
                 <event name="OnUpdateUI"></event>
-                <object class="wxMenu" expanded="1">
+                <object class="wxMenu" expanded="0">
                     <property name="label">File</property>
                     <property name="name">m_fileMenu</property>
                     <property name="permission">protected</property>
@@ -240,7 +240,7 @@
                         <event name="OnUpdateUI"></event>
                     </object>
                 </object>
-                <object class="wxMenu" expanded="1">
+                <object class="wxMenu" expanded="0">
                     <property name="label">Simulation</property>
                     <property name="name">m_simulationMenu</property>
                     <property name="permission">protected</property>
@@ -552,7 +552,7 @@
                         <property name="pos"></property>
                         <property name="resize">Resizable</property>
                         <property name="sashgravity">0.8</property>
-                        <property name="sashpos">0</property>
+                        <property name="sashpos">700</property>
                         <property name="sashsize">-1</property>
                         <property name="show">1</property>
                         <property name="size"></property>
@@ -720,7 +720,7 @@
                                             <property name="pos"></property>
                                             <property name="resize">Resizable</property>
                                             <property name="sashgravity">0.8</property>
-                                            <property name="sashpos">0</property>
+                                            <property name="sashpos">500</property>
                                             <property name="sashsize">-1</property>
                                             <property name="show">1</property>
                                             <property name="size"></property>
@@ -839,11 +839,11 @@
                                                         <property name="name">m_sizer5</property>
                                                         <property name="orient">wxHORIZONTAL</property>
                                                         <property name="permission">protected</property>
-                                                        <object class="sizeritem" expanded="1">
+                                                        <object class="sizeritem" expanded="0">
                                                             <property name="border">5</property>
                                                             <property name="flag">wxEXPAND | wxALL</property>
                                                             <property name="proportion">1</property>
-                                                            <object class="wxAuiNotebook" expanded="1">
+                                                            <object class="wxAuiNotebook" expanded="0">
                                                                 <property name="BottomDockable">1</property>
                                                                 <property name="LeftDockable">1</property>
                                                                 <property name="RightDockable">1</property>
@@ -929,7 +929,7 @@
                                                                 <event name="OnSetFocus"></event>
                                                                 <event name="OnSize"></event>
                                                                 <event name="OnUpdateUI"></event>
-                                                                <object class="auinotebookpage" expanded="1">
+                                                                <object class="auinotebookpage" expanded="0">
                                                                     <property name="bitmap"></property>
                                                                     <property name="label">a page</property>
                                                                     <property name="select">0</property>
@@ -1154,8 +1154,8 @@
                                                     </object>
                                                 </object>
                                             </object>
-                                            <object class="splitteritem" expanded="0">
-                                                <object class="wxPanel" expanded="0">
+                                            <object class="splitteritem" expanded="1">
+                                                <object class="wxPanel" expanded="1">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
                                                     <property name="RightDockable">1</property>
@@ -1229,7 +1229,7 @@
                                                     <event name="OnSetFocus"></event>
                                                     <event name="OnSize"></event>
                                                     <event name="OnUpdateUI"></event>
-                                                    <object class="wxBoxSizer" expanded="0">
+                                                    <object class="wxBoxSizer" expanded="1">
                                                         <property name="minimum_size"></property>
                                                         <property name="name">m_sizer13</property>
                                                         <property name="orient">wxVERTICAL</property>
@@ -1333,8 +1333,8 @@
                                 </object>
                             </object>
                         </object>
-                        <object class="splitteritem" expanded="0">
-                            <object class="wxPanel" expanded="0">
+                        <object class="splitteritem" expanded="1">
+                            <object class="wxPanel" expanded="1">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -1408,12 +1408,12 @@
                                 <event name="OnSetFocus"></event>
                                 <event name="OnSize"></event>
                                 <event name="OnUpdateUI"></event>
-                                <object class="wxBoxSizer" expanded="0">
+                                <object class="wxBoxSizer" expanded="1">
                                     <property name="minimum_size"></property>
                                     <property name="name">m_sideSizer</property>
                                     <property name="orient">wxVERTICAL</property>
                                     <property name="permission">protected</property>
-                                    <object class="sizeritem" expanded="0">
+                                    <object class="sizeritem" expanded="1">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
@@ -1516,7 +1516,7 @@
                                             </object>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="0">
+                                    <object class="sizeritem" expanded="1">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
@@ -1636,11 +1636,11 @@
                                             </object>
                                         </object>
                                     </object>
-                                    <object class="sizeritem" expanded="0">
+                                    <object class="sizeritem" expanded="1">
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND</property>
                                         <property name="proportion">1</property>
-                                        <object class="wxStaticBoxSizer" expanded="0">
+                                        <object class="wxStaticBoxSizer" expanded="1">
                                             <property name="id">wxID_ANY</property>
                                             <property name="label">Tune</property>
                                             <property name="minimum_size"></property>
diff --git a/eeschema/sim/sim_plot_frame_base.h b/eeschema/sim/sim_plot_frame_base.h
index 7e2f63b2ad..b41679a951 100644
--- a/eeschema/sim/sim_plot_frame_base.h
+++ b/eeschema/sim/sim_plot_frame_base.h
@@ -99,19 +99,19 @@ class SIM_PLOT_FRAME_BASE : public KIWAY_PLAYER
 	
 	public:
 		
-		SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Simulation Workbook"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1280,900 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("SIM_PLOT_FRAME") );
+		SIM_PLOT_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Simulation Workbook"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1000,700 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("SIM_PLOT_FRAME") );
 		
 		~SIM_PLOT_FRAME_BASE();
 		
 		void m_splitterPlotOnIdle( wxIdleEvent& )
 		{
-			m_splitterPlot->SetSashPosition( 0 );
+			m_splitterPlot->SetSashPosition( 700 );
 			m_splitterPlot->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterPlotOnIdle ), NULL, this );
 		}
 		
 		void m_splitterConsoleOnIdle( wxIdleEvent& )
 		{
-			m_splitterConsole->SetSashPosition( 0 );
+			m_splitterConsole->SetSashPosition( 500 );
 			m_splitterConsole->Disconnect( wxEVT_IDLE, wxIdleEventHandler( SIM_PLOT_FRAME_BASE::m_splitterConsoleOnIdle ), NULL, this );
 		}
 	

From 0a6390701d7fbc03eb0d930e185b013357dbcd16 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:16 +0200
Subject: [PATCH 183/197] NGSPICE uses a more convenient function to generate
 DLL name

---
 eeschema/sim/ngspice.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 62679d5370..40ab66a89b 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -37,10 +37,8 @@ NGSPICE::NGSPICE()
 {
 #ifdef __WINDOWS__
     m_dll = new wxDynamicLibrary( "libngspice-0.dll" );
-#elif __APPLE__
-    m_dll = new wxDynamicLibrary( "libngspice.dylib" );
 #else
-    m_dll = new wxDynamicLibrary( "libngspice.so" );
+    m_dll = new wxDynamicLibrary( wxDynamicLibrary::CanonicalizeName( "ngspice" ) );
 #endif
 
     if( !m_dll || !m_dll->IsLoaded() )

From 957c6ec4170befdf1461c8e458d30297b0d9360c Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:17 +0200
Subject: [PATCH 184/197] Removed hard limit for ngspice netlist

---
 eeschema/sim/ngspice.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 40ab66a89b..dacc729e08 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -217,26 +217,24 @@ vector<double> NGSPICE::GetPhasePlot( const string& aName, int aMaxLen )
 
 bool NGSPICE::LoadNetlist( const string& aNetlist )
 {
-    // TODO remove the hard limit
-    char* lines[16384];
+    vector<char*> lines;
     stringstream ss( aNetlist );
-    int n = 0;
 
-    while( !ss.eof() && n < 16384 )
+    while( !ss.eof() )
     {
         char line[1024];
-        ss.getline( line, sizeof(line) );
-        lines[n++] = strdup(line);
-
+        ss.getline( line, sizeof( line ) );
+        lines.push_back( strdup( line ) );
     }
-    lines[n] = NULL;
+
+    lines.push_back( nullptr );
 
     setlocale( LC_ALL, "C" );
-    m_ngSpice_Circ( lines );
+    m_ngSpice_Circ( lines.data() );
     setlocale( LC_ALL, "" );
 
-    for(int i = 0; i < n; i++)
-        delete lines[i];
+    for( auto line : lines )
+        delete line;
 
     return true;
 }

From eeeb3e0a9a0d51dbd2b53dee5a7284fecdc58a00 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:17 +0200
Subject: [PATCH 185/197] Simulator code formatting and clean up

---
 eeschema/sim/netlist_exporter_pspice_sim.cpp |   3 -
 eeschema/sim/netlist_exporter_pspice_sim.h   |  25 +-
 eeschema/sim/ngspice.cpp                     |  12 +-
 eeschema/sim/ngspice.h                       |  41 ++-
 eeschema/sim/sim_plot_frame.cpp              |  37 +--
 eeschema/sim/sim_plot_frame.h                | 328 ++++++++++---------
 eeschema/sim/sim_plot_panel.cpp              | 161 ++++-----
 eeschema/sim/sim_plot_panel.h                |  38 +--
 eeschema/sim/sim_types.h                     |   1 +
 eeschema/sim/simulate.h                      |  11 -
 eeschema/sim/spice_simulator.h               |  62 +++-
 eeschema/sim/spice_value.cpp                 |   4 +-
 eeschema/sim/spice_value.h                   |  19 ++
 13 files changed, 443 insertions(+), 299 deletions(-)
 delete mode 100644 eeschema/sim/simulate.h

diff --git a/eeschema/sim/netlist_exporter_pspice_sim.cpp b/eeschema/sim/netlist_exporter_pspice_sim.cpp
index 1e5ca02435..516618e8c7 100644
--- a/eeschema/sim/netlist_exporter_pspice_sim.cpp
+++ b/eeschema/sim/netlist_exporter_pspice_sim.cpp
@@ -44,8 +44,6 @@ wxString NETLIST_EXPORTER_PSPICE_SIM::GetSpiceVector( const wxString& aName, SIM
         return wxString::Format( "V(%d)", it->second );
     }
 
-
-    /// @todo check is Lower() is required
     else if( aType & SPT_CURRENT )
     {
         return wxString::Format( "@%s[%s]", GetSpiceDevice( aName ).Lower(),
@@ -183,5 +181,4 @@ void NETLIST_EXPORTER_PSPICE_SIM::writeDirectives( OUTPUTFORMATTER* aFormatter,
         // Finish with our custom simulation command
         aFormatter->Print( 0, "%s\n", (const char*) m_simCommand.c_str() );
     }
-
 }
diff --git a/eeschema/sim/netlist_exporter_pspice_sim.h b/eeschema/sim/netlist_exporter_pspice_sim.h
index 6cd76c81d7..78e03fb5c7 100644
--- a/eeschema/sim/netlist_exporter_pspice_sim.h
+++ b/eeschema/sim/netlist_exporter_pspice_sim.h
@@ -64,30 +64,53 @@ public:
      */
     static const std::vector<wxString>& GetCurrents( SPICE_PRIMITIVE aPrimitive );
 
+    /**
+     * @brief Overrides the simulation command directive.
+     */
     void SetSimCommand( const wxString& aCmd )
     {
         m_simCommand = aCmd;
     }
 
+    /**
+     * @brief Returns the simulation command directive.
+     */
     const wxString& GetSimCommand() const
     {
         return m_simCommand;
     }
 
+    /**
+     * @brief Clears the simulation command directive.
+     */
     void ClearSimCommand()
     {
         m_simCommand.Clear();
     }
 
+    /**
+     * @brief Returns simulation type basing on the simulation command directives.
+     * Simulation directives set using SetSimCommand() have priority over the ones placed in
+     * schematic sheets.
+     */
     SIM_TYPE GetSimType();
 
+    /**
+     * @brief Returns simulation command directives placed in schematic sheets (if any).
+     */
     wxString GetSheetSimCommand();
 
+    /**
+     * @brief Determines if a directive is a simulation command.
+     */
     static bool IsSimCommand( const wxString& aCmd )
     {
         return CommandToSimType( aCmd ) != ST_UNKNOWN;
     }
 
+    /**
+     * @brief Returns simulation type basing on a simulation command directive.
+     */
     static SIM_TYPE CommandToSimType( const wxString& aCmd );
 
 protected:
@@ -95,7 +118,7 @@ protected:
 
 private:
 
-    ///> Overridden simulation command
+    ///> Custom simulation command (has priority over the schematic sheet simulation commands)
     wxString m_simCommand;
 };
 
diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index dacc729e08..54a5c8ffc4 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -52,7 +52,6 @@ NGSPICE::NGSPICE()
     m_ngSpice_AllPlots = (ngSpice_AllPlots) m_dll->GetSymbol( "ngSpice_AllPlots" );
     m_ngSpice_AllVecs = (ngSpice_AllVecs) m_dll->GetSymbol( "ngSpice_AllVecs" );
     m_ngSpice_Running = (ngSpice_Running) m_dll->GetSymbol( "ngSpice_running" );
-
 }
 
 
@@ -243,7 +242,7 @@ bool NGSPICE::LoadNetlist( const string& aNetlist )
 bool NGSPICE::Run()
 {
     setlocale( LC_ALL, "C" );
-    bool rv =  Command( "bg_run" );
+    bool rv = Command( "bg_run" );  // bg_* commands execute in a separate thread
     setlocale( LC_ALL, "" );
     return rv;
 }
@@ -252,7 +251,7 @@ bool NGSPICE::Run()
 bool NGSPICE::Stop()
 {
     setlocale( LC_ALL, "C" );
-    bool rv = Command( "bg_halt" );
+    bool rv = Command( "bg_halt" ); // bg_* commands execute in a separate thread
     setlocale( LC_ALL, "" );
     return rv;
 }
@@ -301,10 +300,11 @@ string NGSPICE::GetXAxis( SIM_TYPE aType ) const
     return string( "" );
 }
 
-int NGSPICE::cbControlledExit ( int status, bool immediate, bool exit_upon_quit, int id, void *user )
+
+int NGSPICE::cbControlledExit( int status, bool immediate, bool exit_upon_quit, int id, void* user )
 {
-        printf("stat %d immed %d quit %d\n", status, !!immediate, !!exit_upon_quit);
-        return 0;
+    //printf("stat %d immed %d quit %d\n", status, !!immediate, !!exit_upon_quit);
+    return 0;
 }
 
 
diff --git a/eeschema/sim/ngspice.h b/eeschema/sim/ngspice.h
index ca5d1fca87..5fa3f9c7ce 100644
--- a/eeschema/sim/ngspice.h
+++ b/eeschema/sim/ngspice.h
@@ -36,32 +36,54 @@ public:
     NGSPICE();
     virtual ~NGSPICE();
 
+    ///> @copydoc SPICE_SIMULATOR::Init()
     void Init() override;
+
+    ///> @copydoc SPICE_SIMULATOR::LoadNetlist()
     bool LoadNetlist( const std::string& aNetlist ) override;
+
+    ///> @copydoc SPICE_SIMULATOR::Run()
     bool Run() override;
+
+    ///> @copydoc SPICE_SIMULATOR::Stop()
     bool Stop() override;
+
+    ///> @copydoc SPICE_SIMULATOR::IsRunning()
     bool IsRunning() override;
+
+    ///> @copydoc SPICE_SIMULATOR::Command()
     bool Command( const std::string& aCmd ) override;
+
+    ///> @copydoc SPICE_SIMULATOR::GetXAxis()
     std::string GetXAxis( SIM_TYPE aType ) const override;
 
+    ///> @copydoc SPICE_SIMULATOR::GetPlot()
     std::vector<COMPLEX> GetPlot( const std::string& aName, int aMaxLen = -1 ) override;
+
+    ///> @copydoc SPICE_SIMULATOR::GetRealPlot()
     std::vector<double> GetRealPlot( const std::string& aName, int aMaxLen = -1 ) override;
+
+    ///> @copydoc SPICE_SIMULATOR::GetImagPlot()
     std::vector<double> GetImagPlot( const std::string& aName, int aMaxLen = -1 ) override;
+
+    ///> @copydoc SPICE_SIMULATOR::GetMagPlot()
     std::vector<double> GetMagPlot( const std::string& aName, int aMaxLen = -1 ) override;
+
+    ///> @copydoc SPICE_SIMULATOR::GetPhasePlot()
     std::vector<double> GetPhasePlot( const std::string& aName, int aMaxLen = -1 ) override;
 
 private:
+    // ngspice library functions
     typedef void (*ngSpice_Init)( SendChar*, SendStat*, ControlledExit*,
                                     SendData*, SendInitData*, BGThreadRunning*, void* );
+    typedef int (*ngSpice_Circ)( char** circarray );
+    typedef int (*ngSpice_Command)( char* command );
+    typedef pvector_info (*ngGet_Vec_Info)( char* vecname );
+    typedef char** (*ngSpice_AllPlots)( void );
+    typedef char** (*ngSpice_AllVecs)( char* plotname );
+    typedef bool (*ngSpice_Running)( void );
 
-    // ngspice library functions
-    typedef int (*ngSpice_Circ)(char** circarray);
-    typedef int (*ngSpice_Command)(char* command);
-    typedef pvector_info (*ngGet_Vec_Info)(char* vecname);
-    typedef char** (*ngSpice_AllPlots)(void);
-    typedef char** (*ngSpice_AllVecs)(char* plotname);
-    typedef bool (*ngSpice_Running)(void);
-
+    ///> Handles to DLL functions
     ngSpice_Init m_ngSpice_Init;
     ngSpice_Circ m_ngSpice_Circ;
     ngSpice_Command m_ngSpice_Command;
@@ -72,10 +94,11 @@ private:
 
     wxDynamicLibrary* m_dll;
 
+    // Callback functions
     static int cbSendChar( char* what, int id, void* user );
     static int cbSendStat( char* what, int id, void* user );
     static int cbBGThreadRunning( bool is_running, int id, void* user );
-    static int cbControlledExit ( int status, bool immediate, bool exit_upon_quit, int id, void *user );
+    static int cbControlledExit( int status, bool immediate, bool exit_upon_quit, int id, void* user );
 
     void dump();
 };
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index dc92a9f7a3..c693195b71 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -45,6 +45,7 @@ SIM_PLOT_TYPE operator|( SIM_PLOT_TYPE aFirst, SIM_PLOT_TYPE aSecond )
     return (SIM_PLOT_TYPE) res;
 }
 
+
 class SIM_THREAD_REPORTER : public SPICE_REPORTER
 {
 public:
@@ -117,11 +118,17 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     Connect( EVT_SIM_FINISHED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimFinished ), NULL, this );
     Connect( EVT_SIM_CURSOR_UPDATE, wxCommandEventHandler( SIM_PLOT_FRAME::onCursorUpdate ), NULL, this );
 
-    m_toolSimulate = m_toolBar->AddTool( ID_SIM_RUN, _("Run/Stop Simulation"), KiBitmap( sim_run_xpm ), _("Run Simulation"), wxITEM_NORMAL );
-    m_toolAddSignals = m_toolBar->AddTool( ID_SIM_ADD_SIGNALS, _("Add Signals"), KiBitmap( sim_add_signal_xpm ), _("Add signals to plot"), wxITEM_NORMAL );
-    m_toolProbe = m_toolBar->AddTool( ID_SIM_PROBE,  _("Probe"), KiBitmap( sim_probe_xpm ),_("Probe signals on the schematic"), wxITEM_NORMAL );
-    m_toolTune = m_toolBar->AddTool( ID_SIM_TUNE, _("Tune"), KiBitmap( sim_tune_xpm ), _("Tune component values"), wxITEM_NORMAL );
-    m_toolSettings = m_toolBar->AddTool( wxID_ANY, _("Settings"), KiBitmap( sim_settings_xpm ), _("Simulation settings"), wxITEM_NORMAL );
+    // Toolbar buttons
+    m_toolSimulate = m_toolBar->AddTool( ID_SIM_RUN, _( "Run/Stop Simulation" ),
+            KiBitmap( sim_run_xpm ), _( "Run Simulation" ), wxITEM_NORMAL );
+    m_toolAddSignals = m_toolBar->AddTool( ID_SIM_ADD_SIGNALS, _( "Add Signals" ),
+            KiBitmap( sim_add_signal_xpm ), _( "Add signals to plot" ), wxITEM_NORMAL );
+    m_toolProbe = m_toolBar->AddTool( ID_SIM_PROBE,  _( "Probe" ),
+            KiBitmap( sim_probe_xpm ), _( "Probe signals on the schematic" ), wxITEM_NORMAL );
+    m_toolTune = m_toolBar->AddTool( ID_SIM_TUNE, _( "Tune" ),
+            KiBitmap( sim_tune_xpm ), _( "Tune component values" ), wxITEM_NORMAL );
+    m_toolSettings = m_toolBar->AddTool( wxID_ANY, _( "Settings" ),
+            KiBitmap( sim_settings_xpm ), _( "Simulation settings" ), wxITEM_NORMAL );
 
     Connect( m_toolSimulate->GetId(), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME::onSimulate ), NULL, this );
     Connect( m_toolAddSignals->GetId(), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME::onAddSignal ), NULL, this );
@@ -129,6 +136,7 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     Connect( m_toolTune->GetId(), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME::onTune ), NULL, this );
     Connect( m_toolSettings->GetId(), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler( SIM_PLOT_FRAME::onSettings ), NULL, this );
 
+    // Bind toolbar buttons event to existing menu event handlers, so they behave the same
     Bind( wxEVT_COMMAND_MENU_SELECTED, &SIM_PLOT_FRAME::onSimulate,  this, m_runSimulation->GetId() );
     Bind( wxEVT_COMMAND_MENU_SELECTED, &SIM_PLOT_FRAME::onAddSignal, this, m_addSignals->GetId() );
     Bind( wxEVT_COMMAND_MENU_SELECTED, &SIM_PLOT_FRAME::onProbe,     this, m_probeSignals->GetId() );
@@ -136,7 +144,7 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
     Bind( wxEVT_COMMAND_MENU_SELECTED, &SIM_PLOT_FRAME::onSettings,  this, m_settings->GetId() );
 
     m_toolBar->Realize();
-    m_plotNotebook->SetPageText(0, _("Welcome!") );
+    m_plotNotebook->SetPageText( 0, _( "Welcome!" ) );
 }
 
 
@@ -180,8 +188,6 @@ void SIM_PLOT_FRAME::StartSimulation()
     updateTuners();
     applyTuners();
     m_simulator->Run();
-
-    Layout();
 }
 
 
@@ -746,21 +752,6 @@ void SIM_PLOT_FRAME::menuShowLegendUpdate( wxUpdateUIEvent& event )
     event.Check( plot ? plot->IsLegendShown() : false );
 }
 
-#if 0
-void SIM_PLOT_FRAME::menuShowCoords( wxCommandEvent& event )
-{
-    SIM_PLOT_PANEL* plot = CurrentPlot();
-    plot->ShowCoords( !plot->IsCoordsShown() );
-}
-
-
-void SIM_PLOT_FRAME::menuShowCoordsUpdate( wxUpdateUIEvent& event )
-{
-    SIM_PLOT_PANEL* plot = CurrentPlot();
-    event.Check( plot ? plot->IsCoordsShown() : false );
-}
-#endif
-
 
 void SIM_PLOT_FRAME::onPlotClose( wxAuiNotebookEvent& event )
 {
diff --git a/eeschema/sim/sim_plot_frame.h b/eeschema/sim/sim_plot_frame.h
index adae18328d..03cf5dc9d1 100644
--- a/eeschema/sim/sim_plot_frame.h
+++ b/eeschema/sim/sim_plot_frame.h
@@ -27,7 +27,8 @@
 #define __sim_plot_frame__
 
 /**
-@file Subclass of SIM_PLOT_FRAME_BASE, which is generated by wxFormBuilder. */
+ * @file Subclass of SIM_PLOT_FRAME_BASE, which is generated by wxFormBuilder.
+ */
 
 #include "sim_plot_frame_base.h"
 #include "sim_types.h"
@@ -49,7 +50,7 @@ class NETLIST_EXPORTER_PSPICE_SIM;
 class SIM_PLOT_PANEL;
 class TUNER_SLIDER;
 
-/// @todo description
+///> Trace descriptor class
 class TRACE_DESC
 {
 public:
@@ -102,191 +103,218 @@ private:
 /** Implementing SIM_PLOT_FRAME_BASE */
 class SIM_PLOT_FRAME : public SIM_PLOT_FRAME_BASE
 {
-    public:
-        /** Constructor */
-        SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent );
-        ~SIM_PLOT_FRAME();
+public:
+    /** Constructor */
+    SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent );
+    ~SIM_PLOT_FRAME();
 
-        void StartSimulation();
-        void StopSimulation();
-        bool IsSimulationRunning();
+    void StartSimulation();
+    void StopSimulation();
+    bool IsSimulationRunning();
 
-        /**
-         * @brief Creates a new plot panel for a given simulation type and adds it to the main
-         * notebook.
-         * @param aSimType is requested simulation type.
-         * @return The new plot panel.
-         */
-        SIM_PLOT_PANEL* NewPlotPanel( SIM_TYPE aSimType );
+    /**
+     * @brief Creates a new plot panel for a given simulation type and adds it to the main
+     * notebook.
+     * @param aSimType is requested simulation type.
+     * @return The new plot panel.
+     */
+    SIM_PLOT_PANEL* NewPlotPanel( SIM_TYPE aSimType );
 
-        void AddVoltagePlot( const wxString& aNetName );
-        void AddCurrentPlot( const wxString& aDeviceName, const wxString& aParam );
+    /**
+     * @brief Adds a voltage plot for a given net name.
+     * @param aNetName is the net name for which a voltage plot should be created.
+     */
+    void AddVoltagePlot( const wxString& aNetName );
 
-        void AddTuner( SCH_COMPONENT* aComponent );
-        void RemoveTuner( TUNER_SLIDER* aTuner, bool aErase = true );
+    /**
+     * @brief Adds a current plot for a particular device.
+     * @param aDeviceName is the device name (e.g. R1, C1).
+     * @param aParam is the current type (e.g. I, Ic, Id).
+     */
+    void AddCurrentPlot( const wxString& aDeviceName, const wxString& aParam );
 
-        SIM_PLOT_PANEL* CurrentPlot() const;
+    /**
+     * @brief Adds a tuner for a component.
+     */
+    void AddTuner( SCH_COMPONENT* aComponent );
 
-    private:
-        void relayout();
-        /**
-         * @brief Adds a new plot to the current panel.
-         * @param aName is the device/net name.
-         * @param aType describes the type of plot.
-         * @param aParam is the parameter for the device/net (e.g. I, Id, V).
-         */
-        void addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const wxString& aParam );
+    /**
+     * @brief Removes an existing tuner.
+     * @param aTuner is the tuner to be removed.
+     * @param aErase decides whether the tuner should be also removed from the tuners list.
+     * Otherwise it is removed only from the SIM_PLOT_FRAME pane.
+     */
+    void RemoveTuner( TUNER_SLIDER* aTuner, bool aErase = true );
 
-        /**
-         * @brief Removes a plot with a specific title.
-         * @param aPlotName is the full plot title (e.g. I(Net-C1-Pad1)).
-         * @param aErase decides if plot should be removed from corresponding TRACE_MAP (see m_plots).
-         */
-        void removePlot( const wxString& aPlotName, bool aErase = true );
+    /**
+     * @brief Returns the currently opened plot panel (or NULL if there is none).
+     */
+    SIM_PLOT_PANEL* CurrentPlot() const;
 
-        void updateNetlistExporter();
+private:
+    /**
+     * @brief Adds a new plot to the current panel.
+     * @param aName is the device/net name.
+     * @param aType describes the type of plot.
+     * @param aParam is the parameter for the device/net (e.g. I, Id, V).
+     */
+    void addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const wxString& aParam );
 
-        /**
-         * @brief Updates plot in a particular SIM_PLOT_PANEL. If the panel does not contain
-         * the plot, it will be added.
-         * @param aDescriptor contains the plot description.
-         * @param aPanel is the panel that should receive the update.
-         * @return True if a plot was successfully added/updated.
-         */
-        bool updatePlot( const TRACE_DESC& aDescriptor, SIM_PLOT_PANEL* aPanel );
+    /**
+     * @brief Removes a plot with a specific title.
+     * @param aPlotName is the full plot title (e.g. I(Net-C1-Pad1)).
+     * @param aErase decides if plot should be removed from corresponding TRACE_MAP (see m_plots).
+     */
+    void removePlot( const wxString& aPlotName, bool aErase = true );
 
-        /**
-         * @brief Updates the list of currently plotted signals.
-         */
-        void updateSignalList();
+    /**
+     * @brief Reloads the current schematic for the netlist exporter.
+     */
+    void updateNetlistExporter();
 
-        /**
-         * @brief Updates the cursor values list.
-         */
-        void updateCursors();
+    /**
+     * @brief Updates plot in a particular SIM_PLOT_PANEL. If the panel does not contain
+     * the plot, it will be added.
+     * @param aDescriptor contains the plot description.
+     * @param aPanel is the panel that should receive the update.
+     * @return True if a plot was successfully added/updated.
+     */
+    bool updatePlot( const TRACE_DESC& aDescriptor, SIM_PLOT_PANEL* aPanel );
 
-        /**
-         * @brief Filters out tuners for components that do not exist anymore.
-         * Decisions are based on the current NETLIST_EXPORTER data.
-         */
-        void updateTuners();
+    /**
+     * @brief Updates the list of currently plotted signals.
+     */
+    void updateSignalList();
 
-        /**
-         * @brief Applies component values specified using tunder sliders to the current netlist.
-         */
-        void applyTuners();
+    /**
+     * @brief Updates the cursor values list.
+     */
+    void updateCursors();
 
-        /**
-         * @brief Loads plot settings from a file.
-         * @param aPath is the file name.
-         * @return True if successful.
-         */
-        bool loadWorkbook( const wxString& aPath );
+    /**
+     * @brief Filters out tuners for components that do not exist anymore.
+     * Decisions are based on the current NETLIST_EXPORTER data.
+     */
+    void updateTuners();
 
-        /**
-         * @brief Saves plot settings to a file.
-         * @param aPath is the file name.
-         * @return True if successful.
-         */
-        bool saveWorkbook( const wxString& aPath );
+    /**
+     * @brief Applies component values specified using tunder sliders to the current netlist.
+     */
+    void applyTuners();
 
-        SIM_PLOT_TYPE GetXAxisType( SIM_TYPE aType ) const;
+    /**
+     * @brief Loads plot settings from a file.
+     * @param aPath is the file name.
+     * @return True if successful.
+     */
+    bool loadWorkbook( const wxString& aPath );
 
-        // Menu handlers
-        void menuNewPlot( wxCommandEvent& aEvent ) override;
-        void menuOpenWorkbook( wxCommandEvent& event ) override;
-        void menuSaveWorkbook( wxCommandEvent& event ) override;
+    /**
+     * @brief Saves plot settings to a file.
+     * @param aPath is the file name.
+     * @return True if successful.
+     */
+    bool saveWorkbook( const wxString& aPath );
 
-        void menuExit( wxCommandEvent& event ) override
-        {
-            Close();
-        }
+    /**
+     * @brief Returns X axis for a given simulation type.
+     */
+    SIM_PLOT_TYPE GetXAxisType( SIM_TYPE aType ) const;
 
-        void menuSaveImage( wxCommandEvent& event ) override;
-        void menuSaveCsv( wxCommandEvent& event ) override;
-        void menuZoomIn( wxCommandEvent& event ) override;
-        void menuZoomOut( wxCommandEvent& event ) override;
-        void menuZoomFit( wxCommandEvent& event ) override;
-        void menuShowGrid( wxCommandEvent& event ) override;
-        void menuShowGridUpdate( wxUpdateUIEvent& event ) override;
-        void menuShowLegend( wxCommandEvent& event ) override;
-        void menuShowLegendUpdate( wxUpdateUIEvent& event ) override;
-        //void menuShowCoords( wxCommandEvent& event ) override;
-        //void menuShowCoordsUpdate( wxUpdateUIEvent& event ) override;
+    // Menu handlers
+    void menuNewPlot( wxCommandEvent& aEvent ) override;
+    void menuOpenWorkbook( wxCommandEvent& event ) override;
+    void menuSaveWorkbook( wxCommandEvent& event ) override;
 
-        // Event handlers
-        void onPlotChanged( wxAuiNotebookEvent& event ) override;
-        void onPlotClose( wxAuiNotebookEvent& event ) override;
+    void menuExit( wxCommandEvent& event ) override
+    {
+        Close();
+    }
 
-        void onSignalDblClick( wxCommandEvent& event ) override;
-        void onSignalRClick( wxMouseEvent& event ) override;
+    void menuSaveImage( wxCommandEvent& event ) override;
+    void menuSaveCsv( wxCommandEvent& event ) override;
+    void menuZoomIn( wxCommandEvent& event ) override;
+    void menuZoomOut( wxCommandEvent& event ) override;
+    void menuZoomFit( wxCommandEvent& event ) override;
+    void menuShowGrid( wxCommandEvent& event ) override;
+    void menuShowGridUpdate( wxUpdateUIEvent& event ) override;
+    void menuShowLegend( wxCommandEvent& event ) override;
+    void menuShowLegendUpdate( wxUpdateUIEvent& event ) override;
 
-        void onSimulate( wxCommandEvent& event );
-        void onSettings( wxCommandEvent& event );
-        void onAddSignal( wxCommandEvent& event );
-        void onProbe( wxCommandEvent& event );
-        void onTune( wxCommandEvent& event );
+    // Event handlers
+    void onPlotChanged( wxAuiNotebookEvent& event ) override;
+    void onPlotClose( wxAuiNotebookEvent& event ) override;
 
-        void onClose( wxCloseEvent& aEvent );
+    void onSignalDblClick( wxCommandEvent& event ) override;
+    void onSignalRClick( wxMouseEvent& event ) override;
 
-        void onCursorUpdate( wxCommandEvent& aEvent );
-        void onSimUpdate( wxCommandEvent& aEvent );
-        void onSimReport( wxCommandEvent& aEvent );
-        void onSimStarted( wxCommandEvent& aEvent );
-        void onSimFinished( wxCommandEvent& aEvent );
+    void onSimulate( wxCommandEvent& event );
+    void onSettings( wxCommandEvent& event );
+    void onAddSignal( wxCommandEvent& event );
+    void onProbe( wxCommandEvent& event );
+    void onTune( wxCommandEvent& event );
 
-        wxToolBarToolBase* m_toolSimulate;
-		wxToolBarToolBase* m_toolAddSignals;
-		wxToolBarToolBase* m_toolProbe;
-		wxToolBarToolBase* m_toolTune;
-		wxToolBarToolBase* m_toolSettings;
+    void onClose( wxCloseEvent& aEvent );
 
-        SCH_EDIT_FRAME* m_schematicFrame;
-        std::unique_ptr<NETLIST_EXPORTER_PSPICE_SIM> m_exporter;
-        std::unique_ptr<SPICE_SIMULATOR> m_simulator;
+    void onCursorUpdate( wxCommandEvent& aEvent );
+    void onSimUpdate( wxCommandEvent& aEvent );
+    void onSimReport( wxCommandEvent& aEvent );
+    void onSimStarted( wxCommandEvent& aEvent );
+    void onSimFinished( wxCommandEvent& aEvent );
 
-        typedef std::map<wxString, TRACE_DESC> TRACE_MAP;
+    // Toolbar buttons
+    wxToolBarToolBase* m_toolSimulate;
+    wxToolBarToolBase* m_toolAddSignals;
+    wxToolBarToolBase* m_toolProbe;
+    wxToolBarToolBase* m_toolTune;
+    wxToolBarToolBase* m_toolSettings;
 
-        struct PLOT_INFO
-        {
-            ///> Map of the traces displayed on the plot
-            TRACE_MAP m_traces;
+    SCH_EDIT_FRAME* m_schematicFrame;
+    std::unique_ptr<NETLIST_EXPORTER_PSPICE_SIM> m_exporter;
+    std::unique_ptr<SPICE_SIMULATOR> m_simulator;
 
-            ///> Spice directive used to execute the simulation
-            wxString m_simCommand;
-        };
+    typedef std::map<wxString, TRACE_DESC> TRACE_MAP;
 
-        ///> Map of plot panels and associated data
-        std::map<SIM_PLOT_PANEL*, PLOT_INFO> m_plots;
+    struct PLOT_INFO
+    {
+        ///> Map of the traces displayed on the plot
+        TRACE_MAP m_traces;
 
-        ///> List of currently displayed tuners
-        std::list<TUNER_SLIDER*> m_tuners;
+        ///> Spice directive used to execute the simulation
+        wxString m_simCommand;
+    };
 
-        // Trick to preserve settings between runs
-        DIALOG_SIM_SETTINGS m_settingsDlg;
+    ///> Map of plot panels and associated data
+    std::map<SIM_PLOT_PANEL*, PLOT_INFO> m_plots;
 
-        // Right click context menu for signals in the listbox
-        class SIGNAL_CONTEXT_MENU : public wxMenu
-        {
-            public:
-                SIGNAL_CONTEXT_MENU( const wxString& aSignal, SIM_PLOT_FRAME* aPlotFrame );
+    ///> List of currently displayed tuners
+    std::list<TUNER_SLIDER*> m_tuners;
 
-            private:
-                void onMenuEvent( wxMenuEvent& aEvent );
+    // Trick to preserve settings between runs
+    DIALOG_SIM_SETTINGS m_settingsDlg;
 
-                const wxString& m_signal;
-                SIM_PLOT_FRAME* m_plotFrame;
+    // Right click context menu for signals in the listbox
+    class SIGNAL_CONTEXT_MENU : public wxMenu
+    {
+        public:
+            SIGNAL_CONTEXT_MENU( const wxString& aSignal, SIM_PLOT_FRAME* aPlotFrame );
 
-                enum SIGNAL_CONTEXT_MENU_EVENTS
-                {
-                    HIDE_SIGNAL,
-                    SHOW_CURSOR,
-                    HIDE_CURSOR
-                };
-        };
+        private:
+            void onMenuEvent( wxMenuEvent& aEvent );
 
-        ///> Panel that was used as the most recent one for simulations
-        SIM_PLOT_PANEL* m_lastSimPlot;
+            const wxString& m_signal;
+            SIM_PLOT_FRAME* m_plotFrame;
+
+            enum SIGNAL_CONTEXT_MENU_EVENTS
+            {
+                HIDE_SIGNAL,
+                SHOW_CURSOR,
+                HIDE_CURSOR
+            };
+    };
+
+    ///> Panel that was used as the most recent one for simulations
+    SIM_PLOT_PANEL* m_lastSimPlot;
 };
 
 // Commands
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index 4b40753db0..098805fe5d 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -28,80 +28,88 @@
 #include <algorithm>
 #include <limits>
 
-static wxString formatFloat (double x, int nDigits)
+static wxString formatFloat( double x, int nDigits )
 {
     wxString rv, fmt;
 
-    if(nDigits)
+    if( nDigits )
     {
-        fmt = wxT("%.0Nf");
+        fmt = wxT( "%.0Nf" );
         fmt[3] = '0' + nDigits;
-    } else {
-        fmt = wxT("%.0f");
+    }
+    else
+    {
+        fmt = wxT( "%.0f" );
     }
 
-    rv.Printf(fmt, x);
+    rv.Printf( fmt, x );
 
     return rv;
 }
 
-static void getSISuffix ( double x, const wxString& unit, int& power, wxString& suffix )
+
+static void getSISuffix( double x, const wxString& unit, int& power, wxString& suffix )
 {
     const int n_powers = 11;
-    const struct {
+
+    const struct
+    {
         double exponent;
         char suffix;
-    } powers[] = {
-        {-18,'a'},
-        {-15,'f'},
-        {-12,'p'},
-        {-9,'n'},
-        {-6,'u'},
-        {-3,'m'},
-        {0, 0},
-        {3, 'k'},
-        {6, 'M'},
-        {9, 'G'},
-        {12, 'T'},
-        {15, 'P'}
+    } powers[] =
+    {
+        { -18, 'a' },
+        { -15, 'f' },
+        { -12, 'p' },
+        { -9,  'n' },
+        { -6,  'u' },
+        { -3,  'm' },
+        { 0,   0   },
+        { 3,   'k' },
+        { 6,   'M' },
+        { 9,   'G' },
+        { 12,  'T' },
+        { 14,  'P' }
     };
 
     power = 0;
     suffix = unit;
 
-    if (x == 0.0)
+    if( x == 0.0 )
         return;
 
-    for ( int i = 0; i <n_powers - 1;i++)
+    for( int i = 0; i < n_powers - 1; i++ )
     {
-        double r_cur = pow(10, powers[i].exponent);
+        double r_cur = pow( 10, powers[i].exponent );
 
-        if( fabs(x) >= r_cur && fabs(x) < r_cur * 1000.0 )
+        if( fabs( x ) >= r_cur && fabs( x ) < r_cur * 1000.0 )
         {
             power = powers[i].exponent;
-            if ( powers[i].suffix )
-                suffix = wxString(powers[i].suffix) + unit;
+
+            if( powers[i].suffix )
+                suffix = wxString( powers[i].suffix ) + unit;
             else
                 suffix = unit;
+
             return;
         }
     }
-
 }
 
-static int countDecimalDigits ( double x, int maxDigits )
+
+static int countDecimalDigits( double x, int maxDigits )
 {
-    int64_t k = (int) ( ( x - floor(x)) * pow ( 10.0, (double) maxDigits ));
+    int64_t k = (int)( ( x - floor( x ) ) * pow( 10.0, (double) maxDigits ) );
     int n = 0;
 
-    while(k && ((k % 10LL) == 0LL || (k % 10LL) == 9LL))
+    while( k && ( ( k % 10LL ) == 0LL || ( k % 10LL ) == 9LL ) )
     {
         k /= 10LL;
     }
 
     n = 0;
 
-    while (k != 0LL)
+    while( k != 0LL )
     {
         n++;
         k /= 10LL;
@@ -111,64 +119,66 @@ static int countDecimalDigits ( double x, int maxDigits )
 }
 
 
-static void formatSILabels( mpScaleBase *scale, const wxString& aUnit, int nDigits )
+static void formatSILabels( mpScaleBase* scale, const wxString& aUnit, int nDigits )
 {
     double maxVis = scale->AbsVisibleMaxValue();
 
     wxString suffix;
     int power, digits = 0;
 
-    getSISuffix( maxVis, aUnit, power, suffix);
+    getSISuffix( maxVis, aUnit, power, suffix );
 
-    double sf = pow(10.0, power);
+    double sf = pow( 10.0, power );
 
-    for ( auto &l : scale->TickLabels() )
+    for( auto &l : scale->TickLabels() )
     {
         int k = countDecimalDigits( l.pos / sf, nDigits );
 
-        digits = std::max(digits, k);
+        digits = std::max( digits, k );
     }
 
-    for ( auto &l : scale->TickLabels() )
+    for( auto &l : scale->TickLabels() )
     {
         l.label = formatFloat ( l.pos / sf, digits ) + suffix;
         l.visible = true;
     }
 }
 
+
 class FREQUENCY_LOG_SCALE : public mpScaleXLog
 {
 public:
-    FREQUENCY_LOG_SCALE(wxString name, int flags) :
+    FREQUENCY_LOG_SCALE( wxString name, int flags ) :
         mpScaleXLog( name, flags ) {};
 
     void formatLabels()
     {
-        const wxString unit = wxT("Hz");
+        const wxString unit = wxT( "Hz" );
         wxString suffix;
         int power;
 
-        for ( auto &l : TickLabels() )
+        for( auto &l : TickLabels() )
         {
-            getSISuffix( l.pos, unit, power, suffix);
-            double sf = pow(10.0, power);
+            getSISuffix( l.pos, unit, power, suffix );
+            double sf = pow( 10.0, power );
             int k = countDecimalDigits( l.pos / sf, 3 );
 
-            l.label = formatFloat ( l.pos / sf, k ) + suffix;
+            l.label = formatFloat( l.pos / sf, k ) + suffix;
             l.visible = true;
         }
     }
 };
 
+
 class FREQUENCY_LIN_SCALE : public mpScaleX
 {
 public:
-    FREQUENCY_LIN_SCALE(wxString name, int flags) :
+    FREQUENCY_LIN_SCALE( wxString name, int flags ) :
         mpScaleX( name, flags, false , 0 ) {};
 
     void formatLabels()
     {
-        formatSILabels( this, wxT("Hz"), 3 );
+        formatSILabels( this, wxT( "Hz" ), 3 );
     }
 };
 
@@ -176,74 +186,78 @@ public:
 class TIME_SCALE : public mpScaleX
 {
 public:
-    TIME_SCALE(wxString name, int flags) :
-        mpScaleX ( name, flags, false, 0) {};
+    TIME_SCALE( wxString name, int flags ) :
+        mpScaleX( name, flags, false, 0 ) {};
 
     void formatLabels()
     {
-        formatSILabels( this, wxT("s"), 3 );
+        formatSILabels( this, wxT( "s" ), 3 );
     }
 };
 
+
 class VOLTAGE_SCALE_X : public mpScaleX
 {
 public:
-    VOLTAGE_SCALE_X(wxString name, int flags) :
-        mpScaleX ( name, flags, false, 0 ) {};
+    VOLTAGE_SCALE_X( wxString name, int flags ) :
+        mpScaleX( name, flags, false, 0 ) {};
 
     void formatLabels()
     {
-        formatSILabels( this, wxT("V"), 3 );
+        formatSILabels( this, wxT( "V" ), 3 );
     }
 };
 
+
 class GAIN_SCALE : public mpScaleY
 {
 public:
     GAIN_SCALE( wxString name, int flags ) :
-        mpScaleY ( name, flags, false) {};
+        mpScaleY( name, flags, false ) {};
 
     void formatLabels()
     {
-        formatSILabels( this, wxT("dB"), 3 );
+        formatSILabels( this, wxT( "dB" ), 3 );
     }
 
 };
 
+
 class PHASE_SCALE : public mpScaleY
 {
 public:
-    PHASE_SCALE(wxString name, int flags) :
-        mpScaleY ( name, flags, false ) {};
+    PHASE_SCALE( wxString name, int flags ) :
+        mpScaleY( name, flags, false ) {};
 
     void formatLabels()
     {
-        formatSILabels( this, wxT("\u00B0"), 3 );
+        formatSILabels( this, wxT( "\u00B0" ), 3 );     // degree sign
     }
 };
 
+
 class VOLTAGE_SCALE_Y : public mpScaleY
 {
 public:
-    VOLTAGE_SCALE_Y(wxString name, int flags) :
-        mpScaleY ( name, flags, false ) {};
+    VOLTAGE_SCALE_Y( wxString name, int flags ) :
+        mpScaleY( name, flags, false ) {};
 
     void formatLabels()
     {
-        formatSILabels( this, wxT("V"), 3 );
+        formatSILabels( this, wxT( "V" ), 3 );
     }
-
 };
 
+
 class CURRENT_SCALE : public mpScaleY
 {
 public:
-    CURRENT_SCALE(wxString name, int flags ) :
-        mpScaleY ( name, flags, false ) {};
+    CURRENT_SCALE( wxString name, int flags ) :
+        mpScaleY( name, flags, false ) {};
 
     void formatLabels()
     {
-        formatSILabels( this, wxT("A"), 3 );
+        formatSILabels( this, wxT( "A" ), 3 );
     }
 };
 
@@ -366,7 +380,7 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
             m_axis_x = new FREQUENCY_LOG_SCALE( wxT( "Frequency" ), mpALIGN_BOTTOM );
             m_axis_y1 = new GAIN_SCALE( wxT( "Gain" ), mpALIGN_LEFT );
             m_axis_y2 = new PHASE_SCALE( wxT( "Phase" ), mpALIGN_RIGHT );
-            m_axis_y2->SetMasterScale(m_axis_y1);
+            m_axis_y2->SetMasterScale( m_axis_y1 );
             break;
 
         case ST_DC:
@@ -383,7 +397,7 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
             m_axis_x = new TIME_SCALE( wxT( "Time" ), mpALIGN_BOTTOM );
             m_axis_y1 = new VOLTAGE_SCALE_Y( wxT( "Voltage" ), mpALIGN_LEFT );
             m_axis_y2 = new CURRENT_SCALE( wxT( "Current" ), mpALIGN_RIGHT );
-            m_axis_y2->SetMasterScale(m_axis_y1);
+            m_axis_y2->SetMasterScale( m_axis_y1 );
             break;
 
         default:
@@ -416,9 +430,9 @@ SIM_PLOT_PANEL::SIM_PLOT_PANEL( SIM_TYPE aType, wxWindow* parent, wxWindowID id,
     m_legend = new mpInfoLegend( wxRect( 0, 40, 200, 40 ), wxTRANSPARENT_BRUSH );
     AddLayer( m_legend );
     m_topLevel.push_back( m_legend );
-    SetColourTheme(*wxBLACK, *wxWHITE, grey);
+    SetColourTheme( *wxBLACK, *wxWHITE, grey );
 
-    EnableDoubleBuffer(true);
+    EnableDoubleBuffer( true );
     UpdateAll();
 }
 
@@ -455,20 +469,20 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aName, int aPoints,
 
     if( addedNewEntry )
     {
-        if ( m_type == ST_TRANSIENT )
+        if( m_type == ST_TRANSIENT )
         {
             bool hasVoltageTraces = false;
 
             for( auto t : m_traces )
             {
-                if ( ! (t.second->GetFlags() & SPT_CURRENT ) )
+                if( !( t.second->GetFlags() & SPT_CURRENT ) )
                 {
                     hasVoltageTraces = true;
                     break;
                 }
             }
 
-            if ( !hasVoltageTraces )
+            if( !hasVoltageTraces )
                 m_axis_y2->SetMasterScale( nullptr );
             else
                 m_axis_y2->SetMasterScale( m_axis_y1 );
@@ -499,12 +513,12 @@ bool SIM_PLOT_PANEL::AddTrace( const wxString& aName, int aPoints,
     {
         if( aFlags & SPT_AC_PHASE )
         {
-            for(int i = 0; i < aPoints; i++ )
+            for( int i = 0; i < aPoints; i++ )
                 tmp[i] = tmp[i] * 180.0 / M_PI;                 // convert to degrees
         }
         else
         {
-            for(int i = 0; i < aPoints; i++ )
+            for( int i = 0; i < aPoints; i++ )
                 tmp[i] = 20 * log( tmp[i] ) / log( 10.0 );      // convert to dB
         }
     }
@@ -553,6 +567,7 @@ void SIM_PLOT_PANEL::DeleteAllTraces()
         DeleteTrace( t.first );
     }
 
+    m_colorIdx = 0;
     m_traces.clear();
 }
 
diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h
index 6db406a705..873de37935 100644
--- a/eeschema/sim/sim_plot_panel.h
+++ b/eeschema/sim/sim_plot_panel.h
@@ -32,6 +32,7 @@
 
 class TRACE;
 
+///> Cursor attached to a trace to follow its values:
 class CURSOR : public mpInfoLayer
 {
 public:
@@ -86,14 +87,18 @@ class TRACE : public mpFXYVector
 {
 public:
     TRACE( const wxString& aName ) :
-        mpFXYVector( aName ), m_cursor( nullptr ), m_flags(0)
-        {
-            SetContinuity( true );
-            SetDrawOutsideMargins( false );
-            ShowName( false );
-
-        }
+        mpFXYVector( aName ), m_cursor( nullptr ), m_flags( 0 )
+    {
+        SetContinuity( true );
+        SetDrawOutsideMargins( false );
+        ShowName( false );
+    }
 
+    /**
+     * @brief Assigns new data set for the trace. aX and aY need to have the same length.
+     * @param aX are the X axis values.
+     * @param aY are the Y axis values.
+     */
     void SetData( const std::vector<double>& aX, const std::vector<double>& aY ) override
     {
         if( m_cursor )
@@ -127,7 +132,7 @@ public:
         return m_cursor;
     }
 
-    void SetFlags ( int aFlags )
+    void SetFlags( int aFlags )
     {
         m_flags = aFlags;
     }
@@ -222,26 +227,20 @@ public:
         return m_legend->IsVisible();
     }
 
-    void ShowCoords( bool aEnable )
-    {
-        m_coords->SetVisible( aEnable );
-        UpdateAll();
-    }
-
-    bool IsCoordsShown() const
-    {
-        return m_coords->IsVisible();
-    }
-
+    ///> Returns true if the trace has cursor shown.
     bool HasCursorEnabled( const wxString& aName ) const;
 
+    ///> Toggles cursor for a particular trace.
     void EnableCursor( const wxString& aName, bool aEnable );
 
+    ///> Resets scale ranges to fit the current traces
     void ResetScales();
 
 private:
+    ///> Returns a new color from the palette
     wxColour generateColor();
 
+    // Color index to get a new color from the palette
     unsigned int m_colorIdx;
 
     // Traces to be plotted
@@ -251,7 +250,6 @@ private:
     mpScaleY* m_axis_y1;
     mpScaleY* m_axis_y2;
     mpInfoLegend* m_legend;
-    mpInfoCoords* m_coords;
 
     std::vector<mpLayer*> m_topLevel;
 
diff --git a/eeschema/sim/sim_types.h b/eeschema/sim/sim_types.h
index ac2ab0beac..fe36f9ac76 100644
--- a/eeschema/sim/sim_types.h
+++ b/eeschema/sim/sim_types.h
@@ -39,6 +39,7 @@ enum SIM_PLOT_TYPE {
     SPT_AC_PHASE        = 0x04,
     SPT_AC_MAG          = 0x08,
 
+    // X axis
     SPT_TIME            = 0x10,
     SPT_LIN_FREQUENCY   = 0x20,
     SPT_LOG_FREQUENCY   = 0x20,
diff --git a/eeschema/sim/simulate.h b/eeschema/sim/simulate.h
deleted file mode 100644
index 602d4ebcd1..0000000000
--- a/eeschema/sim/simulate.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <schframe.h>
-
-void SCH_EDIT_FRAME::OnSimulationRun( wxCommandEvent& event )
-{}
-
-void SCH_EDIT_FRAME::OnSimulationStop( wxCommandEvent& event )
-{}
-
-void SCH_EDIT_FRAME::OnSimulationAddProbe( wxCommandEvent& event )
-{}
-    
diff --git a/eeschema/sim/spice_simulator.h b/eeschema/sim/spice_simulator.h
index 1231e042e1..4a44be09d2 100644
--- a/eeschema/sim/spice_simulator.h
+++ b/eeschema/sim/spice_simulator.h
@@ -41,31 +41,91 @@ public:
     SPICE_SIMULATOR() : m_reporter( NULL ) {}
     virtual ~SPICE_SIMULATOR() {}
 
+    ///> Creates a simulator instance of particular type (currently only ngspice is handled)
     static SPICE_SIMULATOR* CreateInstance( const std::string& aName );
 
+    ///> Intializes the simulator
     virtual void Init() = 0;
+
+    /*
+     * @brief Loads a netlist for the simulation.
+     * @return True in case of success, false otherwise.
+     */
     virtual bool LoadNetlist( const std::string& aNetlist ) = 0;
+
+    /**
+     * @brief Executes the simulation with currently loaded netlist.
+     * @return True in case of success, false otherwise.
+     */
     virtual bool Run() = 0;
+
+    /**
+     * @brief Halts the simulation.
+     * @return True in case of success, false otherwise.
+     */
     virtual bool Stop() = 0;
+
+    /**
+     * @brief Checks if simulation is running at the moment.
+     * @return True if simulation is currently executed.
+     */
     virtual bool IsRunning() = 0;
+
+    /**
+     * @brief Executes a Spice command as if it was typed into console.
+     * @param aCmd is the command to be issued.
+     */
     virtual bool Command( const std::string& aCmd ) = 0;
 
     ///> Returns X axis name for a given simulation type
     virtual std::string GetXAxis( SIM_TYPE aType ) const = 0;
 
+    ///> Sets a SPICE_REPORTER object to receive the simulation log.
     virtual void SetReporter( SPICE_REPORTER* aReporter )
     {
         m_reporter = aReporter;
     }
 
+    /**
+     * @brief Returns a requested vector with complex values. If the vector is real, then
+     * the imaginary part is set to 0 in all values.
+     * @param aName is the vector named in Spice convention (e.g. V(3), I(R1)).
+     * @return Requested vector. It might be empty if there is no vector with requested name.
+     */
     virtual std::vector<COMPLEX> GetPlot( const std::string& aName, int aMaxLen = -1 ) = 0;
+
+    /**
+     * @brief Returns a requested vector with real values. If the vector is complex, then
+     * the real part is returned.
+     * @param aName is the vector named in Spice convention (e.g. V(3), I(R1)).
+     * @return Requested vector. It might be empty if there is no vector with requested name.
+     */
     virtual std::vector<double> GetRealPlot( const std::string& aName, int aMaxLen = -1 ) = 0;
+
+    /**
+     * @brief Returns a requested vector with imaginary values. If the vector is complex, then
+     * the imaginary part is returned. If the vector is reql, then only zeroes are returned.
+     * @param aName is the vector named in Spice convention (e.g. V(3), I(R1)).
+     * @return Requested vector. It might be empty if there is no vector with requested name.
+     */
     virtual std::vector<double> GetImagPlot( const std::string& aName, int aMaxLen = -1 ) = 0;
+
+    /**
+     * @brief Returns a requested vector with magnitude values.
+     * @param aName is the vector named in Spice convention (e.g. V(3), I(R1)).
+     * @return Requested vector. It might be empty if there is no vector with requested name.
+     */
     virtual std::vector<double> GetMagPlot( const std::string& aName, int aMaxLen = -1 ) = 0;
+
+    /**
+     * @brief Returns a requested vector with phase values.
+     * @param aName is the vector named in Spice convention (e.g. V(3), I(R1)).
+     * @return Requested vector. It might be empty if there is no vector with requested name.
+     */
     virtual std::vector<double> GetPhasePlot( const std::string& aName, int aMaxLen = -1 ) = 0;
 
-
 protected:
+    ///> Reporter object to receive simulation log
     SPICE_REPORTER* m_reporter;
 };
 
diff --git a/eeschema/sim/spice_value.cpp b/eeschema/sim/spice_value.cpp
index a65875355d..383589779f 100644
--- a/eeschema/sim/spice_value.cpp
+++ b/eeschema/sim/spice_value.cpp
@@ -221,13 +221,13 @@ SPICE_VALUE SPICE_VALUE::operator/( const SPICE_VALUE& aOther ) const
 
 void SPICE_VALUE::stripZeros( wxString& aString )
 {
-    if ( aString.Find(',') >= 0 || aString.Find('.') >= 0 )
+    if ( aString.Find( ',' ) >= 0 || aString.Find( '.' ) >= 0 )
     {
         while( aString.EndsWith( '0' ) )
             aString.RemoveLast();
 
         if( aString.EndsWith( '.' ) || aString.EndsWith( ',' ) )
-                aString.RemoveLast();
+            aString.RemoveLast();
     }
 }
 
diff --git a/eeschema/sim/spice_value.h b/eeschema/sim/spice_value.h
index c8c01e7848..0ebead1f83 100644
--- a/eeschema/sim/spice_value.h
+++ b/eeschema/sim/spice_value.h
@@ -51,6 +51,7 @@ public:
     {
     }
 
+    ///> Parses the string to create a Spice value (e.g. 100n)
     SPICE_VALUE( const wxString& aString );
 
     SPICE_VALUE( int aInt, UNIT_PREFIX aPrefix = PFX_NONE )
@@ -65,19 +66,35 @@ public:
         Normalize();
     }
 
+    /**
+     * @brief Normalizes the value. The unit prefix is picked so the base is (0.001 <= base < 1000).
+     */
     void Normalize();
 
     double ToDouble() const;
 
+    /**
+     * @brief Returns string value as when converting double to string (e.g. 123456.789).
+     */
     wxString ToString() const;
 
+    /**
+     * @brief Returns string value in Spice format (e.g. 123.3456789k).
+     */
     wxString ToSpiceString() const;
 
+    /**
+     * @brief Returns either a normal string or Spice format string, depending on the original
+     * value format.
+     */
     wxString ToOrigString() const
     {
         return m_spiceStr ? ToSpiceString() : ToString();
     }
 
+    /**
+     * Returns true if the object was initiated with a Spice formatted string value.
+     */
     bool IsSpiceString() const
     {
         return m_spiceStr;
@@ -120,6 +137,7 @@ private:
     ///> Was the value defined using the Spice notation?
     bool m_spiceStr;
 
+    ///> Removes redundant zeros from the end of a string.
     static void stripZeros( wxString& aString );
 };
 
@@ -141,6 +159,7 @@ public:
     bool Validate( wxWindow* aParent ) override;
 
 private:
+    ///> Is it valid to get an empty value?
     bool m_emptyAllowed;
 };
 

From 8227cd6d8084c037a44c6373c1bd09e729848b2d Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:17 +0200
Subject: [PATCH 186/197] Do not recreate the simulator every time simulation
 is run

---
 eeschema/sim/sim_plot_frame.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index c693195b71..94fd8173da 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -145,6 +145,7 @@ SIM_PLOT_FRAME::SIM_PLOT_FRAME( KIWAY* aKiway, wxWindow* aParent )
 
     m_toolBar->Realize();
     m_plotNotebook->SetPageText( 0, _( "Welcome!" ) );
+    m_simulator.reset( SPICE_SIMULATOR::CreateInstance( "ngspice" ) );
 }
 
 
@@ -158,6 +159,12 @@ void SIM_PLOT_FRAME::StartSimulation()
     STRING_FORMATTER formatter;
     SIM_PLOT_PANEL* plotPanel = CurrentPlot();
 
+    if( !m_simulator )
+    {
+        DisplayError( this, wxT( "Could not create simulator instance" ) );
+        return;
+    }
+
     m_simConsole->Clear();
     updateNetlistExporter();
 
@@ -176,12 +183,6 @@ void SIM_PLOT_FRAME::StartSimulation()
         return;
     }
 
-    /// @todo is it necessary to recreate simulator every time?
-    m_simulator.reset( SPICE_SIMULATOR::CreateInstance( "ngspice" ) );
-
-    if( !m_simulator )
-        return;
-
     m_simulator->SetReporter( new SIM_THREAD_REPORTER( this ) );
     m_simulator->Init();
     m_simulator->LoadNetlist( formatter.GetString() );

From 0667b7ba637b62a79643a0c463cd21e02fc09269 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:18 +0200
Subject: [PATCH 187/197] Fixed ngspice freeze when there is an error in the
 simulated netlist Does not work with current ngspice head, it has to be
 compiled from the official master branch.

---
 eeschema/sim/ngspice.cpp | 69 ++++++++++++++++++++++++++--------------
 eeschema/sim/ngspice.h   |  5 +++
 2 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 54a5c8ffc4..2961f5dc5e 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -35,23 +35,7 @@ using namespace std;
 
 NGSPICE::NGSPICE()
 {
-#ifdef __WINDOWS__
-    m_dll = new wxDynamicLibrary( "libngspice-0.dll" );
-#else
-    m_dll = new wxDynamicLibrary( wxDynamicLibrary::CanonicalizeName( "ngspice" ) );
-#endif
-
-    if( !m_dll || !m_dll->IsLoaded() )
-        throw std::runtime_error( "Missing ngspice shared library" );
-
-    // Obtain function pointers
-    m_ngSpice_Init = (ngSpice_Init) m_dll->GetSymbol( "ngSpice_Init" );
-    m_ngSpice_Circ = (ngSpice_Circ) m_dll->GetSymbol( "ngSpice_Circ" );
-    m_ngSpice_Command = (ngSpice_Command) m_dll->GetSymbol( "ngSpice_Command" );
-    m_ngGet_Vec_Info = (ngGet_Vec_Info) m_dll->GetSymbol( "ngGet_Vec_Info" );
-    m_ngSpice_AllPlots = (ngSpice_AllPlots) m_dll->GetSymbol( "ngSpice_AllPlots" );
-    m_ngSpice_AllVecs = (ngSpice_AllVecs) m_dll->GetSymbol( "ngSpice_AllVecs" );
-    m_ngSpice_Running = (ngSpice_Running) m_dll->GetSymbol( "ngSpice_running" );
+    init_dll();
 }
 
 
@@ -63,9 +47,14 @@ NGSPICE::~NGSPICE()
 
 void NGSPICE::Init()
 {
-    setlocale( LC_ALL, "C" );
-    m_ngSpice_Init( &cbSendChar, &cbSendStat, &cbControlledExit, NULL, NULL, &cbBGThreadRunning, this );
-    setlocale( LC_ALL, "" );
+    if( m_error )
+    {
+        delete m_dll;
+        init_dll();
+    }
+
+    Command( "reset" );
+    Command( "remcirc" );
 }
 
 
@@ -301,10 +290,33 @@ string NGSPICE::GetXAxis( SIM_TYPE aType ) const
 }
 
 
-int NGSPICE::cbControlledExit( int status, bool immediate, bool exit_upon_quit, int id, void* user )
+void NGSPICE::init_dll()
 {
-    //printf("stat %d immed %d quit %d\n", status, !!immediate, !!exit_upon_quit);
-    return 0;
+#ifdef __WINDOWS__
+    m_dll = new wxDynamicLibrary( "libngspice-0.dll" );
+#else
+    m_dll = new wxDynamicLibrary( wxDynamicLibrary::CanonicalizeName( "ngspice" ) );
+#endif
+
+    if( !m_dll || !m_dll->IsLoaded() )
+        throw std::runtime_error( "Missing ngspice shared library" );
+
+    m_error = false;
+
+    // Obtain function pointers
+    m_ngSpice_Init = (ngSpice_Init) m_dll->GetSymbol( "ngSpice_Init" );
+    m_ngSpice_Circ = (ngSpice_Circ) m_dll->GetSymbol( "ngSpice_Circ" );
+    m_ngSpice_Command = (ngSpice_Command) m_dll->GetSymbol( "ngSpice_Command" );
+    m_ngGet_Vec_Info = (ngGet_Vec_Info) m_dll->GetSymbol( "ngGet_Vec_Info" );
+    m_ngSpice_AllPlots = (ngSpice_AllPlots) m_dll->GetSymbol( "ngSpice_AllPlots" );
+    m_ngSpice_AllVecs = (ngSpice_AllVecs) m_dll->GetSymbol( "ngSpice_AllVecs" );
+    m_ngSpice_Running = (ngSpice_Running) m_dll->GetSymbol( "ngSpice_running" ); // it is not a typo
+
+    setlocale( LC_ALL, "C" );
+    m_ngSpice_Init( &cbSendChar, &cbSendStat, &cbControlledExit, NULL, NULL, &cbBGThreadRunning, this );
+    // Workaround to avoid hang ups on certain errors
+    Command( "unset interactive" );
+    setlocale( LC_ALL, "" );
 }
 
 
@@ -346,3 +358,14 @@ int NGSPICE::cbBGThreadRunning( bool is_running, int id, void* user )
 
     return 0;
 }
+
+
+int NGSPICE::cbControlledExit( int status, bool immediate, bool exit_upon_quit, int id, void* user )
+{
+    // Something went wrong, reload the dll
+    NGSPICE* sim = reinterpret_cast<NGSPICE*>( user );
+    sim->m_error = true;
+    //printf("stat %d immed %d quit %d\n", status, !!immediate, !!exit_upon_quit);
+
+    return 0;
+}
diff --git a/eeschema/sim/ngspice.h b/eeschema/sim/ngspice.h
index 5fa3f9c7ce..b24aada872 100644
--- a/eeschema/sim/ngspice.h
+++ b/eeschema/sim/ngspice.h
@@ -73,6 +73,11 @@ public:
     std::vector<double> GetPhasePlot( const std::string& aName, int aMaxLen = -1 ) override;
 
 private:
+    bool m_error;
+
+    // Performs DLL initialization, obtains function pointers
+    void init_dll();
+
     // ngspice library functions
     typedef void (*ngSpice_Init)( SendChar*, SendStat*, ControlledExit*,
                                     SendData*, SendInitData*, BGThreadRunning*, void* );

From 557f9270c740dca642a76cb43e4291e2aa02c9a2 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:18 +0200
Subject: [PATCH 188/197] wxMathPlot basic code formatting

---
 common/widgets/mathplot.cpp | 272 ++++++++++++++++++------------------
 include/widgets/mathplot.h  | 234 +++++++++++++++----------------
 2 files changed, 250 insertions(+), 256 deletions(-)

diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index 040ab046fb..ea2de1f202 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -3,9 +3,9 @@
 // Purpose:         Framework for plotting in wxWindows
 // Original Author: David Schalig
 // Maintainer:      Davide Rondini
-// Contributors:    Jose Luis Blanco, Val Greene
+// Contributors:    Jose Luis Blanco, Val Greene, Maciej Suminski, Tomasz Wlostowski
 // Created:         21/07/2003
-// Last edit:       09/09/2007
+// Last edit:       05/08/2016
 // Copyright:       (c) David Schalig, Davide Rondini
 // Licence:         wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -641,7 +641,7 @@ void mpFXY::Plot(wxDC & dc, mpWindow & w)
                     outUp = (c0 < minYpx) && (c1 < minYpx);
                     if ( !outUp && !outDown ) {
                         dc.DrawLine(x0, c0, x1, c1);
-            //            UpdateViewBoundary(x1, c1);
+                        //            UpdateViewBoundary(x1, c1);
                     }
                 }
                 x0=x1; c0=c1;
@@ -764,23 +764,23 @@ void mpScaleX::recalculateTicks ( wxDC & dc, mpWindow & w )
 
     double minErr = 1000000000000.0;
     double bestStep;
-        for(int i = 10; i <= 20; i+=2)
+    for(int i = 10; i <= 20; i+=2)
+    {
+        double step = fabs(maxVvis - minVvis) / (double) i;
+        double base = pow(10, floor(log10(step)));
+
+        //printf("base %.3f\n", base);
+
+        double stepInt = floor(step / base) * base;
+        double err = fabs(step - stepInt);
+
+        if(err< minErr)
         {
-            double step = fabs(maxVvis - minVvis) / (double) i;
-            double base = pow(10, floor(log10(step)));
-
-            //printf("base %.3f\n", base);
-
-            double stepInt = floor(step / base) * base;
-            double err = fabs(step - stepInt);
-
-            if(err< minErr)
-            {
-                minErr = err;
-                bestStep = stepInt;
-            }
-            //printf("step %d %.3f %.3f best %.3f\n",i, step, stepInt, bestStep);
+            minErr = err;
+            bestStep = stepInt;
         }
+        //printf("step %d %.3f %.3f best %.3f\n",i, step, stepInt, bestStep);
+    }
 
 
     double v = floor(minVvis / bestStep) * bestStep;
@@ -857,42 +857,42 @@ void mpScaleBase::updateTickLabels( wxDC & dc, mpWindow & w )
     formatLabels();
     computeLabelExtents(dc, w);
 
-//    int gap = IsHorizontal() ? m_maxLabelWidth + 10 : m_maxLabelHeight + 5;
+    //    int gap = IsHorizontal() ? m_maxLabelWidth + 10 : m_maxLabelHeight + 5;
 
     //if ( m_tickLabels.size() <= 2)
     //    return;
 
-/*
-    fixme!
+    /*
+       fixme!
 
-    for ( auto &l : m_tickLabels )
-    {
-        double p = TransformToPlot ( l.pos );
+       for ( auto &l : m_tickLabels )
+       {
+       double p = TransformToPlot ( l.pos );
 
-        if ( !IsHorizontal() )
-            l.pixelPos = (int)(( w.GetPosY() - p ) * w.GetScaleY());
-        else
-            l.pixelPos = (int)(( p - w.GetPosX()) * w.GetScaleX());
-    }
+       if ( !IsHorizontal() )
+       l.pixelPos = (int)(( w.GetPosY() - p ) * w.GetScaleY());
+       else
+       l.pixelPos = (int)(( p - w.GetPosX()) * w.GetScaleX());
+       }
 
 
-    for (int i = 1; i  < m_tickLabels.size() - 1; i++)
-    {
-        int dist_prev;
+       for (int i = 1; i  < m_tickLabels.size() - 1; i++)
+       {
+       int dist_prev;
 
-        for(int j = i-1; j >= 1; j--)
-        {
-            if( m_tickLabels[j].visible)
-            {
-                dist_prev = abs( m_tickLabels[j].pixelPos - m_tickLabels[i].pixelPos );
-                break;
-            }
-        }
+       for(int j = i-1; j >= 1; j--)
+       {
+       if( m_tickLabels[j].visible)
+       {
+       dist_prev = abs( m_tickLabels[j].pixelPos - m_tickLabels[i].pixelPos );
+       break;
+       }
+       }
 
-        if (dist_prev < gap)
-            m_tickLabels[i].visible = false;
-    }
-*/
+       if (dist_prev < gap)
+       m_tickLabels[i].visible = false;
+       }
+       */
 
 }
 
@@ -909,12 +909,12 @@ int mpScaleX::labelCount() const
 
 const wxString mpScaleX::getLabel( int n )
 {
-        return wxT("L");
+    return wxT("L");
 }
 
 double mpScaleX::getTickPos( int n )
 {
-        return m_tickValues[n];
+    return m_tickValues[n];
 }
 
 double mpScaleX::getLabelPos( int n )
@@ -940,52 +940,52 @@ void mpScaleY::getVisibleDataRange ( mpWindow& w, double &minV, double& maxV)
 void mpScaleY::computeSlaveTicks( mpWindow& w )
 {
 
-        if( m_masterScale->m_tickValues.size() == 0)
-            return;
+    if( m_masterScale->m_tickValues.size() == 0)
+        return;
 
-            m_tickValues.clear();
-            m_tickLabels.clear();
+    m_tickValues.clear();
+    m_tickLabels.clear();
 
-//                    printf("NTicks %d\n", m_masterScale->m_tickValues.size());
-                    double p0 = m_masterScale->TransformToPlot(m_masterScale->m_tickValues[0]);
-                    double p1 = m_masterScale->TransformToPlot(m_masterScale->m_tickValues[1]);
+    //                    printf("NTicks %d\n", m_masterScale->m_tickValues.size());
+    double p0 = m_masterScale->TransformToPlot(m_masterScale->m_tickValues[0]);
+    double p1 = m_masterScale->TransformToPlot(m_masterScale->m_tickValues[1]);
 
-                    m_scale = 1.0 / ( m_maxV - m_minV );
-                    m_offset = -m_minV;
+    m_scale = 1.0 / ( m_maxV - m_minV );
+    m_offset = -m_minV;
 
-                    double y_slave0 =  p0 / m_scale;
-                    double y_slave1 =  p1 / m_scale;
+    double y_slave0 =  p0 / m_scale;
+    double y_slave1 =  p1 / m_scale;
 
-                    double dy_slave = (y_slave1 - y_slave0);
-                    double exponent = floor(log10(dy_slave));
-                    double base = dy_slave/ pow(10.0, exponent);
+    double dy_slave = (y_slave1 - y_slave0);
+    double exponent = floor(log10(dy_slave));
+    double base = dy_slave/ pow(10.0, exponent);
 
-                    double dy_scaled = ceil( 2.0* base ) / 2.0 * pow (10.0, exponent );
+    double dy_scaled = ceil( 2.0* base ) / 2.0 * pow (10.0, exponent );
 
-                    double minvv, maxvv;
+    double minvv, maxvv;
 
-                    getVisibleDataRange( w,minvv, maxvv);
+    getVisibleDataRange( w,minvv, maxvv);
 
-                    minvv = floor(minvv / dy_scaled) * dy_scaled;
+    minvv = floor(minvv / dy_scaled) * dy_scaled;
 
-                    m_scale = 1.0 / ( m_maxV - m_minV );
-                    m_scale *= dy_slave / dy_scaled;
+    m_scale = 1.0 / ( m_maxV - m_minV );
+    m_scale *= dy_slave / dy_scaled;
 
-                    m_offset = p0 / m_scale - minvv;
+    m_offset = p0 / m_scale - minvv;
 
-                    m_tickValues.clear();
+    m_tickValues.clear();
 
-                    double m;
+    double m;
 
-                    m_absVisibleMaxV = 0;
+    m_absVisibleMaxV = 0;
 
-                    for (unsigned int i = 0; i < m_masterScale->m_tickValues.size(); i++)
-                    {
-                        m = TransformFromPlot ( m_masterScale->TransformToPlot(m_masterScale->m_tickValues[i]) );
-                        m_tickValues.push_back(m);
-                        m_tickLabels.push_back( TickLabel (m) );
-                        m_absVisibleMaxV = std::max(m_absVisibleMaxV, fabs(m));
-                    }
+    for (unsigned int i = 0; i < m_masterScale->m_tickValues.size(); i++)
+    {
+        m = TransformFromPlot ( m_masterScale->TransformToPlot(m_masterScale->m_tickValues[i]) );
+        m_tickValues.push_back(m);
+        m_tickLabels.push_back( TickLabel (m) );
+        m_absVisibleMaxV = std::max(m_absVisibleMaxV, fabs(m));
+    }
 
 }
 
@@ -1016,23 +1016,23 @@ void mpScaleY::recalculateTicks ( wxDC & dc, mpWindow & w )
 
     double minErr = 1000000000000.0;
     double bestStep;
-        for(int i = 10; i <= 20; i+=2)
+    for(int i = 10; i <= 20; i+=2)
+    {
+        double step = fabs(maxVvis - minVvis) / (double) i;
+        double base = pow(10, floor(log10(step)));
+
+        //printf("base %.3f\n", base);
+
+        double stepInt = floor(step / base) * base;
+        double err = fabs(step - stepInt);
+
+        if(err< minErr)
         {
-            double step = fabs(maxVvis - minVvis) / (double) i;
-            double base = pow(10, floor(log10(step)));
-
-            //printf("base %.3f\n", base);
-
-            double stepInt = floor(step / base) * base;
-            double err = fabs(step - stepInt);
-
-            if(err< minErr)
-            {
-                minErr = err;
-                bestStep = stepInt;
-            }
-            //printf("step %d %.3f %.3f best %.3f\n",i, step, stepInt, bestStep);
+            minErr = err;
+            bestStep = stepInt;
         }
+        //printf("step %d %.3f %.3f best %.3f\n",i, step, stepInt, bestStep);
+    }
 
 
     double v = floor(minVvis / bestStep) * bestStep;
@@ -1141,8 +1141,8 @@ void mpScaleXLog::recalculateTicks ( wxDC & dc, mpWindow & w )
 
 
 
-IMPLEMENT_ABSTRACT_CLASS(mpScaleXBase, mpLayer)
-IMPLEMENT_DYNAMIC_CLASS(mpScaleX, mpScaleXBase)
+    IMPLEMENT_ABSTRACT_CLASS(mpScaleXBase, mpLayer)
+    IMPLEMENT_DYNAMIC_CLASS(mpScaleX, mpScaleXBase)
 IMPLEMENT_DYNAMIC_CLASS(mpScaleXLog, mpScaleXBase)
 
 mpScaleXBase::mpScaleXBase(wxString name, int flags, bool ticks, unsigned int type)
@@ -1199,7 +1199,7 @@ void mpScaleXBase::Plot(wxDC & dc, mpWindow & w)
         if (m_flags == mpALIGN_BORDER_TOP )
             orgy = 1;//-dc.LogicalToDeviceY(0);
 
-    //    dc.DrawLine( 0, orgy, w.GetScrX(), orgy);
+        //    dc.DrawLine( 0, orgy, w.GetScrX(), orgy);
 
 #ifdef MATHPLOT_DO_LOGGING
         wxLogMessage(wxT("mpScaleX::Plot: dig: %f , step: %f, end: %f, n: %f"), dig, step, end, n0);
@@ -1308,7 +1308,7 @@ void mpScaleXBase::Plot(wxDC & dc, mpWindow & w)
             case mpALIGN_BOTTOM: {
 
 
-                                         dc.DrawText( m_name, (endPx + startPx) / 2 - tx / 2, orgy + 6 + labelH);
+                                     dc.DrawText( m_name, (endPx + startPx) / 2 - tx / 2, orgy + 6 + labelH);
 
                                  } break;
             case mpALIGN_CENTER:
@@ -1354,7 +1354,7 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
     m_offset = -m_minV;
     m_scale = 1.0 / ( m_maxV - m_minV );
 
-//printf("Plot Y-scale\n");
+    //printf("Plot Y-scale\n");
     recalculateTicks(dc, w);
     if (m_visible) {
         dc.SetPen( m_pen);
@@ -1381,9 +1381,9 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
         if (m_flags == mpALIGN_BORDER_LEFT )
             orgx = 1; //-dc.LogicalToDeviceX(0);
 
-            wxCoord endPx   = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
-            wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
-            wxCoord maxYpx  = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
+        wxCoord endPx   = m_drawOutsideMargins ? w.GetScrX() : w.GetScrX() - w.GetMarginRight();
+        wxCoord minYpx  = m_drawOutsideMargins ? 0 : w.GetMarginTop();
+        wxCoord maxYpx  = m_drawOutsideMargins ? w.GetScrY() : w.GetScrY() - w.GetMarginBottom();
         // Draw line
         dc.DrawLine( orgx, minYpx, orgx, maxYpx);
 
@@ -1442,28 +1442,28 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
         }
 
         //printf("Y-ticks: %d\n", tickCount());
-            for (n = 0; n < labelCount(); n++ ) {
-                //printf("Tick %d\n", n);
+        for (n = 0; n < labelCount(); n++ ) {
+            //printf("Tick %d\n", n);
 
-                double tp = getLabelPos(n);
+            double tp = getLabelPos(n);
 
-                double py = TransformToPlot ( tp ); //( log10 ( tp ) - xlogmin) / (xlogmax - xlogmin);
-                const int p = (int)(( w.GetPosY() - py ) * w.GetScaleY());
+            double py = TransformToPlot ( tp ); //( log10 ( tp ) - xlogmin) / (xlogmax - xlogmin);
+            const int p = (int)(( w.GetPosY() - py ) * w.GetScaleY());
 
-                if ( !m_tickLabels[n].visible )
-                    continue;
+            if ( !m_tickLabels[n].visible )
+                continue;
 
-                if ((p >= minYpx) && (p <= maxYpx)) {
+            if ((p >= minYpx) && (p <= maxYpx)) {
 
-                    s=getLabel(n);
-                    dc.GetTextExtent(s, &tx, &ty);
-                    if ((m_flags == mpALIGN_BORDER_LEFT) || (m_flags == mpALIGN_RIGHT))
-                        dc.DrawText( s, orgx+4, p-ty/2);
-                    else
-                        dc.DrawText( s, orgx-4-tx, p-ty/2); //( s, orgx+4, p-ty/2);
-                }
+                s=getLabel(n);
+                dc.GetTextExtent(s, &tx, &ty);
+                if ((m_flags == mpALIGN_BORDER_LEFT) || (m_flags == mpALIGN_RIGHT))
+                    dc.DrawText( s, orgx+4, p-ty/2);
+                else
+                    dc.DrawText( s, orgx-4-tx, p-ty/2); //( s, orgx+4, p-ty/2);
             }
-            // Draw axis name
+        }
+        // Draw axis name
         // Draw axis name
 
         dc.GetTextExtent(m_name, &tx, &ty);
@@ -1472,11 +1472,11 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
                 dc.DrawText( m_name, labelW + 8, 4);
                 break;
             case mpALIGN_LEFT: {
-    //                               if ((!m_drawOutsideMargins) && (w.GetMarginLeft() > (ty + labelW + 8))) {
-    //                                   dc.DrawRotatedText( m_name, orgx - 6 - labelW - ty, (maxYpx + minYpx) / 2 + tx / 2, 90);
-    //                               } else {
-                                       dc.DrawText( m_name, orgx + 4, minYpx - ty - 4);
-    //                               }
+                                   //                               if ((!m_drawOutsideMargins) && (w.GetMarginLeft() > (ty + labelW + 8))) {
+                                   //                                   dc.DrawRotatedText( m_name, orgx - 6 - labelW - ty, (maxYpx + minYpx) / 2 + tx / 2, 90);
+                                   //                               } else {
+                                   dc.DrawText( m_name, orgx + 4, minYpx - ty - 4);
+                                   //                               }
                                } break;
             case mpALIGN_CENTER:
                                dc.DrawText( m_name, orgx + 4, 4);
@@ -1485,9 +1485,9 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w)
                                     //dc.DrawRotatedText( m_name, orgx + 6, (maxYpx + minYpx) / 2 + tx / 2, 90);
 
                                     /*if ((!m_drawOutsideMargins) && (w.GetMarginRight() > (ty + labelW + 8))) {
-                                        dc.DrawRotatedText( m_name, orgx + 6 + labelW, (maxYpx - minYpx + tx)>>1, 90);
-                                    } else {*/
-                                        dc.DrawText( m_name, orgx - tx - 4, minYpx - ty - 4);
+                                      dc.DrawRotatedText( m_name, orgx + 6 + labelW, (maxYpx - minYpx + tx)>>1, 90);
+                                      } else {*/
+                                    dc.DrawText( m_name, orgx - tx - 4, minYpx - ty - 4);
                                     //}
                                 } break;
             case mpALIGN_BORDER_RIGHT:
@@ -1515,14 +1515,14 @@ IMPLEMENT_DYNAMIC_CLASS(mpWindow, wxWindow)
     EVT_SCROLLWIN_LINEUP(mpWindow::OnScrollLineUp)
     EVT_SCROLLWIN_LINEDOWN(mpWindow::OnScrollLineDown)
     EVT_SCROLLWIN_TOP(mpWindow::OnScrollTop)
-    EVT_SCROLLWIN_BOTTOM(mpWindow::OnScrollBottom)
+EVT_SCROLLWIN_BOTTOM(mpWindow::OnScrollBottom)
 
     EVT_MIDDLE_DOWN(mpWindow::OnMouseMiddleDown) // JLB
     EVT_RIGHT_UP(mpWindow::OnShowPopupMenu)
     EVT_MOUSEWHEEL(mpWindow::OnMouseWheel )   // JLB
     EVT_MOTION(mpWindow::OnMouseMove )   // JLB
     EVT_LEFT_DOWN(mpWindow::OnMouseLeftDown)
-    EVT_LEFT_UP(mpWindow::OnMouseLeftRelease)
+EVT_LEFT_UP(mpWindow::OnMouseLeftRelease)
 
     EVT_MENU( mpID_CENTER,    mpWindow::OnCenter)
     EVT_MENU( mpID_FIT,       mpWindow::OnFit)
@@ -1688,7 +1688,7 @@ void mpWindow::OnMouseMove(wxMouseEvent     &event)
             }
             UpdateAll();
         } else {
-            #if 0
+#if 0
             wxLayerList::iterator li;
             for (li = m_layers.begin(); li != m_layers.end(); li++) {
                 if ((*li)->IsInfo() && (*li)->IsVisible()) {
@@ -1698,7 +1698,7 @@ void mpWindow::OnMouseMove(wxMouseEvent     &event)
                     RefreshRect(tmpLyr->GetRectangle());
                 }
             }
-            #endif
+#endif
             /* if (m_coordTooltip) {
                wxString toolTipContent;
                toolTipContent.Printf(_("X = %f\nY = %f"), p2x(event.GetX()), p2y(event.GetY()));
@@ -1778,7 +1778,7 @@ void mpWindow::Fit(double xMin, double xMax, double yMin, double yMax, wxCoord *
     // Save desired borders:
     m_desiredXmin=xMin; m_desiredXmax=xMax;
     m_desiredYmin=yMin; m_desiredYmax=yMax;
-//    printf("minx %.1f miny %.1f maxx %.1f maxy %.1f\n", xMin, yMin, xMax, yMax);
+    //    printf("minx %.1f miny %.1f maxx %.1f maxy %.1f\n", xMin, yMin, xMax, yMax);
 
     if (printSizeX!=NULL && printSizeY!=NULL)
     {
@@ -1943,7 +1943,7 @@ void mpWindow::AdjustLimitedView()
 bool mpWindow::SetXView(double pos, double desiredMax, double desiredMin)
 {
     //if(!CheckXLimits(desiredMax, desiredMin))
-        //return false;
+    //return false;
 
     m_posX = pos;
     m_desiredXmax = desiredMax;
@@ -1957,7 +1957,7 @@ bool mpWindow::SetXView(double pos, double desiredMax, double desiredMin)
 bool mpWindow::SetYView(double pos, double desiredMax, double desiredMin)
 {
     //if(!CheckYLimits(desiredMax, desiredMin))
-        //return false;
+    //return false;
 
     m_posY = pos;
     m_desiredYmax = desiredMax;
@@ -2399,7 +2399,7 @@ bool mpWindow::UpdateBBox()
 
     return true;
 
-    #if 0
+#if 0
 
     for (wxLayerList::iterator li = m_layers.begin(); li != m_layers.end(); li++)
     {
@@ -2431,7 +2431,7 @@ bool mpWindow::UpdateBBox()
         //node = node->GetNext();
     }
 
-    #endif
+#endif
 
 #ifdef MATHPLOT_DO_LOGGING
     wxLogDebug(wxT("[mpWindow::UpdateBBox] Bounding box: Xmin = %f, Xmax = %f, Ymin = %f, YMax = %f"), m_minX, m_maxX, m_minY, m_maxY);
@@ -2685,7 +2685,7 @@ void mpWindow::GetBoundingBox(double* bbox)
 }
 
 bool mpWindow::SaveScreenshot( const wxString& filename, wxBitmapType type,
-                               wxSize imageSize, bool fit )
+        wxSize imageSize, bool fit )
 {
     int sizeX, sizeY;
     int bk_scrX, bk_scrY;
@@ -2875,7 +2875,7 @@ IMPLEMENT_DYNAMIC_CLASS(mpFXYVector, mpFXY)
 mpFXYVector::mpFXYVector(wxString name, int flags ) : mpFXY(name,flags)
 {
     m_index = 0;
-//printf("FXYVector::FXYVector!\n");
+    //printf("FXYVector::FXYVector!\n");
     m_minX  = -1;
     m_maxX  = 1;
     m_minY  = -1;
@@ -2930,7 +2930,7 @@ double log10( double x)
 
 #if 0
 mpFSemiLogXVector::mpFSemiLogXVector(wxString name, int flags ) :
-mpFXYVector ( name, flags )
+    mpFXYVector ( name, flags )
 {}
 
 
diff --git a/include/widgets/mathplot.h b/include/widgets/mathplot.h
index 170df50f1f..2fd60336ba 100644
--- a/include/widgets/mathplot.h
+++ b/include/widgets/mathplot.h
@@ -3,9 +3,9 @@
 // Purpose:         Framework for plotting in wxWindows
 // Original Author: David Schalig
 // Maintainer:      Davide Rondini
-// Contributors:    Jose Luis Blanco, Val Greene
+// Contributors:    Jose Luis Blanco, Val Greene, Maciej Suminski, Tomasz Wlostowski
 // Created:         21/07/2003
-// Last edit:       22/02/2009
+// Last edit:       05/08/2016
 // Copyright:       (c) David Schalig, Davide Rondini
 // Licence:         wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -688,147 +688,147 @@ class WXDLLIMPEXP_MATHPLOT mpProfile : public mpLayer
 
 class WXDLLIMPEXP_MATHPLOT mpScaleBase : public mpLayer
 {
-public:
-    mpScaleBase () { m_rangeSet = false; m_nameFlags = mpALIGN_BORDER_BOTTOM; };
-    virtual ~mpScaleBase () {};
+    public:
+        mpScaleBase () { m_rangeSet = false; m_nameFlags = mpALIGN_BORDER_BOTTOM; };
+        virtual ~mpScaleBase () {};
 
-    virtual bool IsHorizontal() = 0;
+        virtual bool IsHorizontal() = 0;
 
-    bool HasBBox() { return FALSE; }
+        bool HasBBox() { return FALSE; }
 
-    /** Set X axis alignment.
-      @param align alignment (choose between mpALIGN_BORDER_BOTTOM, mpALIGN_BOTTOM, mpALIGN_CENTER, mpALIGN_TOP, mpALIGN_BORDER_TOP */
-    void SetAlign(int align) { m_flags = align; };
+        /** Set X axis alignment.
+          @param align alignment (choose between mpALIGN_BORDER_BOTTOM, mpALIGN_BOTTOM, mpALIGN_CENTER, mpALIGN_TOP, mpALIGN_BORDER_TOP */
+        void SetAlign(int align) { m_flags = align; };
 
-    void SetNameAlign ( int align ) { m_nameFlags = align; }
+        void SetNameAlign ( int align ) { m_nameFlags = align; }
 
-    /** Set X axis ticks or grid
-      @param ticks TRUE to plot axis ticks, FALSE to plot grid. */
-    void SetTicks(bool enable) { m_ticks = enable; };
+        /** Set X axis ticks or grid
+          @param ticks TRUE to plot axis ticks, FALSE to plot grid. */
+        void SetTicks(bool enable) { m_ticks = enable; };
 
-    /** Get X axis ticks or grid
-      @return TRUE if plot is drawing axis ticks, FALSE if the grid is active. */
-    bool GetTicks() { return m_ticks; };
+        /** Get X axis ticks or grid
+          @return TRUE if plot is drawing axis ticks, FALSE if the grid is active. */
+        bool GetTicks() { return m_ticks; };
 
 
-    //virtual double X2p( mpWindow &w, double x ) = 0;
-    //virtual double P2x( mpWindow &w, double x ) = 0;
+        //virtual double X2p( mpWindow &w, double x ) = 0;
+        //virtual double P2x( mpWindow &w, double x ) = 0;
 
-    void SetDataRange ( double minV, double maxV )
-    {
-        m_rangeSet = true;
-        m_minV = minV;
-        m_maxV = maxV;
-    }
-
-    void GetDataRange ( double &minV, double& maxV)
-    {
-        minV = m_minV;
-        maxV = m_maxV;
-    }
-
-    void ExtendDataRange ( double minV, double maxV )
-    {
-        if(!m_rangeSet)
+        void SetDataRange ( double minV, double maxV )
         {
+            m_rangeSet = true;
             m_minV = minV;
             m_maxV = maxV;
-            m_rangeSet = true;
-        } else {
-            m_minV = std::min(minV, m_minV);
-            m_maxV = std::max(maxV, m_maxV);
         }
 
-        if (m_minV == m_maxV)
+        void GetDataRange ( double &minV, double& maxV)
         {
-            m_minV = -1.0;
-            m_maxV = 1.0;
+            minV = m_minV;
+            maxV = m_maxV;
         }
-    }
 
-    void ResetDataRange()
-    {
-        m_rangeSet = 0;
-    }
+        void ExtendDataRange ( double minV, double maxV )
+        {
+            if(!m_rangeSet)
+            {
+                m_minV = minV;
+                m_maxV = maxV;
+                m_rangeSet = true;
+            } else {
+                m_minV = std::min(minV, m_minV);
+                m_maxV = std::max(maxV, m_maxV);
+            }
 
-    double AbsMaxValue() const
-    {
-        return std::max(std::abs(m_maxV), std::abs(m_minV));
-    }
+            if (m_minV == m_maxV)
+            {
+                m_minV = -1.0;
+                m_maxV = 1.0;
+            }
+        }
 
-    double AbsVisibleMaxValue() const
-    {
+        void ResetDataRange()
+        {
+            m_rangeSet = 0;
+        }
+
+        double AbsMaxValue() const
+        {
+            return std::max(std::abs(m_maxV), std::abs(m_minV));
+        }
+
+        double AbsVisibleMaxValue() const
+        {
             return m_absVisibleMaxV;
-    }
+        }
 
-    virtual double TransformToPlot ( double x ) { return 0.0; };
-    virtual double TransformFromPlot (double xplot ){ return 0.0; };
+        virtual double TransformToPlot ( double x ) { return 0.0; };
+        virtual double TransformFromPlot (double xplot ){ return 0.0; };
 
-    struct TickLabel {
-        TickLabel( double pos_=0.0, const wxString& label_ = wxT("") ) :
-            pos ( pos_ ),
-            label ( label_ ) {};
-        double pos;
-        wxString label;
-        int pixelPos;
-        bool visible;
-    };
+        struct TickLabel {
+            TickLabel( double pos_=0.0, const wxString& label_ = wxT("") ) :
+                pos ( pos_ ),
+                label ( label_ ) {};
+            double pos;
+            wxString label;
+            int pixelPos;
+            bool visible;
+        };
 
-    std::vector<TickLabel>& TickLabels() { return m_tickLabels; };
+        std::vector<TickLabel>& TickLabels() { return m_tickLabels; };
 
 
 
-protected:
+    protected:
 
-    void updateTickLabels( wxDC & dc, mpWindow & w );
-    void computeLabelExtents ( wxDC & dc, mpWindow & w );
+        void updateTickLabels( wxDC & dc, mpWindow & w );
+        void computeLabelExtents ( wxDC & dc, mpWindow & w );
 
-    //virtual int getLabelDecimalDigits(int maxDigits);
-    virtual void getVisibleDataRange ( mpWindow& w, double &minV, double& maxV) {};
-    virtual void recalculateTicks ( wxDC & dc, mpWindow & w ) {};
+        //virtual int getLabelDecimalDigits(int maxDigits);
+        virtual void getVisibleDataRange ( mpWindow& w, double &minV, double& maxV) {};
+        virtual void recalculateTicks ( wxDC & dc, mpWindow & w ) {};
 
-    int tickCount() const
-    {
-        return m_tickValues.size();
-    }
+        int tickCount() const
+        {
+            return m_tickValues.size();
+        }
 
-    virtual int labelCount() const
-    {
-        return m_tickLabels.size();
-    }
+        virtual int labelCount() const
+        {
+            return m_tickLabels.size();
+        }
 
-    virtual const wxString formatLabel( double value, int nDigits ) { return wxT(""); }
-    virtual void formatLabels( ) { };
+        virtual const wxString formatLabel( double value, int nDigits ) { return wxT(""); }
+        virtual void formatLabels( ) { };
 
-    virtual double getTickPos( int n )
-    {
-        return m_tickValues [n];
-    }
+        virtual double getTickPos( int n )
+        {
+            return m_tickValues [n];
+        }
 
-    virtual double getLabelPos( int n )
-    {
-        return m_tickLabels[n].pos;
-    }
+        virtual double getLabelPos( int n )
+        {
+            return m_tickLabels[n].pos;
+        }
 
-    virtual const wxString getLabel( int n )
-    {
-        return m_tickLabels[n].label;
-    }
+        virtual const wxString getLabel( int n )
+        {
+            return m_tickLabels[n].label;
+        }
 
 
 
-    std::vector<double> m_tickValues;
-    std::vector<TickLabel> m_tickLabels;
+        std::vector<double> m_tickValues;
+        std::vector<TickLabel> m_tickLabels;
 
-    double m_offset, m_scale;
-    double m_absVisibleMaxV;
-    int m_flags; //!< Flag for axis alignment
-    int m_nameFlags;
-    bool m_ticks; //!< Flag to toggle between ticks or grid
-    double m_minV, m_maxV;
-    bool m_rangeSet;
-    int m_maxLabelHeight;
-    int m_maxLabelWidth;
+        double m_offset, m_scale;
+        double m_absVisibleMaxV;
+        int m_flags; //!< Flag for axis alignment
+        int m_nameFlags;
+        bool m_ticks; //!< Flag to toggle between ticks or grid
+        double m_minV, m_maxV;
+        bool m_rangeSet;
+        int m_maxLabelHeight;
+        int m_maxLabelWidth;
 
 };
 
@@ -850,8 +850,8 @@ class WXDLLIMPEXP_MATHPLOT mpScaleXBase : public mpScaleBase
 
         virtual void getVisibleDataRange ( mpWindow& w, double &minV, double& maxV);
 
-//        unsigned int m_labelType; //!< Select labels mode: mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds
-//        wxString m_labelFormat; //!< Format string used to print labels
+        //        unsigned int m_labelType; //!< Select labels mode: mpX_NORMAL for normal labels, mpX_TIME for time axis in hours, minutes, seconds
+        //        wxString m_labelFormat; //!< Format string used to print labels
 
         DECLARE_DYNAMIC_CLASS(mpScaleXBase)
 };
@@ -981,7 +981,7 @@ class WXDLLIMPEXP_MATHPLOT mpScaleY : public mpScaleBase
         void computeSlaveTicks ( mpWindow& w );
         mpScaleY * m_masterScale;
 
-//        double m_minV, m_maxV;
+        //        double m_minV, m_maxV;
         int m_maxLabelHeight;
         int m_maxLabelWidth;
 
@@ -1302,7 +1302,7 @@ class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
           @param imageSize Set a size for the output image. Default is the same as the screen size
           @param fit Decide whether to fit the plot into the size*/
         bool SaveScreenshot(const wxString& filename, wxBitmapType type = wxBITMAP_TYPE_BMP,
-                            wxSize imageSize = wxDefaultSize, bool fit = false);
+                wxSize imageSize = wxDefaultSize, bool fit = false);
 
         /** This value sets the zoom steps whenever the user clicks "Zoom in/out" or performs zoom with the mouse wheel.
          *  It must be a number above unity. This number is used for zoom in, and its inverse for zoom out. Set to 1.5 by default. */
@@ -1385,7 +1385,7 @@ class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
         // void OnScroll2       (wxScrollWinEvent &event); //!< Scroll handler, will move canvas
         void OnShowPopupMenu (wxMouseEvent     &event); //!< Mouse handler, will show context menu
         void OnMouseMiddleDown(wxMouseEvent    &event); //!< Mouse handler, for detecting when the user
-                                                        //!< drags with the middle button or just "clicks" for the menu
+        //!< drags with the middle button or just "clicks" for the menu
         void OnCenter        (wxCommandEvent   &event); //!< Context menu handler
         void OnFit           (wxCommandEvent   &event); //!< Context menu handler
         void OnZoomIn        (wxCommandEvent   &event); //!< Context menu handler
@@ -1414,14 +1414,14 @@ class WXDLLIMPEXP_MATHPLOT mpWindow : public wxWindow
         {
             return !(m_enableLimitedView
                     && (desiredMax > m_maxX - m_marginRight / m_scaleX
-                    || desiredMin < m_minX - m_marginLeft / m_scaleX));
+                        || desiredMin < m_minX - m_marginLeft / m_scaleX));
         }
 
         bool CheckYLimits(double& desiredMax, double& desiredMin) const
         {
             return !(m_enableLimitedView
                     && (desiredMax > m_maxY + m_marginBottom / m_scaleY
-                    || desiredMin < m_minY + m_marginTop / m_scaleY));
+                        || desiredMin < m_minY + m_marginTop / m_scaleY));
         }
 
         void AdjustLimitedView();
@@ -1555,7 +1555,7 @@ class WXDLLIMPEXP_MATHPLOT mpFXYVector : public mpFXY
           */
         bool GetNextXY(double & x, double & y);
 
-public:
+    public:
         /** Returns the actual minimum X data (loaded in SetData).
         */
         double GetMinX() { return m_minX; }
@@ -1572,7 +1572,7 @@ public:
         */
         double GetMaxY() { return m_maxY; }
 
-protected:
+    protected:
         int     m_flags; //!< Holds label alignment
 
         DECLARE_DYNAMIC_CLASS(mpFXYVector)
@@ -1953,19 +1953,13 @@ class WXDLLIMPEXP_MATHPLOT mpBitmapLayer : public mpLayer
         wxBitmap     m_scaledBitmap;
         wxCoord      m_scaledBitmap_offset_x,m_scaledBitmap_offset_y;
 
-
         bool            m_validImg;
 
-
         /** The shape of the bitmap:
         */
         double  m_min_x,m_max_x,m_min_y,m_max_y;
-
-
 };
 
-
-
 /*@}*/
 
 #endif // _MP_MATHPLOT_H_

From 2c29133c579143ea17ee49d91d2d7362727034a2 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:18 +0200
Subject: [PATCH 189/197] Use system ngspice.h file

---
 eeschema/sim/ngspice.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eeschema/sim/ngspice.h b/eeschema/sim/ngspice.h
index b24aada872..298d041949 100644
--- a/eeschema/sim/ngspice.h
+++ b/eeschema/sim/ngspice.h
@@ -25,7 +25,7 @@
 #ifndef NGSPICE_H
 #define NGSPICE_H
 
-#include "sharedspice.h"
+#include <ngspice/sharedspice.h>
 #include "spice_simulator.h"
 
 class wxDynamicLibrary;

From d15eef06f9ca81ae13c47f57675856cda24c19ad Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:18 +0200
Subject: [PATCH 190/197] Removed redundant debugging info

---
 eeschema/sim/sim_plot_frame.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 94fd8173da..5c7f121040 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -1014,7 +1014,6 @@ void SIM_PLOT_FRAME::onSimUpdate( wxCommandEvent& aEvent )
 
 void SIM_PLOT_FRAME::onSimReport( wxCommandEvent& aEvent )
 {
-    std::cout << aEvent.GetString() << std::endl;
     m_simConsole->AppendText( aEvent.GetString() + "\n" );
     m_simConsole->SetInsertionPointEnd();
 }

From dfb5c6bfddf67cec9d3741c55229f0bc5cdb666e Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:19 +0200
Subject: [PATCH 191/197] Do not update values if simulation is rerun Otherwise
 sometimes the signal list might be cleared and a new list is not yet
 available, resulting in loss of signals and cursors.

---
 eeschema/sim/sim_plot_frame.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 5c7f121040..6204f4165c 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -951,6 +951,9 @@ void SIM_PLOT_FRAME::onSimFinished( wxCommandEvent& aEvent )
     if( !plotPanel || plotPanel->GetType() != simType )
         plotPanel = NewPlotPanel( simType );
 
+    if( IsSimulationRunning() )
+        return;
+
     // If there are any signals plotted, update them
     if( SIM_PLOT_PANEL::IsPlottable( simType ) )
     {

From 0cb1e80e00c4c413bb90f31f97c322806714ff33 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:19 +0200
Subject: [PATCH 192/197] Activate eeschema on tune/probe

---
 eeschema/sim/sim_plot_frame.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 6204f4165c..1f0e4822c2 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -871,6 +871,7 @@ void SIM_PLOT_FRAME::onProbe( wxCommandEvent& event )
         return;
 
     wxQueueEvent( m_schematicFrame, new wxCommandEvent( wxEVT_TOOL, ID_SIM_PROBE ) );
+    m_schematicFrame->Raise();
 }
 
 
@@ -880,6 +881,7 @@ void SIM_PLOT_FRAME::onTune( wxCommandEvent& event )
         return;
 
     wxQueueEvent( m_schematicFrame, new wxCommandEvent( wxEVT_TOOL, ID_SIM_TUNE ) );
+    m_schematicFrame->Raise();
 }
 
 

From 6bfdfd52268118f97f6e3e9a6bb1d9927404506d Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:19 +0200
Subject: [PATCH 193/197] Look for libraries in the project path

---
 eeschema/dialogs/dialog_spice_model.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp
index d60eefdf93..213e17e598 100644
--- a/eeschema/dialogs/dialog_spice_model.cpp
+++ b/eeschema/dialogs/dialog_spice_model.cpp
@@ -619,9 +619,17 @@ void DIALOG_SPICE_MODEL::updateFromFile( wxComboBox* aComboBox,
 {
     wxString curValue = aComboBox->GetValue();
     const wxString keyword( aKeyword.Lower() );
+    wxFileName filePath( aFilePath );
+
+    if( !filePath.Exists() )
+    {
+        // Look for the file in the project path
+        filePath.SetPath( Prj().GetProjectPath() );
+    }
+
     wxTextFile file;
 
-    if( !file.Open( aFilePath ) )
+    if( !file.Open( filePath.GetFullPath() ) )
         return;
 
     aComboBox->Clear();

From 6b3584ce9bcc699ac9bffa8329306d930ee7fbfb Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:19 +0200
Subject: [PATCH 194/197] fxup system ngspice.h

---
 eeschema/sim/ngspice.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eeschema/sim/ngspice.h b/eeschema/sim/ngspice.h
index 298d041949..0605c62b0c 100644
--- a/eeschema/sim/ngspice.h
+++ b/eeschema/sim/ngspice.h
@@ -25,7 +25,7 @@
 #ifndef NGSPICE_H
 #define NGSPICE_H
 
-#include <ngspice/sharedspice.h>
+#include <../share/ngspice/include/ngspice/sharedspice.h>
 #include "spice_simulator.h"
 
 class wxDynamicLibrary;

From 18e99fa30fee20e30f5dd8ec2ebfe5ace8e03626 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:21 +0200
Subject: [PATCH 195/197] Fixed a crash with certain shared library versions

---
 eeschema/sim/ngspice.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp
index 2961f5dc5e..0d5f456ca7 100644
--- a/eeschema/sim/ngspice.cpp
+++ b/eeschema/sim/ngspice.cpp
@@ -54,7 +54,6 @@ void NGSPICE::Init()
     }
 
     Command( "reset" );
-    Command( "remcirc" );
 }
 
 

From e4c7b4af4f2e0e59a711034c977f5c4f8e7ea08b Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:42:22 +0200
Subject: [PATCH 196/197] Corrected simulation demos

---
 .../laser_driver/laser_driver-cache.lib       |  44 +++----
 .../simulation/laser_driver/laser_driver.pro  |   1 -
 .../simulation/laser_driver/laser_driver.sch  | 114 ++++++++----------
 .../simulation/rectifier/rectifier-cache.lib  |  29 ++---
 demos/simulation/rectifier/rectifier.pro      |  63 +++++-----
 demos/simulation/rectifier/rectifier.sch      |  21 +---
 demos/simulation/sallen_key/AD8051.lib        | 112 -----------------
 .../sallen_key/sallen_key-cache.lib           |  33 +++--
 demos/simulation/sallen_key/sallen_key.pro    |  69 ++++++-----
 demos/simulation/sallen_key/sallen_key.sch    | 109 ++++++++---------
 10 files changed, 219 insertions(+), 376 deletions(-)
 delete mode 100644 demos/simulation/sallen_key/AD8051.lib

diff --git a/demos/simulation/laser_driver/laser_driver-cache.lib b/demos/simulation/laser_driver/laser_driver-cache.lib
index 7acac78e16..f44ec2907a 100644
--- a/demos/simulation/laser_driver/laser_driver-cache.lib
+++ b/demos/simulation/laser_driver/laser_driver-cache.lib
@@ -6,17 +6,14 @@ EESchema-LIBRARY Version 2.3
 DEF C C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
 F1 "C" 25 -100 50 H V L CNN
-F2 "" 38 -150 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  C?
  C_????_*
  C_????
  SMD*_c
  Capacitor*
- Capacitors_ThroughHole:C_Radial_D10_L13_P5
- Capacitors_SMD:C_0805
- Capacitors_SMD:C_1206
 $ENDFPLIST
 DRAW
 P 2 0 1 20 -80 -30 80 -30 N
@@ -31,8 +28,8 @@ ENDDEF
 DEF GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -250 50 H I C CNN
 F1 "GND" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
 X GND 1 0 0 0 D 50 50 1 1 W N
@@ -61,11 +58,16 @@ ENDDEF
 DEF LED D 0 40 Y N 1 F N
 F0 "D" 0 100 50 H V C CNN
 F1 "LED" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
- LED-*
- LED_*
+ LED-3MM
+ LED-5MM
+ LED-10MM
+ LED-0603
+ LED-0805
+ LED-1206
+ LEDV
 $ENDFPLIST
 DRAW
 P 2 0 1 0 -50 50 -50 -50 N
@@ -82,8 +84,8 @@ ENDDEF
 DEF Q_NPN_CBE Q 0 0 Y N 1 F N
 F0 "Q" 300 50 50 H V R CNN
 F1 "Q_NPN_CBE" 600 -50 50 H V R CNN
-F2 "" 200 100 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 200 100 29 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 C 50 0 111 0 1 10 N
 P 2 0 1 0 25 25 100 100 N
@@ -101,16 +103,16 @@ ENDDEF
 DEF R R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
 F1 "R" 0 0 50 V V C CNN
-F2 "" -70 0 50 V V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" -70 0 30 V V C CNN
+F3 "" 0 0 30 H V C CNN
 $FPLIST
  R_*
  Resistor_*
 $ENDFPLIST
 DRAW
 S -40 -100 40 100 0 1 10 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 0 -150 50 U 50 50 1 1 P
+X ~ 1 0 150 50 D 60 60 1 1 P
+X ~ 2 0 -150 50 U 60 60 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -119,8 +121,8 @@ ENDDEF
 DEF VDD #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
 F1 "VDD" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 C 0 75 25 0 1 0 N
 P 2 0 1 0 0 0 0 50 N
@@ -152,8 +154,8 @@ ENDDEF
 DEF VSS #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
 F1 "VSS" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 C 0 75 25 0 1 0 N
 P 2 0 1 0 0 0 0 50 N
diff --git a/demos/simulation/laser_driver/laser_driver.pro b/demos/simulation/laser_driver/laser_driver.pro
index 2618b4a71e..e42812d031 100644
--- a/demos/simulation/laser_driver/laser_driver.pro
+++ b/demos/simulation/laser_driver/laser_driver.pro
@@ -29,7 +29,6 @@ version=1
 NetIExt=net
 [eeschema]
 version=1
-LibDir=../../../../kicad-library/library
 [eeschema/libraries]
 LibName1=power
 LibName2=device
diff --git a/demos/simulation/laser_driver/laser_driver.sch b/demos/simulation/laser_driver/laser_driver.sch
index 64858a3c0b..a54f202d01 100644
--- a/demos/simulation/laser_driver/laser_driver.sch
+++ b/demos/simulation/laser_driver/laser_driver.sch
@@ -48,18 +48,16 @@ L VSOURCE V1
 U 1 1 57336052
 P 2650 3550
 F 0 "V1" H 2778 3596 50  0000 L CNN
-F 1 "AC 1" H 2778 3505 50  0000 L CNN
+F 1 "pulse (check properties)" H 2778 3505 50  0000 L CNN
 F 2 "" H 2650 3550 50  0000 C CNN
 F 3 "" H 2650 3550 50  0000 C CNN
-F 4 "Value" H 2650 3550 60  0001 C CNN "Fieldname"
-F 5 "V" H 2650 3550 60  0001 C CNN "Spice_Primitive"
-F 6 "pulse(0 3 100n 1n 1n 20n 100n )" H 2650 3550 60  0001 C CNN "Spice_Model"
-F 7 "Y" H 2650 3550 60  0001 C CNN "Spice_Netlist_Enabled"
+F 4 "V" H 2650 3550 60  0001 C CNN "Spice_Primitive"
+F 5 "pulse(0 3 100n 1n 1n 20n 100n )" H 2650 3550 60  0001 C CNN "Spice_Model"
 	1    2650 3550
 	1    0    0    -1  
 $EndComp
 Text Notes 3150 5400 0    60   ~ 0
-.tran 10p 150n\n
+.tran 10p 150n
 $Comp
 L Generic_Opamp U1
 U 1 1 5788FF9F
@@ -79,29 +77,29 @@ $EndComp
 $Comp
 L VSOURCE V2
 U 1 1 578900BA
-P 9650 1900
-F 0 "V2" H 9778 1946 50  0000 L CNN
-F 1 "DC 10" H 9778 1855 50  0000 L CNN
-F 2 "" H 9650 1900 50  0000 C CNN
-F 3 "" H 9650 1900 50  0000 C CNN
-F 4 "Value" H 9650 1900 60  0001 C CNN "Fieldname"
-F 5 "V" H 9650 1900 60  0001 C CNN "Spice_Primitive"
-F 6 "1 2" H 9350 2100 60  0001 C CNN "Spice_Node_Sequence"
-	1    9650 1900
+P 9650 1850
+F 0 "V2" H 9778 1896 50  0000 L CNN
+F 1 "DC 10" H 9778 1805 50  0000 L CNN
+F 2 "" H 9650 1850 50  0000 C CNN
+F 3 "" H 9650 1850 50  0000 C CNN
+F 4 "Value" H 9650 1850 60  0001 C CNN "Fieldname"
+F 5 "V" H 9650 1850 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 9350 2050 60  0001 C CNN "Spice_Node_Sequence"
+	1    9650 1850
 	1    0    0    -1  
 $EndComp
 $Comp
 L VSOURCE V3
 U 1 1 57890232
-P 9650 2300
-F 0 "V3" H 9778 2346 50  0000 L CNN
-F 1 "DC 10" H 9778 2255 50  0000 L CNN
-F 2 "" H 9650 2300 50  0000 C CNN
-F 3 "" H 9650 2300 50  0000 C CNN
-F 4 "Value" H 9650 2300 60  0001 C CNN "Fieldname"
-F 5 "V" H 9650 2300 60  0001 C CNN "Spice_Primitive"
-F 6 "1 2" H 9350 2500 60  0001 C CNN "Spice_Node_Sequence"
-	1    9650 2300
+P 9650 2350
+F 0 "V3" H 9778 2396 50  0000 L CNN
+F 1 "DC 10" H 9778 2305 50  0000 L CNN
+F 2 "" H 9650 2350 50  0000 C CNN
+F 3 "" H 9650 2350 50  0000 C CNN
+F 4 "Value" H 9650 2350 60  0001 C CNN "Fieldname"
+F 5 "V" H 9650 2350 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 9350 2550 60  0001 C CNN "Spice_Node_Sequence"
+	1    9650 2350
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -118,23 +116,23 @@ $EndComp
 $Comp
 L VDD #PWR8
 U 1 1 578903C0
-P 9650 1700
-F 0 "#PWR8" H 9650 1550 50  0001 C CNN
-F 1 "VDD" H 9667 1873 50  0000 C CNN
-F 2 "" H 9650 1700 50  0000 C CNN
-F 3 "" H 9650 1700 50  0000 C CNN
-	1    9650 1700
+P 9650 1600
+F 0 "#PWR8" H 9650 1450 50  0001 C CNN
+F 1 "VDD" H 9667 1773 50  0000 C CNN
+F 2 "" H 9650 1600 50  0000 C CNN
+F 3 "" H 9650 1600 50  0000 C CNN
+	1    9650 1600
 	1    0    0    -1  
 $EndComp
 $Comp
 L VSS #PWR9
 U 1 1 578903E2
-P 9650 2500
-F 0 "#PWR9" H 9650 2350 50  0001 C CNN
-F 1 "VSS" H 9668 2673 50  0000 C CNN
-F 2 "" H 9650 2500 50  0000 C CNN
-F 3 "" H 9650 2500 50  0000 C CNN
-	1    9650 2500
+P 9650 2600
+F 0 "#PWR9" H 9650 2450 50  0001 C CNN
+F 1 "VSS" H 9668 2773 50  0000 C CNN
+F 2 "" H 9650 2600 50  0000 C CNN
+F 3 "" H 9650 2600 50  0000 C CNN
+	1    9650 2600
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -163,13 +161,10 @@ $Comp
 L C C2
 U 1 1 5789085B
 P 6800 4000
-F 0 "C2" H 6915 4046 50  0000 L CNN
-F 1 "1p" H 6915 3955 50  0000 L CNN
+F 0 "C2" H 6915 3954 50  0000 L CNN
+F 1 "1p" H 6915 4045 50  0000 L CNN
 F 2 "" H 6838 3850 50  0000 C CNN
 F 3 "" H 6800 4000 50  0000 C CNN
-F 4 "Value" H 6800 4000 60  0001 C CNN "Fieldname"
-F 5 "C" H 6800 4000 60  0001 C CNN "Spice_Primitive"
-F 6 "1 2" H 6800 4000 60  0001 C CNN "SpiceMapping"
 	1    6800 4000
 	-1   0    0    1   
 $EndComp
@@ -177,13 +172,10 @@ $Comp
 L R R5
 U 1 1 578EA6D8
 P 6400 4000
-F 0 "R5" V 6193 4000 50  0000 C CNN
-F 1 "2,5" V 6284 4000 50  0000 C CNN
+F 0 "R5" H 6469 3954 50  0000 L CNN
+F 1 "2.5" H 6469 4045 50  0000 L CNN
 F 2 "" V 6330 4000 50  0000 C CNN
 F 3 "" H 6400 4000 50  0000 C CNN
-F 4 "Value" H 6400 4000 60  0001 C CNN "Fieldname"
-F 5 "1 2" H 6400 4000 60  0001 C CNN "SpiceMapping"
-F 6 "R" V 6400 4000 60  0001 C CNN "Spice_Primitive"
 	1    6400 4000
 	-1   0    0    1   
 $EndComp
@@ -195,9 +187,6 @@ F 0 "R1" V 3943 3600 50  0000 C CNN
 F 1 "220" V 4034 3600 50  0000 C CNN
 F 2 "" V 4080 3600 50  0000 C CNN
 F 3 "" H 4150 3600 50  0000 C CNN
-F 4 "Value" H 4150 3600 60  0001 C CNN "Fieldname"
-F 5 "1 2" H 4150 3600 60  0001 C CNN "SpiceMapping"
-F 6 "R" V 4150 3600 60  0001 C CNN "Spice_Primitive"
 	1    4150 3600
 	0    1    1    0   
 $EndComp
@@ -209,9 +198,6 @@ F 0 "R3" V 5193 4150 50  0000 C CNN
 F 1 "220" V 5284 4150 50  0000 C CNN
 F 2 "" V 5330 4150 50  0000 C CNN
 F 3 "" H 5400 4150 50  0000 C CNN
-F 4 "Value" H 5400 4150 60  0001 C CNN "Fieldname"
-F 5 "1 2" H 5400 4150 60  0001 C CNN "SpiceMapping"
-F 6 "R" V 5400 4150 60  0001 C CNN "Spice_Primitive"
 	1    5400 4150
 	0    1    1    0   
 $EndComp
@@ -219,13 +205,10 @@ $Comp
 L C C1
 U 1 1 578EB076
 P 5400 4400
-F 0 "C1" H 5515 4446 50  0000 L CNN
-F 1 "1p" H 5515 4355 50  0000 L CNN
+F 0 "C1" V 5240 4400 50  0000 C CNN
+F 1 "1p" V 5149 4400 50  0000 C CNN
 F 2 "" H 5438 4250 50  0000 C CNN
 F 3 "" H 5400 4400 50  0000 C CNN
-F 4 "Value" H 5400 4400 60  0001 C CNN "Fieldname"
-F 5 "C" H 5400 4400 60  0001 C CNN "Spice_Primitive"
-F 6 "1 2" H 5400 4400 60  0001 C CNN "SpiceMapping"
 	1    5400 4400
 	0    -1   -1   0   
 $EndComp
@@ -265,9 +248,6 @@ F 0 "R4" V 5943 2900 50  0000 C CNN
 F 1 "220" V 6034 2900 50  0000 C CNN
 F 2 "" V 6080 2900 50  0000 C CNN
 F 3 "" H 6150 2900 50  0000 C CNN
-F 4 "Value" H 6150 2900 60  0001 C CNN "Fieldname"
-F 5 "1 2" H 6150 2900 60  0001 C CNN "SpiceMapping"
-F 6 "R" V 6150 2900 60  0001 C CNN "Spice_Primitive"
 	1    6150 2900
 	0    1    1    0   
 $EndComp
@@ -279,9 +259,6 @@ F 0 "R2" V 4143 2900 50  0000 C CNN
 F 1 "160" V 4234 2900 50  0000 C CNN
 F 2 "" V 4280 2900 50  0000 C CNN
 F 3 "" H 4350 2900 50  0000 C CNN
-F 4 "Value" H 4350 2900 60  0001 C CNN "Fieldname"
-F 5 "1 2" H 4350 2900 60  0001 C CNN "SpiceMapping"
-F 6 "R" V 4350 2900 60  0001 C CNN "Spice_Primitive"
 	1    4350 2900
 	0    1    1    0   
 $EndComp
@@ -374,8 +351,8 @@ $Comp
 L Q_NPN_CBE Q1
 U 1 1 578EADCC
 P 6300 3500
-F 0 "Q1" H 6600 3550 50  0000 R CNN
-F 1 "fzt1049a" H 6900 3450 50  0000 R CNN
+F 0 "Q1" H 6491 3546 50  0000 L CNN
+F 1 "fzt1049a" H 6491 3455 50  0000 L CNN
 F 2 "" H 6500 3600 50  0000 C CNN
 F 3 "" H 6300 3500 50  0000 C CNN
 F 4 "Value" H 6300 3500 60  0001 C CNN "Fieldname"
@@ -395,4 +372,11 @@ Wire Wire Line
 Connection ~ 6400 3750
 Text Label 6550 4350 0    60   ~ 0
 out
+Wire Wire Line
+	9650 1600 9650 1650
+Wire Wire Line
+	9650 2600 9650 2550
+Wire Wire Line
+	9650 2050 9650 2150
+Connection ~ 9650 2100
 $EndSCHEMATC
diff --git a/demos/simulation/rectifier/rectifier-cache.lib b/demos/simulation/rectifier/rectifier-cache.lib
index 3d5c8c2b86..ecde26c816 100644
--- a/demos/simulation/rectifier/rectifier-cache.lib
+++ b/demos/simulation/rectifier/rectifier-cache.lib
@@ -6,17 +6,14 @@ EESchema-LIBRARY Version 2.3
 DEF C C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
 F1 "C" 25 -100 50 H V L CNN
-F2 "" 38 -150 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  C?
  C_????_*
  C_????
  SMD*_c
  Capacitor*
- Capacitors_ThroughHole:C_Radial_D10_L13_P5
- Capacitors_SMD:C_0805
- Capacitors_SMD:C_1206
 $ENDFPLIST
 DRAW
 P 2 0 1 20 -80 -30 80 -30 N
@@ -31,8 +28,8 @@ ENDDEF
 DEF D D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
 F1 "D" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  Diode_*
  D-Pak_TO252AA
@@ -53,8 +50,8 @@ ENDDEF
 DEF GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -250 50 H I C CNN
 F1 "GND" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
 X GND 1 0 0 0 D 50 50 1 1 W N
@@ -66,24 +63,24 @@ ENDDEF
 DEF R R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
 F1 "R" 0 0 50 V V C CNN
-F2 "" -70 0 50 V V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" -70 0 30 V V C CNN
+F3 "" 0 0 30 H V C CNN
 $FPLIST
  R_*
  Resistor_*
 $ENDFPLIST
 DRAW
 S -40 -100 40 100 0 1 10 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 0 -150 50 U 50 50 1 1 P
+X ~ 1 0 150 50 D 60 60 1 1 P
+X ~ 2 0 -150 50 U 60 60 1 1 P
 ENDDRAW
 ENDDEF
 #
-# VSOURCE
+# VSOURCE-RESCUE-rectifier
 #
-DEF ~VSOURCE V 0 40 Y Y 1 F N
+DEF ~VSOURCE-RESCUE-rectifier V 0 40 Y Y 1 F N
 F0 "V" 200 200 50 H V C CNN
-F1 "VSOURCE" 250 100 50 H I C CNN
+F1 "VSOURCE-RESCUE-rectifier" 250 100 50 H I C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 F4 "Value" 0 0 60 H I C CNN "Fieldname"
diff --git a/demos/simulation/rectifier/rectifier.pro b/demos/simulation/rectifier/rectifier.pro
index d9bf54bb1a..e1eba2d128 100644
--- a/demos/simulation/rectifier/rectifier.pro
+++ b/demos/simulation/rectifier/rectifier.pro
@@ -1,4 +1,4 @@
-update=śro, 11 maj 2016, 18:59:29
+update=Fri 05 Aug 2016 05:56:48 PM CEST
 version=1
 last_client=eeschema
 [general]
@@ -29,35 +29,34 @@ version=1
 NetIExt=net
 [eeschema]
 version=1
-LibDir=/home/twl/Kicad-dev/kicad-library/library
 [eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=microcontrollers
-LibName13=dsp
-LibName14=microchip
-LibName15=analog_switches
-LibName16=motorola
-LibName17=texas
-LibName18=intel
-LibName19=audio
-LibName20=interface
-LibName21=digital-audio
-LibName22=philips
-LibName23=display
-LibName24=cypress
-LibName25=siliconi
-LibName26=opto
-LibName27=atmel
-LibName28=contrib
-LibName29=valves
-LibName30=pspice
+LibName1=rectifier-rescue
+LibName2=power
+LibName3=device
+LibName4=transistors
+LibName5=conn
+LibName6=linear
+LibName7=regul
+LibName8=74xx
+LibName9=cmos4000
+LibName10=adc-dac
+LibName11=memory
+LibName12=xilinx
+LibName13=microcontrollers
+LibName14=dsp
+LibName15=microchip
+LibName16=analog_switches
+LibName17=motorola
+LibName18=texas
+LibName19=intel
+LibName20=audio
+LibName21=interface
+LibName22=digital-audio
+LibName23=philips
+LibName24=display
+LibName25=cypress
+LibName26=siliconi
+LibName27=opto
+LibName28=atmel
+LibName29=contrib
+LibName30=valves
diff --git a/demos/simulation/rectifier/rectifier.sch b/demos/simulation/rectifier/rectifier.sch
index 055b7ba0a8..8c69e5b5b6 100644
--- a/demos/simulation/rectifier/rectifier.sch
+++ b/demos/simulation/rectifier/rectifier.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:rectifier-rescue
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -28,7 +29,7 @@ LIBS:opto
 LIBS:atmel
 LIBS:contrib
 LIBS:valves
-LIBS:pspice
+LIBS:rectifier-cache
 EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
@@ -44,16 +45,13 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L VSOURCE V1
+L VSOURCE-RESCUE-rectifier V1
 U 1 1 57336052
 P 4400 4050
 F 0 "V1" H 4528 4096 50  0000 L CNN
 F 1 "SINE(0 1.5 1k 0 0 0 0)" H 4528 4005 50  0000 L CNN
 F 2 "" H 4400 4050 50  0000 C CNN
 F 3 "" H 4400 4050 50  0000 C CNN
-F 4 "Value" H 4400 4050 60  0001 C CNN "Fieldname"
-F 5 "V" H 4400 4050 60  0001 C CNN "Spice_Primitive"
-F 6 "1 2" H 4100 4250 60  0001 C CNN "Spice_Node_Sequence"
 	1    4400 4050
 	-1   0    0    1   
 $EndComp
@@ -76,9 +74,6 @@ F 0 "R1" V 4443 3700 50  0000 C CNN
 F 1 "1k" V 4534 3700 50  0000 C CNN
 F 2 "" V 4580 3700 50  0000 C CNN
 F 3 "" H 4650 3700 50  0000 C CNN
-F 4 "Value" H 4650 3700 60  0001 C CNN "Fieldname"
-F 5 "1 2" H 4650 3700 60  0001 C CNN "SpiceMapping"
-F 6 "R" V 4650 3700 60  0001 C CNN "Spice_Primitive"
 	1    4650 3700
 	0    1    1    0   
 $EndComp
@@ -90,9 +85,6 @@ F 0 "D1" H 5100 3485 50  0000 C CNN
 F 1 "1N4148" H 5100 3576 50  0000 C CNN
 F 2 "" H 5100 3700 50  0000 C CNN
 F 3 "" H 5100 3700 50  0000 C CNN
-F 4 "Value" H 5100 3700 60  0001 C CNN "Fieldname"
-F 5 "D" H 5100 3700 60  0001 C CNN "Spice_Primitive"
-F 6 "2 1" H 5100 3700 60  0001 C CNN "Spice_Node_Sequence"
 	1    5100 3700
 	-1   0    0    1   
 $EndComp
@@ -104,9 +96,6 @@ F 0 "C1" H 5515 4046 50  0000 L CNN
 F 1 "100n" H 5515 3955 50  0000 L CNN
 F 2 "" H 5438 3850 50  0000 C CNN
 F 3 "" H 5400 4000 50  0000 C CNN
-F 4 "Value" H 5400 4000 60  0001 C CNN "Fieldname"
-F 5 "C" H 5400 4000 60  0001 C CNN "Spice_Primitive"
-F 6 "1 2" H 5400 4000 60  0001 C CNN "SpiceMapping"
 	1    5400 4000
 	1    0    0    -1  
 $EndComp
@@ -118,9 +107,6 @@ F 0 "R2" H 5680 3954 50  0000 R CNN
 F 1 "100k" H 5680 4045 50  0000 R CNN
 F 2 "" V 5680 4000 50  0000 C CNN
 F 3 "" H 5750 4000 50  0000 C CNN
-F 4 "Value" H 5750 4000 60  0001 C CNN "Fieldname"
-F 5 "1 2" H 5750 4000 60  0001 C CNN "SpiceMapping"
-F 6 "R" V 5750 4000 60  0001 C CNN "Spice_Primitive"
 	1    5750 4000
 	-1   0    0    1   
 $EndComp
@@ -145,7 +131,6 @@ Wire Wire Line
 Connection ~ 5400 4300
 Wire Wire Line
 	4800 3700 4950 3700
-Connection ~ 4900 3700
 Wire Wire Line
 	4400 3850 4400 3700
 Wire Wire Line
diff --git a/demos/simulation/sallen_key/AD8051.lib b/demos/simulation/sallen_key/AD8051.lib
deleted file mode 100644
index 20ac791cd7..0000000000
--- a/demos/simulation/sallen_key/AD8051.lib
+++ /dev/null
@@ -1,112 +0,0 @@
-* AD8051 SPICE Macro-model
-* Description: Amplifier
-* Generic Desc: Single 110 MHz rail-to-rail op amp - 3V
-* Developed by: JCH / ADI
-* Revision History: 08/10/2012 - Updated to new header style
-* 0.0 (09/1998)
-* Copyright 1998, 2012 by Analog Devices, Inc.
-*
-* Refer to http://www.analog.com/Analog_Root/static/techSupport/designTools/spiceModels/license/spice_general.html for License Statement.  Use of this model
-* indicates your acceptance with the terms and provisions in the License Statement.
-*
-* BEGIN Notes:
-*
-* Not Modeled:
-* CMRR IS NOT MODELED
-*    
-* Parameters modeled include:
-* THIS MODEL IS FOR SINGLE SUPPLY OPERATION (+5V)
-*
-* END Notes
-*	
-* Node assignments
-*                 noninverting input
-*                 |       inverting input  
-*                 |       |       positive supply
-*                 |       |       |       negative supply
-*                 |       |       |       |       output
-*                 |       |       |       |       |
-*                 |       |       |       |       |
-.SUBCKT AD8051  1       2       99      50      45
-*
-* INPUT STAGE
-*
-Q1  4  3  5 QPI
-Q2  6  2  7 QPI
-RC1   50  4 20.5k
-RC2   50  6 20.5k
-RE1    5  8 5k
-RE2    7  8 5k 
-EOS    3  1 POLY(1) 53 98 1.7E-3 1 
-IOS    1  2 0.1u
-FNOI1  1  0 VMEAS2 1E-4
-FNOI2  2  0 VMEAS2 1E-4
-
-CPAR1  3 50 1.7p
-CPAR2  2 50 1.7p
-VCMH1 99  9 1
-VCMH2 99 10 1
-D1     5  9  DX
-D2     7 10 DX
-IBIAS 99  8 73u
-*
-* INTERNAL VOLTAGE REFERENCE
-*
-EREF1 98  0 POLY(2) 99 0 50 0 0 0.5 0.5
-EREF2 97  0 POLY(2)  1 0 2 0 0 0.5 0.5
-GREF2 97 0 97 0 1E-6
-*
-*VOLTAGE NOISE STAGE
-*
-DN1 51 52 DNOI1
-VN1 51 98 0.61
-VMEAS 52 98 0
-RNOI1 52 98 6.5E-3
-
-H1 53 98 VMEAS 1
-RNOI2 53 98 1
-*
-*CURRENT NOISE STAGE
-*
-DN2 61 62 DNOI2
-VN2 61 98 0.545
-VMEAS2 62 98 0
-RNOI3  62 98 2E-4
-*
-* INTERMEDIATE GAIN STAGE WITH POLE = 96MHz
-*
-G1   98 20 4 6 1E-3 
-RP1  98 20 550
-CP1  98 20 3p
-*
-* GAIN STAGE WITH DOMINANT POLE
-*
-G4   98 30 20 98 2.6E-3
-RG1 30 98 155k
-CF1  30 45 13.5p
-D5 31 99 DX
-D6 50 32 DX
-V1 31 30 0.6
-V2 30 32 0.6
-*
-* OUTPUT STAGE
-*
-Q3  45 42 99 QPOX
-Q4  45 44 50 QNOX
-EO3 99 42 POLY(1) 98 30 0.7175 0.5
-EO4 44 50 POLY(1) 30 98 0.7355 0.5
-*
-* MODELS
-*
-.MODEL QPI PNP (IS=8.6E-18,BF=91,VAF=30.6)
-.MODEL QNOX NPN(IS=6.37E-16,BF=100,VAF=90,RC=3)
-.MODEL QPOX PNP(IS=1.19E-15,BF=112,VAF=19.2,RC=6)
-.MODEL DX D(IS=1E-16)
-.MODEL DZ D(IS=1E-14,BV=6.6)
-.MODEL DNOI1 D(KF=9E-10)
-.MODEL DNOI2 D(KF=1E-8)
-.ENDS AD8051
-
-
-
-
diff --git a/demos/simulation/sallen_key/sallen_key-cache.lib b/demos/simulation/sallen_key/sallen_key-cache.lib
index 96a2f7eecf..d299155d9f 100644
--- a/demos/simulation/sallen_key/sallen_key-cache.lib
+++ b/demos/simulation/sallen_key/sallen_key-cache.lib
@@ -6,17 +6,14 @@ EESchema-LIBRARY Version 2.3
 DEF C C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
 F1 "C" 25 -100 50 H V L CNN
-F2 "" 38 -150 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  C?
  C_????_*
  C_????
  SMD*_c
  Capacitor*
- Capacitors_ThroughHole:C_Radial_D10_L13_P5
- Capacitors_SMD:C_0805
- Capacitors_SMD:C_1206
 $ENDFPLIST
 DRAW
 P 2 0 1 20 -80 -30 80 -30 N
@@ -31,8 +28,8 @@ ENDDEF
 DEF GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -250 50 H I C CNN
 F1 "GND" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
 X GND 1 0 0 0 D 50 50 1 1 W N
@@ -61,16 +58,16 @@ ENDDEF
 DEF R R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
 F1 "R" 0 0 50 V V C CNN
-F2 "" -70 0 50 V V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" -70 0 30 V V C CNN
+F3 "" 0 0 30 H V C CNN
 $FPLIST
  R_*
  Resistor_*
 $ENDFPLIST
 DRAW
 S -40 -100 40 100 0 1 10 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 0 -150 50 U 50 50 1 1 P
+X ~ 1 0 150 50 D 60 60 1 1 P
+X ~ 2 0 -150 50 U 60 60 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -79,8 +76,8 @@ ENDDEF
 DEF VDD #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
 F1 "VDD" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 C 0 75 25 0 1 0 N
 P 2 0 1 0 0 0 0 50 N
@@ -88,11 +85,11 @@ X VDD 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# VSOURCE
+# VSOURCE-RESCUE-sallen_key
 #
-DEF ~VSOURCE V 0 40 Y Y 1 F N
+DEF ~VSOURCE-RESCUE-sallen_key V 0 40 Y Y 1 F N
 F0 "V" 200 200 50 H V C CNN
-F1 "VSOURCE" 250 100 50 H I C CNN
+F1 "VSOURCE-RESCUE-sallen_key" 250 100 50 H I C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 F4 "Value" 0 0 60 H I C CNN "Fieldname"
@@ -112,8 +109,8 @@ ENDDEF
 DEF VSS #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
 F1 "VSS" 0 150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 C 0 75 25 0 1 0 N
 P 2 0 1 0 0 0 0 50 N
diff --git a/demos/simulation/sallen_key/sallen_key.pro b/demos/simulation/sallen_key/sallen_key.pro
index d91a6573a1..367e9de187 100644
--- a/demos/simulation/sallen_key/sallen_key.pro
+++ b/demos/simulation/sallen_key/sallen_key.pro
@@ -1,4 +1,4 @@
-update=piÄ…, 15 lip 2016, 17:18:36
+update=Fri 05 Aug 2016 05:58:16 PM CEST
 version=1
 last_client=eeschema
 [general]
@@ -27,40 +27,6 @@ ModuleOutlineThickness=0.150000000000
 [cvpcb]
 version=1
 NetIExt=net
-[eeschema]
-version=1
-LibDir=../../kicad-library/library
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=microcontrollers
-LibName13=dsp
-LibName14=microchip
-LibName15=analog_switches
-LibName16=motorola
-LibName17=texas
-LibName18=intel
-LibName19=audio
-LibName20=interface
-LibName21=digital-audio
-LibName22=philips
-LibName23=display
-LibName24=cypress
-LibName25=siliconi
-LibName26=opto
-LibName27=atmel
-LibName28=contrib
-LibName29=valves
-LibName30=pspice
 [schematic_editor]
 version=1
 PageLayoutDescrFile=
@@ -72,3 +38,36 @@ SpiceForceRefPrefix=0
 SpiceUseNetNumbers=0
 LabSize=60
 ERC_TestSimilarLabels=1
+[eeschema]
+version=1
+[eeschema/libraries]
+LibName1=sallen_key-rescue
+LibName2=power
+LibName3=device
+LibName4=transistors
+LibName5=conn
+LibName6=linear
+LibName7=regul
+LibName8=74xx
+LibName9=cmos4000
+LibName10=adc-dac
+LibName11=memory
+LibName12=xilinx
+LibName13=microcontrollers
+LibName14=dsp
+LibName15=microchip
+LibName16=analog_switches
+LibName17=motorola
+LibName18=texas
+LibName19=intel
+LibName20=audio
+LibName21=interface
+LibName22=digital-audio
+LibName23=philips
+LibName24=display
+LibName25=cypress
+LibName26=siliconi
+LibName27=opto
+LibName28=atmel
+LibName29=contrib
+LibName30=valves
diff --git a/demos/simulation/sallen_key/sallen_key.sch b/demos/simulation/sallen_key/sallen_key.sch
index 4b0d2e2edd..8eb2e8cf0b 100644
--- a/demos/simulation/sallen_key/sallen_key.sch
+++ b/demos/simulation/sallen_key/sallen_key.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:sallen_key-rescue
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -28,7 +29,6 @@ LIBS:opto
 LIBS:atmel
 LIBS:contrib
 LIBS:valves
-LIBS:pspice
 LIBS:sallen_key-cache
 EELAYER 25 0
 EELAYER END
@@ -45,23 +45,16 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L VSOURCE V1
+L VSOURCE-RESCUE-sallen_key V1
 U 1 1 57336052
 P 6000 4700
 F 0 "V1" H 6128 4746 50  0000 L CNN
 F 1 "AC 1" H 6128 4655 50  0000 L CNN
 F 2 "" H 6000 4700 50  0000 C CNN
 F 3 "" H 6000 4700 50  0000 C CNN
-F 4 "Value" H 6000 4700 60  0001 C CNN "Fieldname"
-F 5 "V" H 6000 4700 60  0001 C CNN "Spice_Primitive"
-F 6 "1 2" H 5700 4900 60  0001 C CNN "Spice_Node_Sequence"
 	1    6000 4700
 	1    0    0    -1  
 $EndComp
-Text Notes 4300 4900 0    60   ~ 0
-*.tran 1u 10m\n
-Text Notes 4300 4800 0    60   ~ 0
-.include diodes.lib\n
 Text Label 8550 4400 0    60   ~ 0
 lowpass
 Text Notes 4300 5000 0    60   ~ 0
@@ -74,40 +67,39 @@ F 0 "U1" H 8191 4446 50  0000 L CNN
 F 1 "AD8051" H 8191 4355 50  0000 L CNN
 F 2 "" H 7750 4300 50  0000 C CNN
 F 3 "" H 7850 4400 50  0000 C CNN
-F 4 "Value" H 7850 4400 60  0001 C CNN "Fieldname"
-F 5 "X" H 7850 4400 60  0001 C CNN "Spice_Primitive"
-F 6 "AD8051" H 7850 4400 60  0001 C CNN "Spice_Model"
+F 4 "X" H 7850 4400 60  0001 C CNN "Spice_Primitive"
+F 5 "AD8051" H 7850 4400 60  0001 C CNN "Spice_Model"
+F 6 "ad8051.lib" H 7850 4400 60  0001 C CNN "Spice_Lib_File"
 F 7 "Y" H 7850 4400 60  0001 C CNN "Spice_Netlist_Enabled"
-F 8 "/home/twl/Kicad-dev/kicad-git/eeschema/AD8051.lib" H 7850 4400 60  0001 C CNN "Spice_Lib_File"
 	1    7850 4400
 	1    0    0    -1  
 $EndComp
 $Comp
-L VSOURCE V2
+L VSOURCE-RESCUE-sallen_key V2
 U 1 1 578900BA
-P 9650 1900
-F 0 "V2" H 9778 1946 50  0000 L CNN
-F 1 "DC 10" H 9778 1855 50  0000 L CNN
-F 2 "" H 9650 1900 50  0000 C CNN
-F 3 "" H 9650 1900 50  0000 C CNN
-F 4 "Value" H 9650 1900 60  0001 C CNN "Fieldname"
-F 5 "V" H 9650 1900 60  0001 C CNN "Spice_Primitive"
-F 6 "1 2" H 9350 2100 60  0001 C CNN "Spice_Node_Sequence"
-	1    9650 1900
+P 9650 1850
+F 0 "V2" H 9778 1896 50  0000 L CNN
+F 1 "DC 10" H 9778 1805 50  0000 L CNN
+F 2 "" H 9650 1850 50  0000 C CNN
+F 3 "" H 9650 1850 50  0000 C CNN
+F 4 "Value" H 9650 1850 60  0001 C CNN "Fieldname"
+F 5 "V" H 9650 1850 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 9350 2050 60  0001 C CNN "Spice_Node_Sequence"
+	1    9650 1850
 	1    0    0    -1  
 $EndComp
 $Comp
-L VSOURCE V3
+L VSOURCE-RESCUE-sallen_key V3
 U 1 1 57890232
-P 9650 2300
-F 0 "V3" H 9778 2346 50  0000 L CNN
-F 1 "DC 10" H 9778 2255 50  0000 L CNN
-F 2 "" H 9650 2300 50  0000 C CNN
-F 3 "" H 9650 2300 50  0000 C CNN
-F 4 "Value" H 9650 2300 60  0001 C CNN "Fieldname"
-F 5 "V" H 9650 2300 60  0001 C CNN "Spice_Primitive"
-F 6 "1 2" H 9350 2500 60  0001 C CNN "Spice_Node_Sequence"
-	1    9650 2300
+P 9650 2350
+F 0 "V3" H 9778 2396 50  0000 L CNN
+F 1 "DC 10" H 9778 2305 50  0000 L CNN
+F 2 "" H 9650 2350 50  0000 C CNN
+F 3 "" H 9650 2350 50  0000 C CNN
+F 4 "Value" H 9650 2350 60  0001 C CNN "Fieldname"
+F 5 "V" H 9650 2350 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 9350 2550 60  0001 C CNN "Spice_Node_Sequence"
+	1    9650 2350
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -124,23 +116,23 @@ $EndComp
 $Comp
 L VDD #PWR6
 U 1 1 578903C0
-P 9650 1700
-F 0 "#PWR6" H 9650 1550 50  0001 C CNN
-F 1 "VDD" H 9667 1873 50  0000 C CNN
-F 2 "" H 9650 1700 50  0000 C CNN
-F 3 "" H 9650 1700 50  0000 C CNN
-	1    9650 1700
+P 9650 1600
+F 0 "#PWR6" H 9650 1450 50  0001 C CNN
+F 1 "VDD" H 9667 1773 50  0000 C CNN
+F 2 "" H 9650 1600 50  0000 C CNN
+F 3 "" H 9650 1600 50  0000 C CNN
+	1    9650 1600
 	1    0    0    -1  
 $EndComp
 $Comp
 L VSS #PWR7
 U 1 1 578903E2
-P 9650 2500
-F 0 "#PWR7" H 9650 2350 50  0001 C CNN
-F 1 "VSS" H 9668 2673 50  0000 C CNN
-F 2 "" H 9650 2500 50  0000 C CNN
-F 3 "" H 9650 2500 50  0000 C CNN
-	1    9650 2500
+P 9650 2600
+F 0 "#PWR7" H 9650 2450 50  0001 C CNN
+F 1 "VSS" H 9668 2773 50  0000 C CNN
+F 2 "" H 9650 2600 50  0000 C CNN
+F 3 "" H 9650 2600 50  0000 C CNN
+	1    9650 2600
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -197,13 +189,10 @@ $Comp
 L C C1
 U 1 1 5789077D
 P 7000 4950
-F 0 "C1" H 7115 4996 50  0000 L CNN
-F 1 "100n" H 7115 4905 50  0000 L CNN
+F 0 "C1" V 6748 4950 50  0000 C CNN
+F 1 "100n" V 6839 4950 50  0000 C CNN
 F 2 "" H 7038 4800 50  0000 C CNN
 F 3 "" H 7000 4950 50  0000 C CNN
-F 4 "Value" H 7000 4950 60  0001 C CNN "Fieldname"
-F 5 "C" H 7000 4950 60  0001 C CNN "Spice_Primitive"
-F 6 "1 2" H 7000 4950 60  0001 C CNN "SpiceMapping"
 	1    7000 4950
 	0    1    1    0   
 $EndComp
@@ -237,25 +226,24 @@ Wire Wire Line
 Wire Wire Line
 	8150 4400 8900 4400
 Wire Wire Line
-	8350 4400 8350 4950
+	8350 4950 8350 4400
 Wire Wire Line
-	8350 4950 7400 4950
+	7150 4950 8350 4950
 Wire Wire Line
 	7400 4950 7400 4500
 Wire Wire Line
 	7400 4500 7550 4500
 Wire Wire Line
-	7550 4300 7100 4300
+	7100 4300 7550 4300
 Wire Wire Line
-	6550 4300 6850 4300
+	6550 4300 6800 4300
 Wire Wire Line
 	6850 4950 6650 4950
 Wire Wire Line
 	6650 4950 6650 4300
-Connection ~ 6800 4300
 Connection ~ 6650 4300
 Wire Wire Line
-	7150 4950 7450 4950
+	7400 4950 7450 4950
 Connection ~ 7400 4950
 Wire Wire Line
 	7350 4150 7350 4300
@@ -279,7 +267,12 @@ F 3 "" H 6000 5000 50  0000 C CNN
 	1    6000 5000
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	8900 4400 8900 4450
 Connection ~ 8350 4400
+Wire Wire Line
+	9650 2600 9650 2550
+Wire Wire Line
+	9650 1600 9650 1650
+Wire Wire Line
+	9650 2050 9650 2150
+Connection ~ 9650 2100
 $EndSCHEMATC

From 03154991379adaf6bf4956fbf6175433ca632721 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 11 Aug 2016 14:43:25 +0200
Subject: [PATCH 197/197] Added a missing library

---
 demos/simulation/sallen_key/ad8051.lib | 112 +++++++++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 demos/simulation/sallen_key/ad8051.lib

diff --git a/demos/simulation/sallen_key/ad8051.lib b/demos/simulation/sallen_key/ad8051.lib
new file mode 100644
index 0000000000..20ac791cd7
--- /dev/null
+++ b/demos/simulation/sallen_key/ad8051.lib
@@ -0,0 +1,112 @@
+* AD8051 SPICE Macro-model
+* Description: Amplifier
+* Generic Desc: Single 110 MHz rail-to-rail op amp - 3V
+* Developed by: JCH / ADI
+* Revision History: 08/10/2012 - Updated to new header style
+* 0.0 (09/1998)
+* Copyright 1998, 2012 by Analog Devices, Inc.
+*
+* Refer to http://www.analog.com/Analog_Root/static/techSupport/designTools/spiceModels/license/spice_general.html for License Statement.  Use of this model
+* indicates your acceptance with the terms and provisions in the License Statement.
+*
+* BEGIN Notes:
+*
+* Not Modeled:
+* CMRR IS NOT MODELED
+*    
+* Parameters modeled include:
+* THIS MODEL IS FOR SINGLE SUPPLY OPERATION (+5V)
+*
+* END Notes
+*	
+* Node assignments
+*                 noninverting input
+*                 |       inverting input  
+*                 |       |       positive supply
+*                 |       |       |       negative supply
+*                 |       |       |       |       output
+*                 |       |       |       |       |
+*                 |       |       |       |       |
+.SUBCKT AD8051  1       2       99      50      45
+*
+* INPUT STAGE
+*
+Q1  4  3  5 QPI
+Q2  6  2  7 QPI
+RC1   50  4 20.5k
+RC2   50  6 20.5k
+RE1    5  8 5k
+RE2    7  8 5k 
+EOS    3  1 POLY(1) 53 98 1.7E-3 1 
+IOS    1  2 0.1u
+FNOI1  1  0 VMEAS2 1E-4
+FNOI2  2  0 VMEAS2 1E-4
+
+CPAR1  3 50 1.7p
+CPAR2  2 50 1.7p
+VCMH1 99  9 1
+VCMH2 99 10 1
+D1     5  9  DX
+D2     7 10 DX
+IBIAS 99  8 73u
+*
+* INTERNAL VOLTAGE REFERENCE
+*
+EREF1 98  0 POLY(2) 99 0 50 0 0 0.5 0.5
+EREF2 97  0 POLY(2)  1 0 2 0 0 0.5 0.5
+GREF2 97 0 97 0 1E-6
+*
+*VOLTAGE NOISE STAGE
+*
+DN1 51 52 DNOI1
+VN1 51 98 0.61
+VMEAS 52 98 0
+RNOI1 52 98 6.5E-3
+
+H1 53 98 VMEAS 1
+RNOI2 53 98 1
+*
+*CURRENT NOISE STAGE
+*
+DN2 61 62 DNOI2
+VN2 61 98 0.545
+VMEAS2 62 98 0
+RNOI3  62 98 2E-4
+*
+* INTERMEDIATE GAIN STAGE WITH POLE = 96MHz
+*
+G1   98 20 4 6 1E-3 
+RP1  98 20 550
+CP1  98 20 3p
+*
+* GAIN STAGE WITH DOMINANT POLE
+*
+G4   98 30 20 98 2.6E-3
+RG1 30 98 155k
+CF1  30 45 13.5p
+D5 31 99 DX
+D6 50 32 DX
+V1 31 30 0.6
+V2 30 32 0.6
+*
+* OUTPUT STAGE
+*
+Q3  45 42 99 QPOX
+Q4  45 44 50 QNOX
+EO3 99 42 POLY(1) 98 30 0.7175 0.5
+EO4 44 50 POLY(1) 30 98 0.7355 0.5
+*
+* MODELS
+*
+.MODEL QPI PNP (IS=8.6E-18,BF=91,VAF=30.6)
+.MODEL QNOX NPN(IS=6.37E-16,BF=100,VAF=90,RC=3)
+.MODEL QPOX PNP(IS=1.19E-15,BF=112,VAF=19.2,RC=6)
+.MODEL DX D(IS=1E-16)
+.MODEL DZ D(IS=1E-14,BV=6.6)
+.MODEL DNOI1 D(KF=9E-10)
+.MODEL DNOI2 D(KF=1E-8)
+.ENDS AD8051
+
+
+
+