Commit Graph

91 Commits

Author SHA1 Message Date
rivers c614161cb2 Added BayerPattern
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8245 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-24 20:29:23 +00:00
rivers ecf862e067 Finish adding I/O control widgets
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8214 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-20 00:08:01 +00:00
rivers 33521c9929 Added new widgets for sync and digital I/O
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8208 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-17 00:19:29 +00:00
rivers 210ad7cdcd Added third dimension
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8108 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-24 21:29:45 +00:00
rivers 8cdb9cc032 Added new plugin PVs (Dim2, colorMode)
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8107 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-24 21:25:51 +00:00
rivers 3beee79e95 Added links to ColorConvert plugin
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8106 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-24 21:14:16 +00:00
rivers 4f2ce201c5 New file for color conversion plugin
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8105 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-24 21:13:29 +00:00
rivers 6da53217cd Added third array dimension and ColorMode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8088 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-21 19:58:51 +00:00
rivers 98e83fe82d Added colorMode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8087 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-21 19:57:01 +00:00
rivers 4512534ae5 New file for File I/O on Roper
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7980 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-07 14:42:39 +00:00
rivers a0b1ee91e0 Added new fields, tidied up
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7979 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-07 14:41:53 +00:00
rivers cac22facff Minor formatting change
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7969 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-06 14:24:00 +00:00
rivers 4b5ed83770 Added Roper detectors
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7968 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-06 14:22:48 +00:00
rivers 2530494d5d New file for Roper detectors
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7967 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-12-06 14:21:41 +00:00
rivers d4961c14ed Removed typo colon
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7909 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-24 22:35:26 +00:00
rivers 40d35251e8 Replace hardcode with macro
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7907 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-24 21:11:53 +00:00
rivers d8823c6eed Fixed image macro param
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7906 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-24 20:55:26 +00:00
rivers a229e8c29e Added scan record for marCCD
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7888 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-24 04:47:07 +00:00
rivers d3253f4e97 Changed IMAGE macro to I
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7831 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-16 16:14:53 +00:00
rivers 426dea0a76 Removed plugin related PVs, those are now in NDPluginFile.adl
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7830 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-16 16:13:51 +00:00
rivers 6458a1deec Renamed NDFile.adl to NDPluginFile.adl
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7829 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-16 16:10:47 +00:00
rivers 4ff44a851b Removed file PVs, those are now in NDFile.adl
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7828 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-16 16:09:25 +00:00
rivers d8d4fe3e0c Previously called NDFile.adl, but that is now a new file without the plugin PVs
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7827 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-16 16:07:59 +00:00
rivers 17868d12d1 Updated shutter
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7820 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-14 23:24:16 +00:00
rivers 3238302dee Added MarReadStatus PVs to poll status
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7819 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-14 23:21:50 +00:00
rivers 9b7fcccd9f Many enhancements
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7775 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-11 21:23:28 +00:00
rivers 571c00f5d9 Added status fields
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7774 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-11 21:22:38 +00:00
rivers 600032f0a0 Reformatted
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7773 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-11 21:21:46 +00:00
rivers 4e878dd0b1 Enhancements to shutter PVs; added ArrayCallbacks and NumImagesCounter_RBV PVs
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7772 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-11 21:20:37 +00:00
rivers e2ea4b136b New file for marCCD
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7771 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-11 21:17:41 +00:00
rivers d52f356d07 Many changes for status, shutter, etc.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7757 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-07 13:57:25 +00:00
rivers 80c78c9791 New file for EPICS shutter control
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7756 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-07 13:53:31 +00:00
rivers 4d1a392063 Added marCCD
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7748 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-01 23:13:44 +00:00
rivers 99cf3f4ab2 Renamed TimeRemaining to TimeRemaining_RBV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7747 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-01 23:11:58 +00:00
rivers 0bc4da7229 New file for marCCD
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7746 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-11-01 23:11:07 +00:00
rivers 33ceaafddb Added scan record for simulator detector
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7677 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-09-24 21:07:14 +00:00
rivers c6f26bd761 Added IMAGE and ROI macro arguments; added more related displays
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7589 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-09-05 20:00:48 +00:00
rivers 325300b788 Updated combined ROIs menus
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7569 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-29 18:42:29 +00:00
rivers e4ca19f718 Added Name, rearranged
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7568 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-29 18:41:25 +00:00
rivers 22dedfa8b7 Added full ROI to each menu, changed labels
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7567 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-29 18:40:24 +00:00
rivers 402a33f87f Added combined ROIs
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7566 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-29 18:39:01 +00:00
rivers c14fd40024 Minor change
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7565 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-29 18:38:32 +00:00
rivers 918fd780c0 Made status display line smaller so more can be seen
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7553 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-26 20:07:14 +00:00
rivers 7d157f28e8 Removed waveform callback time
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7549 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-26 19:28:40 +00:00
rivers 2f2366865a Added mca records for on-the-fly scans
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7548 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-26 19:27:20 +00:00
rivers 9007d60353 Fixed Highlight menu
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7542 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-25 21:56:29 +00:00
rivers e7bee8e5b2 Added Use and ComputeStatistics fields, other changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7541 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-25 21:54:57 +00:00
rivers 10885ca014 Added Highlight
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7540 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-25 21:53:33 +00:00
rivers 4ac8da9c40 Added Pilatus detecotr
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7524 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-23 14:55:02 +00:00
rivers 84f0242b4b New file for Pilatus detector
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7523 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2008-08-23 14:53:33 +00:00