Ticket #7637 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

Improve ICAT4 user interface

Reported by: Jay Rainey Owned by: Jay Rainey
Priority: major Milestone: Release 3.0
Component: GUI Keywords: ICAT4
Cc: Blocked By: #7866, #8144, #8218
Blocking: #3827, #6441, #8126, #8191, #8209 Tester: Owen Arnold

Description

Improve current ICAT interface within Mantid to make authentication, searching, publishing, and downloading data more intuitive and user friendly.

Attachments

icat-specification.pdf (242.9 KB) - added by Jay Rainey 7 years ago.
ICAT mockup specification

Change History

comment:1 Changed 7 years ago by Jay Rainey

  • Milestone changed from Backlog to Release 3.0

comment:2 Changed 7 years ago by Jay Rainey

  • Keywords ICAT4 added

comment:3 Changed 7 years ago by Jay Rainey

  • Component changed from Framework to User Interface

comment:4 Changed 7 years ago by Jay Rainey

  • Status changed from new to inprogress

comment:5 Changed 7 years ago by Jay Rainey

Added base GUI files. Refs #7637.

  • Note: I had to name the files ICatSearchTwo as the current ICAT GUI files already exist with the ICatSearch name. This will be updated once the older GUI files are removed from Mantid.

Changeset: ead990fb688059adeadb453b3b67f3ef71318385

comment:6 Changed 7 years ago by Jay Rainey

Added search button to GUI. Refs #7637.

  • This allows me to display and test the functionality of the new ICAT interface.
  • Note: The method name and comments will be changed once complete (and old ICAT GUI is removed).

Changeset: 8860a44c6f168378f8cc6a70ff0ddec9c35b1717

comment:7 Changed 7 years ago by Jay Rainey

Improved variable names in ui file. Refs #7637.

Changeset: 04640bf11d5e7e567df1ded89f6e3279096dc0d2

comment:8 Changed 7 years ago by Jay Rainey

Interface window now appears on top of Mantid. Refs #7637.

  • Made icatsearch a member variable to prevent possible memory leak.

Changeset: 1c690d45c0feb567440977bcb61a0956b73962ab

comment:9 Changed 7 years ago by Jay Rainey

Outline for class functionality. Refs #7637.

Changeset: 285af090d2932660dcdc095f1006fb4b65785e63

comment:10 Changed 7 years ago by Jay Rainey

Added show/hide functionality for first two frames. Refs #7637.

Changeset: 2d3db1bcd3b085ed754bc579b465a03c9de54cf9

comment:11 Changed 7 years ago by Jay Rainey

Renamed class and filenames to abide by standards. Refs #7637.

Changeset: cc52ec2d5ebb9ce9798dd05a2cf73b8d4a9d3e27

comment:12 Changed 7 years ago by Jay Rainey

Added helper class and getInstrumentList method. Refs #7637.

  • Updated instrument name in the .ui file.

Changeset: 0199c77aa07ff4019f987c14bda8e58391b5fc99

comment:13 Changed 7 years ago by Jay Rainey

Added helper class to ICatSearch2 GUI class. Refs #7637.

  • Added functionality for populateInstrumentBox()

Changeset: 00f85259592e2619e165e20d701fd2ab5cd701e4

comment:14 Changed 7 years ago by Jay Rainey

Added functionality for populateInvestigationTypeBox(). Refs #7637.

Changeset: 43b591c7e4f098b55f7c0a88a522f993f47c0b63

comment:15 Changed 7 years ago by Jay Rainey

Added functionality for the calendar including slots. Refs #7637.

Changeset: 0599988ecf5b449d4b24ce10c4cc9d9ad85f885a

comment:16 Changed 7 years ago by Jay Rainey

Minor code improvements. Refs #7637.

  • Removed unnecessary method.
  • Added m_ to distinguish member variables.

Changeset: b7ce9f10a94ae97d98a5f1c2198f04230e62c3a8

comment:17 Changed 7 years ago by Jay Rainey

Added help functionality. Refs #7637.

  • Note: The url links to an old CatalogSearch page, but will be updated once the GUI is functional.

Changeset: e891698bf02baae129ed3ebe4b3c82edb9e6747d

