Skip to content

K
kicad-source-mirror
Commit c759be6f authored by CHARRAS's avatar CHARRAS
Browse files
Options

eeschema: problems found. some (not all) solved (see changelog)

parent 36554e68
Expand all Show whitespace changes
Inline Side-by-side
Showing with 231 additions and 180 deletions
change_log.txt
View file @ c759be6f
......@@ -5,6 +5,21 @@ Started 2007-June-11
Please add newer entries at the top, list the date and your name with
email address.
2008-Feb-21 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
+eeschema
added : full text conversion between text, label, global label and hierarchical label
some problems fixed:
- annotation incorrectly cleared.
- reference not copied in component copy.
- incorrect redo when changing the chip name in component edition
bugs not fixed
- undo/redo problems when changing a text type between text, label, global label and hierarchical label
- incorrect annotation in complex hierarchy with multi parts per package (duplicates created).
2008-Feb-20 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
+eeschema
......
eeschema/component_class.cpp
View file @ c759be6f
This diff is collapsed.
eeschema/edit_label.cpp
View file @ c759be6f
......@@ -117,7 +117,7 @@ void WinEDA_SchematicFrame::EditSchematicText( DrawTextStruct* TextStruct,
wxDC* DC )
/*************************************************************************/
/* Edit the properties of the text (Label, Gloab label, graphic text).. )
/* Edit the properties of the text (Label, Global label, graphic text).. )
* pointed by "TextStruct"
*/
{
......@@ -330,7 +330,7 @@ void WinEDA_SchematicFrame::ConvertTextType( DrawTextStruct* Text,
/*****************************************************************************/
/* Routine to change a text type to an other one (GraphicText, label or Glabel).
* A new test, label or global label is created from the old text.
* A new test, label or hierarchical or global label is created from the old text.
* the old text is deleted
*/
{
......@@ -389,10 +389,10 @@ void WinEDA_SchematicFrame::ConvertTextType( DrawTextStruct* Text,
{
DrawPanel->ForceCloseManageCurseur( DrawPanel, DC );
}
if( (flags & IS_NEW) == 0 ) // Delete old text and save it in undo list
if( (flags & IS_NEW) == 0 ) // Remove old text from current list and save it in undo list
{
Text->m_Flags = 0;
DeleteStruct( DrawPanel, DC, Text );
DeleteStruct( DrawPanel, DC, Text ); // old text is really saved in undo list
GetScreen()->SetCurItem( NULL );
g_ItemToRepeat = NULL;
}
......
eeschema/onrightclick.cpp
View file @ c759be6f
......@@ -380,6 +380,8 @@ void AddMenusForGLabel( wxMenu* PopMenu, DrawGlobalLabelStruct* GLabel )
_( "Change to Label" ), glabel2label_xpm );
ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_COMMENT,
_( "Change to Text" ), glabel2text_xpm );
ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_HLABEL,
_( "Change to Hierarchical Label" ), label2glabel_xpm );
ADD_MENUITEM_WITH_SUBMENU( PopMenu, menu_change_type,
ID_POPUP_SCH_CHANGE_TYPE_TEXT, _( "Change Type" ), gl_change_xpm );
}
......@@ -402,6 +404,8 @@ void AddMenusForHLabel( wxMenu* PopMenu, DrawHierLabelStruct* HLabel )
_( "Change to Label" ), glabel2label_xpm );
ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_COMMENT,
_( "Change to Text" ), glabel2text_xpm );
ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_GLABEL,
_( "Change to Global label" ), label2glabel_xpm );
ADD_MENUITEM_WITH_SUBMENU( PopMenu, menu_change_type,
ID_POPUP_SCH_CHANGE_TYPE_TEXT, _( "Change Type" ), gl_change_xpm );
}
......@@ -424,9 +428,11 @@ void AddMenusForLabel( wxMenu* PopMenu, DrawLabelStruct* Label )
// add menu change type text (to label, glabel, text):
ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_GLABEL,
_( "Change to Glabel" ), label2glabel_xpm );
_( "Change to Global label" ), label2glabel_xpm );
ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_COMMENT,
_( "Change to Text" ), label2text_xpm );
ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_HLABEL,
_( "Change to Hierarchical Label" ), label2glabel_xpm );
ADD_MENUITEM_WITH_SUBMENU( PopMenu, menu_change_type,
ID_POPUP_SCH_CHANGE_TYPE_TEXT, _( "Change Type" ), gl_change_xpm );
}
......@@ -450,6 +456,8 @@ void AddMenusForText( wxMenu* PopMenu, DrawTextStruct* Text )
// add menu change type text (to label, glabel, text):
ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_LABEL,
_( "Change to Label" ), label2text_xpm );
ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_HLABEL,
_( "Change to Hierarchical Label" ), label2glabel_xpm );
ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_GLABEL,
_( "Change to Glabel" ), label2glabel_xpm );
ADD_MENUITEM_WITH_SUBMENU( PopMenu, menu_change_type,
......
eeschema/schedit.cpp
View file @ c759be6f
......@@ -42,6 +42,7 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
case ID_POPUP_SCH_EDIT_TEXT:
case ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_LABEL:
case ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_GLABEL:
case ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_HLABEL:
case ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_COMMENT:
case ID_POPUP_SCH_SET_SHAPE_TEXT:
case ID_POPUP_SCH_ROTATE_TEXT:
......@@ -395,6 +396,12 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
&dc, DRAW_GLOBAL_LABEL_STRUCT_TYPE );
break;
case ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_HLABEL:
DrawPanel->MouseToCursorSchema();
ConvertTextType( (DrawTextStruct*) GetScreen()->GetCurItem(),
&dc, DRAW_HIER_LABEL_STRUCT_TYPE );
break;
case ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_COMMENT:
DrawPanel->MouseToCursorSchema();
ConvertTextType( (DrawTextStruct*) GetScreen()->GetCurItem(),
......@@ -403,7 +410,7 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
case ID_POPUP_SCH_SET_SHAPE_TEXT:
// Non utilis�
// Not used
break;
case ID_POPUP_SCH_ROTATE_FIELD:
......
include/build_version.h
View file @ c759be6f
......@@ -5,7 +5,7 @@
COMMON_GLOBL wxString g_BuildVersion
#ifdef EDA_BASE
(wxT("(2008-02-13)"))
(wxT("(2008-02-20)"))
#endif
;
......
include/id.h
View file @ c759be6f
......@@ -355,7 +355,7 @@ enum main_id {
ID_POPUP_SCH_ADD_JUNCTION,
ID_POPUP_SCH_ADD_LABEL,
ID_POPUP_SCH_ADD_GLABEL,
ID_POPUP_SCH_UNUSED0,
ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_HLABEL,
ID_POPUP_SCH_UNUSED1,
ID_POPUP_SCH_UNUSED2,
ID_POPUP_SCH_UNUSED3,
......
internat/fr/kicad.mo
View file @ c759be6f
No preview for this file type
internat/fr/kicad.po
View file @ c759be6f
......@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kicad\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2008-02-20 20:29+0100\n"
"PO-Revision-Date: 2008-02-21 07:51+0100\n"
"Last-Translator: \n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n"
......@@ -3633,9 +3633,8 @@ msgid "Apply"
msgstr "Appliquer"
#: pcbnew/specctra_import.cpp:74
#, fuzzy
msgid "Merge Specctra Session file:"
msgstr "Fichier Specctra DSN"
msgstr "Fichier Specctra Session Fusionner:"
#: pcbnew/specctra_import.cpp:100
msgid "BOARD may be corrupted, do not save it."
......@@ -3643,17 +3642,17 @@ msgstr "Le PCB peut
#: pcbnew/specctra_import.cpp:102
msgid "Fix problem and try again."
msgstr ""
msgstr "Fixer le problme et recommencer."
#: pcbnew/specctra_import.cpp:116
msgid "Session file imported and merged OK."
msgstr ""
msgstr "Fichier Session import et fusionn correctement."
#: pcbnew/specctra_import.cpp:182
#: pcbnew/specctra_import.cpp:290
#, c-format
msgid "Session file uses invalid layer id \"%s\""
msgstr ""
msgstr "Le Fichier Session utilise une couche invalide n \"%s\""
#: pcbnew/specctra_import.cpp:232
msgid "Session via padstack has no shapes"
......@@ -4434,9 +4433,8 @@ msgid "Last Change"
msgstr "Last Change"
#: pcbnew/class_module.cpp:1076
#, fuzzy
msgid "Netlist path"
msgstr "Netliste: "
msgstr "Chemin Netliste "
#: pcbnew/class_module.cpp:1110
msgid "3D-Shape"
......@@ -4575,14 +4573,14 @@ msgid "%s not found"
msgstr "%s non trouv"
#: pcbnew/cross-probing.cpp:111
#, fuzzy, c-format
#, c-format
msgid "%s pin %s not found"
msgstr " fichier %s non trouv"
msgstr "%s pin %s non trouve"
#: pcbnew/cross-probing.cpp:113
#, fuzzy, c-format
#, c-format
msgid "%s pin %s found"
msgstr " non trouv"
msgstr "%s pin %s trouve"
#: pcbnew/specctra_export.cpp:64
msgid "Specctra DSN file:"
......@@ -4604,7 +4602,7 @@ msgstr "Le composant avec valeur \"%s\" a une r
#: pcbnew/specctra_export.cpp:728
#, c-format
msgid "Multiple components have identical reference IDs of \"%s\"."
msgstr ""
msgstr "Multiple composants ont une reference identique \"%s\"."
#: pcbnew/class_drawsegment.cpp:161
msgid "Shape"
......@@ -5607,9 +5605,9 @@ msgid "Warning HLabel %s not connected to SheetLabel"
msgstr "Attention HLabel %s non connect a SheetLabel"
#: eeschema/erc.cpp:562
#, fuzzy, c-format
#, c-format
msgid "Warning SheetLabel %s not connected to HLabel"
msgstr "Warning SheetLabel %s non connect a GLabel"
msgstr "Warning SheetLabel %s non connect a HLabel"
#: eeschema/erc.cpp:576
#, c-format
......@@ -5645,22 +5643,21 @@ msgid "ERC control"
msgstr "Controle ERC"
#: eeschema/erc.cpp:742
#, fuzzy
msgid ""
"\n"
"***** Sheet Root\n"
msgstr ""
"\n"
"***** feuille %d (%s)\n"
"***** Feuillet Racine\n"
#: eeschema/erc.cpp:745
#, fuzzy, c-format
#, c-format
msgid ""
"\n"
"***** Sheet %s\n"
msgstr ""
"\n"
"***** feuille %d (%s)\n"
"***** Feuille %s\n"
#: eeschema/erc.cpp:762
#, c-format
......@@ -6119,14 +6116,14 @@ msgstr ""
"#Cmp ( ordre = Valeur )"
#: eeschema/dialog_build_BOM.cpp:1315
#, fuzzy, c-format
#, c-format
msgid "> %-28.28s %s (Sheet %s) pos: %3.3f, %3.3f\n"
msgstr "> %-28.28s Global (feuille %.2d) pos: %3.3f, %3.3f\n"
msgstr "> %-28.28s %s (Feuille %s) pos: %3.3f, %3.3f\n"
#: eeschema/dialog_build_BOM.cpp:1335
#, fuzzy, c-format
#, c-format
msgid "> %-28.28s Sheet %-7.7s (Sheet %s) pos: %3.3f, %3.3f\n"
msgstr "> %-28.28s Sheet %-7.7s (feuille %.2d) pos: %3.3f, %3.3f\n"
msgstr "> %-28.28s Sheet %-7.7s (Feuillet %s) pos: %3.3f, %3.3f\n"
#: eeschema/dialog_build_BOM.cpp:1349
msgid "#End labels\n"
......@@ -6834,7 +6831,7 @@ msgstr "Visualisateur des librairies"
#: eeschema/sheet.cpp:162
msgid "Filename (will be created upon save if it does not already exist):"
msgstr ""
msgstr "Nom Fichier (sera cre la sauvegarde si il n'existe pas dj):"
#: eeschema/sheet.cpp:174
msgid "Sheetname:"
......@@ -7099,26 +7096,22 @@ msgid "Place the bus to bus entry"
msgstr "Addition d'entres de bus (type bus vers bus)"
#: eeschema/menubar.cpp:254
#, fuzzy
msgid "No connect flag"
msgstr "Addition de symboles de non connexion"
msgstr "Symbole de Non Connexion"
#: eeschema/menubar.cpp:255
#: eeschema/tool_sch.cpp:189
#, fuzzy
msgid "Place the no connect flag"
msgstr "Addition de symboles de non connexion"
msgstr "Placer le symbole de non connexion"
#: eeschema/menubar.cpp:264
#, fuzzy
msgid "Net name"
msgstr "NetName"
msgstr "Net Name"
#: eeschema/menubar.cpp:265
#: eeschema/tool_sch.cpp:193
#, fuzzy
msgid "Place the net name"
msgstr "Place Feuille"
msgstr "Placer le nom de net"
#: eeschema/menubar.cpp:272
msgid "Global label"
......@@ -7126,7 +7119,7 @@ msgstr "Label Global"
#: eeschema/menubar.cpp:273
msgid "Place the global label. Warning: all global labels with the same name are connected in whole hierarchy"
msgstr ""
msgstr "Placerun label global. Attention: tous les labels globaux avec le mme nom sont connects dans toute la hierarchie"
#: eeschema/menubar.cpp:282
#: eeschema/eelayer.h:85
......@@ -7215,9 +7208,8 @@ msgid "&Edit"
msgstr "&Editer"
#: eeschema/menubar.cpp:407
#, fuzzy
msgid "&View"
msgstr "&ViewLogic"
msgstr "&Voir"
#: eeschema/menubar.cpp:408
msgid "&Place"
......@@ -10562,7 +10554,6 @@ msgid "SheetLabel (Pin Sheet)"
msgstr "Supprimer Connecteur de hirarchie"
#: eeschema/eelayer.h:195
#, fuzzy
msgid "Hierarchical Label"
msgstr "Label Hirarchique"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment