Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
4
4uhv
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cs
ds
4uhv
Commits
9201608d
Commit
9201608d
authored
3 years ago
by
Alessio Igor Bogani
Browse files
Options
Downloads
Patches
Plain Diff
Express pressure and current in scientific notation
parent
1e184e6c
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Agilent4uhv.xmi
+2
-2
2 additions, 2 deletions
src/Agilent4uhv.xmi
src/Agilent4uhvDynAttrUtils.cpp
+2
-2
2 additions, 2 deletions
src/Agilent4uhvDynAttrUtils.cpp
with
4 additions
and
4 deletions
src/Agilent4uhv.xmi
+
2
−
2
View file @
9201608d
...
...
@@ -181,7 +181,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
""
unit=
"A"
standardUnit=
""
displayUnit=
""
format=
""
maxValue=
"9E-1"
minValue=
"1E-10"
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
""
unit=
"A"
standardUnit=
""
displayUnit=
""
format=
"
%1.2E
"
maxValue=
"9E-1"
minValue=
"1E-10"
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<readExcludedStates>
UNKNOWN
</readExcludedStates>
<readExcludedStates>
INIT
</readExcludedStates>
</dynamicAttributes>
...
...
@@ -191,7 +191,7 @@
<archiveEvent
fire=
"false"
libCheckCriteria=
"false"
/>
<dataReadyEvent
fire=
"false"
libCheckCriteria=
"true"
/>
<status
abstract=
"false"
inherited=
"false"
concrete=
"true"
concreteHere=
"true"
/>
<properties
description=
""
label=
""
unit=
"mbar"
standardUnit=
""
displayUnit=
""
format=
""
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<properties
description=
""
label=
""
unit=
"mbar"
standardUnit=
""
displayUnit=
""
format=
"
%1.2E
"
maxValue=
""
minValue=
""
maxAlarm=
""
minAlarm=
""
maxWarning=
""
minWarning=
""
deltaTime=
""
deltaValue=
""
/>
<readExcludedStates>
UNKNOWN
</readExcludedStates>
<readExcludedStates>
INIT
</readExcludedStates>
</dynamicAttributes>
...
...
This diff is collapsed.
Click to expand it.
src/Agilent4uhvDynAttrUtils.cpp
+
2
−
2
View file @
9201608d
...
...
@@ -554,7 +554,7 @@ void Agilent4uhv::add_CurrentX_dynamic_attribute(string attname)
currentx_prop
.
set_unit
(
"A"
);
// standard_unit not set for CurrentX
// display_unit not set for CurrentX
// format not
set
for
CurrentX
currentx_prop
.
set
_
for
mat
(
"%1.2E"
);
currentx_prop
.
set_max_value
(
"9E-1"
);
currentx_prop
.
set_min_value
(
"1E-10"
);
// max_alarm not set for CurrentX
...
...
@@ -611,7 +611,7 @@ void Agilent4uhv::add_PressureX_dynamic_attribute(string attname)
pressurex_prop
.
set_unit
(
"mbar"
);
// standard_unit not set for PressureX
// display_unit not set for PressureX
// format not
set
for
PressureX
pressurex_prop
.
set
_
for
mat
(
"%1.2E"
);
// max_value not set for PressureX
// min_value not set for PressureX
// max_alarm not set for PressureX
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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