From 2e89516b6e6bc7045e111ab7484ecbca743b2602 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 11 Oct 2013 18:24:43 +0200 Subject: [PATCH] Remove wxUSE_UNICODE definition from CMakeLists.txt, because this define comes from wxWidgets and should not be made inside kicad Remove KICAD_GOST option because it is now useless: the 2 GOST options are now selectable at run time and are: * specific page layouts (now user definable, and the GOST page layouts are available in template folder) * notation for multiple parts per package (made in eeschema, preference menu) --- CMakeLists.txt | 12 - CMakeModules/CreateBzrVersionHeader.cmake | 6 +- Documentation/compiling/build-config.txt | 5 - INSTALL.txt | 18 +- common/dialogs/dialog_page_settings.cpp | 7 +- common/page_layout/page_layout_reader.cpp | 3 - common/page_layout/title_block_shapes.cpp | 15 - .../page_layout/title_block_shapes_gost.cpp | 1531 ----------------- eeschema/eeschema_config.cpp | 4 +- eeschema/sch_screen.cpp | 2 +- include/common.h | 11 - include/macros.h | 7 +- include/worksheet_shape_builder.h | 7 - pagelayout_editor/files.cpp | 6 - pagelayout_editor/pl_editor.cpp | 3 - pcbnew/class_board.cpp | 2 +- template/fp_global_table | 2 +- template/fp_global_table.csv | 2 +- 18 files changed, 25 insertions(+), 1618 deletions(-) delete mode 100644 common/page_layout/title_block_shapes_gost.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 54f55a8429..9a1139ad1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,10 +14,6 @@ set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules ) # reports. # -# Russian GOST patch -option( wxUSE_UNICODE "enable/disable building unicode ( default OFF)" ) -option( KICAD_GOST "enable/disable building using GOST notation for multiple gates per package ( default OFF)" ) - #for those who bored with uppercase option( KICAD_KEEPCASE "turn-off automatic component name conversion to uppercase if selected" ) @@ -155,14 +151,6 @@ if( CMAKE_COMPILER_IS_GNUCXX ) endif( CMAKE_COMPILER_IS_GNUCXX ) -if( wxUSE_UNICODE ) - add_definitions( -DwxUSE_UNICODE ) -endif() - -if( KICAD_GOST ) - add_definitions( -DKICAD_GOST ) -endif() - if( KICAD_KEEPCASE ) add_definitions( -DKICAD_KEEPCASE ) endif() diff --git a/CMakeModules/CreateBzrVersionHeader.cmake b/CMakeModules/CreateBzrVersionHeader.cmake index 38f0f0b7d3..a17a48ebda 100644 --- a/CMakeModules/CreateBzrVersionHeader.cmake +++ b/CMakeModules/CreateBzrVersionHeader.cmake @@ -56,11 +56,7 @@ macro( create_bzr_version_header ) if( Kicad_REPO_LAST_CHANGED_DATE ) string( REGEX REPLACE "^([0-9]+)\\-([0-9]+)\\-([0-9]+)" "\\1-\\2-\\3" _kicad_bzr_date ${Kicad_REPO_LAST_CHANGED_DATE} ) - if( KICAD_GOST ) - set( KICAD_BUILD_VERSION "(${_kicad_bzr_date} BZR ${Kicad_REPO_REVISION} GOST)" ) - else( KICAD_GOST ) - set( KICAD_BUILD_VERSION "(${_kicad_bzr_date} BZR ${Kicad_REPO_REVISION})" ) - endif( KICAD_GOST ) + set( KICAD_BUILD_VERSION "(${_kicad_bzr_date} BZR ${Kicad_REPO_REVISION})" ) # Definition to conditionally use date and revision returned from the # Bazaar log command instead of hand coded date and revision in diff --git a/Documentation/compiling/build-config.txt b/Documentation/compiling/build-config.txt index 6daa3618e7..b3bb8ba99a 100644 --- a/Documentation/compiling/build-config.txt +++ b/Documentation/compiling/build-config.txt @@ -111,11 +111,6 @@ This option is used to enable or disable building KiCad with images in menu items. If this is not defined when CMake is used to create the build files, images will be included in menu items on all platforms except OSX. -KICAD_GOST (ON/OFF) -------------------- -This option is used to enable or disable the GOST notation for multiple gates -per package in Eeschema. The default is OFF - KICAD_KEEPCASE (ON/OFF) ----------------------- This option enables or disables turning off the automatic component name diff --git a/INSTALL.txt b/INSTALL.txt index d77f83ebf6..7e1b6e33a1 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -128,13 +128,17 @@ project is created. Installation from source code ----------------------------- - Some dependencies must be satisfied for the correct installation of KiCad: +Some dependencies must be satisfied for the correct installation of KiCad: under Linux: wxWidgets >= 2.8.11 http://www.wxwidgets.org/ +(needs to be compiled with unicode support) under Windows:MacOSX -wxWidgets >= 2.9.3 http://www.wxwidgets.org/ -CMake >= 2.6.4 http://www.cmake.org/ -Boost C++ Libraries (files used by kicad are provided in kicad sources) http://www.boost.org/ +wxWidgets >= 2.9.4 http://www.wxwidgets.org/ + +CMake >= 2.8.1 http://www.cmake.org/ +Boost C++ Libraries: + files used by kicad are autmatically downloaded and patched if needed + from boost site ( http://www.boost.org/ ) OpenGL Linux: Mesa 3D Graphics Library http://www.mesa3d.org/ Windows: built-in @@ -186,12 +190,6 @@ configured and builded with "--enable-monolithic --disable-shared" parameters. For building dinamically linked executables. Can be used only if wxWidgets configured and builded with "--disable-monolithic --enable-shared" parameters. --DwxUSE_UNICODE=ON -Require on locale utf8 for build the KiCad with cyrillic fonts support. - --DKICAD_GOST=ON -Build the KiCad with russian GOST support. - -DKICAD_KEEPCASE=ON Build the KiCad with no component name conversion to uppercase (if you want your ADuC.../Si.../bq... components named as just so). diff --git a/common/dialogs/dialog_page_settings.cpp b/common/dialogs/dialog_page_settings.cpp index 9886bd070b..bbd6cd967f 100644 --- a/common/dialogs/dialog_page_settings.cpp +++ b/common/dialogs/dialog_page_settings.cpp @@ -258,12 +258,15 @@ void DIALOG_PAGES_SETTINGS::OnPaperSizeChoice( wxCommandEvent& event ) { m_orientationComboBox->Enable( true ); - if( paperType.Contains( wxT( "A4" ) ) && IsGOST() ) +#if 0 + // ForcePortrait() does not exist, but could be useful. + // so I leave these lines, which could be seen as a todo feature + if( paperType.ForcePortrait() ) { m_orientationComboBox->SetStringSelection( _( "Portrait" ) ); m_orientationComboBox->Enable( false ); } - +#endif m_TextUserSizeX->Enable( false ); m_TextUserSizeY->Enable( false ); m_customFmt = false; diff --git a/common/page_layout/page_layout_reader.cpp b/common/page_layout/page_layout_reader.cpp index fe101b410e..e48bd9b800 100644 --- a/common/page_layout/page_layout_reader.cpp +++ b/common/page_layout/page_layout_reader.cpp @@ -630,7 +630,6 @@ void WORKSHEET_LAYOUT::SetDefaultLayout() try { lp_parser.Parse( this ); - SetDefaultDescrFlag( true ); } catch( IO_ERROR ioe ) { @@ -652,7 +651,6 @@ void WORKSHEET_LAYOUT::SetPageLayout( const char* aPageLayout, bool Append ) try { lp_parser.Parse( this ); - SetDefaultDescrFlag( true ); } catch( IO_ERROR ioe ) { @@ -716,7 +714,6 @@ void WORKSHEET_LAYOUT::SetPageLayout( const wxString& aFullFileName, bool Append try { lp_parser.Parse( this ); - SetDefaultDescrFlag( false ); } catch( IO_ERROR ioe ) { diff --git a/common/page_layout/title_block_shapes.cpp b/common/page_layout/title_block_shapes.cpp index f2a967cbab..379f3f711c 100644 --- a/common/page_layout/title_block_shapes.cpp +++ b/common/page_layout/title_block_shapes.cpp @@ -62,11 +62,6 @@ #include -// Temporary include. Will be removed when a GOST page layout descr file is available -#ifdef KICAD_GOST -#include "title_block_shapes_gost.cpp" -#endif - void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( const PAGE_INFO& aPageInfo, const TITLE_BLOCK& aTitleBlock, @@ -74,16 +69,6 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( { WORKSHEET_LAYOUT& pglayout = WORKSHEET_LAYOUT::GetTheInstance(); -// Ugly hack: will be removed when a GOST page layout descr file is available -#ifdef KICAD_GOST - if( pglayout.IsDefaultDescr() ) - { - ((WS_DRAW_ITEM_LIST_GOST*)this)->BuildWorkSheetGraphicListGOST( aPageInfo, - aTitleBlock, aColor, aAltColor ); - return; - } -#endif - #define milsTomm (25.4/1000) m_titleBlock = &aTitleBlock; diff --git a/common/page_layout/title_block_shapes_gost.cpp b/common/page_layout/title_block_shapes_gost.cpp deleted file mode 100644 index 3bd1d47afd..0000000000 --- a/common/page_layout/title_block_shapes_gost.cpp +++ /dev/null @@ -1,1531 +0,0 @@ -/** - * @file title_block_shapes_gost.cpp - * @brief description of graphic items and texts to build a title block - * using GOST standard - */ - -/* - * This file creates a lot of structures to define the shape of a title block - * and frame references - */ - -/* - * This program source code file is part of KiCad, a free EDA CAD application. - * - * Copyright (C) 1992-2013 KiCad Developers, see change_log.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 distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include -#include -#include -#include -#include -#include -#include - -#define TEXTSIZE 100 // worksheet text size - -struct Ki_WorkSheetData -{ -public: - int m_Type; - Ki_WorkSheetData* Pnext; - int m_Posx, m_Posy; - int m_Endx, m_Endy; - const wxChar* m_TextBase; - int m_Flags; -}; - -// Work sheet structure type definitions. -enum TypeKi_WorkSheetData { - WS_OSN, - WS_TONK, - WS_TEXT, - WS_TEXTL -}; - -extern Ki_WorkSheetData WS_Osn1_Line1; -extern Ki_WorkSheetData WS_Osn1_Line2; -extern Ki_WorkSheetData WS_Osn1_Line3; -extern Ki_WorkSheetData WS_Osn1_Line4; -extern Ki_WorkSheetData WS_Osn1_Line5; -extern Ki_WorkSheetData WS_Osn1_Line6; -extern Ki_WorkSheetData WS_Osn1_Line7; -extern Ki_WorkSheetData WS_Osn1_Line8; -extern Ki_WorkSheetData WS_Osn1_Line9; -extern Ki_WorkSheetData WS_Osn1_Line10; -extern Ki_WorkSheetData WS_Osn1_Line11; -extern Ki_WorkSheetData WS_Osn1_Line12; -extern Ki_WorkSheetData WS_Osn1_Line13; -extern Ki_WorkSheetData WS_Osn1_Line14; -extern Ki_WorkSheetData WS_Osn1_Line15; -extern Ki_WorkSheetData WS_Osn1_Line16; -extern Ki_WorkSheetData WS_Osn1_Line17; -extern Ki_WorkSheetData WS_Osn1_Line18; -extern Ki_WorkSheetData WS_Osn1_Line19; -extern Ki_WorkSheetData WS_Osn1_Line20; -extern Ki_WorkSheetData WS_Osn1_Line21; -extern Ki_WorkSheetData WS_Osn1_Line22; -extern Ki_WorkSheetData WS_Osn1_Line23; -extern Ki_WorkSheetData WS_Osn1_Line24; -extern Ki_WorkSheetData WS_Osn1_Line25; -extern Ki_WorkSheetData WS_Osn1_Line26; -extern Ki_WorkSheetData WS_Osn1_Line27; - -extern Ki_WorkSheetData WS_Osn1_Text1; -extern Ki_WorkSheetData WS_Osn1_Text2; -extern Ki_WorkSheetData WS_Osn1_Text3; -extern Ki_WorkSheetData WS_Osn1_Text4; -extern Ki_WorkSheetData WS_Osn1_Text5; -extern Ki_WorkSheetData WS_Osn1_Text6; -extern Ki_WorkSheetData WS_Osn1_Text7; -extern Ki_WorkSheetData WS_Osn1_Text8; -extern Ki_WorkSheetData WS_Osn1_Text9; -extern Ki_WorkSheetData WS_Osn1_Text10; -extern Ki_WorkSheetData WS_Osn1_Text11; -extern Ki_WorkSheetData WS_Osn1_Text12; -extern Ki_WorkSheetData WS_Osn1_Text13; -extern Ki_WorkSheetData WS_Osn1_Text14; -extern Ki_WorkSheetData WS_Osn1_Text15; -extern Ki_WorkSheetData WS_Osn1_Text16; -extern Ki_WorkSheetData WS_Osn1_Text17; - -extern Ki_WorkSheetData WS_Osn2a_Line1; -extern Ki_WorkSheetData WS_Osn2a_Line2; -extern Ki_WorkSheetData WS_Osn2a_Line3; -extern Ki_WorkSheetData WS_Osn2a_Line4; -extern Ki_WorkSheetData WS_Osn2a_Line5; -extern Ki_WorkSheetData WS_Osn2a_Line6; -extern Ki_WorkSheetData WS_Osn2a_Line7; -extern Ki_WorkSheetData WS_Osn2a_Line8; -extern Ki_WorkSheetData WS_Osn2a_Line9; -extern Ki_WorkSheetData WS_Osn2a_Line10; -extern Ki_WorkSheetData WS_Osn2a_Line11; - -extern Ki_WorkSheetData WS_Osn2a_Text1; -extern Ki_WorkSheetData WS_Osn2a_Text2; -extern Ki_WorkSheetData WS_Osn2a_Text3; -extern Ki_WorkSheetData WS_Osn2a_Text4; -extern Ki_WorkSheetData WS_Osn2a_Text5; -extern Ki_WorkSheetData WS_Osn2a_Text6; -extern Ki_WorkSheetData WS_Osn2a_Text7; -extern Ki_WorkSheetData WS_Osn2a_Text8; - -extern Ki_WorkSheetData WS_DopLeft_Line1; -extern Ki_WorkSheetData WS_DopLeft_Line2; -extern Ki_WorkSheetData WS_DopLeft_Line3; -extern Ki_WorkSheetData WS_DopLeft_Line4; -extern Ki_WorkSheetData WS_DopLeft_Line5; -extern Ki_WorkSheetData WS_DopLeft_Line6; -extern Ki_WorkSheetData WS_DopLeft_Line7; -extern Ki_WorkSheetData WS_DopLeft_Line8; -extern Ki_WorkSheetData WS_DopLeft_Line9; -extern Ki_WorkSheetData WS_DopLeft_Line10; -extern Ki_WorkSheetData WS_DopLeft_Line11; -extern Ki_WorkSheetData WS_DopLeft_Line12; -extern Ki_WorkSheetData WS_DopLeft_Line13; -extern Ki_WorkSheetData WS_DopLeft_Line14; - -extern Ki_WorkSheetData WS_DopLeft_Text1; -extern Ki_WorkSheetData WS_DopLeft_Text2; -extern Ki_WorkSheetData WS_DopLeft_Text3; -extern Ki_WorkSheetData WS_DopLeft_Text4; -extern Ki_WorkSheetData WS_DopLeft_Text5; -extern Ki_WorkSheetData WS_DopLeft_Text6; -extern Ki_WorkSheetData WS_DopLeft_Text7; - -extern Ki_WorkSheetData WS_DopTop_Line1; -extern Ki_WorkSheetData WS_DopTop_Line2; -extern Ki_WorkSheetData WS_DopTop_Line3; -extern Ki_WorkSheetData WS_DopTop_Line4; -extern Ki_WorkSheetData WS_DopTop_Line5; -extern Ki_WorkSheetData WS_DopTop_Line6; - - -// Center - right bottom corner -Ki_WorkSheetData WS_Osn1_Line1 = -{ - WS_OSN, - &WS_Osn1_Line2, - Mm2mils( 185 ),Mm2mils( 55 ), - 0, Mm2mils( 55 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line2 = -{ - WS_OSN, - &WS_Osn1_Line3, - Mm2mils( 120 ),Mm2mils( 40 ), - 0, Mm2mils( 40 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line3 = -{ - WS_OSN, - &WS_Osn1_Line4, - Mm2mils( 185 ),Mm2mils( 35 ), - Mm2mils( 120 ),Mm2mils( 35 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line4 = -{ - WS_OSN, - &WS_Osn1_Line5, - Mm2mils( 50 ), Mm2mils( 35 ), - 0, Mm2mils( 35 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line5 = -{ - WS_OSN, - &WS_Osn1_Line6, - Mm2mils( 185 ),Mm2mils( 30 ), - Mm2mils( 120 ),Mm2mils( 30 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line6 = -{ - WS_OSN, - &WS_Osn1_Line7, - Mm2mils( 50 ), Mm2mils( 20 ), - 0, Mm2mils( 20 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line7 = -{ - WS_OSN, - &WS_Osn1_Line8, - Mm2mils( 120 ),Mm2mils( 15 ), - 0, Mm2mils( 15 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line8 = -{ - WS_OSN, - &WS_Osn1_Line9, - Mm2mils( 185 ),Mm2mils( 55 ), - Mm2mils( 185 ), 0, - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line9 = -{ - WS_OSN, - &WS_Osn1_Line10, - Mm2mils( 178 ), Mm2mils( 55 ), - Mm2mils( 178 ), Mm2mils( 30 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line10 = -{ - WS_OSN, - &WS_Osn1_Line11, - Mm2mils( 168 ), Mm2mils( 55 ), - Mm2mils( 168 ), 0, - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line11 = -{ - WS_OSN, - &WS_Osn1_Line12, - Mm2mils( 145 ), Mm2mils( 55 ), - Mm2mils( 145 ), 0, - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line12 = -{ - WS_OSN, - &WS_Osn1_Line13, - Mm2mils( 130 ), Mm2mils( 55 ), - Mm2mils( 130 ), 0, - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line13 = -{ - WS_OSN, - &WS_Osn1_Line14, - Mm2mils( 120 ), Mm2mils( 55 ), - Mm2mils( 120 ), 0, - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line14 = -{ - WS_OSN, - &WS_Osn1_Line15, - Mm2mils( 50 ), Mm2mils( 40 ), - Mm2mils( 50 ), 0, - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line15 = -{ - WS_OSN, - &WS_Osn1_Line16, - Mm2mils( 35 ), Mm2mils( 40 ), - Mm2mils( 35 ), Mm2mils( 20 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line16 = -{ - WS_OSN, - &WS_Osn1_Line17, - Mm2mils( 30 ), Mm2mils( 20 ), - Mm2mils( 30 ), Mm2mils( 15 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line17 = -{ - WS_OSN, - &WS_Osn1_Line18, - Mm2mils( 18 ), Mm2mils( 40 ), - Mm2mils( 18 ), Mm2mils( 20 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line18 = -{ - WS_TONK, - &WS_Osn1_Line19, - Mm2mils( 185 ), Mm2mils( 50 ), - Mm2mils( 120 ), Mm2mils( 50 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line19 = -{ - WS_TONK, - &WS_Osn1_Line20, - Mm2mils( 185 ), Mm2mils( 45 ), - Mm2mils( 120 ), Mm2mils( 45 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line20 = -{ - WS_TONK, - &WS_Osn1_Line21, - Mm2mils( 185 ), Mm2mils( 40 ), - Mm2mils( 120 ), Mm2mils( 40 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line21 = -{ - WS_TONK, - &WS_Osn1_Line22, - Mm2mils( 185 ), Mm2mils( 25 ), - Mm2mils( 120 ), Mm2mils( 25 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line22 = -{ - WS_TONK, - &WS_Osn1_Line23, - Mm2mils( 185 ), Mm2mils( 20 ), - Mm2mils( 120 ), Mm2mils( 20 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line23 = -{ - WS_TONK, - &WS_Osn1_Line24, - Mm2mils( 185 ), Mm2mils( 15 ), - Mm2mils( 120 ), Mm2mils( 15 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line24 = -{ - WS_TONK, - &WS_Osn1_Line25, - Mm2mils( 185 ), Mm2mils( 10 ), - Mm2mils( 120 ), Mm2mils( 10 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line25 = -{ - WS_TONK, - &WS_Osn1_Line26, - Mm2mils( 185 ), Mm2mils( 5 ), - Mm2mils( 120 ), Mm2mils( 5 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line26 = -{ - WS_TONK, - &WS_Osn1_Line27, - Mm2mils( 45 ), Mm2mils( 35 ), - Mm2mils( 45 ), Mm2mils( 20 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Line27 = -{ - WS_TONK, - &WS_Osn1_Text1, - Mm2mils( 40 ), Mm2mils( 35 ), - Mm2mils( 40 ), Mm2mils( 20 ), - NULL -}; - -Ki_WorkSheetData WS_Osn1_Text1 = -{ - WS_TEXT, - &WS_Osn1_Text2, - Mm2mils( 181.5 ),Mm2mils( 32.5 ), - 0, 0, - wxT( "Изм." ) -}; - -Ki_WorkSheetData WS_Osn1_Text2 = -{ - WS_TEXTL, - &WS_Osn1_Text3, - Mm2mils( 184 ), Mm2mils( 27.5 ), - 0, 0, - wxT( "Разраб." ) -}; - -Ki_WorkSheetData WS_Osn1_Text3 = -{ - WS_TEXTL, - &WS_Osn1_Text4, - Mm2mils( 184 ),Mm2mils( 22.5 ), - 0, 0, - wxT( "Пров." ) -}; - -Ki_WorkSheetData WS_Osn1_Text4 = -{ - WS_TEXTL, - &WS_Osn1_Text5, - Mm2mils( 184 ), Mm2mils( 17.5 ), - 0, 0, - wxT( "Т.контр." ) -}; - -Ki_WorkSheetData WS_Osn1_Text5 = -{ - WS_TEXTL, - &WS_Osn1_Text6, - Mm2mils( 184 ), Mm2mils( 7.5 ), - 0, 0, - wxT( "Н.контр." ) -}; - -Ki_WorkSheetData WS_Osn1_Text6 = -{ - WS_TEXTL, - &WS_Osn1_Text7, - Mm2mils( 184 ),Mm2mils( 2.5 ), - 0, 0, - wxT( "Утв." ) -}; - -Ki_WorkSheetData WS_Osn1_Text7 = -{ - WS_TEXT, - &WS_Osn1_Text8, - Mm2mils( 173 ),Mm2mils( 32.5 ), - 0, 0, - wxT( "Лист" ) -}; - -Ki_WorkSheetData WS_Osn1_Text8 = -{ - WS_TEXT, - &WS_Osn1_Text9, - Mm2mils( 156.5 ), Mm2mils( 32.5 ), - 0, 0, - wxT( "N докум." ) -}; - -Ki_WorkSheetData WS_Osn1_Text9 = -{ - WS_TEXT, - &WS_Osn1_Text10, - Mm2mils( 137.5 ),Mm2mils( 32.5 ), - 0, 0, - wxT( "Подп." ) -}; - -Ki_WorkSheetData WS_Osn1_Text10 = -{ - WS_TEXT, - &WS_Osn1_Text11, - Mm2mils( 125 ), Mm2mils( 32.5 ), - 0, 0, - wxT( "Дата" ) -}; - -Ki_WorkSheetData WS_Osn1_Text11 = -{ - WS_TEXT, - &WS_Osn1_Text12, - Mm2mils( 42.5 ),Mm2mils( 37.5 ), - 0, 0, - wxT( "Лит." ) -}; - -Ki_WorkSheetData WS_Osn1_Text12 = -{ - WS_TEXT, - &WS_Osn1_Text13, - Mm2mils( 26.5 ),Mm2mils( 37.5 ), - 0, 0, - wxT( "Масса" ) -}; - -Ki_WorkSheetData WS_Osn1_Text13 = -{ - WS_TEXT, - &WS_Osn1_Text14, - Mm2mils( 9 ), Mm2mils( 37.5 ), - 0, 0, - wxT( "Масштаб" ) -}; - -Ki_WorkSheetData WS_Osn1_Text14 = -{ - WS_TEXTL, - &WS_Osn1_Text15, - Mm2mils( 49 ), Mm2mils( 17.5 ), - 0, 0, - wxT( "Лист" ) -}; - -Ki_WorkSheetData WS_Osn1_Text15 = -{ - WS_TEXTL, - &WS_Osn1_Text16, - Mm2mils( 29 ), Mm2mils( 17.5 ), - 0, 0, - wxT( "Листов" ) -}; - -Ki_WorkSheetData WS_Osn1_Text16 = -{ - WS_TEXTL, - &WS_Osn1_Text17, - Mm2mils( 40 ), -Mm2mils( 2.5 ), - 0, 0, - wxT( "Формат" ) -}; - -Ki_WorkSheetData WS_Osn1_Text17 = -{ - WS_TEXTL, - NULL, - Mm2mils( 110 ), -Mm2mils( 2.5 ), - 0, 0, - wxT( "Копировал" ) -}; - -Ki_WorkSheetData WS_Osn2a_Line1 = -{ - WS_OSN, - &WS_Osn2a_Line2, - Mm2mils( 185 ), Mm2mils( 15 ), - 0, Mm2mils( 15 ), - NULL -}; - -Ki_WorkSheetData WS_Osn2a_Line2 = -{ - WS_OSN, - &WS_Osn2a_Line3, - Mm2mils( 185 ), Mm2mils( 5 ), - Mm2mils( 120 ), Mm2mils( 5 ), - NULL -}; - -Ki_WorkSheetData WS_Osn2a_Line3 = -{ - WS_OSN, - &WS_Osn2a_Line4, - Mm2mils( 10 ), Mm2mils( 8 ), - 0, Mm2mils( 8 ), - NULL -}; - -Ki_WorkSheetData WS_Osn2a_Line4 = -{ - WS_OSN, - &WS_Osn2a_Line5, - Mm2mils( 185 ), Mm2mils( 15 ), - Mm2mils( 185 ), 0, - NULL -}; - -Ki_WorkSheetData WS_Osn2a_Line5 = -{ - WS_OSN, - &WS_Osn2a_Line6, - Mm2mils( 178 ), Mm2mils( 15 ), - Mm2mils( 178 ), 0, - NULL -}; - -Ki_WorkSheetData WS_Osn2a_Line6 = -{ - WS_OSN, - &WS_Osn2a_Line7, - Mm2mils( 168 ), Mm2mils( 15 ), - Mm2mils( 168 ), 0, - NULL -}; - -Ki_WorkSheetData WS_Osn2a_Line7 = -{ - WS_OSN, - &WS_Osn2a_Line8, - Mm2mils( 145 ), Mm2mils( 15 ), - Mm2mils( 145 ), 0, - NULL -}; - -Ki_WorkSheetData WS_Osn2a_Line8 = -{ - WS_OSN, - &WS_Osn2a_Line9, - Mm2mils( 130 ), Mm2mils( 15 ), - Mm2mils( 130 ), 0, - NULL -}; - -Ki_WorkSheetData WS_Osn2a_Line9 = -{ - WS_OSN, - &WS_Osn2a_Line10, - Mm2mils( 120 ), Mm2mils( 15 ), - Mm2mils( 120 ), 0, - NULL -}; - -Ki_WorkSheetData WS_Osn2a_Line10 = -{ - WS_OSN, - &WS_Osn2a_Line11, - Mm2mils( 10 ), Mm2mils( 15 ), - Mm2mils( 10 ), 0, - NULL -}; - -Ki_WorkSheetData WS_Osn2a_Line11 = -{ - WS_TONK, - &WS_Osn2a_Text1, - Mm2mils( 185 ), Mm2mils( 10 ), - Mm2mils( 120 ), Mm2mils( 10 ), - NULL -}; - -Ki_WorkSheetData WS_Osn2a_Text1 = -{ - WS_TEXT, - &WS_Osn2a_Text2, - Mm2mils( 181.5 ),Mm2mils( 2.5 ), - 0, 0, - wxT( "Изм." ) -}; - -Ki_WorkSheetData WS_Osn2a_Text2 = -{ - WS_TEXT, - &WS_Osn2a_Text3, - Mm2mils( 173 ), Mm2mils( 2.5 ), - 0, 0, - wxT( "Лист" ) -}; - -Ki_WorkSheetData WS_Osn2a_Text3 = -{ - WS_TEXT, - &WS_Osn2a_Text4, - Mm2mils( 156.5 ), Mm2mils( 2.5 ), - 0, 0, - wxT( "N докум." ) -}; - -Ki_WorkSheetData WS_Osn2a_Text4 = -{ - WS_TEXT, - &WS_Osn2a_Text5, - Mm2mils( 137.5 ),Mm2mils( 2.5 ), - 0, 0, - wxT( "Подп." ) -}; - -Ki_WorkSheetData WS_Osn2a_Text5 = -{ - WS_TEXT, - &WS_Osn2a_Text6, - Mm2mils( 125 ), Mm2mils( 2.5 ), - 0, 0, - wxT( "Дата" ) -}; - -Ki_WorkSheetData WS_Osn2a_Text6 = -{ - WS_TEXT, - &WS_Osn2a_Text7, - Mm2mils( 5 ), Mm2mils( 11.5 ), - 0, 0, - wxT( "Лист" ) -}; - -Ki_WorkSheetData WS_Osn2a_Text7 = -{ - WS_TEXTL, - &WS_Osn2a_Text8, - Mm2mils( 40 ), -Mm2mils( 2.5 ), - 0, 0, - wxT( "Формат" ) -}; - -Ki_WorkSheetData WS_Osn2a_Text8 = -{ - WS_TEXTL, - NULL, - Mm2mils( 110 ), -Mm2mils( 2.5 ), - 0, 0, - wxT( "Копировал" ) -}; - -// Center - left bottom corner - -Ki_WorkSheetData WS_DopLeft_Line1 = -{ - WS_OSN, - &WS_DopLeft_Line2, - Mm2mils( 12 ), Mm2mils( 145 ), - 0, Mm2mils( 145 ), - NULL -}; - -Ki_WorkSheetData WS_DopLeft_Line2 = -{ - WS_OSN, - &WS_DopLeft_Line3, - Mm2mils( 12 ), Mm2mils( 110 ), - 0, Mm2mils( 110 ), - NULL -}; - -Ki_WorkSheetData WS_DopLeft_Line3 = -{ - WS_OSN, - &WS_DopLeft_Line4, - Mm2mils( 12 ), Mm2mils( 85 ), - 0, Mm2mils( 85 ), - NULL -}; - -Ki_WorkSheetData WS_DopLeft_Line4 = -{ - WS_OSN, - &WS_DopLeft_Line5, - Mm2mils( 12 ), Mm2mils( 60 ), - 0, Mm2mils( 60 ), - NULL -}; - -Ki_WorkSheetData WS_DopLeft_Line5 = -{ - WS_OSN, - &WS_DopLeft_Line6, - Mm2mils( 12 ), Mm2mils( 25 ), - 0, Mm2mils( 25 ), - NULL -}; - -Ki_WorkSheetData WS_DopLeft_Line6 = -{ - WS_OSN, - &WS_DopLeft_Line7, - Mm2mils( 12 ), 0, - 0, 0, - NULL -}; - -Ki_WorkSheetData WS_DopLeft_Line7 = -{ - WS_OSN, - &WS_DopLeft_Line8, - Mm2mils( 12 ), Mm2mils( 145 ), - Mm2mils( 12 ), 0, - NULL -}; - -Ki_WorkSheetData WS_DopLeft_Line8 = -{ - WS_OSN, - &WS_DopLeft_Text1, - Mm2mils( 7 ), Mm2mils( 145 ), - Mm2mils( 7 ), 0, - NULL -}; - -Ki_WorkSheetData WS_DopLeft_Text1 = -{ - WS_TEXT, - &WS_DopLeft_Text2, - Mm2mils( 9.5 ), Mm2mils( 12.5 ), - 0, 0, - wxT( "Инв.N подл." ) -}; - -Ki_WorkSheetData WS_DopLeft_Text2 = -{ - WS_TEXT, - &WS_DopLeft_Text3, - Mm2mils( 9.5 ), Mm2mils( 42.5 ), - 0, 0, - wxT( "Подп. и дата" ) -}; - -Ki_WorkSheetData WS_DopLeft_Text3 = -{ - WS_TEXT, - &WS_DopLeft_Text4, - Mm2mils( 9.5 ), Mm2mils( 72.5 ), - 0, 0, - wxT( "Взам.инв.N" ) -}; - -Ki_WorkSheetData WS_DopLeft_Text4 = -{ - WS_TEXT, - &WS_DopLeft_Text5, - Mm2mils( 9.5 ), Mm2mils( 97.5 ), - 0, 0, - wxT( "Инв.N дубл." ) -}; - -Ki_WorkSheetData WS_DopLeft_Text5 = -{ - WS_TEXT, - &WS_DopLeft_Line9, - Mm2mils( 9.5 ), Mm2mils( 127.5 ), - 0, 0, - wxT( "Подп. и дата" ) -}; - -Ki_WorkSheetData WS_DopLeft_Line9 = -{ - WS_OSN, - &WS_DopLeft_Line10, - Mm2mils( 7 ), Mm2mils( 287 ), - Mm2mils( 7 ), Mm2mils( 167 ), - NULL -}; - -Ki_WorkSheetData WS_DopLeft_Line10 = -{ - WS_OSN, - &WS_DopLeft_Line11, - Mm2mils( 12 ), Mm2mils( 287 ), - Mm2mils( 12 ), Mm2mils( 167 ), - NULL -}; - -Ki_WorkSheetData WS_DopLeft_Line11 = -{ - WS_OSN, - &WS_DopLeft_Line12, - Mm2mils( 12 ), Mm2mils( 287 ), - Mm2mils( 12 ), Mm2mils( 167 ), - NULL -}; - -Ki_WorkSheetData WS_DopLeft_Line12 = -{ - WS_OSN, - &WS_DopLeft_Line13, - Mm2mils( 12 ), Mm2mils( 167 ), - 0, Mm2mils( 167 ), - NULL -}; - -Ki_WorkSheetData WS_DopLeft_Line13 = -{ - WS_OSN, - &WS_DopLeft_Line14, - Mm2mils( 12 ), Mm2mils( 227 ), - 0, Mm2mils( 227 ), - NULL -}; - -Ki_WorkSheetData WS_DopLeft_Line14 = -{ - WS_OSN, - &WS_DopLeft_Text6, - Mm2mils( 12 ), Mm2mils( 287 ), - 0, Mm2mils( 287 ), - NULL -}; - -Ki_WorkSheetData WS_DopLeft_Text6 = -{ - WS_TEXT, - &WS_DopLeft_Text7, - Mm2mils( 9.5 ), Mm2mils( 197 ), - 0, 0, - wxT( "Справ. N" ) -}; - -Ki_WorkSheetData WS_DopLeft_Text7 = -{ - WS_TEXT, - NULL, - Mm2mils( 9.5 ), Mm2mils( 257 ), - 0, 0, - wxT( "Перв. примен." ) -}; - -// Center - left top corner - -Ki_WorkSheetData WS_DopTop_Line1 = -{ - WS_OSN, - &WS_DopTop_Line2, - Mm2mils( 70 ), 0, - Mm2mils( 70 ), Mm2mils( 14 ), - NULL -}; - -Ki_WorkSheetData WS_DopTop_Line2 = -{ - WS_OSN, - &WS_DopTop_Line3, - Mm2mils( 70 ), Mm2mils( 14 ), - 0, Mm2mils( 14 ), - NULL -}; - -Ki_WorkSheetData WS_DopTop_Line3 = -{ - WS_OSN, - &WS_DopTop_Line4, - Mm2mils( 70 ), Mm2mils( 14 ), - Mm2mils( 137 ), Mm2mils( 14 ), - NULL -}; - -Ki_WorkSheetData WS_DopTop_Line4 = -{ - WS_OSN, - &WS_DopTop_Line5, - Mm2mils( 84 ), Mm2mils( 7 ), - Mm2mils( 137 ), Mm2mils( 7 ), - NULL -}; - -Ki_WorkSheetData WS_DopTop_Line5 = -{ - WS_OSN, - &WS_DopTop_Line6, - Mm2mils( 84 ), Mm2mils( 14 ), - Mm2mils( 84 ), 0, - NULL -}; - -Ki_WorkSheetData WS_DopTop_Line6 = -{ - WS_OSN, - NULL, - Mm2mils( 137 ),Mm2mils( 14 ), - Mm2mils( 137 ), 0, - NULL -}; - -#include - -class WS_DRAW_ITEM_LIST_GOST : public WS_DRAW_ITEM_LIST -{ -public: - void BuildWorkSheetGraphicListGOST( - const PAGE_INFO& aPageInfo, - const TITLE_BLOCK& aTitleBlock, - EDA_COLOR_T aLineColor, EDA_COLOR_T aTextColor ); -}; - -void WS_DRAW_ITEM_LIST_GOST::BuildWorkSheetGraphicListGOST( - const PAGE_INFO& aPageInfo, - const TITLE_BLOCK& aTitleBlock, - EDA_COLOR_T aLineColor, EDA_COLOR_T aTextColor ) -{ - wxPoint pos; - wxPoint end; - int refx, refy; - Ki_WorkSheetData* WsItem; - wxSize size( TEXTSIZE * m_milsToIu, TEXTSIZE * m_milsToIu ); - wxString msg; - wxString paperFormat = aPageInfo.GetType(); - WS_DRAW_ITEM_TEXT* gtext; - - wxPoint LTmargin( Mm2mils( 20 ), Mm2mils( 5 ) ); - wxPoint RBmargin( Mm2mils( 5 ), Mm2mils( 5 ) ); - SetMargins( LTmargin, RBmargin ); - SetPageSize( aPageInfo.GetSizeMils() ); - - // Upper left corner - refx = m_LTmargin.x; - refy = m_LTmargin.y; - - // lower right corner - int xg, yg; - xg = m_pageSize.x - m_RBmargin.x; - yg = m_pageSize.y - m_RBmargin.y; - - int lnMsg, ln; - int lnWosn = m_penSize * 2; - int lnWtonk = m_penSize; - wxSize sz; - wxSize size0_8( TEXTSIZE * m_milsToIu * 0.8, TEXTSIZE * m_milsToIu * 1 ); - wxSize size1_5( TEXTSIZE * m_milsToIu * 1.5, TEXTSIZE * m_milsToIu * 1.5 ); - wxSize size2( TEXTSIZE * m_milsToIu * 2, TEXTSIZE * m_milsToIu * 2 ); - wxSize size3( TEXTSIZE * m_milsToIu * 3, TEXTSIZE * m_milsToIu * 3 ); - - // Draw the border. - Append( new WS_DRAW_ITEM_RECT( NULL, - wxPoint( refx * m_milsToIu, refy * m_milsToIu ), - wxPoint( xg * m_milsToIu, yg * m_milsToIu ), - lnWosn, aLineColor ) ); - - // Center - right bottom corner - refx = m_pageSize.x - m_RBmargin.x; - refy = m_pageSize.y - m_RBmargin.y; - - // First page - if( m_sheetNumber == 1 ) - { - for( WsItem = &WS_Osn1_Line1; WsItem != NULL; WsItem = WsItem->Pnext ) - { - pos.x = (refx - WsItem->m_Posx) * m_milsToIu; - pos.y = (refy - WsItem->m_Posy) * m_milsToIu; - end.x = (refx - WsItem->m_Endx) * m_milsToIu; - end.y = (refy - WsItem->m_Endy) * m_milsToIu; - msg = WsItem->m_TextBase; - - switch( WsItem->m_Type ) - { - case WS_OSN: - Append( new WS_DRAW_ITEM_LINE( NULL, pos, end, - lnWosn, aLineColor ) ); - break; - - case WS_TONK: - Append( new WS_DRAW_ITEM_LINE( NULL, pos, end, - lnWtonk, aLineColor ) ); - break; - - case WS_TEXT: - - if( !msg.IsEmpty() ) - { - if( WsItem == &WS_Osn1_Text1 ) - Append( new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - size0_8, m_penSize, - aLineColor ) ); - else - Append( new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - size, m_penSize, aLineColor ) ); - } - - break; - - case WS_TEXTL: - - if( !msg.IsEmpty() ) - { - Append( gtext = new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - size, m_penSize, aLineColor ) ); - gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); - } - - break; - } - } - - // Sheet number - if( m_sheetCount > 1 ) - { - pos.x = ( refx - Mm2mils( 36 ) ) * m_milsToIu; - pos.y = ( refy - Mm2mils( 17.5 ) ) * m_milsToIu; - msg.Empty(); - msg << m_sheetNumber; - Append( new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - size, m_penSize, aLineColor ) ); - } - - // Count of sheets - pos.x = ( refx - Mm2mils( 10 ) ) * m_milsToIu; - pos.y = ( refy - Mm2mils( 17.5 ) ) * m_milsToIu; - msg.Empty(); - msg << m_sheetCount; - Append( gtext = new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - size, m_penSize, aLineColor ) ); - gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); - - // Company name - msg = aTitleBlock.GetCompany(); - - if( !msg.IsEmpty() ) - { - sz = size1_5; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; - ln = Mm2mils( 49 ); - - if( lnMsg > ln ) - sz.x *= float(ln) / lnMsg; - - pos.x = ( refx - Mm2mils( 25 ) ) * m_milsToIu; - pos.y = ( refy - Mm2mils( 7.5 ) ) * m_milsToIu; - Append( new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - sz, m_penSize, aLineColor ) ); - } - - // Title - msg = aTitleBlock.GetTitle(); - - if( !msg.IsEmpty() ) - { - sz = size1_5; - wxArrayString lines; - int titleWidth = 0; - int titleHeight = (sz.y + sz.y * 0.5) / m_milsToIu; - int titleFieldWidth = Mm2mils( 69 ); - int titleFieldHeight = Mm2mils( 24 ); - int index = 0; - wxString fullMsg = msg; - - while( 1 ) // Reduce the height of wrapped title until the fit - { - while( 1 ) // Wrap the title - { - titleWidth = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; - - if( titleWidth > titleFieldWidth ) - { - index = 0; - - while( 1 ) - { - msg = msg.Left( msg.Length() - 1 ); - - if( msg.Length() == 0 ) - { - lines.Clear(); - msg = fullMsg; - sz.x -= m_milsToIu; - break; - } - else - { - index++; - titleWidth = - ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; - - wxString ch = wxString( msg.Last() ); - - if( titleWidth < titleFieldWidth && ch == wxT( " " ) ) - { - // New sentence on a new line - int dot = msg.Index( wxT( ". " ) ); - - if( dot != wxNOT_FOUND ) - { - index += msg.Length() - dot - 2; - msg = msg.Left( dot + 1 ); - lines.Add( msg ); - msg = fullMsg.Right( index ); - break; - } - else - { - msg = msg.Left( msg.Length() - 1 ); - lines.Add( msg ); - msg = fullMsg.Right( index ); - break; - } - } - } - } - } - else - { - // New sentence on a new line - int dot = msg.Index( wxT( ". " ) ); - - if( dot != wxNOT_FOUND ) - { - lines.Add( msg.Left( dot + 1 ) ); - lines.Add( fullMsg.Right( msg.Length() - dot - 2 ) ); - } - else - lines.Add( msg ); - - break; - } - } - - if( titleFieldHeight < (int) ( titleHeight * lines.Count() ) ) - { - sz.y -= m_milsToIu; - sz.x -= m_milsToIu; - msg = fullMsg; - lines.Clear(); - } - else - break; - } - - pos.x = ( refx - Mm2mils( 85 ) ) * m_milsToIu; - pos.y = - ( refy - Mm2mils( 27.5 ) - (titleHeight * (lines.Count() - 1) / 2) ) * m_milsToIu; - - for( unsigned curLn = 0; curLn < lines.Count(); curLn++ ) - { - msg = lines[curLn]; - Append( new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - sz, m_penSize, aTextColor ) ); - pos.y += titleHeight * m_milsToIu; - } - } - - // Decimal number - msg = aTitleBlock.GetComment1(); - - if( !msg.IsEmpty() ) - { - sz = size3; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; - ln = Mm2mils( 119 ); - - if( lnMsg > ln ) - sz.x *= float(ln) / lnMsg; - - pos.x = ( refx - Mm2mils( 60 ) ) * m_milsToIu; - pos.y = ( refy - Mm2mils( 47.5 ) ) * m_milsToIu; - Append( new WS_DRAW_ITEM_TEXT(NULL, msg, pos, - sz, m_penSize, aTextColor ) ); - } - - // Developer - msg = aTitleBlock.GetComment2(); - - if( !msg.IsEmpty() ) - { - sz = size; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; - ln = Mm2mils( 22 ); - - if( lnMsg > ln ) - sz.x *= float(ln) / lnMsg; - - pos.x = ( refx - Mm2mils( 167.5 ) ) * m_milsToIu; - pos.y = ( refy - Mm2mils( 27.5 ) ) * m_milsToIu; - Append( gtext = new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - sz, m_penSize, aTextColor ) ); - gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); - } - - // Verifier - msg = aTitleBlock.GetComment3(); - - if( !msg.IsEmpty() ) - { - sz = size; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; - ln = Mm2mils( 22 ); - - if( lnMsg > ln ) - sz.x *= float(ln) / lnMsg; - - pos.x = ( refx - Mm2mils( 167 ) ) * m_milsToIu; - pos.y = ( refy - Mm2mils( 22.5 ) ) * m_milsToIu; - Append( gtext = new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - sz, m_penSize, aTextColor ) ); - gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); - } - - // Approver - msg = aTitleBlock.GetComment4(); - - if( !msg.IsEmpty() ) - { - sz = size; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; - ln = Mm2mils( 22 ); - - if( lnMsg > ln ) - sz.x *= float(ln) / lnMsg; - - pos.x = ( refx - Mm2mils( 167 ) ) * m_milsToIu; - pos.y = ( refy - Mm2mils( 2.5 ) ) * m_milsToIu; - Append( gtext = new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - sz, m_penSize, aTextColor ) ); - gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); - } - } - else // other pages - { - for( WsItem = &WS_Osn2a_Line1; WsItem != NULL; WsItem = WsItem->Pnext ) - { - pos.x = (refx - WsItem->m_Posx) * m_milsToIu; - pos.y = (refy - WsItem->m_Posy) * m_milsToIu; - end.x = (refx - WsItem->m_Endx) * m_milsToIu; - end.y = (refy - WsItem->m_Endy) * m_milsToIu; - msg = WsItem->m_TextBase; - - switch( WsItem->m_Type ) - { - case WS_OSN: - Append( new WS_DRAW_ITEM_LINE( NULL, pos, end, - lnWosn, aLineColor ) ); - break; - - case WS_TONK: - Append( new WS_DRAW_ITEM_LINE( NULL, pos, end, - lnWtonk, aLineColor ) ); - break; - - case WS_TEXT: - - if( !msg.IsEmpty() ) - { - if( WsItem == &WS_Osn2a_Text1 ) - Append( new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - size0_8, m_penSize, - aLineColor ) ); - else - Append( new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - size, m_penSize, aLineColor ) ); - } - - break; - - case WS_TEXTL: - - if( !msg.IsEmpty() ) - { - Append( gtext = new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - size, m_penSize, - aLineColor ) ); - gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); - } - - break; - } - } - - // Sheet number - pos.x = ( refx - Mm2mils( 5 ) ) * m_milsToIu; - pos.y = ( refy - Mm2mils( 4 ) ) * m_milsToIu; - msg.Empty(); - msg << m_sheetNumber; - Append( gtext = new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - size, m_penSize, aLineColor ) ); - - // Decimal number - msg = aTitleBlock.GetComment1(); - - if( !msg.IsEmpty() ) - { - sz = size3; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; - ln = Mm2mils( 109 ); - - if( lnMsg > ln ) - sz.x *= float(ln) / lnMsg; - - pos.x = ( refx - Mm2mils( 65 ) ) * m_milsToIu; - pos.y = ( refy - Mm2mils( 7.5 ) ) * m_milsToIu; - Append( new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - sz, m_penSize, aTextColor ) ); - } - } - - // Format - pos.x = ( refx - Mm2mils( 23 ) ) * m_milsToIu; - pos.y = ( refy + Mm2mils( 2.5 ) ) * m_milsToIu; - msg.Empty(); - msg << paperFormat; - Append( gtext = new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - size, m_penSize, aLineColor ) ); - gtext->SetHorizJustify( GR_TEXT_HJUSTIFY_LEFT ); - - // Center - left bottom corner - refx = m_LTmargin.x; - refy = m_pageSize.y - m_RBmargin.y; - - for( WsItem = &WS_DopLeft_Line1; WsItem != NULL; WsItem = WsItem->Pnext ) - { - if( m_sheetNumber > 1 && WsItem == &WS_DopLeft_Line9 ) // Some fields for first page only - break; - - pos.x = (refx - WsItem->m_Posx) * m_milsToIu; - pos.y = (refy - WsItem->m_Posy) * m_milsToIu; - end.x = (refx - WsItem->m_Endx) * m_milsToIu; - end.y = (refy - WsItem->m_Endy) * m_milsToIu; - msg = WsItem->m_TextBase; - - switch( WsItem->m_Type ) - { - case WS_OSN: - Append( new WS_DRAW_ITEM_LINE( NULL, pos, end, - lnWosn, aLineColor ) ); - break; - - case WS_TEXT: - - if( !msg.IsEmpty() ) - { - Append( gtext = new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - size, m_penSize, aLineColor ) ); - gtext->SetOrientation( TEXT_ORIENT_VERT ); - } - - break; - } - } - - if( paperFormat == PAGE_INFO::A4 || m_pageSize.x > m_pageSize.y ) // A4 or Landscape - { - // Center - left top corner - refx = m_LTmargin.x; - refy = m_LTmargin.y; - - for( WsItem = &WS_DopTop_Line1; WsItem != NULL; WsItem = WsItem->Pnext ) - { - if( m_sheetNumber > 1 && WsItem == &WS_DopTop_Line3 ) // Some fields for first page only - break; - - pos.x = (refx + WsItem->m_Posx) * m_milsToIu; - pos.y = (refy + WsItem->m_Posy) * m_milsToIu; - end.x = (refx + WsItem->m_Endx) * m_milsToIu; - end.y = (refy + WsItem->m_Endy) * m_milsToIu; - msg = WsItem->m_TextBase; - - switch( WsItem->m_Type ) - { - case WS_OSN: - Append( new WS_DRAW_ITEM_LINE( NULL, pos, end, - lnWosn, aLineColor ) ); - break; - - case WS_TONK: - Append( new WS_DRAW_ITEM_LINE( NULL, pos, end, - lnWtonk, aLineColor ) ); - break; - } - } - - // Decimal number - msg = aTitleBlock.GetComment1(); - - if( !msg.IsEmpty() ) - { - sz = size2; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; - ln = Mm2mils( 69 ); - - if( lnMsg > ln ) - sz.x *= float(ln) / lnMsg; - - pos.x = ( refx + Mm2mils( 35 ) ) * m_milsToIu; - pos.y = ( refy + Mm2mils( 7 ) ) * m_milsToIu; - Append( gtext = new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - sz, m_penSize, aTextColor ) ); - gtext->SetOrientation( 1800.0 ); - } - } - else // Portrait - { - // Center - right top corner - // Lines are used from the upper left corner by the change of coordinates - refx = m_pageSize.x - m_RBmargin.x; - refy = m_LTmargin.y; - - for( WsItem = &WS_DopTop_Line1; WsItem != NULL; WsItem = WsItem->Pnext ) - { - if( m_sheetNumber > 1 && WsItem == &WS_DopTop_Line3 ) // Some fields for first page only - break; - - pos.x = (refx - WsItem->m_Posy) * m_milsToIu; - pos.y = (refy + WsItem->m_Posx) * m_milsToIu; - end.x = (refx - WsItem->m_Endy) * m_milsToIu; - end.y = (refy + WsItem->m_Endx) * m_milsToIu; - msg = WsItem->m_TextBase; - - switch( WsItem->m_Type ) - { - case WS_OSN: - Append( new WS_DRAW_ITEM_LINE( NULL, pos, end, - lnWosn, aLineColor ) ); - break; - - case WS_TONK: - Append( new WS_DRAW_ITEM_LINE( NULL, pos, end, - lnWtonk, aLineColor ) ); - break; - } - } - - // Decimal number - msg = aTitleBlock.GetComment1(); - - if( !msg.IsEmpty() ) - { - sz = size2; - lnMsg = ReturnGraphicTextWidth( msg, sz.x, false, false ) / m_milsToIu; - ln = Mm2mils( 69 ); - - if( lnMsg > ln ) - sz.x *= float(ln) / lnMsg; - - pos.x = ( refx - Mm2mils( 7 ) ) * m_milsToIu; - pos.y = ( refy + Mm2mils( 35 ) ) * m_milsToIu; - Append( gtext = new WS_DRAW_ITEM_TEXT( NULL, msg, pos, - sz, m_penSize, aTextColor ) ); - gtext->SetOrientation( TEXT_ORIENT_VERT ); - } - } -} diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp index 832a2b274f..fd4815054d 100644 --- a/eeschema/eeschema_config.cpp +++ b/eeschema/eeschema_config.cpp @@ -364,10 +364,10 @@ PARAM_CFG_ARRAY& SCH_EDIT_FRAME::GetProjectFileParametersList() m_projectFileParams.push_back( new PARAM_CFG_INT( wxT( "SubpartIdSeparator" ), LIB_COMPONENT::SubpartIdSeparatorPtr(), - IsGOST() ? '.' : 0, 0, 126 ) ); + 0, 0, 126 ) ); m_projectFileParams.push_back( new PARAM_CFG_INT( wxT( "SubpartFirstId" ), LIB_COMPONENT::SubpartFirstIdPtr(), - IsGOST() ? '1' : 'A', '1', 'z' ) ); + 'A', '1', 'z' ) ); m_projectFileParams.push_back( new PARAM_CFG_FILENAME( wxT( "LibDir" ), &m_userLibraryPath ) ); diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp index 7ab345f30b..52d512a78a 100644 --- a/eeschema/sch_screen.cpp +++ b/eeschema/sch_screen.cpp @@ -101,7 +101,7 @@ static GRID_TYPE SchematicGridList[] = { SCH_SCREEN::SCH_SCREEN() : BASE_SCREEN( SCH_SCREEN_T ), - m_paper( wxT( "A4" ), IsGOST() ) + m_paper( wxT( "A4" ) ) { size_t i; diff --git a/include/common.h b/include/common.h index aece0a6cc6..004cfbe1c9 100644 --- a/include/common.h +++ b/include/common.h @@ -169,17 +169,6 @@ inline int Mm2mils( double x ) { return KiROUND( x * 1000./25.4 ); } inline int Mils2mm( double x ) { return KiROUND( x * 25.4 / 1000. ); } -/// Return whether GOST is in play -inline bool IsGOST() -{ -#if defined(KICAD_GOST) - return true; -#else - return false; -#endif -} - - enum EDA_UNITS_T { INCHES = 0, MILLIMETRES = 1, diff --git a/include/macros.h b/include/macros.h index 35634311c8..3b31514ad2 100644 --- a/include/macros.h +++ b/include/macros.h @@ -42,7 +42,10 @@ static inline wxString FROM_UTF8( const char* cstring ) *
  • standard C style char when wxUSE_UNICODE==0
    • *
  • wchar_t when wxUSE_UNICODE==1 (the default).
    • * - * i.e. it depends on how the wxWidgets library was compiled. There was a period + * i.e. it depends on how the wxWidgets library was compiled. + * ( wxUSE_UNICODE is defined in wxWidgets, inside setup.h. + * for version >= 2.9 wxUSE_UNICODE is always defined to 1 ) + * There was a period * during the development of wxWidgets 2.9 when GetData() was missing, so this * function was used to provide insulation from that design change. It may * no longer be needed, and is harmless. GetData() seems to be an acceptable @@ -64,7 +67,7 @@ template inline void NEGATE( T &x ) { x = -x; } #define DIM( x ) unsigned( sizeof(x) / sizeof( (x)[0] ) ) // not size_t /// Exchange two values -// std::swap works only with arguments of the same type (which is saner); +// std::swap works only with arguments of the same type (which is saner); // here the compiler will figure out what to do (I hope to get rid of // this soon or late) template inline void EXCHG( T& a, T2& b ) diff --git a/include/worksheet_shape_builder.h b/include/worksheet_shape_builder.h index 04f08c914c..ac9d0115dc 100644 --- a/include/worksheet_shape_builder.h +++ b/include/worksheet_shape_builder.h @@ -476,10 +476,6 @@ class WORKSHEET_LAYOUT double m_rightMargin; // the right page margin in mm double m_topMargin; // the top page margin in mm double m_bottomMargin; // the bottom page margin in mm - bool m_isDefaultDescr; // true if the internal default descr is loaded - // mainly used in Kicad GOST version, until - // a GOST page descr file is available - // to force the GOST default title block public: WORKSHEET_LAYOUT(); @@ -496,9 +492,6 @@ public: } // Accessors: - bool IsDefaultDescr() { return m_isDefaultDescr; } - void SetDefaultDescrFlag( bool aFlg ) { m_isDefaultDescr = aFlg; } - double GetLeftMargin() { return m_leftMargin; } double GetRightMargin() { return m_rightMargin; } double GetTopMargin() { return m_topMargin; } diff --git a/pagelayout_editor/files.cpp b/pagelayout_editor/files.cpp index a43c3738f9..b161125cfe 100644 --- a/pagelayout_editor/files.cpp +++ b/pagelayout_editor/files.cpp @@ -96,9 +96,6 @@ void PL_EDITOR_FRAME::Files_io( wxCommandEvent& event ) { case ID_LOAD_DEFAULT_PAGE_LAYOUT: pglayout.SetPageLayout(); - // Force DefaultDescrFlag to false in page layout editor, - // has meaning only for GOST version - pglayout.SetDefaultDescrFlag( false ); OnNewPageLayout(); break; @@ -106,9 +103,6 @@ void PL_EDITOR_FRAME::Files_io( wxCommandEvent& event ) pglayout.AllowVoidList( true ); SetCurrFileName( wxEmptyString ); pglayout.ClearList(); - // Force DefaultDescrFlag to false in page layout editor, - // has meaning only for GOST version - pglayout.SetDefaultDescrFlag( false ); OnNewPageLayout(); break; diff --git a/pagelayout_editor/pl_editor.cpp b/pagelayout_editor/pl_editor.cpp index 7f3faf6c36..ed1d0e2a5f 100644 --- a/pagelayout_editor/pl_editor.cpp +++ b/pagelayout_editor/pl_editor.cpp @@ -122,9 +122,6 @@ bool EDA_APP::OnInit() if( !descrLoaded ) { WORKSHEET_LAYOUT::GetTheInstance().SetPageLayout(); - // Force DefaultDescrFlag to false in page layout editor, - // has meaning only for GOST version - WORKSHEET_LAYOUT::GetTheInstance().SetDefaultDescrFlag( false ); frame->OnNewPageLayout(); } diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp index c1814743a7..a961ef78e6 100644 --- a/pcbnew/class_board.cpp +++ b/pcbnew/class_board.cpp @@ -62,7 +62,7 @@ wxPoint BOARD_ITEM::ZeroOffset( 0, 0 ); BOARD::BOARD() : BOARD_ITEM( (BOARD_ITEM*) NULL, PCB_T ), m_NetInfo( this ), - m_paper( PAGE_INFO::A4, IsGOST() ), + m_paper( PAGE_INFO::A4 ), m_NetClasses( this ) { // we have not loaded a board yet, assume latest until then. diff --git a/template/fp_global_table b/template/fp_global_table index 263c1c9c7f..46c04c5735 100644 --- a/template/fp_global_table +++ b/template/fp_global_table @@ -51,7 +51,7 @@ (lib (name SI570_SI571_Oscillator_RevA_11Jun2012)(type Legacy)(uri ${KISYSMOD}/SI570_SI571_Oscillator_RevA_11Jun2012.mod)(options "")(descr "")) (lib (name SIP9_Housing_14Jun2013)(type Legacy)(uri ${KISYSMOD}/SIP9_Housing_14Jun2013.mod)(options "")(descr "")) (lib (name smd_capacitors)(type Legacy)(uri ${KISYSMOD}/smd_capacitors.mod)(options "")(descr "")) - (lib (name smd_crystal&oscillator)(type Legacy)(uri ${KISYSMOD}/smd_crystal&oscillator.mod)(options "")(descr "")) + (lib (name smd_crystal_and_oscillator)(type Legacy)(uri ${KISYSMOD}/smd_crystal_and_oscillator.mod)(options "")(descr "")) (lib (name smd_resistors)(type Legacy)(uri ${KISYSMOD}/smd_resistors.mod)(options "")(descr "")) (lib (name smd_soic_packages)(type Legacy)(uri ${KISYSMOD}/smd_soic_packages.mod)(options "")(descr "")) (lib (name smd_ssop_packages)(type Legacy)(uri ${KISYSMOD}/smd_ssop_packages.mod)(options "")(descr "")) diff --git a/template/fp_global_table.csv b/template/fp_global_table.csv index be9eb4eb25..130d38df5d 100644 --- a/template/fp_global_table.csv +++ b/template/fp_global_table.csv @@ -51,7 +51,7 @@ Resistor_Universal-Experimental_RevA,Legacy,${KISYSMOD}/Resistor_Universal-Exper SI570_SI571_Oscillator_RevA_11Jun2012,Legacy,${KISYSMOD}/SI570_SI571_Oscillator_RevA_11Jun2012.mod,"","" SIP9_Housing_14Jun2013,Legacy,${KISYSMOD}/SIP9_Housing_14Jun2013.mod,"","" smd_capacitors,Legacy,${KISYSMOD}/smd_capacitors.mod,"","" -smd_crystal&oscillator,Legacy,${KISYSMOD}/smd_crystal&oscillator.mod,"","" +smd_crystal_and_oscillator,Legacy,${KISYSMOD}/smd_crystal_and_oscillator.mod,"","" smd_resistors,Legacy,${KISYSMOD}/smd_resistors.mod,"","" smd_soic_packages,Legacy,${KISYSMOD}/smd_soic_packages.mod,"","" smd_ssop_packages,Legacy,${KISYSMOD}/smd_ssop_packages.mod,"",""