wavspa 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3619e3dfdcaa48cc41eb51037b91011391cafa4c7e2fe9aa066790bc271d73d7
-  data.tar.gz: 320b9f33e00b3f3b367cd265f04835702585c6a5aa8d2e4a610022930adbf1ac
+  metadata.gz: cd2d32dcf12a061f9555e5cd32be4e6f9623e45622f838614077d03a13f1c625
+  data.tar.gz: '0906de0b8e96773d3e61a73fada4b1675a1925a44b6234d9db144b69524cf931'
 SHA512:
-  metadata.gz: 5b3d0e69c4e5db5dc24d233769728e1bf30da2581ab2affbbf80eda56d495a554212aa84d70b76cffed0351572bf05ac2cb75b333eb3421ee624a01f7378adea
-  data.tar.gz: 747b1bd4ba30bab6543d5add4f4c2a6b3dbb9e6f3a0451d8e23ac1cf6db7256056b6d0a30e733295b95aa5a9b6b20dce41a10782ddbcd22ace64ca68b0fed77d
+  metadata.gz: 7654f8485ac753d0691029422ff367c469c7597577865fda342da8ae923c96587447db33a47332a815b27c5e473bdb8235951ab4ffe1f2f1a7c76f81cd79ed8b
+  data.tar.gz: 5f35c4b6845fc6827314f9f5038a831db73f8a60aeb4519c258cfaefa18fa9c4b6d9f0a6610d6e4a9daa8059c476e1aeb2e8722716c2a53eacdd9f4fd0ff5bb2

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 This application uses OpenMP, but by default tries to link the libgomp. When using another implementation (such as intel OpenMP) with macOS etc, specify the libary path and library name by command line options as follows:
 
-    $ gem insatll wavspa -- --with-openomp ~/env/opts/lib --omp-name omp
+    $ gem insatll wavspa -- --with-openmp ~/env/opts/lib --omp-name omp
 
 ## Usage
 
@@ -36,7 +36,8 @@ options:
     -u, --unit-time=CS
     -W, --output-width=SIZE
     -w, --window-function=FUNCTION
-    -r, --frequency-range=LO,HI,
+    -r, --frequency-range=LO,HI
+    -g, --frequnecy-grid=BASIS,STEP
     -m, --scale-mode=MODE
         --show-params
     -c, --col-steps=SIZE
@@ -67,6 +68,9 @@ options:
   <dt>-r, --frequency-range=LO,HI</dt>
   <dd>specify the frequency band show on the output PNG (upper limit to "HI", and lower limit to "LO").<dd>
 
+  <dt>-g, --frequency-grid=BASIS,STEP</dt>
+  <dd>specify frequency grid settings. basis frequency to "BASIS" and step value to "STEP".  "STEP" is evaluated as a ratio for neighbor grid when the scale mode is LOGSCALE, and as a difference for neighbor grid when LINEARSCALE.</dd>
+
   <dt>-m, --scale=mode</dt>
   <dd>specify the mode of grid scale in vertical direction of th output PNG. you can specify one of "LOGSCALE" or "LINEARSCALE" (default is "LOGSCALE").</dd>
 
@@ -104,6 +108,7 @@ options:
     -r, --frequency-range=LO,HI
         --floor-gain=DB
         --ceil-gain=DB
+    -g, --frequnecy-grid=BASIS,STEP
     -m, --scale-mode=STRING
     -c, --col-steps=SIZE
         --show-params
@@ -140,6 +145,10 @@ options:
   <dt>--ceil-gain=DB</dt>
   <dd>specify the lower limit value of the gain to be displayed. values less than this number will be masked.</dd>
 
+  <dt>-g, --frequency-grid=BASIS,STEP</dt>
+  <dd>specify frequency grid settings. basis frequency to "BASIS" and step value to "STEP".  "STEP" is evaluated as a ratio for neighbor grid when the scale mode is LOGSCALE, and as a difference for neighbor grid when LINEARSCALE.</dd>
+
+
   <dt>-m, --scale=mode</dt>
   <dd>specify the mode of grid scale in vertical direction of th output PNG. you can specify one of "LOGSCALE" or "LINEARSCALE" (default is "LOGSCALE").</dd>
 
