diff --git a/bitmaps/annotate_down_right.xpm b/bitmaps/annotate_down_right.xpm
index f5dfe6bb23..500ea17447 100644
--- a/bitmaps/annotate_down_right.xpm
+++ b/bitmaps/annotate_down_right.xpm
@@ -1,43 +1,38 @@
/* XPM */
-#ifndef XPMMAIN
-extern const char *annotate_down_right_xpm[];
-
-#else
const char *annotate_down_right_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
-"@ c #89B09C",
-"O c #DB8F8F",
-". c #D4B7B7",
-"# c #85A794",
-"& c #72CAA2",
-"% c #9EB5A9",
-"- c #59CD99",
-"o c #E48080",
-"+ c #DC9897",
-" c none",
-"X c #D6A1A0",
-": c #E46264",
-"= c #64F6B4",
-"$ c #B4BEBC",
-"; c #69E5A9",
-"* c #81B79F",
+"= c #9A524C",
+": c #405814",
+"O c #932722",
+". c #BAA7A6",
+"X c #549454",
+"+ c #7C210E",
+" c None",
+"$ c #8C0505",
+"- c #AE7879",
+"@ c #097409",
+"* c #867258",
+"& c #308430",
+"# c #783820",
+"; c #9E3838",
+"% c #403F04",
+"o c #7FA57F",
/* pixels */
-" ",
-" ",
-" .X o. ",
-" .O +o. ",
-" .X O.X. ",
-" .O X. O. ",
-" @# $%%+. #% ",
-" && *=* $&&$",
-"@&-# %;*@ #;-@",
-" @@ .O% $ #@ ",
-" .X O. X. ",
-" .O O O. ",
-" .+O. X. ",
-" .: O. ",
-" $ ",
-" "
+" .X. oX ",
+"O+@#O .@@o ",
+"O$%$$ &@@o ",
+"*$$$= &@@@o ",
+".$$$. -#%&&@o ",
+" +$#.-;$$$+.X@o ",
+" *+*O$$$$$= X@o ",
+" o@X-=*:$$. X@o ",
+" o@X .@%$= $#@O;",
+" o@X &@$$. $$%$O",
+" o@X&@&$; =$$$-",
+" o@@@& -$$$ ",
+" X@@@. $$= ",
+" X@@o :+o ",
+" o@o X@o ",
+" o&. "
};
-#endif
diff --git a/bitmaps/annotate_right_down.xpm b/bitmaps/annotate_right_down.xpm
index 380033f304..d4b70c1f94 100644
--- a/bitmaps/annotate_right_down.xpm
+++ b/bitmaps/annotate_right_down.xpm
@@ -1,43 +1,38 @@
/* XPM */
-#ifndef XPMMAIN
-extern const char *annotate_right_down_xpm[];
-
-#else
const char *annotate_right_down_xpm[] = {
-/* columns rows colors const chars-per-pixel */
+/* columns rows colors chars-per-pixel */
"16 16 16 1",
-"@ c #59CE99",
-"% c #D79E9C",
-"$ c #DC9393",
-"o c #FFB4B4",
-"* c #74CAA2",
-"X c #FFBDBD",
-". c #89AF9A",
-" c none",
-"- c #E46264",
-"# c #FFAAAC",
-"; c #64F6B4",
-"& c #84A794",
-"= c #69E5A9",
-": c #E08280",
-"O c #9BB5A5",
-"+ c #81B79F",
+"o c #A25451",
+"+ c #88A887",
+"* c #424004",
+"% c #308530",
+"@ c #8B0405",
+"# c #7C563C",
+" c None",
+"- c #B18B8C",
+"O c #BAA6A6",
+"X c #8E1C17",
+"$ c #549354",
+"; c #74381C",
+"& c #067205",
+". c #993F3B",
+"= c #748157",
+": c #AC7474",
/* pixels */
-" . ",
-" XoooO+@Ooooo ",
-" #$%$&*=&%$%-X ",
-" X& X$ ",
-" X$o ",
-" $ ",
-" X O$o ",
-" O+=+ ",
-" O;@X ",
-" %.OX ",
-" %X ",
-" $o ",
-" $X X& ",
-" ::%$&*=.%$%$ ",
-" oooo.@@.oooo ",
-" . "
+" .XoO ",
+"+X@@@X#$$$$$$$+ ",
+"%&*@@@@&&&&&&&% ",
+"O#@@@X=+++$&&&O ",
+" X@.O O&&%O ",
+" O o@O+&&% ",
+" @@=&&$ ",
+" -@X&&= ",
+" o@**X@o ",
+" O@@@@@X- ",
+" +&@@@.- ",
+" +&&;oO X@.: ",
+"$&&&%%%%;@@@@;%+",
+"%&&&&&&&&*@@@@&%",
+" +++++++;@@@#++ ",
+" .X: "
};
-#endif
diff --git a/bitmaps/sources/annotate_down_right.svg b/bitmaps/sources/annotate_down_right.svg
new file mode 100644
index 0000000000..75fc4ac469
--- /dev/null
+++ b/bitmaps/sources/annotate_down_right.svg
@@ -0,0 +1,169 @@
+
+
+
+
diff --git a/bitmaps/sources/annotate_right_down.svg b/bitmaps/sources/annotate_right_down.svg
new file mode 100644
index 0000000000..1cf916c8b8
--- /dev/null
+++ b/bitmaps/sources/annotate_right_down.svg
@@ -0,0 +1,169 @@
+
+
+
+
diff --git a/common/edaappl.cpp b/common/edaappl.cpp
index a345e1a702..17aceccc96 100644
--- a/common/edaappl.cpp
+++ b/common/edaappl.cpp
@@ -680,7 +680,7 @@ bool WinEDA_App::SetLanguage( bool first_time )
delete m_Locale;
m_Locale = new wxLocale;
- if( !m_Locale->Init( m_LanguageId ) )
+ if( !m_Locale->Init( m_LanguageId, wxLOCALE_CONV_ENCODING ) )
{
wxLogDebug( wxT("This language is not supported by the system.") );
diff --git a/copyright.h b/copyright.h
index 584ebb12f3..68b8cfce73 100644
--- a/copyright.h
+++ b/copyright.h
@@ -12,8 +12,8 @@ may choose to document this corresponding work in the CHANGELOG.txt file.
/*
* This program source code file is part of KICAD, a free EDA CAD application.
*
- * Copyright (C) 1992-2010
- * Copyright (C) 1992-2010 Kicad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2011
+ * Copyright (C) 1992-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/demos/ecc83/ecc83-pp_v2-cache.lib b/demos/ecc83/ecc83-pp_v2-cache.lib
index d8352a6589..0a04156175 100644
--- a/demos/ecc83/ecc83-pp_v2-cache.lib
+++ b/demos/ecc83/ecc83-pp_v2-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3 Date: 04/12/2010 17:36:18
+EESchema-LIBRARY Version 2.3 Date: 30/12/2010 18:27:52
#
# C
#
diff --git a/demos/ecc83/ecc83-pp_v2.sch b/demos/ecc83/ecc83-pp_v2.sch
index 2759f2a800..d89a6dfc73 100644
--- a/demos/ecc83/ecc83-pp_v2.sch
+++ b/demos/ecc83/ecc83-pp_v2.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2 date 04/12/2010 17:36:18
+EESchema Schematic File Version 2 date 30/12/2010 18:27:52
LIBS:power
LIBS:device
LIBS:valves
@@ -24,12 +24,13 @@ LIBS:display
LIBS:cypress
LIBS:siliconi
LIBS:contrib
-EELAYER 23 0
+LIBS:ecc83-pp_v2-cache
+EELAYER 25 0
EELAYER END
$Descr A4 11700 8267
Sheet 1 1
Title "ECC Push-Pull"
-Date "11 dec 2006"
+Date "30 dec 2010"
Rev "0.1"
Comp ""
Comment1 ""
@@ -41,7 +42,6 @@ Wire Wire Line
6050 4450 6150 4450
Wire Wire Line
5750 3850 5750 4050
-Connection ~ 4450 4500
Wire Wire Line
4450 5400 4450 4450
Wire Wire Line
@@ -102,7 +102,7 @@ L ECC83 U1
U 3 1 48B4F266
P 9950 5700
F 0 "U1" H 10080 6010 50 0000 C CNN
-F 1 "ECC81_83" H 10300 5400 50 0000 C CNN
+F 1 "ECC83" H 10300 5400 50 0000 C CNN
F 2 "VALVE-NOVAL_P" H 10220 5300 50 0001 C CNN
3 9950 5700
1 0 0 -1
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index b4c6fc7de0..ce65ff2660 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -21,6 +21,7 @@ set(EESCHEMA_SRCS
cleanup.cpp
cmp_library_keywords.cpp
cmp_library_lexer.cpp
+ component_references_lister.cpp
controle.cpp
cross-probing.cpp
dangling_ends.cpp
diff --git a/eeschema/annotate.cpp b/eeschema/annotate.cpp
index 55001ff6af..6eb3075115 100644
--- a/eeschema/annotate.cpp
+++ b/eeschema/annotate.cpp
@@ -20,106 +20,11 @@
#include "lib_pin.h"
-static void BreakReference( std::vector< SCH_REFERENCE >& aComponentsList );
-static void ReAnnotateComponents( std::vector< SCH_REFERENCE >& aComponentsList );
-static void ComputeReferenceNumber( std::vector< SCH_REFERENCE >& aComponentsList );
-int GetLastReferenceNumber( int aObjet, std::vector< SCH_REFERENCE >& aComponentsList );
-static int ExistUnit( int aObjet, int aUnit, std::vector< SCH_REFERENCE >& aComponentList );
-
-
-/* sort function to annotate items by their position.
- * Components are sorted
- * by reference
- * if same reference: by sheet
- * if same sheet, by X pos
- * if same X pos, by Y pos
- * if same Y pos, by time stamp
- */
-static bool SortByXPosition( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 )
-{
- int ii = item1.CompareRef( item2 );
-
- if( ii == 0 )
- ii = item1.m_SheetPath.Cmp( item2.m_SheetPath );
- if( ii == 0 )
- ii = item1.m_RootCmp->m_Pos.x - item2.m_RootCmp->m_Pos.x;
- if( ii == 0 )
- ii = item1.m_RootCmp->m_Pos.y - item2.m_RootCmp->m_Pos.y;
- if( ii == 0 )
- ii = item1.m_TimeStamp - item2.m_TimeStamp;
-
- return ii < 0;
-}
-
-
-/* sort function to annotate items by their position.
- * Components are sorted
- * by reference
- * if same reference: by sheet
- * if same sheet, by Y pos
- * if same Y pos, by X pos
- * if same X pos, by time stamp
- */
-static bool SortByYPosition( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 )
-{
- int ii = item1.CompareRef( item2 );
-
- if( ii == 0 )
- ii = item1.m_SheetPath.Cmp( item2.m_SheetPath );
- if( ii == 0 )
- ii = item1.m_RootCmp->m_Pos.y - item2.m_RootCmp->m_Pos.y;
- if( ii == 0 )
- ii = item1.m_RootCmp->m_Pos.x - item2.m_RootCmp->m_Pos.x;
- if( ii == 0 )
- ii = item1.m_TimeStamp - item2.m_TimeStamp;
-
- return ii < 0;
-}
-
-
-/*****************************************************************************
- * qsort function to annotate items by value
- * Components are sorted
- * by reference
- * if same reference: by value
- * if same value: by unit number
- * if same unit number, by sheet
- * if same sheet, by time stamp
- *****************************************************************************/
-static bool SortByValue( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 )
-{
- int ii = item1.CompareRef( item2 );
-
- if( ii == 0 )
- ii = item1.CompareValue( item2 );
- if( ii == 0 )
- ii = item1.m_Unit - item2.m_Unit;
- if( ii == 0 )
- ii = item1.m_SheetPath.Cmp( item2.m_SheetPath );
- if( ii == 0 )
- ii = item1.m_RootCmp->m_Pos.x - item2.m_RootCmp->m_Pos.x;
- if( ii == 0 )
- ii = item1.m_RootCmp->m_Pos.y - item2.m_RootCmp->m_Pos.y;
- if( ii == 0 )
- ii = item1.m_TimeStamp - item2.m_TimeStamp;
-
- return ii < 0;
-}
-
-
-/*****************************************************************************
- * qsort function to annotate items by value
- * Components are sorted by time stamp
- *****************************************************************************/
-static bool SortByTimeStamp( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 )
-{
- int ii = item1.m_SheetPath.Cmp( item2.m_SheetPath );
-
- if( ii == 0 )
- ii = item1.m_TimeStamp - item2.m_TimeStamp;
-
- return ii < 0;
-}
+static void BreakReference( SCH_REFERENCE_LIST& aComponentsList );
+static void ReAnnotateComponents( SCH_REFERENCE_LIST& aComponentsList );
+static void ComputeReferenceNumber( SCH_REFERENCE_LIST& aComponentsList, bool aUseSheetNum );
+static int GetLastReferenceNumber( int aObjet,SCH_REFERENCE_LIST& aComponentsList );
+static int ExistUnit( int aObjet, int aUnit, SCH_REFERENCE_LIST& aComponentList );
/**
@@ -127,9 +32,8 @@ static bool SortByTimeStamp( const SCH_REFERENCE& item1, const SCH_REFERENCE& it
* Remove current component annotations
* @param aCurrentSheetOnly : if false: remove all annotations, else remove
* annotation relative to the current sheet only
- * @param aRedraw : true to refresh display
*/
-void SCH_EDIT_FRAME::DeleteAnnotation( bool aCurrentSheetOnly, bool aRedraw )
+void SCH_EDIT_FRAME::DeleteAnnotation( bool aCurrentSheetOnly )
{
if( aCurrentSheetOnly )
{
@@ -145,9 +49,6 @@ void SCH_EDIT_FRAME::DeleteAnnotation( bool aCurrentSheetOnly, bool aRedraw )
// Update the references for the sheet that is currently being displayed.
m_CurrentSheet->UpdateAllScreenReferences();
-
- if( aRedraw )
- DrawPanel->Refresh( true );
}
@@ -171,13 +72,13 @@ void SCH_EDIT_FRAME::DeleteAnnotation( bool aCurrentSheetOnly, bool aRedraw )
* stamps are used to handle annotation mainly in complex
* hierarchies.
*/
-void AnnotateComponents( SCH_EDIT_FRAME* parent,
+void SCH_EDIT_FRAME::AnnotateComponents(
bool annotateSchematic,
int sortOption,
bool resetAnnotation,
bool repairsTimestamps )
{
- std::vector< SCH_REFERENCE > references;
+ SCH_REFERENCE_LIST references;
wxBusyCursor dummy;
@@ -203,13 +104,13 @@ void AnnotateComponents( SCH_EDIT_FRAME* parent,
// If it is an annotation for all the components, reset previous annotation.
if( resetAnnotation )
- parent->DeleteAnnotation( !annotateSchematic, false );
+ DeleteAnnotation( !annotateSchematic );
// Update the screen date.
screens.SetDate( GenDate() );
// Set sheet number and total sheet counts.
- parent->SetSheetNumberAndCount();
+ SetSheetNumberAndCount();
/* Build component list */
if( annotateSchematic )
@@ -218,71 +119,66 @@ void AnnotateComponents( SCH_EDIT_FRAME* parent,
}
else
{
- parent->GetSheet()->GetComponents( references );
+ GetSheet()->GetComponents( references );
}
/* Break full components reference in name (prefix) and number:
* example: IC1 become IC, and 1 */
BreakReference( references );
+ bool useSheetNum = false;
switch( sortOption )
{
case 0:
- sort( references.begin(), references.end(), SortByXPosition );
+ references.SortCmpByXCoordinate();
break;
case 1:
- sort( references.begin(), references.end(), SortByYPosition );
+ useSheetNum = true;
+ references.SortCmpByXCoordinate();
break;
case 2:
- sort( references.begin(), references.end(), SortByValue );
+ references.SortCmpByYCoordinate();
+ break;
+
+ case 3:
+ useSheetNum = true;
+ references.SortCmpByYCoordinate();
+ break;
+
+ case 4:
+ references.SortComponentsByRefAndValue();
break;
}
/* Recalculate reference numbers */
- ComputeReferenceNumber( references );
+ ComputeReferenceNumber( references, useSheetNum );
ReAnnotateComponents( references );
/* Final control (just in case ... )*/
- parent->CheckAnnotate( NULL, !annotateSchematic );
- parent->OnModify();
- parent->DrawPanel->Refresh( true );
+ CheckAnnotate( NULL, !annotateSchematic );
+ OnModify();
+ DrawPanel->Refresh( true );
}
/*
* Update the reference component for the schematic project (or the current sheet)
*/
-static void ReAnnotateComponents( std::vector< SCH_REFERENCE >& aComponentList )
+static void ReAnnotateComponents( SCH_REFERENCE_LIST& aComponentList )
{
/* update the reference numbers */
- for( unsigned ii = 0; ii < aComponentList.size(); ii++ )
+ for( unsigned ii = 0; ii < aComponentList.GetCount(); ii++ )
{
-#if 0
- char* Text = aComponentList[ii].m_Reference;
- SCH_COMPONENT* component = aComponentList[ii].m_RootCmp;
-
- if( aComponentList[ii].m_NumRef < 0 )
- strcat( Text, "?" );
- else
- sprintf( Text + strlen( Text ), "%d", aComponentList[ii].m_NumRef );
-
- component->SetRef( &(aComponentList[ii].m_SheetPath), CONV_FROM_UTF8( Text ) );
-
- component->SetUnit( aComponentList[ii].m_Unit );
- component->SetUnitSelection( &aComponentList[ii].m_SheetPath,
- aComponentList[ii].m_Unit );
-#else
aComponentList[ii].Annotate();
-#endif
}
}
-void BreakReference( std::vector< SCH_REFERENCE >& aComponentsList )
+void BreakReference( SCH_REFERENCE_LIST& aComponentsList )
{
- for( unsigned ii = 0; ii < aComponentsList.size(); ii++ )
+ for( unsigned ii = 0; ii < aComponentsList.GetCount(); ii++ )
aComponentsList[ii].Split();
}
@@ -291,14 +187,14 @@ void BreakReference( std::vector< SCH_REFERENCE >& aComponentsList )
* Compute the reference number for components without reference number
* Compute .m_NumRef member
*/
-static void ComputeReferenceNumber( std::vector< SCH_REFERENCE >& aComponentsList )
+static void ComputeReferenceNumber( SCH_REFERENCE_LIST& aComponentsList, bool aUseSheetNum )
{
int LastReferenceNumber, NumberOfUnits, Unit;
/* Components with an invisible reference (power...) always are
* re-annotated. So set their .m_IsNew member to true
*/
- for( unsigned ii = 0; ii < aComponentsList.size(); ii++ )
+ for( unsigned ii = 0; ii < aComponentsList.GetCount(); ii++ )
{
if( aComponentsList[ii].GetRefStr()[0] == '#' )
{
@@ -315,7 +211,7 @@ static void ComputeReferenceNumber( std::vector< SCH_REFERENCE >& aComponentsLis
unsigned first = 0;
/* calculate the last used number for this reference prefix: */
LastReferenceNumber = GetLastReferenceNumber( first, aComponentsList );
- for( unsigned ii = 0; ii < aComponentsList.size(); ii++ )
+ for( unsigned ii = 0; ii < aComponentsList.GetCount(); ii++ )
{
if( aComponentsList[ii].m_Flag )
continue;
@@ -327,7 +223,13 @@ static void ComputeReferenceNumber( std::vector< SCH_REFERENCE >& aComponentsLis
first = ii;
LastReferenceNumber = GetLastReferenceNumber( ii, aComponentsList );
}
-
+ // when using sheet number, ensure annot number >= sheet number* 100
+ if( aUseSheetNum )
+ {
+ int min_num = aComponentsList[ii].m_SheetNum * 100;
+ if( LastReferenceNumber < min_num )
+ LastReferenceNumber = min_num;
+ }
/* Annotation of one part per package components (trivial case)*/
if( aComponentsList[ii].m_Entry->GetPartCount() <= 1 )
{
@@ -374,7 +276,7 @@ static void ComputeReferenceNumber( std::vector< SCH_REFERENCE >& aComponentsLis
/* Search a component to annotate ( same prefix, same value,
* not annotated) */
- for( unsigned jj = ii + 1; jj < aComponentsList.size(); jj++ )
+ for( unsigned jj = ii + 1; jj < aComponentsList.GetCount(); jj++ )
{
if( aComponentsList[jj].m_Flag ) // already tested
continue;
@@ -414,11 +316,11 @@ static void ComputeReferenceNumber( std::vector< SCH_REFERENCE >& aComponentsLis
* the search pattern)
* @param aComponentsList = list of items
*/
-int GetLastReferenceNumber( int aObjet, std::vector< SCH_REFERENCE >& aComponentsList )
+int GetLastReferenceNumber( int aObjet,SCH_REFERENCE_LIST& aComponentsList )
{
int LastNumber = 0;
- for( unsigned ii = 0; ii < aComponentsList.size(); ii++ )
+ for( unsigned ii = 0; ii < aComponentsList.GetCount(); ii++ )
{
/* New identifier. */
if( aComponentsList[aObjet].CompareRef( aComponentsList[ii] ) != 0 )
@@ -442,13 +344,13 @@ int GetLastReferenceNumber( int aObjet, std::vector< SCH_REFERENCE >& aComponent
* @param aComponentsList = list of items to examine
* @return index in aComponentsList if found or -1 if not found
*/
-static int ExistUnit( int aObjet, int Unit, std::vector< SCH_REFERENCE >& aComponentsList )
+static int ExistUnit( int aObjet, int Unit, SCH_REFERENCE_LIST& aComponentsList )
{
int NumRef;
NumRef = aComponentsList[aObjet].m_NumRef;
- for( unsigned ii = 0; ii < aComponentsList.size(); ii++ )
+ for( unsigned ii = 0; ii < aComponentsList.GetCount(); ii++ )
{
if( aObjet == (int) ii )
// Do not compare with itself !
@@ -496,7 +398,7 @@ int SCH_EDIT_FRAME::CheckAnnotate( wxArrayString* aMessageList, bool aOneSheetOn
/* build the screen list */
SCH_SHEET_LIST SheetList;
- std::vector< SCH_REFERENCE > ComponentsList;
+ SCH_REFERENCE_LIST ComponentsList;
/* Build the list of components */
if( !aOneSheetOnly )
@@ -504,7 +406,7 @@ int SCH_EDIT_FRAME::CheckAnnotate( wxArrayString* aMessageList, bool aOneSheetOn
else
GetSheet()->GetComponents( ComponentsList );
- sort( ComponentsList.begin(), ComponentsList.end(), SortByValue );
+ ComponentsList.SortComponentsByRefAndValue();
/* Break full components reference in name (prefix) and number: example:
* IC1 become IC, and 1 */
@@ -512,7 +414,7 @@ int SCH_EDIT_FRAME::CheckAnnotate( wxArrayString* aMessageList, bool aOneSheetOn
/* count not yet annotated items */
error = 0;
- int imax = ComponentsList.size() - 1;
+ int imax = ComponentsList.GetCount() - 1;
for( int ii = 0; ii < imax; ii++ )
{
@@ -681,7 +583,7 @@ int SCH_EDIT_FRAME::CheckAnnotate( wxArrayString* aMessageList, bool aOneSheetOn
}
// count the duplicated time stamps
- sort( ComponentsList.begin(), ComponentsList.end(), SortByTimeStamp );
+ ComponentsList.SortComponentsByTimeStamp();
for( int ii = 0; ( ii < imax ) && ( error < 4 ); ii++ )
{
diff --git a/eeschema/build_BOM.cpp b/eeschema/build_BOM.cpp
index 6b4dc0212d..5697a0e1e3 100644
--- a/eeschema/build_BOM.cpp
+++ b/eeschema/build_BOM.cpp
@@ -1,6 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: build_BOM.cpp
-// Purpose:
// Author: jean-pierre Charras
// License: GPL license
/////////////////////////////////////////////////////////////////////////////
@@ -14,29 +13,20 @@
#include "kicad_string.h"
#include "general.h"
-#include "netlist.h"
-#include "protos.h"
#include "sch_sheet.h"
#include "sch_component.h"
#include "template_fieldnames.h"
+#include "netlist.h"
-
-/**
- * @bug - Every instance of fprintf() and fputs() in this file fails to check
- * the return value for an error.
+/* Fill aList with labels
*/
-
-
-/* Fill aList with Glabel info
- */
-void GenListeGLabels( std::vector & aList )
+void GenListeGLabels( LABEL_OBJECT_LIST& aList )
{
// Build the sheet list
SCH_SHEET_LIST sheetList;
+ LABEL_OBJECT label;
- LABEL_OBJECT lable;
-
- for( SCH_SHEET_PATH* path = sheetList.GetFirst(); path; path = sheetList.GetNext() )
+ for( SCH_SHEET_PATH* path = sheetList.GetFirst(); path; path = sheetList.GetNext() )
{
SCH_ITEM* schItem = (SCH_ITEM*) path->LastDrawList();
@@ -46,22 +36,22 @@ void GenListeGLabels( std::vector & aList )
{
case SCH_HIERARCHICAL_LABEL_T:
case SCH_GLOBAL_LABEL_T:
- lable.m_LabelType = schItem->Type();
- lable.m_SheetPath = *path;
- lable.m_Label = schItem;
- aList.push_back( lable );
+ label.m_LabelType = schItem->Type();
+ label.m_SheetPath = *path;
+ label.m_Label = schItem;
+ aList.push_back( label );
break;
case SCH_SHEET_T:
{
SCH_SHEET* sheet = (SCH_SHEET*) schItem;
- BOOST_FOREACH( SCH_SHEET_PIN sheetLabel, sheet->GetSheetPins() )
+ BOOST_FOREACH( SCH_SHEET_PIN& sheetLabel, sheet->GetSheetPins() )
{
- lable.m_LabelType = SCH_SHEET_LABEL_T;
- lable.m_SheetPath = *path;
- lable.m_Label = &sheetLabel;
- aList.push_back( lable );
+ label.m_LabelType = SCH_SHEET_LABEL_T;
+ label.m_SheetPath = *path;
+ label.m_Label = &sheetLabel;
+ aList.push_back( label );
}
}
break;
@@ -75,65 +65,6 @@ void GenListeGLabels( std::vector & aList )
}
}
-
-/* Compare function for sort()
- * components are sorted
- * by value
- * if same value: by reference
- * if same reference: by unit number
- */
-bool SortComponentsByValue( const SCH_REFERENCE& obj1, const SCH_REFERENCE& obj2 )
-{
- int ii;
- const wxString* Text1, * Text2;
-
- Text1 = &( obj1.m_RootCmp->GetField( VALUE )->m_Text );
- Text2 = &( obj2.m_RootCmp->GetField( VALUE )->m_Text );
- ii = Text1->CmpNoCase( *Text2 );
-
- if( ii == 0 )
- {
- ii = RefDesStringCompare( obj1.GetRef(), obj2.GetRef() );
- }
-
- if( ii == 0 )
- {
- ii = obj1.m_Unit - obj2.m_Unit;
- }
-
- return ii < 0;
-}
-
-
-/* compare function for sorting
- * components are sorted
- * by reference
- * if same reference: by value
- * if same value: by unit number
- */
-bool SortComponentsByReference( const SCH_REFERENCE& obj1, const SCH_REFERENCE& obj2 )
-{
- int ii;
- const wxString* Text1, * Text2;
-
- ii = RefDesStringCompare( obj1.GetRef(), obj2.GetRef() );
-
- if( ii == 0 )
- {
- Text1 = &( obj1.m_RootCmp->GetField( VALUE )->m_Text );
- Text2 = &( obj2.m_RootCmp->GetField( VALUE )->m_Text );
- ii = Text1->CmpNoCase( *Text2 );
- }
-
- if( ii == 0 )
- {
- ii = obj1.m_Unit - obj2.m_Unit;
- }
-
- return ii < 0;
-}
-
-
/* compare function for sorting labels
* sort by
* value
@@ -195,43 +126,10 @@ bool SortLabelsBySheet( const LABEL_OBJECT& obj1, const LABEL_OBJECT& obj2 )
}
-/* Remove sub components from the list, when multiples parts per package are
- * found in this list
- * The component list **MUST** be sorted by reference and by unit number
- */
-void DeleteSubCmp( std::vector< SCH_REFERENCE >& aList )
+int PrintListeGLabel( FILE* f, LABEL_OBJECT_LIST& aList )
{
- SCH_COMPONENT* libItem;
- wxString oldName;
- wxString currName;
-
-
- for( unsigned ii = 0; ii < aList.size(); ii++ )
- {
- libItem = aList[ii].m_RootCmp;
-
- if( libItem == NULL )
- continue;
-
- currName = aList[ii].GetRef();
-
- if( !oldName.IsEmpty() )
- {
- if( oldName == currName ) // currName is a subpart of oldName: remove it
- {
- aList.erase( aList.begin() + ii );
- ii--;
- }
- }
- oldName = currName;
- }
-}
-
-
-int PrintListeGLabel( FILE* f, std::vector & aList )
-{
- SCH_LABEL* DrawTextItem;
- SCH_SHEET_PIN* DrawSheetLabel;
+ SCH_LABEL* label;
+ SCH_SHEET_PIN* pinsheet;
wxString msg, sheetpath;
wxString labeltype;
@@ -241,7 +139,7 @@ int PrintListeGLabel( FILE* f, std::vector & aList )
{
case SCH_HIERARCHICAL_LABEL_T:
case SCH_GLOBAL_LABEL_T:
- DrawTextItem = (SCH_LABEL*)(aList[ii].m_Label);
+ label = (SCH_LABEL*)(aList[ii].m_Label);
if( aList[ii].m_LabelType == SCH_HIERARCHICAL_LABEL_T )
labeltype = wxT( "Hierarchical" );
@@ -250,19 +148,19 @@ int PrintListeGLabel( FILE* f, std::vector & aList )
sheetpath = aList[ii].m_SheetPath.PathHumanReadable();
msg.Printf( _( "> %-28.28s %s (Sheet %s) pos: %3.3f, %3.3f\n" ),
- GetChars( DrawTextItem->m_Text ),
+ GetChars( label->m_Text ),
GetChars( labeltype ),
GetChars( sheetpath ),
- (float) DrawTextItem->m_Pos.x / 1000,
- (float) DrawTextItem->m_Pos.y / 1000 );
+ (float) label->m_Pos.x / 1000,
+ (float) label->m_Pos.y / 1000 );
fputs( CONV_TO_UTF8( msg ), f );
break;
case SCH_SHEET_LABEL_T:
{
- DrawSheetLabel = (SCH_SHEET_PIN*) aList[ii].m_Label;
- int jj = DrawSheetLabel->m_Shape;
+ pinsheet = (SCH_SHEET_PIN*) aList[ii].m_Label;
+ int jj = pinsheet->m_Shape;
if( jj < 0 )
jj = NET_TMAX;
@@ -273,11 +171,11 @@ int PrintListeGLabel( FILE* f, std::vector & aList )
wxString labtype = CONV_FROM_UTF8( SheetLabelType[jj] );
msg.Printf( _( "> %-28.28s PinSheet %-7.7s (Sheet %s) pos: %3.3f, %3.3f\n" ),
- GetChars( DrawSheetLabel->m_Text ),
+ GetChars( pinsheet->m_Text ),
GetChars( labtype ),
GetChars( aList[ii].m_SheetPath.PathHumanReadable() ),
- (float) DrawSheetLabel->m_Pos.x / 1000,
- (float) DrawSheetLabel->m_Pos.y / 1000 );
+ (float) pinsheet->m_Pos.x / 1000,
+ (float) pinsheet->m_Pos.y / 1000 );
fputs( CONV_TO_UTF8( msg ), f );
}
diff --git a/eeschema/class_libentry.cpp b/eeschema/class_libentry.cpp
index 60209c5cb2..4b96809279 100644
--- a/eeschema/class_libentry.cpp
+++ b/eeschema/class_libentry.cpp
@@ -253,7 +253,7 @@ wxString LIB_COMPONENT::GetLibraryName()
/**
- * Function IsMulti
+ * Function ReturnSubReference
* @return the sub reference for component having multiple parts per package.
* The sub reference identify the part (or unit)
* @param aUnit = the part identifier ( 1 to 26)
diff --git a/eeschema/class_libentry.h b/eeschema/class_libentry.h
index 48d76ec621..ad80c0e762 100644
--- a/eeschema/class_libentry.h
+++ b/eeschema/class_libentry.h
@@ -545,7 +545,7 @@ public:
bool IsMulti() { return m_unitCount > 1; }
/**
- * Function IsMulti
+ * Function ReturnSubReference
* @return the sub reference for component having multiple parts per package.
* The sub reference identify the part (or unit)
* @param aUnit = the part identifier ( 1 to max count)
diff --git a/eeschema/component_references_lister.cpp b/eeschema/component_references_lister.cpp
new file mode 100644
index 0000000000..2dd187dd00
--- /dev/null
+++ b/eeschema/component_references_lister.cpp
@@ -0,0 +1,328 @@
+/*
+ * component_references_lister.cpp: creates a flat list of components.
+ * Needed for annotation and BOM.
+ */
+
+/*
+ * This program source code file is part of KICAD, a free EDA CAD application.
+ *
+ * Copyright (C) 1992-2011 jean-pierre Charras
+ * Copyright (C) 1992-2011 Wayne Stambaugh
+ * Copyright (C) 1992-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
+ * 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 // to use sort vector
+#include
+
+#include "fctsys.h"
+#include "common.h"
+#include "kicad_string.h"
+#include "wxEeschemaStruct.h"
+#include "wxstruct.h"
+#include "netlist.h"
+#include "class_sch_screen.h"
+#include "sch_component.h"
+
+
+
+/* sort function to annotate items from their position.
+ * Components are sorted
+ * by reference
+ * if same reference: by sheet
+ * if same sheet, by X pos
+ * if same X pos, by Y pos
+ * if same Y pos, by time stamp
+ */
+bool SCH_REFERENCE_LIST::sortBy_X_Position( const SCH_REFERENCE& item1,
+ const SCH_REFERENCE& item2 )
+{
+ int ii = item1.CompareRef( item2 );
+
+ if( ii == 0 )
+ ii = item1.m_SheetNum - item2.m_SheetNum;
+ if( ii == 0 )
+ ii = item1.m_CmpPos.x - item2.m_CmpPos.x;
+ if( ii == 0 )
+ ii = item1.m_CmpPos.y - item2.m_CmpPos.y;
+ if( ii == 0 )
+ ii = item1.m_TimeStamp - item2.m_TimeStamp;
+
+ return ii < 0;
+}
+
+
+/* sort function to annotate items by their position.
+ * Components are sorted
+ * by reference
+ * if same reference: by sheet
+ * if same sheet, by Y pos
+ * if same Y pos, by X pos
+ * if same X pos, by time stamp
+ */
+bool SCH_REFERENCE_LIST::sortBy_Y_Position( const SCH_REFERENCE& item1,
+ const SCH_REFERENCE& item2 )
+{
+ int ii = item1.CompareRef( item2 );
+
+ if( ii == 0 )
+ ii = item1.m_SheetNum - item2.m_SheetNum;
+ if( ii == 0 )
+ ii = item1.m_CmpPos.y - item2.m_CmpPos.y;
+ if( ii == 0 )
+ ii = item1.m_CmpPos.x - item2.m_CmpPos.x;
+ if( ii == 0 )
+ ii = item1.m_TimeStamp - item2.m_TimeStamp;
+
+ return ii < 0;
+}
+
+/*
+ * sort function to annotate items by value
+ * Components are sorted
+ * by reference
+ * if same reference: by value
+ * if same value: by unit number
+ * if same unit number, by sheet
+ * if same sheet, by position X, and Y
+ */
+bool SCH_REFERENCE_LIST::sortByRefAndValue( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 )
+{
+ int ii = item1.CompareRef( item2 );
+ if( ii == 0 )
+ ii = item1.CompareValue( item2 );
+ if( ii == 0 )
+ ii = item1.m_Unit - item2.m_Unit;
+ if( ii == 0 )
+ ii = item1.m_SheetNum - item2.m_SheetNum;
+ if( ii == 0 )
+ ii = item1.m_CmpPos.x - item2.m_CmpPos.x;
+ if( ii == 0 )
+ ii = item1.m_CmpPos.y - item2.m_CmpPos.y;
+ if( ii == 0 )
+ ii = item1.m_TimeStamp - item2.m_TimeStamp;
+
+ return ii < 0;
+}
+
+/* sort function for for list by values
+ * components are sorted
+ * by value
+ * if same value: by reference
+ * if same reference: by unit number
+ */
+bool SCH_REFERENCE_LIST::sortComponentsByValueOnly( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 )
+{
+ int ii;
+ const wxString* Text1, * Text2;
+
+ Text1 = &( item1.m_RootCmp->GetField( VALUE )->m_Text );
+ Text2 = &( item2.m_RootCmp->GetField( VALUE )->m_Text );
+ ii = Text1->CmpNoCase( *Text2 );
+
+ if( ii == 0 )
+ {
+ ii = RefDesStringCompare( item1.GetRef(), item2.GetRef() );
+ }
+
+ if( ii == 0 )
+ {
+ ii = item1.m_Unit - item2.m_Unit;
+ }
+
+ return ii < 0;
+}
+
+/**
+ * Function sortComponentsByReferenceOnly
+ * compare function for sorting in BOM creation.
+ * components are sorted
+ * by reference
+ * if same reference: by value
+ * if same value: by unit number
+ */
+bool SCH_REFERENCE_LIST::sortComponentsByReferenceOnly( const SCH_REFERENCE& item1,
+ const SCH_REFERENCE& item2 )
+{
+ int ii;
+ const wxString* Text1, * Text2;
+
+ ii = RefDesStringCompare( item1.GetRef(), item2.GetRef() );
+
+ if( ii == 0 )
+ {
+ Text1 = &( item1.m_RootCmp->GetField( VALUE )->m_Text );
+ Text2 = &( item2.m_RootCmp->GetField( VALUE )->m_Text );
+ ii = Text1->CmpNoCase( *Text2 );
+ }
+
+ if( ii == 0 )
+ {
+ ii = item1.m_Unit - item2.m_Unit;
+ }
+
+ return ii < 0;
+}
+
+
+/*****************************************************************************
+ * qsort function to annotate items by value
+ * Components are sorted by time stamp
+ *****************************************************************************/
+bool SCH_REFERENCE_LIST::sortByTimeStamp( const SCH_REFERENCE& item1,
+ const SCH_REFERENCE& item2 )
+{
+ int ii = item1.m_SheetPath.Cmp( item2.m_SheetPath );
+
+ if( ii == 0 )
+ ii = item1.m_TimeStamp - item2.m_TimeStamp;
+
+ return ii < 0;
+}
+
+
+/* Remove sub components from the list, when multiples parts per package are
+ * found in this list
+ */
+void SCH_REFERENCE_LIST::RemoveSubComponentsFromList( )
+{
+ SCH_COMPONENT* libItem;
+ wxString oldName;
+ wxString currName;
+
+ // The component list **MUST** be sorted by reference and by unit number
+ // in order to find all parts of a component
+ SortComponentsByReferenceOnly();
+ for( unsigned ii = 0; ii < componentFlatList.size(); ii++ )
+ {
+ libItem = componentFlatList[ii].m_RootCmp;
+ if( libItem == NULL )
+ continue;
+
+ currName = componentFlatList[ii].GetRef();
+
+ if( !oldName.IsEmpty() )
+ {
+ if( oldName == currName ) // currName is a subpart of oldName:
+ // remove it
+ {
+ componentFlatList.erase( componentFlatList.begin() + ii );
+ ii--;
+ }
+ }
+ oldName = currName;
+ }
+}
+
+
+
+SCH_REFERENCE::SCH_REFERENCE( SCH_COMPONENT* aComponent, LIB_COMPONENT* aLibComponent,
+ SCH_SHEET_PATH& aSheetPath )
+{
+ wxASSERT( aComponent != NULL && aLibComponent != NULL );
+
+ m_RootCmp = aComponent;
+ m_Entry = aLibComponent;
+ m_Unit = aComponent->GetUnitSelection( &aSheetPath );
+ m_SheetPath = aSheetPath;
+ m_IsNew = false;
+ m_Flag = 0;
+ m_TimeStamp = aComponent->m_TimeStamp;
+ m_CmpPos = aComponent->m_Pos;
+ m_SheetNum = 0;
+
+ if( aComponent->GetRef( &aSheetPath ).IsEmpty() )
+ aComponent->SetRef( &aSheetPath, wxT( "DefRef?" ) );
+
+ SetRef( aComponent->GetRef( &aSheetPath ) );
+
+ m_NumRef = -1;
+
+ if( aComponent->GetField( VALUE )->GetText().IsEmpty() )
+ aComponent->GetField( VALUE )->SetText( wxT( "~" ) );
+
+ m_Value = &aComponent->GetField( VALUE )->m_Text;
+}
+
+
+void SCH_REFERENCE::Annotate()
+{
+ if( m_NumRef < 0 )
+ m_Ref += wxChar( '?' );
+ else
+ m_Ref = CONV_TO_UTF8( GetRef() << m_NumRef );
+
+ m_RootCmp->SetRef( &m_SheetPath, CONV_FROM_UTF8( m_Ref.c_str() ) );
+ m_RootCmp->SetUnit( m_Unit );
+ m_RootCmp->SetUnitSelection( &m_SheetPath, m_Unit );
+}
+
+
+void SCH_REFERENCE::Split()
+{
+ std::string refText = GetRefStr();
+
+ m_NumRef = -1;
+
+ int ll = refText.length() - 1;
+
+ if( refText[ll] == '?' )
+ {
+ m_IsNew = true;
+
+ if( !IsPartsLocked() )
+ m_Unit = 0x7FFFFFFF;
+
+ refText.erase( ll ); // delete last char
+
+ SetRefStr( refText );
+ }
+ else if( isdigit( refText[ll] ) == 0 )
+ {
+ m_IsNew = true;
+
+ if( !IsPartsLocked() )
+ m_Unit = 0x7FFFFFFF;
+ }
+ else
+ {
+ while( ll >= 0 )
+ {
+ if( (refText[ll] <= ' ' ) || isdigit( refText[ll] ) )
+ ll--;
+ else
+ {
+ if( isdigit( refText[ll + 1] ) )
+ {
+ // null terminated C string into cp
+ const char* cp = refText.c_str() + ll + 1;
+
+ m_NumRef = atoi( cp );
+ }
+
+ refText.erase( ll+1 ); // delete from ll+1 to end
+ break;
+ }
+ }
+
+ SetRefStr( refText );
+ }
+}
+
diff --git a/eeschema/dialogs/annotate_dialog.cpp b/eeschema/dialogs/annotate_dialog.cpp
index 150ac05a6e..a7e5d5ffcd 100644
--- a/eeschema/dialogs/annotate_dialog.cpp
+++ b/eeschema/dialogs/annotate_dialog.cpp
@@ -9,17 +9,12 @@
#include "bitmaps.h"
#include "common.h"
#include "wxEeschemaStruct.h"
+#include "class_drawpanel.h"
#include "annotate_dialog.h"
#define KEY_ANNOTATE_SORT_OPTION wxT("AnnotateSortOption")
-extern void AnnotateComponents( SCH_EDIT_FRAME* parent,
- bool annotateSchematic,
- int sortOption,
- bool resetAnnotation,
- bool repairsTimestamps );
-
DIALOG_ANNOTATE::DIALOG_ANNOTATE( SCH_EDIT_FRAME* parent )
: DIALOG_ANNOTATE_BASE( parent )
@@ -44,29 +39,35 @@ void DIALOG_ANNOTATE::InitValues()
m_Config->Read(KEY_ANNOTATE_SORT_OPTION, &option, 0l);
switch( option )
{
+ default:
case 0:
m_rbSortBy_X_Position->SetValue(1);
break;
-
case 1:
+ m_rbSortBy_X_Position_and_useSheet->SetValue(1);
+ break;
+
+ case 2:
m_rbSortBy_Y_Position->SetValue(1);
break;
-
- case 2:
- rbSortByValue->SetValue(1);
+ case 3:
+ m_rbSortBy_Y_Position_and_useSheet->SetValue(1);
break;
- default:
+ case 4:
+ rbSortByValue->SetValue(1);
break;
}
}
wxBitmap bitmap0(annotate_down_right_xpm);
annotate_down_right_bitmap->SetBitmap(bitmap0);
+ annotate_down_right_bitmap1->SetBitmap(bitmap0);
wxBitmap bitmap1(annotate_right_down_xpm);
annotate_right_down_bitmap->SetBitmap(bitmap1);
+ annotate_right_down_bitmap1->SetBitmap(bitmap1);
wxBitmap bitmap2(add_text_xpm);
annotate_by_value_bitmap->SetBitmap(bitmap2);
@@ -97,7 +98,9 @@ void DIALOG_ANNOTATE::OnApplyClick( wxCommandEvent& event )
response = wxMessageBox( message, wxT( "" ), wxICON_EXCLAMATION | wxOK | wxCANCEL );
if (response == wxCANCEL)
return;
- AnnotateComponents( m_Parent, GetLevel(), GetSortOrder(), GetResetItems() , true );
+ m_Parent->AnnotateComponents( GetLevel(), GetSortOrder(), GetResetItems() , true );
+ m_Parent->DrawPanel->Refresh();
+
m_btnClear->Enable();
}
@@ -119,7 +122,9 @@ void DIALOG_ANNOTATE::OnClearAnnotationCmpClick( wxCommandEvent& event )
wxICON_EXCLAMATION | wxOK | wxCANCEL );
if (response == wxCANCEL)
return;
- m_Parent->DeleteAnnotation( GetLevel() ? false : true, true );
+ m_Parent->DeleteAnnotation( GetLevel() ? false : true );
+ m_Parent->DrawPanel->Refresh();
+
m_btnClear->Enable(false);
}
@@ -157,14 +162,20 @@ int DIALOG_ANNOTATE::GetSortOrder( void )
/****************************************/
/**
* @return 0 if annotation by X position,
- * 1 if annotation by Y position
- * 2 if annotation by value
+ * 1 if annotation by X position and use sheet number,
+ * 2 if annotation by Y position,
+ * 3 if annotation by Y position and use sheet number,
+ * 4 if annotation by value
*/
{
if ( m_rbSortBy_X_Position->GetValue() )
return 0;
- if ( m_rbSortBy_Y_Position->GetValue() )
+ if ( m_rbSortBy_X_Position_and_useSheet->GetValue() )
return 1;
- return 2;
+ if ( m_rbSortBy_Y_Position->GetValue() )
+ return 2;
+ if ( m_rbSortBy_Y_Position_and_useSheet->GetValue() )
+ return 3;
+ return 4;
}
diff --git a/eeschema/dialogs/dialog_annotate_base.cpp b/eeschema/dialogs/dialog_annotate_base.cpp
index 070135122c..03275232d3 100644
--- a/eeschema/dialogs/dialog_annotate_base.cpp
+++ b/eeschema/dialogs/dialog_annotate_base.cpp
@@ -1,139 +1,167 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 21 2008)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include "dialog_annotate_base.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
-{
- this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
- wxBoxSizer* bmainSizer;
- bmainSizer = new wxBoxSizer( wxVERTICAL );
-
- wxBoxSizer* bupperSizer;
- bupperSizer = new wxBoxSizer( wxVERTICAL );
-
- m_staticTextScope = new wxStaticText( this, wxID_ANY, _("Scope"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticTextScope->Wrap( -1 );
- m_staticTextScope->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-
- bupperSizer->Add( m_staticTextScope, 0, wxALL, 6 );
-
- wxBoxSizer* bscopeOptSizer;
- bscopeOptSizer = new wxBoxSizer( wxVERTICAL );
-
- m_rbEntireSchematic = new wxRadioButton( this, ID_ENTIRE_SCHEMATIC, _("Use the &entire schematic"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
- bscopeOptSizer->Add( m_rbEntireSchematic, 0, wxALL, 3 );
-
- m_rbCurrPage = new wxRadioButton( this, ID_CURRENT_PAGE, _("Use the current &page only"), wxDefaultPosition, wxDefaultSize, 0 );
- bscopeOptSizer->Add( m_rbCurrPage, 0, wxALL, 3 );
-
- m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
- bscopeOptSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
-
- m_rbKeepAnnotation = new wxRadioButton( this, ID_KEEP_ANNOTATION, _("&Keep existing annotation"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
- bscopeOptSizer->Add( m_rbKeepAnnotation, 0, wxALL, 3 );
-
- m_rbResetAnnotation = new wxRadioButton( this, ID_RESET_ANNOTATION, _("&Reset existing annotation"), wxDefaultPosition, wxDefaultSize, 0 );
- bscopeOptSizer->Add( m_rbResetAnnotation, 0, wxALL, 3 );
-
- bupperSizer->Add( bscopeOptSizer, 0, wxEXPAND|wxLEFT|wxALIGN_RIGHT, 25 );
-
- m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
- bupperSizer->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 );
-
- m_staticTextOrder = new wxStaticText( this, wxID_ANY, _("Annotation Order"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticTextOrder->Wrap( -1 );
- m_staticTextOrder->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-
- bupperSizer->Add( m_staticTextOrder, 0, wxALL, 6 );
-
- wxBoxSizer* b_orderOptSizer;
- b_orderOptSizer = new wxBoxSizer( wxVERTICAL );
-
- wxBoxSizer* bSizerXpos;
- bSizerXpos = new wxBoxSizer( wxHORIZONTAL );
-
- m_rbSortBy_X_Position = new wxRadioButton( this, ID_SORT_BY_X_POSITION, _("Sort Components by &X Position"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
- bSizerXpos->Add( m_rbSortBy_X_Position, 0, wxALL, 3 );
-
-
- bSizerXpos->Add( 0, 0, 1, wxEXPAND, 5 );
-
- annotate_down_right_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
- bSizerXpos->Add( annotate_down_right_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 12 );
-
- b_orderOptSizer->Add( bSizerXpos, 0, wxEXPAND|wxRIGHT, 5 );
-
- wxBoxSizer* bSizerYpos;
- bSizerYpos = new wxBoxSizer( wxHORIZONTAL );
-
- m_rbSortBy_Y_Position = new wxRadioButton( this, ID_SORT_BY_Y_POSITION, _("Sort Components by &Y Position"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizerYpos->Add( m_rbSortBy_Y_Position, 0, wxALL, 3 );
-
-
- bSizerYpos->Add( 0, 0, 1, wxEXPAND, 5 );
-
- annotate_right_down_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
- bSizerYpos->Add( annotate_right_down_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 12 );
-
- b_orderOptSizer->Add( bSizerYpos, 0, wxEXPAND|wxRIGHT, 5 );
-
- wxBoxSizer* bSizerValuepos;
- bSizerValuepos = new wxBoxSizer( wxHORIZONTAL );
-
- rbSortByValue = new wxRadioButton( this, ID_SORT_BY_VALUE, _("Sort Components by &Value"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizerValuepos->Add( rbSortByValue, 0, wxALL, 3 );
-
-
- bSizerValuepos->Add( 0, 0, 1, wxEXPAND, 5 );
-
- annotate_by_value_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
- bSizerValuepos->Add( annotate_by_value_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 12 );
-
- b_orderOptSizer->Add( bSizerValuepos, 0, wxEXPAND|wxRIGHT, 5 );
-
- bupperSizer->Add( b_orderOptSizer, 1, wxEXPAND|wxLEFT, 25 );
-
- m_staticline5 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
- bupperSizer->Add( m_staticline5, 0, wxEXPAND | wxALL, 5 );
-
- wxBoxSizer* bButtonsSizer;
- bButtonsSizer = new wxBoxSizer( wxHORIZONTAL );
-
- m_btnClose = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
- bButtonsSizer->Add( m_btnClose, 0, wxALL|wxEXPAND, 5 );
-
- m_btnClear = new wxButton( this, ID_CLEAR_ANNOTATION_CMP, _("Clear Annotation"), wxDefaultPosition, wxDefaultSize, 0 );
- bButtonsSizer->Add( m_btnClear, 0, wxALL|wxEXPAND, 5 );
-
- m_btnApply = new wxButton( this, wxID_APPLY, _("Annotation"), wxDefaultPosition, wxDefaultSize, 0 );
- bButtonsSizer->Add( m_btnApply, 0, wxALL|wxEXPAND, 5 );
-
- bupperSizer->Add( bButtonsSizer, 0, wxALIGN_CENTER_HORIZONTAL, 6 );
-
- bmainSizer->Add( bupperSizer, 1, wxALL|wxEXPAND, 6 );
-
- this->SetSizer( bmainSizer );
- this->Layout();
- bmainSizer->Fit( this );
-
- // Connect Events
- m_btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnCancelClick ), NULL, this );
- m_btnClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnClearAnnotationCmpClick ), NULL, this );
- m_btnApply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnApplyClick ), NULL, this );
-}
-
-DIALOG_ANNOTATE_BASE::~DIALOG_ANNOTATE_BASE()
-{
- // Disconnect Events
- m_btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnCancelClick ), NULL, this );
- m_btnClear->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnClearAnnotationCmpClick ), NULL, this );
- m_btnApply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnApplyClick ), NULL, this );
-}
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Sep 8 2010)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_annotate_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+{
+ this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+ wxBoxSizer* bmainSizer;
+ bmainSizer = new wxBoxSizer( wxVERTICAL );
+
+ wxBoxSizer* bupperSizer;
+ bupperSizer = new wxBoxSizer( wxVERTICAL );
+
+ m_staticTextScope = new wxStaticText( this, wxID_ANY, _("Scope"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextScope->Wrap( -1 );
+ m_staticTextScope->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+ bupperSizer->Add( m_staticTextScope, 0, wxALL, 6 );
+
+ wxBoxSizer* bscopeOptSizer;
+ bscopeOptSizer = new wxBoxSizer( wxVERTICAL );
+
+ m_rbEntireSchematic = new wxRadioButton( this, ID_ENTIRE_SCHEMATIC, _("Use the &entire schematic"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+ bscopeOptSizer->Add( m_rbEntireSchematic, 0, wxALL, 3 );
+
+ m_rbCurrPage = new wxRadioButton( this, ID_CURRENT_PAGE, _("Use the current &page only"), wxDefaultPosition, wxDefaultSize, 0 );
+ bscopeOptSizer->Add( m_rbCurrPage, 0, wxALL, 3 );
+
+ m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+ bscopeOptSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
+
+ m_rbKeepAnnotation = new wxRadioButton( this, ID_KEEP_ANNOTATION, _("&Keep existing annotation"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+ bscopeOptSizer->Add( m_rbKeepAnnotation, 0, wxALL, 3 );
+
+ m_rbResetAnnotation = new wxRadioButton( this, ID_RESET_ANNOTATION, _("&Reset existing annotation"), wxDefaultPosition, wxDefaultSize, 0 );
+ bscopeOptSizer->Add( m_rbResetAnnotation, 0, wxALL, 3 );
+
+ bupperSizer->Add( bscopeOptSizer, 0, wxEXPAND|wxLEFT|wxALIGN_RIGHT, 25 );
+
+ m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+ bupperSizer->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 );
+
+ m_staticTextOrder = new wxStaticText( this, wxID_ANY, _("Annotation Order"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextOrder->Wrap( -1 );
+ m_staticTextOrder->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+ bupperSizer->Add( m_staticTextOrder, 0, wxALL, 6 );
+
+ wxBoxSizer* b_orderOptSizer;
+ b_orderOptSizer = new wxBoxSizer( wxVERTICAL );
+
+ wxBoxSizer* bSizerXpos;
+ bSizerXpos = new wxBoxSizer( wxHORIZONTAL );
+
+ m_rbSortBy_X_Position = new wxRadioButton( this, ID_SORT_BY_X_POSITION, _("Sort components by &X position"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+ bSizerXpos->Add( m_rbSortBy_X_Position, 0, wxALL, 3 );
+
+
+ bSizerXpos->Add( 0, 0, 1, wxEXPAND, 5 );
+
+ annotate_down_right_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+ bSizerXpos->Add( annotate_down_right_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 12 );
+
+ b_orderOptSizer->Add( bSizerXpos, 0, wxEXPAND|wxRIGHT, 5 );
+
+ wxBoxSizer* bSizerXpos_and_use_sheet;
+ bSizerXpos_and_use_sheet = new wxBoxSizer( wxHORIZONTAL );
+
+ m_rbSortBy_X_Position_and_useSheet = new wxRadioButton( this, wxID_ANY, _("Sort components by X position and use sheet &number"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizerXpos_and_use_sheet->Add( m_rbSortBy_X_Position_and_useSheet, 0, wxALL, 3 );
+
+
+ bSizerXpos_and_use_sheet->Add( 0, 0, 1, wxEXPAND, 5 );
+
+ annotate_down_right_bitmap1 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+ bSizerXpos_and_use_sheet->Add( annotate_down_right_bitmap1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 12 );
+
+ b_orderOptSizer->Add( bSizerXpos_and_use_sheet, 0, wxEXPAND|wxRIGHT, 5 );
+
+ wxBoxSizer* bSizerYpos;
+ bSizerYpos = new wxBoxSizer( wxHORIZONTAL );
+
+ m_rbSortBy_Y_Position = new wxRadioButton( this, ID_SORT_BY_Y_POSITION, _("Sort components by &Y position"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizerYpos->Add( m_rbSortBy_Y_Position, 0, wxALL, 3 );
+
+
+ bSizerYpos->Add( 0, 0, 1, wxEXPAND, 5 );
+
+ annotate_right_down_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+ bSizerYpos->Add( annotate_right_down_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 12 );
+
+ b_orderOptSizer->Add( bSizerYpos, 0, wxEXPAND|wxRIGHT, 5 );
+
+ wxBoxSizer* bSizerYpos_and_useSheet;
+ bSizerYpos_and_useSheet = new wxBoxSizer( wxHORIZONTAL );
+
+ m_rbSortBy_Y_Position_and_useSheet = new wxRadioButton( this, wxID_ANY, _("Sort components by Y position and use &sheet number"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizerYpos_and_useSheet->Add( m_rbSortBy_Y_Position_and_useSheet, 0, wxALL, 3 );
+
+
+ bSizerYpos_and_useSheet->Add( 0, 0, 1, wxEXPAND, 5 );
+
+ annotate_right_down_bitmap1 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+ bSizerYpos_and_useSheet->Add( annotate_right_down_bitmap1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 12 );
+
+ b_orderOptSizer->Add( bSizerYpos_and_useSheet, 0, wxEXPAND|wxRIGHT, 5 );
+
+ wxBoxSizer* bSizerValuepos;
+ bSizerValuepos = new wxBoxSizer( wxHORIZONTAL );
+
+ rbSortByValue = new wxRadioButton( this, ID_SORT_BY_VALUE, _("Sort components by &value"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizerValuepos->Add( rbSortByValue, 0, wxALL, 3 );
+
+
+ bSizerValuepos->Add( 0, 0, 1, wxEXPAND, 5 );
+
+ annotate_by_value_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+ bSizerValuepos->Add( annotate_by_value_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 12 );
+
+ b_orderOptSizer->Add( bSizerValuepos, 0, wxEXPAND|wxRIGHT, 5 );
+
+ bupperSizer->Add( b_orderOptSizer, 1, wxEXPAND|wxLEFT, 25 );
+
+ m_staticline5 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+ bupperSizer->Add( m_staticline5, 0, wxEXPAND | wxALL, 5 );
+
+ wxBoxSizer* bButtonsSizer;
+ bButtonsSizer = new wxBoxSizer( wxHORIZONTAL );
+
+ m_btnClose = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
+ bButtonsSizer->Add( m_btnClose, 0, wxALL|wxEXPAND, 5 );
+
+ m_btnClear = new wxButton( this, ID_CLEAR_ANNOTATION_CMP, _("Clear Annotation"), wxDefaultPosition, wxDefaultSize, 0 );
+ bButtonsSizer->Add( m_btnClear, 0, wxALL|wxEXPAND, 5 );
+
+ m_btnApply = new wxButton( this, wxID_APPLY, _("Annotation"), wxDefaultPosition, wxDefaultSize, 0 );
+ bButtonsSizer->Add( m_btnApply, 0, wxALL|wxEXPAND, 5 );
+
+ bupperSizer->Add( bButtonsSizer, 0, wxALIGN_CENTER_HORIZONTAL, 6 );
+
+ bmainSizer->Add( bupperSizer, 1, wxALL|wxEXPAND, 6 );
+
+ this->SetSizer( bmainSizer );
+ this->Layout();
+
+ // Connect Events
+ m_btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnCancelClick ), NULL, this );
+ m_btnClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnClearAnnotationCmpClick ), NULL, this );
+ m_btnApply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnApplyClick ), NULL, this );
+}
+
+DIALOG_ANNOTATE_BASE::~DIALOG_ANNOTATE_BASE()
+{
+ // Disconnect Events
+ m_btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnCancelClick ), NULL, this );
+ m_btnClear->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnClearAnnotationCmpClick ), NULL, this );
+ m_btnApply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnApplyClick ), NULL, this );
+
+}
diff --git a/eeschema/dialogs/dialog_annotate_base.fbp b/eeschema/dialogs/dialog_annotate_base.fbp
index a1123286b4..dc9c32e7ca 100644
--- a/eeschema/dialogs/dialog_annotate_base.fbp
+++ b/eeschema/dialogs/dialog_annotate_base.fbp
@@ -1,1104 +1,1467 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/eeschema/dialogs/dialog_annotate_base.h b/eeschema/dialogs/dialog_annotate_base.h
index 7338ee1ebe..cbef0a53d8 100644
--- a/eeschema/dialogs/dialog_annotate_base.h
+++ b/eeschema/dialogs/dialog_annotate_base.h
@@ -1,82 +1,89 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 21 2008)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __dialog_annotate_base__
-#define __dialog_annotate_base__
-
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-///////////////////////////////////////////////////////////////////////////
-
-#define ID_ENTIRE_SCHEMATIC 1000
-#define ID_CURRENT_PAGE 1001
-#define ID_KEEP_ANNOTATION 1002
-#define ID_RESET_ANNOTATION 1003
-#define ID_SORT_BY_X_POSITION 1004
-#define ID_SORT_BY_Y_POSITION 1005
-#define ID_SORT_BY_VALUE 1006
-#define ID_CLEAR_ANNOTATION_CMP 1007
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_ANNOTATE_BASE
-///////////////////////////////////////////////////////////////////////////////
-class DIALOG_ANNOTATE_BASE : public wxDialog
-{
- private:
-
- protected:
- wxStaticText* m_staticTextScope;
- wxRadioButton* m_rbEntireSchematic;
- wxRadioButton* m_rbCurrPage;
- wxStaticLine* m_staticline1;
- wxRadioButton* m_rbKeepAnnotation;
- wxRadioButton* m_rbResetAnnotation;
- wxStaticLine* m_staticline2;
- wxStaticText* m_staticTextOrder;
- wxRadioButton* m_rbSortBy_X_Position;
-
- wxStaticBitmap* annotate_down_right_bitmap;
- wxRadioButton* m_rbSortBy_Y_Position;
-
- wxStaticBitmap* annotate_right_down_bitmap;
- wxRadioButton* rbSortByValue;
-
- wxStaticBitmap* annotate_by_value_bitmap;
- wxStaticLine* m_staticline5;
- wxButton* m_btnClose;
- wxButton* m_btnClear;
- wxButton* m_btnApply;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnClearAnnotationCmpClick( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnApplyClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Annotate Schematic"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DIALOG_ANNOTATE_BASE();
-
-};
-
-#endif //__dialog_annotate_base__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Sep 8 2010)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __dialog_annotate_base__
+#define __dialog_annotate_base__
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+///////////////////////////////////////////////////////////////////////////
+
+#define ID_ENTIRE_SCHEMATIC 1000
+#define ID_CURRENT_PAGE 1001
+#define ID_KEEP_ANNOTATION 1002
+#define ID_RESET_ANNOTATION 1003
+#define ID_SORT_BY_X_POSITION 1004
+#define ID_SORT_BY_Y_POSITION 1005
+#define ID_SORT_BY_VALUE 1006
+#define ID_CLEAR_ANNOTATION_CMP 1007
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_ANNOTATE_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_ANNOTATE_BASE : public wxDialog
+{
+ private:
+
+ protected:
+ wxStaticText* m_staticTextScope;
+ wxRadioButton* m_rbEntireSchematic;
+ wxRadioButton* m_rbCurrPage;
+ wxStaticLine* m_staticline1;
+ wxRadioButton* m_rbKeepAnnotation;
+ wxRadioButton* m_rbResetAnnotation;
+ wxStaticLine* m_staticline2;
+ wxStaticText* m_staticTextOrder;
+ wxRadioButton* m_rbSortBy_X_Position;
+
+ wxStaticBitmap* annotate_down_right_bitmap;
+ wxRadioButton* m_rbSortBy_X_Position_and_useSheet;
+
+ wxStaticBitmap* annotate_down_right_bitmap1;
+ wxRadioButton* m_rbSortBy_Y_Position;
+
+ wxStaticBitmap* annotate_right_down_bitmap;
+ wxRadioButton* m_rbSortBy_Y_Position_and_useSheet;
+
+ wxStaticBitmap* annotate_right_down_bitmap1;
+ wxRadioButton* rbSortByValue;
+
+ wxStaticBitmap* annotate_by_value_bitmap;
+ wxStaticLine* m_staticline5;
+ wxButton* m_btnClose;
+ wxButton* m_btnClear;
+ wxButton* m_btnApply;
+
+ // Virtual event handlers, overide them in your derived class
+ virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
+ virtual void OnClearAnnotationCmpClick( wxCommandEvent& event ) { event.Skip(); }
+ virtual void OnApplyClick( wxCommandEvent& event ) { event.Skip(); }
+
+
+ public:
+
+ DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Annotate Schematic"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 432,376 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+ ~DIALOG_ANNOTATE_BASE();
+
+};
+
+#endif //__dialog_annotate_base__
diff --git a/eeschema/dialogs/dialog_build_BOM.cpp b/eeschema/dialogs/dialog_build_BOM.cpp
index 7190aaa8d6..956bb1cb05 100644
--- a/eeschema/dialogs/dialog_build_BOM.cpp
+++ b/eeschema/dialogs/dialog_build_BOM.cpp
@@ -30,6 +30,12 @@
#include "protos.h"
+extern void GenListeGLabels( std::vector & aList );
+extern bool SortLabelsByValue( const LABEL_OBJECT& obj1, const LABEL_OBJECT& obj2 );
+extern bool SortLabelsBySheet( const LABEL_OBJECT& obj1, const LABEL_OBJECT& obj2 );
+extern int PrintListeGLabel( FILE* f, std::vector & aList );
+
+
/* Local variables */
static bool s_ListByRef = TRUE;
static bool s_ListByValue = TRUE;
@@ -392,20 +398,17 @@ void DIALOG_BUILD_BOM::CreatePartsList( const wxString& aFullFileName, bool aInc
return;
}
- std::vector cmplist;
+ SCH_REFERENCE_LIST cmplist;
SCH_SHEET_LIST sheetList; // uses a global
sheetList.GetComponents( cmplist, false );
// sort component list by ref and remove sub components
if( !aIncludeSubComponents )
- {
- sort( cmplist.begin(), cmplist.end(), SortComponentsByReference );
- DeleteSubCmp( cmplist );
- }
+ cmplist.RemoveSubComponentsFromList();
// sort component list by value
- sort( cmplist.begin(), cmplist.end(), SortComponentsByValue );
+ cmplist.SortComponentsByValueOnly( );
PrintComponentsListByPart( f, cmplist,aIncludeSubComponents );
fclose( f );
@@ -431,16 +434,16 @@ void DIALOG_BUILD_BOM::CreateExportList( const wxString& aFullFileName,
return;
}
- std::vector cmplist;
+ SCH_REFERENCE_LIST cmplist;
SCH_SHEET_LIST sheetList; // uses a global
sheetList.GetComponents( cmplist, false );
// sort component list
- sort( cmplist.begin(), cmplist.end(), SortComponentsByReference );
+ cmplist.SortComponentsByReferenceOnly( );
if( !aIncludeSubComponents )
- DeleteSubCmp( cmplist );
+ cmplist.RemoveSubComponentsFromList();
// create the file
PrintComponentsListByRef( f, cmplist, TRUE, aIncludeSubComponents );
@@ -469,12 +472,12 @@ void DIALOG_BUILD_BOM::GenereListeOfItems( const wxString& aFullFileName,
return;
}
- std::vector cmplist;
- SCH_SHEET_LIST sheetList; // uses a global
+ SCH_REFERENCE_LIST cmplist;
+ SCH_SHEET_LIST sheetList;
sheetList.GetComponents( cmplist, false );
- itemCount = cmplist.size();
+ itemCount = cmplist.GetCount();
if( itemCount )
{
@@ -486,17 +489,17 @@ void DIALOG_BUILD_BOM::GenereListeOfItems( const wxString& aFullFileName,
fprintf( f, "%s >> Creation date: %s\n", CONV_TO_UTF8( Title ), Line );
// sort component list
- sort( cmplist.begin(), cmplist.end(), SortComponentsByReference );
+ cmplist.SortComponentsByReferenceOnly();
if( !aIncludeSubComponents )
- DeleteSubCmp( cmplist );
+ cmplist.RemoveSubComponentsFromList();
if( m_ListCmpbyRefItems->GetValue() )
PrintComponentsListByRef( f, cmplist, false, aIncludeSubComponents );
if( m_ListCmpbyValItems->GetValue() )
{
- sort( cmplist.begin(), cmplist.end(), SortComponentsByValue );
+ cmplist.SortComponentsByValueOnly();
PrintComponentsListByVal( f, cmplist, aIncludeSubComponents );
}
}
@@ -576,10 +579,10 @@ void DIALOG_BUILD_BOM::PrintFieldData( FILE* f, SCH_COMPONENT* DrawLibItem,
/* Print the B.O.M sorted by reference
*/
-int DIALOG_BUILD_BOM::PrintComponentsListByRef( FILE* f,
- std::vector & aList,
- bool CompactForm,
- bool aIncludeSubComponents )
+int DIALOG_BUILD_BOM::PrintComponentsListByRef( FILE* f,
+ SCH_REFERENCE_LIST& aList,
+ bool CompactForm,
+ bool aIncludeSubComponents )
{
wxString msg;
@@ -627,7 +630,7 @@ int DIALOG_BUILD_BOM::PrintComponentsListByRef( FILE* f,
wxString subRef;
// Print list of items
- for( unsigned ii = 0; ii < aList.size(); ii++ )
+ for( unsigned ii = 0; ii < aList.GetCount(); ii++ )
{
EDA_ITEM* item = aList[ii].m_RootCmp;
@@ -678,25 +681,23 @@ int DIALOG_BUILD_BOM::PrintComponentsListByRef( FILE* f,
if( aIncludeSubComponents )
{
msg = aList[ii].m_SheetPath.PathHumanReadable();
+ BASE_SCREEN * screen = (BASE_SCREEN*) comp->GetParent();
- if( CompactForm )
+ if( screen )
{
- fprintf( f, "%c%s", s_ExportSeparatorSymbol, CONV_TO_UTF8( msg ) );
-
- msg = m_Parent->GetXYSheetReferences( (BASE_SCREEN*) comp->GetParent(),
- comp->m_Pos );
-
- fprintf( f, "%c%s)", s_ExportSeparatorSymbol,
- CONV_TO_UTF8( msg ) );
- }
- else
- {
- fprintf( f, " (Sheet %s)", CONV_TO_UTF8( msg ) );
-
- msg = m_Parent->GetXYSheetReferences( (BASE_SCREEN*) comp->GetParent(),
- comp->m_Pos );
-
- fprintf( f, " (loc %s)", CONV_TO_UTF8( msg ) );
+ if( CompactForm )
+ {
+ fprintf( f, "%c%s", s_ExportSeparatorSymbol, CONV_TO_UTF8( msg ) );
+ msg = m_Parent->GetXYSheetReferences( screen, comp->m_Pos );
+ fprintf( f, "%c%s)", s_ExportSeparatorSymbol,
+ CONV_TO_UTF8( msg ) );
+ }
+ else
+ {
+ fprintf( f, " (Sheet %s)", CONV_TO_UTF8( msg ) );
+ msg = m_Parent->GetXYSheetReferences( screen, comp->m_Pos );
+ fprintf( f, " (loc %s)", CONV_TO_UTF8( msg ) );
+ }
}
}
@@ -726,7 +727,7 @@ int DIALOG_BUILD_BOM::PrintComponentsListByRef( FILE* f,
* FIELD2 - manufacture part number
* FIELD3 - distributor part number
*/
-int DIALOG_BUILD_BOM::PrintComponentsListByPart( FILE* f, std::vector & aList,
+int DIALOG_BUILD_BOM::PrintComponentsListByPart( FILE* f, SCH_REFERENCE_LIST& aList,
bool aIncludeSubComponents )
{
int qty = 0;
@@ -744,11 +745,11 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart( FILE* f, std::vector & aList,
- bool aIncludeSubComponents )
+int DIALOG_BUILD_BOM::PrintComponentsListByVal( FILE* f,
+ SCH_REFERENCE_LIST& aList,
+ bool aIncludeSubComponents )
{
EDA_ITEM* schItem;
SCH_COMPONENT* DrawLibItem;
@@ -879,7 +880,7 @@ int DIALOG_BUILD_BOM::PrintComponentsListByVal( FILE* f,
fputs( CONV_TO_UTF8( msg ), f );
- for( unsigned ii = 0; ii < aList.size(); ii++ )
+ for( unsigned ii = 0; ii < aList.GetCount(); ii++ )
{
schItem = aList[ii].m_RootCmp;
@@ -914,11 +915,14 @@ int DIALOG_BUILD_BOM::PrintComponentsListByVal( FILE* f,
// print the sheet path
if( aIncludeSubComponents )
{
- msg = aList[ii].m_SheetPath.PathHumanReadable();
- fprintf( f, " (Sheet %s)", CONV_TO_UTF8( msg ) );
- msg = m_Parent->GetXYSheetReferences( (BASE_SCREEN*) DrawLibItem->GetParent(),
- DrawLibItem->m_Pos );
- fprintf( f, " (loc %s)", CONV_TO_UTF8( msg ) );
+ BASE_SCREEN * screen = (BASE_SCREEN*) DrawLibItem->GetParent();
+ if( screen )
+ {
+ msg = aList[ii].m_SheetPath.PathHumanReadable();
+ fprintf( f, " (Sheet %s)", CONV_TO_UTF8( msg ) );
+ msg = m_Parent->GetXYSheetReferences( screen, DrawLibItem->m_Pos );
+ fprintf( f, " (loc %s)", CONV_TO_UTF8( msg ) );
+ }
}
PrintFieldData( f, DrawLibItem );
diff --git a/eeschema/dialogs/dialog_build_BOM.h b/eeschema/dialogs/dialog_build_BOM.h
index 7f3aeb378d..122e21f9ba 100644
--- a/eeschema/dialogs/dialog_build_BOM.h
+++ b/eeschema/dialogs/dialog_build_BOM.h
@@ -46,13 +46,13 @@ private:
*/
void CreatePartsList( const wxString& aFullFileName, bool aIncludeSubComponents );
- int PrintComponentsListByRef( FILE* f, std::vector & aList,
+ int PrintComponentsListByRef( FILE* f, SCH_REFERENCE_LIST& aList,
bool CompactForm, bool aIncludeSubComponents );
- int PrintComponentsListByVal( FILE* f, std::vector & aList,
+ int PrintComponentsListByVal( FILE* f, SCH_REFERENCE_LIST& aList,
bool aIncludeSubComponents );
- int PrintComponentsListByPart( FILE* f, std::vector & aList,
+ int PrintComponentsListByPart( FILE* f, SCH_REFERENCE_LIST& aList,
bool aIncludeSubComponents );
void PrintFieldData( FILE* f, SCH_COMPONENT* DrawLibItem, bool CompactForm = FALSE );
diff --git a/eeschema/netlist.cpp b/eeschema/netlist.cpp
index 942dcba524..cd1f98fbff 100644
--- a/eeschema/netlist.cpp
+++ b/eeschema/netlist.cpp
@@ -18,7 +18,6 @@
#include "sch_no_connect.h"
#include "sch_text.h"
#include "sch_sheet.h"
-
#include "algorithm"
#include
@@ -65,98 +64,6 @@ void dumpNetTable()
#endif
-SCH_REFERENCE::SCH_REFERENCE( SCH_COMPONENT* aComponent, LIB_COMPONENT* aLibComponent,
- SCH_SHEET_PATH& aSheetPath )
-{
- wxASSERT( aComponent != NULL && aLibComponent != NULL );
-
- m_RootCmp = aComponent;
- m_Entry = aLibComponent;
- m_Unit = aComponent->GetUnitSelection( &aSheetPath );
- m_SheetPath = aSheetPath;
- m_IsNew = false;
- m_Flag = 0;
- m_TimeStamp = aComponent->m_TimeStamp;
-
- if( aComponent->GetRef( &aSheetPath ).IsEmpty() )
- aComponent->SetRef( &aSheetPath, wxT( "DefRef?" ) );
-
- SetRef( aComponent->GetRef( &aSheetPath ) );
-
- m_NumRef = -1;
-
- if( aComponent->GetField( VALUE )->GetText().IsEmpty() )
- aComponent->GetField( VALUE )->SetText( wxT( "~" ) );
-
- m_Value = &aComponent->GetField( VALUE )->m_Text;
-}
-
-
-void SCH_REFERENCE::Annotate()
-{
- if( m_NumRef < 0 )
- m_Ref += wxChar( '?' );
- else
- m_Ref = CONV_TO_UTF8( GetRef() << m_NumRef );
-
- m_RootCmp->SetRef( &m_SheetPath, CONV_FROM_UTF8( m_Ref.c_str() ) );
- m_RootCmp->SetUnit( m_Unit );
- m_RootCmp->SetUnitSelection( &m_SheetPath, m_Unit );
-}
-
-
-void SCH_REFERENCE::Split()
-{
- std::string refText = GetRefStr();
-
- m_NumRef = -1;
-
- int ll = refText.length() - 1;
-
- if( refText[ll] == '?' )
- {
- m_IsNew = true;
-
- if( !IsPartsLocked() )
- m_Unit = 0x7FFFFFFF;
-
- refText.erase( ll ); // delete last char
-
- SetRefStr( refText );
- }
- else if( isdigit( refText[ll] ) == 0 )
- {
- m_IsNew = true;
-
- if( !IsPartsLocked() )
- m_Unit = 0x7FFFFFFF;
- }
- else
- {
- while( ll >= 0 )
- {
- if( (refText[ll] <= ' ' ) || isdigit( refText[ll] ) )
- ll--;
- else
- {
- if( isdigit( refText[ll + 1] ) )
- {
- // null terminated C string into cp
- const char* cp = refText.c_str() + ll + 1;
-
- m_NumRef = atoi( cp );
- }
-
- refText.erase( ll+1 ); // delete from ll+1 to end
- break;
- }
- }
-
- SetRefStr( refText );
- }
-}
-
-
/*
* Routine to free memory used to calculate the netlist TabNetItems = pointer
* to the main table (list items)
diff --git a/eeschema/netlist.h b/eeschema/netlist.h
index 8180278293..2c6e133950 100644
--- a/eeschema/netlist.h
+++ b/eeschema/netlist.h
@@ -2,6 +2,32 @@
/* netlist.h */
/***************/
+/*
+ * This program source code file is part of KICAD, a free EDA CAD application.
+ *
+ * Copyright (C) 1992-2011 jean-pierre Charras
+ * Copyright (C) 1992-2011 Wayne Stambaugh
+ * Copyright (C) 1992-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
+ * 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
+ */
+
+
#ifndef _NETLIST_H_
#define _NETLIST_H_
@@ -22,7 +48,6 @@ class SCH_COMPONENT;
/* Max pin number per component and footprint */
#define MAXPIN 5000
-
/**
* Class SCH_REFERENCE
* is used as a helper to define a component's reference designator in a schematic. This
@@ -43,7 +68,10 @@ public:
LIB_COMPONENT* m_Entry; // the source component in library
int m_Unit; /* Selected part (For multi parts per
* package) depending on sheet path */
+ wxPoint m_CmpPos; // The physical position of the component in schematic
+ // used to annotate by Y ou Y position
SCH_SHEET_PATH m_SheetPath; /* the sheet path for this component */
+ int m_SheetNum; // the sheet num for this component
unsigned long m_TimeStamp; /* unique identification number
* depending on sheet path */
bool m_IsNew; /* true for not yet annotated
@@ -66,6 +94,7 @@ public:
m_Value = NULL;
m_NumRef = 0;
m_Flag = 0;
+ m_SheetNum = 0;
}
SCH_REFERENCE( SCH_COMPONENT* aComponent, LIB_COMPONENT* aLibComponent,
@@ -127,5 +156,225 @@ public:
}
};
+/* object used in annotation to handle a list of components in schematic
+ * because in a complex hierarchy, a component is used more than once,
+ * and its reference is depending on the sheet path
+ * for the same component, we must create a flat list of components
+ * used in nelist generation, BOM generation and annotation
+ */
+
+class SCH_REFERENCE_LIST
+{
+private:
+ std::vector componentFlatList;
+
+public:
+ /** Constructor
+ */
+ SCH_REFERENCE_LIST()
+ {
+ }
+
+ SCH_REFERENCE& operator[]( int aIndex )
+ {
+ return componentFlatList[ aIndex ];
+ }
+
+ /**
+ * Function GetCount
+ * @return the number of items in the list
+ */
+ unsigned GetCount()
+ {
+ return componentFlatList.size();
+ }
+
+ /**
+ * Function GetItem
+ * @return the aIdx item
+ */
+ SCH_REFERENCE& GetItem(int aIdx)
+ {
+ return componentFlatList[aIdx];
+ }
+
+ /**
+ * Function AddItem
+ * Add a OBJ_CMP_TO_LIST object in aComponentsList for each component found
+ * in sheet
+ * @param aItem - a SCH_REFERENCE item to add
+ */
+ void AddItem( SCH_REFERENCE& aItem )
+ {
+ componentFlatList.push_back( aItem);
+ }
+
+ /**
+ * Function RemoveSubComponentsFromList
+ * Remove sub components from the list, when multiples parts per package are
+ * found in this list.
+ * Useful to create BOM, when a component must appear only once
+ */
+ void RemoveSubComponentsFromList( );
+
+ /* Sort functions:
+ * Sort functions are used to sort components for annotatioon or BOM generation.
+ * Because sorting depend on we want to do, there are many sort functions.
+ * Note:
+ * When creating BOM, components are fully annotated.
+ * references are somethink like U3, U5 or R4, R8
+ * When annotating, some or all components are not annotated,
+ * i.e. ref is only U or R, with no number.
+ */
+ /**
+ * Function SortCmpByXCoordinate
+ * sort the flat list by X coordinates.
+ * The list is always sorted first by ref and sheet
+ */
+ void SortCmpByXCoordinate()
+ {
+ sort( componentFlatList.begin(), componentFlatList.end(), sortBy_X_Position );
+ }
+
+ /**
+ * Function SortCmpByYCoordinate
+ * sort the flat list by Y coordinates.
+ * The list is always sorted first by ref and sheet
+ */
+ void SortCmpByYCoordinate()
+ {
+ sort( componentFlatList.begin(), componentFlatList.end(), sortBy_Y_Position );
+ }
+
+ /**
+ * Function SortComponentsByTimeStamp
+ * sort the flat list by Time Stamp.
+ * Useful to detect duplicate Time Stamps
+ */
+ void SortComponentsByTimeStamp()
+ {
+ sort( componentFlatList.begin(), componentFlatList.end(), sortByTimeStamp );
+ }
+
+ /**
+ * Function SortComponentsByValue
+ * sort the flat list by Value.
+ * Values are sorted by numeric values, not by alpahbetic order
+ * The list is always sorted first by ref
+ */
+ void SortComponentsByRefAndValue()
+ {
+ sort( componentFlatList.begin(), componentFlatList.end(), sortByRefAndValue );
+ }
+
+ /**
+ * Function SortComponentsByReferenceOnly
+ * sort the flat list by references
+ * For BOM, sorted by reference
+ */
+ void SortComponentsByReferenceOnly()
+ {
+ sort( componentFlatList.begin(), componentFlatList.end(), sortComponentsByReferenceOnly );
+ }
+
+ /**
+ * Function SortComponentsByValueOnly
+ * sort the flat list by references
+ * For BOM, sorted by values
+ */
+ void SortComponentsByValueOnly()
+ {
+ sort( componentFlatList.begin(), componentFlatList.end(), sortComponentsByValueOnly );
+ }
+
+private:
+ /* sort functions used to sort componentFlatList
+ */
+
+ /**
+ * Function sortByRefAndValue
+ * sort function to annotate items by value
+ * Components are sorted
+ * by reference (when used, referenc is only U ot R, with no number)
+ * if same reference: by value
+ * if same value: by unit number
+ * if same unit number, by sheet
+ * if same sheet, by position X, and Y
+ * @param item1, item2 = SCH_REFERENCE items to compare
+ */
+ static bool sortByRefAndValue( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 );
+ /**
+ * Function sortBy_X_Position
+ * sort function to annotate items from their position.
+ * Components are sorted
+ * by reference (when used, referenc is only U ot R, with no number)
+ * if same reference: by sheet
+ * if same sheet, by X pos
+ * if same X pos, by Y pos
+ * if same Y pos, by time stamp
+ * @param item1, item2 = SCH_REFERENCE items to compare
+ */
+ static bool sortBy_X_Position( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 );
+
+ /**
+ * Function sortBy_Y_Position
+ * sort function to annotate items from their position.
+ * Components are sorted
+ * by reference (when used, referenc is only U ot R, with no number)
+ * if same reference: by sheet
+ * if same sheet, by Y pos
+ * if same Y pos, by X pos
+ * if same X pos, by time stamp
+ * @param item1, item2 = SCH_REFERENCE items to compare
+ */
+ static bool sortBy_Y_Position( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 );
+
+ static bool sortByTimeStamp( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 );
+
+ /**
+ * Function sortComponentsByValueOnly
+ * compare function for sorting in BOM creation.
+ * components are sorted
+ * by value
+ * if same value: by reference
+ * if same reference: by unit number
+ * @param item1, item2 = SCH_REFERENCE items to compare
+ */
+
+ static bool sortComponentsByValueOnly( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 );
+ /**
+ * Function sortComponentsByReferenceOnly
+ * compare function for sorting in BOM creation.
+ * components are sorted
+ * by reference
+ * if same reference: by value (happens only for multi parts per package)
+ * if same value: by unit number
+ * @param item1, item2 = SCH_REFERENCE items to compare
+ */
+ static bool sortComponentsByReferenceOnly( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 );
+};
+
+/**
+ * helper Class LABEL_OBJECT
+ * is used in build BOM to handle the list of labels in schematic
+ * because in a complex hierarchy, a label is used more than once,
+ * and had more than one sheet path, so we must create a flat list of labels
+ */
+class LABEL_OBJECT
+{
+public:
+ int m_LabelType;
+ SCH_ITEM* m_Label;
+
+ //have to store it here since the object references will be duplicated.
+ SCH_SHEET_PATH m_SheetPath; //composed of UIDs
+
+public: LABEL_OBJECT()
+ {
+ m_Label = NULL;
+ m_LabelType = 0;
+ }
+};
+typedef std::vector LABEL_OBJECT_LIST;
#endif
diff --git a/eeschema/protos.h b/eeschema/protos.h
index 3195f43cf3..5fea6348bf 100644
--- a/eeschema/protos.h
+++ b/eeschema/protos.h
@@ -65,40 +65,6 @@ bool LibItemInBox( int x1, int y1, int x2, int y2, SCH_COMPONENT* Draw
void DeleteStruct( WinEDA_DrawPanel* panel, wxDC* DC, SCH_ITEM* DrawStruct );
-// build_BOM.cpp
-
-/**
- * Class LABEL_OBJECT
- * is used in build BOM to handle the list of labels in schematic
- * because in a complex hierarchy, a label is used more than once,
- * and had more than one sheet path, so we must create a flat list of labels
- */
-class LABEL_OBJECT
-{
-public:
- int m_LabelType;
- SCH_ITEM* m_Label;
-
- //have to store it here since the object references will be duplicated.
- SCH_SHEET_PATH m_SheetPath; //composed of UIDs
-
-public: LABEL_OBJECT()
- {
- m_Label = NULL;
- m_LabelType = 0;
- }
-};
-
-
-void GenListeGLabels( std::vector & aList );
-bool SortComponentsByReference( const SCH_REFERENCE& obj1, const SCH_REFERENCE& obj2 );
-bool SortComponentsByValue( const SCH_REFERENCE& obj1, const SCH_REFERENCE& obj2 );
-bool SortLabelsByValue( const LABEL_OBJECT& obj1, const LABEL_OBJECT& obj2 );
-bool SortLabelsBySheet( const LABEL_OBJECT& obj1, const LABEL_OBJECT& obj2 );
-void DeleteSubCmp( std::vector< SCH_REFERENCE >& aList );
-int PrintListeGLabel( FILE* f, std::vector & aList );
-
-
// operations_on_item_lists.cpp
/**
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index 25d2a2609b..ff79c0e0e8 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -861,6 +861,11 @@ void SCH_SHEET::DisplayInfo( WinEDA_DrawFrame* frame )
frame->ClearMsgPanel();
frame->AppendMsgPanel( _( "Sheet name" ), m_SheetName, CYAN );
frame->AppendMsgPanel( _( "File name" ), m_FileName, BROWN );
+#if 0 // Set to 1 to display the sheet time stamp (mainly for test)
+ wxString msg;
+ msg.Printf(wxT("%.8X"), m_TimeStamp );
+ frame->AppendMsgPanel( _( "Time Stamp" ), msg, BLUE );
+#endif
}
diff --git a/eeschema/sch_sheet_path.cpp b/eeschema/sch_sheet_path.cpp
index a56c5c1261..0dce4df9e7 100644
--- a/eeschema/sch_sheet_path.cpp
+++ b/eeschema/sch_sheet_path.cpp
@@ -313,9 +313,17 @@ void SCH_SHEET_PATH::AnnotatePowerSymbols( int* aReference )
}
-void SCH_SHEET_PATH::GetComponents( std::vector< SCH_REFERENCE >& aReferences,
- bool aIncludePowerSymbols )
+void SCH_SHEET_PATH::GetComponents( SCH_REFERENCE_LIST& aReferences,
+ bool aIncludePowerSymbols )
{
+ // Search to sheet path number:
+ int sheetnumber = 1; // 1 = root
+ SCH_SHEET_LIST sheetList;
+ for( SCH_SHEET_PATH* path = sheetList.GetFirst(); path != NULL;
+ path = sheetList.GetNext(), sheetnumber++ )
+ if( Cmp(*path) == 0 )
+ break;
+
for( SCH_ITEM* item = LastDrawList(); item != NULL; item = item->Next() )
{
if( item->Type() == SCH_COMPONENT_T )
@@ -333,7 +341,8 @@ void SCH_SHEET_PATH::GetComponents( std::vector< SCH_REFERENCE >& aReferences,
continue;
SCH_REFERENCE reference = SCH_REFERENCE( component, entry, *this );
- aReferences.push_back( reference );
+ reference.m_SheetNum = sheetnumber;
+ aReferences.AddItem( reference );
}
}
}
@@ -635,8 +644,8 @@ void SCH_SHEET_LIST::AnnotatePowerSymbols()
}
-void SCH_SHEET_LIST::GetComponents( std::vector< SCH_REFERENCE >& aReferences,
- bool aIncludePowerSymbols )
+void SCH_SHEET_LIST::GetComponents( SCH_REFERENCE_LIST& aReferences,
+ bool aIncludePowerSymbols )
{
for( SCH_SHEET_PATH* path = GetFirst(); path != NULL; path = GetNext() )
path->GetComponents( aReferences, aIncludePowerSymbols );
diff --git a/eeschema/sch_sheet_path.h b/eeschema/sch_sheet_path.h
index ba97253e42..1f838e7eb3 100644
--- a/eeschema/sch_sheet_path.h
+++ b/eeschema/sch_sheet_path.h
@@ -55,7 +55,7 @@ class SCH_SCREEN;
class SCH_MARKER;
class SCH_SHEET;
class SCH_ITEM;
-class SCH_REFERENCE;
+class SCH_REFERENCE_LIST;
/**
@@ -202,8 +202,8 @@ public:
* @param aReferences List of references to populate.
* @param aIncludePowerSymbols Set to false to only get normal components.
*/
- void GetComponents( std::vector< SCH_REFERENCE >& aReferences,
- bool aIncludePowerSymbols = true );
+ void GetComponents( SCH_REFERENCE_LIST& aReferences,
+ bool aIncludePowerSymbols = true );
/**
* Find the next schematic item in this sheet ojbect.
@@ -349,8 +349,8 @@ public:
* @param aReferences List of references to populate.
* @param aIncludePowerSymbols Set to false to only get normal components.
*/
- void GetComponents( std::vector< SCH_REFERENCE >& aReferences,
- bool aIncludePowerSymbols = true );
+ void GetComponents( SCH_REFERENCE_LIST& aReferences,
+ bool aIncludePowerSymbols = true );
/**
* Function FindNextItem
diff --git a/include/dialog_load_error.h b/include/dialog_load_error.h
index 2a2fb3e868..965660d378 100644
--- a/include/dialog_load_error.h
+++ b/include/dialog_load_error.h
@@ -22,15 +22,15 @@ public:
/**
* Function ListSet
* Add a list of items.
- * @param list = a string containing items. Items are separated by '\n'
+ * @param aList = a string containing items. Items are separated by '\n'
*/
- void ListSet(const wxString &list);
+ void ListSet(const wxString &aList);
/**
* Function ListSet
* Add a list of items.
- * @param list = a wxArrayString containing items.
+ * @param aList = a wxArrayString containing items.
*/
- void ListSet(const wxArrayString &list);
+ void ListSet(const wxArrayString &aList);
void ListClear();
/**
diff --git a/include/wxEeschemaStruct.h b/include/wxEeschemaStruct.h
index be91e2e12f..94cdfd5ede 100644
--- a/include/wxEeschemaStruct.h
+++ b/include/wxEeschemaStruct.h
@@ -273,11 +273,38 @@ public:
* Remove current component annotations
* @param aCurrentSheetOnly : if false: remove all annotations, else
* remove annotation relative to the current
- * sheet only
- * @param aRedraw : true to refresh display
+ * sheet only
*/
- void DeleteAnnotation( bool aCurrentSheetOnly, bool aRedraw );
+ void DeleteAnnotation( bool aCurrentSheetOnly );
+ /**
+ * Function AnnotateComponents:
+ *
+ * Compute the annotation of the components for the whole project, or the
+ * current sheet only. All the components or the new ones only will be
+ * annotated.
+ * @param annotateSchematic : true = entire schematic annotation,
+ * false = current sheet only
+ * @param sortOption : 0 = annotate by sorting X position,
+ * 1 = annotate by sorting X position,
+ * and use sheet number to calculate annotation
+ * 2 = annotate by sorting Y position,
+ * 3 = annotate by sorting Y position,
+ * and use sheet number to calculate annotation
+ * 4 = annotate by sorting value
+ * @param resetAnnotation : true = remove previous annotation
+ * false = annotate new components only
+ * @param repairsTimestamps : true = test for duplicate times stamps and
+ * replace duplicated
+ * Note: this option could change previous annotation, because time
+ * stamps are used to handle annotation mainly in complex
+ * hierarchies.
+ * When the sheet number is used in annotation,
+ * for each sheet annotation starts from sheet number * 100
+ * ( the first sheet uses 100 to 199, the second 200 to 299 ... )
+ */
+ void AnnotateComponents(bool annotateSchematic, int sortOption,
+ bool resetAnnotation, bool repairsTimestamps );
// Functions used for hierarchy handling
void InstallPreviousSheet();
void InstallNextScreen( SCH_SHEET* Sheet );
diff --git a/polygon/PolyLine.cpp b/polygon/PolyLine.cpp
index 8dbde4023b..28776ae737 100644
--- a/polygon/PolyLine.cpp
+++ b/polygon/PolyLine.cpp
@@ -45,7 +45,7 @@ CPolyLine::~CPolyLine()
* if more than one outside contour are found, extra CPolyLines will be created
* because copper areas have only one outside contour
* Therefore, if this results in new CPolyLines, return them as std::vector pa
- * @param aExtraPolys: pointer on a std::vector to store extra CPolyLines
+ * @param aExtraPolyList: pointer on a std::vector to store extra CPolyLines
* @param bRetainArcs == TRUE, try to retain arcs in polys
* @return number of external contours, or -1 if error
*/
diff --git a/polygon/PolyLine.h b/polygon/PolyLine.h
index f30d8d3ad9..3e6083ce6a 100644
--- a/polygon/PolyLine.h
+++ b/polygon/PolyLine.h
@@ -224,7 +224,7 @@ public:
* if more than one outside contour are found, extra CPolyLines will be created
* because copper areas have only one outside contour
* Therefore, if this results in new CPolyLines, return them as std::vector pa
- * @param aExtraPolys: pointer on a std::vector to store extra CPolyLines
+ * @param aExtraPolyList: pointer on a std::vector to store extra CPolyLines
* @param bRetainArcs == false, try to retain arcs in polys
* @return number of external contours, or -1 if error
*/
diff --git a/polygon/kbool/include/kbool/_dl_itr.cpp b/polygon/kbool/include/kbool/_dl_itr.cpp
index ad17951730..0f988fdd9a 100644
--- a/polygon/kbool/include/kbool/_dl_itr.cpp
+++ b/polygon/kbool/include/kbool/_dl_itr.cpp
@@ -1,11 +1,11 @@
-/*! \file kbool/_dl_itr.cpp
+/*! \file _dl_itr.cpp
\brief Double Linked list with Iterators on list
\author Probably Klaas Holwerda
-
+
Copyright: 2001-2004 (C) Probably Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: _dl_itr.cpp,v 1.5 2009/04/23 19:35:24 titato Exp $
*/
@@ -143,9 +143,9 @@ class | Dtype | item object in list
too see if list is empty
\code
DL_List _intlist; #create a list of integers
-
+
if (_intlist.Empty())
-
+
cout << "empty";
\endcode
*/
@@ -163,9 +163,9 @@ bool DL_List::empty()
too see if list contains only one object
\code
DL_List _intlist; #create a list of integers
-
+
if (_intlist.count() == 1)
-
+
cout << "one object in list";
\endcode
*/
@@ -181,11 +181,11 @@ int DL_List::count()
\note
The objects itself are not deleted, only removed from the list.
The user is responsible for memory management.
-
+
\note
The iterator level must be zero to be able to use this function,
else an error will be generated
-
+
\note
Use this function if an iterator is not needed to do more complex things.
This will save time, since the iterator does not have to be created.
@@ -194,13 +194,13 @@ int DL_List::count()
\code
DL_List _intlist; #create a list of integers
int a=123;
-
+
int b=345;
-
+
_intlist.insbegin(a);
-
+
_intlist.insbegin(b);
-
+
_intlist.remove_all();
\endcode
*/
@@ -233,28 +233,28 @@ remove the object at the begin of the list (head).
\note
The object itself is not deleted, only removed from the list.
The user is responsible for memory management.
-
+
\note
The iterator level must be zero to be able to use this function, else an error will be generated
-
+
\note
The list must contain objects, else an error will be generated.
-
+
\note
Use this function if an iterator is not needed to do more complex things. This will save time, since the iterator does not
have to be created.
-
+
\par Example:
too insert integer a at begin of list and remove it directly.
\code
DL_List _intlist; #create a list of integers
-
+
int a=123;
-
+
_intlist.insbegin(a)
-
+
_intlist.removehead();
-
+
\endcode
*/
template
@@ -277,7 +277,7 @@ void DL_List::removehead()
/*!
remove the object at the begin of the list (head).
-
+
\note
- The object itself is not deleted, only removed from the list.
The user is responsible for memory management.
@@ -286,18 +286,18 @@ remove the object at the begin of the list (head).
- The list must contain objects, else an error will be generated.
- Use this function if an iterator is not needed to do more complex things.
This will save time, since the iterator does not have to be created.
-
+
\par Example:
too insert integer a at end of list and remove it directly.
\code
DL_List _intlist; #create a list of integers
-
+
int a=123;
-
+
_intlist.insend(a)
-
+
_intlist.removetail();
-
+
\endcode
*/
template
@@ -322,7 +322,7 @@ insert the object given at the end of the list, after tail
\note
The iterator level must be zero to be able to use this function,
else an error will be generated
-
+
\note
Use this function if an iterator is not needed to do more complex things.
This will save time, since the iterator does not have to be created.
@@ -330,9 +330,9 @@ This will save time, since the iterator does not have to be created.
too insert integer a at end of list
\code
DL_List _intlist; #create a list of integers
-
+
int a=123;
-
+
_intlist.insend(a)
\endcode
\param newitem an object for which the template list was generated
@@ -360,18 +360,18 @@ insert the object given at the begin of the list, before head
\note
The iterator level must be zero to be able to use this function,
else an error will be generated
-
+
\note
Use this function if an iterator is not needed to do more complex things.
This will save time, since the iterator does not have to be created.
-
+
\par Example:
too insert integer a at begin of list
\code
DL_List _intlist; #create a list of integers
-
+
int a=123;
-
+
_intlist.insbegin(a)
\endcode
\param newitem an object for which the template list was generated
@@ -401,15 +401,15 @@ get head item
which is at head of list|
\code
DL_List _intlist; #create a list of integers
-
+
int a=123;
-
+
int b=345;
-
+
int c;
-
+
_intlist.insbegin(a)
-
+
_intlist.insbegin(b)
c=_intlist.headitem()
\endcode
@@ -428,15 +428,15 @@ get tail item
is at the tail of list
\code
DL_List _intlist; #create a list of integers
-
+
int a=123;
-
+
int b=345;
-
+
int c;
_intlist.insbegin(a)
_intlist.insbegin(b)
-
+
c=_intlist.headitem()
\endcode
*/
@@ -449,7 +449,7 @@ Dtype DL_List::tailitem()
/*!
* \note
The iterator level must be zero to be able to use this function, else an error will be generated
-
+
* \note The list may not be the same list as this list
* \param otherlist the list to take the items from
*/
@@ -497,23 +497,23 @@ void DL_List::takeover( DL_List* otherlist )
to insert integer a and b into list and remove_all directly using an iterator
\code
DL_List* a_list = new DL_List(); // declaration and allocation
-
+
int a=123;
-
+
int b=345;
-
+
{
-
+
DL_Iter* a_listiter=new DL_Iter(a_list);
-
+
a_listiter->insbegin(a)
-
+
a_listiter->insbegin(b)
-
+
a_listiter->remove_all()
-
+
} //to destruct the iterator before the list is deleted
-
+
delete a_list; #delete it (must have no iterators attached to it)
\endcode
*/
@@ -585,11 +585,11 @@ tcarg: class | Dtype | list item object
How to construct a list of type integer and a second iterator for it:|
\code
DL_List* IntegerList;
-
+
IntegerList = new DL_List();
-
+
DL_Iter* a_listiter=new DL_Iter(IntegerList);
-
+
DL_Iter* a_secondlistiter=new DL_Iter(a_listiter);
\endcode
\param otheriter other iterator on same list
@@ -610,21 +610,21 @@ Later on when a list is constructed,the iterator can be attached to it.
This way an iterator to a specific list can be made static to a class, and can be used
for several lists at the same time. \n
tcarg: class | Dtype | list item object
-
+
\par Example
How to construct an iterator, without having a list first.
This constructs an iterator for a list of the given type, but the list thus not yet exist.
\code
DL_Iter* a_iter=new DL_Iter();
-
+
DL_List* IntegerList;
-
+
IntegerList = new DL_List();
-
+
a_iter.Attach(IntegerList);
-
+
a_iter.insend(123);
-
+
a_iter.Detach();
\endcode
*/
@@ -655,15 +655,15 @@ static to a class, and can be used for several lists at the same time.\n
How to construct an iterator, without having a list first, and attach an iterator later:|
\code
DL_Iter* a_iter=new DL_Iter();
-
+
DL_List* IntegerList;
-
+
IntegerList = new DL_List();
-
+
a_iter.Attach(IntegerList);
-
+
a_iter.insend(123);
-
+
a_iter.Detach();
\endcode
\param newlist the list to attached the iterator to
@@ -687,15 +687,15 @@ and can be used for several lists at the same time. \n
How to construct an iterator, without having a list first, and attach an iterator later:
\code
DL_Iter* a_iter=new DL_Iter();
-
+
DL_List* IntegerList;
-
+
IntegerList = new DL_List();
-
+
a_iter.Attach(IntegerList);
-
+
a_iter.insend(123);
-
+
a_iter.Detach();
\endcode
\param newlist: the list to attached the iterator to
@@ -755,22 +755,22 @@ to move all objects in a list to the list of the iterator.
\note
The iterator level must be one to be able to use this function,
else an error will be generated
-
+
\note
The list may not be the same list as the iterator list
\par Example
to take over all items in _intlist|
\code
DL_List _intlist; #create a list of integers
-
+
DL_List _intlist2; #create a list of integers
-
+
int a=123;
-
+
DL_Iter* a_listiter2=new DL_Iter(&_intlist2);
-
+
_intlist->insend(a) // insert at end
-
+
a_listiter2->takeover(_intlist)
\endcode
\param otherlist the list to take the items from
@@ -808,28 +808,28 @@ void DL_Iter::takeover( DL_List* otherlist )
to move all objects in a list (using iterator of that list) to the list of the iterator.
\note
The iterator level for both iterators must be one to be able to use this function,
-
+
\note
else an error will be generated
-
+
\note
The list may not be the same list as the iterator list
-
+
\par Example
to take over all items in a_listiter1 it's list|
\code
DL_List _intlist; #create a list of integers
-
+
DL_List _intlist2; #create a list of integers
-
+
int a=123;
-
+
DL_Iter* a_listiter1=new DL_Iter(&_intlist);
-
+
DL_Iter* a_listiter2=new DL_Iter(&_intlist2);
-
+
a_listiter1->insend(a) // insert at end
-
+
a_listiter2->takeover(a_listiter1)
\\!to move all objects in a list (using iterator of that list) to the list of the iterator
\endcode
@@ -872,27 +872,27 @@ to move maxcount objects in a list (using iterator of that list)
to the list of the iterator.
\note The iterator level for both iterators must be one to be able to use this function,
else an error will be generated
-
+
\note The list may not be the same list as the iterator list
-
+
\note If less then maxcount objects are available in the source iterator,
all of them are taken and no error will accur
-
+
\par Example
to take over 1 item from a_listiter1 it's list
\code
DL_List _intlist; #create a list of integers
-
+
DL_List _intlist2; #create a list of integers
-
+
int a=123;
-
+
DL_Iter* a_listiter1=new DL_Iter(&_intlist);
-
+
DL_Iter* a_listiter2=new DL_Iter(&_intlist2);
-
+
a_listiter1->insend(a) // insert at end
-
+
a_listiter2->takeover(a_listiter1,1);
//! to move maxcount objects in a list (using iterator of that list) to the list of the iterator
\endcode
@@ -987,13 +987,13 @@ put the iterator root object before the current iterator position in the list.
The current object will become the new head of the list.
\note The iterator level must be one to be able to use this function,
else an error will be generated
-
+
\par Example
move the root object to make the new head the old tail object|
\code
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->insend(2345);
a_listiter->insend(3456);
@@ -1036,7 +1036,7 @@ The current object will become the new tail of the list.
\code
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->insend(2345);
a_listiter->insend(3456);
@@ -1076,7 +1076,7 @@ is list empty (contains items or not)?
\code
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
if (a_listiter->Empty())
cout << "empty"
\endcode
@@ -1100,7 +1100,7 @@ the end can be tested with this function.
\code
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->tohead();
//traverse forwards
while ( ! a_listiter->hitroot())
@@ -1108,7 +1108,7 @@ while ( ! a_listiter->hitroot())
cout << "The item =" << a_listiter->item();
a_listiter++; //goto next object
}
-
+
a_listiter->totail();
//traverse backwards
while ( ! a_listiter->hitroot())
@@ -1135,7 +1135,7 @@ is the iterator at the head of the list.
\code
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->tohead();
if (a_listiter->athead())
cout << "at the head The item =" << a_listiter->item();
@@ -1159,7 +1159,7 @@ is the iterator at the tail of the list.
\code
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->totail();
if (a_listiter->attail())
cout << "at the tail The item =" << a_listiter->item();
@@ -1183,7 +1183,7 @@ does the iterator/list contain the given object
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
a_listiter->insend(1234);
-
+
if (a_listiter->has(1234))
cout << "yes it does";
\endcode
@@ -1233,7 +1233,7 @@ go to first item, if list is empty goto hite
\code
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->tohead();
\endcode
@@ -1254,7 +1254,7 @@ go to last item, if list is empty goto hite
\code
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->totail();
\endcode
@@ -1275,7 +1275,7 @@ set the iterator position to the root (empty dummy) object in the list.
\code
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->toroot();
while (a_listiter->iterate())
@@ -1298,7 +1298,7 @@ how to iterate backwards
\code
DL_List _intlist; //create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->tohead();
while (!a_listiter->hitroot())
@@ -1324,7 +1324,7 @@ how to iterate backwards
\code
DL_List _intlist; //create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->tohead();
while (!a_listiter->hitroot())
@@ -1351,7 +1351,7 @@ how to iterate backwards
\code
DL_List _intlist; //create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->totail();
while (!a_listiter->hitroot())
@@ -1378,7 +1378,7 @@ how to iterate backwards
\code
DL_List _intlist; //create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->totail();
while (!a_listiter->hitroot())
@@ -1454,11 +1454,11 @@ put the iterator at the position of the given object in the list.
\code
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->insend(2345);
a_listiter->insend(3456);
-
+
a_listiter->toitem(2345); template
\endcode
*/
@@ -1488,7 +1488,7 @@ put the iterator at the same position as the given iterator in the list.
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
DL_Iter* a_listiter2=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->insend(2345);
a_listiter->insend(3456);
@@ -1535,27 +1535,27 @@ bool DL_Iter::tonode( DL_Node *othernode )
/*!
advance the iterator one position in the next direction in the list.
\return returns true if not at the end/root of the list else false.
-
+
\note This function combines iteration and testing for the end of
the list in one.
-
+
\note Therefore we do not have to advance the iterator ourselves.
-
+
\note
The iterator is first put to the next object, before testing for the end of the list. |
This is why we need to start at the root element in general usage.
-
+
\par Example
iterate through all the items in a list
\code
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->insend(2345);
a_listiter->insend(3456);
a_listiter->tobegin(2345);
-
+
while (a_listiter->iterate())
{ cout << a_listiter->item(); }
\endcode
@@ -1583,7 +1583,7 @@ since there is no item there.
\code
DL_List _intlist; //create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->tohead();
int theitem=a_listiter->item();
@@ -1634,11 +1634,11 @@ cycle the list twice
\code
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->insend(2345);
a_listiter->tohead();
-
+
int count=2*a_listiter->count();
while (count)
{
@@ -1681,11 +1681,11 @@ cycle the list twice
\code
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(1234);
a_listiter->insend(2345);
a_listiter->totail();
-
+
int count=2*a_listiter->count();
while (count)
{
@@ -1723,23 +1723,23 @@ void DL_Iter::remove_all()
/*!
remove object at current iterator position from the list.
\note The object itself is not deleted, only removed from the list. The user is responsible for memory management.
-
+
\note The iterator level must be one to be able to use this function, else an error will be generated
-
+
\note The list must contain an object at the current iterator position, else an error will be generated.
\par Example:
to insert integer a at begin of list and remove it directly
\code
DL_List _intlist; #create a list of integers
-
+
int a=123;
-
+
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insbegin(a);
-
+
a_listiter->tohead();
-
+
a_listiter->remove();
\endcode
*/
@@ -1767,21 +1767,21 @@ void DL_Iter::remove()
/*!
remove the object at the begin of the list using an iterator
\note The object itself is not deleted, only removed from the list. The user is responsible for memory management.
-
+
\note The iterator level must be one to be able to use this function, else an error will be generated
-
+
\note The list must contain objects, else an error will be generated.
-
+
\note Use this function if an iterator is needed to do more complex things. Else use the list member functions directly.
\par Example:
to insert integer a at begin of list and remove it directly|
\code
DL_List _intlist; #create a list of integers
-
+
int a=123;
-
+
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insbegin(a);
a_listiter->removehead();
\endcode
@@ -1808,21 +1808,21 @@ void DL_Iter::removehead()
/*!
//remove the object at the end of the list using an iterator
\note The object itself is not deleted, only removed from the list. The user is responsible for memory management.
-
+
\note The iterator level must be one to be able to use this function, else an error will be generated
-
+
\note The list must contain objects, else an error will be generated.
-
+
\note Use this function if an iterator is needed to do more complex things. Else use the list member functions directly.
\par Example:
to insert integer a at end of list and remove it directly
\code
DL_List _intlist; #create a list of integers
-
+
int a=123;
-
+
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(a);
a_listiter->removetail();
\endcode
@@ -1848,19 +1848,19 @@ void DL_Iter::removetail()
/*!
insert the object given at the end of the list
-
+
\note The iterator level must be one to be able to use this function, else an error will be generated
-
+
\note Use this function if an iterator is needed to do more complex things. Else use the list member functions directly.
\par Example:
to insert integer a at end of list|
\code
DL_List _intlist; #create a list of integers
-
+
int a=123;
-
+
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(a);
\endcode
*/
@@ -1882,18 +1882,18 @@ DL_Node* DL_Iter::insend( Dtype newitem )
/*!
insert the object given at the begin of the list
\note The iterator level must be one to be able to use this function, else an error will be generated
-
+
\note Use this function if an iterator is needed to do more complex things. Else use the list member functions directly.
-
+
\par Example:
to insert integer a at begin of list|
\code
DL_List _intlist; #create a list of integers
-
+
int a=123;
-
+
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insbegin(a);
\endcode
\param newitem an object for which the template list/iterator was generated
@@ -1919,9 +1919,9 @@ DL_Node* DL_Iter::insbegin( Dtype newitem )
to insert integer before the iterator position in the list|
\code
DL_List _intlist; #create a list of integers
-
+
int a=123;
-
+
DL_Iter* a_listiter=new DL_Iter(&_intlist);
a_listiter->totail();
a_listiter->insbefore(a); // insert before tail
@@ -1954,9 +1954,9 @@ insert the object given after the current position of the iterator in list
\par Example: to insert integer after the iterator position in the list|
\code
DL_List _intlist; #create a list of integers
-
+
int a=123;
-
+
DL_Iter* a_listiter=new DL_Iter(&_intlist);
a_listiter->tohead();
a_listiter->insafter(a); // insert after head
@@ -1986,30 +1986,30 @@ DL_Node* DL_Iter::insafter( Dtype newitem )
sort all items in the list according to the compare function.
when items need to be swapped to reach the right order the swap function will be called also.
\note There are no restrictions on the internal decision in the compare function when to return -1,0,1.
-
+
\note The swap function can be used to change items when they are swapped.
fcmp (function, fcmp)
\verbatim
-
+
Declaration: int (*fcmp) (Dtype,Dtype)
-
+
compare function pointer, the function takes two objects in the list. It must return -1, 0, 1, to sort the list in upgoing
order the function should return:
-
+
-1 is returned if the first object is bigger then the second.
0 is returned if the objects are equal.
1 is returned if the first object is smaller then the second.
-
+
To sort the list in downgoing order:
-
+
1 is returned if the first object is bigger then the second.
0 is returned if the objects are equal.
-1 is returned if the first object is smaller then the second.
-
+
fswap (function, fswap)
-
+
Declaration: void (*fswap) (Dtype,Dtype)
-
+
swap function pointer, the function takes two objects in the list. It will be called when the objects are swapped to
reach the right order. If it is NULL, it will not be called.
\endverbatim
@@ -2022,10 +2022,10 @@ int numbersorter(int a,int b)
if(a == b) return(0);
return(-1);
}
-
+
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(2345);
a_listiter->insend(3456);
a_listiter->insend(1234);
@@ -2110,34 +2110,34 @@ int DL_Iter::cocktailsort( int ( *fcmp ) ( Dtype, Dtype ), bool ( *fswap
/*!
sort all items in the list according to the compare function.
-
+
\note
There are no restrictions on the internal decision in the compare function when to return -1,0,1.
-
+
\note
For the mergesort function the objects will be swapped when the return value is -1.
-
+
\note
\verbatim
-
+
fcmp (function, fcmp)
-
+
Declaration: int (*fcmp) (Dtype,Dtype)
-
+
compare function pointer, the function takes two objects in the list. It must return -1, 0, 1, to sort the list in upgoing
order the function should return:
-
+
-1 is returned if the first object is bigger then the second.
0 is returned if the objects are equal.
1 is returned if the first object is smaller then the second.
-
+
To sort the list in downgoing order:
-
+
1 is returned if the first object is bigger then the second.
0 is returned if the objects are equal.
-1 is returned if the first object is smaller then the second.
\endverbatim
-
+
!tcarg: class | Dtype | list item object
\par example
sort the list in upgoing order using mergesort and the function numbersorter|
@@ -2149,10 +2149,10 @@ int numbersorter(int a,int b)
if(a == b) return(0);
return(-1);
}
-
+
DL_List _intlist; #create a list of integers
DL_Iter* a_listiter=new DL_Iter(&_intlist);
-
+
a_listiter->insend(2345);
a_listiter->insend(3456);
a_listiter->insend(1234);
diff --git a/polygon/kbool/include/kbool/_dl_itr.h b/polygon/kbool/include/kbool/_dl_itr.h
index 6e9c8ff073..54cad412ee 100644
--- a/polygon/kbool/include/kbool/_dl_itr.h
+++ b/polygon/kbool/include/kbool/_dl_itr.h
@@ -1,10 +1,10 @@
-/*! \file kbool/include/kbool/_dl_itr.h
- \author Klaas Holwerda
-
+/*! \file _dl_itr.h
+ \author Klaas Holwerda
+
Copyright: 2001-2004 (C) Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: _dl_itr.h,v 1.6 2009/09/10 17:04:09 titato Exp $
*/
diff --git a/polygon/kbool/include/kbool/_lnk_itr.cpp b/polygon/kbool/include/kbool/_lnk_itr.cpp
index b9a0dadfd6..a19cdf3577 100644
--- a/polygon/kbool/include/kbool/_lnk_itr.cpp
+++ b/polygon/kbool/include/kbool/_lnk_itr.cpp
@@ -1,10 +1,10 @@
-/*! \file kbool/_lnk_itr.cpp
+/*! \file _lnk_itr.cpp
\author Probably Klaas Holwerda
-
+
Copyright: 2001-2004 (C) Probably Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: _lnk_itr.cpp,v 1.4 2009/02/06 21:33:03 titato Exp $
*/
diff --git a/polygon/kbool/include/kbool/_lnk_itr.h b/polygon/kbool/include/kbool/_lnk_itr.h
index 3b077ca405..1b9a297c25 100644
--- a/polygon/kbool/include/kbool/_lnk_itr.h
+++ b/polygon/kbool/include/kbool/_lnk_itr.h
@@ -1,10 +1,10 @@
-/*! \file kbool/include/kbool/_lnk_itr.h
+/*! \file _lnk_itr.h
\author Klaas Holwerda
-
+
Copyright: 2001-2004 (C) Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: _lnk_itr.h,v 1.4 2009/09/10 17:04:09 titato Exp $
*/
diff --git a/polygon/kbool/include/kbool/booleng.h b/polygon/kbool/include/kbool/booleng.h
index a48601e260..5d0930d63a 100644
--- a/polygon/kbool/include/kbool/booleng.h
+++ b/polygon/kbool/include/kbool/booleng.h
@@ -1,10 +1,10 @@
-/*! \file include/booleng.h
+/*! \file booleng.h
\author Klaas Holwerda
-
+
Copyright: 2001-2004 (C) Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: booleng.h,v 1.9 2009/09/14 18:18:03 titato Exp $
*/
@@ -225,7 +225,7 @@ template class TDLI;
The boolean operation ( BOOL_OR, BOOL_AND, BOOL_EXOR, BOOL_A_SUB_B, BOOL_B_SUB_A )
are based on the two sets of polygons in group A and B.
The other operation on group A only.
-
+
At the end of the operation the resulting polygons can be extracted.
*/
class A2DKBOOLDLLEXP Bool_Engine
@@ -257,7 +257,7 @@ public:
/*
The algorithm takes into account gaps and inaccuracies caused by rounding to integer coordinates
in the original data.
- Imagine two rectangles one with a side ( 0,0 ) ( 2.0, 17.0 )
+ Imagine two rectangles one with a side ( 0,0 ) ( 2.0, 17.0 )
and the other has a side ( 0,0 ) ( 1.0, 8.5 )
If for some reason those coordinates where round to ( 0,0 ) ( 2, 17 ) ( 0,0 ) ( 1, 9 ),
there will be clearly a gap or overlap that was not intended.
@@ -280,8 +280,8 @@ public:
Grid makes sure that the integer data used within the algorithm has room for extra intersections
smaller than the smallest number within the input data.
The input data scaled up with DGrid is related to the accuracy the user has in his input data.
- Another scaling with Grid is applied on top of it to create space in the integer number for
- even smaller numbers.
+ Another scaling with Grid is applied on top of it to create space in the integer number for
+ even smaller numbers.
*/
void SetGrid( B_INT grid );
@@ -299,7 +299,7 @@ public:
doubles, part of the integers used in vertexes within the boolean algorithm.
And therefore DGRID bigger than 1 is not usefull, you would only loose accuracy.
Within the algorithm all input data is multiplied with DGRID, and the result
- is rounded to an integer.
+ is rounded to an integer.
*/
void SetDGrid( double dgrid );
@@ -417,7 +417,7 @@ public:
//! if set true holes are linked into outer contours by double overlapping segments.
/*!
- This mode is needed when the software using the boolean algorithm does
+ This mode is needed when the software using the boolean algorithm does
not understand hole polygons. In that case a contour and its holes form one
polygon. In cases where software understands the concept of holes, contours
are clockwise oriented, while holes are anticlockwise oriented.
@@ -457,11 +457,11 @@ public:
if (booleng->StartPolygonAdd(GROUP_A))
{
booleng->AddPoint(100,100);
- booleng->AddPoint(-100,100);
- booleng->AddPoint(-100,-100);
- booleng->AddPoint(100,-100);
+ booleng->AddPoint(-100,100);
+ booleng->AddPoint(-100,-100);
+ booleng->AddPoint(100,-100);
}
- booleng->EndPolygonAdd();
+ booleng->EndPolygonAdd();
\param A_or_B defines if the new polygon will be of group A or B
@@ -469,7 +469,7 @@ public:
to another polygon added.
So the contour polygon ClockWise, then add counterclockwise polygons for holes, and visa versa.
BUT only if m_orientationEntryMode is set true, else all polygons are redirected, and become
- individual areas without holes.
+ individual areas without holes.
Holes in such a case must be linked into the contour using two extra segments.
*/
bool StartPolygonAdd( GroupType A_or_B );
@@ -505,7 +505,7 @@ public:
/*!
This iterates through the first graph in the graphlist.
Setting the current kbNode properly by following the links in the graph
- through its nodes.
+ through its nodes.
*/
bool PolygonHasMorePoints();
diff --git a/polygon/kbool/include/kbool/graph.h b/polygon/kbool/include/kbool/graph.h
index acae6d8b26..24e21e65df 100644
--- a/polygon/kbool/include/kbool/graph.h
+++ b/polygon/kbool/include/kbool/graph.h
@@ -1,10 +1,10 @@
-/*! \file include/graph.h
+/*! \file graph.h
\author Klaas Holwerda
-
+
Copyright: 2001-2004 (C) Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: graph.h,v 1.5 2009/09/10 17:04:09 titato Exp $
*/
diff --git a/polygon/kbool/include/kbool/graphlst.h b/polygon/kbool/include/kbool/graphlst.h
index 9bbe771aac..1a9028c25b 100644
--- a/polygon/kbool/include/kbool/graphlst.h
+++ b/polygon/kbool/include/kbool/graphlst.h
@@ -1,10 +1,10 @@
-/*! \file include/graphlst.h
+/*! \file graphlst.h
\author Klaas Holwerda
-
+
Copyright: 2001-2004 (C) Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: graphlst.h,v 1.4 2009/09/10 17:04:09 titato Exp $
*/
diff --git a/polygon/kbool/include/kbool/line.h b/polygon/kbool/include/kbool/line.h
index 351f8c72a4..07187e825e 100644
--- a/polygon/kbool/include/kbool/line.h
+++ b/polygon/kbool/include/kbool/line.h
@@ -1,11 +1,11 @@
-/*! \file include/line.h
+/*! \file line.h
\brief Mainy used for calculating crossings
\author Klaas Holwerda
-
+
Copyright: 2001-2004 (C) Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: line.h,v 1.5 2009/09/10 17:04:09 titato Exp $
*/
diff --git a/polygon/kbool/include/kbool/link.h b/polygon/kbool/include/kbool/link.h
index c01f55c64e..d7f1301338 100644
--- a/polygon/kbool/include/kbool/link.h
+++ b/polygon/kbool/include/kbool/link.h
@@ -1,11 +1,11 @@
-/*! \file include/link.h
+/*! \file link.h
\brief Part of a graph, connection between nodes (Header)
\author Klaas Holwerda or Julian Smart
-
+
Copyright: 2001-2004 (C) Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: link.h,v 1.5 2009/09/10 17:04:09 titato Exp $
*/
@@ -23,13 +23,13 @@ class kbRecord;
//! segment within a graph
/*
- A Graph contains a list of kbLink, the kbLink or connected by Node's.
- Several kbLink can be connected to one Node.
+ A Graph contains a list of kbLink, the kbLink or connected by Node's.
+ Several kbLink can be connected to one Node.
A kbLink has a direction defined by its begin and end node.
Node do have a list of connected kbLink's.
So one can walk trough a graph in two ways:
- 1- via its kbLink list
- 2- via the node connected to the kbLink's
+ 1- via its kbLink list
+ 2- via the node connected to the kbLink's
*/
class A2DKBOOLDLLEXP kbLink
{
diff --git a/polygon/kbool/include/kbool/lpoint.h b/polygon/kbool/include/kbool/lpoint.h
index 457a87742b..3c9c737a14 100644
--- a/polygon/kbool/include/kbool/lpoint.h
+++ b/polygon/kbool/include/kbool/lpoint.h
@@ -1,10 +1,10 @@
-/*! \file include/lpoint.h
+/*! \file lpoint.h
\author Klaas Holwerda
-
+
Copyright: 2001-2004 (C) Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: lpoint.h,v 1.4 2009/09/10 17:04:09 titato Exp $
*/
diff --git a/polygon/kbool/include/kbool/node.h b/polygon/kbool/include/kbool/node.h
index 4539cac2ac..db32f25855 100644
--- a/polygon/kbool/include/kbool/node.h
+++ b/polygon/kbool/include/kbool/node.h
@@ -1,11 +1,11 @@
-/*! \file include/node.h
+/*! \file node.h
\brief Holds a GDSII node structure (Header)
\author Klaas Holwerda
-
+
Copyright: 2001-2004 (C) Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: node.h,v 1.7 2009/09/14 16:50:12 titato Exp $
*/
@@ -60,7 +60,7 @@ public:
kbLink* GetNotFlat();
//! get a link to a hole or from a hole.
- kbLink* GetHoleLink( kbLink* const prev, LinkStatus whatside,
+ kbLink* GetHoleLink( kbLink* const prev, LinkStatus whatside,
bool checkbin, BOOL_OP operation );
int Merge( kbNode* );
diff --git a/polygon/kbool/include/kbool/record.h b/polygon/kbool/include/kbool/record.h
index a3f7453d68..d0bb2a7cd3 100644
--- a/polygon/kbool/include/kbool/record.h
+++ b/polygon/kbool/include/kbool/record.h
@@ -1,10 +1,10 @@
-/*! \file include/record.h
+/*! \file record.h
\author Klaas Holwerda
-
+
Copyright: 2001-2004 (C) Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: record.h,v 1.5 2009/09/10 17:04:09 titato Exp $
*/
diff --git a/polygon/kbool/include/kbool/scanbeam.h b/polygon/kbool/include/kbool/scanbeam.h
index 6732995308..43eb09e716 100644
--- a/polygon/kbool/include/kbool/scanbeam.h
+++ b/polygon/kbool/include/kbool/scanbeam.h
@@ -1,10 +1,10 @@
-/*! \file include/scanbeam.h
+/*! \file scanbeam.h
\author Klaas Holwerda
-
+
Copyright: 2001-2004 (C) Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: scanbeam.h,v 1.6 2009/09/10 17:04:09 titato Exp $
*/
diff --git a/polygon/kbool/include/kbool/statusb.h b/polygon/kbool/include/kbool/statusb.h
index 4c7b351152..f961a84fb9 100644
--- a/polygon/kbool/include/kbool/statusb.h
+++ b/polygon/kbool/include/kbool/statusb.h
@@ -1,10 +1,10 @@
-/*! \file kbool/include/kbool/statusb.h
+/*! \file statusb.h
\author Probably Klaas Holwerda
-
+
Copyright: 2001-2004 (C) Probably Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: statusb.h,v 1.3 2009/02/06 21:33:03 titato Exp $
*/
diff --git a/polygon/kbool/include/kbool/valuesvc.h b/polygon/kbool/include/kbool/valuesvc.h
index b8e3624f59..bf4e83ec0b 100644
--- a/polygon/kbool/include/kbool/valuesvc.h
+++ b/polygon/kbool/include/kbool/valuesvc.h
@@ -1,9 +1,9 @@
-/*! \file kbool/include/kbool/valuesvc.h
+/*! \file valuesvc.h
\author Probably Klaas Holwerda
-
+
Copyright: 2001-2004 (C) Probably Klaas Holwerda
-
- Licence: see kboollicense.txt
-
+
+ Licence: see kboollicense.txt
+
RCS-ID: $Id: valuesvc.h,v 1.2 2009/02/06 21:33:03 titato Exp $
*/
diff --git a/polygon/math_for_graphics.cpp b/polygon/math_for_graphics.cpp
index b362851821..34c3f129d6 100644
--- a/polygon/math_for_graphics.cpp
+++ b/polygon/math_for_graphics.cpp
@@ -17,7 +17,7 @@ using namespace std;
* Function TestLineHit
* test for hit on line segment i.e. a point within a given distance from segment
* @param x, y = cursor coords
- * @param xi,yi and xf,yf = the end-points of the line segment
+ * @param xi,yi,xf,yf = the end-points of the line segment
* @param dist = maximum distance for hit
* return true if dist < distance between the point and the segment
*/
@@ -484,7 +484,7 @@ int FindLineSegmentIntersection( double a, double b, int xi, int yi, int xf, int
return 1;
}
-/**
+/*
* Function TestForIntersectionOfStraightLineSegments
* Test for intersection of line segments
* If lines are parallel, returns false
diff --git a/polygon/math_for_graphics.h b/polygon/math_for_graphics.h
index 24e0d5050b..99271bbe6d 100644
--- a/polygon/math_for_graphics.h
+++ b/polygon/math_for_graphics.h
@@ -64,7 +64,7 @@ int GetClearanceBetweenSegments( int x1i, int y1i, int x1f, int y1f, int style1,
* Function GetPointToLineSegmentDistance
* Get distance between line segment and point
* @param x,y = point
- * @param xi,yi and xf,yf = the end-points of the line segment
+ * @param xi,yi, xf,yf = the end-points of the line segment
* @return the distance
*/
double GetPointToLineSegmentDistance( int x, int y, int xi, int yi, int xf, int yf );