removal of resistive element

smariel · Mar 6, 2022 · 88fb946 · 88fb946
1 parent 529659e
commit 88fb946
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/html/itemEditor.html b/html/itemEditor.html
@@ -93,7 +93,7 @@ <h3>Characteristics</h3>
               <optgroup label="Other">
                 <option value="6">Dummy (wire)</option>
                 <option value="7">Perfect (no loss)</option>
-                <option value="8">Resistive Element</option>
+                <!--<option value="8">Resistive Element</option>-->
               </optgroup>
             </select>
           </div>

diff --git a/js/class.Item.Source.js b/js/class.Item.Source.js
@@ -106,7 +106,7 @@ class Source extends Item {
 
   // Check if the item is a Dummy reg
   isDummy() {
-    return ('6' == this.characs.regtype);
+    return ('6' == this.characs.regtype || '8' == this.characs.regtype);
   }
 
 
@@ -118,7 +118,7 @@ class Source extends Item {
 
   // Check if the item is Resistive Element
   isResistive() {
-    return ('8' == this.characs.regtype);
+    return false;
   }
 
 
@@ -600,6 +600,12 @@ class Source extends Item {
       };
     }
 
+    // compatibility with < v2.1.0
+    // conversions of (deleted) resistor to dummy
+    if(8 == this.characs.regtype) {
+      this.characs.regtype = 6;
+    }
+
     return properties;
   }
 }