Merge pull request #50 from studio-YOLO/code-optimization

Code optimization
studio-YOLO · May 2, 2024 · 7dbbce1 · 7dbbce1
2 parents 1516641 + 8eab42e
commit 7dbbce1
Show file tree

Hide file tree

Showing 7 changed files with 190 additions and 186 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ coverage
 .DS_Store
 lib/target
 lib/pkg
-lib/Cargo.lock
+lib/Cargo.lock
+.vscode
diff --git a/demo/index.html b/demo/index.html
@@ -11,26 +11,27 @@
 <body>
   <div class="container">
     <!--<script type="module" src="scripts/black-white-filter-demo.js"></script>
+    <script type="module" src="scripts/change-brightness-demo.js"></script>
+    <script type="module" src="scripts/change-contrast-demo.js"></script>
+    <script type="module" src="scripts/change-exposure-demo.js"></script>
+    <script type="module" src="scripts/change-highlights-demo.js"></script>
+    <script type="module" src="scripts/change-opacity-demo.js"></script>
+    <script type="module" src="scripts/change-saturation-demo.js"></script>
+    <script type="module" src="scripts/change-shadow-demo.js"></script>
+    <script type="module" src="scripts/change-sharpness-demo.js"></script>
+    <script type="module" src="scripts/change-temperature-demo.js"></script>
+    <script type="module" src="scripts/change-tint-demo.js"></script>
+    <script type="module" src="scripts/color-conversion-demo.js"></script>
     <script type="module" src="scripts/color-palette-demo.js"></script>
     <script type="module" src="scripts/dominant-color-demo.js"></script>
+    <script type="module" src="scripts/color-palette-wasm-demo.js"></script>
     <script type="module" src="scripts/gray-scale-filter-demo.js"></script>
-    <script type="module" src="scripts/image-from-url-demo.js"></script>
-    <script type="module" src="scripts/change-temperature-demo.js"></script>
+    <script type="module" src="scripts/higher-color-contrast-demo.js"></script>
     <script type="module" src="scripts/optimize-contrast-demo.js"></script>
-    <script type="module" src="scripts/change-contrast-demo.js"></script>
-    <script type="module" src="scripts/change-saturation-demo.js"></script>
-    <script type="module" src="scripts/change-brightness-demo.js"></script>
-    <script type="module" src="scripts/sepia-filter-demo.js"></script>
-    <script type="module" src="scripts/change-opacity-demo.js"></script>
-    <script type="module" src="scripts/resize-image-demo.js"></script>
-    <script type="module" src="scripts/color-palette-wasm-demo.js"></script>
     <script type="module" src="scripts/resize-image-demo.js"></script>
+    <script type="module" src="scripts/sepia-filter-demo.js"></script>-->
     <script type="module" src="scripts/change-opacity-demo.js"></script>
-    <script type="module" src="scripts/change-shadow-demo.js"></script>
-    <script type="module" src="scripts/change-tint-demo.js"></script>
-    <script type="module" src="scripts/change-highlights-demo.js"></script>-->
-    <script type="module" src="scripts/color-conversion-demo.js"></script>
-
+  </div>
 </body>
 
 </html>
diff --git a/demo/scripts/change-contrast-demo.js b/demo/scripts/change-contrast-demo.js
@@ -10,7 +10,7 @@ image.src = url;
 //waiting image load
 image.onload = () => {
 
-    editpix.setContrast(image, 2)
+    editpix.changeContrast(image, 2)
         .then(highContrastImage => {
             document.body.appendChild(image);
             document.body.appendChild(highContrastImage);

diff --git a/demo/scripts/change-temperature-demo.js b/demo/scripts/change-temperature-demo.js
@@ -11,25 +11,25 @@ image.src = url;
 image.onload = () => {
     document.body.appendChild(image);
 
-    editpix.adjustTemperature(image, 20)
+    editpix.changeTemperature(image, 20)
         .then(highContrastImage => {
             document.body.appendChild(highContrastImage);
         })
         .catch(error => { console.log(error) })
 
-    editpix.adjustTemperature(image, 50)
+    editpix.changeTemperature(image, 50)
         .then(highContrastImage => {
             document.body.appendChild(highContrastImage);
         })
         .catch(error => { console.log(error) })
 
-    editpix.adjustTemperature(image, -20)
+    editpix.changeTemperature(image, -20)
         .then(highContrastImage => {
             document.body.appendChild(highContrastImage);
         })
         .catch(error => { console.log(error) })
 
-    editpix.adjustTemperature(image, -50)
+    editpix.changeTemperature(image, -50)
         .then(highContrastImage => {
             document.body.appendChild(highContrastImage);
         })

diff --git a/demo/scripts/higher-color-contrast-demo.js b/demo/scripts/higher-color-contrast-demo.js
@@ -6,13 +6,13 @@ const editpix = new EditPix();
 const hexColor = "#78828c";
 
 //convert color from hex to rgb
-const rgbColor = editpix.convertToRgb(hexColor);
+const rgbColor = editpix.hexToRgb(hexColor);
 
 //get the higher contrast color
-const higherColorContrastRgb = editpix.getHigherContrast(rgbColor);
+const higherColorContrastRgb = editpix.getHigherContrast(rgbColor.r, rgbColor.g, rgbColor.b);
 
 //convert higher contrast color from rgb to hex
-const higherColorContrastHex = editpix.convertToHex(higherColorContrastRgb);
+const higherColorContrastHex = editpix.rgbToHex(higherColorContrastRgb.r, higherColorContrastRgb.g, higherColorContrastRgb.b);
 
 
 //display results