Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
9cdcb043
Commit
9cdcb043
authored
3 years ago
by
Matthias Puchner
Browse files
Options
Downloads
Patches
Plain Diff
use platform independent UTF-8 coding
parent
f69c2224
No related branches found
No related tags found
1 merge request
!415
Unit handling in layer oriented sample editor
Pipeline
#47618
passed
3 years ago
Stage: build
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GUI/Models/Unit.cpp
+5
-5
5 additions, 5 deletions
GUI/Models/Unit.cpp
GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
+1
-1
1 addition, 1 deletion
GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
GUI/mainwindow/actionmanager.cpp
+1
-1
1 addition, 1 deletion
GUI/mainwindow/actionmanager.cpp
with
7 additions
and
7 deletions
GUI/Models/Unit.cpp
+
5
−
5
View file @
9cdcb043
...
...
@@ -63,15 +63,15 @@ QString unitAsString(const Unit& unit)
case
Unit
::
nanometer
:
return
"nm"
;
case
Unit
::
nanometerPower2
:
return
"nm
²
"
;
return
u8
"nm
\u00B2
"
;
case
Unit
::
nanometerPowerMinus2
:
return
"1/nm
²
"
;
return
u8
"1/nm
\u00B2
"
;
case
Unit
::
angstrom
:
return
"
\303\20
5
"
;
return
u8"\u00c
5"
;
case
Unit
::
angstromPower2
:
return
"
\303\205
²
"
;
return
u8"\u00c5\u00B2
"
;
case
Unit
::
angstromPowerMinus2
:
return
"1/
\
303\205
²
"
;
return
u8
"1/\
u00c5\u00B2
"
;
case
Unit
::
degree
:
return
"°"
;
case
Unit
::
radiant
:
...
...
This diff is collapsed.
Click to expand it.
GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
+
1
−
1
View file @
9cdcb043
...
...
@@ -58,7 +58,7 @@ LayerOrientedSampleEditor::LayerOrientedSampleEditor(QWidget* parent)
m_asAngstromAction
=
new
QAction
(
this
);
m_asAngstromAction
->
setIcon
(
QIcon
(
":/images/unit_angstrom.svg"
));
m_asAngstromAction
->
setToolTip
(
"Use
\
303\20
5
ngstrom as unit (where applicable)"
);
m_asAngstromAction
->
setToolTip
(
u8
"Use \
u00c
5ngstrom as unit (where applicable)"
);
connect
(
m_asAngstromAction
,
&
QAction
::
toggled
,
this
,
&
LayerOrientedSampleEditor
::
onUnitActionToggled
);
m_asAngstromAction
->
setCheckable
(
true
);
...
...
This diff is collapsed.
Click to expand it.
GUI/mainwindow/actionmanager.cpp
+
1
−
1
View file @
9cdcb043
...
...
@@ -264,7 +264,7 @@ void ActionManager::onAboutToShowSettingsMenu()
};
addUnitAction
(
"Use nanometer as default unit"
,
false
);
addUnitAction
(
"Use
\
303\20
5
ngstrom as default unit"
,
true
);
addUnitAction
(
u8
"Use \
u00c
5ngstrom as default unit"
,
true
);
m_settingsMenu
->
addSeparator
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment