Reorganize the pcb_calculator directory to make it more logical

pcb_calculator/CMakeLists.txt

@@ -14,15 +14,24 @@ set( PCB_CALCULATOR_SRCS
     pcb_calculator_frame.cpp
     pcb_calculator_settings.cpp
     datafile_read_write.cpp
-    panel_attenuators.cpp
-    panel_board_class.cpp
-    panel_color_code.cpp
-    panel_electrical_spacing.cpp
-    panel_eserie.cpp
-    panel_regulator.cpp
-    panel_track_width.cpp
-    panel_transline.cpp
-    panel_via_size.cpp
+    calculator_panels/panel_attenuators.cpp
+    calculator_panels/panel_attenuators_base.cpp
+    calculator_panels/panel_board_class.cpp
+    calculator_panels/panel_board_class_base.cpp
+    calculator_panels/panel_color_code.cpp
+    calculator_panels/panel_color_code_base.cpp
+    calculator_panels/panel_electrical_spacing.cpp
+    calculator_panels/panel_electrical_spacing_base.cpp
+    calculator_panels/panel_eserie.cpp
+    calculator_panels/panel_eserie_base.cpp
+    calculator_panels/panel_regulator.cpp
+    calculator_panels/panel_regulator_base.cpp
+    calculator_panels/panel_track_width.cpp
+    calculator_panels/panel_track_width_base.cpp
+    calculator_panels/panel_transline.cpp
+    calculator_panels/panel_transline_base.cpp
+    calculator_panels/panel_via_size.cpp
+    calculator_panels/panel_via_size_base.cpp
     transline_ident.cpp
     widgets/unit_selector.cpp
     transline/transline.cpp
@@ -38,15 +47,6 @@ set( PCB_CALCULATOR_SRCS
     dialogs/pcb_calculator_frame_base.cpp
     dialogs/dialog_regulator_form_base.cpp
     dialogs/dialog_regulator_form.cpp
-    dialogs/panel_attenuators_base.cpp
-    dialogs/panel_board_class_base.cpp
-    dialogs/panel_regulator_base.cpp
-    dialogs/panel_color_code_base.cpp
-    dialogs/panel_electrical_spacing_base.cpp
-    dialogs/panel_eserie_base.cpp
-    dialogs/panel_via_size_base.cpp
-    dialogs/panel_track_width_base.cpp
-    dialogs/panel_transline_base.cpp
     ../common/env_vars.cpp      # needed on MSW to avoid a link issue (a symbol not found)
     )
 

pcb_calculator/panel_attenuators.cpp → pcb_calculator/calculator_panels/panel_attenuators.cpp

@@ -22,9 +22,9 @@
 #include <wx/choicdlg.h>
 #include <wx/msgdlg.h>
 
-#include "pcb_calculator_settings.h"
-#include "attenuators/attenuator_classes.h"
-#include "../dialogs/panel_attenuators.h"
+#include <attenuators/attenuator_classes.h>
+#include <calculator_panels/panel_attenuators.h>
+#include <pcb_calculator_settings.h>
 
 #include <bitmaps.h>
 #include <string_utils.h>

pcb_calculator/dialogs/panel_attenuators.h → pcb_calculator/calculator_panels/panel_attenuators.h

@@ -19,9 +19,13 @@
 
 #ifndef PANEL_ATTENUATORS_H
 #define PANEL_ATTENUATORS_H
+
 #include "panel_attenuators_base.h"
 
+#include <vector>
+
 class  ATTENUATOR;
+class PCB_CALCULATOR_SETTINGS;
 
 class PANEL_ATTENUATORS : public PANEL_ATTENUATORS_BASE
 {
@@ -50,4 +54,4 @@ public:
 
 };
 
-#endif
+#endif

pcb_calculator/panel_board_class.cpp → pcb_calculator/calculator_panels/panel_board_class.cpp

@@ -18,11 +18,10 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//#include <string_utils.h>
-#include "pcb_calculator_settings.h"
-#include <panel_board_class.h>
+#include <calculator_panels/panel_board_class.h>
+#include <pcb_calculator_settings.h>
 #include <widgets/unit_selector.h>
-#include "units_scales.h"
+#include <units_scales.h>
 
 PANEL_BOARD_CLASS::PANEL_BOARD_CLASS( wxWindow* parent, wxWindowID id,
                                 const wxPoint& pos, const wxSize& size,
@@ -159,4 +158,4 @@ void PANEL_BOARD_CLASS::BoardClassesUpdateData( double aUnitScale )
             txt = NO_VALUE;
         m_gridClassesValuesDisplay->SetCellValue(4, ii, txt );
     }
-}
+}

pcb_calculator/panel_color_code.cpp → pcb_calculator/calculator_panels/panel_color_code.cpp

@@ -19,8 +19,8 @@
  */
 
 #include <bitmaps.h>
