From 8bc01714025b1f76f42fb2b6a84abf2101a82641 Mon Sep 17 00:00:00 2001
From: sbs20 <sam.strachan@gmail.com>
Date: Mon, 23 Sep 2019 14:36:09 +0100
Subject: [PATCH] Dynamic Lineart

---
 classes/Api.js         |  6 ++++--
 classes/Device.js      |  4 +---
 classes/ScanRequest.js |  6 +-----
 classes/Scanimage.js   |  6 ++----
 index.html             | 17 +++++++----------
 src/client.js          | 43 ++++++++++++++----------------------------
 6 files changed, 29 insertions(+), 53 deletions(-)

diff --git a/classes/Api.js b/classes/Api.js
index 0a6cbccb..8484a9b4 100755
--- a/classes/Api.js
+++ b/classes/Api.js
@@ -50,7 +50,9 @@ module.exports = function () {
         return convert.execute()
             .then(function () {
                 var fileInfo = new FileInfo(options.target);
-                if (!fileInfo.exists()) throw new Error("File does not exist");
+                if (!fileInfo.exists()) {
+                    throw new Error("File does not exist");
+                }
                 return fileInfo;
             });
     };
@@ -67,7 +69,7 @@ module.exports = function () {
             mode: req.mode,
             brightness: req.brightness,
             contrast: req.contrast,
-            disableDynamicLineart: req.disableDynamicLineart,
+            dynamicLineart: req.dynamicLineart,
             outputFilepath: Config.PreviewDirectory + 'preview.tif',
             resolution: Config.PreviewResolution
         });
diff --git a/classes/Device.js b/classes/Device.js
index 5f68090c..ba9b92eb 100644
--- a/classes/Device.js
+++ b/classes/Device.js
@@ -86,9 +86,7 @@ module.exports = function () {
     };
 
     _this.isFeatureSupported = function (feature) {
-        if (_this.data && 
-            _this.data.features &&
-            feature in _this.data.features) {
+        if (_this.data && _this.data.features && feature in _this.data.features) {
             return _this.data.features[feature].default !== 'inactive';
         }
 
diff --git a/classes/ScanRequest.js b/classes/ScanRequest.js
index a3fa8abe..420cb92a 100644
--- a/classes/ScanRequest.js
+++ b/classes/ScanRequest.js
@@ -55,10 +55,6 @@ var ScanRequest = function (def) {
 			errors.push('Invalid format type');
 		}
 
-		if (_this.disableDynamicLineart && !device.isFeatureSupported('--disable-dynamic-lineart')) {
-			errors.push('disableDynamicLineart set to true, but unsupported by device');
-		}
-
 		return errors;
 	};
 };
@@ -75,7 +71,7 @@ ScanRequest.default = {
 	brightness: 0,
 	contrast: 0,
 	convertFormat: 'tif',
-	disableDynamicLineart: false
+	dynamicLineart: true
 };
 
 module.exports = ScanRequest;
\ No newline at end of file
diff --git a/classes/Scanimage.js b/classes/Scanimage.js
index 557fc9f6..834cb783 100755
--- a/classes/Scanimage.js
+++ b/classes/Scanimage.js
@@ -36,7 +36,8 @@ module.exports = function () {
 			cmd += ' --contrast ' + scanRequest.contrast;
 		}
 
