Skip to content

Commit

Permalink
Changed install to include a note about binaries
Browse files Browse the repository at this point in the history
  • Loading branch information
Greg Blumberg committed Sep 12, 2019
1 parent 22e3563 commit b84c6e0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ after_test:
# - "move dist\\SHARPpy.exe dist\\SHARPpy%ARCH%.exe"

artifacts:
- path: "dist\\SHARPpy64.exe"
- path: "runsharp\\dist\\SHARPpy64.exe"
name: binary

- path: "*.png"
Expand All @@ -62,7 +62,7 @@ deploy:
release: $(appveyor_repo_tag_name)
auth_token:
secure: DB6sQwYCM7Dhhy+mjPkMd6kclvw0Sc2wglTJxcTBQue63dtIQRNa1dz/aqJG7Ygc
artifact: "dist\\SHARPpy64.exe"
artifact: "runsharp\\dist\\SHARPpy64.exe"
draft: true
prerelease: true
on:
Expand Down
2 changes: 2 additions & 0 deletions docs/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ https://github.com/sharppy/SHARPpy/releases/

Installing a pre-compiled binary *should* be as simple as downloading the .zip file and extracting it to the location of your choice. The zip files are named for the operating system and number of bits. Most recently-built computers (probably post-2010 or so) should have 64-bit operating systems installed. If your computer is older and you're unsure whether it has a 32- or 64-bit operating system, you can check on Windows 7 by clicking Start, right-clicking on Computer, and selecting Properties. All recent versions of OS X (10.6 and newer) should be 64-bit.

.. note:: The pre-compile binaries are sometimes difficult to keep up to date, so for more recent versions of SHARPpy, you may want to look into the next section, which is about installing the program via package managers.

Installing using package managers
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Expand Down
5 changes: 4 additions & 1 deletion runsharp/full_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,9 @@ def __initUI(self):

self.show()
self.raise_()
import time
time.sleep(3)
QPixmap.grabWidget(self).save('./screenshot.png', 'png')

def createMenuBar(self):
"""
Expand Down Expand Up @@ -1191,8 +1194,8 @@ def main():
win.close()
else:
main_win = Main()
#app.exec_()
sys.exit(app.exec_())


if __name__ == '__main__':
main()
3 changes: 3 additions & 0 deletions sharppy/io/spc_decoder.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,6 @@ def _parse(self):
prof_coll.setMeta('base_time', time)
return prof_coll

#if __name__ == '__main__':
# import sys
# SPCDecoder(sys.argv[1])

0 comments on commit b84c6e0

Please sign in to comment.