telescope-term 0.4 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ea6b3e73010cffa6a0324e98ab9ef000ddf7c28f175f35d4596d0918d4c5bb5
-  data.tar.gz: 0e8673add4c94a37ea777955c332cc78d2a5abf12f417910b827fbebd55f59b3
+  metadata.gz: 6bccc053edff15e7f32e22c80a0cff25b3ffbc88155743eae29b4cfc1b0a6591
+  data.tar.gz: 6b94e933c3bf9b2f263940b5bded516e155972fea4b7cfe492dc9d59ca5b8899
 SHA512:
-  metadata.gz: 07ba9d284c86a7780af29ce2af1b12e6c8fa3e43ffc48b4e3743a72d235da4aefd83e1d2260f6a2a0e41aeb0d337a5224149026809571eb3d655a403e2b80530
-  data.tar.gz: d82e0a4e639b6052b6d2b7aea24146d93964f6f4e889f3c19c3cfa131e1c8a60c4a1f350362007f637bb7e4ad210cfe2cfccc4994c71d8837a8e8f9ec33519b6
+  metadata.gz: bad1524541bd4b94f2c8ea827860239ba74c3bb76fc0b0405828dde8c5c833f612b3cf403f86f8123eb2c4228e34922f00e057b58f9da7a73ef0ce57d542a934
+  data.tar.gz: 9c58155c752fc6b0bd24b6791be425d0b5c53b08ca7d0c5e01d9f94392ea3dfe751d48a015ab45740df4179468b0f6623f2ad3fcccd7af575bed79c779b1e0d8

data/bin/telescope

