Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OMERO.tables ArrayColumns #5632 (rebased onto develop) #728

Merged

Commits on Feb 12, 2013

  1. Added DoubleArrayColumn and LongArrayColumn to OMERO.Tables (ome#5632)

    This needs reviewing by someone who knows about NumPy-Ice array conversions
    manics committed Feb 12, 2013
    Configuration menu
    Copy the full SHA
    e92a8fe View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    821a21b View commit details
    Browse the repository at this point in the history
  3. This effectively replaces the call to numpy.rec.fromarrays by creatin…

    …g a single recarray from the values and dtypes of each column in one go, instead of each co
    
    lumn creating its own numpy.array
    manics committed Feb 12, 2013
    Configuration menu
    Copy the full SHA
    f7aa3ae View commit details
    Browse the repository at this point in the history
  4. Remove initialisation dependency on variables which might not be set.

    AbstractColumn.__init__ uses properties such as self.name which aren't always set at initialisation, especially when Ice is involved. This commit removes self.recarrtype and replaces it with just the properties that should exist (based on testing since its unclear under what circumstances Ice will set a property or not).
    manics committed Feb 12, 2013
    Configuration menu
    Copy the full SHA
    805af0e View commit details
    Browse the repository at this point in the history
  5. Mask unit tests now enter unique values for each field

    Mask creation and test functions also put into separate functions for reuse within test.
    manics committed Feb 12, 2013
    Configuration menu
    Copy the full SHA
    c199d31 View commit details
    Browse the repository at this point in the history
  6. Added more unit-tests for array columns

    Test for a array column of size 1.
    Test all possible column types in the same table.
    manics committed Feb 12, 2013
    Configuration menu
    Copy the full SHA
    665b428 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b9a3838 View commit details
    Browse the repository at this point in the history
  8. AbstractArrayColumn holds common methods for array columns.

    Now that array columns seem to be working I can start to clean things up.
    manics committed Feb 12, 2013
    Configuration menu
    Copy the full SHA
    4d54fbc View commit details
    Browse the repository at this point in the history
  9. Removed old commented code

    manics committed Feb 12, 2013
    Configuration menu
    Copy the full SHA
    7dcfc16 View commit details
    Browse the repository at this point in the history
  10. Use pos=None to indicate an uninitialised column

    This replaces the need for a separate variable to indicate initialisation
    manics committed Feb 12, 2013
    Configuration menu
    Copy the full SHA
    263d6b5 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    09efbc5 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    697fce2 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    6b0f2e5 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    b53906e View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    9d3f65f View commit details
    Browse the repository at this point in the history
  16. Moved new array column types to the end of testAllColumnsSameTable

    This makes things logically nicer (new stuff goes at the end of the table)
    manics committed Feb 12, 2013
    Configuration menu
    Copy the full SHA
    0d88b5a View commit details
    Browse the repository at this point in the history
  17. createAllColumns_4_4_5 creates the referenced HDF5 file.

    Also moved HDF5 upload from class initialiser to the actual test method. This should make things easier if addition test files for future versions are needed.
    manics committed Feb 12, 2013
    Configuration menu
    Copy the full SHA
    2f48e72 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    62ecf09 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    78a2fb4 View commit details
    Browse the repository at this point in the history
  20. Remove testMultipleArrayColumns, output file ID in testAllColumnsSame…

    …Table
    
    The OriginalFile ID is useful for compatibility tests, as it allows the underlying file to be manually retrieved
    manics committed Feb 12, 2013
    Configuration menu
    Copy the full SHA
    98d0d55 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    03b57c5 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    81a319b View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2013

  1. Configuration menu
    Copy the full SHA
    184bcdc View commit details
    Browse the repository at this point in the history