From 1c03d052da75968ae4c7b0934167f33c19808a2f Mon Sep 17 00:00:00 2001
From: timmmooney <mooney@aps.anl.gov>
Date: Wed, 29 Jan 2014 18:24:50 +0000
Subject: [PATCH] For one motor

---
 motorApp/op/adl/MAX_trajectoryScan1.adl | 1164 ++++++++++++-----------
 1 file changed, 615 insertions(+), 549 deletions(-)

diff --git a/motorApp/op/adl/MAX_trajectoryScan1.adl b/motorApp/op/adl/MAX_trajectoryScan1.adl
index b3f749fe..2e0543b3 100644
--- a/motorApp/op/adl/MAX_trajectoryScan1.adl
+++ b/motorApp/op/adl/MAX_trajectoryScan1.adl
@@ -1,14 +1,14 @@
 
 file {
-	name="/home/oxygen4/MOONEY/epics/synAppsSVN/support/motor/motorApp/op/adl/MAX_trajectoryScan1.adl"
+	name="/home/oxygen/MOONEY/epics/synApps/support/motor/motorApp/op/adl/MAX_trajectoryScan1.adl"
 	version=030107
 }
 display {
 	object {
-		x=164
-		y=54
+		x=757
+		y=66
 		width=530
-		height=595
+		height=620
 	}
 	clr=14
 	bclr=4
@@ -92,7 +92,7 @@ rectangle {
 		x=5
 		y=51
 		width=524
-		height=215
+		height=240
 	}
 	"basic attribute" {
 		clr=14
@@ -100,18 +100,6 @@ rectangle {
 		width=2
 	}
 }
-text {
-	object {
-		x=20
-		y=55
-		width=210
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="# trajectory elements"
-}
 "text entry" {
 	object {
 		x=234
@@ -178,18 +166,6 @@ text {
 	limits {
 	}
 }
-text {
-	object {
-		x=80
-		y=105
-		width=150
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="# output pulses"
-}
 "text entry" {
 	object {
 		x=234
@@ -205,18 +181,6 @@ text {
 	limits {
 	}
 }
-text {
-	object {
-		x=140
-		y=155
-		width=90
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Time mode"
-}
 menu {
 	object {
 		x=234
@@ -230,18 +194,6 @@ menu {
 		bclr=51
 	}
 }
-text {
-	object {
-		x=130
-		y=180
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Total time"
-}
 "text entry" {
 	object {
 		x=234
@@ -272,18 +224,6 @@ text {
 	limits {
 	}
 }
-text {
-	object {
-		x=29
-		y=205
-		width=200
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Execution time scale"
-}
 "text entry" {
 	object {
 		x=234
@@ -326,30 +266,6 @@ text {
 	limits {
 	}
 }
-text {
-	object {
-		x=10
-		y=130
-		width=210
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Range of pulses: Start"
-}
-text {
-	object {
-		x=20
-		y=80
-		width=210
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Trajectory definition"
-}
 menu {
 	object {
 		x=234
@@ -378,18 +294,6 @@ menu {
 	limits {
 	}
 }
-text {
-	object {
-		x=60
-		y=230
-		width=170
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Acceleration time"
-}
 "text update" {
 	object {
 		x=340
@@ -553,45 +457,497 @@ text {
 	textix="Debug Level"
 	align="horiz. centered"
 }
+rectangle {
+	object {
+		x=4
+		y=300
+		width=524
+		height=60
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+		width=2
+	}
+}
 composite {
 	object {
 		x=4
-		y=273
+		y=367
 		width=524
-		height=317
+		height=250
 	}
 	"composite name"=""
 	children {
-		rectangle {
+		composite {
 			object {
 				x=4
-				y=273
+				y=367
 				width=524
-				height=60
+				height=250
 			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-				width=2
+			"composite name"=""
+			children {
+				rectangle {
+					object {
+						x=4
+						y=367
+						width=524
+						height=250
+					}
+					"basic attribute" {
+						clr=14
+						fill="outline"
+						width=2
+					}
+				}
+				text {
+					object {
+						x=111
+						y=397
+						width=50
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Build"
+				}
+				"message button" {
+					object {
+						x=167
+						y=397
+						width=96
+						height=20
+					}
+					control {
+						chan="$(P)$(R)Build"
+						clr=14
+						bclr=51
+					}
+					label="Build"
+					press_msg="1"
+					release_msg="0"
+				}
+				text {
+					object {
+						x=31
+						y=447
+						width=130
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Simulate/Real"
+				}
+				menu {
+					object {
+						x=165
+						y=447
+						width=100
+						height=20
+					}
+					control {
+						chan="$(P)$(R)SimMode"
+						clr=14
+						bclr=51
+					}
+				}
+				"text update" {
+					object {
+						x=168
+						y=423
+						width=350
+						height=20
+					}
+					monitor {
+						chan="$(P)$(R)BuildMessage"
+						clr=14
+						bclr=56
+					}
+					limits {
+					}
+				}
+				text {
+					object {
+						x=31
+						y=422
+						width=130
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Build message"
+				}
+				"text update" {
+					object {
+						x=272
+						y=397
+						width=103
+						height=20
+					}
+					monitor {
+						chan="$(P)$(R)BuildState"
+						clr=50
+						bclr=13
+					}
+					clrmod="alarm"
+					limits {
+					}
+				}
+				"text update" {
+					object {
+						x=272
+						y=472
+						width=103
+						height=20
+					}
+					monitor {
+						chan="$(P)$(R)ExecState"
+						clr=50
+						bclr=14
+					}
+					clrmod="alarm"
+					limits {
+					}
+				}
+				"text update" {
+					object {
+						x=386
+						y=397
+						width=103
+						height=20
+					}
+					monitor {
+						chan="$(P)$(R)BuildStatus"
+						clr=50
+						bclr=14
+					}
+					clrmod="alarm"
+					limits {
+					}
+				}
+				"text update" {
+					object {
+						x=386
+						y=472
+						width=103
+						height=20
+					}
+					monitor {
+						chan="$(P)$(R)ExecStatus"
+						clr=50
+						bclr=14
+					}
+					clrmod="alarm"
+					limits {
+					}
+				}
+				text {
+					object {
+						x=180
+						y=372
+						width=70
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Command"
+				}
+				text {
+					object {
+						x=298
+						y=372
+						width=50
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="State"
+				}
+				text {
+					object {
+						x=407
+						y=372
+						width=60
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Status"
+				}
+				composite {
+					object {
+						x=91
+						y=472
+						width=172
+						height=20
+					}
+					"composite name"=""
+					children {
+						text {
+							object {
+								x=91
+								y=472
+								width=70
+								height=20
+							}
+							"basic attribute" {
+								clr=14
+							}
+							textix="Execute"
+						}
+						"message button" {
+							object {
+								x=167
+								y=472
+								width=96
+								height=20
+							}
+							control {
+								chan="$(P)$(R)Execute"
+								clr=14
+								bclr=51
+							}
+							label="Execute"
+							press_msg="1"
+							release_msg="0"
+						}
+					}
+				}
+				text {
+					object {
+						x=111
+						y=527
+						width=60
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Abort"
+				}
+				"message button" {
+					object {
+						x=167
+						y=522
+						width=150
+						height=30
+					}
+					control {
+						chan="$(P)$(R)Abort"
+						clr=14
+						bclr=20
+					}
+					label="Abort!"
+					press_msg="1"
+					release_msg="0"
+				}
+				text {
+					object {
+						x=11
+						y=497
+						width=150
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Execute message"
+				}
+				"text update" {
+					object {
+						x=168
+						y=498
+						width=350
+						height=20
+					}
+					monitor {
+						chan="$(P)$(R)ExecMessage"
+						clr=14
+						bclr=56
+					}
+					limits {
+					}
+				}
+				"message button" {
+					object {
+						x=167
+						y=562
+						width=96
+						height=20
+					}
+					control {
+						chan="$(P)$(R)Readback"
+						clr=14
+						bclr=51
+					}
+					label="Readback"
+					press_msg="1"
+					release_msg="0"
+				}
+				text {
+					object {
+						x=81
+						y=562
+						width=80
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Readback"
+				}
+				"text update" {
+					object {
+						x=272
+						y=562
+						width=103
+						height=20
+					}
+					monitor {
+						chan="$(P)$(R)ReadState"
+						clr=50
+						bclr=14
+					}
+					clrmod="alarm"
+					limits {
+					}
+				}
+				"text update" {
+					object {
+						x=386
+						y=562
+						width=103
+						height=20
+					}
+					monitor {
+						chan="$(P)$(R)ReadStatus"
+						clr=50
+						bclr=14
+					}
+					clrmod="alarm"
+					limits {
+					}
+				}
+				text {
+					object {
+						x=41
+						y=587
+						width=120
+						height=20
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Read message"
+				}
+				"text update" {
+					object {
+						x=168
+						y=588
+						width=350
+						height=20
+					}
+					monitor {
+						chan="$(P)$(R)ReadMessage"
+						clr=14
+						bclr=56
+					}
+					limits {
+					}
+				}
 			}
 		}
-		text {
+	}
+}
+text {
+	object {
+		x=470
+		y=307
+		width=50
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Plots"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=168
+		y=307
+		width=60
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Move?"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=230
+		y=307
+		width=110
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Current Pos"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=348
+		y=307
+		width=100
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Start Pos"
+	align="horiz. centered"
+}
+composite {
+	object {
+		x=6
+		y=331
+		width=514
+		height=20
+	}
+	"composite name"=""
+	children {
+		"text update" {
 			object {
-				x=168
-				y=276
-				width=100
+				x=6
+				y=331
+				width=150
 				height=20
 			}
-			"basic attribute" {
+			monitor {
+				chan="$(P)$(M1).DESC"
 				clr=14
+				bclr=4
+			}
+			align="horiz. right"
+			limits {
 			}
-			textix="Move axis?"
 		}
 		menu {
 			object {
 				x=168
-				y=300
-				width=100
+				y=331
+				width=60
 				height=20
 			}
 			control {
@@ -600,23 +956,11 @@ composite {
 				bclr=51
 			}
 		}
-		text {
-			object {
-				x=300
-				y=276
-				width=100
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Current Pos."
-		}
 		"text update" {
 			object {
-				x=291
-				y=300
-				width=103
+				x=230
+				y=331
+				width=110
 				height=20
 			}
 			monitor {
@@ -628,23 +972,11 @@ composite {
 			limits {
 			}
 		}
-		text {
-			object {
-				x=456
-				y=276
-				width=50
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Plots"
-		}
 		"related display" {
 			object {
-				x=440
-				y=300
-				width=75
+				x=470
+				y=331
+				width=50
 				height=20
 			}
 			display[0] {
@@ -677,415 +1009,149 @@ composite {
 		}
 		"text update" {
 			object {
-				x=6
-				y=300
-				width=150
+				x=348
+				y=331
+				width=100
 				height=20
 			}
 			monitor {
-				chan="$(P)$(M1).DESC"
-				clr=14
+				chan="$(P)$(R)M1Start"
+				clr=54
 				bclr=4
 			}
 			align="horiz. right"
 			limits {
 			}
 		}
-		composite {
-			object {
-				x=4
-				y=340
-				width=524
-				height=250
-			}
-			"composite name"=""
-			children {
-				composite {
-					object {
-						x=4
-						y=340
-						width=524
-						height=250
-					}
-					"composite name"=""
-					children {
-						rectangle {
-							object {
-								x=4
-								y=340
-								width=524
-								height=250
-							}
-							"basic attribute" {
-								clr=14
-								fill="outline"
-								width=2
-							}
-						}
-						text {
-							object {
-								x=111
-								y=370
-								width=50
-								height=20
-							}
-							"basic attribute" {
-								clr=14
-							}
-							textix="Build"
-						}
-						"message button" {
-							object {
-								x=167
-								y=370
-								width=96
-								height=20
-							}
-							control {
-								chan="$(P)$(R)Build"
-								clr=14
-								bclr=51
-							}
-							label="Build"
-							press_msg="1"
-							release_msg="0"
-						}
-						text {
-							object {
-								x=31
-								y=420
-								width=130
-								height=20
-							}
-							"basic attribute" {
-								clr=14
-							}
-							textix="Simulate/Real"
-						}
-						menu {
-							object {
-								x=165
-								y=420
-								width=100
-								height=20
-							}
-							control {
-								chan="$(P)$(R)SimMode"
-								clr=14
-								bclr=51
-							}
-						}
-						"text update" {
-							object {
-								x=168
-								y=396
-								width=350
-								height=20
-							}
-							monitor {
-								chan="$(P)$(R)BuildMessage"
-								clr=14
-								bclr=56
-							}
-							limits {
-							}
-						}
-						text {
-							object {
-								x=31
-								y=395
-								width=130
-								height=20
-							}
-							"basic attribute" {
-								clr=14
-							}
-							textix="Build message"
-						}
-						"text update" {
-							object {
-								x=272
-								y=370
-								width=103
-								height=20
-							}
-							monitor {
-								chan="$(P)$(R)BuildState"
-								clr=50
-								bclr=13
-							}
-							clrmod="alarm"
-							limits {
-							}
-						}
-						"text update" {
-							object {
-								x=272
-								y=445
-								width=103
-								height=20
-							}
-							monitor {
-								chan="$(P)$(R)ExecState"
-								clr=50
-								bclr=14
-							}
-							clrmod="alarm"
-							limits {
-							}
-						}
-						"text update" {
-							object {
-								x=386
-								y=370
-								width=103
-								height=20
-							}
-							monitor {
-								chan="$(P)$(R)BuildStatus"
-								clr=50
-								bclr=14
-							}
-							clrmod="alarm"
-							limits {
-							}
-						}
-						"text update" {
-							object {
-								x=386
-								y=445
-								width=103
-								height=20
-							}
-							monitor {
-								chan="$(P)$(R)ExecStatus"
-								clr=50
-								bclr=14
-							}
-							clrmod="alarm"
-							limits {
-							}
-						}
-						text {
-							object {
-								x=180
-								y=345
-								width=70
-								height=20
-							}
-							"basic attribute" {
-								clr=14
-							}
-							textix="Command"
-						}
-						text {
-							object {
-								x=298
-								y=345
-								width=50
-								height=20
-							}
-							"basic attribute" {
-								clr=14
-							}
-							textix="State"
-						}
-						text {
-							object {
-								x=407
-								y=345
-								width=60
-								height=20
-							}
-							"basic attribute" {
-								clr=14
-							}
-							textix="Status"
-						}
-						composite {
-							object {
-								x=91
-								y=445
-								width=172
-								height=20
-							}
-							"composite name"=""
-							children {
-								text {
-									object {
-										x=91
-										y=445
-										width=70
-										height=20
-									}
-									"basic attribute" {
-										clr=14
-									}
-									textix="Execute"
-								}
-								"message button" {
-									object {
-										x=167
-										y=445
-										width=96
-										height=20
-									}
-									control {
-										chan="$(P)$(R)Execute"
-										clr=14
-										bclr=51
-									}
-									label="Execute"
-									press_msg="1"
-									release_msg="0"
-								}
-							}
-						}
-						text {
-							object {
-								x=111
-								y=500
-								width=60
-								height=20
-							}
-							"basic attribute" {
-								clr=14
-							}
-							textix="Abort"
-						}
-						"message button" {
-							object {
-								x=167
-								y=495
-								width=150
-								height=30
-							}
-							control {
-								chan="$(P)$(R)Abort"
-								clr=14
-								bclr=20
-							}
-							label="Abort!"
-							press_msg="1"
-							release_msg="0"
-						}
-						text {
-							object {
-								x=11
-								y=470
-								width=150
-								height=20
-							}
-							"basic attribute" {
-								clr=14
-							}
-							textix="Execute message"
-						}
-						"text update" {
-							object {
-								x=168
-								y=471
-								width=350
-								height=20
-							}
-							monitor {
-								chan="$(P)$(R)ExecMessage"
-								clr=14
-								bclr=56
-							}
-							limits {
-							}
-						}
-						"message button" {
-							object {
-								x=167
-								y=535
-								width=96
-								height=20
-							}
-							control {
-								chan="$(P)$(R)Readback"
-								clr=14
-								bclr=51
-							}
-							label="Readback"
-							press_msg="1"
-							release_msg="0"
-						}
-						text {
-							object {
-								x=81
-								y=535
-								width=80
-								height=20
-							}
-							"basic attribute" {
-								clr=14
-							}
-							textix="Readback"
-						}
-						"text update" {
-							object {
-								x=272
-								y=535
-								width=103
-								height=20
-							}
-							monitor {
-								chan="$(P)$(R)ReadState"
-								clr=50
-								bclr=14
-							}
-							clrmod="alarm"
-							limits {
-							}
-						}
-						"text update" {
-							object {
-								x=386
-								y=535
-								width=103
-								height=20
-							}
-							monitor {
-								chan="$(P)$(R)ReadStatus"
-								clr=50
-								bclr=14
-							}
-							clrmod="alarm"
-							limits {
-							}
-						}
-						text {
-							object {
-								x=41
-								y=560
-								width=120
-								height=20
-							}
-							"basic attribute" {
-								clr=14
-							}
-							textix="Read message"
-						}
-						"text update" {
-							object {
-								x=168
-								y=561
-								width=350
-								height=20
-							}
-							monitor {
-								chan="$(P)$(R)ReadMessage"
-								clr=14
-								bclr=56
-							}
-							limits {
-							}
-						}
-					}
-				}
-			}
-		}
 	}
 }
+menu {
+	object {
+		x=234
+		y=255
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(R)AddAccelDecel"
+		clr=14
+		bclr=51
+	}
+}
+text {
+	object {
+		x=10
+		y=55
+		width=220
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="# trajectory elements"
+	align="horiz. right"
+}
+text {
+	object {
+		x=10
+		y=105
+		width=220
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="# output pulses"
+	align="horiz. right"
+}
+text {
+	object {
+		x=10
+		y=180
+		width=220
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Total time"
+	align="horiz. right"
+}
+text {
+	object {
+		x=10
+		y=205
+		width=220
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Execution time scale"
+	align="horiz. right"
+}
+text {
+	object {
+		x=10
+		y=130
+		width=220
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Range of pulses: Start"
+	align="horiz. right"
+}
+text {
+	object {
+		x=10
+		y=80
+		width=220
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Trajectory definition"
+	align="horiz. right"
+}
+text {
+	object {
+		x=10
+		y=230
+		width=220
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Acceleration time"
+	align="horiz. right"
+}
+text {
+	object {
+		x=10
+		y=155
+		width=220
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Time mode"
+	align="horiz. right"
+}
+text {
+	object {
+		x=10
+		y=255
+		width=220
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Add accel/decel pts?"
+	align="horiz. right"
+}