From 7af67a89430535a8e784b0ce9f611db839101df9 Mon Sep 17 00:00:00 2001 From: charras Date: Sat, 17 Oct 2009 06:23:18 +0000 Subject: [PATCH] fixed compil error, and a display problem in eeschema --- common/get_component_dialog.cpp | 2 +- eeschema/class_libentry.h | 3 ++- eeschema/class_sch_component.cpp | 2 +- eeschema/viewlib_frame.cpp | 5 +++++ packaging/mac-osx/__MACOSX/._osx-package.pmdoc | Bin 82 -> 0 bytes ...rbview-contents.xml => 04gerbview-contents.xml} | 2 +- packaging/mac-osx/osx-package.pmdoc/04gerbview.xml | 1 + .../mac-osx/osx-package.pmdoc/04kicad-contents.xml | 1 - packaging/mac-osx/osx-package.pmdoc/04kicad.xml | 1 - packaging/mac-osx/osx-package.pmdoc/05gerbview.xml | 1 - .../mac-osx/osx-package.pmdoc/05kicad-contents.xml | 1 + packaging/mac-osx/osx-package.pmdoc/05kicad.xml | 1 + .../mac-osx/osx-package.pmdoc/06demos-contents.xml | 1 - packaging/mac-osx/osx-package.pmdoc/06demos.xml | 1 - 14 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 packaging/mac-osx/__MACOSX/._osx-package.pmdoc rename packaging/mac-osx/osx-package.pmdoc/{05gerbview-contents.xml => 04gerbview-contents.xml} (59%) create mode 100644 packaging/mac-osx/osx-package.pmdoc/04gerbview.xml delete mode 100644 packaging/mac-osx/osx-package.pmdoc/04kicad-contents.xml delete mode 100644 packaging/mac-osx/osx-package.pmdoc/04kicad.xml delete mode 100644 packaging/mac-osx/osx-package.pmdoc/05gerbview.xml create mode 100644 packaging/mac-osx/osx-package.pmdoc/05kicad-contents.xml create mode 100644 packaging/mac-osx/osx-package.pmdoc/05kicad.xml delete mode 100644 packaging/mac-osx/osx-package.pmdoc/06demos-contents.xml delete mode 100644 packaging/mac-osx/osx-package.pmdoc/06demos.xml diff --git a/common/get_component_dialog.cpp b/common/get_component_dialog.cpp index 9797c52095..dc8aa5d67d 100644 --- a/common/get_component_dialog.cpp +++ b/common/get_component_dialog.cpp @@ -59,7 +59,7 @@ WinEDA_SelectCmp::WinEDA_SelectCmp( WinEDA_DrawFrame* parent, Text = new wxStaticText( this, -1, _( "Name:" ) ); LeftBoxSizer->Add( Text, 0, wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 5 ); - m_TextCtrl = new wxTextCtrl( this, ID_ENTER_NAME, *m_Text ); + m_TextCtrl = new wxTextCtrl( this, ID_ENTER_NAME, m_Text ); m_TextCtrl->SetInsertionPoint( 1 ); LeftBoxSizer->Add( m_TextCtrl, 0, diff --git a/eeschema/class_libentry.h b/eeschema/class_libentry.h index fae79f068a..3675003976 100644 --- a/eeschema/class_libentry.h +++ b/eeschema/class_libentry.h @@ -194,7 +194,8 @@ public: * @param transformMatrix - Cooridinate adjustment settings. * @param showPinText - Show pin text if true. * @param drawFields - Draw field text if true otherwise just draw - * body items. + * body items (useful to draw a body in schematic, + * because fields of schematic components replace the lib component fields). * @param onlySelected - Draws only the body items that are selected. * Used for block move redraws. */ diff --git a/eeschema/class_sch_component.cpp b/eeschema/class_sch_component.cpp index 69df67043d..1a9731b1b8 100644 --- a/eeschema/class_sch_component.cpp +++ b/eeschema/class_sch_component.cpp @@ -204,7 +204,7 @@ void SCH_COMPONENT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, Entry->Draw( panel, DC, m_Pos + offset, dummy ? 0 : m_Multi, dummy ? 0 : m_Convert, DrawMode, Color, m_Transform, - DrawPinText ); + DrawPinText, false ); SCH_CMP_FIELD* field = GetField( REFERENCE ); diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp index 6b83be5026..93ea77a7f1 100644 --- a/eeschema/viewlib_frame.cpp +++ b/eeschema/viewlib_frame.cpp @@ -104,6 +104,11 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame( wxWindow* father, SetBaseScreen( new SCH_SCREEN() ); GetScreen()->m_Center = true; // set to true to have the coordinates origine -0,0) centered on screen LoadSettings(); + // Initilialize grid id to a default value if not found in config or bad: + if( (m_LastGridSizeId <= 0) || + (m_LastGridSizeId < (ID_POPUP_GRID_USER - ID_POPUP_GRID_LEVEL_1000)) ) + m_LastGridSizeId = ID_POPUP_GRID_LEVEL_50 - ID_POPUP_GRID_LEVEL_1000; + SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y ); GetScreen()->SetGrid( ID_POPUP_GRID_LEVEL_1000 + m_LastGridSizeId ); diff --git a/packaging/mac-osx/__MACOSX/._osx-package.pmdoc b/packaging/mac-osx/__MACOSX/._osx-package.pmdoc deleted file mode 100644 index 0ddac7cfd48e9d9839c1e384c0ce652b38b5b311..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 82 ucmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDI}u>uf-_(4F700IamG7A6;S_Clw diff --git a/packaging/mac-osx/osx-package.pmdoc/05gerbview-contents.xml b/packaging/mac-osx/osx-package.pmdoc/04gerbview-contents.xml similarity index 59% rename from packaging/mac-osx/osx-package.pmdoc/05gerbview-contents.xml rename to packaging/mac-osx/osx-package.pmdoc/04gerbview-contents.xml index 36acdfdd8a..eecb493223 100644 --- a/packaging/mac-osx/osx-package.pmdoc/05gerbview-contents.xml +++ b/packaging/mac-osx/osx-package.pmdoc/04gerbview-contents.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packaging/mac-osx/osx-package.pmdoc/04gerbview.xml b/packaging/mac-osx/osx-package.pmdoc/04gerbview.xml new file mode 100644 index 0000000000..758b5a9f0c --- /dev/null +++ b/packaging/mac-osx/osx-package.pmdoc/04gerbview.xml @@ -0,0 +1 @@ +net.sourceforge.kicad.gerbview1../../gerbview/gerbview.app/Applications/KicadinstallTorelocatableinstallTo.isAbsoluteTypeinstallFrom.pathrequireAuthorizationparentversioninstallTo.pathincludeRootidentifier04gerbview-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/packaging/mac-osx/osx-package.pmdoc/04kicad-contents.xml b/packaging/mac-osx/osx-package.pmdoc/04kicad-contents.xml deleted file mode 100644 index 6ca0de4235..0000000000 --- a/packaging/mac-osx/osx-package.pmdoc/04kicad-contents.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packaging/mac-osx/osx-package.pmdoc/04kicad.xml b/packaging/mac-osx/osx-package.pmdoc/04kicad.xml deleted file mode 100644 index 791b895fa3..0000000000 --- a/packaging/mac-osx/osx-package.pmdoc/04kicad.xml +++ /dev/null @@ -1 +0,0 @@ -net.sourceforge.kicad.kicad1../kicad/kicad.app/Applications/KicadparentinstallFrom.pathrequireAuthorizationinstallTo.isAbsoluteTyperelocatableinstallTo.pathincludeRootinstallToidentifier04kicad-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/packaging/mac-osx/osx-package.pmdoc/05gerbview.xml b/packaging/mac-osx/osx-package.pmdoc/05gerbview.xml deleted file mode 100644 index 7fa03ab417..0000000000 --- a/packaging/mac-osx/osx-package.pmdoc/05gerbview.xml +++ /dev/null @@ -1 +0,0 @@ -net.sourceforge.kicad.gerbview1../gerbview/gerbview.app/Applications/KicadparentinstallTo.pathrequireAuthorizationinstallTo.isAbsoluteTyperelocatableversionincludeRootinstallFrom.pathinstallToidentifier05gerbview-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/packaging/mac-osx/osx-package.pmdoc/05kicad-contents.xml b/packaging/mac-osx/osx-package.pmdoc/05kicad-contents.xml new file mode 100644 index 0000000000..6d343e6283 --- /dev/null +++ b/packaging/mac-osx/osx-package.pmdoc/05kicad-contents.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packaging/mac-osx/osx-package.pmdoc/05kicad.xml b/packaging/mac-osx/osx-package.pmdoc/05kicad.xml new file mode 100644 index 0000000000..142060a7ab --- /dev/null +++ b/packaging/mac-osx/osx-package.pmdoc/05kicad.xml @@ -0,0 +1 @@ +net.sourceforge.kicad1.0../../kicad/kicad.app/ApplicationsinstallFrom.pathidentifierparent05kicad-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/packaging/mac-osx/osx-package.pmdoc/06demos-contents.xml b/packaging/mac-osx/osx-package.pmdoc/06demos-contents.xml deleted file mode 100644 index 3464b6c412..0000000000 --- a/packaging/mac-osx/osx-package.pmdoc/06demos-contents.xml +++ /dev/null @@ -1 +0,0 @@ -modemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemode \ No newline at end of file diff --git a/packaging/mac-osx/osx-package.pmdoc/06demos.xml b/packaging/mac-osx/osx-package.pmdoc/06demos.xml deleted file mode 100644 index 930de6b029..0000000000 --- a/packaging/mac-osx/osx-package.pmdoc/06demos.xml +++ /dev/null @@ -1 +0,0 @@ -net.sourceforge.kicad.demos1../demos/Applications/KicadparentinstallTo.pathrequireAuthorizationinstallTo.isAbsoluteTypeinstallTo.isRelativeTypeincludeRootinstallFrom.pathinstallToidentifier06demos-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$/CMakeLists.txt \ No newline at end of file