@@ -1,38 +1,27 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 @help = <<HELPTEXT
-  Welcome to Telescope - a terminal/console program for the amateur astronomer.
-  The top panel lists your telescopes. To add a telescope, press 't' and in the "command line"
-  at the bottom enter a name, the apperature (APP) and the focal length (FL) and press ENTER. 
-  The lower panel lists your eyepieces with properties for each telescope. To add an eyepiece, press 'e'. 
-  Enter a name, the focal length (FL) and apparent field of view (AFOV) and press ENTER.
-  Select the telescope and eyepiece panel by pressing TAB, and use the UP, DOWN, HOME and END cursor keys. 
-  Press ENTER on a selected item to change the values in the command line. Delete an item by pressing 'D'.
-  Move an item up or down in a panel by pressing the PgUP or PgDown keys. 
-  Tag items for use in an observation using the SPACE key (untag all with 'u'). Press 'o' to create an observation
-  log file with the tagged equipment. The content of the file is then shown in the lower panel.
-  Refresh all panels with the 'r' key. Escape the selected panels or the command line by pressing 'Ctrl-G'. 
-  Quit via 'q' (or 'Q' if you don't want to save your edits since last session). 
-  Save a backup session with 'b' and load a previously saved backup session with the 'B' key.
-  Telescope and eyepiece data is saved in the file '.telescope' in your home directory.
+  WELCOME TO TELESCOPE - A TERMINAL/CONSOLE PROGRAM FOR THE AMATEUR ASTRONOMER.
+  The top panel lists your telescopes with eyepieces in the lower panel. Add a telescope by pressing 't' and fill in the name, the 
+  apperature (APP) and the focal length (FL) in the "command line" at the bottom and press ENTER. Add an eyepiece with 'e' and enter
+  a name, the focal length (FL) and apparent field of view (AFOV) and press ENTER. Select items by using the TAB/UP/DOWN cursor keys.
+  Press ENTER on a selected item to change the values in the command line. Delete an item by pressing 'D'. Move an with PgUP/PgDown keys. 
+  Tag items with the SPACE key (untag all with 'u'), then press 'o' to create an observation log file (content shown in the lower panel).
+  Refresh all panels with the 'r' key. Escape the selected panels or the command line by pressing 'Ctrl-G'. Quit via 'q' (or 'Q' if you 
+  don't want to save your edits since last session). Save a backup session with 'b' and load a saved backup session with the 'B' key.
+  Telescope and eyepiece data is saved in the file '.telescope' in your home directory (backup file is '.telescope.bu').
 
-  LIST OF TELESCOPE ABBREVIATIONS:                                           LIST OF EYEPIECE ABBREVIATIONS:
-  APP    = Apperature (in millimeters)                                       FL    = Focal Length (in millimeters)
-  FL     = Focal Length (in millimeters)                                     AFOV  = Apparent Field Of View
-  F/?    = Focal ratio (FL/APP)                                              xMAGN = Magnification (with that telescope)
-  <MAG   = Maximum magnitude visible                                         FOV   = True Field Of View (deg/min/sec)
-  xEYE   = Light gathering compared to the human eye                         XPUP  = Exit pupil (in millimeters)
-  MINx   = Minimum usable magnification (may be lower for refractors)
-  MAXx   = Maximum usable magnification
-  *FIELD = Recommended magnification for star fields
-  GX/NEB = Recommended magnification for galaxies and nebulae
-  PL/GCL = Recommended magnification for planets and globular clusters
-  PLd/2* = Recommended magnification for planet details and double stars
-  TGHT2* = Recommended magnification for tight double stars
-  DL-SEP = Minimum separation, Dawes limit
-  RC-SEP = Minimum separation, Rayleigh limit
-  MOON   = Minimum feature resolved on the Moon (in meters)
-  SUN    = Minimum feature resolved on the Sun (in kilometers)
+  LIST OF TELESCOPE ABBREVIATIONS:                                                           LIST OF EYEPIECE ABBREVIATIONS:
+  APP, FL, F/? = Apperature and Focal Length (millimeters) and F-ratio                       FL     = Focal Length (in millimeters)
+  <MAG         = Maximum magnitude visible                                                   AFOV   = Apparent Field Of View
+  xEYE         = Light gathering compared to the human eye                                   xMAGN  = Magnification (with that telescope)
+  MINx, MAXx   = Minimum and maximum usable magnification                                    FOV    = True Field Of View (deg/min/sec)
+                                                                                             XPUP   = Exit pupil (in millimeters)
+  Recommended magnifications for objects:
+        *FIELD = star fields, GX/NEB = galaxies/nebulae, PL/GCL = planets/globular clusters 
+        PLd/2* = planet details/double stars, TGHT2* = tight double stars
+  DL/RC-SEP    = Minimum separation, Dawes limit and Rayleigh limit
+  MOON, SUN    = Minimum feature resolved on the Moon (meters) & Sun (kilometers)
 HELPTEXT
 begin # BASIC SETUP
   if `tput cols`.to_i < 140
@@ -65,6 +54,12 @@ end
 class Numeric # NUMERIC CLASS EXTENSION
 	def deg
 	  self * Math::PI / 180 
+  end
+	def rad
+	  self * 180 / Math::PI 
+  end
+  def dec2
+    "%.2f" % self
   end
 end
 class Curses::Window # CLASS EXTENSION 
@@ -254,15 +249,37 @@ def main_getkey # GET KEY FROM USER
     end
   when 'UP' # Examples of moving up and down in a window
     if @tsmark
-      @tsmark -= 1 unless @tsmark == 0
+      if @tsmark == 0
+        @tsmark = false
+      else
+        @tsmark -= 1
+      end
     elsif @epmark
-      @epmark -= 1 unless @epmark == 0
+      if @epmark == 0
+        @epmark = false
+        @tsmark = @ts.length - 1
+      else
+        @epmark -= 1
+      end
+    else
+      @epmark = @ep.length - 1
     end
   when 'DOWN'
     if @tsmark
-      @tsmark += 1 unless @tsmark == @ts.length - 1
+      if @tsmark == @ts.length - 1
+        @tsmark = false
+        @epmark = 0
+      else
+        @tsmark += 1
+      end
     elsif @epmark
-      @epmark += 1 unless @epmark == @ep.length - 1
+      if @epmark == @ep.length - 1
+        @epmark = false
+      else
+        @epmark += 1
+      end
+    else
+      @tsmark = 0
     end
   when 'PgUP'
     if @tsmark
@@ -344,7 +361,7 @@ def observe
     mag  = (5 * Math::log(d/10, 10) + 7.5).truncate(1).to_s
     obs += "  Max MAG: " + mag
     sepd = (115.824/d).truncate(2).to_s
-    sepr = (3600*Math::asin(671E-6/d)*180/Math::PI).truncate(2).to_s
+    sepr = (3600*Math::asin(671E-6/d).rad).truncate(2).to_s
     obs += "  Min SEP: " + sepd + "/" + sepr + "\n"
   end
   obs += "No telescope(s) chosen for the observation\n" if @tstag.empty?
@@ -391,7 +408,7 @@ def w_ts_show
   @w_ts.fg = 15
   @w_ts.bg =  0
   @ts.each_with_index do |scope, i|
-    name = scope[0]
+    name = scope[0][0...15]
     d    = scope[1]
     f    = scope[2]
     out  = " " + name.ljust(15)
@@ -400,36 +417,36 @@ def w_ts_show
     attr = Curses::A_BOLD
     attr = attr | Curses::A_REVERSE if @tsmark == i
     attr = attr | Curses::A_UNDERLINE if @tstag.include?(i)
-    @w_ts.pa(254, 0, attr, out)
+    @w_ts.pa(254, 0, attr, out) # Basic info (Name, APP, FL)
     out  = (f.to_f/d.to_f).truncate(1).to_s.rjust(6)
-    @w_ts.pa(254, 0, 0, out)
+    @w_ts.pa(254, 0, 0, out)    # F/?
     out  = (5 * Math::log(d/10, 10) + 7.5).truncate(1).to_s.rjust(6)
-    @w_ts.pa(229, 0, 0, out)
+    @w_ts.pa(229, 0, 0, out)    # <MAG
     out  = (d**2/49).to_i.to_s.rjust(6)
-    @w_ts.pa(229, 0, 0, out)
+    @w_ts.pa(229, 0, 0, out)    # xEYE
     out  = magx(d, f, 1/7.to_f)
-    @w_ts.pa(194, 0, 0, out)
+    @w_ts.pa(194, 0, 0, out)    # MINx
     out  = magx(d, f, 2)
-    @w_ts.pa(194, 0, 0, out)
+    @w_ts.pa(194, 0, 0, out)    # MAXx
     out  = magx(d, f, 1/6.4)
-    @w_ts.pa(189, 0, 0, out)
+    @w_ts.pa(189, 0, 0, out)    # *FIELD
     out  = magx(d, f, 1/3.6)
-    @w_ts.pa(189, 0, 0, out)
+    @w_ts.pa(189, 0, 0, out)    # GX/NEB
     out  = magx(d, f, 1/2.1)
-    @w_ts.pa(189, 0, 0, out)
+    @w_ts.pa(189, 0, 0, out)    # PL/GCL
     out  = magx(d, f, 1/1.3)
-    @w_ts.pa(189, 0, 0, out)
+    @w_ts.pa(189, 0, 0, out)    # PLd/2*
     out  = magx(d, f, 1/0.7)
-    @w_ts.pa(189, 0, 0, out)
-    out  = (115.824/d).truncate(2).to_s.rjust(7)
-    @w_ts.pa(219, 0, 0, out)
-    out  = (3600*Math::asin(671E-6/d)*180/Math::PI).truncate(2).to_s.rjust(8)
-    @w_ts.pa(219, 0, 0, out)
-    moon = (384E6*Math::tan((Math::PI/180*115.824/d)/3600))
+    @w_ts.pa(189, 0, 0, out)    # TGHT2*
+    out  = (115.824/d).truncate(2).dec2.to_s.rjust(7)
+    @w_ts.pa(219, 0, 0, out)    # DL-SEP
+    out  = (3600*Math::asin(671E-6/d).rad).truncate(2).dec2.to_s.rjust(8)
+    @w_ts.pa(219, 0, 0, out)    # RC-SEP
+    moon = (384E6*Math::tan((115.824.deg/d)/3600))
     out  = moon.to_i.to_s.rjust(6) + "m"
-    @w_ts.pa(225, 0, 0, out)
+    @w_ts.pa(225, 0, 0, out)    # MOON
     out  = (moon/2.5668).to_i.to_s.rjust(5) + "km"
-    @w_ts.pa(225, 0, 0, out)
+    @w_ts.pa(225, 0, 0, out)    # SUN
     @w_ts.p("\n")
   end
   @w_ts.clr_from_cur_line
@@ -460,7 +477,7 @@ def w_ep_show
   @w_ep.fg = 15
   @w_ep.bg =  0
   @ep.each_with_index do |ep, i|
-    name = ep[0]
+    name = ep[0][0...15]
     m    = ep[1].truncate(1)
     a    = ep[2]
     out  = " " + name.ljust(15)
@@ -498,7 +515,7 @@ end
 # COMMAND FUNCTIONS   (bottom window, w_cm) 
 def w_cm_show
   @w_cm.fill
-  @w_cm.p(" Telescope v0.2 - By Geir Isene (https://isene.com)")
+  @w_cm.p(" Telescope v0.2 - By Geir Isene (https://isene.com) - press '?' to display the help text")
 end
 def w_cm_getstr(pretext, text) # A SIMPLE READLINE-LIKE ROUTINE
   Curses.curs_set(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telescope-term
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.5.3
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -32,8 +32,8 @@ dependencies:
         version: 1.3.2
 description: 'With this program you can list your telescopes and eyepieces and get
   a set of calculations done for each scope and for the combination of scope and eyepiece.
-  Easy interface. Run the program, then hit ''?'' to show the help file. New in v0.4:
-  Added observation log capabilities.'
+  Easy interface. Run the program, then hit ''?'' to show the help file. New in v0.5.3:
+  Improved navigation.'
 email: g@isene.com
 executables:
 - telescope