Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
f76041e9
Commit
f76041e9
authored
Jun 04, 2014
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some compil warnings and Debug assertions
parent
43167593
Changes
18
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
67 additions
and
39 deletions
+67
-39
stroke_font.cpp
common/gal/stroke_font.cpp
+2
-2
class_components_listbox.cpp
cvpcb/class_components_listbox.cpp
+4
-4
class_footprints_listbox.cpp
cvpcb/class_footprints_listbox.cpp
+2
-2
class_library_listbox.cpp
cvpcb/class_library_listbox.cpp
+2
-2
cvstruct.h
cvpcb/cvstruct.h
+3
-3
dialog_erc_listbox.h
eeschema/dialog_erc_listbox.h
+23
-6
dialog_lib_edit_text_base.cpp
eeschema/dialogs/dialog_lib_edit_text_base.cpp
+1
-1
dialog_lib_edit_text_base.fbp
eeschema/dialogs/dialog_lib_edit_text_base.fbp
+1
-1
dialog_drc_base.cpp
pcbnew/dialogs/dialog_drc_base.cpp
+8
-1
dialog_drc_base.fbp
pcbnew/dialogs/dialog_drc_base.fbp
+3
-1
dialog_drc_base.h
pcbnew/dialogs/dialog_drc_base.h
+4
-2
dialog_gendrill_base.cpp
pcbnew/dialogs/dialog_gendrill_base.cpp
+1
-2
dialog_gendrill_base.fbp
pcbnew/dialogs/dialog_gendrill_base.fbp
+1
-1
dialog_gendrill_base.h
pcbnew/dialogs/dialog_gendrill_base.h
+1
-1
dialog_netlist_fbp.cpp
pcbnew/dialogs/dialog_netlist_fbp.cpp
+1
-2
dialog_netlist_fbp.fbp
pcbnew/dialogs/dialog_netlist_fbp.fbp
+3
-1
dialog_netlist_fbp.h
pcbnew/dialogs/dialog_netlist_fbp.h
+1
-1
idf_parser.cpp
utils/idftools/idf_parser.cpp
+6
-6
No files found.
common/gal/stroke_font.cpp
View file @
f76041e9
...
@@ -268,7 +268,7 @@ void STROKE_FONT::drawSingleLineText( const UTF8& aText )
...
@@ -268,7 +268,7 @@ void STROKE_FONT::drawSingleLineText( const UTF8& aText )
// If it is a double tilda, just process the second one
// If it is a double tilda, just process the second one
}
}
unsigned
dd
=
*
chIt
-
' '
;
int
dd
=
*
chIt
-
' '
;
if
(
dd
>=
m_glyphBoundingBoxes
.
size
()
||
dd
<
0
)
if
(
dd
>=
m_glyphBoundingBoxes
.
size
()
||
dd
<
0
)
dd
=
'?'
-
' '
;
dd
=
'?'
-
' '
;
...
@@ -336,7 +336,7 @@ VECTOR2D STROKE_FONT::computeTextSize( const UTF8& aText ) const
...
@@ -336,7 +336,7 @@ VECTOR2D STROKE_FONT::computeTextSize( const UTF8& aText ) const
}
}
// Index in the bounding boxes table
// Index in the bounding boxes table
unsigned
dd
=
*
it
-
' '
;
int
dd
=
*
it
-
' '
;
if
(
dd
>=
m_glyphBoundingBoxes
.
size
()
||
dd
<
0
)
if
(
dd
>=
m_glyphBoundingBoxes
.
size
()
||
dd
<
0
)
dd
=
'?'
-
' '
;
dd
=
'?'
-
' '
;
...
...
cvpcb/class_components_listbox.cpp
View file @
f76041e9
...
@@ -71,7 +71,7 @@ void COMPONENTS_LISTBOX::SetString( unsigned linecount, const wxString& text )
...
@@ -71,7 +71,7 @@ void COMPONENTS_LISTBOX::SetString( unsigned linecount, const wxString& text )
if
(
linecount
>=
m_ComponentList
.
Count
()
)
if
(
linecount
>=
m_ComponentList
.
Count
()
)
linecount
=
m_ComponentList
.
Count
()
-
1
;
linecount
=
m_ComponentList
.
Count
()
-
1
;
if
(
linecount
>=
0
)
if
(
m_ComponentList
.
Count
()
>
0
)
m_ComponentList
[
linecount
]
=
text
;
m_ComponentList
[
linecount
]
=
text
;
}
}
...
@@ -89,9 +89,9 @@ wxString COMPONENTS_LISTBOX::OnGetItemText( long item, long column ) const
...
@@ -89,9 +89,9 @@ wxString COMPONENTS_LISTBOX::OnGetItemText( long item, long column ) const
}
}
void
COMPONENTS_LISTBOX
::
SetSelection
(
unsigned
index
,
bool
State
)
void
COMPONENTS_LISTBOX
::
SetSelection
(
int
index
,
bool
State
)
{
{
if
(
(
int
)
index
>=
GetCount
()
)
if
(
index
>=
GetCount
()
)
index
=
GetCount
()
-
1
;
index
=
GetCount
()
-
1
;
if
(
(
index
>=
0
)
&&
(
GetCount
()
>
0
)
)
if
(
(
index
>=
0
)
&&
(
GetCount
()
>
0
)
)
...
@@ -164,7 +164,7 @@ void COMPONENTS_LISTBOX::OnChar( wxKeyEvent& event )
...
@@ -164,7 +164,7 @@ void COMPONENTS_LISTBOX::OnChar( wxKeyEvent& event )
if
(
key
==
start_char
)
if
(
key
==
start_char
)
{
{
SetSelection
(
ii
,
true
);
// Ensure visible
SetSelection
(
(
int
)
ii
,
true
);
// Ensure visible
break
;
break
;
}
}
}
}
...
...
cvpcb/class_footprints_listbox.cpp
View file @
f76041e9
...
@@ -101,9 +101,9 @@ wxString FOOTPRINTS_LISTBOX::OnGetItemText( long item, long column ) const
...
@@ -101,9 +101,9 @@ wxString FOOTPRINTS_LISTBOX::OnGetItemText( long item, long column ) const
}
}
void
FOOTPRINTS_LISTBOX
::
SetSelection
(
unsigned
index
,
bool
State
)
void
FOOTPRINTS_LISTBOX
::
SetSelection
(
int
index
,
bool
State
)
{
{
if
(
(
int
)
index
>=
GetCount
()
)
if
(
index
>=
GetCount
()
)
index
=
GetCount
()
-
1
;
index
=
GetCount
()
-
1
;
if
(
(
index
>=
0
)
&&
(
GetCount
()
>
0
)
)
if
(
(
index
>=
0
)
&&
(
GetCount
()
>
0
)
)
...
...
cvpcb/class_library_listbox.cpp
View file @
f76041e9
...
@@ -95,9 +95,9 @@ wxString LIBRARY_LISTBOX::OnGetItemText( long item, long column ) const
...
@@ -95,9 +95,9 @@ wxString LIBRARY_LISTBOX::OnGetItemText( long item, long column ) const
}
}
void
LIBRARY_LISTBOX
::
SetSelection
(
unsigned
index
,
bool
State
)
void
LIBRARY_LISTBOX
::
SetSelection
(
int
index
,
bool
State
)
{
{
if
(
(
int
)
index
>=
GetCount
()
)
if
(
index
>=
GetCount
()
)
index
=
GetCount
()
-
1
;
index
=
GetCount
()
-
1
;
if
(
(
index
>=
0
)
&&
(
GetCount
()
>
0
)
)
if
(
(
index
>=
0
)
&&
(
GetCount
()
>
0
)
)
...
...
cvpcb/cvstruct.h
View file @
f76041e9
...
@@ -78,7 +78,7 @@ public:
...
@@ -78,7 +78,7 @@ public:
~
FOOTPRINTS_LISTBOX
();
~
FOOTPRINTS_LISTBOX
();
int
GetCount
();
int
GetCount
();
void
SetSelection
(
unsigned
index
,
bool
State
=
true
);
void
SetSelection
(
int
index
,
bool
State
=
true
);
void
SetString
(
unsigned
linecount
,
const
wxString
&
text
);
void
SetString
(
unsigned
linecount
,
const
wxString
&
text
);
void
AppendLine
(
const
wxString
&
text
);
void
AppendLine
(
const
wxString
&
text
);
...
@@ -127,7 +127,7 @@ public:
...
@@ -127,7 +127,7 @@ public:
~
LIBRARY_LISTBOX
();
~
LIBRARY_LISTBOX
();
int
GetCount
();
int
GetCount
();
void
SetSelection
(
unsigned
index
,
bool
State
=
true
);
void
SetSelection
(
int
index
,
bool
State
=
true
);
void
SetString
(
unsigned
linecount
,
const
wxString
&
text
);
void
SetString
(
unsigned
linecount
,
const
wxString
&
text
);
void
AppendLine
(
const
wxString
&
text
);
void
AppendLine
(
const
wxString
&
text
);
void
SetLibraryList
(
const
wxArrayString
&
aList
);
void
SetLibraryList
(
const
wxArrayString
&
aList
);
...
@@ -187,7 +187,7 @@ public:
...
@@ -187,7 +187,7 @@ public:
/*
/*
* Enable or disable an item
* Enable or disable an item
*/
*/
void
SetSelection
(
unsigned
index
,
bool
State
=
true
);
void
SetSelection
(
int
index
,
bool
State
=
true
);
void
SetString
(
unsigned
linecount
,
const
wxString
&
text
);
void
SetString
(
unsigned
linecount
,
const
wxString
&
text
);
void
AppendLine
(
const
wxString
&
text
);
void
AppendLine
(
const
wxString
&
text
);
...
...
eeschema/dialog_erc_listbox.h
View file @
f76041e9
/////////////////////////////////////////////////////////////////////////////
/*
// Name: dialog_erc.h
* This program source code file is part of KiCad, a free EDA CAD application.
// Author: jean-pierre Charras
*
// Licence: GPL
* Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.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 DIALOG_ERC_LISTBOX_H
#ifndef DIALOG_ERC_LISTBOX_H
#define DIALOG_ERC_LISTBOX_H
#define DIALOG_ERC_LISTBOX_H
...
@@ -76,7 +93,7 @@ public:
...
@@ -76,7 +93,7 @@ public:
*/
*/
wxString
OnGetItem
(
size_t
n
)
const
wxString
OnGetItem
(
size_t
n
)
const
{
{
if
(
m_MarkerList
.
size
()
>
n
&&
n
>=
0
)
if
(
m_MarkerList
.
size
()
>
n
)
{
{
const
SCH_MARKER
*
item
=
m_MarkerList
[
n
];
const
SCH_MARKER
*
item
=
m_MarkerList
[
n
];
if
(
item
)
if
(
item
)
...
...
eeschema/dialogs/dialog_lib_edit_text_base.cpp
View file @
f76041e9
...
@@ -77,7 +77,7 @@ DIALOG_LIB_EDIT_TEXT_BASE::DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindow
...
@@ -77,7 +77,7 @@ DIALOG_LIB_EDIT_TEXT_BASE::DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindow
sOptionsSizer
->
Add
(
m_Invisible
,
0
,
wxALL
,
5
);
sOptionsSizer
->
Add
(
m_Invisible
,
0
,
wxALL
,
5
);
bBottomtBoxSizer
->
Add
(
sOptionsSizer
,
1
,
wxALL
|
wxEXPAND
,
5
);
bBottomtBoxSizer
->
Add
(
sOptionsSizer
,
0
,
wxALL
|
wxEXPAND
,
5
);
wxString
m_TextShapeOptChoices
[]
=
{
_
(
"Normal"
),
_
(
"Italic"
),
_
(
"Bold"
),
_
(
"Bold Italic"
)
};
wxString
m_TextShapeOptChoices
[]
=
{
_
(
"Normal"
),
_
(
"Italic"
),
_
(
"Bold"
),
_
(
"Bold Italic"
)
};
int
m_TextShapeOptNChoices
=
sizeof
(
m_TextShapeOptChoices
)
/
sizeof
(
wxString
);
int
m_TextShapeOptNChoices
=
sizeof
(
m_TextShapeOptChoices
)
/
sizeof
(
wxString
);
...
...
eeschema/dialogs/dialog_lib_edit_text_base.fbp
View file @
f76041e9
...
@@ -495,7 +495,7 @@
...
@@ -495,7 +495,7 @@
<object
class=
"sizeritem"
expanded=
"1"
>
<object
class=
"sizeritem"
expanded=
"1"
>
<property
name=
"border"
>
5
</property>
<property
name=
"border"
>
5
</property>
<property
name=
"flag"
>
wxALL|wxEXPAND
</property>
<property
name=
"flag"
>
wxALL|wxEXPAND
</property>
<property
name=
"proportion"
>
1
</property>
<property
name=
"proportion"
>
0
</property>
<object
class=
"wxStaticBoxSizer"
expanded=
"1"
>
<object
class=
"wxStaticBoxSizer"
expanded=
"1"
>
<property
name=
"id"
>
wxID_ANY
</property>
<property
name=
"id"
>
wxID_ANY
</property>
<property
name=
"label"
>
Options
</property>
<property
name=
"label"
>
Options
</property>
...
...
pcbnew/dialogs/dialog_drc_base.cpp
View file @
f76041e9
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Apr 10 2012
)
// C++ code generated with wxFormBuilder (version
Nov 6 2013
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
#include "dialog_drclistbox.h"
#include "dialog_drc_base.h"
#include "dialog_drc_base.h"
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
...
@@ -36,6 +38,7 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i
...
@@ -36,6 +38,7 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i
fgMinValuesSizer
->
Add
(
m_ClearanceTitle
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
5
);
fgMinValuesSizer
->
Add
(
m_ClearanceTitle
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
5
);
m_SetClearance
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
_
(
"By Netclass"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_SetClearance
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
_
(
"By Netclass"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_SetClearance
->
SetMaxLength
(
0
);
m_SetClearance
->
Enable
(
false
);
m_SetClearance
->
Enable
(
false
);
fgMinValuesSizer
->
Add
(
m_SetClearance
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
|
wxEXPAND
,
5
);
fgMinValuesSizer
->
Add
(
m_SetClearance
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
|
wxEXPAND
,
5
);
...
@@ -47,6 +50,7 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i
...
@@ -47,6 +50,7 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i
fgMinValuesSizer
->
Add
(
m_TrackMinWidthTitle
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
5
);
fgMinValuesSizer
->
Add
(
m_TrackMinWidthTitle
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
5
);
m_SetTrackMinWidthCtrl
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_SetTrackMinWidthCtrl
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_SetTrackMinWidthCtrl
->
SetMaxLength
(
0
);
fgMinValuesSizer
->
Add
(
m_SetTrackMinWidthCtrl
,
0
,
wxALL
|
wxEXPAND
,
5
);
fgMinValuesSizer
->
Add
(
m_SetTrackMinWidthCtrl
,
0
,
wxALL
|
wxEXPAND
,
5
);
m_ViaMinTitle
=
new
wxStaticText
(
this
,
wxID_ANY
,
_
(
"Min via size"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_ViaMinTitle
=
new
wxStaticText
(
this
,
wxID_ANY
,
_
(
"Min via size"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
...
@@ -56,6 +60,7 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i
...
@@ -56,6 +60,7 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i
fgMinValuesSizer
->
Add
(
m_ViaMinTitle
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
5
);
fgMinValuesSizer
->
Add
(
m_ViaMinTitle
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
5
);
m_SetViaMinSizeCtrl
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_SetViaMinSizeCtrl
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_SetViaMinSizeCtrl
->
SetMaxLength
(
0
);
fgMinValuesSizer
->
Add
(
m_SetViaMinSizeCtrl
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
|
wxEXPAND
,
5
);
fgMinValuesSizer
->
Add
(
m_SetViaMinSizeCtrl
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
|
wxEXPAND
,
5
);
m_MicroViaMinTitle
=
new
wxStaticText
(
this
,
wxID_ANY
,
_
(
"Min uVia size"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_MicroViaMinTitle
=
new
wxStaticText
(
this
,
wxID_ANY
,
_
(
"Min uVia size"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
...
@@ -65,6 +70,7 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i
...
@@ -65,6 +70,7 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i
fgMinValuesSizer
->
Add
(
m_MicroViaMinTitle
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
5
);
fgMinValuesSizer
->
Add
(
m_MicroViaMinTitle
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
5
);
m_SetMicroViakMinSizeCtrl
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_SetMicroViakMinSizeCtrl
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_SetMicroViakMinSizeCtrl
->
SetMaxLength
(
0
);
fgMinValuesSizer
->
Add
(
m_SetMicroViakMinSizeCtrl
,
0
,
wxALL
|
wxEXPAND
,
5
);
fgMinValuesSizer
->
Add
(
m_SetMicroViakMinSizeCtrl
,
0
,
wxALL
|
wxEXPAND
,
5
);
...
@@ -79,6 +85,7 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i
...
@@ -79,6 +85,7 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i
ReportFileSizer
->
Add
(
m_CreateRptCtrl
,
0
,
wxALL
|
wxALIGN_CENTER_VERTICAL
,
5
);
ReportFileSizer
->
Add
(
m_CreateRptCtrl
,
0
,
wxALL
|
wxALIGN_CENTER_VERTICAL
,
5
);
m_RptFilenameCtrl
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_RptFilenameCtrl
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_RptFilenameCtrl
->
SetMaxLength
(
0
);
m_RptFilenameCtrl
->
SetToolTip
(
_
(
"Enter the report filename"
)
);
m_RptFilenameCtrl
->
SetToolTip
(
_
(
"Enter the report filename"
)
);
m_RptFilenameCtrl
->
SetMinSize
(
wxSize
(
180
,
-
1
)
);
m_RptFilenameCtrl
->
SetMinSize
(
wxSize
(
180
,
-
1
)
);
...
...
pcbnew/dialogs/dialog_drc_base.fbp
View file @
f76041e9
...
@@ -20,8 +20,10 @@
...
@@ -20,8 +20,10 @@
<property
name=
"path"
>
.
</property>
<property
name=
"path"
>
.
</property>
<property
name=
"precompiled_header"
></property>
<property
name=
"precompiled_header"
></property>
<property
name=
"relative_path"
>
1
</property>
<property
name=
"relative_path"
>
1
</property>
<property
name=
"skip_lua_events"
>
1
</property>
<property
name=
"skip_php_events"
>
1
</property>
<property
name=
"skip_php_events"
>
1
</property>
<property
name=
"skip_python_events"
>
1
</property>
<property
name=
"skip_python_events"
>
1
</property>
<property
name=
"ui_table"
>
UI
</property>
<property
name=
"use_enum"
>
0
</property>
<property
name=
"use_enum"
>
0
</property>
<property
name=
"use_microsoft_bom"
>
0
</property>
<property
name=
"use_microsoft_bom"
>
0
</property>
<object
class=
"Dialog"
expanded=
"1"
>
<object
class=
"Dialog"
expanded=
"1"
>
...
@@ -1247,7 +1249,7 @@
...
@@ -1247,7 +1249,7 @@
<property
name=
"max_size"
></property>
<property
name=
"max_size"
></property>
<property
name=
"maximize_button"
>
0
</property>
<property
name=
"maximize_button"
>
0
</property>
<property
name=
"maximum_size"
></property>
<property
name=
"maximum_size"
></property>
<property
name=
"maxlength"
>
0
</property>
<property
name=
"maxlength"
></property>
<property
name=
"min_size"
></property>
<property
name=
"min_size"
></property>
<property
name=
"minimize_button"
>
0
</property>
<property
name=
"minimize_button"
>
0
</property>
<property
name=
"minimum_size"
>
220,-1
</property>
<property
name=
"minimum_size"
>
220,-1
</property>
...
...
pcbnew/dialogs/dialog_drc_base.h
View file @
f76041e9
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Apr 10 2012
)
// C++ code generated with wxFormBuilder (version
Nov 6 2013
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -11,7 +11,9 @@
...
@@ -11,7 +11,9 @@
#include <wx/artprov.h>
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include <wx/intl.h>
#include "dialog_drclistbox.h"
class
DIALOG_SHIM
;
class
DRCLISTBOX
;
#include "dialog_shim.h"
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/string.h>
#include <wx/stattext.h>
#include <wx/stattext.h>
...
...
pcbnew/dialogs/dialog_gendrill_base.cpp
View file @
f76041e9
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Feb 26 2014
)
// C++ code generated with wxFormBuilder (version
Nov 6 2013
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -190,7 +190,6 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con
...
@@ -190,7 +190,6 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con
bmsgSizer
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"Messages:"
)
),
wxVERTICAL
);
bmsgSizer
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"Messages:"
)
),
wxVERTICAL
);
m_messagesBox
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
wxTE_MULTILINE
|
wxTE_READONLY
);
m_messagesBox
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
wxTE_MULTILINE
|
wxTE_READONLY
);
m_messagesBox
->
SetMaxLength
(
0
);
m_messagesBox
->
SetMinSize
(
wxSize
(
-
1
,
90
)
);
m_messagesBox
->
SetMinSize
(
wxSize
(
-
1
,
90
)
);
bmsgSizer
->
Add
(
m_messagesBox
,
1
,
wxALL
|
wxEXPAND
,
5
);
bmsgSizer
->
Add
(
m_messagesBox
,
1
,
wxALL
|
wxEXPAND
,
5
);
...
...
pcbnew/dialogs/dialog_gendrill_base.fbp
View file @
f76041e9
...
@@ -2133,7 +2133,7 @@
...
@@ -2133,7 +2133,7 @@
<property
name=
"max_size"
></property>
<property
name=
"max_size"
></property>
<property
name=
"maximize_button"
>
0
</property>
<property
name=
"maximize_button"
>
0
</property>
<property
name=
"maximum_size"
></property>
<property
name=
"maximum_size"
></property>
<property
name=
"maxlength"
>
0
</property>
<property
name=
"maxlength"
></property>
<property
name=
"min_size"
></property>
<property
name=
"min_size"
></property>
<property
name=
"minimize_button"
>
0
</property>
<property
name=
"minimize_button"
>
0
</property>
<property
name=
"minimum_size"
>
-1,90
</property>
<property
name=
"minimum_size"
>
-1,90
</property>
...
...
pcbnew/dialogs/dialog_gendrill_base.h
View file @
f76041e9
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Feb 26 2014
)
// C++ code generated with wxFormBuilder (version
Nov 6 2013
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
pcbnew/dialogs/dialog_netlist_fbp.cpp
View file @
f76041e9
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Oct 8 2012
)
// C++ code generated with wxFormBuilder (version
Nov 6 2013
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
@@ -173,7 +173,6 @@ DIALOG_NETLIST_FBP::DIALOG_NETLIST_FBP( wxWindow* parent, wxWindowID id, const w
...
@@ -173,7 +173,6 @@ DIALOG_NETLIST_FBP::DIALOG_NETLIST_FBP( wxWindow* parent, wxWindowID id, const w
bLowerSizer
->
Add
(
m_staticText1
,
0
,
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
bLowerSizer
->
Add
(
m_staticText1
,
0
,
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
m_MessageWindow
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
wxTE_CHARWRAP
|
wxTE_MULTILINE
|
wxTE_READONLY
|
wxTE_WORDWRAP
);
m_MessageWindow
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
wxTE_CHARWRAP
|
wxTE_MULTILINE
|
wxTE_READONLY
|
wxTE_WORDWRAP
);
m_MessageWindow
->
SetMaxLength
(
0
);
m_MessageWindow
->
SetMinSize
(
wxSize
(
300
,
150
)
);
m_MessageWindow
->
SetMinSize
(
wxSize
(
300
,
150
)
);
bLowerSizer
->
Add
(
m_MessageWindow
,
1
,
wxEXPAND
|
wxBOTTOM
|
wxRIGHT
|
wxLEFT
,
5
);
bLowerSizer
->
Add
(
m_MessageWindow
,
1
,
wxEXPAND
|
wxBOTTOM
|
wxRIGHT
|
wxLEFT
,
5
);
...
...
pcbnew/dialogs/dialog_netlist_fbp.fbp
View file @
f76041e9
...
@@ -20,8 +20,10 @@
...
@@ -20,8 +20,10 @@
<property
name=
"path"
>
.
</property>
<property
name=
"path"
>
.
</property>
<property
name=
"precompiled_header"
></property>
<property
name=
"precompiled_header"
></property>
<property
name=
"relative_path"
>
1
</property>
<property
name=
"relative_path"
>
1
</property>
<property
name=
"skip_lua_events"
>
1
</property>
<property
name=
"skip_php_events"
>
1
</property>
<property
name=
"skip_php_events"
>
1
</property>
<property
name=
"skip_python_events"
>
1
</property>
<property
name=
"skip_python_events"
>
1
</property>
<property
name=
"ui_table"
>
UI
</property>
<property
name=
"use_enum"
>
1
</property>
<property
name=
"use_enum"
>
1
</property>
<property
name=
"use_microsoft_bom"
>
0
</property>
<property
name=
"use_microsoft_bom"
>
0
</property>
<object
class=
"Dialog"
expanded=
"1"
>
<object
class=
"Dialog"
expanded=
"1"
>
...
@@ -1974,7 +1976,7 @@
...
@@ -1974,7 +1976,7 @@
<property
name=
"max_size"
></property>
<property
name=
"max_size"
></property>
<property
name=
"maximize_button"
>
0
</property>
<property
name=
"maximize_button"
>
0
</property>
<property
name=
"maximum_size"
></property>
<property
name=
"maximum_size"
></property>
<property
name=
"maxlength"
>
0
</property>
<property
name=
"maxlength"
></property>
<property
name=
"min_size"
></property>
<property
name=
"min_size"
></property>
<property
name=
"minimize_button"
>
0
</property>
<property
name=
"minimize_button"
>
0
</property>
<property
name=
"minimum_size"
>
300,150
</property>
<property
name=
"minimum_size"
>
300,150
</property>
...
...
pcbnew/dialogs/dialog_netlist_fbp.h
View file @
f76041e9
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Oct 8 2012
)
// C++ code generated with wxFormBuilder (version
Nov 6 2013
)
// http://www.wxformbuilder.org/
// http://www.wxformbuilder.org/
//
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
utils/idftools/idf_parser.cpp
View file @
f76041e9
...
@@ -1488,8 +1488,8 @@ bool IDF3_BOARD::setUnit( IDF3::IDF_UNIT aUnit, bool convert )
...
@@ -1488,8 +1488,8 @@ bool IDF3_BOARD::setUnit( IDF3::IDF_UNIT aUnit, bool convert )
do
do
{
{
std
::
map
<
std
::
string
,
GROUP_OUTLINE
*>::
iterator
its
=
olnGroup
.
begin
();
std
::
m
ultim
ap
<
std
::
string
,
GROUP_OUTLINE
*>::
iterator
its
=
olnGroup
.
begin
();
std
::
map
<
std
::
string
,
GROUP_OUTLINE
*>::
iterator
ite
=
olnGroup
.
end
();
std
::
m
ultim
ap
<
std
::
string
,
GROUP_OUTLINE
*>::
iterator
ite
=
olnGroup
.
end
();
while
(
its
!=
ite
)
while
(
its
!=
ite
)
{
{
...
@@ -2905,8 +2905,8 @@ void IDF3_BOARD::writeBoardFile( const std::string& aFileName )
...
@@ -2905,8 +2905,8 @@ void IDF3_BOARD::writeBoardFile( const std::string& aFileName )
// PLACEMENT GROUP outlines
// PLACEMENT GROUP outlines
do
do
{
{
std
::
map
<
std
::
string
,
GROUP_OUTLINE
*>::
iterator
its
=
olnGroup
.
begin
();
std
::
m
ultim
ap
<
std
::
string
,
GROUP_OUTLINE
*>::
iterator
its
=
olnGroup
.
begin
();
std
::
map
<
std
::
string
,
GROUP_OUTLINE
*>::
iterator
ite
=
olnGroup
.
end
();
std
::
m
ultim
ap
<
std
::
string
,
GROUP_OUTLINE
*>::
iterator
ite
=
olnGroup
.
end
();
while
(
its
!=
ite
)
while
(
its
!=
ite
)
{
{
...
@@ -4102,8 +4102,8 @@ void IDF3_BOARD::Clear( void )
...
@@ -4102,8 +4102,8 @@ void IDF3_BOARD::Clear( void )
// delete PLACEMENT GROUP outlines
// delete PLACEMENT GROUP outlines
do
do
{
{
std
::
map
<
std
::
string
,
GROUP_OUTLINE
*>::
iterator
os
=
olnGroup
.
begin
();
std
::
m
ultim
ap
<
std
::
string
,
GROUP_OUTLINE
*>::
iterator
os
=
olnGroup
.
begin
();
std
::
map
<
std
::
string
,
GROUP_OUTLINE
*>::
iterator
oe
=
olnGroup
.
end
();
std
::
m
ultim
ap
<
std
::
string
,
GROUP_OUTLINE
*>::
iterator
oe
=
olnGroup
.
end
();
while
(
os
!=
oe
)
while
(
os
!=
oe
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment