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
096f4a10
Commit
096f4a10
authored
Jul 08, 2012
by
Marco Mattila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add rotation field to pcbnew text item property dialog.
parent
1da099dd
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1824 additions
and
1946 deletions
+1824
-1946
dialog_pcb_text_properties.cpp
pcbnew/dialogs/dialog_pcb_text_properties.cpp
+7
-22
dialog_pcb_text_properties_base.cpp
pcbnew/dialogs/dialog_pcb_text_properties_base.cpp
+63
-78
dialog_pcb_text_properties_base.fbp
pcbnew/dialogs/dialog_pcb_text_properties_base.fbp
+1738
-1830
dialog_pcb_text_properties_base.h
pcbnew/dialogs/dialog_pcb_text_properties_base.h
+16
-16
No files found.
pcbnew/dialogs/dialog_pcb_text_properties.cpp
View file @
096f4a10
...
...
@@ -135,27 +135,9 @@ void DIALOG_PCB_TEXT_PROPERTIES::MyInit()
}
}
switch
(
(
int
)
m_SelectedPCBText
->
GetOrientation
()
)
{
default
:
m_OrientationCtrl
->
SetSelection
(
0
);
break
;
case
900
:
case
-
2700
:
m_OrientationCtrl
->
SetSelection
(
1
);
break
;
case
1800
:
case
-
1800
:
m_OrientationCtrl
->
SetSelection
(
2
);
break
;
case
2700
:
case
-
900
:
m_OrientationCtrl
->
SetSelection
(
3
);
break
;
}
wxString
orientationStr
;
orientationStr
<<
m_SelectedPCBText
->
GetOrientation
();
m_OrientationCtrl
->
SetValue
(
orientationStr
);
if
(
m_SelectedPCBText
->
m_Mirror
)
m_DisplayCtrl
->
SetSelection
(
1
);
...
...
@@ -263,7 +245,10 @@ void DIALOG_PCB_TEXT_PROPERTIES::OnOkClick( wxCommandEvent& event )
m_SelectedPCBText
->
m_Mirror
=
(
m_DisplayCtrl
->
GetSelection
()
==
1
)
?
true
:
false
;
// Set the text orientation
m_SelectedPCBText
->
m_Orient
=
m_OrientationCtrl
->
GetSelection
()
*
900
;
long
orientation
;
m_OrientationCtrl
->
GetValue
().
ToLong
(
&
orientation
);
orientation
=
orientation
%
3600
;
m_SelectedPCBText
->
SetOrientation
(
orientation
);
// Set whether the PCB text is slanted (it is not italics, as italics has additional curves in style)
m_SelectedPCBText
->
m_Italic
=
m_StyleCtrl
->
GetSelection
()
?
1
:
0
;
...
...
pcbnew/dialogs/dialog_pcb_text_properties_base.cpp
View file @
096f4a10
This diff is collapsed.
Click to expand it.
pcbnew/dialogs/dialog_pcb_text_properties_base.fbp
View file @
096f4a10
This source diff could not be displayed because it is too large. You can
view the blob
instead.
pcbnew/dialogs/dialog_pcb_text_properties_base.h
View file @
096f4a10
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Mar 19
2012)
// C++ code generated with wxFormBuilder (version
Apr 11
2012)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
@@ -19,8 +19,8 @@
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/textctrl.h>
#include <wx/sizer.h>
#include <wx/choice.h>
#include <wx/sizer.h>
#include <wx/button.h>
#include <wx/dialog.h>
...
...
@@ -38,25 +38,25 @@ class DIALOG_PCB_TEXT_PROPERTIES_BASE : public DIALOG_SHIM
wxStaticText
*
m_TextLabel
;
wxTextCtrl
*
m_TextContentCtrl
;
wxStaticText
*
m_SizeXLabel
;
wxTextCtrl
*
m_SizeXCtrl
;
wxStaticText
*
m_SizeYLabel
;
wxTextCtrl
*
m_SizeYCtrl
;
wxStaticText
*
m_ThicknessLabel
;
wxTextCtrl
*
m_ThicknessCtrl
;
wxStaticText
*
m_PositionXLabel
;
wxTextCtrl
*
m_PositionXCtrl
;
wxStaticText
*
m_PositionYLabel
;
wxTextCtrl
*
m_PositionYCtrl
;
wxStaticText
*
m_LayerLabel
;
wxChoice
*
m_LayerSelectionCtrl
;
wxStaticText
*
m_staticText8
;
wxChoice
*
m_OrientationCtrl
;
wxStaticText
*
m_staticText9
;
wxChoice
*
m_StyleCtrl
;
wxStaticText
*
m_staticText10
;
wxTextCtrl
*
m_SizeXCtrl
;
wxTextCtrl
*
m_PositionXCtrl
;
wxChoice
*
m_LayerSelectionCtrl
;
wxChoice
*
m_DisplayCtrl
;
wxStaticText
*
m_SizeYLabel
;
wxStaticText
*
m_PositionYLabel
;
wxStaticText
*
m_staticText9
;
wxStaticText
*
m_staticText11
;
wxTextCtrl
*
m_SizeYCtrl
;
wxTextCtrl
*
m_PositionYCtrl
;
wxChoice
*
m_StyleCtrl
;
wxChoice
*
m_justifyChoice
;
wxStaticText
*
m_ThicknessLabel
;
wxStaticText
*
m_orientationLabel
;
wxTextCtrl
*
m_ThicknessCtrl
;
wxTextCtrl
*
m_OrientationCtrl
;
wxStdDialogButtonSizer
*
m_StandardSizer
;
wxButton
*
m_StandardSizerOK
;
wxButton
*
m_StandardSizerCancel
;
...
...
@@ -69,7 +69,7 @@ class DIALOG_PCB_TEXT_PROPERTIES_BASE : public DIALOG_SHIM
public
:
DIALOG_PCB_TEXT_PROPERTIES_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Text Properties"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
433
,
4
65
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
|
wxSYSTEM_MENU
);
DIALOG_PCB_TEXT_PROPERTIES_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Text Properties"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
433
,
4
50
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
|
wxSYSTEM_MENU
);
~
DIALOG_PCB_TEXT_PROPERTIES_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