telescope-term 0.5 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b0de1183d0d4197c99af85b31b0219c172ae66f0deb6b26a84e68f25e3a69af
-  data.tar.gz: c58af4a71983444111c6583fc6b7de99afe6518adb45b94ff8dd46f7dfc3e3be
+  metadata.gz: 1e39aeebfaa4fecec0d561cbdc2af5185dc6a0d7290de68a38cc5192c2e90867
+  data.tar.gz: aac05e0a5b7e9f8f134dbb1cd8b3e7c4d69bddecbeeec241c032e7aa53d222a1
 SHA512:
-  metadata.gz: 2f50f189e964d58bed2ff5e6a21c53f89ffe0ac9b9f2828869df9cab94fb006b1fc5cf03f582c1faf91b8c492a37ea3985204e01ebe3c7e100e4662d953de85e
-  data.tar.gz: 2292e4a4e17027e01a5988945b6d8937a5c358340fee014167e60debb6b12662ac18d5bddc31edbc0af9db831aa117613f48ab2fb1d20920c6833796cb9dd606
+  metadata.gz: fece1d6680316403ff013e5328da25fba67a101648914a65b3d0ae4a3c9275130cab17c476d307850345a8ec09e16888353f9107e0eaa65faf0746a29e190ed2
+  data.tar.gz: 3182803706369be8ab32e191bac1219795983942766f4ce4bcf2a54fc57c793b15c65ec49481620eb13570a750c872fddd34e2ce5981f78b356e7fb345b9b511

data/bin/telescope

@@ -4,30 +4,24 @@
   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 pressing TAB, then UP/DOWN cursor keys.
+  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
@@ -60,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 
@@ -249,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
@@ -339,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?
@@ -380,51 +402,51 @@ end
 # TELESCOPE FUNCTIONS (top window,    w_ts) 
 def w_ts_show
   @w_ts.setpos(0,0)
-  heading = " TELESCOPES       APP(mm)  FL(mm)  F/?  <MAG  xEYE   MINx    MAXx   *FIELD  GX/NEB  PL/GCL  PLd/2*  TGHT2*  DL-SEP  RC-SEP  MOON   SUN"
+  heading = " TELESCOPES          APP(mm)  FL(mm)  F/?  <MAG  xEYE   MINx    MAXx   *FIELD  GX/NEB  PL/GCL  PLd/2*  TGHT2*  DL-SEP  RC-SEP  MOON   SUN"
   heading += " " * (@w_ts.maxx - heading.length).abs
   @w_ts.pa(255, 94, Curses::A_BOLD, heading)
   @w_ts.fg = 15
   @w_ts.bg =  0
   @ts.each_with_index do |scope, i|
-    name = scope[0]
+    name = scope[0][0...18]
     d    = scope[1]
     f    = scope[2]
-    out  = " " + name.ljust(15)
+    out  = " " + name.ljust(18)
     out += d.to_s.rjust(8)
     out += f.to_s.rjust(8)
     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
@@ -448,17 +470,17 @@ def w_ep_show
   end
   heading = " " * (@w_ep.maxx - @w_ep.curx)
   @w_ep.p(heading)
-  heading = " EYEPIECES         FL(mm)  AFOV "
+  heading = " EYEPIECES            FL(mm)  AFOV "
   heading += "│ xMAGN  FOV(dms)  XPUP " * @ts.length
   heading += " " * (@w_ep.maxx - heading.length).abs
   @w_ep.pa(231, 240, Curses::A_BOLD, heading)
   @w_ep.fg = 15
   @w_ep.bg =  0
   @ep.each_with_index do |ep, i|
-    name = ep[0]
+    name = ep[0][0...18]
     m    = ep[1].truncate(1)
     a    = ep[2]
-    out  = " " + name.ljust(15)
+    out  = " " + name.ljust(18)
     out += m.to_s.rjust(8)
     out += a.to_s.rjust(6) + "°"
     attr = Curses::A_BOLD

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telescope-term
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.4
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-11-12 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.5:
-  Improved help text.'
+  Easy interface. Run the program, then hit ''?'' to show the help file. New in v0.5.4:
+  Wider name for telescopes/eyepieces.'
 email: g@isene.com
 executables:
 - telescope