From 9cac0a38cc3050f8a9a3380f505eda07bfca39e6 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 19 Jan 2019 12:35:35 +0100 Subject: [PATCH] DIALOG_GRAPHIC_ITEM_PROPERTIES: better tooltip. minor other code enhancement (does not create any actual change) --- .../dialog_graphic_item_properties.cpp | 16 +++++++-------- pcbnew/zone_filler.cpp | 20 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp index 6449054a42..73d667f862 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp +++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp @@ -1,13 +1,13 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2018 Jean-Pierre Charras jp.charras at wanadoo.fr - * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2019 Jean-Pierre Charras jp.charras at wanadoo.fr + * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -214,8 +214,8 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataToWindow() if( m_LayerSelectionCtrl->SetLayerSelection( m_item->GetLayer() ) < 0 ) { - wxMessageBox( _( "This item was on a non-existing layer.\n" - "It has been moved to the first allowed layer." ) ); + wxMessageBox( _( "This item was on a non-existing or forbidden layer.\n" + "It has been moved to the first allowed layer. Please fix it." ) ); m_LayerSelectionCtrl->SetSelection( 0 ); } diff --git a/pcbnew/zone_filler.cpp b/pcbnew/zone_filler.cpp index 689650b63c..2f6c07635f 100644 --- a/pcbnew/zone_filler.cpp +++ b/pcbnew/zone_filler.cpp @@ -2,13 +2,13 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2014-2017 CERN - * Copyright (C) 2014-2018 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2014-2019 KiCad Developers, see AUTHORS.txt for contributors. * @author Tomasz Włostowski * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -542,24 +542,24 @@ void ZONE_FILLER::buildZoneFeatureHoleList( const ZONE_CONTAINER* aZone, switch( aItem->Type() ) { case PCB_LINE_T: - ( (DRAWSEGMENT*) aItem )->TransformShapeWithClearanceToPolygon( + static_cast( aItem )->TransformShapeWithClearanceToPolygon( aFeatures, zclearance, segsPerCircle, correctionFactor, ignoreLineWidth ); break; case PCB_TEXT_T: - ( (TEXTE_PCB*) aItem )->TransformBoundingBoxWithClearanceToPolygon( + static_cast( aItem )->TransformBoundingBoxWithClearanceToPolygon( &aFeatures, zclearance ); break; case PCB_MODULE_EDGE_T: - ( (EDGE_MODULE*) aItem )->TransformShapeWithClearanceToPolygon( + static_cast( aItem )->TransformShapeWithClearanceToPolygon( aFeatures, zclearance, segsPerCircle, correctionFactor, ignoreLineWidth ); break; case PCB_MODULE_TEXT_T: - if( ( (TEXTE_MODULE*) aItem )->IsVisible() ) + if( static_cast( aItem )->IsVisible() ) { - ( (TEXTE_MODULE*) aItem )->TransformBoundingBoxWithClearanceToPolygon( + static_cast( aItem )->TransformBoundingBoxWithClearanceToPolygon( &aFeatures, zclearance ); } break;