diff --git a/new/Doxyfile b/new/Doxyfile index e6b11073e4..2f60321c5f 100644 --- a/new/Doxyfile +++ b/new/Doxyfile @@ -604,7 +604,7 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = +EXCLUDE = build # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded @@ -1024,7 +1024,7 @@ GENERATE_LATEX = NO # If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `latex' will be used as the default path. -LATEX_OUTPUT = . +LATEX_OUTPUT = pdf # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. If left blank `latex' will be used as the default command name. diff --git a/new/design.h b/new/design.h index eb08fdcd69..2a4fc7b0d8 100644 --- a/new/design.h +++ b/new/design.h @@ -3,7 +3,7 @@ namespace SCH { /** @mainpage -This file describes the design of a new Distributed Library System for Kicad's +This file describes the design of a new Distributed Library System for KiCad's EESCHEMA. Many of the concepts can be adapted with modest modification to PCBNEW also, in the future. @@ -32,15 +32,15 @@ speed up the pace at which new parts are found and used.

Electronic component manufacturers need and look for ways to differentiate their products from their competitors. With this Distributed Library System -facility in Kicad, one way for manufacturers to differentiate themselves and +facility in KiCad, one way for manufacturers to differentiate themselves and their parts is to publish a part library on the Internet and save their -customers the work of doing the data entry of the part into the Kicad design +customers the work of doing the data entry of the part into the KiCad design system.

Maintaining a comprehensive part library is a fairly labor intensive activity. New parts come into the market everyday. By being able to publish a superior library on the Internet, it may be possible to make a for profit -business out of doing this. The Kicad eco-system would benefit should this +business out of doing this. The KiCad eco-system would benefit should this happen, and there could even be competition between such businesses. Or there can be library specializations or niches. @@ -52,9 +52,9 @@ an existing part without completely re-designing it. It is sometimes easier to modify an existing part than it is to create the new part entirely from scratch.

