Add support for noise0 on web

assets/index.de.html

@@ -102,11 +102,16 @@
 	    </div>
 	  </div>
 	  <div class="option-right">
-	    <label><input type="radio" name="noise" class="radio" value="0">
+	    <label><input type="radio" name="noise" class="radio" value="-1">
 	      <span class="r-text">
 		Keine
 	      </span>
 	    </label>
+	    <label><input type="radio" name="noise" class="radio" value="0" checked>
+	      <span class="r-text">
+		Low
+	      </span>
+	    </label>
 	    <label><input type="radio" name="noise" class="radio" value="1" checked>
 	      <span class="r-text">
 		Mittel

assets/index.es.html

@@ -102,11 +102,16 @@
 	    </div>
 	  </div>
 	  <div class="option-right">
-	    <label><input type="radio" name="noise" class="radio" value="0">
+	    <label><input type="radio" name="noise" class="radio" value="-1">
 	      <span class="r-text">
 		Ninguno
 	      </span>
 	    </label>
+	    <label><input type="radio" name="noise" class="radio" value="0" checked>
+	      <span class="r-text">
+		Low
+	      </span>
+	    </label>
 	    <label><input type="radio" name="noise" class="radio" value="1" checked>
 	      <span class="r-text">
 		Medio

assets/index.fr.html

@@ -102,11 +102,16 @@
 	    </div>
 	  </div>
 	  <div class="option-right">
-	    <label><input type="radio" name="noise" class="radio" value="0">
+	    <label><input type="radio" name="noise" class="radio" value="-1">
 	      <span class="r-text">
 		Aucune
 	      </span>
 	    </label>
+	    <label><input type="radio" name="noise" class="radio" value="0" checked>
+	      <span class="r-text">
+		Low
+	      </span>
+	    </label>
 	    <label><input type="radio" name="noise" class="radio" value="1" checked>
 	      <span class="r-text">
 		Moyenne

assets/index.html

@@ -102,11 +102,16 @@
 	    </div>
 	  </div>
 	  <div class="option-right">
-	    <label><input type="radio" name="noise" class="radio" value="0">
+	    <label><input type="radio" name="noise" class="radio" value="-1">
 	      <span class="r-text">
 		None
 	      </span>
 	    </label>
+	    <label><input type="radio" name="noise" class="radio" value="0" checked>
+	      <span class="r-text">
+		Low
+	      </span>
+	    </label>
 	    <label><input type="radio" name="noise" class="radio" value="1" checked>
 	      <span class="r-text">
 		Medium

assets/index.ja.html

@@ -102,11 +102,16 @@
 	    </div>
 	  </div>
 	  <div class="option-right">
-	    <label><input type="radio" name="noise" class="radio" value="0">
+	    <label><input type="radio" name="noise" class="radio" value="-1">
 	      <span class="r-text">
 		なし
 	      </span>
 	    </label>
+	    <label><input type="radio" name="noise" class="radio" value="0" checked>
+	      <span class="r-text">
+		低
+	      </span>
+	    </label>
 	    <label><input type="radio" name="noise" class="radio" value="1" checked>
 	      <span class="r-text">
 		中

assets/index.pt.html

@@ -102,11 +102,16 @@
 	    </div>
 	  </div>
 	  <div class="option-right">
-	    <label><input type="radio" name="noise" class="radio" value="0">
+	    <label><input type="radio" name="noise" class="radio" value="-1">
 	      <span class="r-text">
 		Nenhuma
 	      </span>
 	    </label>
+	    <label><input type="radio" name="noise" class="radio" value="0" checked>
+	      <span class="r-text">
+		Low
+	      </span>
+	    </label>
 	    <label><input type="radio" name="noise" class="radio" value="1" checked>
 	      <span class="r-text">
 		Média

assets/index.ru.html

@@ -102,11 +102,16 @@
 	    </div>
 	  </div>
 	  <div class="option-right">
-	    <label><input type="radio" name="noise" class="radio" value="0">
+	    <label><input type="radio" name="noise" class="radio" value="-1">
 	      <span class="r-text">
 		Нет
 	      </span>
 	    </label>
+	    <label><input type="radio" name="noise" class="radio" value="0" checked>
+	      <span class="r-text">
+		Low
+	      </span>
+	    </label>
 	    <label><input type="radio" name="noise" class="radio" value="1" checked>
 	      <span class="r-text">
 		Средне

