fixed bug 583939

demos/sonde xilinx/sonde xilinx.pro

-update=14/3/2007-09:03:09
-version=1
-last_client=pcbnew
-[cvpcb]
-NetITyp=0
-NetIExt=.net
-PkgIExt=.pkg
-NetDir=
-LibDir=
-NetType=0
-[general]
-version=1
-RootSch=sonde.sch
-BoardNm=sonde.brd
-[eeschema]
-version=1
-LibDir=
-NetFmt=1
-HPGLSpd=20
-HPGLDm=15
-HPGLNum=1
-offX_A4=0
-offY_A4=0
-offX_A3=0
-offY_A3=0
-offX_A2=0
-offY_A2=0
-offX_A1=0
-offY_A1=0
-offX_A0=0
-offY_A0=0
-offX_A=0
-offY_A=0
-offX_B=0
-offY_B=0
-offX_C=0
-offY_C=0
-offX_D=0
-offY_D=0
-offX_E=0
-offY_E=0
-RptD_X=0
-RptD_Y=100
-RptLab=1
-PenMin=20
-SimCmd=
-UseNetN=0
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=conn
-LibName4=linear
-LibName5=regul
-LibName6=74xx
-LibName7=cmos4000
-LibName8=adc-dac
-LibName9=memory
-LibName10=xilinx
-LibName11=special
-LibName12=microcontrollers
-LibName13=microchip
-LibName14=microchip1
-LibName15=analog_switches
-LibName16=motorola
-LibName17=intel
-LibName18=audio
-LibName19=interface
-LibName20=digital-audio
-LibName21=philips
-LibName22=display
-LibName23=cypress
-LibName24=siliconi
-LibName25=contrib
-[pcbnew]
-version=1
-PadDrlX=320
-PadDimH=620
-PadDimV=1220
-PadForm=1
-PadMask=14745599
-ViaDiam=700
-ViaDril=250
-Isol=100
-Countlayer=2
-Lpiste=170
-RouteTo=15
-RouteBo=0
-TypeVia=3
-Segm45=1
-Racc45=1
-Unite=0
-SegFill=1
-SegAffG=0
-NewAffG=1
-PadFill=1
-PadAffG=1
-PadSNum=1
-ModAffC=1
-ModAffT=1
-PcbAffT=1
-SgPcb45=1
-TxtPcbV=600
-TxtPcbH=600
-TxtModV=600
-TxtModH=120
-TxtModW=120
-HPGLnum=1
-HPGdiam=15
-HPGLSpd=20
-HPGLrec=2
-HPGLorg=0
-GERBmin=15
-VEgarde=100
-DrawLar=120
-EdgeLar=120
-TxtLar=120
-MSegLar=120
-ForPlot=1
-WpenSer=10
-UserGrX=0,01
-UserGrY=0,01
-UserGrU=1
-DivGrPc=1
-TimeOut=600
-MaxLnkS=3
-ShowRat=0
-ShowMRa=1
-[pcbnew/libraries]
-LibDir=
-LibName1=supports
-LibName2=connect
-LibName3=discret
-LibName4=pin_array
-LibName5=divers
-LibName6=libcms
-LibName7=display
-LibName8=valves
+update=20/05/2010 10:19:24
+version=1
+last_client=pcbnew
+[cvpcb]
+NetITyp=0
+NetIExt=.net
+PkgIExt=.pkg
+NetDir=
+LibDir=
+NetType=0
+[general]
+version=1
+RootSch=sonde.sch
+BoardNm=sonde.brd
+[eeschema]
+version=1
+LibDir=
+NetFmt=1
+HPGLSpd=20
+HPGLDm=15
+HPGLNum=1
+offX_A4=0
+offY_A4=0
+offX_A3=0
+offY_A3=0
+offX_A2=0
+offY_A2=0
+offX_A1=0
+offY_A1=0
+offX_A0=0
+offY_A0=0
+offX_A=0
+offY_A=0
+offX_B=0
+offY_B=0
+offX_C=0
+offY_C=0
+offX_D=0
+offY_D=0
+offX_E=0
+offY_E=0
+RptD_X=0
+RptD_Y=100
+RptLab=1
+PenMin=20
+SimCmd=
+UseNetN=0
+[eeschema/libraries]
+LibName1=power
+LibName2=device
+LibName3=conn
+LibName4=linear
+LibName5=regul
+LibName6=74xx
+LibName7=cmos4000
+LibName8=adc-dac
+LibName9=memory
+LibName10=xilinx
+LibName11=special
+LibName12=microcontrollers
+LibName13=microchip
+LibName14=microchip1
+LibName15=analog_switches
+LibName16=motorola
+LibName17=intel
+LibName18=audio
+LibName19=interface
+LibName20=digital-audio
+LibName21=philips
+LibName22=display
+LibName23=cypress
+LibName24=siliconi
+LibName25=contrib
+[pcbnew]
+version=1
+PadDrlX=320
+PadDimH=620
+PadDimV=900
+BoardThickness=630
+SgPcb45=1
+TxtPcbV=600
+TxtPcbH=600
+TxtModV=600
+TxtModH=120
+TxtModW=120
+VEgarde=100
+DrawLar=120
+EdgeLar=120
+TxtLar=120
+MSegLar=120
+LastNetListRead=
+[pcbnew/libraries]
+LibDir=
+LibName1=supports
+LibName2=connect
+LibName3=discret
+LibName4=pin_array
+LibName5=divers
+LibName6=libcms
+LibName7=display
+LibName8=valves