-		if (scanRequest.mode === 'Lineart' && scanRequest.disableDynamicLineart) {
+		if (scanRequest.mode === 'Lineart' && !scanRequest.dynamicLineart &&
+				device.isFeatureSupported('--disable-dynamic-lineart')) {
 			cmd += ' --disable-dynamic-lineart=yes ';
 		}
 
@@ -50,7 +51,6 @@ module.exports = function () {
 	};
 
 	_this.execute = function (scanRequest) {
-
 		if (!exists()) {
 			return Q.reject(new Error('Unable to find Scanimage at "' + Config.Scanimage + '"'));
 		}
@@ -70,11 +70,9 @@ module.exports = function () {
 		};
 
 		System.trace('Scanimage.execute:start');
-
 		response.errors = scanRequest.validate(device);
 
 		if (response.errors.length === 0) {
-
 			response.cmdline = commandLine(scanRequest, device);
 
 			return System.execute(response.cmdline)
diff --git a/index.html b/index.html
index 15eef25e..d32e5032 100644
--- a/index.html
+++ b/index.html
@@ -19,11 +19,8 @@
 
 <script type="text/template" id="page">
     <div class="row">
-        <!-- Padding for larger screens -->
-        <div class="col-lg-2 col-md-1"></div>
-
         <!-- Fields and buttons -->
-        <div id="fields" class="col-lg-4 col-md-5 col-sm-12">
+        <div id="fields" class="col-lg-6 col-md-6 col-sm-12">
 
             <div class="row">
                 <div id="col1" class="col">
@@ -69,9 +66,12 @@
                         </select>
                     </div>
 
-                    <div class="form-check" id="formGroupDisableDynamicLineart">
-                        <label for="disableDynamicLineart" class="form-check-label">Disable dynamic lineart</label>
-                        <input id="disableDynamicLineart" type="checkbox" class="form-check-input" />
+                    <div class="form-group" id="formGroupDynamicLineart" style="display: none">
+                        <label for="mode">Dynamic lineart</label>
+                        <select id="dynamicLineart" class="form-control">
+                            <option value="false">disabled</option>
+                            <option value="true">enabled</option>
+                        </select>
                     </div>
 
                     <label for="brightness">Brightness</label>
@@ -108,9 +108,6 @@
         <!-- Preview pane -->
         <div id="previewPane" class="col-lg-4 col-md-5 col-sm-12">
         </div>
-
-        <!-- Padding for larger screens -->
-        <div class="xcol-lg-2 col-md-1"></div>
     </div>
 
     <div class="row">
diff --git a/src/client.js b/src/client.js
index f667f642..fd735419 100644
--- a/src/client.js
+++ b/src/client.js
@@ -9,22 +9,7 @@ require("jquery-jcrop");
 require('backbone.localstorage');
 require("bootstrap");
 
-function updateDynamicLineartVisibility(mode, device) {
-    var $div = $("#formGroupDisableDynamicLineart");
-    var features = device.attributes.features;
-    // this function might be called before fetching the device model, which might result in this variable
-    // being potentially erroneously set to false at that time : however, since deviceSync() calls render(),
-    // an update to the correct value will eventually happen once the device model is fetched.
-    var disableSupported = (features !== undefined && '--disable-dynamic-lineart' in features);
-    if (mode === 'Lineart' && disableSupported) {
-        $div.show();
-    } else {
-        $div.hide();
-    }
-}
-
 $(document).ready(function () {
-
     // Set up toastr how we want it
     toastr.options = {
         "positionClass": "toast-bottom-right"
@@ -50,7 +35,6 @@ $(document).ready(function () {
     // ScanRequest is what gets sent to the scanner and contains
     // the various fields which define what the scanner will do
     var ScanRequest = Backbone.Model.extend({
-
         defaults: function () {
             return {
                 // LocalStorage requires an id in order to
@@ -65,7 +49,7 @@ $(document).ready(function () {
                 brightness: 0,
                 contrast: 0,
                 convertFormat: 'tif',
-                disableDynamicLineart: false
+                dynamicLineart: true
             };
         },
 
@@ -76,7 +60,6 @@ $(document).ready(function () {
 
     // Views
     var FileView = Backbone.View.extend({
-
         tagName: 'tr',
         template: _.template($('#file-row').html()),
         events: {
@@ -171,8 +154,8 @@ $(document).ready(function () {
                     $slider.slider("value", val);
                     break;
 
-                case 'disableDynamicLineart':
-                    data[field.id] = field.checked;
+                case 'dynamicLineart':
+                    data[field.id] = field.value === 'true';
                     break;
 
                 default:
@@ -324,7 +307,7 @@ $(document).ready(function () {
 
         render: function (ev) {
             var attrs = (ev && ev.changed) || this.model.attributes;
-            var dev = this.device;
+            var device = this.device;
             _.each(attrs, function (val, id) {
                 var $e = this.$('#' + id);
                 if ($e) {
@@ -334,12 +317,16 @@ $(document).ready(function () {
                 if (id === 'contrast' || id === 'brightness') {
                     $e = this.$('#' + id + '_slider');
                     $e.slider('value', val);
-                }
-                else if (id === 'mode') {
-                    updateDynamicLineartVisibility(val, dev);
-                }
-                else if (id === 'disableDynamicLineart') {
-                    $e.prop("checked", val);
+                } else if (id === 'mode' && device) {
+                    // This might be called before fetching the device model, in which case
+                    // `features` might be incorrect. This will self-correct once the device
+                    // model is fetched.
+                    var features = device.attributes.features;
+                    var isDisableSupported = features && '--disable-dynamic-lineart' in features;
+                    var visible = val === 'Lineart' && isDisableSupported;
+                    $("#formGroupDynamicLineart").toggle(visible);
+                } else if (id === 'dynamicLineart') {
+                    $e.val(String(val));
                 }
             });
         },
@@ -352,7 +339,6 @@ $(document).ready(function () {
     });
 
     var JcropManager = function (model) {
-
         var _this = this;
         
         _this.dotsToMm = function (dots) {
@@ -463,7 +449,6 @@ $(document).ready(function () {
     page.convert();
 
     var jcrop = new JcropManager(page.model);
-
 });