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

Img proc api #63

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open

Img proc api #63

wants to merge 35 commits into from

Commits on Apr 8, 2015

  1. DEV: Moved mathops.py and test_img_proc from skxray to vttools

    After review of the arithmetic tools with Eric, we decided that tools
    whos sole purpose is to wrap existing tools into more user friendly
    VisTrails modules should be located in VTTools, thereby leaving skxray
    to exclusively contain new analysis tools and functions, while
    continuing to increase the usefullness and usability of VisTrails for
    analysis of NSLS-II data.
    
    The file mathops.py has been moved to vttools/to_wrap and renamed as
    image_proc.py. The file test_img_proc.py has been copied from
    skxray/tests/ to vttools/tests/.
    Gabriel Iltis committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    2970091 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2015

  1. DEV: Reduced the included funcs to only arith funcs specific to VisTr…

    …ails
    
    As per review and comment from Eric, the arithmetic functions designed
    explicitly to ease image processing and data analysis in VisTrails have
    been moved to the VTTools repo. This commit removes the addl analysis
    funcs, which will remain in skxray (logical_nand, logical_nor,
    logical_sub). The remaining functions (arithmetic_basic,
    arithmetic_custom, and logic_basic) remain.
    
    All additional math functions are directly imported from either mathops
    or numpy. And names for mathops functions have been corrected to mimic
    style established in Numpy.
    Gabriel Iltis committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    af219e2 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2015

  1. Configuration menu
    Copy the full SHA
    221fb0d View commit details
    Browse the repository at this point in the history
  2. TST: Img arith tool test. Changed tool location and refs to srch vttool

    Simple term replacement. Replaced all references to mathops by changing
    import statement to:
    import vttools.to_wrap.image_proc as img
    The tests included focus on the vistrails specific functions:
    arithmetic_basic, logic_basic, and arithmetic_custom
    Gabriel Iltis committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    d8c978a View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2015

  1. DEV: Mod to arith_custom docs. Removed additional operators.

    Previously the docstring for arithmetic_custom included references
    to additional operators such as +=, -=, *= etc. which are supposed to
    simplify expressions like a=a+b, which is the equivalent of a+=b.
    However, the parsing function does not evaluate these short cuts
    correctly.
    
    If these additional operators become important, then I'll revisit and
    modify the parsing function, or write a custom one. However, at this
    time the additional operators are deemed to be unnecessary, since the
    expressions can still be evaluated without the operators.`
    Gabriel Iltis committed Apr 13, 2015
    Configuration menu
    Copy the full SHA
    ff10b4a View commit details
    Browse the repository at this point in the history
  2. DEV: Changed data inputs to x1 and x2. Completed docstrings for funcs.

    As per Eric's suggestion, inputs specific to data have been renamed in
    order to conform to typical numpy docstrings, e.g. the arg src_data1
    and src_data2 have been changed to x1 and x2.
    
    The funcs requiring a string operation to be defined have also been
    standardized so that the input order starts with the operation
    or expression followed by the input data.
    
    Finally, the docstring for arithmetic_custom was incomplete, and has
    been flushed out.
    Gabriel Iltis committed Apr 13, 2015
    Configuration menu
    Copy the full SHA
    9be03ce View commit details
    Browse the repository at this point in the history
  3. DEV: Renamed functions so they're simpler and more straight forward.

    As discussed with Eric, we decided to shorten, simplify and make the
    function names more explicit about their functionality. So, logic_basic
    has been renamed to logic, arithmetic_basic has been renamed arithmetic,
    and arithmetic_custom has been changed to
    arithmetic_expression. In Vistrails these tools are exprected
    to be nested in the tool tree under an "Image Arithmetic" heading,
    included in the "Image Processing" tool set/kit.
    Gabriel Iltis committed Apr 13, 2015
    Configuration menu
    Copy the full SHA
    4cf2f9f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5b2e3a2 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2015

  1. Configuration menu
    Copy the full SHA
    adf036f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1b7a073 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bbed6dc View commit details
    Browse the repository at this point in the history
  4. DOC: Updated input params docstrings, simplifying them.

    Gabriel Iltis committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    9822c1f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fcc8d22 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2015

  1. DEV: Moved mathops.py and test_img_proc from skxray to vttools

    After review of the arithmetic tools with Eric, we decided that tools
    whos sole purpose is to wrap existing tools into more user friendly
    VisTrails modules should be located in VTTools, thereby leaving skxray
    to exclusively contain new analysis tools and functions, while
    continuing to increase the usefullness and usability of VisTrails for
    analysis of NSLS-II data.
    
    The file mathops.py has been moved to vttools/to_wrap and renamed as
    image_proc.py. The file test_img_proc.py has been copied from
    skxray/tests/ to vttools/tests/.
    Gabriel Iltis authored and ericdill committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    bff1406 View commit details
    Browse the repository at this point in the history
  2. DEV: Reduced the included funcs to only arith funcs specific to VisTr…

    …ails
    
    As per review and comment from Eric, the arithmetic functions designed
    explicitly to ease image processing and data analysis in VisTrails have
    been moved to the VTTools repo. This commit removes the addl analysis
    funcs, which will remain in skxray (logical_nand, logical_nor,
    logical_sub). The remaining functions (arithmetic_basic,
    arithmetic_custom, and logic_basic) remain.
    
    All additional math functions are directly imported from either mathops
    or numpy. And names for mathops functions have been corrected to mimic
    style established in Numpy.
    Gabriel Iltis authored and ericdill committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    a699039 View commit details
    Browse the repository at this point in the history
  3. DEV: Added __init__ to vttools tests folder. Can now access tests

    Gabriel Iltis authored and ericdill committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    cf06549 View commit details
    Browse the repository at this point in the history
  4. TST: Img arith tool test. Changed tool location and refs to srch vttool

    Simple term replacement. Replaced all references to mathops by changing
    import statement to:
    import vttools.to_wrap.image_proc as img
    The tests included focus on the vistrails specific functions:
    arithmetic_basic, logic_basic, and arithmetic_custom
    Gabriel Iltis authored and ericdill committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    102feb3 View commit details
    Browse the repository at this point in the history
  5. DEV: Mod to arith_custom docs. Removed additional operators.

    Previously the docstring for arithmetic_custom included references
    to additional operators such as +=, -=, *= etc. which are supposed to
    simplify expressions like a=a+b, which is the equivalent of a+=b.
    However, the parsing function does not evaluate these short cuts
    correctly.
    
    If these additional operators become important, then I'll revisit and
    modify the parsing function, or write a custom one. However, at this
    time the additional operators are deemed to be unnecessary, since the
    expressions can still be evaluated without the operators.`
    Gabriel Iltis authored and ericdill committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    98c3f36 View commit details
    Browse the repository at this point in the history
  6. DEV: Changed data inputs to x1 and x2. Completed docstrings for funcs.

    As per Eric's suggestion, inputs specific to data have been renamed in
    order to conform to typical numpy docstrings, e.g. the arg src_data1
    and src_data2 have been changed to x1 and x2.
    
    The funcs requiring a string operation to be defined have also been
    standardized so that the input order starts with the operation
    or expression followed by the input data.
    
    Finally, the docstring for arithmetic_custom was incomplete, and has
    been flushed out.
    Gabriel Iltis authored and ericdill committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    5545161 View commit details
    Browse the repository at this point in the history
  7. DEV: Renamed functions so they're simpler and more straight forward.

    As discussed with Eric, we decided to shorten, simplify and make the
    function names more explicit about their functionality. So, logic_basic
    has been renamed to logic, arithmetic_basic has been renamed arithmetic,
    and arithmetic_custom has been changed to
    arithmetic_expression. In Vistrails these tools are exprected
    to be nested in the tool tree under an "Image Arithmetic" heading,
    included in the "Image Processing" tool set/kit.
    Gabriel Iltis authored and ericdill committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    f4d9a17 View commit details
    Browse the repository at this point in the history
  8. DEV: Transferred test funcs for arith tools for VT from skxray.

    Gabriel Iltis authored and ericdill committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    91a4547 View commit details
    Browse the repository at this point in the history
  9. DEV: Updated functions in image_proc.py after transfer from skxray

    Gabriel Iltis authored and ericdill committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    72f0463 View commit details
    Browse the repository at this point in the history
  10. TST: Updated basic arith test function after img_proc name changes

    Gabriel Iltis authored and ericdill committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    d51e33f View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    bef01aa View commit details
    Browse the repository at this point in the history
  12. DOC: Updated input params docstrings, simplifying them.

    Gabriel Iltis authored and ericdill committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    ffa4cd2 View commit details
    Browse the repository at this point in the history
  13. TST: Tested and verified img_proc tst funcs using nose, coverage.

    Gabriel Iltis authored and ericdill committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    69e81a0 View commit details
    Browse the repository at this point in the history
  14. DOC, MNT: Edits to be consistent with np and pep8

    - This looks like a lot of changes, but there is functionally
      no difference between the original code and this code.  It is
      entirely stylistic.
    - Doc edits moved the descriptive prose to `/doc/resource/user-guide/image.rst`
      and used language largely copied from numpy
    - content edits favored use of built in functionality over
      defining look-up dictionaries
    ericdill committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    25fc89c View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2015

  1. Merge branch 'master' of github.com:Nikea/VTTools into img_proc_math

    Conflicts:
    	vttools/tests/__init__.py
    Gabriel Iltis committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    08c0aab View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'dill/img_proc_math' into img_proc_math

    Conflicts:
    	vttools/tests/test_img_proc.py
    	vttools/to_wrap/image_proc.py
    Gabriel Iltis committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    bdbe90d View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2015

  1. DEV: Updated init.py to properly include all img proc arithmetic funcs

    The tools designed to ease use of math functions in VisTrails are now
    included in vttools-->to_wrap-->image_processing-->arithmetic since
    these tools are explicitly designed to simplify the VisTrails user
    experience. As part of the growing collection of image processing
    functions included in skxray, the basic image arithmetic functions
    are compiled in skxray-->image_processing-->arithmetic for
    completeness.
    Gabriel Iltis committed Jun 21, 2015
    Configuration menu
    Copy the full SHA
    062059f View commit details
    Browse the repository at this point in the history
  2. DEV: Changed test import statement to reflect img_proc to arithmetic …

    …refactor.
    Gabriel Iltis committed Jun 21, 2015
    Configuration menu
    Copy the full SHA
    ef51305 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2015

  1. FIX: Removed HTML folder which was inadvertently added at some point.

    HTML folder was accidentally added during a previous commit. This
    folder has now been removed in order to merge this PR finally.
    Gabriel Iltis committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    03eaf66 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2015

  1. DOC: Updated and corrected doc for arith-expr referencing lmfit.asteval

    As Eric mentioned, lmfit.asteval may be a cleaner and more effective
    parsing tool for evaluating the input expressions. Added an explicit
    TODO noting the parser comparision should be completed on next
    iteration.
    Gabriel Iltis committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    4007ce2 View commit details
    Browse the repository at this point in the history
  2. DOC: Added TODO that docs for logical func need to be updated after s…

    …phinx docs
    Gabriel Iltis committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    f67a3bb View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2015

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