From 1c22ec9be8885fca568785b84f9e9dfd99f553b0 Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Tue, 6 Mar 2012 00:36:47 +0000
Subject: [PATCH] Removed PSPacketSize; now read-only

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14572 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/op/adl/prosilicaMore.adl | 896 +++++++++++++++++----------------
 1 file changed, 457 insertions(+), 439 deletions(-)

diff --git a/ADApp/op/adl/prosilicaMore.adl b/ADApp/op/adl/prosilicaMore.adl
index b2d8a8b..d7df1ce 100644
--- a/ADApp/op/adl/prosilicaMore.adl
+++ b/ADApp/op/adl/prosilicaMore.adl
@@ -1089,48 +1089,44 @@ composite {
 		}
 	}
 }
+text {
+	object {
+		x=189
+		y=501
+		width=40
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="GigE"
+	align="horiz. centered"
+}
+rectangle {
+	object {
+		x=5
+		y=496
+		width=420
+		height=120
+	}
+	"basic attribute" {
+		clr=14
+		fill="outline"
+	}
+}
 composite {
 	object {
 		x=5
-		y=581
+		y=620
 		width=420
-		height=275
+		height=235
 	}
 	"composite name"=""
 	children {
-		text {
-			object {
-				x=129
-				y=608
-				width=99
-				height=15
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Driver type"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=236
-				y=608
-				width=120
-				height=15
-			}
-			monitor {
-				chan="$(P)$(R)PSDriverType_RBV"
-				clr=54
-				bclr=3
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
 		text {
 			object {
 				x=165
-				y=584
+				y=623
 				width=100
 				height=20
 			}
@@ -1143,19 +1139,390 @@ composite {
 		rectangle {
 			object {
 				x=5
-				y=581
+				y=620
 				width=420
-				height=275
+				height=235
 			}
 			"basic attribute" {
 				clr=14
 				fill="outline"
 			}
 		}
+		composite {
+			object {
+				x=75
+				y=649
+				width=281
+				height=198
+			}
+			"composite name"=""
+			children {
+				text {
+					object {
+						x=84
+						y=669
+						width=144
+						height=15
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Frames completed"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=236
+						y=669
+						width=120
+						height=15
+					}
+					monitor {
+						chan="$(P)$(R)PSFramesCompleted_RBV"
+						clr=54
+						bclr=3
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+				text {
+					object {
+						x=102
+						y=689
+						width=126
+						height=15
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Frames dropped"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=236
+						y=689
+						width=120
+						height=15
+					}
+					monitor {
+						chan="$(P)$(R)PSFramesDropped_RBV"
+						clr=54
+						bclr=3
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+				text {
+					object {
+						x=75
+						y=709
+						width=153
+						height=15
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Packets erroneous"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=236
+						y=709
+						width=120
+						height=15
+					}
+					monitor {
+						chan="$(P)$(R)PSPacketsErroneous_RBV"
+						clr=54
+						bclr=3
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+				text {
+					object {
+						x=102
+						y=729
+						width=126
+						height=15
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Packets missed"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=236
+						y=729
+						width=120
+						height=15
+					}
+					monitor {
+						chan="$(P)$(R)PSPacketsMissed_RBV"
+						clr=54
+						bclr=3
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+				text {
+					object {
+						x=84
+						y=749
+						width=144
+						height=15
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Packets received"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=236
+						y=749
+						width=120
+						height=15
+					}
+					monitor {
+						chan="$(P)$(R)PSPacketsReceived_RBV"
+						clr=54
+						bclr=3
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+				text {
+					object {
+						x=75
+						y=769
+						width=153
+						height=15
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Packets requested"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=236
+						y=769
+						width=120
+						height=15
+					}
+					monitor {
+						chan="$(P)$(R)PSPacketsRequested_RBV"
+						clr=54
+						bclr=3
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+				text {
+					object {
+						x=138
+						y=649
+						width=90
+						height=15
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Frame rate"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=236
+						y=649
+						width=120
+						height=15
+					}
+					monitor {
+						chan="$(P)$(R)PSFrameRate_RBV"
+						clr=54
+						bclr=3
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+				text {
+					object {
+						x=102
+						y=789
+						width=126
+						height=15
+					}
+					"basic attribute" {
+						clr=14
+					}
+					textix="Bad frames"
+					align="horiz. right"
+				}
+				"text update" {
+					object {
+						x=236
+						y=789
+						width=120
+						height=15
+					}
+					monitor {
+						chan="$(P)$(R)PSBadFrameCounter_RBV"
+						clr=54
+						bclr=3
+					}
+					align="horiz. centered"
+					limits {
+					}
+				}
+				composite {
+					object {
+						x=129
+						y=829
+						width=207
+						height=18
+					}
+					"composite name"=""
+					children {
+						text {
+							object {
+								x=129
+								y=831
+								width=99
+								height=15
+							}
+							"basic attribute" {
+								clr=14
+							}
+							textix="Update rate"
+							align="horiz. right"
+						}
+						menu {
+							object {
+								x=236
+								y=829
+								width=100
+								height=18
+							}
+							control {
+								chan="$(P)$(R)PSReadStatistics.SCAN"
+								clr=14
+								bclr=51
+							}
+						}
+					}
+				}
+				composite {
+					object {
+						x=102
+						y=809
+						width=254
+						height=15
+					}
+					"composite name"=""
+					children {
+						text {
+							object {
+								x=102
+								y=809
+								width=126
+								height=15
+							}
+							"basic attribute" {
+								clr=14
+							}
+							textix="Packets resent"
+							align="horiz. right"
+						}
+						"text update" {
+							object {
+								x=236
+								y=809
+								width=120
+								height=15
+							}
+							monitor {
+								chan="$(P)$(R)PSPacketsResent_RBV"
+								clr=54
+								bclr=3
+							}
+							align="horiz. centered"
+							limits {
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+composite {
+	object {
+		x=69
+		y=526
+		width=224
+		height=15
+	}
+	"composite name"=""
+	children {
 		text {
 			object {
-				x=102
-				y=628
+				x=69
+				y=526
+				width=99
+				height=15
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Driver type"
+			align="horiz. right"
+		}
+		"text update" {
+			object {
+				x=173
+				y=526
+				width=120
+				height=15
+			}
+			monitor {
+				chan="$(P)$(R)PSDriverType_RBV"
+				clr=54
+				bclr=3
+			}
+			align="horiz. centered"
+			limits {
+			}
+		}
+	}
+}
+composite {
+	object {
+		x=42
+		y=546
+		width=251
+		height=15
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=42
+				y=546
 				width=126
 				height=15
 			}
@@ -1167,8 +1534,8 @@ composite {
 		}
 		"text update" {
 			object {
-				x=236
-				y=628
+				x=173
+				y=546
 				width=120
 				height=15
 			}
@@ -1181,428 +1548,39 @@ composite {
 			limits {
 			}
 		}
-		text {
-			object {
-				x=84
-				y=668
-				width=144
-				height=15
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Frames completed"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=236
-				y=668
-				width=120
-				height=15
-			}
-			monitor {
-				chan="$(P)$(R)PSFramesCompleted_RBV"
-				clr=54
-				bclr=3
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=102
-				y=688
-				width=126
-				height=15
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Frames dropped"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=236
-				y=688
-				width=120
-				height=15
-			}
-			monitor {
-				chan="$(P)$(R)PSFramesDropped_RBV"
-				clr=54
-				bclr=3
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=75
-				y=708
-				width=153
-				height=15
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Packets erroneous"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=236
-				y=708
-				width=120
-				height=15
-			}
-			monitor {
-				chan="$(P)$(R)PSPacketsErroneous_RBV"
-				clr=54
-				bclr=3
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=102
-				y=728
-				width=126
-				height=15
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Packets missed"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=236
-				y=728
-				width=120
-				height=15
-			}
-			monitor {
-				chan="$(P)$(R)PSPacketsMissed_RBV"
-				clr=54
-				bclr=3
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=84
-				y=748
-				width=144
-				height=15
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Packets received"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=236
-				y=748
-				width=120
-				height=15
-			}
-			monitor {
-				chan="$(P)$(R)PSPacketsReceived_RBV"
-				clr=54
-				bclr=3
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=75
-				y=768
-				width=153
-				height=15
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Packets requested"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=236
-				y=768
-				width=120
-				height=15
-			}
-			monitor {
-				chan="$(P)$(R)PSPacketsRequested_RBV"
-				clr=54
-				bclr=3
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=138
-				y=648
-				width=90
-				height=15
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Frame rate"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=236
-				y=648
-				width=120
-				height=15
-			}
-			monitor {
-				chan="$(P)$(R)PSFrameRate_RBV"
-				clr=54
-				bclr=3
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		text {
-			object {
-				x=102
-				y=788
-				width=126
-				height=15
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Bad frames"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=236
-				y=788
-				width=120
-				height=15
-			}
-			monitor {
-				chan="$(P)$(R)PSBadFrameCounter_RBV"
-				clr=54
-				bclr=3
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		composite {
-			object {
-				x=129
-				y=828
-				width=207
-				height=18
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=129
-						y=830
-						width=99
-						height=15
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Update rate"
-					align="horiz. right"
-				}
-				menu {
-					object {
-						x=236
-						y=828
-						width=100
-						height=18
-					}
-					control {
-						chan="$(P)$(R)PSReadStatistics.SCAN"
-						clr=14
-						bclr=51
-					}
-				}
-			}
-		}
-		composite {
-			object {
-				x=102
-				y=808
-				width=254
-				height=15
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=102
-						y=808
-						width=126
-						height=15
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Packets resent"
-					align="horiz. right"
-				}
-				"text update" {
-					object {
-						x=236
-						y=808
-						width=120
-						height=15
-					}
-					monitor {
-						chan="$(P)$(R)PSPacketsResent_RBV"
-						clr=54
-						bclr=3
-					}
-					align="horiz. centered"
-					limits {
-					}
-				}
-			}
-		}
 	}
 }
 composite {
 	object {
-		x=5
-		y=496
-		width=420
-		height=80
+		x=24
+		y=566
+		width=394
+		height=20
 	}
 	"composite name"=""
 	children {
 		text {
 			object {
-				x=134
-				y=501
-				width=150
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="GigE"
-			align="horiz. centered"
-		}
-		rectangle {
-			object {
-				x=5
-				y=496
-				width=420
-				height=80
-			}
-			"basic attribute" {
-				clr=14
-				fill="outline"
-			}
-		}
-		composite {
-			object {
-				x=20
-				y=526
-				width=394
-				height=20
-			}
-			"composite name"=""
-			children {
-				text {
-					object {
-						x=20
-						y=529
-						width=144
-						height=15
-					}
-					"basic attribute" {
-						clr=14
-					}
-					textix="Stream bytes/sec"
-					align="horiz. right"
-				}
-				"text entry" {
-					object {
-						x=169
-						y=526
-						width=120
-						height=20
-					}
-					control {
-						chan="$(P)$(R)PSByteRate"
-						clr=14
-						bclr=51
-					}
-					limits {
-					}
-				}
-				"text update" {
-					object {
-						x=294
-						y=529
-						width=120
-						height=15
-					}
-					monitor {
-						chan="$(P)$(R)PSByteRate_RBV"
-						clr=54
-						bclr=3
-					}
-					align="horiz. centered"
-					limits {
-					}
-				}
-			}
-		}
-		text {
-			object {
-				x=20
-				y=554
+				x=24
+				y=569
 				width=144
 				height=15
 			}
 			"basic attribute" {
 				clr=14
 			}
-			textix="Packet size"
+			textix="Stream bytes/sec"
 			align="horiz. right"
 		}
 		"text entry" {
 			object {
-				x=169
-				y=551
+				x=173
+				y=566
 				width=120
 				height=20
 			}
 			control {
-				chan="$(P)$(R)PSPacketSize"
+				chan="$(P)$(R)PSByteRate"
 				clr=14
 				bclr=51
 			}
@@ -1611,8 +1589,48 @@ composite {
 		}
 		"text update" {
 			object {
-				x=294
-				y=554
+				x=298
+				y=569
+				width=120
+				height=15
+			}
+			monitor {
+				chan="$(P)$(R)PSByteRate_RBV"
+				clr=54
+				bclr=3
+			}
+			align="horiz. centered"
+			limits {
+			}
+		}
+	}
+}
+composite {
+	object {
+		x=69
+		y=591
+		width=224
+		height=15
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=69
+				y=591
+				width=99
+				height=15
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Packet size"
+			align="horiz. right"
+		}
+		"text update" {
+			object {
+				x=173
+				y=591
 				width=120
 				height=15
 			}