Clean up qrscu a little to aid field debugging
For example see if we can close each association before opening the next one
Comments (44)
-
reporter -
reporter See also 91a8855: Terminated initial association after ehco instead of keeping it open. Better check of initial echo. More references to query_id in logging, but not completed. Refs 528
-
reporter Fixing errors to test code introduced by changing signatures. Refs
#528→ <<cset 98e325eedb68>>
-
reporter Correcting some errors picked up by codacy. Refs
#528,#526→ <<cset ce1e904055a0>>
-
reporter Removed some unused imports, refs
#528.→ <<cset 3735e0a9b06b>>
-
reporter Reduced the number of associations during the query to one. Query still works. Refs
#528→ <<cset fbf0fb162849>>
-
reporter Move only has one association now. Refs
#528→ <<cset 46505d07342d>>
-
reporter Added a check that the association is alive before sending each move request. It hasn't been triggered in my testing so far :-( Refs
#528→ <<cset 8d142df77d1b>>
-
reporter Added assoc to _prune_series_response and fixed some of the test fakes etc. Refs
#528→ <<cset a0c2d035dfc3>>
-
reporter Moved tools import to after django setup to make testing easier. Moved _move_req to nearer movescu. Added max idle, not sure it does anything, can't see how to handle it. Refs
#528→ <<cset 5c0fd1e7419b>>
-
reporter I don't think max idle works for a move association, so removing. Made Pending message more useful, reduced other messages to debug to reduce the noise. Refs
#528→ <<cset cf56e4689dd0>>
-
reporter Removed codacy 'new issues'. Refs
#528→ <<cset befeeb3f090b>>
-
reporter Added ref
#528to changes.→ <<cset 77475c9b4724>>
-
Hi @edmcdonagh. Should I be able to drop the updated files into my live system to test this?
As an aside, for my Toshiba CT RDSR creation routine to work I'll need to be able to retrieve at least two images from each series because the dose summaries consist of two images.
-
reporter Missed an unused import. Refs
#528→ <<cset 9234be804884>>
-
reporter Yes, that would be useful @dplatten. Thanks.
-
@edmcdonagh, I've used the code from this branch to query my PACS.
python D:\Server_Apps\python27\Scripts\openrem_qr.py 1 1 -dx -f 2017-09-14 -t 2017-09-14
and
python D:\Server_Apps\python27\Scripts\openrem_qr.py 1 1 -mg -f 2017-09-14 -t 2017-09-14
both worked beautifully, but when I tried
python D:\Server_Apps\python27\Scripts\openrem_qr.py 1 1 -ct -f 2017-09-14 -t 2017-09-14 -i "CT Chest High Resolution"
I received the following error:
Traceback (most recent call last): File "D:\Server_Apps\python27\Scripts\openrem_qr.py", line 14, in <module> sys.exit(qrscu_script(sys.argv)) File "D:\Server_Apps\python27\lib\site-packages\openrem\remapp\netdicom\qrscu.py", line 947, in qrscu_script study_desc_inc = map(str.lower, map(str.strip, args.desc_include.split(u','))) TypeError: descriptor 'strip' requires a 'str' object but received a 'unicode'
Do you think this error may be because I'm running OpenREM 0.7.4 code everywhere except for your updated netdicom files?
Thanks.
-
reporter No, from the error message that is probably due to the new files, and lack of testing of that element.
I'm glad the non-text string tests worked nicely. I'll add a test if I can and fix the versions with the text.
-
reporter I meant to say, thanks for testing for me @dplatten!
-
@edmcdonagh, I tried to use this new code to retrieve CT data from PACS, but it only fetches RDSR objects. Does it have a switch to make it fetch images too? I need to be able to retrieve images for the majority of our CT scanners. Thanks.
-
reporter Are you trying to get Philips dose screens, or something else? What scanners are you after images from?
-
I need to be able to get:
- Philips dose screens from a Brilliance 64
- Toshiba dose screens from an Aquilion CX and an Aquilion CXL. Dose screens from these come as a pair of images, so I need at least two images retrieved from each series
-
reporter I don't expect it to work for your Toshiba extensions - that's the next job. Does it work for the Phillips? If, then I need to fix it!
-
I've just checked the log files. It works perfectly for the Philips dose summary objects.
-
reporter Phew!
-
reporter Refactored arg parser so it can be tested, added initial test. Refs
#528→ <<cset 63d07a15195c>>
-
reporter Added study description arg, fails as reported by @dplatten. Refs
#528→ <<cset 0ca41e2ff474>>
-
reporter Fixed str.split issue. Refs
#528→ <<cset 4d72774acae1>>
-
reporter None of the long
--
versions of the flags are working, nor are multi-letter short-
flags with strings. Not sure if it's something to do with this version of the code, or if it never worked. -
reporter Fixed str.split issueAdding test for include/exclude strings. flags not currently working, need to investigate. Refs
#528→ <<cset aaf087353a64>>
-
reporter Now works with command line and testing. I think. Refs
#528→ <<cset 11d03e3ed867>>
-
reporter Removing erroneous argument. Refs
#528→ <<cset afe37882e0c6>>
-
reporter Hi @dplatten can you try using the new files - it should all be working now.
-
Thanks. I'll test tomorrow.
-
@edmcdonagh, I have just tested the code:
openrem_qr.py 1 1 -ct -f 2017-09-22 -t 2017-09-22
and
openrem_qr.py 1 1 -dx -f 2017-09-22 -t 2017-09-22 -i "XR Abdomen"
both worked as expected.
-
reporter Thanks David
-
reporter Removing redundant commented code and variables. Refs
#528→ <<cset b23509299338>>
-
reporter Removing redundant variables. Refs
#528→ <<cset 85b41391358c>>
-
reporter Fixing fake versions of functions now with fewer variables in signature. Refs
#528→ <<cset 11694be80ac9>>
-
reporter Removing redundant code from tests. Added test for modalities_returned. Refs
#528→ <<cset b3a47421aba9>>
-
reporter - changed status to resolved
-
reporter Previous merge ref
#528fixes#533. Updating changes.→ <<cset 62fc35e342af>>
-
reporter Removing more redundant arguments from issue ref
#528before new code created for ref#546. Might need to update tests.→ <<cset 6b37444c07a7>>
-
reporter Updated tests for removed args from fake function. Refs
#528,#546→ <<cset d4af07b7064d>>
- Log in to comment
Improved naming of RemoteAE. Refs
#528→ <<cset 1c5c37b7af89>>