Refactor progress bar to Class

Author: Eliepse

src/explode_shape_layer.jsx

@@ -5,7 +5,7 @@
 
 function explodeLayer(layer) {
 
-    cLog('Exploding layer : ' + layer.name + '\n==================');
+    cLog('==================\n' + 'Exploding layer : ' + layer.name);
 
     // Get the elements of the original shape layer
     var contents = layer.property("Contents");
@@ -22,15 +22,15 @@ function explodeLayer(layer) {
 
     }
 
-    _progressBar.make(1, contents.numProperties, 1);
-    _progressBar.showBar();
+    var pb = new ProgressBar(1, contents.numProperties, 1);
+    pb.start();
 
     // Browse through contents array
     for(var i = contents.numProperties; i > 0; i--) {
 
         // Get the original property
         var _prop = contents.property(i);
-        _progressBar.setCurrent(contents.numProperties - i)
+        pb.update(contents.numProperties - i)
 
         // Skip the property if not enabled
         if (!_prop.enabled) continue;
@@ -52,7 +52,7 @@ function explodeLayer(layer) {
 
     }
 
-    _progressBar.hideBar();
+    pb.end();
 
     for(var i = 0; i < layers.length; i++) {
         layers[i].enabled = true;

src/progressBar.jsx

@@ -1,42 +1,83 @@
-_progressBar = new Window('palette', configs.title, undefined, {
-    resizeable : false,
-    borderless : 'not quite true',
-});
-
-_progressBar.preferredSize = [420, 40];
-_progressBar.bar = _progressBar.add("progressbar", undefined, 0, 100);
-_progressBar.bar.value = 0;
-_progressBar.bar.preferredSize.width = 400;
-_progressBar.bar.show()
-
-_progressBar.barInfos = _progressBar.add("statictext", undefined, 'Loading, please wait', {
-    justify: 'center'
-});
-_progressBar.barInfos.preferredSize = [400, 17];
-
-_progressBar.make = function (min, max, current) {
-    this.barProps = {
-        min : min,
-        max : max,
-        current : current,
+function ProgressBar(min, max, current) {
+
+    var _window,
+        _progressBar,
+        _infos,
+        _real,
+        _cursor,
+        _isVisible;
+
+    this.testInfos = 'Processing element :current on :max';
+
+    this.constructor = function(min, max, current) {
+
+        _this = this;
+        _isVisible = false;
+
+        _real = { min : min, max : max, current : current };
+        _cursor = { min : 0, max : 100, current : 0 };
+
+        _cursor.max = (_real.max - _real.min) + 1;
+
+        // Instanciate the window
+        _window = new Window('palette', configs.title, undefined, {
+            resizeable : false,
+            borderless : 'not quite true',
+        });
+        _window.preferredSize = [420, 40];
+
+        // Instanciate the progress bar
+        _progressBar = _window.add("progressbar", undefined, _cursor.min, _cursor.max);
+        _progressBar.preferredSize.width = 400;
+        _progressBar.show();
+
+        // Instanciate text infos
+        _infos = _window.add("statictext", undefined, 'Loading, please wait', {
+            justify: 'center'
+        });
+        _infos.preferredSize = [400, 17];
+
+        this.update(current);
+
+
+        return this;
+
     }
-    this.barProps.total = (this.barProps.max - this.barProps.min) + 1;
-    this.barProps.step = (this.barProps.current - this.barProps.min) + 1;
-}
 
-_progressBar.updateBar = function () {
-    this.bar.value = Math.round(( (this.barProps.step) * 100) / this.barProps.max)
-    consLog('Processing element ' + (this.barProps.step + 1) + ' on ' + this.barProps.total);
-    this.barInfos.text = 'Processing element ' + (this.barProps.step + 1) + ' on ' + this.barProps.total;
-}
+    this.start = function () {
+        _isVisible = true;
+        this.update(_real.current)
+        _window.show();
+    }
+
+    this.end = function () {
+        _window.hide();
+    }
+
+    this.update = function(step) {
+
+        _real.current = step;
+        _cursor.current = (_real.current + 1) - _real.min;
+
+        var infos = this.testInfos
+        .replace(':current', _cursor.current)
+        .replace(':max', _cursor.max);
 
-_progressBar.showBar = function () { this.show(); }
+        _progressBar.value = _cursor.current;
+        _infos.text = infos;
 
-_progressBar.hideBar = function  () { this.hide(); }
+        cDebug(infos);
+
+        updateGraphics();
+    }
+
+    function updateGraphics() {
+        if(!_isVisible) return;
+        _window.update();
+    }
+
+    return this.constructor(min, max, current);
 
-_progressBar.setCurrent = function  (current, text) {
-    this.barProps.current = current;
-    this.barProps.step = (this.barProps.current - this.barProps.min) + 1;
-    this.updateBar();
-    this.update();
 }
+
+// this.bar.value = Math.round(( (this.barProps.step) * 100) / this.barProps.max)