Merge branch 'develop' into feature/pid-1-sheet-2/BK-2020-04

Update and combine sheet 2 branch's REVISIONS.org file.

 Conflicts:
	REVISIONS.org

diff --git a/DEL/BK-2020-04-PID-1-SHT2.pdf b/DEL/BK-2020-04-PID-1-SHT2.pdf
index 00e164b9a46017632130390d0f6c189231ee3a78..abd27d68b0b5193ca43141c1db237f389154ecc3 100644 (file)
Binary files a/DEL/BK-2020-04-PID-1-SHT2.pdf and b/DEL/BK-2020-04-PID-1-SHT2.pdf differ

diff --git a/DWG/BK-2020-04-PID-1-SHT2.svg b/DWG/BK-2020-04-PID-1-SHT2.svg
index 33f4f71ab78361da89e54acba1acd24ff23afdf6..2a1b505969c56b3126c81700f975514074532233 100644 (file)
--- a/DWG/BK-2020-04-PID-1-SHT2.svg
+++ b/DWG/BK-2020-04-PID-1-SHT2.svg
@@ -237,8 +237,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35355339"
-     inkscape:cx="1508.2353"
-     inkscape:cy="1128.7917"
+     inkscape:cx="1437.3031"
+     inkscape:cy="1112.752"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -2754,7 +2754,7 @@
          id="tspan10235"
          x="823.74994"
          y="582.75"
-         style="stroke-width:0.26458332">D</tspan></text>
+         style="stroke-width:0.26458332">E</tspan></text>
     <text
        inkscape:label="text_5.1.4..revision_index_label"
        xml:space="preserve"
@@ -2980,20 +2980,28 @@
        id="path2193"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 0.5, 0.25, 0.5;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-       d="M 27.5,14 H 425 V 81.5 H 225 V 579 H 25 V 14 Z"
-       id="path2495"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 0.5, 0.25, 0.5;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-       d="M 424.99999,81.5 V 466.49999 H 225"
-       id="path2497"
-       inkscape:connector-curvature="0" />
     <text
-       xml:space="preserve"
+       id="text1848"
+       y="582.75"
+       x="823.74994"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:1.25;font-family:osifont;-inkscape-font-specification:osifont;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       xml:space="preserve"
+       inkscape:label="text_5.1.4..revision_index_content"><tspan
+         style="stroke-width:0.26458332"
+         y="586.82465"
+         x="823.74994"
+         id="tspan1846"
+         sodipodi:role="line" /></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Group areas"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:1.25;font-family:osifont;-inkscape-font-specification:osifont;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
        x="-414.73242"
        y="38.647461"
        id="text2501"
@@ -3008,7 +3016,7 @@
        id="text2509"
        y="238.64746"
        x="-414.73242"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:1.25;font-family:osifont;-inkscape-font-specification:osifont;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:1.25;font-family:osifont;-inkscape-font-specification:osifont;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
        xml:space="preserve"><tspan
          id="tspan2507"
          style="font-size:10px;stroke-width:0.26458332"
@@ -3017,7 +3025,7 @@
          sodipodi:role="line">GROUP 4 — STEAM GENERATORS, FURNACES, RECOOLING DEVICE</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:1.25;font-family:osifont;-inkscape-font-specification:osifont;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:1.25;font-family:osifont;-inkscape-font-specification:osifont;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
        x="-414.73242"
        y="438.64746"
        id="text2513"
@@ -3027,18 +3035,17 @@
          y="438.64746"
          style="font-size:10px;stroke-width:0.26458332"
          id="tspan2511">GROUP 5 — COOLING TOWER</tspan></text>
-    <text
-       id="text1848"
-       y="582.75"
-       x="823.74994"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5px;line-height:1.25;font-family:osifont;-inkscape-font-specification:osifont;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-       xml:space="preserve"
-       inkscape:label="text_5.1.4..revision_index_content"><tspan
-         style="stroke-width:0.26458332"
-         y="582.75"
-         x="823.74994"
-         id="tspan1846"
-         sodipodi:role="line">D</tspan></text>
+    <path
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 0.5, 0.25, 0.5;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       d="M 27.5,14 H 425 V 81.5 H 225 V 579 H 25 V 14 Z"
+       id="path2495"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 0.5, 0.25, 0.5;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       d="M 424.99999,81.5 V 466.49999 H 225"
+       id="path2497"
+       inkscape:connector-curvature="0" />
   </g>
   <g
      inkscape:groupmode="layer"

diff --git a/REVISIONS.org b/REVISIONS.org
index 01109d53e11825ae385ebe2e6c03e7e00eaa7008..1331298c5d8ec5ca9df681c336ec40926b3519ef 100644 (file)
--- a/REVISIONS.org
+++ b/REVISIONS.org
@@ -16,13 +16,13 @@
 | 2020-09-24T05:34Z | D   | SBS     |          | Align symbols             |
 
 *** BK-2020-04-PID-1-SHT2
-| Revision date     | Rev | Creator | Approved | Comment                        |
-|-------------------+-----+---------+----------+--------------------------------|
-| 2020-09-24T03:33Z | A   | SBS     |          | Initial draft                  |
-| 2020-09-24T05:14Z | B   | SBS     |          | Align group titles, fix legend |
-| 2020-09-24T06:07Z | C   | SBS     |          | Remove minor errant line       |
-| 2020-09-24T06:17Z | D   | SBS     |          | Fix minor text misalign        |
-|                   |     |         |          |                                |
+| Revision date     | Rev | Creator | Approved | Comment                            |
+|-------------------+-----+---------+----------+------------------------------------|
+| 2020-09-24T03:33Z | A   | SBS     |          | Initial draft                      |
+| 2020-09-24T05:14Z | B   | SBS     |          | Align group titles, fix legend     |
+| 2020-09-24T06:07Z | C   | SBS     |          | Remove minor errant line           |
+| 2020-09-24T06:17Z | D   | SBS     |          | Fix minor text misalign            |
+| 2020-09-24T09:23Z | E   | SBS     |          | New layer: group partition objects |
 
 *** BK-2020-04-PID-1-SHT3
 | Revision date | Rev | Creator | Approved | Comment |

diff --git a/TODO.org b/TODO.org
index 33d988f9892cd7b01f32365053b84e69499445b9..e61a4f3327ffad12e5819a2f73a6d4cde86e6b9d 100644 (file)
--- a/TODO.org
+++ b/TODO.org
@@ -2,6 +2,8 @@
 ** Rename SHT1 Title "VESSELS, TANKS, COLUMNS"
 ** Mark "GROUP 1", "GROUP 2" in SHT1
 
+** Reorder REVISIONS dwg history columns
+Make "DWG.ID | REV | REVISION DATE | CREATED BY | APPROVED BY | COMMENT |"
 * Reference
 ** Drawing Grouping
 | Grp | Count | Category Desc.                                        | DWG. ID.              |