ccp4 / DUI

CCP4 DIALS User Interface
GNU General Public License v2.0
5 stars 3 forks source link

Export merged #182

Closed dagewa closed 3 years ago

dagewa commented 3 years ago

This is intended to fix #179 but ended up more complicated than I expected. To get merged MTZs I had to get DUI to run dials.merge instead of dials.export. DUI takes a lot of control over what commands can be run and has various bits of special case handling, not all of which I understand.

There are still some bugs in this area (like #181 and #147) but I don't think these have been introduced here, just remain unfixed.

dagewa commented 3 years ago

Ok, this is in a slightly better state now.

I could not figure out how to disable the Run button prior to a filename being selected. As a result, you still start with a default filename (integrated.mtz or scaled.mtz) and I left the red warning text in place in case this is going to overwrite a file. As a result you get warned twice if you use the dialog to select an existing filename. Oh well, to be sure, to be sure.

This needs a bit of testing over the next week.

dagewa commented 3 years ago

Oh, another thing: because the file dialogue allows the user to write the file anywhere they like, not just in dui_files/, the full path is now displayed. It might be better to disallow directory navigation in the file chooser (if I can figure out how). Writing outside dui_files/ might break other things (like i2 and Cloud integration)

dagewa commented 3 years ago

In discussion with Eugene and Kyle, I have now changed the MTZ copying behaviour, and recording of filenames in output.json, to a new mechanism that records file path and type (integrated|scaled|merged) in manifest.json. The automatic setting of filenames was partially broken and in the end I just removed it. The MTZ output name defaults to dui_output.mtz unless changed by the user.

luisodls commented 3 years ago

Is ok by me...

I pass the torch to David on this, as this week is not the best one for me and David is more in touch with the developers of CCP4 cloud.

Thanks

L


From: David Waterman @.> Sent: 08 November 2021 17:17 To: ccp4/DUI @.> Cc: Fuentes-Montero, Luis (DLSLtd,RAL,LSCI) @.>; Review requested @.> Subject: Re: [ccp4/DUI] Export merged (PR #182)

In discussion with Eugene and Kyle, I have now changed the MTZ copying and recording in output.json to a new mechanism that records file path and type (integrated|scaled|merged) in manifest.json. The automatic setting of filenames was partially broken and in the end I just removed it. The MTZ output name defaults to dui_output.mtz unless changed by the user.

— You are receiving this because your review was requested. Reply to this email directly, view it on GitHubhttps://github.com/ccp4/DUI/pull/182#issuecomment-963382478, or unsubscribehttps://github.com/notifications/unsubscribe-auth/ADMFOAKXDCWKFRHHGWCZ563ULAA33ANCNFSM5HN7QLVA. Triage notifications on the go with GitHub Mobile for iOShttps://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675 or Androidhttps://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub.

-- This e-mail and any attachments may contain confidential, copyright and or privileged material, and are for the use of the intended addressee only. If you are not the intended addressee or an authorised recipient of the addressee please notify us of receipt by returning the e-mail and do not use, copy, retain, distribute or disclose the information in or attached to the e-mail. Any opinions expressed within this e-mail are those of the individual and not necessarily of Diamond Light Source Ltd. Diamond Light Source Ltd. cannot guarantee that this e-mail or any attachments are free from viruses and we cannot accept liability for any damage which you may sustain as a result of software viruses which may be transmitted in or with the message. Diamond Light Source Limited (company no. 4375679). Registered in England and Wales with its registered office at Diamond House, Harwell Science and Innovation Campus, Didcot, Oxfordshire, OX11 0DE, United Kingdom

dagewa commented 3 years ago

Thanks @luisodls. I'll merge now and make a release. I think DUI is working well enough now in my hands for the workshop