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
2ff53e95
Commit
2ff53e95
authored
Jun 16, 2014
by
Dick Hollenbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix some bugs in FOOTPRINT_VIEWER_FRAME, get rid of statics
parent
b22aba20
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
91 additions
and
80 deletions
+91
-80
project.h
include/project.h
+2
-0
loadcmp.cpp
pcbnew/loadcmp.cpp
+0
-1
modview_frame.cpp
pcbnew/modview_frame.cpp
+85
-65
modview_frame.h
pcbnew/modview_frame.h
+4
-14
No files found.
include/project.h
View file @
2ff53e95
...
@@ -142,6 +142,8 @@ public:
...
@@ -142,6 +142,8 @@ public:
PCB_LIB_NICKNAME
,
PCB_LIB_NICKNAME
,
VIEWER_3D_PATH
,
VIEWER_3D_PATH
,
PCB_FOOTPRINT
,
PCB_FOOTPRINT
,
PCB_FOOTPRINT_VIEWER_FPNAME
,
PCB_FOOTPRINT_VIEWER_NICKNAME
,
RSTRING_COUNT
RSTRING_COUNT
};
};
...
...
pcbnew/loadcmp.cpp
View file @
2ff53e95
...
@@ -334,7 +334,6 @@ wxString PCB_BASE_FRAME::SelectFootprint( EDA_DRAW_FRAME* aWindow,
...
@@ -334,7 +334,6 @@ wxString PCB_BASE_FRAME::SelectFootprint( EDA_DRAW_FRAME* aWindow,
wxString
fpname
;
wxString
fpname
;
wxString
msg
;
wxString
msg
;
wxArrayString
libraries
;
wxArrayString
libraries
;
FP_LIB_TABLE
libTable
;
std
::
vector
<
wxArrayString
>
rows
;
std
::
vector
<
wxArrayString
>
rows
;
...
...
pcbnew/modview_frame.cpp
View file @
2ff53e95
This diff is collapsed.
Click to expand it.
pcbnew/modview_frame.h
View file @
2ff53e95
...
@@ -59,15 +59,6 @@ public:
...
@@ -59,15 +59,6 @@ public:
*/
*/
static
const
wxChar
*
GetFootprintViewerFrameName
();
static
const
wxChar
*
GetFootprintViewerFrameName
();
wxString
&
GetSelectedFootprint
(
void
)
const
{
return
m_selectedFootprintName
;
}
const
wxString
GetSelectedLibraryFullName
();
/**
* Function GetSelectedLibrary
* @return the selected library name from the #FP_LIB_TABLE.
*/
const
wxString
&
GetSelectedLibrary
()
{
return
m_libraryName
;
}
virtual
EDA_COLOR_T
GetGridColor
()
const
;
virtual
EDA_COLOR_T
GetGridColor
()
const
;
/**
/**
...
@@ -86,10 +77,11 @@ private:
...
@@ -86,10 +77,11 @@ private:
wxString
m_configPath
;
// subpath for configuration
wxString
m_configPath
;
// subpath for configuration
static
wxString
m_libraryName
;
// Current selected library
const
wxString
getCurNickname
();
static
wxString
m_footprintName
;
// Current selected footprint
void
setCurNickname
(
const
wxString
&
aNickname
);
static
wxString
m_selectedFootprintName
;
// When the viewer is used to select a footprint
const
wxString
getCurFootprintName
();
void
setCurFootprintName
(
const
wxString
&
aName
);
void
OnSize
(
wxSizeEvent
&
event
);
void
OnSize
(
wxSizeEvent
&
event
);
...
@@ -123,8 +115,6 @@ private:
...
@@ -123,8 +115,6 @@ private:
void
LoadSettings
(
wxConfigBase
*
aCfg
);
// override virtual
void
LoadSettings
(
wxConfigBase
*
aCfg
);
// override virtual
void
SaveSettings
(
wxConfigBase
*
aCfg
);
// override virtual
void
SaveSettings
(
wxConfigBase
*
aCfg
);
// override virtual
wxString
&
GetFootprintName
(
void
)
const
{
return
m_footprintName
;
}
/**
/**
* Function OnActivate
* Function OnActivate
* is called when the frame frame is activate to reload the libraries and component lists
* is called when the frame frame is activate to reload the libraries and component lists
...
...
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