-#include <panel_color_code.h>
-#include "pcb_calculator_settings.h"
+#include <calculator_panels/panel_color_code.h>
+#include <pcb_calculator_settings.h>
 
 
 PANEL_COLOR_CODE::PANEL_COLOR_CODE( wxWindow* parent, wxWindowID id,

pcb_calculator/panel_electrical_spacing.cpp → pcb_calculator/calculator_panels/panel_electrical_spacing.cpp

@@ -24,11 +24,11 @@
  * for more info
  */
 
+#include <calculator_panels/panel_electrical_spacing.h>
+#include <pcb_calculator_settings.h>
 #include <string_utils.h>
-#include "pcb_calculator_settings.h"
-#include <panel_electrical_spacing.h>
 #include <widgets/unit_selector.h>
-#include "units_scales.h"
+#include <units_scales.h>
 
 extern double DoubleFromString( const wxString& TextValue );
 

pcb_calculator/panel_eserie.cpp → pcb_calculator/calculator_panels/panel_eserie.cpp

@@ -24,9 +24,9 @@
  * for more info
  */
 
+#include <calculator_panels/panel_eserie.h>
+#include <pcb_calculator_settings.h>
 #include <string_utils.h>
-#include "pcb_calculator_settings.h"
-#include <panel_eserie.h>
 
 #include <i18n_utility.h>   // For _HKI definition
 wxString eseries_help =

pcb_calculator/panel_regulator.cpp → pcb_calculator/calculator_panels/panel_regulator.cpp

@@ -25,13 +25,11 @@
 #include <wx/filedlg.h>
 #include <wx/msgdlg.h>
 
-#include "class_regulator_data.h"
-#include "pcb_calculator_settings.h"
-
-#include "dialogs/dialog_regulator_form.h"
-#include "dialogs/panel_regulator.h"
-
 #include <bitmaps.h>
+#include <calculator_panels/panel_regulator.h>
+#include <class_regulator_data.h>
+#include <dialogs/dialog_regulator_form.h>
+#include <pcb_calculator_settings.h>
 
 extern double DoubleFromString( const wxString& TextValue );
 

pcb_calculator/panel_track_width.cpp → pcb_calculator/calculator_panels/panel_track_width.cpp

@@ -28,10 +28,11 @@
 #include <cmath>
 #include <kiface_base.h>
 
+#include <calculator_panels/panel_track_width.h>
+#include <pcb_calculator_settings.h>
 #include <string_utils.h>
-#include "pcb_calculator_settings.h"
-#include "units_scales.h"
-#include <panel_track_width.h>
+#include <units_scales.h>
+
 #include <widgets/unit_selector.h>
 
 #include <i18n_utility.h>   // For _HKI definition

pcb_calculator/panel_transline.cpp → pcb_calculator/calculator_panels/panel_transline.cpp

@@ -20,8 +20,8 @@
 
 
 #include <bitmaps.h>
-#include "pcb_calculator_settings.h"
-#include <panel_transline.h>
+#include <calculator_panels/panel_transline.h>
+#include <pcb_calculator_settings.h>
 
 
 PANEL_TRANSLINE::PANEL_TRANSLINE( wxWindow* parent, wxWindowID id,

pcb_calculator/panel_via_size.cpp → pcb_calculator/calculator_panels/panel_via_size.cpp

@@ -46,11 +46,11 @@
 #include <wx/choicdlg.h>
 
 #include <bitmaps.h>
+#include <calculator_panels/panel_via_size.h>
+#include <common_data.h>
+#include <pcb_calculator_settings.h>
+#include <units_scales.h>
 
-#include "common_data.h"
-#include "pcb_calculator_settings.h"
-#include "units_scales.h"
-#include "panel_via_size.h"
 
 extern double DoubleFromString( const wxString& TextValue );
 

pcb_calculator/datafile_read_write.cpp

@@ -26,6 +26,7 @@
 #include <wx/msgdlg.h>
 
 #include <build_version.h>
+#include <calculator_panels/panel_regulator.h>
 #include <class_regulator_data.h>
 #include <datafile_read_write.h>
 #include <string_utils.h>
@@ -34,7 +35,6 @@
 #include <pcb_calculator_datafile_lexer.h>
 #include <pcb_calculator_frame.h>
 #include <pgm_base.h>
-#include <panel_regulator.h>
 
 
 using namespace PCBCALC_DATA_T;

pcb_calculator/dialogs/pcb_calculator_frame_base.h

@@ -10,15 +10,15 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-#include "panel_regulator.h"
-#include "panel_attenuators.h"
-#include "panel_eserie.h"
-#include "panel_color_code.h"
-#include "panel_transline.h"
-#include "panel_via_size.h"
-#include "panel_track_width.h"
-#include "panel_electrical_spacing.h"
-#include "panel_board_class.h"
+#include "calculator_panels/panel_regulator.h"
+#include "calculator_panels/panel_attenuators.h"
+#include "calculator_panels/panel_eserie.h"
+#include "calculator_panels/panel_color_code.h"
+#include "calculator_panels/panel_transline.h"
+#include "calculator_panels/panel_via_size.h"
+#include "calculator_panels/panel_track_width.h"
+#include "calculator_panels/panel_electrical_spacing.h"
+#include "calculator_panels/panel_board_class.h"
 #include "kiway_player.h"
 #include <wx/string.h>
 #include <wx/menu.h>

pcb_calculator/eserie.cpp

@@ -22,7 +22,7 @@
 #include <array>
 #include <algorithm>
 
-#include "panel_eserie.h"
+#include <calculator_panels/panel_eserie.h>
 
 /* If BENCHMARK is defined, any 4R E12 calculations will print its execution time to console
  * My Hasswell Enthusiast reports 225 mSec what are reproducible within plusminus 2 percent

pcb_calculator/params_read_write.cpp

@@ -22,9 +22,9 @@
 #include <wx/colour.h>
 #include <wx/msgdlg.h>
 
-#include "pcb_calculator_frame.h"
-#include "panel_transline.h"
-#include "transline/transline.h"
+#include <calculator_panels/panel_transline.h>
+#include <pcb_calculator_frame.h>
+#include <transline/transline.h>
 
 /*
  * Return the value from a string,

pcb_calculator/transline_dlg_funct.cpp

@@ -22,8 +22,8 @@
 #include <wx/settings.h>
 
 #include <bitmaps.h>
-#include "common_data.h"
-#include "panel_transline.h"
+#include <calculator_panels/panel_transline.h>
+#include <common_data.h>
 #include <widgets/unit_selector.h>