From 39f782eda6b776ffab2240d3bba7fc20e2f0b52d Mon Sep 17 00:00:00 2001
From: AntixK <anandkrish894@gmail.com>
Date: Mon, 6 May 2019 01:27:38 +0900
Subject: [PATCH] fixed some import errors

---
 package-lock.json | 34 ++++++++++------------------------
 public/index.html |  4 ++--
 public/sketch.js  | 27 ++++++++++++++-------------
 3 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9de28cf..c3f0dc1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1778,14 +1778,12 @@
                 "balanced-match": {
                     "version": "1.0.0",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "brace-expansion": {
                     "version": "1.1.11",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "balanced-match": "^1.0.0",
                         "concat-map": "0.0.1"
@@ -1800,20 +1798,17 @@
                 "code-point-at": {
                     "version": "1.1.0",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "concat-map": {
                     "version": "0.0.1",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "console-control-strings": {
                     "version": "1.1.0",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "core-util-is": {
                     "version": "1.0.2",
@@ -1930,8 +1925,7 @@
                 "inherits": {
                     "version": "2.0.3",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "ini": {
                     "version": "1.3.5",
@@ -1943,7 +1937,6 @@
                     "version": "1.0.0",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "number-is-nan": "^1.0.0"
                     }
@@ -1958,7 +1951,6 @@
                     "version": "3.0.4",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "brace-expansion": "^1.1.7"
                     }
@@ -1966,14 +1958,12 @@
                 "minimist": {
                     "version": "0.0.8",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "minipass": {
                     "version": "2.3.5",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "safe-buffer": "^5.1.2",
                         "yallist": "^3.0.0"
@@ -1992,7 +1982,6 @@
                     "version": "0.5.1",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "minimist": "0.0.8"
                     }
@@ -2073,8 +2062,7 @@
                 "number-is-nan": {
                     "version": "1.0.1",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "object-assign": {
                     "version": "4.1.1",
@@ -2086,7 +2074,6 @@
                     "version": "1.4.0",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "wrappy": "1"
                     }
@@ -2208,7 +2195,6 @@
                     "version": "1.0.2",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "code-point-at": "^1.0.0",
                         "is-fullwidth-code-point": "^1.0.0",
@@ -3765,9 +3751,9 @@
             }
         },
         "rcedit": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-1.1.1.tgz",
-            "integrity": "sha512-6NjOhOpkvbc/gpMEfk2hpXuWyHfbLFN8as5jx3jf4bhELvouRoYvc8d/W3NVVPwEBF1ICfbpwp1oRm8OJ2WDWw==",
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-1.1.2.tgz",
+            "integrity": "sha512-z2ypB4gbINhI6wVe0JJMmdpmOpmNc4g90sE6/6JSuch5kYnjfz9CxvVPqqhShgR6GIkmtW3W2UlfiXhWljA0Fw==",
             "dev": true
         },
         "read-config-file": {
diff --git a/public/index.html b/public/index.html
index b79c9d8..c7b12d4 100644
--- a/public/index.html
+++ b/public/index.html
@@ -115,7 +115,7 @@
     <p>
       <div class="tab",id="tabs">
           <button title="Design Catmull-Rom curve" class="tablinks active" onclick="opentab(event, 'Catmull Rom Spline')" id="defaultOpen">Catmull</button>
-          <button title="Design Bezier curve" class="tablinks" onclick="opentab(event, 'Bezier')">Bezier</button>
+          <button title="Design Bezier curve" class="tablinks" onclick="opentab(event, 'Bezier')">B&#xE9zier</button>
           <button title="Design NURBS curve" class="tablinks" onclick="opentab(event, 'NURBS')">NURBS</button>
       </div>
       
@@ -131,7 +131,7 @@
       <button title="Exports all the curve data as a JSON file." class = "mybutton" id='exportjson'>Export JSON</button>
       <button title="Resets the canvas." class = "mybutton" id='reset'>Reset</button>
       <input type="range" min="70" max="200" value="100"  step='1' class="myslider" id="zoomslider">
-      
+      <input type="number" min="1" max="5" value="2" id="degreeslider">
       <label class="container"id="clampedbox">
         <input type="checkbox">
         <span class="checkmark"></span>
diff --git a/public/sketch.js b/public/sketch.js
index db9ed2f..accd84f 100644
--- a/public/sketch.js
+++ b/public/sketch.js
@@ -1,6 +1,6 @@
 var INITIAL_NUM_PTS = 5;
 var N = INITIAL_NUM_PTS;
-var MAX_NUM_PTS = 10;
+var MAX_NUM_PTS = 15;
 var curr_marker;
 var control_points = [];
 var curve_points;
@@ -8,7 +8,7 @@ var curve_choice = 'Catmull Rom Spline';
 var degree = 2;
 var degree_slider;
 let clamped_box;
-var clamped_curve = false;
+var clamped_curve = true;
 
 var curve_dict = {
   'Catmull Rom Spline': 0,
@@ -147,7 +147,8 @@ function setup() {
   degree_text.style('font-family', button_font.font.names.postScriptName["en"]);
   degree_text.style('color', 'white');
 
-  degree_slider = createInput('2','Number'); 
+  degree_slider =select("#degreeslider"); 
+  //degree_slider.parent("container");
   degree_slider.style('width','70px');
   degree_slider.style('text-align','center');
   degree_slider.attribute('min', '1');
@@ -167,6 +168,7 @@ function setup() {
   clamped_box.style('color', 'white');
   clamped_box.position(NUM_X + 180, NUM_Y - 68);
   clamped_box.changed(set_clamped);
+  update_clamped_box(); 
 
   reset_canvas(false);
 
@@ -301,10 +303,11 @@ function import_json()
       x_mark.position(240 + text_offset_x,(- 12)+(N-1)*40 + text_offset_y);
       x_mark.html('\u2718');
 
-      clamped_curve = in_json_file.clamped;
+      //clamped_curve = in_json_file.clamped;
       degree = in_json_file.degree;
       update_degree_slider();
-      update_clamped_box();
+      if(in_json_file.clamped && !clamped_curve)
+        update_clamped_box();
     }
     reader.readAsText(file_handle.files[0]);
   }, false);   
@@ -318,7 +321,7 @@ function reset_canvas(flag = true)
   panx = 0;
   pany = 0;
     
-  clamped_curve = false;
+  clamped_curve = true;
   if(flag)
   {
     while(N > 0)
@@ -347,11 +350,10 @@ function reset_canvas(flag = true)
   
   noStroke();
 
-  degree_slider.attribute('min', '1');
-  degree_slider.attribute('max',(INITIAL_NUM_PTS -1).toString());
   degree =2;
   update_degree_slider();
-  update_clamped_box();
+
+  update_clamped_box(); 
 
 }
 
@@ -425,14 +427,14 @@ function opentab(evt, curve_name) {
 
 function update_degree()
 { 
-
+  console.log("am here!");
   degree = Number(degree_slider.value());
 }
 
 function set_clamped()
 {
 
-  clamped_box.value(!clamped_curve);
+  //document.getElementById('clampedbox').click();
   clamped_curve = !clamped_curve;
 }
 
@@ -443,7 +445,6 @@ function update_degree_slider()
 
 function update_clamped_box()
 {
-  clamped_box.value(clamped_curve);
-  document.getElementById("clampedbox").checked = clamped_curve;
+  document.getElementById('clampedbox').click();
   
 }
\ No newline at end of file