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
226b877a
Commit
226b877a
authored
Feb 12, 2013
by
Emmeran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tabs converted to spaces except wxstruct.h
parent
0bdf5bac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
drawpanel.cpp
common/drawpanel.cpp
+10
-10
zoom.cpp
common/zoom.cpp
+3
-3
gerbview_dialog_display_options_frame.cpp
gerbview/dialogs/gerbview_dialog_display_options_frame.cpp
+1
-1
No files found.
common/drawpanel.cpp
View file @
226b877a
...
...
@@ -160,20 +160,20 @@ BASE_SCREEN* EDA_DRAW_PANEL::GetScreen()
wxPoint
EDA_DRAW_PANEL
::
ToDeviceXY
(
const
wxPoint
&
pos
)
{
wxPoint
ret
;
INSTALL_UNBUFFERED_DC
(
dc
,
this
);
ret
.
x
=
dc
.
LogicalToDeviceX
(
pos
.
x
);
ret
.
y
=
dc
.
LogicalToDeviceY
(
pos
.
y
);
return
ret
;
wxPoint
ret
;
INSTALL_UNBUFFERED_DC
(
dc
,
this
);
ret
.
x
=
dc
.
LogicalToDeviceX
(
pos
.
x
);
ret
.
y
=
dc
.
LogicalToDeviceY
(
pos
.
y
);
return
ret
;
}
wxPoint
EDA_DRAW_PANEL
::
ToLogicalXY
(
const
wxPoint
&
pos
)
{
wxPoint
ret
;
INSTALL_UNBUFFERED_DC
(
dc
,
this
);
ret
.
x
=
dc
.
DeviceToLogicalX
(
pos
.
x
);
ret
.
y
=
dc
.
DeviceToLogicalY
(
pos
.
y
);
return
ret
;
wxPoint
ret
;
INSTALL_UNBUFFERED_DC
(
dc
,
this
);
ret
.
x
=
dc
.
DeviceToLogicalX
(
pos
.
x
);
ret
.
y
=
dc
.
DeviceToLogicalY
(
pos
.
y
);
return
ret
;
}
void
EDA_DRAW_PANEL
::
DrawCrossHair
(
wxDC
*
aDC
,
EDA_COLOR_T
aColor
)
...
...
common/zoom.cpp
View file @
226b877a
...
...
@@ -56,9 +56,9 @@ void EDA_DRAW_FRAME::RedrawScreen( const wxPoint& aCenterPoint, bool aWarpPointe
void
EDA_DRAW_FRAME
::
RedrawScreen2
(
const
wxPoint
&
posBefore
)
{
wxPoint
dPos
=
posBefore
-
m_canvas
->
GetClientSize
()
/
2
;
// relative screen position to center before zoom
wxPoint
newScreenPos
=
m_canvas
->
ToDeviceXY
(
GetScreen
()
->
GetCrossHairPosition
()
);
// screen position of crosshair after zoom
wxPoint
newCenter
=
m_canvas
->
ToLogicalXY
(
newScreenPos
-
dPos
);
wxPoint
dPos
=
posBefore
-
m_canvas
->
GetClientSize
()
/
2
;
// relative screen position to center before zoom
wxPoint
newScreenPos
=
m_canvas
->
ToDeviceXY
(
GetScreen
()
->
GetCrossHairPosition
()
);
// screen position of crosshair after zoom
wxPoint
newCenter
=
m_canvas
->
ToLogicalXY
(
newScreenPos
-
dPos
);
AdjustScrollBars
(
newCenter
);
...
...
gerbview/dialogs/gerbview_dialog_display_options_frame.cpp
View file @
226b877a
...
...
@@ -143,7 +143,7 @@ void DIALOG_DISPLAY_OPTIONS::OnOKBUttonClick( wxCommandEvent& event )
m_Parent
->
SetPageSettings
(
pageInfo
);
m_Parent
->
GetCanvas
()
->
SetEnableZoomNoCenter
(
m_OptZoomNoCenter
->
GetValue
()
);
m_Parent
->
GetCanvas
()
->
SetEnableZoomNoCenter
(
m_OptZoomNoCenter
->
GetValue
()
);
m_Parent
->
GetCanvas
()
->
SetEnableMiddleButtonPan
(
m_OptMiddleButtonPan
->
GetValue
()
);
m_Parent
->
GetCanvas
()
->
SetMiddleButtonPanLimited
(
m_OptMiddleButtonPanLimited
->
GetValue
()
);
...
...
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