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
949118a0
Commit
949118a0
authored
Feb 21, 2014
by
Wayne Stambaugh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor coding policy fixes.
parent
932c92af
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
20 deletions
+7
-20
schedit.cpp
eeschema/schedit.cpp
+1
-1
schframe.cpp
eeschema/schframe.cpp
+6
-19
No files found.
eeschema/schedit.cpp
View file @
949118a0
...
@@ -701,7 +701,7 @@ static void abortMoveItem( EDA_DRAW_PANEL* aPanel, wxDC* aDC )
...
@@ -701,7 +701,7 @@ static void abortMoveItem( EDA_DRAW_PANEL* aPanel, wxDC* aDC )
// Erase the wire representation before the 'normal' view is drawn.
// Erase the wire representation before the 'normal' view is drawn.
if
(
item
->
IsWireImage
()
)
if
(
item
->
IsWireImage
()
)
item
->
Draw
(
aPanel
,
aDC
,
wxPoint
(
0
,
0
),
g_XorMode
);
item
->
Draw
(
aPanel
,
aDC
,
wxPoint
(
0
,
0
),
g_XorMode
);
item
->
ClearFlags
();
item
->
ClearFlags
();
}
}
...
...
eeschema/schframe.cpp
View file @
949118a0
...
@@ -173,6 +173,7 @@ END_EVENT_TABLE()
...
@@ -173,6 +173,7 @@ END_EVENT_TABLE()
#define SCH_EDIT_FRAME_NAME wxT( "SchematicFrame" )
#define SCH_EDIT_FRAME_NAME wxT( "SchematicFrame" )
SCH_EDIT_FRAME
::
SCH_EDIT_FRAME
(
wxWindow
*
aParent
,
const
wxString
&
aTitle
,
SCH_EDIT_FRAME
::
SCH_EDIT_FRAME
(
wxWindow
*
aParent
,
const
wxString
&
aTitle
,
const
wxPoint
&
aPosition
,
const
wxSize
&
aSize
,
const
wxPoint
&
aPosition
,
const
wxSize
&
aSize
,
long
aStyle
)
:
long
aStyle
)
:
...
@@ -534,12 +535,6 @@ double SCH_EDIT_FRAME::BestZoom()
...
@@ -534,12 +535,6 @@ double SCH_EDIT_FRAME::BestZoom()
}
}
/* Build a filename that can be used in plot and print functions
* for the current sheet path.
* This filename is unique and must be used instead of the screen filename
* when one must creates file for each sheet in the hierarchy,
* because in complex hierarchies a sheet and a SCH_SCREEN is used more than once
*/
wxString
SCH_EDIT_FRAME
::
GetUniqueFilenameForCurrentSheet
()
wxString
SCH_EDIT_FRAME
::
GetUniqueFilenameForCurrentSheet
()
{
{
wxFileName
fn
=
GetScreen
()
->
GetFileName
();
wxFileName
fn
=
GetScreen
()
->
GetFileName
();
...
@@ -582,11 +577,6 @@ void SCH_EDIT_FRAME::OnModify()
...
@@ -582,11 +577,6 @@ void SCH_EDIT_FRAME::OnModify()
}
}
/*****************************************************************************
* Enable or disable menu entry and toolbar buttons according to current
* conditions.
*****************************************************************************/
void
SCH_EDIT_FRAME
::
OnUpdateBlockSelected
(
wxUpdateUIEvent
&
event
)
void
SCH_EDIT_FRAME
::
OnUpdateBlockSelected
(
wxUpdateUIEvent
&
event
)
{
{
bool
enable
=
(
GetScreen
()
&&
GetScreen
()
->
m_BlockLocate
.
GetCommand
()
==
BLOCK_MOVE
);
bool
enable
=
(
GetScreen
()
&&
GetScreen
()
->
m_BlockLocate
.
GetCommand
()
==
BLOCK_MOVE
);
...
@@ -782,9 +772,11 @@ void SCH_EDIT_FRAME::OnOpenCvpcb( wxCommandEvent& event )
...
@@ -782,9 +772,11 @@ void SCH_EDIT_FRAME::OnOpenCvpcb( wxCommandEvent& event )
}
}
}
}
void
SCH_EDIT_FRAME
::
OnOpenLibraryEditor
(
wxCommandEvent
&
event
)
void
SCH_EDIT_FRAME
::
OnOpenLibraryEditor
(
wxCommandEvent
&
event
)
{
{
SCH_COMPONENT
*
component
=
NULL
;
SCH_COMPONENT
*
component
=
NULL
;
if
(
event
.
GetId
()
==
ID_POPUP_SCH_CALL_LIBEDIT_AND_LOAD_CMP
)
if
(
event
.
GetId
()
==
ID_POPUP_SCH_CALL_LIBEDIT_AND_LOAD_CMP
)
{
{
SCH_ITEM
*
item
=
GetScreen
()
->
GetCurItem
();
SCH_ITEM
*
item
=
GetScreen
()
->
GetCurItem
();
...
@@ -861,6 +853,7 @@ void SCH_EDIT_FRAME::OnPrint( wxCommandEvent& event )
...
@@ -861,6 +853,7 @@ void SCH_EDIT_FRAME::OnPrint( wxCommandEvent& event )
}
}
}
}
void
SCH_EDIT_FRAME
::
PrintPage
(
wxDC
*
aDC
,
LAYER_MSK
aPrintMask
,
bool
aPrintMirrorMode
,
void
SCH_EDIT_FRAME
::
PrintPage
(
wxDC
*
aDC
,
LAYER_MSK
aPrintMask
,
bool
aPrintMirrorMode
,
void
*
aData
)
void
*
aData
)
{
{
...
@@ -975,7 +968,7 @@ void SCH_EDIT_FRAME::addCurrentItemToList( wxDC* aDC )
...
@@ -975,7 +968,7 @@ void SCH_EDIT_FRAME::addCurrentItemToList( wxDC* aDC )
// Erase the wire representation before the 'normal' view is drawn.
// Erase the wire representation before the 'normal' view is drawn.
if
(
item
->
IsWireImage
()
)
if
(
item
->
IsWireImage
()
)
item
->
Draw
(
m_canvas
,
aDC
,
wxPoint
(
0
,
0
),
g_XorMode
);
item
->
Draw
(
m_canvas
,
aDC
,
wxPoint
(
0
,
0
),
g_XorMode
);
item
->
ClearFlags
();
item
->
ClearFlags
();
screen
->
SetModify
();
screen
->
SetModify
();
...
@@ -993,13 +986,7 @@ void SCH_EDIT_FRAME::addCurrentItemToList( wxDC* aDC )
...
@@ -993,13 +986,7 @@ void SCH_EDIT_FRAME::addCurrentItemToList( wxDC* aDC )
}
}
}
}
/* sets the main window title bar text.
* If file name defined by SCH_SCREEN::m_FileName is not set, the title is set to the
* application name appended with no file.
* Otherwise, the title is set to the hierarchical sheet path and the full file name,
* and read only is appended to the title if the user does not have write
* access to the file.
*/
void
SCH_EDIT_FRAME
::
UpdateTitle
()
void
SCH_EDIT_FRAME
::
UpdateTitle
()
{
{
wxString
title
;
wxString
title
;
...
...
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