Added dichroic color default

Moved dichroic settings into mirror function Replaced dichroic settings in all other mirrors with imported function.
rvalenzuelar · Jan 29, 2023 · 88b4a60 · 88b4a60
1 parent 48bd834
commit 88b4a60
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 55 deletions.
diff --git a/simulator/js/objs/arcmirror.js b/simulator/js/objs/arcmirror.js
@@ -6,19 +6,11 @@ objTypes['arcmirror'] = {
     return {type: 'arcmirror', p1: mouse, isDichroic: false, isDichroicFilter: false};
   },
 
+  dichroicSettings: objTypes['mirror'].dichroicSettings,
+
   //顯示屬性方塊 Show the property box
   p_box: function(obj, elem) {
-    if (colorMode) {
-      createBooleanAttr(getMsg('dichroic'), obj.isDichroic, function(obj, value) {
-          obj.isDichroic = value;
-      }, elem);
-      createBooleanAttr(getMsg('filter'), obj.isDichroicFilter, function(obj, value) {
-        obj.isDichroicFilter = value;
-      }, elem);
-      createNumberAttr(getMsg('wavelength'), UV_WAVELENGTH, INFRARED_WAVELENGTH, 1, obj.wavelength || GREEN_WAVELENGTH, function(obj, value) { 
-        obj.wavelength = value;
-      }, elem);
-    }
+    this.dichroicSettings(obj,elem);
   },
 
   //建立物件過程滑鼠按下 Mousedown when the obj is being constructed by the user

diff --git a/simulator/js/objs/beamsplitter.js b/simulator/js/objs/beamsplitter.js
@@ -7,22 +7,14 @@ objTypes['beamsplitter'] = {
     return {type: 'beamsplitter', p1: mouse, p2: mouse, p: .5, isDichroic: false, isDichroicFilter: false};
   },
 
+  dichroicSettings: objTypes['mirror'].dichroicSettings,
+
   //顯示屬性方塊 Show the property box
   p_box: function(obj, elem) {
     createNumberAttr(getMsg('transmissionratio'), 0, 1, 0.01, obj.p, function(obj, value) {
       obj.p = value;
     }, elem);
-    if (colorMode) {
-      createBooleanAttr(getMsg('dichroic'), obj.isDichroic, function(obj, value) {
-        obj.isDichroic = value;
-      }, elem);
-      createBooleanAttr(getMsg('filter'), obj.isDichroicFilter, function(obj, value) {
-        obj.isDichroicFilter = value;
-      }, elem);
-      createNumberAttr(getMsg('wavelength'), UV_WAVELENGTH, INFRARED_WAVELENGTH, 1, obj.wavelength || GREEN_WAVELENGTH, function(obj, value) { 
-        obj.wavelength = value;
-      }, elem);
-    }
+    this.dichroicSettings(obj,elem);
   },
 
   //使用lineobj原型 Use the prototype lineobj

diff --git a/simulator/js/objs/curvedmirror.js b/simulator/js/objs/curvedmirror.js
@@ -6,22 +6,14 @@ objTypes['curvedmirror'] = {
     return {type: 'curvedmirror', p1: mouse, p2: mouse, p: "0.5\\cdot\\sqrt{1-x^2}", isDichroic: false, isDichroicFilter: false};
   },
 
+  dichroicSettings: objTypes['mirror'].dichroicSettings,
+
   //顯示屬性方塊 Show the property box
   p_box: function(obj, elem) {
     createEquationAttr('y = ', obj.p, function(obj, value) {
       obj.p = value;
     }, elem);
-    if (colorMode) {
-      createBooleanAttr(getMsg('dichroic'), obj.isDichroic, function(obj, value) {
-          obj.isDichroic = value;
-      }, elem);
-      createBooleanAttr(getMsg('filter'), obj.isDichroicFilter, function(obj, value) {
-        obj.isDichroicFilter = value;
-      }, elem);
-      createNumberAttr(getMsg('wavelength'), UV_WAVELENGTH, INFRARED_WAVELENGTH, 1, obj.wavelength || GREEN_WAVELENGTH, function(obj, value) { 
-        obj.wavelength = value;
-      }, elem);
-    }
+    this.dichroicSettings(obj,elem);
   },
 
   c_mousedown: objTypes['lineobj'].c_mousedown,