comment:18 Changed 7 years ago by Jay Rainey

Field names to match CatalogSearch in .ui file. Refs #7637.

  • Renamed member variables within ICatSearch2.cpp.
  • Note: The CatalogSearch.cpp algorithm obtains values to search for via the getPropertyValue. As such, the names have to match, which is why I changed them. However, in the new interface there is no longer a datafile field. Moreover, the run range is in one field, and options need to be discussed to see how the user will most likely input the seperator (e.g. start,end run as 100,110 or 100-110 or 100:110).
  • Also, InvestigatorSurname no longer exists in the GUI, and is instead the whole name.

Changeset: 9c7a644b3576e9ab9e073b1159e8337f4c900e09

comment:19 Changed 7 years ago by Jay Rainey

Implemented searching functionality. Refs #7637.

  • Removed the inputMask from the date fields to prevent checking if the field contained "" prior to adding it to the map. When the date is selected from the calendar the user it's separated just like the input mask requires.

Changeset: 89d32e3c8bb137501801b446065ade9b54126b52

comment:20 Changed 7 years ago by Jay Rainey

Implemented search results functionality. Refs #7637.

  • Added more relevant rows to ICat4Catalog to abide by new design.
  • Implemented helper methods in ICatSearch2 to allow populateResultTable method to focus on it's task.
  • Reads the results from the search query that are save to a workspace and ouputs them into the "Search results" table.

Changeset: a4c725050abed8689ac20ea1171e1cdba8247d6f

comment:21 Changed 7 years ago by Jay Rainey

Implemented "My data only" functionality. Refs #7637.

  • Added a new property to the CatalogSearch algorithm to enable the algorithm to make us of the field.
  • Updated the query in ICat4Catalog to reflect the new property and to enable the required functionality.
  • Removed useless slot from ICatSearch2.h

Changeset: 299e9c2294a28a201022728367a35d00034df422

comment:22 Changed 7 years ago by Jay Rainey

Added investigation id to match algorithm requirements. Refs #7637.

  • Earlier I removed Investigation id field from the saveInvestigations method. I forgot that GetDataFiles requires the id in order to do the search. As such, I have added this to the method.
  • I have hidden the investigation id from the GUI in ICatSearch2 as it's not useful for the end-user.

Changeset: da5b3fbabac922daec353141aa2c80e8ebce43cf

comment:23 Changed 7 years ago by Jay Rainey

Added error message if no search terms input. Refs #7637.

Changeset: 8911a07a0f44f4abb4128f786d68991ce1b05c81

comment:24 Changed 7 years ago by Jay Rainey

Removed unnecessary methods. Refs #7637.

Changeset: 49ca69df57c24a301fce2a28289fda5b947d372a

comment:25 Changed 7 years ago by Jay Rainey

Added dataFiles information functionality. Refs #7637.

  • Refactored table functionality in order to reuse methods for both tables.
  • Removed unused labels from .ui file.
  • Added getDataFiles method to helper class.
  • Updated onReset to allow future input fields to be added and reset without modification of method.

Changeset: 6c6cf6707d56951b05cc10cfc983aa3bab62daf3

comment:26 Changed 7 years ago by Jay Rainey

Added clearSearch functionality to improve UX. Refs #7637.

Changeset: 899574385d81034aabcf33d695124fc80633f483

comment:27 Changed 7 years ago by Jay Rainey

Added datafile filtering functionality. Refs #7637.

Changeset: d9afcb1fc87162448ca77b6bba4b8761bde474d6

comment:28 Changed 7 years ago by Jay Rainey

Hide the workspace from the user. Refs #7637.

Changeset: f483c4ef42195a03d4cbbba4e4a4d202bf049f72

comment:29 Changed 7 years ago by Jay Rainey

Improved ICAT window management. Refs #7637.

  • Nullify member variable
  • Destroy icatsearch widget when mantid is closed.

Changeset: 0c3835b5b451cd7c726767345ef65751adb5ff4b

comment:30 Changed 7 years ago by Jay Rainey

Improve filter type functionality. Refs #7637.

Converted file extension to lowercase in order to show all files of that type. (E.g. .TXT and .txt files now appear in the result)

Changeset: fc20de734873b58d2ffb723d8137cdc095693b4a

