telescope-term 0.5.1 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a3c05dde8a5ff611a62d0cfd72a5a811915d218b7af6cd977c14297396d8c31
-  data.tar.gz: f89a8414af71225d15d689d0cb1ea57b6669a0b67a43327e5e61e6c79754195d
+  metadata.gz: b4b0126ce3cf3b86c84f8f52e82e76c7e9c8e6d00c91d10d0814f817a6e38e4e
+  data.tar.gz: ae64b594368f3934623f6805baf839d9c24649a6335167013fec173cb41aa781
 SHA512:
-  metadata.gz: 17c083153fd29104fd907d5288247a6b5eb8b92db8eb8bc22692d725b89104c194ddc5aec27b7f515f411c5aec2f2560006151d131a229883d4baf3b0d42ea16
-  data.tar.gz: b268815b853c51df96d2d71fd1a4213cb52d4d14c06062ec212e6f06ebce7b47c77cec3f593c67dd5d3ffcba306914ef74e320c8017b5e9b71508ece97a2d1b2
+  metadata.gz: 1d6ae5826300b3bd8489bbb339a4af342ee3c48815d491fe1134d334548a49bb8c23e377dd5b89dc25c376b448ad5d05e3da93021da63f69ccb5cf032bb043d1
+  data.tar.gz: 11fb99f9393c15ffd4a1872a0b0a6454e0ea22120e353bd9bf4eed901699ef788d8939509a32cdd69962b5083cedd38cf015f4f78ea7371603f88a598625faff

data/bin/telescope

@@ -4,7 +4,7 @@
   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 
@@ -54,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 
@@ -243,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
@@ -333,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?
@@ -374,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
@@ -433,7 +461,7 @@ end
 def w_ep_show
   @w_ep.setpos(0,0)
   scopes   = 5
-  heading  = " ".rjust(32)
+  heading  = " ".rjust(35)
   @w_ep.pa(231, 240, 0, heading)
   @ts.each do |scope| 
     @w_ep.pa(231, 240, Curses::A_BOLD, "│ ")
@@ -442,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.1
+  version: 0.5.5
 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.1:
-  Improved help text.'
+  Easy interface. Run the program, then hit ''?'' to show the help file. New in v0.5.4:
+  Fixed minor glitch.'
 email: g@isene.com
 executables:
 - telescope