Version 5.12

usnistgov · Jun 3, 2024 · b4cd894 · b4cd894
1 parent 5280724
commit b4cd894
Show file tree

Hide file tree

Showing 12 changed files with 350 additions and 453 deletions.
diff --git a/source/sfa-dimtol.tcl b/source/sfa-dimtol.tcl
@@ -107,7 +107,7 @@ proc spmiDimtolReport {objEntity} {
   global dimModNames dimOrient dimReference dimrep dimrepID dimSizeNames dimtolAttr dimtolEnt dimtolEntType dimtolGeom dimtolID
   global dimtolPM dimtolType dimval driPropID dt entLevel ent entAttrList entCount entlevel2 equivUnicodeString lastEnt nistName
   global numDSnames opt pmiCol pmiColumns pmiHeading pmiModifiers pmiStartCol pmiUnicode propDefIDs recPracNames
-  global savedModifier spaces spmiEnts spmiID spmiIDRow spmiRow spmiTypesPerFile syntaxErr tolStandard vftq
+  global savedModifier spaces spmiEnts spmiID spmiIDRow spmiRow spmiTypesPerFile syntaxErr tolStandard vftq worksheet
 
   if {$opt(DEBUG1)} {outputMsg "spmiDimtolReport" red}
 
@@ -320,6 +320,7 @@ proc spmiDimtolReport {objEntity} {
                         } else {
                           set dimrep($dimrepID) "$dim(symbol)$dim(lower)-$dim(upper)"
                         }
+                        lappend spmiTypesPerFile "value range"
 
                         set msg ""
                         if {([info exists dim(nominal)] && $dim(upper) < $dim(nominal)) || $dim(upper) < $dim(lower)} {
@@ -362,10 +363,13 @@ proc spmiDimtolReport {objEntity} {
 # check for problems with related_shape_aspect
                     set msg ""
                     set rsa [[[$objEntity Attributes] Item [expr 4]] Value]
-                    if {[$objValue P21ID] == [$rsa P21ID]} {set msg "Syntax Error: Identical 'relating' and 'related' shape aspects on dimensional_location"}
-                    if {$rsa == ""} {set msg "Syntax Error: Missing 'related_shape_aspect' on dimensional_location"}
+                    if {$rsa == ""} {
+                      set msg "Syntax Error: Missing 'related_shape_aspect'"
+                    } elseif {[$objValue P21ID] == [$rsa P21ID]} {
+                      set msg "Syntax Error: Identical 'relating' and 'related' shape aspects"
+                    }
                     if {$msg != ""} {
-                      append msg "$spaces\($recPracNames(pmi242), Sec. 5.1.1)"
+                      append msg " on [formatComplexEnt $ent($entLevel)]$spaces\($recPracNames(pmi242), Sec. 5.1.1)"
                       errorMsg $msg
                       lappend syntaxErr(dimensional_location) [list $objID "related_shape_aspect" $msg]
                     }
@@ -842,9 +846,9 @@ proc spmiDimtolReport {objEntity} {
                         if {[string first "dimension name" $colName] == 0} {
                           set comment "Section numbers refer to the CAx-IF Recommended Practice for Representation and Presentation of PMI (AP242)."
                         } elseif {[string first "length/angle precision" $colName] == 0} {
-                          set str ""
-                          if {$opt(PMISEMRND)} {set str ", round,"}
-                          set comment "The precision might truncate$str or add trailing zeros to the 'length/angle'.  Column D shows the value with the precision applied.  See option on the More tab to Round dimensions and geometric tolerances."
+                          set str "TRUNCATE"
+                          if {$opt(PMISEMRND)} {set str "ROUND"}
+                          set comment "The precision will $str or add trailing zeros to the 'length/angle'.  Column D shows the value with the precision applied.  See option on the More tab to Round dimensions and geometric tolerances. ($recPracNames(pmi242), Sec. 5.4)"
                         }
                         if {$comment != ""} {addCellComment $dt 3 $c $comment}
                       }
@@ -877,10 +881,6 @@ proc spmiDimtolReport {objEntity} {
                         errorMsg $msg
                         lappend syntaxErr($dt) [list -$r "length/angle name" $msg]
                       }
-                      if {($ov == "upper limit" || $ov == "lower limit") && $dim(num) > 2} {
-                        set item "value range"
-                        lappend spmiTypesPerFile $item
-                      }
                       if {[string first $ov $val] == -1} {$cells($dt) Item $r $c "$val[format "%c" 10]$ov"}
                     }
 
@@ -1202,9 +1202,9 @@ proc spmiDimtolReport {objEntity} {
                 $cells($dt) Item 3 $c $colName
                 set pmiHeading($pmiColumns(pmq)) 1
                 set pmiCol [expr {max($pmiColumns(pmq),$pmiCol)}]
-                set str ""
-                if {$opt(PMISEMRND)} {set str ", round,"}
-                set comment "The precision might truncate$str or add trailing zeros to the '+/- tolerance'.  Column D shows the value with the precision applied.  See option on the More tab to Round dimensions and geometric tolerances."
+                set str "TRUNCATE"
+                if {$opt(PMISEMRND)} {set str "ROUND"}
+                set comment "The precision will $str or add trailing zeros to the '+/- tolerance'.  Column D shows the value with the precision applied.  See option on the More tab to Round dimensions and geometric tolerances. ($recPracNames(pmi242), Sec. 5.4)"
                 addCellComment $dt 3 $c $comment
               }
               $cells($dt) Item $r $pmiColumns(pmq) [join $tolQual]
@@ -1403,13 +1403,19 @@ proc spmiDimtolReport {objEntity} {
           $cells($dt) Item 3 $c $colName
           set pmiHeading($pmiColumns(dmrp)) 1
           set pmiCol [expr {max($pmiColumns(dmrp),$pmiCol)}]
+
           set comment "See Help > User Guide (section 6.1.3) for an explanation of how the Dimensional Tolerances are constructed.  Results are summarized on the PMI Representation Summary worksheet."
           if {[info exists dim(unit)]} {append comment "\n\nDimension units: $dim(unit)"}
           append comment "\n\nRepetitive dimensions (e.g., 4X) are shown for diameter and radius.  They are computed based on the number of cylindrical, spherical, and toroidal surfaces associated with a dimension (see Associated Geometry column to the right) and, depending on the CAD system, might be off by a factor of two, have the wrong value, or be missing.  Repetitive dimensions are not computed for linear distance."
           if {$nistName != ""} {
             append comment "\n\nSee the PMI Representation Summary worksheet to see how the Dimensional Tolerance compares to the expected PMI."
           }
           addCellComment $dt 3 $c $comment
+
+          set hlink [$worksheet($dt) Hyperlinks]
+          set anchor [$worksheet($dt) Range [cellRange 3 $c]]
+          set hlsheet "'PMI Representation Summary'"
+          $hlink Add $anchor [string trim ""] "$hlsheet![cellRange 3 3]" ""
         }
 
 # add brackets or parentheses for basic or reference dimensions

diff --git a/source/sfa-ent.tcl b/source/sfa-ent.tcl
@@ -1,7 +1,7 @@
 # read entity and write to spreadsheet
 proc getEntity {objEntity rmax checkInverse checkBadAttributes unicodeCheck} {
   global attrType badAttributes cells col count entComment entCount entName entRows heading invMsg invVals matrixList opt roseLogical row
-  global sheetLast skipEntities skipFileName skipPerm syntaxErr thisEntType unicodeAttributes unicodeString worksheet worksheets wsCount wsNames
+  global sheetLast skipEntities skipFileName syntaxErr thisEntType unicodeAttributes unicodeString worksheet worksheets wsCount wsNames
 
 # get entity type
   set thisEntType [$objEntity Type]
@@ -64,8 +64,8 @@ proc getEntity {objEntity rmax checkInverse checkBadAttributes unicodeCheck} {
 # file of entities not to process
     if {[catch {
       set skipFile [open $skipFileName w]
-      foreach item $skipEntities {if {[lsearch $skipPerm $item] == -1} {puts $skipFile $item}}
-      if {[lsearch $skipEntities $thisEntType] == -1 && [lsearch $skipPerm $thisEntType] == -1} {puts $skipFile $thisEntType}
+      foreach item $skipEntities {puts $skipFile $item}
+      if {[lsearch $skipEntities $thisEntType] == -1} {puts $skipFile $thisEntType}
       close $skipFile
     } emsg]} {
       errorMsg "Error processing 'skip' file: $emsg"
@@ -420,7 +420,7 @@ proc setIDRow {entType p21id} {
 # -------------------------------------------------------------------------------------------------
 # read entity and write to CSV file
 proc getEntityCSV {objEntity checkBadAttributes} {
-  global badAttributes count csvdirnam csvfile csvinhome csvstr entCount fcsv mydocs roseLogical row rowmax skipEntities skipFileName skipPerm thisEntType
+  global badAttributes count csvdirnam csvfile csvinhome csvstr entCount fcsv mydocs roseLogical row rowmax skipEntities skipFileName thisEntType
 
 # get entity type
   set thisEntType [$objEntity Type]
@@ -462,8 +462,8 @@ proc getEntityCSV {objEntity checkBadAttributes} {
 # file of entities not to process
     if {[catch {
       set skipFile [open $skipFileName w]
-      foreach item $skipEntities {if {[lsearch $skipPerm $item] == -1} {puts $skipFile $item}}
-      if {[lsearch $skipEntities $thisEntType] == -1 && [lsearch $skipPerm $thisEntType] == -1} {puts $skipFile $thisEntType}
+      foreach item $skipEntities {puts $skipFile $item}
+      if {[lsearch $skipEntities $thisEntType] == -1} {puts $skipFile $thisEntType}
       close $skipFile
     } emsg]} {
       errorMsg "Error processing 'skip' file: $emsg"