@@ -177,9 +186,12 @@ As a sample data, transformed from "Call to Quarters" (https://archive.org/detai
 ```
  wavlet -p cd -F -T -c 2 -v -o Call_To_Quarters-wavelet.png Call_To_Quarters.wav
 ```
-
 ![wavelet result](example/Call_To_Quarters-wavelet.png)
 
+```
+ wavlet -p cd -F -T -c 2 --floor-gain -110 -v -o Call_To_Quarters-wavelet2.png Call_To_Quarters.wav
+```
+![wavelet result](example/Call_To_Quarters-wavelet2.png)
 
 ## Contributing
 

data/bin/wavfft

@@ -76,8 +76,7 @@ OptionParser.new {|opt|
     if FFTApp::PRESET_TABLE.include?(name)
       params = FFTApp::PRESET_TABLE[name]
     else
-      STDERR.print("error: unknown preset name.\n")
-      exit(1)
+      error("unknown preset name.\n")
     end
   }
 
@@ -104,8 +103,7 @@ OptionParser.new {|opt|
     if window_funcs.include?(name)
       params[:window_function] = name
     else
-      STDERR.print("unknown windows function.\n")
-      exit(1)
+      error("unknown windows function.")
     end
   }
 
@@ -113,11 +111,15 @@ OptionParser.new {|opt|
     params[:range] = [val[0].to_f, val[1].to_f]
   }
 
-  opt.on("-m", "--scale-mode=MODE", String) { |val|
+  opt.on("-g", "--frequency-grid=BASIS,STEP", Array) { |val|
+    params[:basis_freq] = val[0].to_f
+    params[:grid_step]  = val[1].to_f
+  }
+
+  opt.on("-m", "--scale-mode=MODE", String) { |name|
     name = name.upcase.to_sym
-    if not ["LINEAR", "LOGSCALE"].include?(name)
-      STDERR.print("error: unknown scale mode.\n")
-      exit(1)
+    if not [:LINEARSCALE, :LOGSCALE].include?(name)
+      error("unknown scale mode.")
     end
 
     params[:scale_mode] = name
@@ -152,9 +154,19 @@ OptionParser.new {|opt|
 
   opt.parse!(ARGV)
 
+  if params[:scale_mode] == :LOGSCALE
+    if params[:basis_freq]&.<=(1.0) || params[:grid_step]&.<=(1.0)
+      error("illeagal frequency grid.")
+    end
+
+  else
+    if params[:basis_freq]&.<=(0.0) || params[:grid_step]&.<=(0.0)
+      error("illeagal frequency grid.")
+    end
+  end
+
   if ARGV.empty?
-    STDERR.print("error: target file not specified.\n")
-    exit(1)
+    error("target file not specified.")
   end
 
   output ||= File.basename(ARGV[0], ".wav") + ".png"

data/bin/wavlet

@@ -105,9 +105,14 @@ OptionParser.new {|opt|
     params[:ceil] = val
   }
 
+  opt.on("-g", "--frequency-grid=BASIS,STEP", Array) { |val|
+    params[:basis_freq] = val[0].to_f
+    params[:grid_step]  = val[1].to_f
+  }
+
   opt.on("-m", "--scale-mode=STRING", String) {|name|
     name = name.upcase.to_sym
-    if not ["LINEAR", "LOGSCALE"].include?(name)
+    if not [:LINEARSCALE, :LOGSCALE].include?(name)
       STDERR.print("error: unknown scale mode.\n")
       exit(1)
     end
@@ -145,6 +150,17 @@ OptionParser.new {|opt|
 
   opt.parse!(ARGV)
 
+  if params[:scale_mode] == :LOGSCALE
+    if params[:basis_freq]&.<=(1.0) || params[:grid_step]&.<=(1.0)
+      error("illeagal frequency grid.")
+    end
+
+  else
+    if params[:basis_freq]&.<=(0.0) || params[:grid_step]&.<=(0.0)
+      error("illeagal frequency grid.")
+    end
+  end
+
   if ARGV.empty?
     STDERR.print("error: target file not specified.\n")
     exit(1)

data/lib/wavspa/common.rb

@@ -15,17 +15,25 @@ module WavSpectrumAnalyzer
       return (scale * @output_width).round
     end
 
+    def up_step(freq)
+      return (@logscale)? (freq * @grid_step): (freq + @grid_step)
+    end
+
+    def down_step(freq)
+      return (@logscale)? (freq / @grid_step): (freq - @grid_step)
+    end
+
     def draw_freq_line(fb)
       #
       # 低周波方向
       #
-      frq = @basis_freq / 2
+      frq = down_step(@basis_freq)
       loop {
         pos  = fpos(frq)
-        break if pos > @output_width
+        break if pos >= @output_width
 
         fb.hline(pos, "#{frq.to_i}Hz")
-        frq /= 2
+        frq = down_step(frq)
       }
      
       #
@@ -37,7 +45,7 @@ module WavSpectrumAnalyzer
         break if pos <= 0 
 
         fb.hline(pos, "#{frq.to_i}Hz")
-        frq *= 2
+        frq = up_step(frq)
       }
     end
 
@@ -70,5 +78,12 @@ module WavSpectrumAnalyzer
         end
       }
     end
+
   end
 end
+
+def error(msg)
+  STDERR.printf("error: %s\n", msg)
+  abort()
+end
+

data/lib/wavspa/version.rb

@@ -1,3 +1,3 @@
 module WavSpectrumAnalyzer
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/lib/wavspa/wavfft/main.rb

@@ -22,19 +22,22 @@ module WavSpectrumAnalyzer
         @unit_time    = param[:unit_time]
         @fft_size     = param[:fft_size]
         @output_width = param[:output_width]
-        @logscale     = (param[:scale_mode] == :LOGSCALE)
         @win_func     = param[:window_function]
+
+        @freq_range   = param[:range]
         @scale_mode   = param[:scale_mode]
+        @logscale     = (param[:scale_mode] == :LOGSCALE)
         @col_step     = param[:col_step]
 
-        @freq_range   = param[:range]
+        @basis_freq   = param[:basis_freq] || 440.0 
+        @grid_step    = param[:grid_step] || ((@logscale)? 2.0: 2000.0)
+
         @lo_freq      = @freq_range[0]
         @hi_freq      = @freq_range[1]
         @freq_width   = (@hi_freq - @lo_freq)
 
         @log_step     = (@hi_freq / @lo_freq) ** (1.0 / @output_width)
         @log_base     = Math.log(@log_step)
-        @basis_freq   = 440.0
       end
       private :load_param
 
@@ -85,9 +88,8 @@ module WavSpectrumAnalyzer
         end
 
         if wav.channel_num >= 2
-          STDERR.print("error: multi chanel data is not supported " \
-                       "(support only monoral data).\n")
-          exit(1)
+          error("error: multi chanel data is not supported " \
+                "(support only monoral data).")
         end
        
         until rows >= nblk

data/lib/wavspa/wavlet/main.rb

@@ -25,18 +25,21 @@ module WavSpectrumAnalyzer
         @floor        = param[:floor]
         @tran_mode    = param[:transform_mode]
         @output_width = param[:output_width]
-        @logscale     = (param[:scale_mode] == :LOGSCALE)
+
+        @freq_range   = param[:range]
         @scale_mode   = param[:scale_mode]
+        @logscale     = (param[:scale_mode] == :LOGSCALE)
         @col_step     = param[:col_step]
 
-        @freq_range   = param[:range]
+        @basis_freq   = param[:basis_freq] || 440.0 
+        @grid_step    = param[:grid_step] || ((@logscale)? 2.0: 2000.0)
+
         @lo_freq      = @freq_range[0]
         @hi_freq      = @freq_range[1]
         @freq_width   = (@hi_freq - @lo_freq)
 
         @log_step     = (@hi_freq / @lo_freq) ** (1.0 / @output_width)
         @log_base     = Math.log(@log_step)
-        @basis_freq   = 440.0
       end
       private :load_param
 
@@ -93,9 +96,8 @@ module WavSpectrumAnalyzer
         end
 
         if wav.channel_num >= 2
-          STDERR.print("error: multi chanel data is not supported " \
-                       "(support only monoral data).\n")
-          exit(1)
+          error("error: multi chanel data is not supported " \
+                "(support only monoral data).")
         end
        
         until rows >= nblk

data/lib/wavspa/wavlet/preset.rb

@@ -17,8 +17,8 @@ module WavSpectrumAnalyzer
         :transform_mode  => :POWER,
         :output_width    => 240,
         :range           => [200.0, 8000.0],
-        :ceil            => -10,
-        :floor           => -90,
+        :ceil            => -10.0,
+        :floor           => -90.0,
         :col_step        => 1,
       },
 
@@ -29,8 +29,8 @@ module WavSpectrumAnalyzer
         :transform_mode  => :POWER,
         :output_width    => 480,
         :range           => [50.0, 22050.0],
-        :ceil            => -10,
-        :floor           => -90,
+        :ceil            => -10.0,
+        :floor           => -90.0,
         :col_step        => 1,
       },
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavspa
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Hirosho Kuwagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ files:
 - bin/wavlet
 - example/Call_To_Quarters-fft.png
 - example/Call_To_Quarters-wavelet.png
+- example/Call_To_Quarters-wavelet2.png
 - ext/wavspa/fb/extconf.rb
 - ext/wavspa/fb/rb_fb.c
 - ext/wavspa/fft/extconf.rb