comment:31 Changed 7 years ago by Jay Rainey

Moved emboldenTableHeaders to a more logical location. Refs #7637.

Changeset: b86cbce366284304ce5811f473bcfaf916d1d237

comment:32 Changed 7 years ago by Jay Rainey

Added run range search support for ICAT4. Refs #7637.

  • Added notes in order to remember to remove ICAT3 related code from this algorithm once ICAT3 is removed.

Changeset: a786e7aa051c7d5de88f72057353e5e8a8cafdbb

comment:33 Changed 7 years ago by Jay Rainey

  • Blocked By 7866 added

comment:34 Changed 7 years ago by Jay Rainey

  • Blocking 8087 added

comment:35 Changed 7 years ago by Jay Rainey

  • Blocking 6441 added

comment:36 Changed 7 years ago by Jay Rainey

Added run range search support for ICAT4. Refs #7637.

  • Added notes in order to remember to remove ICAT3 related code from this algorithm once ICAT3 is removed.

Changeset: c26dc33c04e69d20d9ce251d6a72e8230db8220d

comment:37 Changed 7 years ago by Jay Rainey

Improvement to user experience by showing max 2 frames. Refs #7637.

Changeset: 4f278af21ca30e8ae292225ef2ad440c5c2c6a9d

comment:38 Changed 7 years ago by Jay Rainey

Added checkbox column to datafile table. Refs #7637.

  • Added headerIndexByName method to promote re-usability.

Changeset: 7e118cdc4abee6697386464452b70b883b4104d7

comment:39 Changed 7 years ago by Jay Rainey

Added getDataFilePaths to helper class. Refs #7637.

  • Note: This solution is not complete, and the related algorithm (CatalogDownloadDataFiles) needs a complete re-design. This could be achieved by allowing it to take an int and a string rather than a vector of each, and then calling the algorithm as many times as you have file information to download.
  • I will tidy re-design the algorithm during maintenance as it currently works fine.

Changeset: e254b851d1ad8cae9dc1b3309b9405878b0c3636

comment:40 Changed 7 years ago by Jay Rainey

Added selectedDataFileNames functionality. Refs #7637.

  • Added connects for download and load buttons.

Changeset: 0ad4f9f83ed233b4d4f4e8bc08fbdebd9e3896b8

comment:41 Changed 7 years ago by Jay Rainey

Double click row to select datafile to download. Refs #7637.

Changeset: 85d8b5630dc9961b1e5c4e355356bc8f1943e9a6

comment:42 Changed 7 years ago by Jay Rainey

Added downloadDataFiles functionality. Refs #7637.

  • Note: There are no messages to inform the user where the files have been downloaded to. This could be done in the saveFiletoDisk within the related algorithm.

Changeset: 5ef1d4e7af0a805633b4b695b3343a6701e41bb7

comment:43 Changed 7 years ago by Jay Rainey

Tidied up a few methods. Refs #7637.

  • Moved filter functionality to related slot.
  • Moved headerIndexByName to the correct location.

Changeset: eb1d368874bfacaa2a566bcb5d9a7490e86f120c

comment:44 Changed 7 years ago by Jay Rainey

Minor GUI change. Refs #7637.

  • Allow the user to select multiple rows in the table.

Changeset: f9bbbd1e219d79315660b8b7cd3b41fb4c2b2783

comment:45 Changed 7 years ago by Jay Rainey

Added loadDataFiles functionality. Refs #7637.

Changeset: 5ae6f2765ba4df8ecd0da6687f99e9eab30e2dbe

comment:46 Changed 7 years ago by Jay Rainey

Fixed failing ICAT data files test. Refs #7637.

  • The test now takes account for the new parameter that is made use of when saving a file to disk.
  • Updated property name to abide by standards.

Changeset: 7a6bbc0e6f629ca94aca1a0df6a60e053dd517de

comment:47 Changed 7 years ago by Jay Rainey

Merge branch 'feature/7637_improve_icat_gui' into develop. Refs #7637.

Conflicts:

Code/Mantid/Framework/ICat/src/CatalogDownloadDataFiles.cpp Code/Mantid/Framework/ICat/src/CatalogSearch.cpp

