Skip to content

Commit

Permalink
Several implementation & installation updates
Browse files Browse the repository at this point in the history
- Removed tkinter from setup.py, since it is installed by default
- updated cx_setup
- corrected cx_setup readme
  • Loading branch information
Sieboldianus committed Dec 19, 2018
1 parent 03480c0 commit 7f92747
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion 00_generateClusters_OnlyEmoji.cmd
Expand Up @@ -13,5 +13,5 @@
#-f shapefilePath
#-stat statisticsOnly
#-lmuc limitBottomUserCount, default = 5
%~dp0__main__.exe -p "False" -o "True" -t "False"
%~dp0tagmaps.exe -p "False" -o "True" -t "False"
exit
2 changes: 1 addition & 1 deletion 00_generateClusters_OnlyPhotoLocations.cmd
Expand Up @@ -13,5 +13,5 @@
#-f shapefilePath
#-stat statisticsOnly
#-lmuc limitBottomUserCount, default = 5
%~dp0__main__.exe -p "True" -o "False" -t "False"
%~dp0tagmaps.exe -p "True" -o "False" -t "False"
exit
2 changes: 1 addition & 1 deletion 00_generateClusters_OnlyTags.cmd
Expand Up @@ -13,5 +13,5 @@
#-f shapefilePath
#-stat statisticsOnly
#-lmuc limitBottomUserCount, default = 5
%~dp0__main__.exe -p "False" -o "False" -t "True"
%~dp0tagmaps.exe -p "False" -o "False" -t "True"
exit
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -17,7 +17,7 @@ Afterwards, Alpha Shapes are generated as a means to 'soft' placement of tags on
## Installation

1. The easiest way for Windows users is to download the Pre-compiled build that is available [here](https://cloudstore.zih.tu-dresden.de/index.php/s/8EFfeJcpNCStQ9X/download) (315MB!) and run `generateTagClusters.exe`
- you can also compile the program yourself using the `setup.py` with [cx_Freeze](https://anthony-tuininga.github.io/cx_Freeze/): run `python setup.py build`
- you can also compile the program yourself using the `setup.py` with [cx_Freeze](https://anthony-tuininga.github.io/cx_Freeze/): run `python cx_setup.py build`
- or simple run `generateTagClusters.py` if you have Python and all dependencies installed
2. Place geotagged photo data in `/01_Input` subfolder
- example files/format are available in the Pre-compiled build zip-file above
Expand Down
2 changes: 1 addition & 1 deletion cx_setup.py
Expand Up @@ -47,7 +47,7 @@
# base = "Win32GUI"

executables = [
Executable('tagmaps/__main__.py', base=base)
Executable('tagmaps/__main__.py', base=base, targetName="tagmaps.exe")
]

setup( name = "tagmaps",
Expand Down
1 change: 0 additions & 1 deletion setup.py
Expand Up @@ -24,7 +24,6 @@
install_requires=[
'shapely',
'emoji',
'tkinter',
'hdbscan'
],
entry_points={
Expand Down
8 changes: 6 additions & 2 deletions tagmaps/__main__.py
Expand Up @@ -113,8 +113,8 @@
cleanedPhotoList = []

def main():
from .classes.utils import Utils
from .config.config import BaseConfig
from tagmaps.classes.utils import Utils
from tagmaps.config.config import BaseConfig
######################
####config section####
######################
Expand Down Expand Up @@ -1621,6 +1621,7 @@ def delete(listbox):
# break
#plt.savefig('foo.png')
#sys.exit()
sys.stdout.flush()
log.info("########## STEP 4 of 6: Generating Alpha Shapes ##########")
#if (tnum % 50 == 0):#modulo: if division has no remainder, force update cmd output
#sys.stdout.flush()
Expand Down Expand Up @@ -1887,6 +1888,9 @@ def delete(listbox):
def set_logger():
""" Set logging handler manually, so we can also print to console while logging to file
"""

if not os.path.exists("02_Output/"):
os.makedirs("02_Output/")
__log_file = "02_Output/log.txt"

# Set Output to Replace in case of encoding issues (console/windows)
Expand Down

0 comments on commit 7f92747

Please sign in to comment.