Merge pull request #749 from rzellem/develop

v0.46.3: fix alignment bug in GUI
rzellem · Jun 17, 2021 · c26ca28 · c26ca28
2 parents b297eef + bb6058f
commit c26ca28
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 46 deletions.
diff --git a/exotic/animate.py b/exotic/animate.py
@@ -0,0 +1,42 @@
+import threading
+import time
+import sys
+
+
+done_flag_animate_exotic = None
+th_animate_exotic = None
+
+
+def animate():
+    import itertools
+    for c in itertools.cycle(['|', '/', '-', '\\']):
+        if done_flag_animate_exotic:
+            sys.stdout.write('\rThinking ... DONE!')
+            sys.stdout.write('\n')
+            break
+        sys.stdout.write('\rThinking ' + c + ' ... ')
+        sys.stdout.flush()
+        time.sleep(0.11)
+    sys.stdout.flush()
+
+
+def animate_toggle(enabled=False):
+    """
+    Console feature intended to be run in a single synchronous block.
+    """
+    global done_flag_animate_exotic
+    global th_animate_exotic
+    counter_wait = 0
+    if enabled:
+        done_flag_animate_exotic = False
+        th_animate_exotic = threading.Thread(target=animate, daemon=True)
+        th_animate_exotic.start()
+    else:
+        done_flag_animate_exotic = True
+        if th_animate_exotic is not None:  # kill animate thread before proceeding
+            while th_animate_exotic.is_alive() and counter_wait <= 30:
+                time.sleep(.37)
+                counter_wait += 1
+            th_animate_exotic.join()  # lightest solution
+        th_animate_exotic = None
+    return not done_flag_animate_exotic
diff --git a/exotic/exotic.py b/exotic/exotic.py
@@ -37,47 +37,12 @@
 # ########################################################################### #
 # -- IMPORTS START ------------------------------------------------------------
 # ########## IMPORTS -- PRELOAD ANIMATION START ##########
-done_flag_animate_exotic = None
-th_animate_exotic = None
-
-import threading
-import time
 import sys
 
-
-def animate():
-    import itertools
-    for c in itertools.cycle(['|', '/', '-', '\\']):
-        if done_flag_animate_exotic:
-            sys.stdout.write('\rThinking ... DONE!')
-            sys.stdout.write('\n')
-            break
-        sys.stdout.write('\rThinking ' + c + ' ... ')
-        sys.stdout.flush()
-        time.sleep(0.11)
-    sys.stdout.flush()
-
-
-def animate_toggle(enabled=False):
-    """
-    Console feature intended to be run in a single synchronous block.
-    """
-    global done_flag_animate_exotic
-    global th_animate_exotic
-    counter_wait = 0
-    if enabled:
-        done_flag_animate_exotic = False
-        th_animate_exotic = threading.Thread(target=animate, daemon=True)
-        th_animate_exotic.start()
-    else:
-        done_flag_animate_exotic = True
-        if th_animate_exotic is not None:  # kill animate thread before proceeding
-            while th_animate_exotic.is_alive() and counter_wait <= 30:
-                time.sleep(.37)
-                counter_wait += 1
-            th_animate_exotic.join()  # lightest solution
-        th_animate_exotic = None
-    return not done_flag_animate_exotic
+try:  # animation
+    from animate import *
+except ImportError:
+    from .animate import *
 
 
 if __name__ == "__main__":

diff --git a/exotic/exotic_gui.py b/exotic/exotic_gui.py
@@ -471,7 +471,7 @@ def save_input():
                     else:
                         input_data['platesolve'] = 'n'
 
-                    if platesolve.get():
+                    if alignment.get():
                         input_data['alignment'] = 'y'
                     else:
                         input_data['alignment'] = 'n'

diff --git a/exotic/inputs.py b/exotic/inputs.py
@@ -7,6 +7,10 @@
     from util import user_input, dms_to_dd, open_elevation, typecast_check, init_params
 except ImportError:
     from .util import user_input, dms_to_dd, open_elevation, typecast_check, init_params
+try:
+    from animate import *
+except ImportError:
+    from .animate import *
 
 
 log = logging.getLogger(__name__)
@@ -342,7 +346,9 @@ def elevation(elev, lat, long):
             if not elev:
                 log_info("\nEXOTIC is retrieving elevation based on entered "
                          "latitude and longitude from Open Elevation.")
+                animate_toggle(True)
                 elev = open_elevation(lat, long)
+                animate_toggle()
                 if not elev:
                     log_info("\nEXOTIC could not retrieve elevation.")
                     elev = user_input("Enter the elevation (in meters) of where you observed: ", type_=float)

diff --git a/exotic/version.py b/exotic/version.py
@@ -1 +1 @@
-__version__ = "0.46.2"
+__version__ = "0.46.3"
diff --git a/run_exotic_linux.sh b/run_exotic_linux.sh
@@ -51,7 +51,7 @@ then
     echo -e "ERROR: Incompatible or missing Python runtime. Please install\n" \
             "       Python 3.6 or above. EXITING!"
     echo -e "For more information, see ${py_download}. ...\n"
-    exit 65
+    exit 127
 fi
 # test for pip
 for app in ${pip_commands} ; do
@@ -77,17 +77,17 @@ then
     echo "INFO: Installing 'Pip Installs Packages' (pip) for Python3. ..."
     echo "      DOWNLOADING ..."
     # install pip3
-    if curl &>/dev/null ;
+    if curl --version &>/dev/null ;
     then
         curl -O "${pip_download}"
-    elif wget &>/dev/null ;
+    elif wget --version &>/dev/null ;
     then
         wget "${pip_download}"
     else
         echo -e "ERROR: Unable to download package manager. Please install\n" \
                 "       Pip for Python 3. EXITING!"
         echo -e "For more information, see ${pip_instructions}. ...\n"
-        exit 65
+        exit 127
     fi
     ${py_runner} get-pip.py
     pip_runner="pip3"
@@ -97,7 +97,7 @@ then
         echo -e "ERROR: Incompatible or missing package manager. Please install\n" \
                 "       Pip for Python 3. EXITING!"
         echo -e "For more information, see ${pip_instructions}. ...\n"
-        exit 65
+        exit 127
     fi
 fi
 # exec commands using determinate pip