Skip to content

Commit

Permalink
Rewrote map widget:
Browse files Browse the repository at this point in the history
-) Improved zoom controls
-) Interactive markers:
  -) Added Contextmenu
  -) Added ToolTips
  -) Added RPC support (Fast Travel, Set/Remove Custom Marker)
  -) Added local map widget
-) Added player condition widget (showing limb damage)
-) Several small bugfixes and improvements
  • Loading branch information
matzman666 committed Dec 5, 2015
1 parent 457483c commit 05802dc
Show file tree
Hide file tree
Showing 24 changed files with 1,986 additions and 953 deletions.
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__pycache__
/.project
/.pydevproject
/.settings/
/widgets/map/res/*.svg
/widgets/map/res/*.png
/widgets/playerinfo/res/*.svg
/widgets/playerinfo/res/*.png
3 changes: 2 additions & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ Currently implemented features are:
- Data Browser
- Data Update Logger
- Player Info
- Player Condition (showing limb damage)
- Date/Time
- Map (Heavy WIP)
- Map (Global and Local)

# Screenshots

Expand Down
9 changes: 6 additions & 3 deletions pypipboyapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import os
import sys
import importlib
import traceback
import logging.config
from PyQt5 import QtWidgets, QtCore, uic
from pypipboy.network import NetworkChannel
Expand Down Expand Up @@ -262,8 +263,9 @@ def _slotConnectToHostFinished(self, status, msg):
self._connectHostMessageBox.hide()
self._connectHostMessageBox = None
# delete thread
self._connectHostThread.wait()
self._connectHostThread = None
if self._connectHostThread:
self._connectHostThread.wait()
self._connectHostThread = None
# Handle errors
if status:
pass
Expand Down Expand Up @@ -337,7 +339,7 @@ def _loadWidgets(self):
self.modulehandles = dict()
for dir in os.listdir(self.PROGRAM_WIDGETS_DIR):
dirpath = os.path.join(self.PROGRAM_WIDGETS_DIR, dir)
if not dir.startswith('__') and os.path.isdir(dirpath):
if dir != 'shared' and not dir.startswith('__') and os.path.isdir(dirpath):
self._logger.debug('Tyring to load widget dir "' + dir + '"')
module = None
try:
Expand Down Expand Up @@ -368,6 +370,7 @@ def _loadWidgets(self):
self._logger.warning('Could not load widget dir "' + dir + '": No Info')
except Exception as e:
self._logger.warning('Could not load widget dir "' + dir + '": ' + str(e))
traceback.print_exc(file=sys.stdout)

# load widgets
def _initWidgets(self):
Expand Down
Binary file modified screenshots/screen02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 0 additions & 13 deletions widgets/extmap/info.py

This file was deleted.

Loading

0 comments on commit 05802dc

Please sign in to comment.