GPML Map type Added

GPML map type added to map menu and map type compatibility implemented
iVis-at-Bilkent · May 29, 2024 · 667cfaa · 667cfaa
1 parent 10d9ecd
commit 667cfaa
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/app/js/app-utilities.js b/app/js/app-utilities.js
@@ -27,7 +27,7 @@ appUtilities.mapTypesToViewableText = {
   'SIF': 'SIF',
   'SBML': 'SBML',
   'HybridSbgn' : 'Hybrid (PD,AF)' ,
-  'HybridAny' : 'Hybrid (PD,AF,SIF, SBML)'   
+  'HybridAny' : 'Hybrid (PD,AF,SIF, SBML, GPML)'   
 };
 // Set a single property on scratchpad of an element or the core
 appUtilities.setScratch = function (cyOrEle, name, val) {

diff --git a/app/js/backbone-views.js b/app/js/backbone-views.js
@@ -623,7 +623,7 @@ var MapTabGeneralPanel = GeneralPropertiesParentView.extend({
       }
       var currentMapType = chiseInstance.getMapType();
       var validChange = false;
-      if((currentMapType == 'PD' || currentMapType == 'AF' || currentMapType =='SIF' || currentMapType =='SBML' ) && newMapType == 'HybridAny' && !validChange){
+      if((currentMapType == 'PD' || currentMapType == 'AF' || currentMapType =='SIF' || currentMapType =='SBML' || currentMapType =='GPML' ) && newMapType == 'HybridAny' && !validChange){
         validChange = true;
 
         //ok
@@ -660,7 +660,7 @@ var MapTabGeneralPanel = GeneralPropertiesParentView.extend({
            //check no SIF elements in netwrok
            var checkType = true;     
            for(var i = 0 ; i < elements.length && checkType ;i++){
-             if(elements[i].data("language") == "SIF" || elements[i].data("language") == "SBML"){
+             if(elements[i].data("language") == "SIF" || elements[i].data("language") == "SBML" || elements[i].data("language") == "GPML"){
                checkType = false;             
              }
            }
@@ -669,7 +669,7 @@ var MapTabGeneralPanel = GeneralPropertiesParentView.extend({
            //check no AF  OR SIF elements in netwrok
            var checkType = true;  
           for(var i = 0 ; i < elements.length &&  checkType;i++){
-            if(elements[i].data("language") == "AF" || elements[i].data("language") == "SIF" || elements[i].data("language") == "SBML" ){
+            if(elements[i].data("language") == "AF" || elements[i].data("language") == "SIF" || elements[i].data("language") == "SBML" || elements[i].data("language") == "GPML"){
               checkType = false;            
             }
           }
@@ -679,7 +679,7 @@ var MapTabGeneralPanel = GeneralPropertiesParentView.extend({
           //check no PD  OR SIF elements in netwrok
           var checkType = true;   
           for(var i = 0 ; i < elements.length && checkType ;i++){
-            if(elements[i].data("language") == "PD" || elements[i].data("language") == "SIF" || elements[i].data("language") == "SBML"){
+            if(elements[i].data("language") == "PD" || elements[i].data("language") == "SIF" || elements[i].data("language") == "SBML" || elements[i].data("language") == "GPML"){
               checkType = false;            
             }
           }
@@ -691,7 +691,17 @@ var MapTabGeneralPanel = GeneralPropertiesParentView.extend({
           //check no PD  AF or SIF elements in netwrok
           var checkType = true;   
           for(var i = 0 ; i < elements.length && checkType ;i++){
-            if(elements[i].data("language") == "PD" || elements[i].data("language") == "SIF" || elements[i].data("language") == "AF"){
+            if(elements[i].data("language") == "PD" || elements[i].data("language") == "SIF" || elements[i].data("language") == "AF" || elements[i].data("language") == "GPML"){
+              checkType = false;            
+            }
+          }
+        }
+        else if(newMapType == 'GPML')
+        {
+          //check no PD  AF or SIF elements in netwrok
+          var checkType = true;   
+          for(var i = 0 ; i < elements.length && checkType ;i++){
+            if(elements[i].data("language") == "PD" || elements[i].data("language") == "SIF" || elements[i].data("language") == "AF" || elements[i].data("language") == "SBML"){
               checkType = false;            
             }
           }
@@ -700,7 +710,7 @@ var MapTabGeneralPanel = GeneralPropertiesParentView.extend({
           //check no PD  OR AF elements in netwrok
           var checkType = true;  
           for(var i = 0 ; i < elements.length && checkType ;i++){
-            if(elements[i].data("language") == "AF" || elements[i].data("language") == "PD" || elements[i].data("language") == "SBML"){
+            if(elements[i].data("language") == "AF" || elements[i].data("language") == "PD" || elements[i].data("language") == "SBML" || elements[i].data("language") == "GPML"){
               checkType = false;           
             }
           }

diff --git a/index.html b/index.html
@@ -1405,7 +1405,8 @@ <h4 class="modal-title">Layout Properties</h4>
                         <option value="HybridSbgn">PD+AF</option>
                         <option value="SIF">SIF</option>
                         <option value="SBML">SBML</option>
-                        <option value="HybridAny">PD+AF+SIF+SBML</option>
+                        <option value="GPML">GPML</option>
+                        <option value="HybridAny">PD+AF+SIF+SBML+GPML</option>
                     </select>
                 </td>
             </tr>