# HG changeset patch
# User imgteam
# Date 1562675750 14400
# Node ID f03b4da203d09dcb359498c9bc6e77ba3f80a440
# Parent  96909b9d1df128feb9e6594a279c8567d2654701
planemo upload for repository https://github.com/BMCV/galaxy-image-analysis/tools/2d_feature_extraction/ commit e45ba62aae80d942bbf1cbf572bd9aec64297900

diff -r 96909b9d1df1 -r f03b4da203d0 2d_feature_extraction.py
--- a/2d_feature_extraction.py	Sat Feb 09 14:28:26 2019 -0500
+++ b/2d_feature_extraction.py	Tue Jul 09 08:35:50 2019 -0400
@@ -118,7 +118,9 @@
 if args.moments or args.all_features:
     df['moments'] = df['it'].map(lambda ait: regions[ait].moments)
 if args.convexity or args.all_features:
-    df['convexity'] = df.area/(df.perimeter*df.perimeter)
+    perimeter = df['it'].map(lambda ait: regions[ait].perimeter)
+    area = df['it'].map(lambda ait: regions[ait].area)
+    df['convexity'] = area/(perimeter*perimeter)
 
 del df['it']
 df.to_csv(out_file, sep='\t', line_terminator='\n', index=False)
diff -r 96909b9d1df1 -r f03b4da203d0 2d_feature_extraction.xml
--- a/2d_feature_extraction.xml	Sat Feb 09 14:28:26 2019 -0500
+++ b/2d_feature_extraction.xml	Tue Jul 09 08:35:50 2019 -0400
@@ -1,4 +1,4 @@
-<tool id="ip_2d_feature_extraction" name="2D Feature Extraction" version="0.0.8">
+<tool id="ip_2d_feature_extraction" name="2D Feature Extraction" version="0.0.9">
     <description>Feature Extraction</description>
     <requirements>
         <requirement type="package" version="0.23.4">pandas</requirement>