telescope-term 0.5.4 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e39aeebfaa4fecec0d561cbdc2af5185dc6a0d7290de68a38cc5192c2e90867
-  data.tar.gz: aac05e0a5b7e9f8f134dbb1cd8b3e7c4d69bddecbeeec241c032e7aa53d222a1
+  metadata.gz: 93f099da6e249cc7c3825842b465fe84053055db14341add65b1bcb4e216a215
+  data.tar.gz: 275b32f847c3b89330501325d5da0bf91fb4d2c6568c64828001fed894f34a9e
 SHA512:
-  metadata.gz: fece1d6680316403ff013e5328da25fba67a101648914a65b3d0ae4a3c9275130cab17c476d307850345a8ec09e16888353f9107e0eaa65faf0746a29e190ed2
-  data.tar.gz: 3182803706369be8ab32e191bac1219795983942766f4ce4bcf2a54fc57c793b15c65ec49481620eb13570a750c872fddd34e2ce5981f78b356e7fb345b9b511
+  metadata.gz: d36c2596ec5ac74360a7a73338c022e7c6cc5f2a90a57dc8e688ef6533b94da1c30cfbb5eaaab58b2ce6f279941e314d9ae1a83c73604b227ae5407c62dcfdf9
+  data.tar.gz: 4cecdf3bce9399c0831ea94b16da404ba6eff4125675d1cfc5084cc81e55042aca2d594251828e8251e5b9acf562c0254c260b70d928a4c43a0554551c61d45f

data/bin/telescope

@@ -6,6 +6,7 @@
   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. 
+  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')
@@ -154,7 +158,7 @@ class Curses::Window # CLASS EXTENSION
   end
 end
 def getchr # PROCESS KEY PRESSES
-  c = STDIN.getch
+  c = STDIN.getch(min: 0, time: 0.1)
   case c
   when "\e"    # ANSI escape sequences
     case $stdin.getc
@@ -187,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
@@ -203,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(",")
@@ -222,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
@@ -231,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
@@ -239,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
@@ -247,7 +251,21 @@ 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
       if @tsmark == 0
         @tsmark = false
@@ -264,7 +282,7 @@ def main_getkey # GET KEY FROM USER
     else
       @epmark = @ep.length - 1
     end
-  when 'DOWN'
+  when 'DOWN' # Move to one item down
     if @tsmark
       if @tsmark == @ts.length - 1
         @tsmark = false
@@ -281,7 +299,7 @@ def main_getkey # GET KEY FROM USER
     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
@@ -291,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
@@ -301,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
@@ -321,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
@@ -425,19 +443,19 @@ def w_ts_show
     out  = (d**2/49).to_i.to_s.rjust(6)
     @w_ts.pa(229, 0, 0, out)    # xEYE
     out  = magx(d, f, 1/7.to_f)
-    @w_ts.pa(194, 0, 0, out)    # MINx
+    @w_ts.pa(157, 0, 0, out)    # MINx
     out  = magx(d, f, 2)
-    @w_ts.pa(194, 0, 0, out)    # MAXx
+    @w_ts.pa(157, 0, 0, out)    # MAXx
     out  = magx(d, f, 1/6.4)
-    @w_ts.pa(189, 0, 0, out)    # *FIELD
+    @w_ts.pa(195, 0, 0, out)    # *FIELD
     out  = magx(d, f, 1/3.6)
-    @w_ts.pa(189, 0, 0, out)    # GX/NEB
+    @w_ts.pa(195, 0, 0, out)    # GX/NEB
     out  = magx(d, f, 1/2.1)
-    @w_ts.pa(189, 0, 0, out)    # PL/GCL
+    @w_ts.pa(195, 0, 0, out)    # PL/GCL
     out  = magx(d, f, 1/1.3)
-    @w_ts.pa(189, 0, 0, out)    # PLd/2*
+    @w_ts.pa(195, 0, 0, out)    # PLd/2*
     out  = magx(d, f, 1/0.7)
-    @w_ts.pa(189, 0, 0, out)    # TGHT2*
+    @w_ts.pa(195, 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)
@@ -461,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, "│ ")
@@ -605,7 +623,11 @@ loop do # OUTER LOOP - (catching refreshes via 'r')
       w_cm_show
       main_getkey        # Get key from user 
       break if @break    # Break to outer loop, redrawing windows, if user hit 'r'
-      break if Curses.cols != maxx or Curses.lines != maxy # break on terminal resize 
+      if Curses.cols != maxx or Curses.lines != maxy # break on terminal resize 
+        close_screen
+        puts " You must run Telescope with a minimum tarminal width of 140 chracters."
+        break
+      end
     end
   ensure # On exit: close curses, clear terminal 
     close_screen

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telescope-term
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.2
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -32,8 +32,10 @@ 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.4:
-  Wider name for telescopes/eyepieces.'
+  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'').  New in 1.6.2: Made
+  Telescope more responsive to terminal size changes and to die w/message of minimum
+  140 char width.'
 email: g@isene.com
 executables:
 - telescope