Remove dtdBit2Text/dtdBit1Text, allow ngShow/ngHide in the HTML to de…

…termine what to use.
dgallegos · Sep 11, 2013 · f0fa0e2 · f0fa0e2
1 parent d788b68
commit f0fa0e2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 63 deletions.
diff --git a/app/js/controllers.js b/app/js/controllers.js
@@ -48,8 +48,6 @@ function EdidCtrl($scope) {
     var index = blockDescriptor[1]-1;
     $scope.dtd = $scope.edid.dtds[index];
     var block = 0;
-    $scope.updateDtdBit2Text(block,index);
-    $scope.updateDtdBit1Text(block,index);
     $scope.edidData = node.url+"?"+$scope.getRevision();
   }
   $scope.blockXHandler = function(node){
@@ -111,8 +109,6 @@ function EdidCtrl($scope) {
     var dtdNumber = node.id.replace("tBlock","").substring(1).replace("Dtd","");
     var dtdIndex = dtdNumber -1;
     $scope.dtd = $scope.ext.dtds[dtdIndex];
-    $scope.updateDtdBit2Text(blockNumber,dtdIndex);
-    $scope.updateDtdBit1Text(blockNumber,dtdIndex);
     $scope.edidData = node.url+"?"+$scope.getRevision(); 
   }
     // QuantumData Default Edid
@@ -378,61 +374,6 @@ function EdidCtrl($scope) {
     var isSet = ($scope.edid.timingBitmap & (msb >> index))?true:false;
     return isSet;
   }
-  $scope.updateDtdBit2Text = function(block,index)
-  {
-      var bit2Text = new String();
-      var dtd = {};
-      if(block == 0)
-      {
-        dtd = $scope.edid.dtds[index];
-      }
-      else
-      {
-        dtd = $scope.edid.exts[block-1].dtds[index];
-      }
-
-      if(dtd.syncType ==
-                $scope.edid.syncTypeEnum.DIGITAL_SEPARATE)
-      {
-        bit2Text = "Vertical Sync Polarity: ";
-        bit2Text += dtd.vSyncPolarity;
-      }
-      else
-      {
-        bit2Text = "Vertical Sync Serrated: ";
-        bit2Text += dtd.vSyncSerrated;
-      }
-      $scope.dtd.dtdBit2Text = bit2Text;
-  }
-  $scope.updateDtdBit1Text = function(block,index)
-  {
-      var bit1Text = new String();
-      var dtd = {};
-
-      if(block == 0)
-      {
-        dtd = $scope.edid.dtds[index];
-      }
-      else
-      {
-        dtd = $scope.edid.exts[block-1].dtds[index];
-      }
-
-      if((dtd.syncType ==
-                $scope.edid.syncTypeEnum.ANALOG_COMPOSITE) ||
-                (dtd.syncType ==
-                $scope.edid.syncTypeEnum.BIPOLAR_ANALOG_COMPOSITE))
-      {
-        bit1Text = "Sync on all 3 RGB lines: ";
-        bit1Text += dtd.syncAllRGBLines;
-      }
-      else
-      {
-        bit1Text = "HSync polarity: ";
-        bit1Text += dtd.hSyncPolarity;
-      }
-      $scope.dtd.dtdBit1Text = bit1Text;
-  }
   $scope.shortAudioDescView = function(format)
   {
     var view;

diff --git a/app/partials/block0/detailedTimingDescriptors.html b/app/partials/block0/detailedTimingDescriptors.html
@@ -17,6 +17,19 @@ <h2>Detailed Timing Descriptor</h2>
 Interlaced: {{dtd.interlaced}} <br />
 Stereo Mode: {{dtd.stereoMode}} <br />
 Sync Type: {{dtd.syncType}} <br />
-{{dtd.dtdBit2Text}} <br />
-{{dtd.dtdBit1Text}}  <br />
+<span ng-show="dtd.syncType == edid.syncTypeEnum.DIGITAL_SEPARATE">
+    Vertical Sync Polarity: {{dtd.vSyncPolarity}} <br/>
+</span>
+<span ng-show="dtd.syncType != edid.syncTypeEnum.DIGITAL_SEPARATE">
+    Vertical Sync Serrated: {{dtd.vSyncSerrated}} <br />
+</span>
+
+<span ng-show="(dtd.syncType == edid.syncTypeEnum.ANALOG_COMPOSITE) ||
+                (dtd.syncType == edid.syncTypeEnum.BIPOLAR_ANALOG_COMPOSITE)">
+    Sync on all 3 RGB lines: {{dtd.syncAllRGBLines}} <br/>
+</span>
+<span ng-show="(dtd.syncType != edid.syncTypeEnum.ANALOG_COMPOSITE) &&
+                (dtd.syncType != edid.syncTypeEnum.BIPOLAR_ANALOG_COMPOSITE)">
+    HSync polarity: {{dtd.hSyncPolarity}} <br />
+</span>
 2-Way Line-Interleaved Stereo: {{dtd.twoWayStereo}} <br />
diff --git a/app/partials/blockX/extDtds.html b/app/partials/blockX/extDtds.html
@@ -17,6 +17,19 @@ <h3>Detailed Timing Descriptor</h3>
 Interlaced: {{dtd.interlaced}} <br />
 Stereo Mode: {{dtd.stereoMode}} <br />
 Sync Type: {{dtd.syncType}} <br />
-{{dtd.dtdBit2Text}} <br />
-{{dtd.dtdBit1Text}}  <br />
+<span ng-show="dtd.syncType == edid.syncTypeEnum.DIGITAL_SEPARATE">
+    Vertical Sync Polarity: {{dtd.vSyncPolarity}} <br/>
+</span>
+<span ng-show="dtd.syncType != edid.syncTypeEnum.DIGITAL_SEPARATE">
+    Vertical Sync Serrated: {{dtd.vSyncSerrated}} <br />
+</span>
+
+<span ng-show="(dtd.syncType == edid.syncTypeEnum.ANALOG_COMPOSITE) ||
+                (dtd.syncType == edid.syncTypeEnum.BIPOLAR_ANALOG_COMPOSITE)">
+    Sync on all 3 RGB lines: {{dtd.syncAllRGBLines}} <br/>
+</span>
+<span ng-show="(dtd.syncType != edid.syncTypeEnum.ANALOG_COMPOSITE) &&
+                (dtd.syncType != edid.syncTypeEnum.BIPOLAR_ANALOG_COMPOSITE)">
+    HSync polarity: {{dtd.hSyncPolarity}} <br />
+</span>
 2-Way Line-Interleaved Stereo: {{dtd.twoWayStereo}} <br />