rpms/kicad/F-12 kicad-2010.05.27.3Dviewer-arcs-draw-issue.patch, NONE, 1.1 kicad-2010.05.27.fix-unwanted-mouse-cursor-move.patch, NONE, 1.1 kicad-2010.05.27.missing-focus.patch, NONE, 1.1 kicad-2010.05.27.undo-redo-issue.patch, NONE, 1.1 kicad-2010.05.27.real-version.patch, 1.1, 1.2 kicad.spec, 1.27, 1.28
Alain Portal
dionysos at fedoraproject.org
Thu Jun 10 18:43:13 UTC 2010
- Previous message: rpms/kicad/F-13 kicad-2010.05.27.3Dviewer-arcs-draw-issue.patch, NONE, 1.1 kicad-2010.05.27.fix-unwanted-mouse-cursor-move.patch, NONE, 1.1 kicad-2010.05.27.missing-focus.patch, NONE, 1.1 kicad-2010.05.27.undo-redo-issue.patch, NONE, 1.1 kicad-2010.05.27.real-version.patch, 1.1, 1.2 kicad.spec, 1.27, 1.28
- Next message: rpms/kicad/F-11 kicad-2010.05.27.3Dviewer-arcs-draw-issue.patch, NONE, 1.1 kicad-2010.05.27.fix-unwanted-mouse-cursor-move.patch, NONE, 1.1 kicad-2010.05.27.missing-focus.patch, NONE, 1.1 kicad-2010.05.27.undo-redo-issue.patch, NONE, 1.1 kicad-2010.05.27.real-version.patch, 1.1, 1.2 kicad.spec, 1.25, 1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dionysos
Update of /cvs/pkgs/rpms/kicad/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12079
Modified Files:
kicad-2010.05.27.real-version.patch kicad.spec
Added Files:
kicad-2010.05.27.3Dviewer-arcs-draw-issue.patch
kicad-2010.05.27.fix-unwanted-mouse-cursor-move.patch
kicad-2010.05.27.missing-focus.patch
kicad-2010.05.27.undo-redo-issue.patch
Log Message:
* Mon Jun 8 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.27-4
- Fix a focus issue (https://bugs.launchpad.net/kicad/+bug/587970)
- Fix an unwanted mouse cursor move when using the t hotkey in pcbnew
- Fix an issue on arcs draw in 3D viewer (https://bugs.launchpad.net/kicad/+bug/588882)
* Mon May 31 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.27-3
- Fix an undo-redo issue (https://bugs.launchpad.net/kicad/+bug/586032)
kicad-2010.05.27.3Dviewer-arcs-draw-issue.patch:
3d_draw.cpp | 55 +++++++++++++++++++++++++++++++++++--------------------
1 file changed, 35 insertions(+), 20 deletions(-)
--- NEW FILE kicad-2010.05.27.3Dviewer-arcs-draw-issue.patch ---
--- 3d-viewer/3d_draw.cpp.orig 2010-05-28 21:47:32.000000000 +0200
+++ 3d-viewer/3d_draw.cpp 2010-06-08 22:14:59.000000000 +0200
@@ -32,8 +32,8 @@
double width, double holex,
double holey, double holeradius,
double zpos );
-static void Draw3D_ArcSegment( double startx, double starty, double endx,
- double endy, double width, double zpos );
+static void Draw3D_ArcSegment( double startx, double starty, double centrex,
+ double centrey, double arc_angle, double width, double zpos );
static void Draw3D_CircleSegment( double startx, double starty, double endx,
double endy, double width, double zpos );
static int Get3DLayerEnable( int act_layer );
@@ -530,7 +530,7 @@
switch( segment->m_Shape )
{
case S_ARC:
- Draw3D_ArcSegment( x, -y, xf, -yf, w, zpos );
+ Draw3D_ArcSegment( x, -y, xf, -yf, (double) segment->m_Angle, w, zpos );
break;
case S_CIRCLE:
@@ -552,7 +552,7 @@
switch( segment->m_Shape )
{
case S_ARC:
- Draw3D_ArcSegment( x, -y, xf, -yf, w, zpos );
+ Draw3D_ArcSegment( x, -y, xf, -yf, (double) segment->m_Angle, w, zpos );
break;
case S_CIRCLE:
@@ -759,7 +759,7 @@
break;
case S_ARC:
- Draw3D_ArcSegment( x, -y, fx, -fy, w, zpos );
+ Draw3D_ArcSegment( x, -y, fx, -fy, (double) m_Angle, w, zpos );
break;
default:
@@ -1196,27 +1196,42 @@
}
-static void Draw3D_ArcSegment( double startx, double starty, double endx,
- double endy, double width, double zpos )
+static void Draw3D_ArcSegment( double startx, double starty, double centrex,
+ double centrey, double arc_angle, double width, double zpos )
{
- int ii, slice = 36;
- double x, y, hole, rayon;
- int angle;
+ int ii;
+ int slice = 36; // Number of segments to approximate a circle by segments
+ double hole, rayon;
+ double arcStart_Angle;
- angle = static_cast<int>( atan2( startx - endx, starty - endy ) *
- 1800 / M_PI ) + 900;
- rayon = hypot( startx - endx, starty - endy ) + ( width / 2);
+ arcStart_Angle = (atan2( startx - centrex, starty - centrey ) * 1800 / M_PI );
+ rayon = hypot( startx - centrex, starty - centrey ) + ( width / 2);
hole = rayon - width;
+ // Calculate the number of segments to approximate this arc
+ int imax = (int) ( (double) arc_angle * slice / 3600.0 );
+ if( imax < 0 )
+ imax = -imax;
+ if (imax == 0 )
+ imax = 1;
+
+ // Adjust delta_angle to have exactly imax segments in arc_angle
+ // i.e. arc_angle = imax delta_agnle.
+ double delta_angle = (double) arc_angle / imax;
+
glBegin( GL_QUAD_STRIP );
- for( ii = 0; ii <= slice / 4; ii++ )
+ for( ii = 0; ii <= imax; ii++ )
{
- x = hole; y = 0.0;
- RotatePoint( &x, &y, angle + ( ii * 3600 / slice ) );
- glVertex3f( x + startx, y + starty, zpos );
- x = rayon; y = 0.0;
- RotatePoint( &x, &y, angle + ( ii * 3600 / slice ) );
- glVertex3f( x + startx, y + starty, zpos );
+ double angle = (double) ii * delta_angle;
+ angle += arcStart_Angle + 900;
+ double dx = hole;
+ double dy = 0.0;
+ RotatePoint( &dx, &dy, (int)angle );
+ glVertex3f( dx + startx, dy + starty, zpos );
+ dx = rayon;
+ dy = 0.0;
+ RotatePoint( &dx, &dy, (int)angle );
+ glVertex3f( dx + startx, dy + starty, zpos );
}
glEnd();
kicad-2010.05.27.fix-unwanted-mouse-cursor-move.patch:
edit.cpp | 2 +-
hotkeys.cpp | 2 ++
modules.cpp | 3 ---
3 files changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE kicad-2010.05.27.fix-unwanted-mouse-cursor-move.patch ---
diff -ru kicad-2010.05.27/pcbnew/edit.cpp kicad-2010.06.08/pcbnew/edit.cpp
--- kicad-2010.05.27/pcbnew/edit.cpp 2010-05-28 21:47:32.000000000 +0200
+++ kicad-2010.06.08/pcbnew/edit.cpp 2010-06-08 20:36:39.000000000 +0200
@@ -582,7 +582,6 @@
g_Drag_Pistes_On = true;
case ID_POPUP_PCB_MOVE_MODULE_REQUEST:
-
// If the current Item is a pad, text module ...: Get its parent
if( GetCurItem()->Type() != TYPE_MODULE )
SetCurItem( GetCurItem()->GetParent() );
@@ -591,6 +590,7 @@
g_Drag_Pistes_On = false;
break;
}
+ GetScreen()->m_Curseur = ((MODULE*) GetCurItem())->m_Pos;
DrawPanel->MouseToCursorSchema();
StartMove_Module( (MODULE*) GetCurItem(), &dc );
break;
diff -ru kicad-2010.05.27/pcbnew/hotkeys.cpp kicad-2010.06.08/pcbnew/hotkeys.cpp
--- kicad-2010.05.27/pcbnew/hotkeys.cpp 2010-05-28 21:47:32.000000000 +0200
+++ kicad-2010.06.08/pcbnew/hotkeys.cpp 2010-06-08 20:36:39.000000000 +0200
@@ -657,6 +657,8 @@
// fall through
case HK_MOVE_FOOTPRINT: // Start move module
+ GetScreen()->m_Curseur = module->m_Pos;
+ DrawPanel->MouseToCursorSchema();
StartMove_Module( module, DC );
break;
}
diff -ru kicad-2010.05.27/pcbnew/modules.cpp kicad-2010.06.08/pcbnew/modules.cpp
--- kicad-2010.05.27/pcbnew/modules.cpp 2010-05-28 21:47:32.000000000 +0200
+++ kicad-2010.06.08/pcbnew/modules.cpp 2010-06-08 20:36:39.000000000 +0200
@@ -100,9 +100,6 @@
GetBoard()->m_Status_Pcb &= ~RATSNEST_ITEM_LOCAL_OK;
module->m_Flags |= IS_MOVED;
- GetScreen()->m_Curseur = module->m_Pos;
- DrawPanel->MouseToCursorSchema();
-
/* Show ratsnest. */
if( GetBoard()->IsElementVisible(RATSNEST_VISIBLE) )
DrawGeneralRatsnest( DC );
kicad-2010.05.27.missing-focus.patch:
common/get_component_dialog.cpp | 35 +++++++++++++++++++++++------------
include/get_component_dialog.h | 3 +--
2 files changed, 24 insertions(+), 14 deletions(-)
--- NEW FILE kicad-2010.05.27.missing-focus.patch ---
diff -ru kicad-2010.05.27/common/get_component_dialog.cpp kicad-2010.06.08/common/get_component_dialog.cpp
--- kicad-2010.05.27/common/get_component_dialog.cpp 2010-05-28 21:47:32.000000000 +0200
+++ kicad-2010.06.08/common/get_component_dialog.cpp 2010-06-08 20:36:39.000000000 +0200
@@ -21,7 +21,7 @@
BEGIN_EVENT_TABLE( WinEDA_SelectCmp, wxDialog )
EVT_BUTTON( ID_ACCEPT_NAME, WinEDA_SelectCmp::Accept )
EVT_BUTTON( ID_ACCEPT_KEYWORD, WinEDA_SelectCmp::Accept )
- EVT_BUTTON( ID_CANCEL, WinEDA_SelectCmp::Accept )
+ EVT_BUTTON( wxID_CANCEL, WinEDA_SelectCmp::Accept )
EVT_BUTTON( ID_LIST_ALL, WinEDA_SelectCmp::Accept )
EVT_BUTTON( ID_EXTRA_TOOL, WinEDA_SelectCmp::GetExtraSelection )
EVT_LISTBOX( ID_SEL_BY_LISTBOX, WinEDA_SelectCmp::Accept )
@@ -39,10 +39,19 @@
bool show_extra_tool ) :
wxDialog( parent, -1, Title, framepos, wxDefaultSize, DIALOG_STYLE )
{
+ m_AuxTool = show_extra_tool;
+ InitDialog( HistoryList );
+
+ GetSizer()->Fit( this );
+ GetSizer()->SetSizeHints( this );
+}
+
+void WinEDA_SelectCmp::InitDialog( wxArrayString& aHistoryList )
+{
+
wxButton* Button;
wxStaticText* Text;
- m_AuxTool = show_extra_tool;
m_GetExtraFunction = false;
wxBoxSizer* MainBoxSizer = new wxBoxSizer( wxHORIZONTAL );
@@ -58,20 +67,19 @@
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->SetInsertionPoint( 1 );
- m_TextCtrl->SetFocus();
+ m_TextCtrl = new wxTextCtrl( this, wxID_ANY );
+ m_TextCtrl->SetFocus(); // text value will be initialized later by calling GetComponentName()
LeftBoxSizer->Add( m_TextCtrl,
0,
wxGROW | wxLEFT | wxRIGHT | wxBOTTOM | wxADJUST_MINSIZE,
5 );
+
Text = new wxStaticText( this, -1, _( "History list:" ) );
LeftBoxSizer->Add( Text, 0, wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 5 );
m_List = new wxListBox( this, ID_SEL_BY_LISTBOX, wxDefaultPosition,
- wxSize( 220, -1 ), HistoryList, wxLB_SINGLE );
+ wxSize( 220, -1 ), aHistoryList, wxLB_SINGLE );
LeftBoxSizer->Add( m_List,
0,
wxGROW | wxLEFT | wxRIGHT | wxBOTTOM | wxADJUST_MINSIZE,
@@ -87,7 +95,7 @@
Button = new wxButton( this, ID_ACCEPT_KEYWORD, _( "Search by Keyword" ) );
RightBoxSizer->Add( Button, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
- Button = new wxButton( this, ID_CANCEL, _( "Cancel" ) );
+ Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
RightBoxSizer->Add( Button, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
Button = new wxButton( this, ID_LIST_ALL, _( "List All" ) );
@@ -100,9 +108,6 @@
RightBoxSizer->Add( Button, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
}
#endif
-
- GetSizer()->Fit( this );
- GetSizer()->SetSizeHints( this );
}
@@ -124,7 +129,7 @@
m_Text = wxT( "= " ) + m_TextCtrl->GetValue();
break;
- case ID_CANCEL:
+ case wxID_CANCEL:
m_Text = wxEmptyString;
id = wxID_CANCEL;
break;
@@ -156,16 +161,22 @@
}
+// Return the component name selected by the dialog
wxString WinEDA_SelectCmp::GetComponentName( void )
{
return m_Text;
}
+/* Initialize the default component name default choice
+*/
void WinEDA_SelectCmp::SetComponentName( const wxString& name )
{
if( m_TextCtrl )
+ {
m_TextCtrl->SetValue( name );
+ m_TextCtrl->SetSelection(-1, -1);
+ }
}
diff -ru kicad-2010.05.27/include/get_component_dialog.h kicad-2010.06.08/include/get_component_dialog.h
--- kicad-2010.05.27/include/get_component_dialog.h 2010-05-28 21:47:33.000000000 +0200
+++ kicad-2010.06.08/include/get_component_dialog.h 2010-06-08 20:36:39.000000000 +0200
@@ -18,8 +18,6 @@
enum selcmp_id {
ID_ACCEPT_NAME = 3900,
ID_ACCEPT_KEYWORD,
- ID_ENTER_NAME,
- ID_CANCEL,
ID_LIST_ALL,
ID_EXTRA_TOOL,
ID_SEL_BY_LISTBOX
@@ -48,6 +46,7 @@
void SetComponentName( const wxString& name );
private:
+ void InitDialog( wxArrayString& aHistoryList );
void Accept( wxCommandEvent& event );
void GetExtraSelection( wxCommandEvent& event );
kicad-2010.05.27.undo-redo-issue.patch:
class_sch_component.cpp | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE kicad-2010.05.27.undo-redo-issue.patch ---
--- eeschema/class_sch_component.cpp.orig 2010-05-28 19:08:39.000000000 +0200
+++ eeschema/class_sch_component.cpp 2010-05-31 22:16:03.000000000 +0200
@@ -608,6 +608,7 @@
GetField(ii)->SetParent( this );
}
+ EXCHG( m_PathsAndReferences, copyitem->m_PathsAndReferences);
}
kicad-2010.05.27.real-version.patch:
build_version.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: kicad-2010.05.27.real-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-12/kicad-2010.05.27.real-version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kicad-2010.05.27.real-version.patch 30 May 2010 21:52:57 -0000 1.1
+++ kicad-2010.05.27.real-version.patch 10 Jun 2010 18:43:12 -0000 1.2
@@ -1,11 +1,11 @@
--- common/build_version.cpp.orig 2010-05-28 21:47:34.000000000 +0200
-+++ common/build_version.cpp 2010-05-29 15:32:11.000000000 +0200
++++ common/build_version.cpp 2010-06-08 20:51:20.000000000 +0200
@@ -6,7 +6,7 @@
#endif
#ifndef KICAD_BUILD_VERSION
-#define KICAD_BUILD_VERSION "(2010-00-09 BZR 23xx)"
-+#define KICAD_BUILD_VERSION "(2010-05-09 BZR 2363)"
++#define KICAD_BUILD_VERSION "(2010-05-09 BZR 2366)"
#endif
#define VERSION_STABILITY "stable"
Index: kicad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-12/kicad.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- kicad.spec 30 May 2010 22:07:20 -0000 1.27
+++ kicad.spec 10 Jun 2010 18:43:13 -0000 1.28
@@ -1,6 +1,6 @@
Name: kicad
Version: 2010.05.27
-Release: 2.rev2363%{?dist}
+Release: 4.rev2363%{?dist}
Summary: Electronic schematic diagrams and printed circuit board artwork
Summary(fr): Saisie de schéma électronique et routage de circuit imprimé
@@ -24,6 +24,10 @@ Source6: %{name}-icons.tar.bz2
Patch10: %{name}-%{version}.real-version.patch
Patch11: %{name}-%{version}.display-footprint-value.patch
Patch12: %{name}-%{version}.set-extension-if-missing.patch
+Patch13: %{name}-%{version}.undo-redo-issue.patch
+Patch14: %{name}-%{version}.missing-focus.patch
+Patch15: %{name}-%{version}.fix-unwanted-mouse-cursor-move.patch
+Patch16: %{name}-%{version}.3Dviewer-arcs-draw-issue.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -179,6 +183,10 @@ Documentation and tutorials for Kicad in
%patch10 -p0 -b .real-version
%patch11 -p0 -b .display-footprint-value
%patch12 -p0 -b .set-extension-if-missing
+%patch13 -p0 -b .undo-redo-issue
+%patch14 -p1 -b .missing-focus
+%patch15 -p1 -b .fix-unwanted-mouse-cursor-move
+%patch16 -p0 -b .3Dviewer-arcs-draw-issue
#kicad-doc.noarch: W: file-not-utf8 /usr/share/doc/kicad/AUTHORS.txt
iconv -f iso8859-1 -t utf-8 AUTHORS.txt > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS.txt
@@ -301,12 +309,6 @@ install -pm 644 %{name}-icons/resources/
%{__cp} -pr AUTHORS.txt CHANGELOG* version.txt %{buildroot}%{_docdir}/%{name}
-# Delete backup of patched files
-%{__rm} -f %{buildroot}%{_datadir}/applications/*.desktops
-%{__rm} -f %{buildroot}%{_datadir}/mime/packages/*.mimetype
-%{__rm} -f %{buildroot}%{_datadir}/mimelnk/application/*.mimetype
-
-
%find_lang %{name}
@@ -405,7 +407,15 @@ gtk-update-icon-cache %{_datadir}/icons/
%changelog
-* Sun May 29 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.27-2
+* Mon Jun 8 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.27-4
+- Fix a focus issue (https://bugs.launchpad.net/kicad/+bug/587970)
+- Fix an unwanted mouse cursor move when using the t hotkey in pcbnew
+- Fix an issue on arcs draw in 3D viewer (https://bugs.launchpad.net/kicad/+bug/588882)
+
+* Mon May 31 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.27-3
+- Fix an undo-redo issue (https://bugs.launchpad.net/kicad/+bug/586032)
+
+* Sun May 30 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.27-2
- Don't forget icons
* Sat May 29 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.27-1
- Previous message: rpms/kicad/F-13 kicad-2010.05.27.3Dviewer-arcs-draw-issue.patch, NONE, 1.1 kicad-2010.05.27.fix-unwanted-mouse-cursor-move.patch, NONE, 1.1 kicad-2010.05.27.missing-focus.patch, NONE, 1.1 kicad-2010.05.27.undo-redo-issue.patch, NONE, 1.1 kicad-2010.05.27.real-version.patch, 1.1, 1.2 kicad.spec, 1.27, 1.28
- Next message: rpms/kicad/F-11 kicad-2010.05.27.3Dviewer-arcs-draw-issue.patch, NONE, 1.1 kicad-2010.05.27.fix-unwanted-mouse-cursor-move.patch, NONE, 1.1 kicad-2010.05.27.missing-focus.patch, NONE, 1.1 kicad-2010.05.27.undo-redo-issue.patch, NONE, 1.1 kicad-2010.05.27.real-version.patch, 1.1, 1.2 kicad.spec, 1.25, 1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list