assets/index.tr.html

@@ -102,11 +102,16 @@
 	    </div>
 	  </div>
 	  <div class="option-right">
-	    <label><input type="radio" name="noise" class="radio" value="0">
+	    <label><input type="radio" name="noise" class="radio" value="-1">
 	      <span class="r-text">
 		Yok
 	      </span>
 	    </label>
+	    <label><input type="radio" name="noise" class="radio" value="0" checked>
+	      <span class="r-text">
+		Low
+	      </span>
+	    </label>
 	    <label><input type="radio" name="noise" class="radio" value="1" checked>
 	      <span class="r-text">
 		Orta

assets/index.zh-CN.html

@@ -102,11 +102,16 @@
 	    </div>
 	  </div>
 	  <div class="option-right">
-	    <label><input type="radio" name="noise" class="radio" value="0">
+	    <label><input type="radio" name="noise" class="radio" value="-1">
 	      <span class="r-text">
 		不降噪
 	      </span>
 	    </label>
+	    <label><input type="radio" name="noise" class="radio" value="0" checked>
+	      <span class="r-text">
+		Low
+	      </span>
+	    </label>
 	    <label><input type="radio" name="noise" class="radio" value="1" checked>
 	      <span class="r-text">
 		中

web.lua

@@ -45,18 +45,22 @@ local ART_MODEL_DIR = path.join(ROOT, "models", "upconv_7", "art")
 local PHOTO_MODEL_DIR = path.join(ROOT, "models", "upconv_7", "photo")
 local art_model = {
    scale = w2nn.load_model(path.join(ART_MODEL_DIR, "scale2.0x_model.t7"), opt.force_cudnn),
+   noise0_scale = w2nn.load_model(path.join(ART_MODEL_DIR, "noise0_scale2.0x_model.t7"), opt.force_cudnn),
    noise1_scale = w2nn.load_model(path.join(ART_MODEL_DIR, "noise1_scale2.0x_model.t7"), opt.force_cudnn),
    noise2_scale = w2nn.load_model(path.join(ART_MODEL_DIR, "noise2_scale2.0x_model.t7"), opt.force_cudnn),
    noise3_scale = w2nn.load_model(path.join(ART_MODEL_DIR, "noise3_scale2.0x_model.t7"), opt.force_cudnn),
+   noise0 = w2nn.load_model(path.join(ART_MODEL_DIR, "noise0_model.t7"), opt.force_cudnn),
    noise1 = w2nn.load_model(path.join(ART_MODEL_DIR, "noise1_model.t7"), opt.force_cudnn),
    noise2 = w2nn.load_model(path.join(ART_MODEL_DIR, "noise2_model.t7"), opt.force_cudnn),
    noise3 = w2nn.load_model(path.join(ART_MODEL_DIR, "noise3_model.t7"), opt.force_cudnn)
 }
 local photo_model = {
    scale = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "scale2.0x_model.t7"), opt.force_cudnn),
+   noise0_scale = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "noise0_scale2.0x_model.t7"), opt.force_cudnn),
    noise1_scale = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "noise1_scale2.0x_model.t7"), opt.force_cudnn),
    noise2_scale = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "noise2_scale2.0x_model.t7"), opt.force_cudnn),
    noise3_scale = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "noise3_scale2.0x_model.t7"), opt.force_cudnn),
+   noise0 = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "noise0_model.t7"), opt.force_cudnn),
    noise1 = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "noise1_model.t7"), opt.force_cudnn),
    noise2 = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "noise2_model.t7"), opt.force_cudnn),
    noise3 = w2nn.load_model(path.join(PHOTO_MODEL_DIR, "noise3_model.t7"), opt.force_cudnn)
@@ -189,6 +193,7 @@ local function convert(x, meta, options)
 	 x = alpha_util.make_border(x, alpha_orig, reconstruct.offset_size(model.scale))
       end
       if (options.method == "scale" or
+	     options.method == "noise0_scale" or
 	     options.method == "noise1_scale" or
 	     options.method == "noise2_scale" or
 	     options.method == "noise3_scale")
@@ -204,7 +209,8 @@ local function convert(x, meta, options)
 	    end
 	 end
 	 cleanup_model(model[options.method])
