Set board modify bit only when necessary after Board Setup.

Fixes https://gitlab.com/kicad/code/kicad/issues/5685

pcbnew/board_stackup_manager/panel_board_stackup.cpp

@@ -1082,6 +1082,9 @@ bool PANEL_SETUP_BOARD_STACKUP::TransferDataFromWindow()
 
     BOARD_STACKUP& brd_stackup = m_brdSettings->GetStackupDescriptor();
 
+    STRING_FORMATTER old_stackup;
+    brd_stackup.FormatBoardStackup( &old_stackup, m_board, 0 );
+
     brd_stackup.m_FinishType = m_stackup.m_FinishType;
     brd_stackup.m_HasDielectricConstrains = m_stackup.m_HasDielectricConstrains;
     brd_stackup.m_EdgeConnectorConstraints = m_stackup.m_EdgeConnectorConstraints;
@@ -1091,14 +1094,31 @@ bool PANEL_SETUP_BOARD_STACKUP::TransferDataFromWindow()
     // copy enabled items to the new board stackup
     brd_stackup.RemoveAll();
 
-    for( auto item : m_stackup.GetList() )
+    for( BOARD_STACKUP_ITEM* item : m_stackup.GetList() )
     {
         if( item->IsEnabled() )
             brd_stackup.Add( new BOARD_STACKUP_ITEM( *item ) );
     }
 
-    m_brdSettings->SetBoardThickness( GetPcbThickness() );
+    STRING_FORMATTER new_stackup;
-    m_brdSettings->m_HasStackup = true;
+    brd_stackup.FormatBoardStackup( &new_stackup, m_board, 0 );
+
+    bool modified = old_stackup.GetString() != new_stackup.GetString();
+
+    if( m_brdSettings->GetBoardThickness() != GetPcbThickness() )
+    {
+        m_brdSettings->SetBoardThickness( GetPcbThickness() );
+        modified = true;
+    }
+
+    if( !m_brdSettings->m_HasStackup )
+    {
+        m_brdSettings->m_HasStackup = true;
+        modified = true;
+    }
+
+    if( modified )
+        m_frame->OnModify();
 
     return true;
 }

pcbnew/dialogs/panel_setup_feature_constraints.cpp

@@ -110,11 +110,14 @@ bool PANEL_SETUP_FEATURE_CONSTRAINTS::TransferDataFromWindow()
     if( !m_holeToHoleMin.Validate( 0, 10, EDA_UNITS::INCHES ) )
         return false;
 
+    // These are all stored in project file, not board, so no need for OnModify()
+
     m_BrdSettings->m_BlindBuriedViaAllowed = m_OptAllowBlindBuriedVias->GetValue();
     m_BrdSettings->m_MicroViasAllowed = m_OptAllowMicroVias->GetValue();
 
     m_BrdSettings->m_MaxError = Clamp<int>( IU_PER_MM * MINIMUM_ERROR_SIZE_MM,
-            m_maxError.GetValue(), IU_PER_MM * MAXIMUM_ERROR_SIZE_MM );
+                                            m_maxError.GetValue(),
+                                            IU_PER_MM * MAXIMUM_ERROR_SIZE_MM );
 
     m_BrdSettings->m_ZoneFillVersion = m_rbOutlinePolygonFastest->GetValue() ? 6 : 5;
     m_BrdSettings->m_ZoneKeepExternalFillets = m_allowExternalFilletsOpt->GetValue();

pcbnew/dialogs/panel_setup_layers.cpp

@@ -536,6 +536,7 @@ bool PANEL_SETUP_LAYERS::TransferDataFromWindow()
         return false;
 
     wxString msg;
+    bool     modified = false;
 
     // Check for removed layers with items which will get deleted from the board.
     LSEQ removedLayers = getRemovedLayersWithItems();
@@ -552,14 +553,18 @@ bool PANEL_SETUP_LAYERS::TransferDataFromWindow()
                                               "%s\n"
                                               "These items will be no longer accessible\n"
                                               "Do you wish to continue?" ), msg ) ) )
+        {
             return false;
+        }
     }
 
-    if( !removedLayers.empty() &&
+    if( !removedLayers.empty()
-        !IsOK( this, _( "Items have been found on removed layers. This operation will delete "
+            && !IsOK( this, _( "Items have been found on removed layers. This operation will "
-                        "all items from removed layers and cannot be undone. Do you wish to "
+                               "delete all items from removed layers and cannot be undone.\n"
-                        "continue?" ) ) )
+                               "Do you wish to continue?" ) ) )
+    {
         return false;
+    }
 
     // Delete all objects on layers that have been removed.  Leaving them in copper layers
     // can (will?) result in DRC errors and it pollutes the board file with cruft.
@@ -582,6 +587,7 @@ bool PANEL_SETUP_LAYERS::TransferDataFromWindow()
 
                 layers.reset( layer_id );
                 hasRemovedBoardItems = true;
+                modified = true;
 
                 if( layers.any() )
                 {
@@ -607,6 +613,8 @@ bool PANEL_SETUP_LAYERS::TransferDataFromWindow()
          * layers are not visible when exiting this dialog
          */
         m_pcb->SetVisibleLayers( m_enabledLayers );
+
+        modified = true;
     }
 
     for( LSEQ seq = LSET::AllLayersMask().Seq();  seq;  ++seq )
