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
8fe06e12
Commit
8fe06e12
authored
Dec 16, 2013
by
Wayne Stambaugh
Browse files
Options
Browse Files
Download
Plain Diff
Merge changes from testing head.
parents
8f6d69e5
bb8741c7
Changes
15
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
2018 additions
and
1127 deletions
+2018
-1127
dialog_edit_component_in_schematic.cpp
eeschema/dialogs/dialog_edit_component_in_schematic.cpp
+17
-12
dialog_edit_component_in_schematic_fbp.cpp
eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp
+29
-22
dialog_edit_component_in_schematic_fbp.fbp
eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp
+354
-106
dialog_edit_component_in_schematic_fbp.h
eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h
+6
-3
dialog_sch_sheet_props.fbp
eeschema/dialogs/dialog_sch_sheet_props.fbp
+1280
-891
dialog_sch_sheet_props.h
eeschema/dialogs/dialog_sch_sheet_props.h
+6
-0
dialog_sch_sheet_props_base.cpp
eeschema/dialogs/dialog_sch_sheet_props_base.cpp
+38
-3
dialog_sch_sheet_props_base.h
eeschema/dialogs/dialog_sch_sheet_props_base.h
+9
-3
sheet.cpp
eeschema/sheet.cpp
+4
-2
class_module.cpp
pcbnew/class_module.cpp
+2
-2
dialog_copper_zones.cpp
pcbnew/dialogs/dialog_copper_zones.cpp
+2
-2
dialog_edit_module_for_BoardEditor.cpp
pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
+9
-6
dialog_edit_module_for_BoardEditor_base.cpp
pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp
+10
-1
dialog_edit_module_for_BoardEditor_base.fbp
pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp
+248
-72
dialog_edit_module_for_BoardEditor_base.h
pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h
+4
-2
No files found.
eeschema/dialogs/dialog_edit_component_in_schematic.cpp
View file @
8fe06e12
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2004-201
1
KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 2004-201
3
KiCad Developers, see change_log.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
...
...
@@ -863,7 +863,19 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copyOptionsToPanel()
// Disable unit selection if only one unit exists:
if
(
choiceCount
<=
1
)
{
unitChoice
->
Enable
(
false
);
unitsInterchageableLabel
->
Show
(
false
);
unitsInterchageableText
->
Show
(
false
);
}
else
{
// Show the "Units are not interchangeable" message option?
if
(
!
m_LibEntry
||
!
m_LibEntry
->
UnitsLocked
()
)
unitsInterchageableLabel
->
SetLabel
(
_
(
"Yes"
)
);
else
unitsInterchageableLabel
->
SetLabel
(
_
(
"No"
)
);
}
int
orientation
=
m_Cmp
->
GetOrientation
()
&
~
(
CMP_MIRROR_X
|
CMP_MIRROR_Y
);
...
...
@@ -895,24 +907,17 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copyOptionsToPanel()
// Activate/Desactivate the normal/convert option ? (activated only if
// the component has more than one shape)
if
(
m_Cmp
->
GetConvert
()
>
1
)
{
convertCheckBox
->
SetValue
(
true
);
}
if
(
m_LibEntry
==
NULL
||
!
m_LibEntry
->
HasConversion
()
)
{
convertCheckBox
->
Enable
(
false
);
}
// Show the "Parts Locked" option?
if
(
!
m_LibEntry
||
!
m_LibEntry
->
UnitsLocked
()
)
{
DBG
(
printf
(
"partsAreLocked->false
\n
"
);
)
partsAreLockedLabel
->
Show
(
false
);
}
// Set the component's library name.
chipnameTextCtrl
->
SetValue
(
m_Cmp
->
m_ChipName
);
// Set the component's unique ID time stamp.
m_textCtrlTimeStamp
->
SetValue
(
wxString
::
Format
(
wxT
(
"%8.8lX"
),
(
unsigned
long
)
m_Cmp
->
GetTimeStamp
()
)
);
}
...
...
eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp
View file @
8fe06e12
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Apr 30
2013)
// C++ code generated with wxFormBuilder (version
Nov 6
2013)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
@@ -32,22 +32,27 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
unitChoice
->
SetSelection
(
0
);
optionsSizer
->
Add
(
unitChoice
,
0
,
wxEXPAND
|
wxBOTTOM
|
wxRIGHT
|
wxLEFT
,
5
);
wxBoxSizer
*
orientationSizer
;
orientationSizer
=
new
wxBoxSizer
(
wxHORIZONTAL
);
wxBoxSizer
*
bSizerUnitsInterchangeable
;
bSizerUnitsInterchangeable
=
new
wxBoxSizer
(
wxHORIZONTAL
);
unitsInterchageableText
=
new
wxStaticText
(
this
,
wxID_ANY
,
_
(
"Units are interchangeable:"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
unitsInterchageableText
->
Wrap
(
-
1
);
bSizerUnitsInterchangeable
->
Add
(
unitsInterchageableText
,
0
,
wxEXPAND
|
wxTOP
|
wxBOTTOM
|
wxLEFT
,
5
);
unitsInterchageableLabel
=
new
wxStaticText
(
this
,
wxID_ANY
,
_
(
"Yes"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
unitsInterchageableLabel
->
Wrap
(
-
1
);
bSizerUnitsInterchangeable
->
Add
(
unitsInterchageableLabel
,
0
,
wxALL
,
5
);
optionsSizer
->
Add
(
bSizerUnitsInterchangeable
,
1
,
wxEXPAND
,
5
);
wxString
orientationRadioBoxChoices
[]
=
{
_
(
"0"
),
_
(
"+90"
),
_
(
"180"
),
_
(
"-90"
)
};
int
orientationRadioBoxNChoices
=
sizeof
(
orientationRadioBoxChoices
)
/
sizeof
(
wxString
);
orientationRadioBox
=
new
wxRadioBox
(
this
,
wxID_ANY
,
_
(
"Orientation (Degrees)"
),
wxDefaultPosition
,
wxDefaultSize
,
orientationRadioBoxNChoices
,
orientationRadioBoxChoices
,
1
,
wxRA_SPECIFY_COLS
);
orientationRadioBox
->
SetSelection
(
0
);
orientationRadioBox
->
SetSelection
(
1
);
orientationRadioBox
->
SetToolTip
(
_
(
"Select if the component is to be rotated when drawn"
)
);
orientationSizer
->
Add
(
orientationRadioBox
,
1
,
wxALL
|
wxEXPAND
,
8
);
optionsSizer
->
Add
(
orientationSizer
,
0
,
wxLEFT
|
wxRIGHT
|
wxTOP
|
wxEXPAND
,
0
);
wxBoxSizer
*
mirrorSizer
;
mirrorSizer
=
new
wxBoxSizer
(
wxHORIZONTAL
);
optionsSizer
->
Add
(
orientationRadioBox
,
0
,
wxEXPAND
|
wxALL
,
5
);
wxString
mirrorRadioBoxChoices
[]
=
{
_
(
"Normal"
),
_
(
"Mirror ---"
),
_
(
"Mirror |"
)
};
int
mirrorRadioBoxNChoices
=
sizeof
(
mirrorRadioBoxChoices
)
/
sizeof
(
wxString
);
...
...
@@ -55,10 +60,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
mirrorRadioBox
->
SetSelection
(
0
);
mirrorRadioBox
->
SetToolTip
(
_
(
"Pick the graphical transformation to be used when displaying the component, if any"
)
);
mirrorSizer
->
Add
(
mirrorRadioBox
,
1
,
wxALL
,
8
);
optionsSizer
->
Add
(
mirrorSizer
,
0
,
wxLEFT
|
wxRIGHT
|
wxTOP
|
wxEXPAND
,
0
);
optionsSizer
->
Add
(
mirrorRadioBox
,
0
,
wxALL
|
wxEXPAND
,
5
);
m_staticTextChipname
=
new
wxStaticText
(
this
,
wxID_ANY
,
_
(
"Chip Name"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_staticTextChipname
->
Wrap
(
-
1
);
...
...
@@ -73,19 +75,24 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
convertCheckBox
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Convert"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
convertCheckBox
->
SetToolTip
(
_
(
"Use the alternate shape of this component.
\n
For gates, this is the
\"
De Morgan
\"
conversion"
)
);
optionsSizer
->
Add
(
convertCheckBox
,
0
,
wxALL
,
8
);
partsAreLockedLabel
=
new
wxStaticText
(
this
,
wxID_ANY
,
_
(
"Parts are locked"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
partsAreLockedLabel
->
Wrap
(
-
1
);
optionsSizer
->
Add
(
partsAreLockedLabel
,
0
,
wxALL
|
wxEXPAND
,
8
);
optionsSizer
->
Add
(
convertCheckBox
,
0
,
wxALL
,
5
);
defaultsButton
=
new
wxButton
(
this
,
wxID_ANY
,
_
(
"Reset to Library Defaults"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
defaultsButton
->
SetToolTip
(
_
(
"Set position and style of fields and component orientation to default lib value.
\n
Fields texts are not modified."
)
);
optionsSizer
->
Add
(
defaultsButton
,
0
,
wxALL
|
wxEXPAND
,
5
);
m_staticTextTimeStamp
=
new
wxStaticText
(
this
,
wxID_ANY
,
_
(
"Timestamp"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_staticTextTimeStamp
->
Wrap
(
-
1
);
optionsSizer
->
Add
(
m_staticTextTimeStamp
,
0
,
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
m_textCtrlTimeStamp
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
wxTE_READONLY
);
m_textCtrlTimeStamp
->
SetToolTip
(
_
(
"An unique ID (a time stamp) to identify the component.
\n
This is an alternate identifier to the reference."
)
);
optionsSizer
->
Add
(
m_textCtrlTimeStamp
,
0
,
wxBOTTOM
|
wxRIGHT
|
wxLEFT
|
wxEXPAND
,
5
);
upperSizer
->
Add
(
optionsSizer
,
0
,
wxALIGN_TOP
|
wx
ALL
|
wxEXPAND
,
5
);
upperSizer
->
Add
(
optionsSizer
,
0
,
wxALIGN_TOP
|
wx
EXPAND
|
wxALL
,
5
);
wxStaticBoxSizer
*
fieldsSizer
;
fieldsSizer
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"Fields"
)
),
wxHORIZONTAL
);
...
...
@@ -265,7 +272,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
stdDialogButtonSizer
->
AddButton
(
stdDialogButtonSizerCancel
);
stdDialogButtonSizer
->
Realize
();
mainSizer
->
Add
(
stdDialogButtonSizer
,
0
,
wxALL
|
wxEXPAND
,
8
);
mainSizer
->
Add
(
stdDialogButtonSizer
,
0
,
wxALL
|
wxEXPAND
,
5
);
this
->
SetSizer
(
mainSizer
);
...
...
eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp
View file @
8fe06e12
This diff is collapsed.
Click to expand it.
eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h
View file @
8fe06e12
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Apr 30
2013)
// C++ code generated with wxFormBuilder (version
Nov 6
2013)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
@@ -21,8 +21,8 @@ class DIALOG_SHIM;
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/choice.h>
#include <wx/radiobox.h>
#include <wx/sizer.h>
#include <wx/radiobox.h>
#include <wx/textctrl.h>
#include <wx/checkbox.h>
#include <wx/button.h>
...
...
@@ -43,13 +43,16 @@ class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP : public DIALOG_SHIM
protected
:
wxStaticText
*
m_staticTextUnit
;
wxChoice
*
unitChoice
;
wxStaticText
*
unitsInterchageableText
;
wxStaticText
*
unitsInterchageableLabel
;
wxRadioBox
*
orientationRadioBox
;
wxRadioBox
*
mirrorRadioBox
;
wxStaticText
*
m_staticTextChipname
;
wxTextCtrl
*
chipnameTextCtrl
;
wxCheckBox
*
convertCheckBox
;
wxStaticText
*
partsAreLockedLabel
;
wxButton
*
defaultsButton
;
wxStaticText
*
m_staticTextTimeStamp
;
wxTextCtrl
*
m_textCtrlTimeStamp
;
wxListCtrl
*
fieldListCtrl
;
wxButton
*
addFieldButton
;
wxButton
*
deleteFieldButton
;
...
...
eeschema/dialogs/dialog_sch_sheet_props.fbp
View file @
8fe06e12
This diff is collapsed.
Click to expand it.
eeschema/dialogs/dialog_sch_sheet_props.h
View file @
8fe06e12
...
...
@@ -45,6 +45,12 @@ public:
{
m_staticSheetNameSizeUnits
->
SetLabel
(
aUnits
);
}
void
SetSheetTimeStamp
(
const
wxString
&
aTimeStamp
)
{
m_textCtrlTimeStamp
->
SetValue
(
aTimeStamp
);
}
};
#endif // __dialog_sch_sheet_props__
eeschema/dialogs/dialog_sch_sheet_props_base.cpp
View file @
8fe06e12
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Apr 10 2012
)
// C++ code generated with wxFormBuilder (version
Nov 6 2013
)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
@@ -16,8 +16,11 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi
wxBoxSizer
*
mainSizer
;
mainSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
wxBoxSizer
*
bupperSizer
;
bupperSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
wxFlexGridSizer
*
fgSizer1
;
fgSizer1
=
new
wxFlexGridSizer
(
2
,
6
,
0
,
0
);
fgSizer1
=
new
wxFlexGridSizer
(
0
,
6
,
0
,
0
);
fgSizer1
->
AddGrowableCol
(
1
);
fgSizer1
->
SetFlexibleDirection
(
wxBOTH
);
fgSizer1
->
SetNonFlexibleGrowMode
(
wxFLEX_GROWMODE_SPECIFIED
);
...
...
@@ -27,6 +30,7 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi
fgSizer1
->
Add
(
m_staticText1
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
3
);
m_textFileName
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_textFileName
->
SetMaxLength
(
0
);
m_textFileName
->
SetMinSize
(
wxSize
(
200
,
-
1
)
);
fgSizer1
->
Add
(
m_textFileName
,
5
,
wxALIGN_CENTER_VERTICAL
|
wxEXPAND
|
wxTOP
|
wxBOTTOM
,
3
);
...
...
@@ -39,6 +43,7 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi
fgSizer1
->
Add
(
m_staticText2
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
3
);
m_textFileNameSize
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_textFileNameSize
->
SetMaxLength
(
0
);
fgSizer1
->
Add
(
m_textFileNameSize
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxTOP
|
wxBOTTOM
,
3
);
m_staticFileNameSizeUnits
=
new
wxStaticText
(
this
,
wxID_ANY
,
_
(
"units"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
...
...
@@ -50,6 +55,7 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi
fgSizer1
->
Add
(
m_staticText4
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
3
);
m_textSheetName
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_textSheetName
->
SetMaxLength
(
0
);
fgSizer1
->
Add
(
m_textSheetName
,
5
,
wxALIGN_CENTER_VERTICAL
|
wxEXPAND
|
wxTOP
|
wxBOTTOM
,
3
);
...
...
@@ -60,14 +66,43 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi
fgSizer1
->
Add
(
m_staticText5
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
3
);
m_textSheetNameSize
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_textSheetNameSize
->
SetMaxLength
(
0
);
fgSizer1
->
Add
(
m_textSheetNameSize
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxTOP
|
wxBOTTOM
,
3
);
m_staticSheetNameSizeUnits
=
new
wxStaticText
(
this
,
wxID_ANY
,
_
(
"units"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_staticSheetNameSizeUnits
->
Wrap
(
-
1
);
fgSizer1
->
Add
(
m_staticSheetNameSizeUnits
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
3
);
m_staticline2
=
new
wxStaticLine
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxLI_HORIZONTAL
);
fgSizer1
->
Add
(
m_staticline2
,
0
,
wxEXPAND
|
wxALL
,
5
);
m_staticline3
=
new
wxStaticLine
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxLI_HORIZONTAL
);
fgSizer1
->
Add
(
m_staticline3
,
0
,
wxEXPAND
|
wxALL
,
5
);
fgSizer1
->
Add
(
0
,
0
,
1
,
wxEXPAND
,
5
);
fgSizer1
->
Add
(
0
,
0
,
1
,
wxEXPAND
,
5
);
fgSizer1
->
Add
(
0
,
0
,
1
,
wxEXPAND
,
5
);
fgSizer1
->
Add
(
0
,
0
,
1
,
wxEXPAND
,
5
);
m_staticTextTimeStamp
=
new
wxStaticText
(
this
,
wxID_ANY
,
_
(
"Unique timestamp:"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_staticTextTimeStamp
->
Wrap
(
-
1
);
fgSizer1
->
Add
(
m_staticTextTimeStamp
,
0
,
wxALL
|
wxALIGN_CENTER_VERTICAL
,
5
);
m_textCtrlTimeStamp
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
wxTE_READONLY
);
fgSizer1
->
Add
(
m_textCtrlTimeStamp
,
0
,
wxEXPAND
|
wxTOP
|
wxBOTTOM
|
wxALIGN_CENTER_VERTICAL
,
5
);
bupperSizer
->
Add
(
fgSizer1
,
1
,
wxALL
|
wxEXPAND
,
12
);
mainSizer
->
Add
(
fgSizer1
,
1
,
wxALL
|
wxEXPAND
,
12
);
mainSizer
->
Add
(
bupperSizer
,
0
,
wxEXPAND
,
5
);
mainSizer
->
Add
(
0
,
0
,
0
,
wxEXPAND
|
wxBOTTOM
|
wxRIGHT
|
wxLEFT
,
5
);
...
...
eeschema/dialogs/dialog_sch_sheet_props_base.h
View file @
8fe06e12
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Apr 10 2012
)
// C++ code generated with wxFormBuilder (version
Nov 6 2013
)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
@@ -11,6 +11,8 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
class
DIALOG_SHIM
;
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/stattext.h>
...
...
@@ -19,8 +21,8 @@
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/textctrl.h>
#include <wx/sizer.h>
#include <wx/statline.h>
#include <wx/sizer.h>
#include <wx/button.h>
#include <wx/dialog.h>
...
...
@@ -44,6 +46,10 @@ class DIALOG_SCH_SHEET_PROPS_BASE : public DIALOG_SHIM
wxStaticText
*
m_staticText5
;
wxTextCtrl
*
m_textSheetNameSize
;
wxStaticText
*
m_staticSheetNameSizeUnits
;
wxStaticLine
*
m_staticline2
;
wxStaticLine
*
m_staticline3
;
wxStaticText
*
m_staticTextTimeStamp
;
wxTextCtrl
*
m_textCtrlTimeStamp
;
wxStaticLine
*
m_staticline1
;
wxStdDialogButtonSizer
*
m_sdbSizer1
;
wxButton
*
m_sdbSizer1OK
;
...
...
@@ -51,7 +57,7 @@ class DIALOG_SCH_SHEET_PROPS_BASE : public DIALOG_SHIM
public
:
DIALOG_SCH_SHEET_PROPS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Schematic Sheet Properties"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
453
,
170
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
DIALOG_SCH_SHEET_PROPS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Schematic Sheet Properties"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
519
,
198
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
~
DIALOG_SCH_SHEET_PROPS_BASE
();
};
...
...
eeschema/sheet.cpp
View file @
8fe06e12
...
...
@@ -27,13 +27,13 @@
*/
#include <fctsys.h>
#include <gr_basic.h>
//
#include <gr_basic.h>
#include <class_drawpanel.h>
#include <confirm.h>
#include <wxEeschemaStruct.h>
#include <base_units.h>
#include <general.h>
//
#include <general.h>
#include <sch_sheet.h>
#include <dialogs/dialog_sch_sheet_props.h>
...
...
@@ -55,6 +55,8 @@ bool SCH_EDIT_FRAME::EditSheet( SCH_SHEET* aSheet, wxDC* aDC )
dlg
.
SetSheetName
(
aSheet
->
GetName
()
);
dlg
.
SetSheetNameTextSize
(
ReturnStringFromValue
(
g_UserUnit
,
aSheet
->
GetSheetNameSize
()
)
);
dlg
.
SetSheetNameTextSizeUnits
(
units
);
dlg
.
SetSheetTimeStamp
(
wxString
::
Format
(
wxT
(
"%8.8lX"
),
(
unsigned
long
)
aSheet
->
GetTimeStamp
()
)
);
/* This ugly hack fixes a bug in wxWidgets 2.8.7 and likely earlier
* versions for the flex grid sizer in wxGTK that prevents the last
...
...
pcbnew/class_module.cpp
View file @
8fe06e12
...
...
@@ -473,9 +473,9 @@ void MODULE::GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList )
msg
=
FROM_UTF8
(
bufcar
);
aList
.
push_back
(
MSG_PANEL_ITEM
(
_
(
"Last Change"
),
msg
,
BROWN
)
);
// display time stamp in schematic
msg
.
Printf
(
wxT
(
"%8.8lX"
),
m_TimeStamp
);
// display schematic path
aList
.
push_back
(
MSG_PANEL_ITEM
(
_
(
"Netlist path"
),
m_Path
,
BROWN
)
);
aList
.
push_back
(
MSG_PANEL_ITEM
(
_
(
"Layer"
),
GetLayerName
(),
RED
)
);
EDA_ITEM
*
PtStruct
=
m_Pads
;
...
...
pcbnew/dialogs/dialog_copper_zones.cpp
View file @
8fe06e12
...
...
@@ -443,10 +443,10 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aPromptForErrors, bool aUseExportab
(
double
)
m_settings
.
m_ThermalReliefCopperBridge
/
IU_PER_MILS
);
}
if
(
m_settings
.
m_ThermalReliefCopperBridge
<
m_settings
.
m_ZoneMinThickness
)
if
(
m_settings
.
m_ThermalReliefCopperBridge
<
=
m_settings
.
m_ZoneMinThickness
)
{
DisplayError
(
this
,
_
(
"Thermal relief spoke
width is small
er than the minimum width."
)
);
_
(
"Thermal relief spoke
must be great
er than the minimum width."
)
);
return
false
;
}
...
...
pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
View file @
8fe06e12
/**
****************************************************************************
* Module editor: Dialog
box for editing module properties in the pcb editor. *
*
*****************************************************************************
/
/**
* Module editor: Dialog
for editing module properties in the pcb editor.
*/
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 201
1
Jean-Pierre Charras
* Copyright (C) 201
2
Dick Hollenbeck, dick@softplc.com
* Copyright (C) 2004-201
1
KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 201
3
Jean-Pierre Charras
* Copyright (C) 201
3
Dick Hollenbeck, dick@softplc.com
* Copyright (C) 2004-201
3
KiCad Developers, see change_log.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
...
...
@@ -266,6 +266,9 @@ void DIALOG_MODULE_BOARD_EDITOR::InitModeditProperties()
m_ReferenceCtrl
->
SetValue
(
m_ReferenceCopy
->
GetText
()
);
m_ValueCtrl
->
SetValue
(
m_ValueCopy
->
GetText
()
);
// Shows the footprint's schematic path.
m_textCtrlSheetPath
->
SetValue
(
m_CurrentModule
->
GetPath
()
);
m_AttributsCtrl
->
SetItemToolTip
(
0
,
_
(
"Use this attribute for most non SMD components
\n
"
"Components with this option are not put in the footprint position list file"
)
);
...
...
pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp
View file @
8fe06e12
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Oct 8 2012
)
// C++ code generated with wxFormBuilder (version
Nov 6 2013
)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
@@ -114,6 +114,15 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
bSizerLeft
->
Add
(
fgSizerPos
,
0
,
wxEXPAND
|
wxBOTTOM
,
5
);
m_TextSheetPath
=
new
wxStaticText
(
m_PanelProperties
,
wxID_ANY
,
_
(
"Sheet path:"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_TextSheetPath
->
Wrap
(
-
1
);
bSizerLeft
->
Add
(
m_TextSheetPath
,
0
,
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
m_textCtrlSheetPath
=
new
wxTextCtrl
(
m_PanelProperties
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
wxTE_READONLY
);
m_textCtrlSheetPath
->
SetToolTip
(
_
(
"An unique ID (a time stamp) to identify the component.
\n
This is an alternate identifier to the reference."
)
);
bSizerLeft
->
Add
(
m_textCtrlSheetPath
,
0
,
wxBOTTOM
|
wxRIGHT
|
wxLEFT
|
wxEXPAND
,
5
);
m_PanelPropertiesBoxSizer
->
Add
(
bSizerLeft
,
1
,
wxEXPAND
,
5
);
...
...
pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp
View file @
8fe06e12
This diff is collapsed.
Click to expand it.
pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h
View file @
8fe06e12
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Oct 8 2012
)
// C++ code generated with wxFormBuilder (version
Nov 6 2013
)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
@@ -75,6 +75,8 @@ class DIALOG_MODULE_BOARD_EDITOR_BASE : public DIALOG_SHIM
wxStaticText
*
m_YPosLabel
;
wxTextCtrl
*
m_ModPositionY
;
wxStaticText
*
m_YPosUnit
;
wxStaticText
*
m_TextSheetPath
;
wxTextCtrl
*
m_textCtrlSheetPath
;
wxButton
*
m_buttonExchange
;
wxButton
*
m_buttonModuleEditor
;
wxRadioBox
*
m_AttributsCtrl
;
...
...
@@ -134,7 +136,7 @@ class DIALOG_MODULE_BOARD_EDITOR_BASE : public DIALOG_SHIM
public
:
wxStaticBoxSizer
*
m_Sizer3DValues
;
DIALOG_MODULE_BOARD_EDITOR_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Module Properties"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
499
,
5
6
1
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
DIALOG_MODULE_BOARD_EDITOR_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Module Properties"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
499
,
5
9
1
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
~
DIALOG_MODULE_BOARD_EDITOR_BASE
();
};
...
...
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