-      elseif (options.method == "noise1" or
+      elseif (options.method == "noise0" or
+		 options.method == "noise1" or
 		 options.method == "noise2" or
 		 options.method == "noise3")
       then
@@ -242,8 +248,8 @@ function APIHandler:post()
       return
    end
    local x, meta, filename = get_image(self)
-   local scale = tonumber(self:get_argument("scale", "0"))
-   local noise = tonumber(self:get_argument("noise", "0"))
+   local scale = tonumber(self:get_argument("scale", "-1"))
+   local noise = tonumber(self:get_argument("noise", "-1"))
    local tta_level = tonumber(self:get_argument("tta_level", "1"))
    local style = self:get_argument("style", "art")
    local download = (self:get_argument("download", "")):len()
@@ -259,14 +265,14 @@ function APIHandler:post()
    end
    if x and valid_size(x, scale, tta_level) then
       local prefix = nil
-      if (noise ~= 0 or scale ~= 0) then
+      if (noise >= 0 or scale > 0) then
 	 local hash = md5.sumhexa(meta.blob)
 	 local alpha_prefix = style .. "_" .. hash .. "_alpha"
 	 local border = false
-	 if scale ~= 0 and meta.alpha then
+	 if scale >= 0 and meta.alpha then
 	    border = true
 	 end
-	 if (scale == 1 or scale == 2) and (noise == 0) then
+	 if (scale == 1 or scale == 2) and (noise < 0) then
 	    prefix = style .. "_scale_tta_"  .. tta_level .. "_"
 	    x, meta = convert(x, meta, {method = "scale",
 					style = style,
@@ -277,7 +283,7 @@ function APIHandler:post()
 	    if scale == 1 then
 	       x = iproc.scale(x, x:size(3) * (1.6 / 2.0), x:size(2) * (1.6 / 2.0), "Sinc")
 	    end
-	 elseif (scale == 1 or scale == 2) and (noise == 1 or noise == 2 or noise == 3) then
+	 elseif (scale == 1 or scale == 2) and (noise == 0 or noise == 1 or noise == 2 or noise == 3) then
 	    prefix = style .. string.format("_noise%d_scale_tta_", noise)  .. tta_level .. "_"
 	    x, meta = convert(x, meta, {method = string.format("noise%d_scale", noise),
 					style = style,
@@ -288,7 +294,7 @@ function APIHandler:post()
 	    if scale == 1 then
 	       x = iproc.scale(x, x:size(3) * (1.6 / 2.0), x:size(2) * (1.6 / 2.0), "Sinc")
 	    end
-	 elseif (noise == 1 or noise == 2 or noise == 3) then
+	 elseif (noise == 0 or noise == 1 or noise == 2 or noise == 3) then
 	    prefix = style .. string.format("_noise%d_tta_", noise) .. tta_level .. "_"
 	    x = convert(x, meta, {method = string.format("noise%d", noise), 
 				  style = style, 

webgen/locales/en.yml

@@ -12,6 +12,7 @@ photo: Photo
 noise_reduction: Noise Reduction
 expect_jpeg: expect JPEG artifact
 nr_none: None
+nr_low: Low
 nr_medium: Medium
 nr_high: High
 nr_highest: Highest

webgen/locales/ja.yml

@@ -12,6 +12,7 @@ photo: 写真
 noise_reduction: ノイズ除去
 expect_jpeg: JPEGノイズを想定
 nr_none: なし
+nr_low: 低
 nr_medium: 中
 nr_high: 高
 nr_highest: 最高

webgen/templates/index.html.erb

@@ -102,11 +102,16 @@
 	    </div>
 	  </div>
 	  <div class="option-right">
-	    <label><input type="radio" name="noise" class="radio" value="0">
+	    <label><input type="radio" name="noise" class="radio" value="-1">
 	      <span class="r-text">
 		<%= t[:nr_none] %>
 	      </span>
 	    </label>
+	    <label><input type="radio" name="noise" class="radio" value="0" checked>
+	      <span class="r-text">
+		<%= t[:nr_low] %>
+	      </span>
+	    </label>
 	    <label><input type="radio" name="noise" class="radio" value="1" checked>
 	      <span class="r-text">
 		<%= t[:nr_medium] %>
@@ -135,7 +140,7 @@
 	    <div class="option-left-small"></div>
 	  </div>
 	  <div class="option-right">
-	    <label><input type="radio" name="scale" class="radio" value="0" checked>
+	    <label><input type="radio" name="scale" class="radio" value="-1" checked>
 	      <span class="r-text">
 		<%= t[:up_none] %>
 	      </span>