This Distributed Library System design will have the capability to -significantly benefit the Kicad eco-system, and that should mean expanding the +significantly benefit the KiCad eco-system, and that should mean expanding the numbers of users and contributors to the project, and hopefully making for a -better Kicad tool-set for all. +better KiCad tool-set for all. @section definitions Definitions @@ -172,7 +172,7 @@ logical library names duplicately defined. (Or we will simply ask that any remot

Eventually there will be an external publicly available internet based logical library table also, but this will need to be glued down at a hard coded URL that we have control over. The internet based library table allows us to -advertise remote libraries without having to issue an update to Kicad. +advertise remote libraries without having to issue an update to KiCad.

Query Language
This is a means of searching for something that is contained within a container. Since some library sources are remote, it is @@ -218,8 +218,8 @@ ever get done, the boundary of the plug-in interface will remain the C++ library API as given here (mostly in class LIB_SOURCE). The only reason to introduce a plug-in design is to allow proprietary closed source library implementations, and this could eventually come about if a part vendor wanted to provide one for -the Kicad project. If a Texas Instruments type of company wants to maintain a -Kicad library, we will be positioned to accommodate them. Until then, the +the KiCad project. If a Texas Instruments type of company wants to maintain a +KiCad library, we will be positioned to accommodate them. Until then, the LIB_SOURCE implementations can be statically linked into EESCHEMA and there is no conceptual disruption either way. @@ -247,9 +247,9 @@ conversion program can simplify things by simply putting all schematic parts into a parts list within each schematic.
  • An Internet connection is required to use some of the library sources. It -will be possible to omit these library sources and run Kicad by doing a +will be possible to omit these library sources and run KiCad by doing a configuration change. Eventually, some library sources will spring up and will -not technically be part of the Kicad project, so they will remain remote, but +not technically be part of the KiCad project, so they will remain remote, but fully usable to those with an internet connection and permission from the library source's owner. @@ -297,7 +297,7 @@ SCH for EESCHEMA, and PCB for PCBNEW.

    Since most if not all the APIs deal with file or non-volatile storage, only 8 bit string types are used. For international strings, UTF-8 is used, and -that is what is currently in use within the Kicad file storage formats. +that is what is currently in use within the KiCad file storage formats.

    The typedef STRINGS is used frequently as a holder for multiple std::strings. After some research, I chose std::dequeue to hold a list of diff --git a/new/import_export.h b/new/import_export.h index 92f9eb67e4..b3b5b1291d 100644 --- a/new/import_export.h +++ b/new/import_export.h @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2011 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2011 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2011 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 diff --git a/new/sch_canvas.cpp b/new/sch_canvas.cpp index f8418cb023..26a4798fba 100644 --- a/new/sch_canvas.cpp +++ b/new/sch_canvas.cpp @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2011 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2011 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2011 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 @@ -24,8 +24,8 @@ #include "sch_canvas.h" - #include "sch_part.h" +#include namespace SCH { @@ -40,28 +40,18 @@ CANVAS::CANVAS( wxWindow* aParent ) : SetScreenDPI( 100 ); - // SetLookAtPoint( VECTOR2D( size.x / 2, size.y / 2 ) ); - ComputeWorldScreenMatrix(); -/* - // Compute the world size - m_worldSize = VECTOR2D( m_screenSize.x, m_screenSize.y ); - - m_isReady = true; - m_isPanning = false; - m_isGroupStarted = true; - - m_offset = 0.333; + // Set the world unit length + // SetLookAtPoint( VECTOR2D( size.x / 2, size.y / 2 ) ); // Load Font if( !m_font.LoadNewStrokeFont( newstroke_font, newstroke_font_bufsize ) ) { - cout << "Loading of the font failed." << endl; + printf( "Loading of the font failed.\n" ); } m_font.SetGraphicsAbstractionLayer( this ); -*/ } diff --git a/new/sch_canvas.h b/new/sch_canvas.h index 06726d44a5..41e4f3c3ee 100644 --- a/new/sch_canvas.h +++ b/new/sch_canvas.h @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2011 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2011 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2011 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 @@ -26,6 +26,7 @@ #define SCH_CANVAS_H_ #include +#include namespace SCH { @@ -36,7 +37,9 @@ class CANVAS : public OPENGL_GAL { protected: - PART* part; ///< which PART to draw + PART* m_part; ///< which PART to draw + STROKE_FONT m_font; + void onRedraw( wxCommandEvent& event ); @@ -47,10 +50,10 @@ public: * Function SetPart * sets the PART to draw, returns the previous PART. */ - PART* SetPart( PART* aPart ) + PART* SetPart( PART* aPart ) { - PART* ret = part; - part = aPart; + PART* ret = m_part; + m_part = aPart; return ret; } diff --git a/new/sch_dir_lib_source.cpp b/new/sch_dir_lib_source.cpp index 51e48f0257..8edf331bbb 100644 --- a/new/sch_dir_lib_source.cpp +++ b/new/sch_dir_lib_source.cpp @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2010 SoftPLC Corporation, - * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2010 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 diff --git a/new/sch_dir_lib_source.h b/new/sch_dir_lib_source.h index 9444bb2f84..9d39352f9e 100644 --- a/new/sch_dir_lib_source.h +++ b/new/sch_dir_lib_source.h @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2010 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 diff --git a/new/sch_lib.cpp b/new/sch_lib.cpp index e76e09543d..a5464fa5d6 100644 --- a/new/sch_lib.cpp +++ b/new/sch_lib.cpp @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2010 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 diff --git a/new/sch_lib.h b/new/sch_lib.h index 5161942ecf..9a383c31ef 100644 --- a/new/sch_lib.h +++ b/new/sch_lib.h @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2010 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 diff --git a/new/sch_lib_table.cpp b/new/sch_lib_table.cpp index 36767e5db0..1950371826 100644 --- a/new/sch_lib_table.cpp +++ b/new/sch_lib_table.cpp @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2010-2011 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2010 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 diff --git a/new/sch_lib_table.h b/new/sch_lib_table.h index 00b7430028..d05dfdb569 100644 --- a/new/sch_lib_table.h +++ b/new/sch_lib_table.h @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2010 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 diff --git a/new/sch_lpid.cpp b/new/sch_lpid.cpp index 54c3a621a7..e4757790e4 100644 --- a/new/sch_lpid.cpp +++ b/new/sch_lpid.cpp @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2010 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 diff --git a/new/sch_lpid.h b/new/sch_lpid.h index a16dfea64b..97fdf77ca2 100644 --- a/new/sch_lpid.h +++ b/new/sch_lpid.h @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2010 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 diff --git a/new/sch_part.cpp b/new/sch_part.cpp index d63f0d8606..730ded9a11 100644 --- a/new/sch_part.cpp +++ b/new/sch_part.cpp @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2011 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2010 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 diff --git a/new/sch_part.h b/new/sch_part.h index 216d214cbd..2340ff42a0 100644 --- a/new/sch_part.h +++ b/new/sch_part.h @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2011 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2010 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 diff --git a/new/sch_sweet_parser.cpp b/new/sch_sweet_parser.cpp index 8fcf0efc52..f0be7bd87c 100644 --- a/new/sch_sweet_parser.cpp +++ b/new/sch_sweet_parser.cpp @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2011 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2010 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 diff --git a/new/sch_sweet_parser.h b/new/sch_sweet_parser.h index 2e6fd3c9fb..d5424f936e 100644 --- a/new/sch_sweet_parser.h +++ b/new/sch_sweet_parser.h @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2011 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2010 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 diff --git a/new/sweet_edit.cpp b/new/sweet_edit.cpp index 5737b434a9..e230aff949 100644 --- a/new/sweet_edit.cpp +++ b/new/sweet_edit.cpp @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2011 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2011 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2011 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 @@ -112,29 +112,6 @@ SWEET_FRAME::SWEET_FRAME( wxWindow* parent, wxWindowID id, const wxString& title Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( SWEET_FRAME::OnMouseWheel ) ); Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( SWEET_FRAME::OnRightDown ) ); Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( SWEET_FRAME::OnRightUp ) ); - -// Connect( EVT_GAL_REDRAW, wxCommandEventHandler( SWEET_FRAME::OnRedraw ) ); - - -/* - // Set the world unit length - m_gal->SetWorldUnitLength( 0.01 ); - m_gal->SetScreenDPI( 100 ); - m_gal->SetLookAtPoint( VECTOR2D( size.x / 2, size.y / 2 ) ); - m_gal->ComputeWorldScreenMatrix(); - - // Compute the world size - m_worldSize = VECTOR2D( m_screenSize.x, m_screenSize.y ); - - // Load Font - if( !m_font.LoadNewStrokeFont( newstroke_font, newstroke_font_bufsize ) ) - { - cout << "Loading of the font failed." << endl; - } - - m_font.SetGraphicsAbstractionLayer( m_gal ); -*/ - } diff --git a/new/test_sch_lib_table.cpp b/new/test_sch_lib_table.cpp index c872409e08..d433623c1d 100644 --- a/new/test_sch_lib_table.cpp +++ b/new/test_sch_lib_table.cpp @@ -1,8 +1,8 @@ /* - * This program source code file is part of KICAD, a free EDA CAD application. + * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2010-2011 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 2010 Kicad Developers, see change_log.txt for contributors. + * Copyright (C) 2010 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 diff --git a/new/utf8.h b/new/utf8.h index f633c48bcd..046d880ba5 100644 --- a/new/utf8.h +++ b/new/utf8.h @@ -28,11 +28,11 @@ typedef std::deque STRINGS; * Type STR_UTF * holds a UTF8 encoded sequence of 8 bit bytes that represent a sequence * of variable multi-byte international characters. UTF8 is the chosen encoding - * for all Kicad data files so that they can be transported from one nation to another - * without ambiguity. Data files are those where Kicad controls the content. + * for all KiCad data files so that they can be transported from one nation to another + * without ambiguity. Data files are those where KiCad controls the content. * This is not the same thing as filenames, which are not file content. * Filenames may be encoded on disk using an encoding chosen by the host operating - * system. Nonetheless, Kicad data file _content_ is always UTF8 encoded, regardless + * system. Nonetheless, KiCad data file _content_ is always UTF8 encoded, regardless * of host operating system. * STR_UTF is UTF8 encoded, by definition. */