diff --git a/simulator/js/objs/idealmirror.js b/simulator/js/objs/idealmirror.js
@@ -6,6 +6,8 @@ objTypes['idealmirror'] = {
     return {type: 'idealmirror', p1: mouse, p2: graphs.point(mouse.x + gridSize, mouse.y), p: 100, isDichroic: false, isDichroicFilter: false};
   },
 
+  dichroicSettings: objTypes['mirror'].dichroicSettings,
+
   //顯示屬性方塊 Show the property box
   p_box: function(obj, elem) {
     createNumberAttr(getMsg('focallength'), -1000, 1000, 1, obj.p * (cartesianSign?-1:1), function(obj, value) {
@@ -18,17 +20,7 @@ objTypes['idealmirror'] = {
         selectObj(selectedObj);
       }
     }, elem);
-    if (colorMode) {
-      createBooleanAttr(getMsg('dichroic'), obj.isDichroic, function(obj, value) {
-          obj.isDichroic = value;
-      }, elem);
-      createBooleanAttr(getMsg('filter'), obj.isDichroicFilter, function(obj, value) {
-        obj.isDichroicFilter = value;
-      }, elem);
-      createNumberAttr(getMsg('wavelength'), UV_WAVELENGTH, INFRARED_WAVELENGTH, 1, obj.wavelength || GREEN_WAVELENGTH, function(obj, value) { 
-        obj.wavelength = value;
-      }, elem);
-    }
+    this.dichroicSettings(obj,elem);
   },
 
   //使用lineobj原型 Use the prototype lineobj

diff --git a/simulator/js/objs/mirror.js b/simulator/js/objs/mirror.js
@@ -25,9 +25,14 @@ objTypes['mirror'] = {
 
   //顯示屬性方塊 Show the property box
   p_box: function(obj, elem) {
+    this.dichroicSettings(obj,elem);
+  },
+
+  dichroicSettings: function(obj,elem){
     if (colorMode) {
       createBooleanAttr(getMsg('dichroic'), obj.isDichroic, function(obj, value) {
           obj.isDichroic = value;
+          obj.wavelength = obj.wavelength || GREEN_WAVELENGTH;
       }, elem);
       createBooleanAttr(getMsg('filter'), obj.isDichroicFilter, function(obj, value) {
         obj.isDichroicFilter = value;

diff --git a/simulator/js/objs/parabolicmirror.js b/simulator/js/objs/parabolicmirror.js
@@ -7,19 +7,11 @@ objTypes['parabolicmirror'] = {
     return {type: 'parabolicmirror', p1: mouse, isDichroic: false, isDichroicFilter: false};
   },
 
+  dichroicSettings: objTypes['mirror'].dichroicSettings,
+
   //顯示屬性方塊 Show the property box
   p_box: function(obj, elem) {
-    if (colorMode) {
-      createBooleanAttr(getMsg('dichroic'), obj.isDichroic, function(obj, value) {
-          obj.isDichroic = value;
-      }, elem);
-      createBooleanAttr(getMsg('filter'), obj.isDichroicFilter, function(obj, value) {
-        obj.isDichroicFilter = value;
-      }, elem);
-      createNumberAttr(getMsg('wavelength'), UV_WAVELENGTH, INFRARED_WAVELENGTH, 1, obj.wavelength || GREEN_WAVELENGTH, function(obj, value) { 
-        obj.wavelength = value;
-      }, elem);
-    }
+    this.dichroicSettings(obj,elem);
   },
 
   c_mousedown: objTypes['arcmirror'].c_mousedown,