Commit Graph

5830 Commits

Author SHA1 Message Date
Jerome Kieffer bf2fd2f00f Issue when PYFAI_OPENCL="False", some Opencl stuff nevertheless loaded
close #1246
2019-05-16 17:22:13 +02:00
Jerome Kieffer 6ea155f09c Issue when PYFAI_OPENCL="False", some Opencl stuff nevertheless loaded
close #1246
2019-05-16 17:21:22 +02:00
Jerome Kieffer 5854addf0d Merge remote-tracking branch 'upstream/master' into 0.18 2019-05-16 17:07:19 +02:00
Jerome Kieffer 38a8876e50 Merge remote-tracking branch 'upstream/master' 2019-05-16 17:05:49 +02:00
Jerome Kieffer 4a84cac95e Merge remote-tracking branch 'origin/0.18' 2019-05-16 17:05:29 +02:00
Jerome Kieffer 9567a134f7
Merge pull request #1250 from vallsv/update-gui-label
Rewrite GUI task labels
2019-05-16 17:04:24 +02:00
Jerome Kieffer 974b8fa571
Merge pull request #1248 from vallsv/fix-fitted-ring-display
Fix redraw of the rings
2019-05-16 17:04:02 +02:00
Jerome Kieffer 7c52febabf
Merge pull request #1245 from vallsv/polishing
Polishing
2019-05-16 17:03:26 +02:00
Valentin Valls 4aa6922cf2 Rewrite GUI task labels 2019-05-16 17:00:07 +02:00
Jerome Kieffer 3ca98bf762 Merge remote-tracking branch 'upstream/master' 2019-05-16 16:59:35 +02:00
Valentin Valls fc6dbb64c5
Merge pull request #1249 from kif/ImageD11
Image d11
2019-05-16 16:05:18 +02:00
Valentin Valls c8735fdd40
Typo 2019-05-16 16:04:23 +02:00
Jerome Kieffer 4686b70e26
Merge pull request #1247 from vallsv/fix-testoptions
Parse test options when using run_tests function
2019-05-16 15:51:12 +02:00
Jerome Kieffer 27febdd8b6 Update date 2019-05-16 15:41:16 +02:00
Carsten DETLEFS e9796b0ba8 Contribution from Carsten to import and export geometries in ImageD11
formats.
2019-05-16 15:40:09 +02:00
Valentin Valls 445fe1f3dd Fix clean up 2019-05-16 15:31:41 +02:00
Valentin Valls 5b1bb42ded Parse test options when using run_tests function 2019-05-16 15:05:57 +02:00
Valentin Valls c3a6fb5981 Display detector pixel size 2019-05-16 14:49:40 +02:00
Valentin Valls cc0fff12db Add q to the fitting statusbar 2019-05-16 14:28:48 +02:00
Valentin Valls e56f15c4d5 Add q to the integration statusbar 2019-05-16 14:28:48 +02:00
Valentin Valls 9f6ff5d293 Add a scattering vector unit to the application model 2019-05-16 14:28:48 +02:00
Valentin Valls 490ae9bbfc Create GUI unit for scattering vector 2019-05-16 14:28:48 +02:00
Jerome Kieffer df23990f8b Start writing changelog 2019-05-16 12:38:35 +02:00
Jerome Kieffer 16fbbde127
Merge pull request #1242 from silx-kit/vallsv-patch-3
Fix rst inline code
2019-05-16 12:26:38 +02:00
Valentin Valls 6253e670ad Shortcut with +/- to select next rings to pick 2019-05-16 12:13:51 +02:00
Valentin Valls bdea5a47e6 Implement ring tooltip at the fitting stage 2019-05-16 12:03:07 +02:00
Valentin Valls 76d9d6687e Make sure installEventFilter is used 2019-05-16 11:56:54 +02:00
Valentin Valls b3096fb6cc Implement ring tooltip at the integration stage 2019-05-16 11:47:09 +02:00
Valentin Valls 79eff4794d Implement human readable ordinal 2019-05-16 11:41:41 +02:00
Valentin Valls 81defd1287 Fix deprecation 2019-05-16 11:39:49 +02:00
Valentin Valls b27a00f80a Always display the 10 first rings 2019-05-16 10:26:24 +02:00
Valentin Valls 70d849f23b Typo 2019-05-16 10:09:57 +02:00
Valentin Valls 5e444c8ac7
Fix rst inline code 2019-05-16 09:17:56 +02:00
Jerome Kieffer 6bf390b800 Merge remote-tracking branch 'upstream/master' into 0.18 2019-05-16 09:17:23 +02:00
Jerome Kieffer eeb1ba8e15
Merge pull request #1226 from vallsv/fix-reset-using-peaks
Fix reset using peaks
2019-05-16 09:15:04 +02:00
Jerome Kieffer a674640887
Merge pull request #1233 from vallsv/fix-rubber-mode
Fix rubber mode
2019-05-16 09:13:25 +02:00
Jerome Kieffer 3402dfe8c4
Merge pull request #1240 from silx-kit/vallsv-patch-1
Add ellipse to binder
2019-05-16 09:12:38 +02:00
Jerome Kieffer cd33b0321c
Merge pull request #1241 from silx-kit/vallsv-patch-2
Typo readme
2019-05-16 09:11:37 +02:00
Jerome Kieffer b29d9ec36b
Merge pull request #1239 from vallsv/fix-detector-deepcopy
Fix deepcopy memo arg to NexusDetector
2019-05-16 09:10:50 +02:00
Valentin Valls 0aec7d6122
Typo readme 2019-05-16 09:09:43 +02:00
Valentin Valls 54f1da6922
Add ellipse to binder 2019-05-16 09:06:11 +02:00
Valentin Valls a49fd77f6f Fix deepcopy memo arg to NexusDetedctor 2019-05-16 08:42:02 +02:00
Jerome Kieffer 373a6dac85 update a few tutorial 2019-05-16 07:55:58 +02:00
Jerome Kieffer 401f044217 start release v0.18: a build for the doc 2019-05-16 07:23:10 +02:00
Jerome Kieffer 1ed487ca2e
Update README.rst
issue with badges
2019-05-15 18:47:36 +02:00
Jerome Kieffer a0b818cbb9
Merge pull request #1235 from t20100/binder
Add binder environment to run cookbook and tutorials
2019-05-15 18:45:02 +02:00
Valentin Valls 9293c4dc2b
Merge pull request #1234 from kif/1228_importerror
fix ImportError
2019-05-15 15:27:59 +02:00
Thomas VINCENT 80a0fd95b8 Add myBinder launcher badge 2019-05-15 15:15:08 +02:00
Jerome Kieffer 7fea07842c Merge remote-tracking branch 'upstream/master' 2019-05-15 14:05:07 +02:00
Jerome Kieffer ab48e10e71
Merge pull request #1231 from vallsv/fix-valid-energy
Fix valid energy
2019-05-15 14:04:27 +02:00