Changeset: 68e76e493516560cac1e4dc14c739b870974b733

comment:48 Changed 7 years ago by Jay Rainey

Added run range search support for ICAT4. Refs #7637.

  • Added notes in order to remember to remove ICAT3 related code from this algorithm once ICAT3 is removed.

Changeset: c26dc33c04e69d20d9ce251d6a72e8230db8220d

comment:49 Changed 7 years ago by Jay Rainey

Improvement to user experience by showing max 2 frames. Refs #7637.

Changeset: 4f278af21ca30e8ae292225ef2ad440c5c2c6a9d

comment:50 Changed 7 years ago by Jay Rainey

Added checkbox column to datafile table. Refs #7637.

  • Added headerIndexByName method to promote re-usability.

Changeset: 7e118cdc4abee6697386464452b70b883b4104d7

comment:51 Changed 7 years ago by Jay Rainey

Added getDataFilePaths to helper class. Refs #7637.

  • Note: This solution is not complete, and the related algorithm (CatalogDownloadDataFiles) needs a complete re-design. This could be achieved by allowing it to take an int and a string rather than a vector of each, and then calling the algorithm as many times as you have file information to download.
  • I will tidy re-design the algorithm during maintenance as it currently works fine.

Changeset: e254b851d1ad8cae9dc1b3309b9405878b0c3636

comment:52 Changed 7 years ago by Jay Rainey

Added selectedDataFileNames functionality. Refs #7637.

  • Added connects for download and load buttons.

Changeset: 0ad4f9f83ed233b4d4f4e8bc08fbdebd9e3896b8

comment:53 Changed 7 years ago by Jay Rainey

Double click row to select datafile to download. Refs #7637.

Changeset: 85d8b5630dc9961b1e5c4e355356bc8f1943e9a6

comment:54 Changed 7 years ago by Jay Rainey

Added downloadDataFiles functionality. Refs #7637.

  • Note: There are no messages to inform the user where the files have been downloaded to. This could be done in the saveFiletoDisk within the related algorithm.

Changeset: 5ef1d4e7af0a805633b4b695b3343a6701e41bb7

comment:55 Changed 7 years ago by Jay Rainey

Tidied up a few methods. Refs #7637.

  • Moved filter functionality to related slot.
  • Moved headerIndexByName to the correct location.

Changeset: eb1d368874bfacaa2a566bcb5d9a7490e86f120c

comment:56 Changed 7 years ago by Jay Rainey

Minor GUI change. Refs #7637.

  • Allow the user to select multiple rows in the table.

Changeset: f9bbbd1e219d79315660b8b7cd3b41fb4c2b2783

comment:57 Changed 7 years ago by Jay Rainey

Added loadDataFiles functionality. Refs #7637.

Changeset: 5ae6f2765ba4df8ecd0da6687f99e9eab30e2dbe

comment:58 Changed 7 years ago by Jay Rainey

Fixed failing ICAT data files test. Refs #7637.

  • The test now takes account for the new parameter that is made use of when saving a file to disk.
  • Updated property name to abide by standards.

Changeset: 7a6bbc0e6f629ca94aca1a0df6a60e053dd517de

comment:59 Changed 7 years ago by Jay Rainey

Updated dataFileSelected slot. Refs #7637.

  • If the user selected a file to download, and then performed a filter the checked state would remain, and thus if they pressed download it would download the file (which they have no longer selected, or may not even be able to view).
  • Show search frame by default.

Changeset: 7f57d6cc36d1e8218f813c44f58931c69937432d

comment:60 Changed 7 years ago by Jay Rainey

Small refactor of ICatHelper algorithm handling. Refs #7637.

  • Created a convenience method that creates an algorithm based on the name provided to prevent duplication of code.

Changeset: 7ecbf5dc2300fe343e5249f90c50f52af4b94a2b

comment:61 Changed 7 years ago by Jay Rainey

Implemented search input validation. Refs #7637.

Changeset: caf9d1563375458821a29f6a5fc91c2339a4d341

comment:62 Changed 7 years ago by Jay Rainey

Implemented multi-select functionality. Refs #7637.

  • Added logging URL output to catalogDownloadDataFiles.

Changeset: 53369ad3065fd220ba2a3fa61f775cb6533850f8

