Changeset 29906 for other-projects/nz-flag-design/trunk/similarity-2d/flag-processing.js

Timestamp:

2015-05-20T23:25:37+12:00 (9 years ago)

Author:

davidb

Message:

Changes resulting from writing the TPDL submission

File:

• other-projects/nz-flag-design/trunk/similarity-2d/flag-processing.js (modified) (8 diffs)

other-projects/nz-flag-design/trunk/similarity-2d/flag-processing.js

@@ -251 +251 @@
     }
 
-    console.log("Product for HSL histogram: " + quant_product);
+    //console.log("Product for HSL histogram: " + quant_product);
 
     return quant_product;
@@ -283 +283 @@
     
     var imageObj = new Image();
+
     imageObj.onload = function() {
         callback_count++;
@@ -333 +334 @@
         if (clicked_on_count==2) {
             // trigger comparison
-            alert("Similarity score: " + quantizedColourHistogramComparison(flag_comparison_array[0],flag_comparison_array[1]));
+            alert("Similarity score: " + quantizedColourHistogramComparison(flag_comparison_array[0],flag_comparison_array[1]) + "%");
             clicked_on_count=0;
         }
@@ -346 +347 @@
     
     
-    imageObj.src   = img_url;
-    imageObj.title = title.toUpperCase();
+    imageObj.src     = img_url;
+        imageObj.height  = 216;
+    imageObj.title   = title.toUpperCase();
     imageObj.country = imageObj.title;
-    imageObj.id    = "flag-img-" + i;
+    imageObj.id      = "flag-img-" + i;
 
     $displayDiv.append(imageObj);
@@ -358 +360 @@
 
 
+function calcSimilarityValuesChain(newFlagQuantHSLHist, 
+                   chain_count, img_obj_list, img_obj_list_len,
+                   progressVal, progress_step,
+                   $progressArea,$progressBar)
+{
+    var imgObj = img_obj_list[chain_count];
+
+    var existingQuantHSLHist = imgObj.quantHSLHist;
+
+    var similarity_score = quantizedColourHistogramComparison(newFlagQuantHSLHist,existingQuantHSLHist);
+    similarity_score = Math.round(similarity_score * 100) / 100; // round to 2 decimal places
+    similarity_score *= 100; // express as percentage
+
+    imgObj.similarityScore = similarity_score;
+        var img_title = imgObj.country;
+
+        if (isoCountryCodes != null) {
+        var country_code = imgObj.country;
+        img_title = isoCountryCodes[country_code] + " (" + country_code + ")";
+    }
+    imgObj.title = img_title + ", Similarity score: " + similarity_score + "%";
+    if (similarity_score>50) {
+        //imgObj.style.display = "block";
+        //imgObj.style.visibility = "visible";
+    }
+    else {
+        //imgObj.style.display = "none";
+        //imgObj.style.visibility = "hidden";
+    }
+
+
+
+    if (chain_count < img_obj_list_len-1) {
+    progressVal += progress_step;   
+    if ($progressBar.progressbar) {
+        $progressBar.progressbar('value',progressVal);
+    }
+
+    setTimeout(function()
+           { calcSimilarityValuesChain(newFlagQuantHSLHist, 
+                           chain_count+1,img_obj_list, img_obj_list_len,
+                           progressVal, progress_step,
+                           $progressArea,$progressBar)
+               }
+           ,1 // any time delay causes break in 'rendering' thread, even 0!
+           );
+
+    }
+    else {
+    // done
+    $progressArea.find('span:first').text("Done.");
+    if (img_obj_list_len>show_progress) {
+        progressVal = 100;
+        if ($progressBar.progressbar) {
+        $progressBar.progressbar('value',progressVal);
+        }
+        $progressArea.slideUp();
+    }
+    }
+
+}
 
 function calcSimilarityValues(newFlagQuantHSLHist, $displayDiv,$progressArea,$progressBar)
@@ -368 +431 @@
 
     var img_obj_list_len = img_obj_list.length;
+    console.log("*** img obj list len = " + img_obj_list_len);
 
     if (img_obj_list_len==0) {
@@ -377 +441 @@
     }
 
-    var progress_step = 100.0 / img_obj_list_len;
-    
     for (var i=0; i<img_obj_list.length; i++) {
     var imgObj = img_obj_list[i];
+    imgObj.style.display = "inline";
+    //imgObj.style.visibility = "visible";
+    }
+
+    var progress_step = 100.0 / img_obj_list_len;
+/*
+    var chain_count=0;
+
+    setTimeout(function() {
+    calcSimilarityValuesChain(newFlagQuantHSLHist, 
+                  chain_count, img_obj_list, img_obj_list_len,
+                  progressVal, progress_step,
+                  $progressArea,$progressBar)
+        }
+    ,100
+    );
+*/
+    
+
+    for (var i=0; i<img_obj_list.length; i++) {
+    var imgObj = img_obj_list[i];
 
     var existingQuantHSLHist = imgObj.quantHSLHist;
 
     var similarity_score = quantizedColourHistogramComparison(newFlagQuantHSLHist,existingQuantHSLHist);
+    similarity_score = Math.round(similarity_score * 100) / 100; // round to 2 decimal places
+    similarity_score *= 100; // express as percentage
+
     imgObj.similarityScore = similarity_score;
-    imgObj.title = imgObj.country + ", Similarity score: " + similarity_score;
+        var img_title = imgObj.country;
+
+        if (isoCountryCodes != null) {
+        var country_code = imgObj.country;
+        img_title = isoCountryCodes[country_code] + " (" + country_code + ")";
+    }
+    imgObj.title = img_title + ", Similarity score: " + similarity_score + "%";
+    if (similarity_score>50) {
+        //imgObj.style.display = "inline";
+        //imgObj.style.visibility = "visible";
+    }
+    else {
+        //imgObj.style.display = "none";
+        //imgObj.style.visibility = "hidden";
+    }
 
     progressVal += progress_step;   
-    console.log("*** i = " + i);
-    console.log("*** pbar = " + $progressBar.progressbar);
+    //console.log("*** i = " + i);
+    //console.log("*** pbar = " + $progressBar.progressbar);
     if ($progressBar.progressbar) {
         $progressBar.progressbar('value',progressVal);
@@ -402 +502 @@
     $progressArea.slideUp();
     }
+
+
 }