@@ -615,21 +623,38 @@ bool PANEL_SETUP_LAYERS::TransferDataFromWindow()
 
         if( m_enabledLayers[layer] )
         {
-            m_pcb->SetLayerName( layer, GetLayerName( layer ) );
+            const wxString& newLayerName = GetLayerName( layer );
+
+            if( m_pcb->GetLayerName( layer ) != newLayerName )
+            {
+                m_pcb->SetLayerName( layer, newLayerName );
+                modified = true;
+            }
 
             // Only copper layers have a definable type.
             if( LSET::AllCuMask().Contains( layer ) )
             {
                 LAYER_T t = (LAYER_T) getLayerTypeIndex( layer );
-                m_pcb->SetLayerType( layer, t );
+
+                if( m_pcb->GetLayerType( layer ) != t )
+                {
+                    m_pcb->SetLayerType( layer, t );
+                    modified = true;
+                }
             }
         }
     }
 
     for( LSEQ seq = LSET::UserDefinedLayers().Seq();  seq;  ++seq )
     {
-        if( m_enabledLayers[*seq] )
+        PCB_LAYER_ID    layer = *seq;
-            m_pcb->SetLayerName( *seq, GetLayerName( *seq ) );
+        const wxString& newLayerName = GetLayerName( layer );
+
+        if( m_enabledLayers[ layer ] && m_pcb->GetLayerName( layer ) != newLayerName )
+        {
+            m_pcb->SetLayerName( layer, newLayerName );
+            modified = true;
+        }
     }
 
     // If some board items are deleted: Rebuild the connectivity,
@@ -641,6 +666,9 @@ bool PANEL_SETUP_LAYERS::TransferDataFromWindow()
         m_frame->Compile_Ratsnest( true );
     }
 
+    if( modified )
+        m_frame->OnModify();
+
     return true;
 }
 

pcbnew/dialogs/panel_setup_mask_and_paste.cpp

@@ -67,6 +67,8 @@ bool PANEL_SETUP_MASK_AND_PASTE::TransferDataToWindow()
 
 bool PANEL_SETUP_MASK_AND_PASTE::TransferDataFromWindow()
 {
+    // These are all stored in project file, not board, so no need for OnModify()
+
     m_BrdSettings->m_SolderMaskMargin = m_maskMargin.GetValue();
     m_BrdSettings->m_SolderMaskMinWidth = m_maskMinWidth.GetValue();
 

pcbnew/dialogs/panel_setup_text_and_graphics.cpp

@@ -207,7 +207,9 @@ bool PANEL_SETUP_TEXT_AND_GRAPHICS::TransferDataFromWindow()
                 wxGridCellBoolEditor::IsTrueValue( m_grid->GetCellValue( i, COL_TEXT_UPRIGHT ) );
     }
 
-    int mode = m_dimensionUnits->GetSelection();
+    // These are all stored in project file, not board, so no need for OnModify()
+
+    int mode                                  = m_dimensionUnits->GetSelection();
     m_BrdSettings->m_DimensionUnitsMode       = static_cast<DIM_UNITS_MODE>( mode );
     int format                                = m_dimensionUnitsFormat->GetSelection();
     m_BrdSettings->m_DimensionUnitsFormat     = static_cast<DIM_UNITS_FORMAT>( format );

pcbnew/dialogs/panel_setup_tracks_and_vias.cpp

@@ -51,9 +51,9 @@ enum DIFF_VAR_GRID_COLUMNS
 };
 
 
-PANEL_SETUP_TRACKS_AND_VIAS::PANEL_SETUP_TRACKS_AND_VIAS(
+PANEL_SETUP_TRACKS_AND_VIAS::PANEL_SETUP_TRACKS_AND_VIAS( PAGED_DIALOG* aParent,
-                                          PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFrame,
+                                                          PCB_EDIT_FRAME* aFrame,
-                                          PANEL_SETUP_FEATURE_CONSTRAINTS* aConstraintsPanel ) :
+                                                          PANEL_SETUP_FEATURE_CONSTRAINTS* aConstraintsPanel ) :
     PANEL_SETUP_TRACKS_AND_VIAS_BASE( aParent->GetTreebook() )
 {
     m_Parent = aParent;
@@ -197,6 +197,8 @@ bool PANEL_SETUP_TRACKS_AND_VIAS::TransferDataFromWindow()
     sort( vias.begin(), vias.end() );
     sort( diffPairs.begin(), diffPairs.end() );
 
+    // These are all stored in project file, not board, so no need for OnModify()
+
     trackWidths.insert( trackWidths.begin(), 0 );         // dummy value for "use netclass"
     m_BrdSettings->m_TrackWidthList = trackWidths;
 

pcbnew/pcb_edit_frame.cpp

@@ -909,8 +909,6 @@ void PCB_EDIT_FRAME::ShowBoardSetupDialog( const wxString& aInitialPage, const w
         TOOL_EVENT toolEvent( TC_COMMAND, TA_MODEL_CHANGE, AS_ACTIVE );
         toolEvent.SetHasPosition( false );
         m_toolManager->ProcessEvent( toolEvent );
-
-        OnModify();
     }
 
     GetCanvas()->SetFocus();

pcbnew/plugins/kicad/kicad_plugin.cpp

@@ -465,7 +465,7 @@ void PCB_IO::formatSetup( BOARD* aBoard, int aNestLevel ) const
     BOARD_STACKUP& stackup = aBoard->GetDesignSettings().GetStackupDescriptor();
 
     if( aBoard->GetDesignSettings().m_HasStackup )
-        stackup.FormatBoardStackup( m_out,aBoard, aNestLevel+1 );
+        stackup.FormatBoardStackup( m_out, aBoard, aNestLevel+1 );
 
     BOARD_DESIGN_SETTINGS& dsnSettings = aBoard->GetDesignSettings();