telescope-term 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ec5fe7e67a8718b893359293e5effc26ab0231dbb1140f9e7a3bcd27daaf595
-  data.tar.gz: 2843d0b8045b3a9792c8da5da2fcec973bf52a5157dd704ef7d42ac87ac2d057
+  metadata.gz: a1f96d4afdd39035d8aff14031e43034607bd6772e71b57b46a6aca7280e372d
+  data.tar.gz: 99560838dfcc2488495387672c46976a2a9131d9196aceaea2a4307b219dd01a
 SHA512:
-  metadata.gz: d0b2674b2f1a89074cf8a07da2bf519bf9c3bec13b75b1162331b174dbf55386e4224d8167707a9d6febcebb61da7dd75e13eeeeda6eafc30b367d45619c20bd
-  data.tar.gz: 5cc9d3afc791fa9faa5e8c8aa27471404422dff3d5657ec99c1f030077ff49e184d08b075768caa6b1ca555bf520e3ee824a6b5233d006ef2841f5b9da81c8fd
+  metadata.gz: ab7ea6182535bdfd32f7ef8394630e1c3f17e73716d7ad175c19a7b05a75ea54f9cee7a45a9c69786d1f60d6a2acb55a16b18d97f660601bc2208762b0517286
+  data.tar.gz: 83587a7ec14ecf772f49542f2fb491ca3f86e87d1c86c1e5065ef4ed502816f0e09a0ac517778048ecff9e76d37a6ddc748c70fbbc215593445171c7521add29

data/bin/telescope

@@ -4,8 +4,9 @@
   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. 
+  Sort telescopes with 'T' (toggles sorting by the first thre columns; Name, APP, FL). Sort eyepieces in the same way with the 'E' key.
   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.
@@ -45,8 +46,11 @@ begin # BASIC SETUP
   @tsmark = false
   @epmark = false
 
-  @tstag = []
-  @eptag = []
+  @tstag  = []
+  @eptag  = []
+
+  @t_sort = false
+  @e_sort = false
 end
 if File.exist?(Dir.home+'/.telescope')
   load(Dir.home+'/.telescope')
@@ -54,6 +58,9 @@ end
 class Numeric # NUMERIC CLASS EXTENSION
 	def deg
 	  self * Math::PI / 180 
+  end
+	def rad
+	  self * 180 / Math::PI 
   end
   def dec2
     "%.2f" % self
@@ -184,12 +191,12 @@ end
 def main_getkey # GET KEY FROM USER
   chr = getchr
   case chr
-  when '?' # Show helptext in right window 
+  when '?' # Show helptext in lower panel 
     @w_ep.clr
     @w_ep.pa(249, 0, 0, @help)
     @w_ep.p("\n  ...Press any key to continue")
     getch
-  when 'TAB'
+  when 'TAB' # Move between the panels
     if @tsmark
       @tsmark = false
       @epmark = 0
@@ -200,10 +207,10 @@ def main_getkey # GET KEY FROM USER
       @tsmark = 0
       @epmark = false
     end
-  when 'C-G'
+  when 'C-G' # Escape from panel selections or command line
     @epmark = false
     @tsmark = false
-  when 'ENTER'
+  when 'ENTER' # Edit selected item in the command line (or refresh panels)
     if @tsmark
       out  = "#{@ts[@tsmark][0]}, #{@ts[@tsmark][1]}, #{@ts[@tsmark][2]}"
       ret = w_cm_getstr("", out).split(",")
@@ -219,7 +226,7 @@ def main_getkey # GET KEY FROM USER
       ret[2] = ret[2].to_i
       @ep[@epmark] = ret
     end
-  when 't'
+  when 't' # Add a telescope
     return if @ts.length == 5
     ret = w_cm_getstr("", "Telescope, App, FL").split(",")
     return if ret.length != 3
@@ -228,7 +235,7 @@ def main_getkey # GET KEY FROM USER
     ret[1] = 1 if ret[1] == 0
     ret[2] = 1 if ret[2] == 0
     @ts[@ts.length] = ret
-  when 'e'
+  when 'e' # Add an eyepiece
     ret = w_cm_getstr("", "Eyepiece, FL, AFOV").split(",")
     return if ret.length != 3
     ret[1] = ret[1].to_f
@@ -236,7 +243,7 @@ def main_getkey # GET KEY FROM USER
     ret[1] = 1 if ret[1] == 0
     ret[2] = 1 if ret[2] == 0
     @ep[@ep.length] = ret