comment:63 Changed 7 years ago by Jay Rainey

Merge branch 'feature/7637_improve_icat_gui' into develop. Refs #7637.

Conflicts:

Code/Mantid/Framework/ICat/src/CatalogDownloadDataFiles.cpp Code/Mantid/Framework/ICat/src/CatalogSearch.cpp

Changeset: 93a09aa6183a6ce22ac254998d8f49fcf1b9d2a2

comment:64 Changed 7 years ago by Jay Rainey

  • Blocking 8126 added

comment:65 Changed 7 years ago by Jay Rainey

  • Blocking 3827 added

comment:66 Changed 7 years ago by Jay Rainey

  • Blocking 8126 removed

comment:67 Changed 7 years ago by Jay Rainey

Removed unused local variable. Refs #7637.

  • Suppressed unused parameter warning.

Changeset: 52c51718350f3f39cc201d94e34daa06809f4555

comment:68 Changed 7 years ago by Jay Rainey

Allow rows to be unchecked in datafile table. Refs #7637.

Changeset: de00b1e836e5d2b898ba9e3e8d8bcda4332e3803

comment:69 Changed 7 years ago by Jay Rainey

Added load/download validation. Refs #7637.

  • Disable load and download button by default, and re-enable when a user has selected at least one

Changeset: 5ba52661a1524fae74ce9e450d0e72208424d1c0

comment:70 Changed 7 years ago by Jay Rainey

Override QHeadView options to allow checkbox in header. Refs #7637.

Changeset: 1ac1ea529a2a6d61293ff278792067125ee673c5

comment:71 Changed 7 years ago by Jay Rainey

Use custom header class to allow checkbox in table header. Refs #7637.

Changeset: f29ec6f3b6637442308452b07609edb857008050

comment:72 Changed 7 years ago by Jay Rainey

Added select all slot. Refs #7637.

Changeset: d9c290fe82fe660ff9549fc5e5ba6ce8dbe96eca

comment:73 Changed 7 years ago by Jay Rainey

  • Blocked By 8144 added

comment:74 Changed 7 years ago by Jay Rainey

Fixed GUI tab order. Refs #7637.

Changeset: 13689b32ee348579cb43888380cbb2d5be71eb12

comment:75 Changed 7 years ago by Jay Rainey

Added validation to GUI. Refs #7637.

  • Removed useless label from GUI.
  • Added relevant label to inform user of the catalog they're logged into. The label is also used for error message if they are not logged into ICAT rather than re-opening a login dialog.
  • Enabled header to calendar.

Changeset: 56758636e5182bb6c86333b94dd18b60712f28df

comment:76 Changed 7 years ago by Jay Rainey

Hide elements on GUI. Refs #7637.

  • I have opted to hide elements that related to functionality that will not make it into this release, such as paging and multiple facility login.

Changeset: 6cdc7c7fbb66afcaf39e185b07130e6118759ffb

comment:77 Changed 7 years ago by Jay Rainey

Minor UX improvement during search. Refs #7637.

Changeset: 1a52800615e0ffee34cf964a5bfee400a1678416

comment:78 Changed 7 years ago by Jay Rainey

Hide old ICAT GUI menu items. Refs #7637.

  • I have hidden these rather than removal as this will be done in another ticket along with the older ICAT GUI classes/files.

Changeset: d57081b4505caea518d84b552e697bfecde40d23

comment:79 Changed 7 years ago by Jay Rainey

Create new icat GUI when menu clicked. Refs #7637.

  • If I had not logged in and then clicked Search I would get error messages (great). However, if I closed the ICAT GUI and logged in and clicked Search again then I would get the previous GUI. This is no longer the case.
  • Ensures only one ICAT GUI can exist.

Changeset: 45a67787e18d17230aa97876885b259ccbd2297d

Changed 7 years ago by Jay Rainey

ICAT mockup specification

comment:80 Changed 7 years ago by Jay Rainey

Removed ICAT term from label. Refs #7637.

Changeset: 3c03c29da66d5d9404bf188b61fdf342b6be736e

comment:81 Changed 7 years ago by Jay Rainey

To test

This ticket needs to be tested on multiple platforms, and against ICAT3 and ICAT4. I have based the GUI on my mockup, which is in the attached pdf.

