Skip to content

Commit 82635c8

Browse files
keenanlangkeenanlang
authored
Adjusting string sizing for longer path names (#36)
* Adjusting string sizing for longer path names * swap over to long strings * switch fullPath to lso as well
1 parent 6cf6740 commit 82635c8

6 files changed

Lines changed: 681 additions & 800 deletions

File tree

‎sscanApp/Db/saveData.db‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,33 @@ record(stringout, "$(P)saveData_comment2") {
3030
field(DTYP, "Soft Channel")
3131
}
3232

33-
record(stringout, "$(P)saveData_fileName") {
33+
record(lso, "$(P)saveData_fileName") {
3434
field(DTYP, "Soft Channel")
35+
field(SIZV, "256")
3536
}
3637

37-
record(stringout, "$(P)saveData_fileSystem") {
38+
record(lso, "$(P)saveData_fileSystem") {
3839
field(DTYP, "Soft Channel")
40+
field(SIZV, "256")
3941
}
4042

4143
record(stringout, "$(P)saveData_message") {
4244
field(DTYP, "Soft Channel")
4345
}
4446

45-
record(stringout, "$(P)saveData_subDir") {
47+
record(lso, "$(P)saveData_subDir") {
4648
field(DTYP, "Soft Channel")
49+
field(SIZV, "256")
4750
}
4851

49-
record(stringout, "$(P)saveData_baseName") {
52+
record(lso, "$(P)saveData_baseName") {
5053
field(DTYP, "Soft Channel")
54+
field(SIZV, "256")
5155
}
5256

53-
record(waveform, "$(P)saveData_fullPathName") {
57+
record(lso, "$(P)saveData_fullPathName") {
5458
field(DTYP, "Soft Channel")
55-
field(NELM, "100")
56-
field(FTVL, "CHAR")
59+
field(SIZV, "512")
5760
}
5861

5962
record(longout, "$(P)saveData_maxAllowedRetries") {

‎sscanApp/Db/saveData_settings.req‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
$(P)saveData_fileSystem
2-
$(P)saveData_subDir
3-
$(P)saveData_baseName
1+
$(P)saveData_fileSystem.$
2+
$(P)saveData_subDir.$
3+
$(P)saveData_baseName.$
44
$(P)saveData_scanNumber
55
$(P)saveData_realTime1D
66
$(P)saveData_maxAllowedRetries

‎sscanApp/op/adl/scan_saveData.adl‎

Lines changed: 92 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
file {
3-
name="/home/oxygen4/MOONEY/epics/synAppsSVN/support/sscan/sscanApp/op/adl/scan_saveData.adl"
4-
version=030107
3+
name="/home/beams1/KLANG/Documents/Projects/Repository/git/sscan/sscanApp/op/adl/scan_saveData.adl"
4+
version=030111
55
}
66
display {
77
object {
@@ -107,7 +107,7 @@ text {
107107
height=20
108108
}
109109
control {
110-
chan="$(P)saveData_fileSystem"
110+
chan="$(P)saveData_fileSystem.$"
111111
clr=14
112112
bclr=51
113113
}
@@ -238,58 +238,47 @@ text {
238238
}
239239
textix="Example: //"
240240
}
241-
composite {
241+
text {
242242
object {
243243
x=10
244+
y=63
245+
width=80
246+
height=14
247+
}
248+
"basic attribute" {
249+
clr=14
250+
}
251+
textix="Subdirectory"
252+
}
253+
"text entry" {
254+
object {
255+
x=100
244256
y=60
245-
width=380
257+
width=260
246258
height=20
247259
}
248-
"composite name"=""
249-
children {
250-
text {
251-
object {
252-
x=10
253-
y=63
254-
width=80
255-
height=14
256-
}
257-
"basic attribute" {
258-
clr=14
259-
}
260-
textix="Subdirectory"
261-
}
262-
"text entry" {
263-
object {
264-
x=100
265-
y=60
266-
width=260
267-
height=20
268-
}
269-
control {
270-
chan="$(P)saveData_subDir"
271-
clr=14
272-
bclr=51
273-
}
274-
format="string"
275-
limits {
276-
}
277-
}
278-
"text entry" {
279-
object {
280-
x=370
281-
y=60
282-
width=20
283-
height=20
284-
}
285-
control {
286-
chan="$(P)saveData_subDir.DISP"
287-
clr=14
288-
bclr=51
289-
}
290-
limits {
291-
}
292-
}
260+
control {
261+
chan="$(P)saveData_subDir.$"
262+
clr=14
263+
bclr=51
264+
}
265+
format="string"
266+
limits {
267+
}
268+
}
269+
"text entry" {
270+
object {
271+
x=370
272+
y=60
273+
width=20
274+
height=20
275+
}
276+
control {
277+
chan="$(P)saveData_subDir.DISP"
278+
clr=14
279+
bclr=51
280+
}
281+
limits {
293282
}
294283
}
295284
text {
@@ -312,7 +301,7 @@ text {
312301
height=20
313302
}
314303
control {
315-
chan="$(P)saveData_baseName"
304+
chan="$(P)saveData_baseName.$"
316305
clr=14
317306
bclr=51
318307
}
@@ -746,74 +735,63 @@ composite {
746735
}
747736
}
748737
}
749-
composite {
738+
"text update" {
739+
object {
740+
x=50
741+
y=150
742+
width=340
743+
height=14
744+
}
745+
monitor {
746+
chan="$(P)saveData_fileName.$"
747+
clr=53
748+
bclr=1
749+
}
750+
format="string"
751+
limits {
752+
}
753+
}
754+
"text update" {
755+
object {
756+
x=50
757+
y=130
758+
width=340
759+
height=14
760+
}
761+
monitor {
762+
chan="$(P)saveData_fullPathName.$"
763+
clr=53
764+
bclr=1
765+
}
766+
format="string"
767+
limits {
768+
}
769+
}
770+
text {
750771
object {
751772
x=10
752773
y=130
753-
width=380
754-
height=34
774+
width=40
775+
height=14
755776
}
756-
"composite name"=""
757-
children {
758-
"text update" {
759-
object {
760-
x=50
761-
y=150
762-
width=340
763-
height=14
764-
}
765-
monitor {
766-
chan="$(P)saveData_fileName"
767-
clr=53
768-
bclr=1
769-
}
770-
format="string"
771-
limits {
772-
}
773-
}
774-
"text update" {
775-
object {
776-
x=50
777-
y=130
778-
width=340
779-
height=14
780-
}
781-
monitor {
782-
chan="$(P)saveData_fullPathName"
783-
clr=53
784-
bclr=1
785-
}
786-
format="string"
787-
limits {
788-
}
789-
}
790-
text {
791-
object {
792-
x=10
793-
y=130
794-
width=40
795-
height=14
796-
}
797-
"basic attribute" {
798-
clr=14
799-
}
800-
textix="PATH:"
801-
align="horiz. centered"
802-
}
803-
text {
804-
object {
805-
x=10
806-
y=150
807-
width=40
808-
height=14
809-
}
810-
"basic attribute" {
811-
clr=14
812-
}
813-
textix="NAME:"
814-
align="horiz. centered"
815-
}
777+
"basic attribute" {
778+
clr=14
779+
}
780+
textix="PATH:"
781+
align="horiz. centered"
782+
}
783+
text {
784+
object {
785+
x=10
786+
y=150
787+
width=40
788+
height=14
816789
}
790+
"basic attribute" {
791+
clr=14
792+
}
793+
textix="NAME:"
794+
align="horiz. centered"
817795
}
818796
text {
819797
object {

0 commit comments

Comments
 (0)