-  when 'D'
+  when 'D' # Delete selected item (telescope or eyepiece)
     if @tsmark
       @ts.delete_at(@tsmark)
       @tsmark -= 1
@@ -244,19 +251,55 @@ def main_getkey # GET KEY FROM USER
       @ep.delete_at(@epmark)
       @epmark -= 1
     end
-  when 'UP' # Examples of moving up and down in a window
+  when 'T' # Sort telescopes by next column (Name, APP, FL)
+    if @t_sort == false or @t_sort == 2
+      @t_sort = 0
+    else
+      @t_sort += 1
+    end
+    @ts = @ts.sort {|a,b| b[@t_sort] <=> a[@t_sort]}
+  when 'E' # Sort eyepiece by next column (Name, FL, AFOV)
+    if @e_sort == false or @e_sort == 2
+      @e_sort = 0
+    else
+      @e_sort += 1
+    end
+    @ep = @ep.sort {|a,b| b[@e_sort] <=> a[@e_sort]}
+  when 'UP' # Move to one item up
     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'
+  when 'DOWN' # Move to one item 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'
+  when 'PgUP' # Move selected item up by one
     if @tsmark
       t = @ts.delete_at(@tsmark)
       @tsmark -= 1 unless @tsmark == 0
@@ -266,7 +309,7 @@ def main_getkey # GET KEY FROM USER
       @epmark -= 1 unless @epmark == 0
       @ep.insert(@epmark, e)
     end
-  when 'PgDOWN'
+  when 'PgDOWN' # Move selected item by one down
     if @tsmark
       t = @ts.delete_at(@tsmark)
       @tsmark += 1 unless @tsmark == @ts.length
@@ -276,19 +319,19 @@ def main_getkey # GET KEY FROM USER
       @epmark += 1 unless @epmark == @ep.length
       @ep.insert(@epmark, e)
     end
-  when 'HOME'
+  when 'HOME' # Jump to first item in the panel
     if @tsmark
       @tsmark = 0
     elsif @epmark
       @epmark = 0
     end
-  when 'END'
+  when 'END' # Move to last item in the panel
     if @tsmark
       @tsmark = @ts.length - 1
     elsif @epmark
       @epmark = @ep.length - 1
     end
-  when ' '
+  when ' ' # Tag selected item to be used in observation file/log
     if @tsmark
       @tstag.include?(@tsmark) ? @tstag.delete(@tsmark) : @tstag.push(@tsmark)
       @tsmark += 1 unless @tsmark == @ts.length - 1
@@ -296,23 +339,23 @@ def main_getkey # GET KEY FROM USER
       @eptag.include?(@epmark) ? @eptag.delete(@epmark) : @eptag.push(@epmark)
       @epmark += 1 unless @epmark == @ep.length - 1
     end
-  when 'u'
+  when 'u' # Untag all tagget items
     @tstag.clear
     @eptag.clear
-  when 'o'
+  when 'o' # Create observation file/log and show content in lower panel
     observe
-  when 'b'
+  when 'b' # Create backup file (~/.telescope.bu) with current items
     File.write(Dir.home+'/.telescope.bu',"@ts = #{@ts}\n@ep = #{@ep}")
-  when 'B'
+  when 'B' # Read items from backup file
     if File.exist?(Dir.home+'/.telescope.bu')
       load(Dir.home+'/.telescope.bu')
     end
-  when 'r'
+  when 'r' # Hard refres panels
     @break = true
-  when 'q' # Exit 
+  when 'q' # Exit after saving items to ~/.telescope
     File.write(Dir.home+'/.telescope',"@ts = #{@ts}\n@ep = #{@ep}")
     exit 0
-  when 'Q' # Exit 
+  when 'Q' # Exit without saving items
     exit 0
   else
   end
@@ -336,7 +379,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?
@@ -377,16 +420,16 @@ 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
@@ -415,9 +458,9 @@ def w_ts_show
     @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)*180/Math::PI).truncate(2).dec2.to_s.rjust(8)
+    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((Math::PI/180*115.824/d)/3600))
+    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)    # MOON
     out  = (moon/2.5668).to_i.to_s.rjust(5) + "km"
@@ -436,7 +479,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, "│ ")
@@ -445,17 +488,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.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-11 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.2:
-  Minor fixes.'
+  Easy interface. Run the program, then hit ''?'' to show the help file. New in v0.6.0:
+  Added sorting of telescopes (via ''T'') and eyepieces (''E'').'
 email: g@isene.com
 executables:
 - telescope