demos/video/video-cache.lib

-EESchema-LIBRARY Version 2.3  Date: 09/02/2010 21:37:25
+EESchema-LIBRARY Version 2.3  Date: 16/05/2010 20:17:13
 #
 # +12V
 #
@@ -909,6 +909,7 @@ $FPLIST
  SM0603
  SM0805
  R?-*
+ SM1206
 $ENDFPLIST
 DRAW
 S -40 150 40 -150 0 1 12 N

eeschema/edit_component_in_schematic.cpp

@@ -359,7 +359,6 @@ void WinEDA_SchematicFrame::EditComponentFootprint( SCH_COMPONENT* Cmp, wxDC* DC
 {
     wxString       message;
     LIB_COMPONENT* Entry;
-    bool           wasEmpty = false;
 
     if( Cmp == NULL )
         return;
@@ -371,19 +370,20 @@ void WinEDA_SchematicFrame::EditComponentFootprint( SCH_COMPONENT* Cmp, wxDC* DC
 
     SCH_FIELD* TextField = Cmp->GetField( FOOTPRINT );
 
-    message = TextField->m_Text;
-    if( message.IsEmpty() )
-        wasEmpty = true;
-
     if( Get_Message( _( "Footprint" ), _( "Component footprint" ), message, this ) )
-        message.Empty();    // allow the user to remove the value.
+        return;    // edition cancelled by user.
+
+    bool wasEmpty = false;
+    if( TextField->m_Text.IsEmpty() )
+        wasEmpty = true;
 
     // save old cmp in undo list if not already in edit, or moving ...
     if( Cmp->m_Flags == 0 )
         SaveCopyInUndoList( Cmp, UR_CHANGED );
     Cmp->GetField( FOOTPRINT )->Draw( DrawPanel, DC, wxPoint( 0, 0 ), g_XorMode );
 
-    // move the field if it was new.
+    // Give a suitable position to the field if it was new,
+    // and therefore has no position already given.
     if( wasEmpty && !message.IsEmpty() )
     {
         Cmp->GetField( FOOTPRINT )->m_Pos = Cmp->GetField( REFERENCE )->m_Pos;
@@ -400,13 +400,12 @@ void WinEDA_SchematicFrame::EditComponentFootprint( SCH_COMPONENT* Cmp, wxDC* DC
             ( -1 * Cmp->GetField( REFERENCE )->m_Size.y );
 
         Cmp->GetField( FOOTPRINT )->m_Orient = Cmp->GetField( REFERENCE )->m_Orient;
-
-        TextField->m_Text = message;
-
-        Cmp->GetField( FOOTPRINT )->Draw( DrawPanel, DC, wxPoint( 0, 0 ),
-                                          Cmp->m_Flags ? g_XorMode : GR_DEFAULT_DRAWMODE );
-        OnModify();
     }
 
+    TextField->m_Text = message;
+    Cmp->GetField( FOOTPRINT )->Draw( DrawPanel, DC, wxPoint( 0, 0 ),
+                                      Cmp->m_Flags ? g_XorMode : GR_DEFAULT_DRAWMODE );
+    OnModify();
+
     Cmp->DisplayInfo( this );
 }