To test against ICAT4.2 change the facilities.xml to:

<catalog name="ICat4Catalog">
  <soapendpoint url="https://icatisis.esc.rl.ac.uk/ICATService/ICAT"></soapendpoint>

To open the new interface:

  1. Open Mantid and log into the catalog.
  2. Click "Search" and the new GUI will appear.
  3. Perform searches/downloads/loading as described below.

Misc:

  • Download and load currently do not work in ICAT4. See: #8126.
  • Notice how more user-friendly rows are output into both tables when using ICAT4. (E.g. the location of the file in the archives is not output into the table, whereas the start/end date of the experiment is).

Catalog search

  • When Advanced search is checked the other input fields are shown.
  • Run various queries to verify that the input fields work as expected.
  • Check that validation markers work correctly. For example, input letters into start date.
  • When My data only is checked it will only search your available data. This only works in ICAT4.
  • Ensure the calendar picker works as expected. (E.g. when you open it and select a date the correct date is input into the text-field. In addition, the other date picker should be hidden).
  • Are the Instrument name and Investigation type drop-boxes populated correctly?

Search Results

  • Search label updates with the correct amount of results (or none) and the labels correspond correctly to data output.
  • When you double click an investigation you want to obtain the data-files for the Datafiles information table is populated correctly.

Datafiles information

  • Download to... and Load buttons are disabled if no data file is selected. They should be enabled if the opposite is true.
  • When you select a row the corrosponding checkbox in the row is selected.
  • If you select the checkbox header it should select all data files to download.
  • You should be able to Ctrl + left click to select multiple data files in the table.
  • "Filter type..." filters the data file results as expected. (E.g. if you select .raw then only .raw files are shown in the data file result table.
  • When you click Download to.. a file browser is open, and you can save your file to this specific location. Close Mantid and try downloading a file again. The path should remain the same.
  • Load will download the datafile (to the default directory, or the directory you have previously saved a datafile to) and load it into a workspace.
Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:82 Changed 7 years ago by Jay Rainey

  • Status changed from inprogress to verify
  • Resolution set to fixed

comment:83 Changed 7 years ago by Jay Rainey

  • type changed from enhancement to task

comment:84 Changed 7 years ago by Jay Rainey

  • Blocking 1807 added

comment:85 Changed 7 years ago by Jay Rainey

  • Status changed from verify to reopened
  • Resolution fixed deleted

comment:86 Changed 7 years ago by Jay Rainey

  • Status changed from reopened to verify
  • Resolution set to fixed

comment:87 Changed 7 years ago by Jay Rainey

  • Status changed from verify to reopened
  • Resolution fixed deleted

comment:88 Changed 7 years ago by Jay Rainey

  • Status changed from reopened to inprogress

Merge branch 'master' into feature/7637_improve_icat_gui. Refs #7637.

Conflicts:

Code/Mantid/Framework/ICat/src/CatalogDownloadDataFiles.cpp Code/Mantid/Framework/ICat/src/CatalogSearch.cpp

Changeset: 9b458456e28bf30b6ff7c8c0a34c5b3ff71df6ae

comment:89 Changed 7 years ago by Jay Rainey

Merge branch 'feature/7637_improve_icat_gui' into develop. Refs #7637.

Conflicts:

Code/Mantid/Framework/ICat/src/CatalogDownloadDataFiles.cpp Code/Mantid/Framework/ICat/src/CatalogSearch.cpp

Changeset: a1b913e20be0116c2321bfa9fb69759a7ab054ef

comment:90 Changed 7 years ago by Owen Arnold

Here are my comments from a code review of these changes:

line 230 CatalogDownloadDataFiles.cpp: Pascal case should be used for property names. line 56: CatalogSearch.cpp (same as above)

line 16230 in ApplicationWindow.cpp: icatsearch should be resource managed if possible.

line 48 in ICatHelper.cpp: Better to use either auto or a typedef to avoid having to show the full template declaration in code. This type of code occurs several types and makes it hard to read.

block starting line 204 in ICatHelper.cpp:

+      try
+      {
+        catalogAlgorithm = Mantid::API::AlgorithmManager::Instance().create(algName);
+      }
+      catch(std::runtime_error& exception)
+      {
+        exception.what();
+      }

What is the try-catch hoping to achieve?

Consider using MVC for complex GUIs involving lots of logic. I'm looking at the logic coded into ICatSearch2.cpp. This isn't something to do right now but would be good to consider for future GUI work.

In future, break your solutions down such that they are not monolithic (if possible). This will help testers find bugs in your code, and will actually lead to more overall testing.

Other than that, looks quite good. Good comments and generally the c++ usage seemed good. Looks like the style has generally been correctly applied. I haven't tested the functionality yet ... awaiting a stable checkbuild.

comment:91 Changed 7 years ago by Jay Rainey

Pascal case property settings. Refs #7637.

Changeset: c89f9da63798b9ebeba5c16d530416579228852d

comment:92 Changed 7 years ago by Jay Rainey

Make use of auto. Refs #7637.

  • Removed useless try/catch since we want the algorithm's exception to be thrown.
  • Removed useless (since it outputs the path prior to transform) log message in ICat4Catalog.

Changeset: dd23600b9617dc63604cfffb247eddf97d271be7

comment:93 Changed 7 years ago by Jay Rainey

Set size constraint properties in ui file. Refs #7637.

  • No longer a fixed size.

Changeset: 46469af3c0f0fb35e2ebcd94a0873731824b419b

comment:94 Changed 7 years ago by Jay Rainey

Added input masks for run-range and dates. Refs #7637.

  • Prevent labels from stretching and instead expand tables to content size.

Changeset: 69716f9dfc921b1c6bafc3b0fb2255da1c1b76b8

comment:95 Changed 7 years ago by Jay Rainey

Output transformed location for user. Refs #7637.

Changeset: 4179b80f382196d7cb5d137b37d3cfeb3a8f9327

comment:96 Changed 7 years ago by Jay Rainey

Enable sorting in data file table. Refs #7637.

Changeset: 6b1d3a6eac202ac79ca23acfdf481fe2c39d8d14

comment:97 Changed 7 years ago by Jay Rainey

Improved content in datafile table. Refs #7637.

  • Show file size in the data file table, and made it use friendly.
  • Hide location of file in archives and file id in data file table.

Changeset: 5e7014a9340c59194d366614db28612c4aea0ca3

comment:98 Changed 7 years ago by Jay Rainey

Initializer lists are not supported on all compilers. Refs #7637.

Changeset: 0ca3698cce178f0d0785fef4d0e5c4fb5708ef4b

comment:99 Changed 7 years ago by Jay Rainey

  • Status changed from inprogress to verify
  • Resolution set to fixed

See comment:81 for details on how to test.

comment:100 Changed 7 years ago by Jay Rainey

  • Status changed from verify to reopened
  • Resolution fixed deleted

comment:101 Changed 7 years ago by Jay Rainey

  • Blocked By 8126 added

comment:102 Changed 7 years ago by Jay Rainey

  • Blocking 8126 added
  • Blocked By 8126 removed

comment:103 Changed 7 years ago by Jay Rainey

  • Status changed from reopened to inprogress

Removed time from investigation results table. Refs #7637.

  • Updated formatDateTime to format datetime with desired format to allow investigation and data file datetimes to be formatted differently.

Changeset: 1742b0a4782b0269a42a08d23da97828df1b7f50

comment:104 Changed 7 years ago by Jay Rainey

Updated help url. Refs #7637.

Changeset: f5bee3ef2afd4ec609d2daba6d2cbe570738e7a1

comment:105 Changed 7 years ago by Jay Rainey

Improved column display in both tables. Refs #7637.

Changeset: aa0587a70b99cbaa7b015c6de6b8ab354c9970de

comment:106 Changed 7 years ago by Jay Rainey

Improved various expanding issues. Refs #7637.

Changeset: cc7d070c4c6b15a330a948fe64f87590d515810d

comment:107 Changed 7 years ago by Jay Rainey

Open login dialog box is invalid users. Refs #7637.

Changeset: 37b390f883705ddb653b6e350954040b0fee6a98

comment:108 Changed 7 years ago by Jay Rainey

Merge branch 'feature/7637_improve_icat_gui' into develop. Refs #7637.

Conflicts:

Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp

Note: Removed datetime temp fix from dev.

Changeset: c16716b283c3506e61e3ee40945d4d87d015bcc9

comment:109 Changed 7 years ago by Jay Rainey

  • Status changed from inprogress to verify
  • Resolution set to fixed

I have written documentation (#8087) for the new GUI, which I think would be useful to read prior to testing. In order to test this please read comment:81.

Note: You will have to build this locally as there are changes on develop that prevents the search functionality working with ICat4, which are will be addressed in another ticket that this is blocking (#8126).

Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:110 Changed 7 years ago by Jay Rainey

  • Blocking 8087 removed

comment:111 Changed 7 years ago by Owen Arnold

  • Status changed from verify to verifying
  • Tester set to Owen Arnold

comment:112 Changed 7 years ago by Peter Peterson

Quick comment on an error message: It should reference "Facilities.xml" rather than "facilities.xml".

Attempting to login to  for SNS
Error in execution of algorithm CatalogLogin:
Your current Facility, SNS, does not have ICAT catalog information. 
The facilities.xml file may need updating. Contact the Mantid Team for help.

comment:113 Changed 7 years ago by Peter Peterson

  • Blocking 8191 added

comment:114 Changed 7 years ago by Jay Rainey

  • Blocking 6457 added

comment:114 Changed 7 years ago by Owen Arnold

  • Status changed from verifying to reopened
  • Resolution fixed deleted
  • Blocking 6457 removed

There is a crash fix that must be sorted out. We also want to be confident that we can specify mac-friendly mount points.

comment:115 Changed 7 years ago by Owen Arnold

Other observations for future tickets:

  • 'Filter type ...' should be a label and not an option. The current 'Filter type' should be called 'none' or 'no filter'
  • Would be nice to have tabs or buttons rather than checkboxes for expanding/closing the different sections of the search dialogs
  • Would be nice to have a 'cancel search' button. Rather than having to do this on the main Mantid Plot gui.
  • Cancelling searching can be very unresponsive. Makes me think that progress reporting isn't frequent enough. It should be possible to cancel a search without waiting for more than a second.
  • Checkboxes cannot be directly selected on the mac.
  • It's possible to run a search without specifying ANY search parameters. Should at least HAVE to specify one otherwise you're searching everything!
  • Search instrument selection should default to your current default instrument.
  • Should print a debug statement for the mount point it's trying to use
  • Should be some way of (easily) determining what version of ICat is being used

Implement each of these as small individual tickets. From a testing point of view, this current ticket is scary.

comment:117 Changed 7 years ago by Jay Rainey

  • Status changed from reopened to inprogress

Prevent crash on OSX. Refs #7637.

Changeset: 0261a236fe7b85a0785a24db3bbfb9047e35bfae

comment:118 Changed 7 years ago by Jay Rainey

I have created minor tickets for the observations made, which are: #8199, #8200, #8201, #8202, #8204, #8205, and #8206.

You said:

It's possible to run a search without specifying ANY search parameters. Should at least HAVE to specify one otherwise you're searching everything!

This only occurs in ICAT3 and has not been resolved as we will be using 4.3 in the release and removing ICAT3 functionality for the following release.

Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:119 Changed 7 years ago by Jay Rainey

  • Status changed from inprogress to verify
  • Resolution set to fixed

comment:120 Changed 7 years ago by Jay Rainey

  • Blocking 8209 added

comment:122 Changed 7 years ago by Jay Rainey

Removed unreferenced variables. Refs #7637.

Changeset: 9f5c6a39ff7a259aa224ab0e12361c8311da87bb

comment:123 Changed 7 years ago by Owen Arnold

  • Status changed from verify to verifying

comment:124 Changed 7 years ago by Owen Arnold

  • Status changed from verifying to closed

Merge remote-tracking branch 'origin/feature/7637_improve_icat_gui'

Full changeset: e3390e04ffe14d7c313ed76fac16c0e827ed74f2

comment:125 Changed 7 years ago by Jay Rainey

  • Blocked By 8218 added

comment:126 Changed 7 years ago by Jay Rainey

  • Blocking 1807 removed

comment:127 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 8482

Note: See TracTickets for help on using tickets.