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
d8c14403
Commit
d8c14403
authored
May 25, 2012
by
Andrey Fedorushkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
eeschema: fix set bus width when define KICAD_GOST
parent
e6ec9f0a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
28 deletions
+0
-28
dialog_eeschema_options.cpp
eeschema/dialogs/dialog_eeschema_options.cpp
+0
-9
dialog_eeschema_options.h
eeschema/dialogs/dialog_eeschema_options.h
+0
-8
eeschema_config.h
eeschema/eeschema_config.h
+0
-7
sch_line.cpp
eeschema/sch_line.cpp
+0
-4
No files found.
eeschema/dialogs/dialog_eeschema_options.cpp
View file @
d8c14403
...
@@ -37,15 +37,6 @@ DIALOG_EESCHEMA_OPTIONS::DIALOG_EESCHEMA_OPTIONS( wxWindow* parent ) :
...
@@ -37,15 +37,6 @@ DIALOG_EESCHEMA_OPTIONS::DIALOG_EESCHEMA_OPTIONS( wxWindow* parent ) :
{
{
m_choiceUnits
->
SetFocus
();
m_choiceUnits
->
SetFocus
();
m_sdbSizer1OK
->
SetDefault
();
m_sdbSizer1OK
->
SetDefault
();
#if defined (KICAD_GOST)
/* The GOST standard pre-defines certain schematic attributes that cannot be changed */
m_spinBusWidth
->
Enable
(
false
);
#endif
}
}
...
...
eeschema/dialogs/dialog_eeschema_options.h
View file @
d8c14403
...
@@ -47,20 +47,12 @@ public:
...
@@ -47,20 +47,12 @@ public:
void
SetBusWidth
(
int
aWidth
)
void
SetBusWidth
(
int
aWidth
)
{
{
#if defined( KICAD_GOST )
m_spinBusWidth
->
SetValue
(
GOST_BUS_WIDTH
);
#else
m_spinBusWidth
->
SetValue
(
aWidth
);
m_spinBusWidth
->
SetValue
(
aWidth
);
#endif
}
}
int
GetBusWidth
(
void
)
int
GetBusWidth
(
void
)
{
{
#if defined( KICAD_GOST )
return
GOST_BUS_WIDTH
;
#else
return
m_spinBusWidth
->
GetValue
();
return
m_spinBusWidth
->
GetValue
();
#endif
}
}
void
SetLineWidth
(
int
aWidth
)
{
m_spinLineWidth
->
SetValue
(
aWidth
);
}
void
SetLineWidth
(
int
aWidth
)
{
m_spinLineWidth
->
SetValue
(
aWidth
);
}
...
...
eeschema/eeschema_config.h
View file @
d8c14403
...
@@ -13,13 +13,6 @@
...
@@ -13,13 +13,6 @@
*/
*/
extern
int
g_DefaultBusWidth
;
extern
int
g_DefaultBusWidth
;
#if defined(KICAD_GOST)
/** In a GOST build, the bus width is set and cannot be changed */
#define GOST_BUS_WIDTH 22
#endif
/* saving parameters option : */
/* saving parameters option : */
#define INSETUP true
/* used when the parameter is saved in general config
#define INSETUP true
/* used when the parameter is saved in general config
* if not used, the parameter is saved in the local
* if not used, the parameter is saved in the local
...
...
eeschema/sch_line.cpp
View file @
d8c14403
...
@@ -214,11 +214,7 @@ int SCH_LINE::GetPenSize() const
...
@@ -214,11 +214,7 @@ int SCH_LINE::GetPenSize() const
if
(
m_Layer
==
LAYER_BUS
)
if
(
m_Layer
==
LAYER_BUS
)
{
{
#if defined(KICAD_GOST)
pensize
=
GOST_BUS_WIDTH
;
#else
pensize
=
(
m_width
==
0
)
?
g_DefaultBusWidth
:
m_width
;
pensize
=
(
m_width
==
0
)
?
g_DefaultBusWidth
:
m_width
;
#endif
}
}
return
pensize
;
return
pensize
;
...
...
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