From 6ec6baf401fc55bc63ed329e655dc91a5c43a317 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 17 Sep 2020 17:15:25 +0200 Subject: [PATCH] 3d viewer: save color settings. The call to SaveColorSettings() was not at the right place, and the new color settings never saved. Fixes #5529 https://gitlab.com/kicad/code/kicad/issues/5529 --- 3d-viewer/3d_viewer/eda_3d_viewer.cpp | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.cpp b/3d-viewer/3d_viewer/eda_3d_viewer.cpp index 87313a731f..4ed792d7bb 100644 --- a/3d-viewer/3d_viewer/eda_3d_viewer.cpp +++ b/3d-viewer/3d_viewer/eda_3d_viewer.cpp @@ -291,9 +291,6 @@ void EDA_3D_VIEWER::OnCloseWindow( wxCloseEvent &event ) //delete m_canvas; //m_canvas = nullptr; - COLOR_SETTINGS* colors = Pgm().GetSettingsManager().GetColorSettings(); - Pgm().GetSettingsManager().SaveColorSettings( colors, "3d_viewer" ); - Destroy(); event.Skip( true ); } @@ -581,7 +578,21 @@ void EDA_3D_VIEWER::SaveSettings( APP_SETTINGS_BASE *aCfg ) auto save_color = [colors] ( SFVEC4F& aSource, LAYER_3D_ID aTarget ) { - colors->SetColor( aTarget, COLOR4D( aSource.r, aSource.g, aSource.b, aSource.a ) ); + // You could think just copy the new color in config is enough. + // unfortunately, SFVEC4F uses floats, and COLOR4D uses doubles, + // and the conversion SFVEC4F from/to COLOR4D creates small diffs. + // + // This has no matter to draw colors, but creates slight differences + // in config file, that appears always modified. + // So we must compare the SFVEC4F old and new values and update only + // actual changes. + SFVEC4F newSFVEC4Fcolor( float(colors->GetColor( aTarget ).r), + float(colors->GetColor( aTarget ).g), + float(colors->GetColor( aTarget ).b), + float(colors->GetColor( aTarget ).a) ); + + if( aSource != newSFVEC4Fcolor ) + colors->SetColor( aTarget, COLOR4D( aSource.r, aSource.g, aSource.b, aSource.a ) ); }; save_color( m_boardAdapter.m_BgColorBot, LAYER_3D_BACKGROUND_BOTTOM ); @@ -593,6 +604,8 @@ void EDA_3D_VIEWER::SaveSettings( APP_SETTINGS_BASE *aCfg ) save_color( m_boardAdapter.m_SolderMaskColorTop, LAYER_3D_SOLDERMASK ); save_color( m_boardAdapter.m_SolderPasteColor, LAYER_3D_SOLDERPASTE ); + Pgm().GetSettingsManager().SaveColorSettings( colors, "3d_viewer" ); + wxLogTrace( m_logTrace, m_boardAdapter.RenderEngineGet() == RENDER_ENGINE::RAYTRACING ? "EDA_3D_VIEWER::SaveSettings render setting Ray Trace" : "EDA_3D_VIEWER::SaveSettings render setting OpenGL" );