Fix inches being sometimes used instead of mils

common/base_units.cpp

@@ -40,8 +40,6 @@
 #include <macros.h>
 #include <title_block.h>
 
-// We need this function even in routines that do not define internal units
-
 #if defined( PCBNEW ) || defined( CVPCB ) || defined( EESCHEMA ) || defined( GERBVIEW ) || defined( PL_EDITOR )
 #define IU_TO_MM( x )       ( x / IU_PER_MM )
 #define IU_TO_IN( x )       ( x / IU_PER_MILS / 1000 )

eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp

@@ -435,7 +435,7 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::visitItem( const SCH_SHEET_PATH& aShe
 
 bool DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::TransferDataFromWindow()
 {
-    if( !m_textSize.Validate( 1.0, 10000.0, EDA_UNITS::INCHES ) )  // 1 mil .. 10 inches
+    if( !m_textSize.Validate( 1.0, 10000.0, EDA_UNITS::MILS ) )  // 1 mil .. 10 inches
         return false;
 
     SCH_SHEET_PATH currentSheet = m_parent->GetCurrentSheet();

eeschema/dialogs/panel_setup_formatting.cpp

@@ -59,10 +59,10 @@ bool PANEL_SETUP_FORMATTING::TransferDataToWindow()
 
     m_choiceSeparatorRefId->SetSelection( refStyleSelection );
 
-    m_textSize.SetUnits( EDA_UNITS::INCHES );
-    m_lineWidth.SetUnits( EDA_UNITS::INCHES );
-    m_pinSymbolSize.SetUnits( EDA_UNITS::INCHES );
-    m_junctionSize.SetUnits( EDA_UNITS::INCHES );
+    m_textSize.SetUnits( EDA_UNITS::MILS );
+    m_lineWidth.SetUnits( EDA_UNITS::MILS );
+    m_pinSymbolSize.SetUnits( EDA_UNITS::MILS );
+    m_junctionSize.SetUnits( EDA_UNITS::MILS );
 
     m_textSize.SetValue( settings.m_DefaultTextSize );
     m_lineWidth.SetValue( settings.m_DefaultLineWidth );

pcbnew/class_dimension.cpp

@@ -193,7 +193,7 @@ void DIMENSION::SetUnitsMode( DIM_UNITS_MODE aMode )
         break;
 
     case DIM_UNITS_MODE::MILS:
-        m_units = EDA_UNITS::INCHES;
+        m_units = EDA_UNITS::MILS;
         break;
 
     case DIM_UNITS_MODE::MILLIMETRES:

pcbnew/dialogs/dialog_board_reannotate.cpp

@@ -398,14 +398,14 @@ void DIALOG_BOARD_REANNOTATE::GetParameters()
 
     if( m_GridIndex >= ( int ) m_Settings->m_Window.grid.sizes.size() )
     {
-        m_SortGridx = DoubleValueFromString( EDA_UNITS::INCHES,
+        m_SortGridx = DoubleValueFromString( EDA_UNITS::MILS,
                                              m_Settings->m_Window.grid.user_grid_x );
-        m_SortGridy = DoubleValueFromString( EDA_UNITS::INCHES,
+        m_SortGridy = DoubleValueFromString( EDA_UNITS::MILS,
                                              m_Settings->m_Window.grid.user_grid_y );
     }
     else
     {
-        m_SortGridx = DoubleValueFromString( EDA_UNITS::INCHES,
+        m_SortGridx = DoubleValueFromString( EDA_UNITS::MILS,
                                              m_Settings->m_Window.grid.sizes[ m_GridIndex ] );
         m_SortGridy = m_SortGridx;
     }

pcbnew/dialogs/panel_setup_feature_constraints.cpp

@@ -101,7 +101,7 @@ bool PANEL_SETUP_FEATURE_CONSTRAINTS::TransferDataFromWindow()
     if( !m_edgeClearance.Validate( 0, 10, EDA_UNITS::INCHES ) )
         return false;
 
-    if( !m_throughHoleMin.Validate( 2, 1000, EDA_UNITS::INCHES ) )   // #107 to 1 inch
+    if( !m_throughHoleMin.Validate( 2, 1000, EDA_UNITS::MILS ) )   // #107 to 1 inch
         return false;
 
     if( !m_holeToHoleMin.Validate( 0, 10, EDA_UNITS::INCHES ) )

pcbnew/footprint_preview_panel.cpp

@@ -483,7 +483,7 @@ FOOTPRINT_PREVIEW_PANEL* FOOTPRINT_PREVIEW_PANEL::New( KIWAY* aKiway, wxWindow*
 
     //Bounds checking cannot include number of elements as an index!
     int gridIdx = std::max( 0, std::min( gridCfg.last_size_idx, (int) gridCfg.sizes.size() - 1 ) );
-    int gridSize = (int) ValueFromString( EDA_UNITS::INCHES, gridCfg.sizes[ gridIdx ] );
+    int gridSize = (int) ValueFromString( EDA_UNITS::MILS, gridCfg.sizes[ gridIdx ] );
     panel->GetGAL()->SetGridSize( VECTOR2D( gridSize, gridSize ) );
 
     return panel;

pcbnew/pcb_expr_evaluator.cpp

@@ -533,7 +533,7 @@ public:
 
         switch( unitId )
         {
-        case 0:  return DoubleValueFromString( EDA_UNITS::INCHES, aString );
+        case 0:  return DoubleValueFromString( EDA_UNITS::MILS, aString );
         case 1:  return DoubleValueFromString( EDA_UNITS::MILLIMETRES, aString );
         case 2:  return DoubleValueFromString( EDA_UNITS::INCHES, aString );
         default: return v;

pcbnew/plugins/altium/altium_pcb.cpp

@@ -965,7 +965,7 @@ void ALTIUM_PCB::HelperParseDimensions6Linear( const ADIMENSION6& aElem )
         dimension->SetUnits( EDA_UNITS::INCHES );
         break;
     case ALTIUM_UNIT::MILS:
-        dimension->SetUnits( EDA_UNITS::INCHES );
+        dimension->SetUnits( EDA_UNITS::MILS );
         break;
     case ALTIUM_UNIT::MILLIMETERS:
     case ALTIUM_UNIT::CENTIMETER:

pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp

@@ -946,7 +946,7 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadDimensions()
                     break;
 
                 case UNITS::THOU:
-                    dimension->SetUnits( EDA_UNITS::INCHES );
+                    dimension->SetUnits( EDA_UNITS::MILS );
                     break;
                 }
             }