Skip to content

Commit

Permalink
Merge branch 'master' into docs
Browse files Browse the repository at this point in the history
  • Loading branch information
DinoBektesevic committed Jan 15, 2019
2 parents 3684721 + f7ae0a7 commit 42efc34
Show file tree
Hide file tree
Showing 20 changed files with 21 additions and 3 deletions.
17 changes: 17 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
include lfd/analysis/profiles/rabina/lfd_img0_r.png
include lfd/analysis/profiles/rabina/lfd_img10_r.png
include lfd/analysis/profiles/rabina/lfd_img11_r.png
include lfd/analysis/profiles/rabina/lfd_img12_r.png
include lfd/analysis/profiles/rabina/lfd_img13_r.png
include lfd/analysis/profiles/rabina/lfd_img14_r.png
include lfd/analysis/profiles/rabina/lfd_img15_r.png
include lfd/analysis/profiles/rabina/lfd_img1_r.png
include lfd/analysis/profiles/rabina/lfd_img2_r.png
include lfd/analysis/profiles/rabina/lfd_img3_r.png
include lfd/analysis/profiles/rabina/lfd_img4_r.png
include lfd/analysis/profiles/rabina/lfd_img5_r.png
include lfd/analysis/profiles/rabina/lfd_img6_r.png
include lfd/analysis/profiles/rabina/lfd_img7_r.png
include lfd/analysis/profiles/rabina/lfd_img8_r.png
include lfd/analysis/profiles/rabina/lfd_img9_r.png
include lfd/gui/imagechecker/lfd_noimage.png
File renamed without changes
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lfd/gui/imagechecker/leftframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def __init__(self, parent):
self.data = parent.data

tmppath = os.path.split(__file__)[0]
failimg = Image.open(os.path.join(tmppath, "noimage.png"))
failimg = Image.open(os.path.join(tmppath, "lfd_noimage.png"))
self.img = failimg
self.drawnline = None

Expand Down
File renamed without changes
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@

setup(
name='lfd',
version='1.0.1',
version='1.0.2',
description='Linear Feature Detector for Astronomical images',
long_description=long_description,
long_description_content_type='text/markdown',
author='Dino Bektesevic',
author_email='ljetibo@gmail.com',
packages=find_packages(), #same as name
packages=find_packages(),
include_package_data=True,
install_requires=[
'numpy',
'matplotlib',
Expand Down

0 comments on commit 42efc34

Please sign in to comment.