Commonize page_info by simply making the Iu scale a parameter on call.

3d-viewer/dialogs/panel_3D_raytracing_options.cpp

@@ -25,6 +25,7 @@
 #include <pgm_base.h>
 #include <settings/settings_manager.h>
 #include <eda_3d_viewer_settings.h>
+#include <base_units.h>
 #include "panel_3D_raytracing_options.h"
 
 

common/CMakeLists.txt

@@ -344,6 +344,7 @@ set( COMMON_SRCS
     netclass.cpp
     observable.cpp
     origin_transforms.cpp
+    page_info.cpp
     paths.cpp
     printout.cpp
     project.cpp
@@ -507,7 +508,6 @@ set( PCB_COMMON_SRCS
     eda_shape.cpp
     fp_lib_table.cpp
     hash_eda.cpp
-    page_info.cpp
     pg_properties.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_base_frame.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_expr_evaluator.cpp

common/page_info.cpp

@@ -26,6 +26,7 @@
 #include <common.h>
 #include <page_info.h>
 #include <macros.h>
+#include <base_units.h>     // for Mm2mils
 
 
 // late arriving wxPAPER_A0, wxPAPER_A1

eeschema/CMakeLists.txt

@@ -322,7 +322,6 @@ set( EESCHEMA_COMMON_SRCS
     ${CMAKE_SOURCE_DIR}/common/base_units.cpp
     ${CMAKE_SOURCE_DIR}/common/eda_shape.cpp
     ${CMAKE_SOURCE_DIR}/common/eda_text.cpp
-    ${CMAKE_SOURCE_DIR}/common/page_info.cpp
     )
 
 

eeschema/dialogs/dialog_annotate.cpp

@@ -24,6 +24,7 @@
 
 
 #include <sch_edit_frame.h>
+#include <base_units.h>
 #include <bitmaps.h>
 #include <confirm.h>
 #include <dialog_annotate_base.h>

eeschema/dialogs/dialog_lib_edit_pin_table.cpp

@@ -26,6 +26,7 @@
 #include "lib_pin.h"
 #include "pin_numbers.h"
 #include "pgm_base.h"
+#include <base_units.h>
 #include <bitmaps.h>
 #include <confirm.h>
 #include <symbol_edit_frame.h>

eeschema/dialogs/dialog_plot_schematic.cpp

@@ -657,8 +657,8 @@ void DIALOG_PLOT_SCHEMATIC::createHPGLFiles( bool aPlotAll, bool aPlotFrameRef,
 
         if( getPlotOriginAndUnits() == HPGL_PLOT_ORIGIN_AND_UNITS::PLOTTER_CENTER )
         {
-            plotOffset.x    = plotPage.GetWidthIU() / 2;
-            plotOffset.y    = -plotPage.GetHeightIU() / 2;
+            plotOffset.x = plotPage.GetWidthIU( IU_PER_MILS ) / 2;
+            plotOffset.y = -plotPage.GetHeightIU( IU_PER_MILS ) / 2;
         }
 
         try
@@ -899,8 +899,8 @@ void DIALOG_PLOT_SCHEMATIC::plotOneSheetPDF( PLOTTER* aPlotter, SCH_SCREEN* aScr
     if( m_plotBackgroundColor->GetValue() && aPlotter->GetColorMode() )
     {
         aPlotter->SetColor( aPlotter->RenderSettings()->GetBackgroundColor() );
-        wxPoint end( aPlotter->PageSettings().GetWidthIU(),
-                     aPlotter->PageSettings().GetHeightIU() );
+        wxPoint end( aPlotter->PageSettings().GetWidthIU( IU_PER_MILS ),
+                     aPlotter->PageSettings().GetHeightIU( IU_PER_MILS ) );
         aPlotter->Rect( wxPoint( 0, 0 ), end, FILL_T::FILLED_SHAPE, 1.0 );
     }
 
@@ -1093,7 +1093,8 @@ bool DIALOG_PLOT_SCHEMATIC::plotOneSheetPS( const wxString&     aFileName,
     if( m_plotBackgroundColor->GetValue() && plotter->GetColorMode() )
     {
         plotter->SetColor( plotter->RenderSettings()->GetLayerColor( LAYER_SCHEMATIC_BACKGROUND ) );
-        wxPoint end( plotter->PageSettings().GetWidthIU(), plotter->PageSettings().GetHeightIU() );
+        wxPoint end( plotter->PageSettings().GetWidthIU( IU_PER_MILS ),
+                     plotter->PageSettings().GetHeightIU( IU_PER_MILS ) );
         plotter->Rect( wxPoint( 0, 0 ), end, FILL_T::FILLED_SHAPE, 1.0 );
     }
 
@@ -1225,8 +1226,8 @@ bool DIALOG_PLOT_SCHEMATIC::plotOneSheetSVG( const wxString&  aFileName,
     if( m_plotBackgroundColor->GetValue() && plotter->GetColorMode() )
     {
         plotter->SetColor( plotter->RenderSettings()->GetLayerColor( LAYER_SCHEMATIC_BACKGROUND ) );
-        wxPoint end( plotter->PageSettings().GetWidthIU(),
-                     plotter->PageSettings().GetHeightIU() );
+        wxPoint end( plotter->PageSettings().GetWidthIU( IU_PER_MILS ),
+                     plotter->PageSettings().GetHeightIU( IU_PER_MILS ) );
         plotter->Rect( wxPoint( 0, 0 ), end, FILL_T::FILLED_SHAPE, 1.0 );
     }
 

eeschema/dialogs/dialog_print_using_printer.cpp

@@ -423,7 +423,7 @@ void SCH_PRINTOUT::PrintPage( SCH_SCREEN* aScreen )
     // Change scale factor and offset to print the whole page.
     bool printReference = cfg->m_Printing.title_block;
 
-    pageSizeIU = aScreen->GetPageSettings().GetSizeIU();
+    pageSizeIU = aScreen->GetPageSettings().GetSizeIU( IU_PER_MILS );
     FitThisSizeToPaper( pageSizeIU );
 
     fitRect = GetLogicalPaperRect();

eeschema/dialogs/panel_eeschema_color_settings.cpp

@@ -501,7 +501,7 @@ void PANEL_EESCHEMA_COLOR_SETTINGS::zoomFitPreview()
         view->SetScale( 1.0 );
         VECTOR2D screenSize = view->ToWorld( m_preview->GetClientSize(), false );
 
-        VECTOR2I psize( m_page->GetWidthIU(), m_page->GetHeightIU() );
+        VECTOR2I psize( m_page->GetWidthIU( IU_PER_MILS ), m_page->GetHeightIU( IU_PER_MILS ) );
         double scale = view->GetScale() / std::max( fabs( psize.x / screenSize.x ),
                                                     fabs( psize.y / screenSize.y ) );
 

eeschema/lib_pin.cpp

@@ -23,6 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <base_units.h>
 #include <pgm_base.h>
 #include <sch_draw_panel.h>
 #include <sch_edit_frame.h>

eeschema/lib_textbox.cpp

@@ -21,6 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <base_units.h>
 #include <pgm_base.h>
 #include <sch_edit_frame.h>
 #include <plotters/plotter.h>

eeschema/sch_base_frame.cpp

@@ -151,7 +151,7 @@ const PAGE_INFO& SCH_BASE_FRAME::GetPageSettings () const
 const wxSize SCH_BASE_FRAME::GetPageSizeIU() const
 {
     // GetSizeIU is compile time dependent:
-    return GetScreen()->GetPageSettings().GetSizeIU();
+    return GetScreen()->GetPageSettings().GetSizeIU( IU_PER_MILS );
 }
 
 

eeschema/sch_edit_frame.cpp

@@ -1670,8 +1670,8 @@ const BOX2I SCH_EDIT_FRAME::GetDocumentExtents( bool aIncludeAllVisible ) const
     if( aIncludeAllVisible )
     {
         // Get the whole page size and return that
-        int sizeX = GetScreen()->GetPageSettings().GetWidthIU();
-        int sizeY = GetScreen()->GetPageSettings().GetHeightIU();
+        int sizeX = GetScreen()->GetPageSettings().GetWidthIU( IU_PER_MILS );
+        int sizeY = GetScreen()->GetPageSettings().GetHeightIU( IU_PER_MILS );
         bBoxDoc   = BOX2I( VECTOR2I( 0, 0 ), VECTOR2I( sizeX, sizeY ) );
     }
     else

eeschema/sch_field.cpp

@@ -32,6 +32,7 @@
 
 #include <wx/log.h>
 #include <wx/menu.h>
+#include <base_units.h>
 #include <common.h>     // for ExpandTextVars
 #include <eda_item.h>
 #include <sch_edit_frame.h>

eeschema/sch_label.cpp

@@ -23,6 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <base_units.h>
 #include <pgm_base.h>
 #include <sch_edit_frame.h>
 #include <plotters/plotter.h>

eeschema/sch_line.cpp

@@ -22,6 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <base_units.h>
 #include <bitmaps.h>
 #include <string_utils.h>
 #include <core/mirror.h>

eeschema/sch_pin.cpp

@@ -19,6 +19,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <base_units.h>
 #include <lib_pin.h>
 #include <sch_symbol.h>
 #include <sch_pin.h>

eeschema/sch_plugins/altium/sch_altium_plugin.cpp

@@ -2429,7 +2429,7 @@ void SCH_ALTIUM_PLUGIN::ParseSheet( const std::map<wxString, wxString>& aPropert
 
     m_currentSheet->GetScreen()->SetPageSettings( pageInfo );
 
-    m_sheetOffset = { 0, pageInfo.GetHeightIU() };
+    m_sheetOffset = { 0, pageInfo.GetHeightIU( IU_PER_MILS ) };
 }
 
 

eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp

@@ -232,7 +232,7 @@ void CADSTAR_SCH_ARCHIVE_LOADER::Load( SCHEMATIC* aSchematic, SCH_SHEET* aRootSh
         // Set the new sheet size.
         sheet->GetScreen()->SetPageSettings( pageInfo );
 
-        wxSize  pageSizeIU = sheet->GetScreen()->GetPageSettings().GetSizeIU();
+        wxSize   pageSizeIU = sheet->GetScreen()->GetPageSettings().GetSizeIU( IU_PER_MILS );
         VECTOR2I sheetcentre( pageSizeIU.x / 2, pageSizeIU.y / 2 );
         VECTOR2I itemsCentre = sheetBoundingBox.Centre();
 

eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp

@@ -755,7 +755,7 @@ void SCH_EAGLE_PLUGIN::loadSchematic( wxXmlNode* aSchematicNode )
 
     // Calculate the already placed items bounding box and the page size to determine
     // placement for the new symbols
-    wxSize   pageSizeIU = m_rootSheet->GetScreen()->GetPageSettings().GetSizeIU();
+    wxSize   pageSizeIU = m_rootSheet->GetScreen()->GetPageSettings().GetSizeIU( IU_PER_MILS );
     EDA_RECT sheetBbox  = getSheetBbox( m_rootSheet );
     VECTOR2I newCmpPosition( sheetBbox.GetLeft(), sheetBbox.GetBottom() );
     int      maxY = sheetBbox.GetY();
@@ -940,7 +940,7 @@ void SCH_EAGLE_PLUGIN::loadSheet( wxXmlNode* aSheetNode, int aSheetIndex )
     targetSheetSize += VECTOR2I( Mils2iu( 1500 ), Mils2iu( 1500 ) );
 
     // Get current Eeschema sheet size.
-    wxSize    pageSizeIU = m_currentSheet->GetScreen()->GetPageSettings().GetSizeIU();
+    wxSize    pageSizeIU = m_currentSheet->GetScreen()->GetPageSettings().GetSizeIU( IU_PER_MILS );
     PAGE_INFO pageInfo   = m_currentSheet->GetScreen()->GetPageSettings();
 
     // Increase if necessary
@@ -953,7 +953,7 @@ void SCH_EAGLE_PLUGIN::loadSheet( wxXmlNode* aSheetNode, int aSheetIndex )
     // Set the new sheet size.
     m_currentSheet->GetScreen()->SetPageSettings( pageInfo );
 
-    pageSizeIU = m_currentSheet->GetScreen()->GetPageSettings().GetSizeIU();
+    pageSizeIU = m_currentSheet->GetScreen()->GetPageSettings().GetSizeIU( IU_PER_MILS );
     VECTOR2I sheetcentre( pageSizeIU.x / 2, pageSizeIU.y / 2 );
     VECTOR2I itemsCentre = sheetBoundingBox.Centre();
 

eeschema/sch_plugins/kicad/sch_sexpr_lib_plugin_cache.cpp

@@ -19,6 +19,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <base_units.h>
 #include <lib_field.h>
 #include <lib_shape.h>
 #include <lib_symbol.h>

eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp

@@ -34,6 +34,7 @@
 #include <wx/mstream.h>
 #include <wx/tokenzr.h>
 
+#include <base_units.h>
 #include <lib_id.h>
 #include <lib_shape.h>
 #include <lib_pin.h>

eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp

@@ -29,6 +29,7 @@
 #include <wx/log.h>
 #include <wx/mstream.h>
 #include <advanced_config.h>
+#include <base_units.h>
 #include <trace_helpers.h>
 #include <locale_io.h>
 #include <sch_bitmap.h>

eeschema/sch_plugins/kicad/sch_sexpr_plugin_common.cpp

@@ -18,6 +18,7 @@
  */
 
 #include <advanced_config.h>
+#include <base_units.h>
 #include <macros.h>
 #include <schematic_lexer.h>
 #include "sch_sexpr_plugin_common.h"

eeschema/sch_screen.cpp

@@ -73,7 +73,7 @@ SCH_SCREEN::SCH_SCREEN( EDA_ITEM* aParent ) :
     // Suitable for schematic only. For symbol_editor and viewlib, must be set to true
     m_Center = false;
 
-    InitDataPoints( m_paper.GetSizeIU() );
+    InitDataPoints( m_paper.GetSizeIU( IU_PER_MILS ) );
 }