From 6eb26b40cff312e6478e86afc11a0511f04bab83 Mon Sep 17 00:00:00 2001 From: Giulia Malinverno Date: Tue, 19 Sep 2023 09:58:32 +0200 Subject: [PATCH 1/4] fix import_dxf + tests --- _unittest/example_models/cad/DXF/dxf2.dxf | 3968 +++++++++++++++++++++ _unittest/test_20_HFSS.py | 7 + _unittest/test_27_Maxwell2D.py | 3 +- _unittest/test_28_Maxwell3D.py | 3 +- _unittest/test_30_Q2D.py | 7 + _unittest/test_98_Icepak.py | 7 + pyaedt/application/Analysis3D.py | 4 +- 7 files changed, 3996 insertions(+), 3 deletions(-) create mode 100644 _unittest/example_models/cad/DXF/dxf2.dxf diff --git a/_unittest/example_models/cad/DXF/dxf2.dxf b/_unittest/example_models/cad/DXF/dxf2.dxf new file mode 100644 index 00000000000..ceff2d28494 --- /dev/null +++ b/_unittest/example_models/cad/DXF/dxf2.dxf @@ -0,0 +1,3968 @@ + 0 +SECTION + 2 +HEADER + 9 +$ACADVER + 1 +AC1012 + 9 +$DWGCODEPAGE + 3 +ansi_1252 + 9 +$INSBASE + 10 +0.0 + 20 +0.0 + 30 +0.0 + 9 +$EXTMIN + 10 +1.000000000000000E+20 + 20 +1.000000000000000E+20 + 30 +1.000000000000000E+20 + 9 +$EXTMAX + 10 +-1.000000000000000E+20 + 20 +-1.000000000000000E+20 + 30 +-1.000000000000000E+20 + 9 +$LIMMIN + 10 +0.0 + 20 +0.0 + 9 +$LIMMAX + 10 +12.0 + 20 +9.0 + 9 +$ORTHOMODE + 70 + 0 + 9 +$REGENMODE + 70 + 1 + 9 +$FILLMODE + 70 + 1 + 9 +$QTEXTMODE + 70 + 0 + 9 +$MIRRTEXT + 70 + 1 + 9 +$DRAGMODE + 70 + 2 + 9 +$LTSCALE + 40 +1.0 + 9 +$OSMODE + 70 + 37 + 9 +$ATTMODE + 70 + 1 + 9 +$TEXTSIZE + 40 +0.2 + 9 +$TRACEWID + 40 +0.05 + 9 +$TEXTSTYLE + 7 +STANDARD + 9 +$CLAYER + 8 +0 + 9 +$CELTYPE + 6 +BYLAYER + 9 +$CECOLOR + 62 + 256 + 9 +$CELTSCALE + 40 +1.0 + 9 +$DELOBJ + 70 + 1 + 9 +$DISPSILH + 70 + 0 + 9 +$DIMSCALE + 40 +1.0 + 9 +$DIMASZ + 40 +0.18 + 9 +$DIMEXO + 40 +0.0625 + 9 +$DIMDLI + 40 +0.38 + 9 +$DIMRND + 40 +0.0 + 9 +$DIMDLE + 40 +0.0 + 9 +$DIMEXE + 40 +0.18 + 9 +$DIMTP + 40 +0.0 + 9 +$DIMTM + 40 +0.0 + 9 +$DIMTXT + 40 +0.18 + 9 +$DIMCEN + 40 +0.09 + 9 +$DIMTSZ + 40 +0.0 + 9 +$DIMTOL + 70 + 0 + 9 +$DIMLIM + 70 + 0 + 9 +$DIMTIH + 70 + 1 + 9 +$DIMTOH + 70 + 1 + 9 +$DIMSE1 + 70 + 0 + 9 +$DIMSE2 + 70 + 0 + 9 +$DIMTAD + 70 + 0 + 9 +$DIMZIN + 70 + 0 + 9 +$DIMBLK + 1 + + 9 +$DIMASO + 70 + 1 + 9 +$DIMSHO + 70 + 1 + 9 +$DIMPOST + 1 + + 9 +$DIMAPOST + 1 + + 9 +$DIMALT + 70 + 0 + 9 +$DIMALTD + 70 + 2 + 9 +$DIMALTF + 40 +25.4 + 9 +$DIMLFAC + 40 +1.0 + 9 +$DIMTOFL + 70 + 0 + 9 +$DIMTVP + 40 +0.0 + 9 +$DIMTIX + 70 + 0 + 9 +$DIMSOXD + 70 + 0 + 9 +$DIMSAH + 70 + 0 + 9 +$DIMBLK1 + 1 + + 9 +$DIMBLK2 + 1 + + 9 +$DIMSTYLE + 2 +STANDARD + 9 +$DIMCLRD + 70 + 0 + 9 +$DIMCLRE + 70 + 0 + 9 +$DIMCLRT + 70 + 0 + 9 +$DIMTFAC + 40 +1.0 + 9 +$DIMGAP + 40 +0.09 + 9 +$DIMJUST + 70 + 0 + 9 +$DIMSD1 + 70 + 0 + 9 +$DIMSD2 + 70 + 0 + 9 +$DIMTOLJ + 70 + 1 + 9 +$DIMTZIN + 70 + 0 + 9 +$DIMALTZ + 70 + 0 + 9 +$DIMALTTZ + 70 + 0 + 9 +$DIMFIT + 70 + 3 + 9 +$DIMUPT + 70 + 0 + 9 +$DIMUNIT + 70 + 2 + 9 +$DIMDEC + 70 + 4 + 9 +$DIMTDEC + 70 + 4 + 9 +$DIMALTU + 70 + 2 + 9 +$DIMALTTD + 70 + 2 + 9 +$DIMTXSTY + 7 +STANDARD + 9 +$DIMAUNIT + 70 + 0 + 9 +$LUNITS + 70 + 2 + 9 +$LUPREC + 70 + 4 + 9 +$SKETCHINC + 40 +0.1 + 9 +$FILLETRAD + 40 +0.5 + 9 +$AUNITS + 70 + 0 + 9 +$AUPREC + 70 + 0 + 9 +$MENU + 1 +. + 9 +$ELEVATION + 40 +0.0 + 9 +$PELEVATION + 40 +0.0 + 9 +$THICKNESS + 40 +0.0 + 9 +$LIMCHECK + 70 + 0 + 9 +$CHAMFERA + 40 +0.0 + 9 +$CHAMFERB + 40 +0.0 + 9 +$CHAMFERC + 40 +0.0 + 9 +$CHAMFERD + 40 +0.0 + 9 +$SKPOLY + 70 + 0 + 9 +$TDCREATE + 40 +2460207.399557407 + 9 +$TDUPDATE + 40 +2460207.399557431 + 9 +$TDINDWG + 40 +0.0000000116 + 9 +$TDUSRTIMER + 40 +0.0000000116 + 9 +$USRTIMER + 70 + 1 + 9 +$ANGBASE + 50 +0.0 + 9 +$ANGDIR + 70 + 0 + 9 +$PDMODE + 70 + 0 + 9 +$PDSIZE + 40 +0.0 + 9 +$PLINEWID + 40 +0.0 + 9 +$COORDS + 70 + 1 + 9 +$SPLFRAME + 70 + 0 + 9 +$SPLINETYPE + 70 + 6 + 9 +$SPLINESEGS + 70 + 8 + 9 +$ATTDIA + 70 + 0 + 9 +$ATTREQ + 70 + 1 + 9 +$HANDLING + 70 + 1 + 9 +$HANDSEED + 5 +86 + 9 +$SURFTAB1 + 70 + 6 + 9 +$SURFTAB2 + 70 + 6 + 9 +$SURFTYPE + 70 + 6 + 9 +$SURFU + 70 + 6 + 9 +$SURFV + 70 + 6 + 9 +$UCSNAME + 2 + + 9 +$UCSORG + 10 +0.0 + 20 +0.0 + 30 +0.0 + 9 +$UCSXDIR + 10 +1.0 + 20 +0.0 + 30 +0.0 + 9 +$UCSYDIR + 10 +0.0 + 20 +1.0 + 30 +0.0 + 9 +$PUCSNAME + 2 + + 9 +$PUCSORG + 10 +0.0 + 20 +0.0 + 30 +0.0 + 9 +$PUCSXDIR + 10 +1.0 + 20 +0.0 + 30 +0.0 + 9 +$PUCSYDIR + 10 +0.0 + 20 +1.0 + 30 +0.0 + 9 +$USERI1 + 70 + 0 + 9 +$USERI2 + 70 + 0 + 9 +$USERI3 + 70 + 0 + 9 +$USERI4 + 70 + 0 + 9 +$USERI5 + 70 + 0 + 9 +$USERR1 + 40 +0.0 + 9 +$USERR2 + 40 +0.0 + 9 +$USERR3 + 40 +0.0 + 9 +$USERR4 + 40 +0.0 + 9 +$USERR5 + 40 +0.0 + 9 +$WORLDVIEW + 70 + 1 + 9 +$SHADEDGE + 70 + 3 + 9 +$SHADEDIF + 70 + 70 + 9 +$TILEMODE + 70 + 1 + 9 +$MAXACTVP + 70 + 64 + 9 +$PINSBASE + 10 +0.0 + 20 +0.0 + 30 +0.0 + 9 +$PLIMCHECK + 70 + 0 + 9 +$PEXTMIN + 10 +1.000000000000000E+20 + 20 +1.000000000000000E+20 + 30 +1.000000000000000E+20 + 9 +$PEXTMAX + 10 +-1.000000000000000E+20 + 20 +-1.000000000000000E+20 + 30 +-1.000000000000000E+20 + 9 +$PLIMMIN + 10 +0.0 + 20 +0.0 + 9 +$PLIMMAX + 10 +12.0 + 20 +9.0 + 9 +$UNITMODE + 70 + 0 + 9 +$VISRETAIN + 70 + 1 + 9 +$PLINEGEN + 70 + 0 + 9 +$PSLTSCALE + 70 + 1 + 9 +$TREEDEPTH + 70 + 3020 + 9 +$PICKSTYLE + 70 + 1 + 9 +$CMLSTYLE + 2 +STANDARD + 9 +$CMLJUST + 70 + 0 + 9 +$CMLSCALE + 40 +1.0 + 9 +$SAVEIMAGES + 70 + 1 + 0 +ENDSEC + 0 +SECTION + 2 +CLASSES + 0 +CLASS + 1 +ACDBDICTIONARYWDFLT + 2 +AcDbDictionaryWithDefault + 3 +ObjectDBX Classes + 90 + 32768 +280 + 0 +281 + 0 + 0 +CLASS + 1 +VISUALSTYLE + 2 +AcDbVisualStyle + 3 +ObjectDBX Classes + 90 + 4095 +280 + 0 +281 + 0 + 0 +CLASS + 1 +MATERIAL + 2 +AcDbMaterial + 3 +ObjectDBX Classes + 90 + 1153 +280 + 0 +281 + 0 + 0 +CLASS + 1 +SCALE + 2 +AcDbScale + 3 +ObjectDBX Classes + 90 + 1153 +280 + 0 +281 + 0 + 0 +CLASS + 1 +TABLESTYLE + 2 +AcDbTableStyle + 3 +ObjectDBX Classes + 90 + 4095 +280 + 0 +281 + 0 + 0 +CLASS + 1 +MLEADERSTYLE + 2 +AcDbMLeaderStyle + 3 +ACDB_MLEADERSTYLE_CLASS + 90 + 4095 +280 + 0 +281 + 0 + 0 +CLASS + 1 +SUN + 2 +AcDbSun + 3 +SCENEOE + 90 + 1153 +280 + 0 +281 + 0 + 0 +CLASS + 1 +DICTIONARYVAR + 2 +AcDbDictionaryVar + 3 +ObjectDBX Classes + 90 + 0 +280 + 0 +281 + 0 + 0 +CLASS + 1 +XRECORD + 2 +AcDbXrecord + 3 +ObjectDBX Classes + 90 + 32768 +280 + 0 +281 + 0 + 0 +CLASS + 1 +LWPOLYLINE + 2 +AcDbPolyline + 3 +ObjectDBX Classes + 90 + 32768 +280 + 0 +281 + 1 + 0 +CLASS + 1 +HATCH + 2 +AcDbHatch + 3 +ObjectDBX Classes + 90 + 32768 +280 + 0 +281 + 1 + 0 +CLASS + 1 +ACDBPLACEHOLDER + 2 +AcDbPlaceHolder + 3 +ObjectDBX Classes + 90 + 0 +280 + 0 +281 + 0 + 0 +CLASS + 1 +LAYOUT + 2 +AcDbLayout + 3 +ObjectDBX Classes + 90 + 0 +280 + 0 +281 + 0 + 0 +ENDSEC + 0 +SECTION + 2 +TABLES + 0 +TABLE + 2 +VPORT + 5 +8 +330 +0 +100 +AcDbSymbolTable + 70 + 1 + 0 +VPORT + 5 +29 +330 +8 +100 +AcDbSymbolTableRecord +100 +AcDbViewportTableRecord + 2 +*ACTIVE + 70 + 0 + 10 +0.0 + 20 +0.0 + 11 +1.0 + 21 +1.0 + 12 +10.42990654205607 + 22 +4.5 + 13 +0.0 + 23 +0.0 + 14 +0.5 + 24 +0.5 + 15 +0.5 + 25 +0.5 + 16 +0.0 + 26 +0.0 + 36 +1.0 + 17 +0.0 + 27 +0.0 + 37 +0.0 + 40 +9.0 + 41 +1.972972972850329 + 42 +50.0 + 43 +0.0 + 44 +0.0 + 50 +0.0 + 51 +0.0 + 71 + 0 + 72 + 100 + 73 + 1 + 74 + 3 + 75 + 0 + 76 + 0 + 77 + 0 + 78 + 0 + 0 +ENDTAB + 0 +TABLE + 2 +LTYPE + 5 +5 +330 +0 +100 +AcDbSymbolTable + 70 + 1 + 0 +LTYPE + 5 +14 +330 +5 +100 +AcDbSymbolTableRecord +100 +AcDbLinetypeTableRecord + 2 +BYBLOCK + 70 + 0 + 3 + + 72 + 65 + 73 + 0 + 40 +0.0 + 0 +LTYPE + 5 +15 +330 +5 +100 +AcDbSymbolTableRecord +100 +AcDbLinetypeTableRecord + 2 +BYLAYER + 70 + 0 + 3 + + 72 + 65 + 73 + 0 + 40 +0.0 + 0 +LTYPE + 5 +16 +330 +5 +100 +AcDbSymbolTableRecord +100 +AcDbLinetypeTableRecord + 2 +CONTINUOUS + 70 + 0 + 3 +Solid line + 72 + 65 + 73 + 0 + 40 +0.0 + 0 +ENDTAB + 0 +TABLE + 2 +LAYER + 5 +2 +330 +0 +100 +AcDbSymbolTable + 70 + 2 + 0 +LAYER + 5 +10 +330 +2 +100 +AcDbSymbolTableRecord +100 +AcDbLayerTableRecord + 2 +0 + 70 + 0 + 62 + 7 + 6 +CONTINUOUS + 0 +LAYER + 5 +6E +330 +2 +100 +AcDbSymbolTableRecord +100 +AcDbLayerTableRecord + 2 +LAYER_1 + 70 + 0 + 62 + 10 + 6 +CONTINUOUS + 0 +ENDTAB + 0 +TABLE + 2 +STYLE + 5 +3 +330 +0 +100 +AcDbSymbolTable + 70 + 1 + 0 +STYLE + 5 +11 +330 +3 +100 +AcDbSymbolTableRecord +100 +AcDbTextStyleTableRecord + 2 +STANDARD + 70 + 0 + 40 +0.0 + 41 +1.0 + 50 +0.0 + 71 + 0 + 42 +0.2 + 3 +txt + 4 + + 0 +ENDTAB + 0 +TABLE + 2 +VIEW + 5 +6 +330 +0 +100 +AcDbSymbolTable + 70 + 0 + 0 +ENDTAB + 0 +TABLE + 2 +UCS + 5 +7 +330 +0 +100 +AcDbSymbolTable + 70 + 0 + 0 +ENDTAB + 0 +TABLE + 2 +APPID + 5 +9 +330 +0 +100 +AcDbSymbolTable + 70 + 2 + 0 +APPID + 5 +12 +330 +9 +100 +AcDbSymbolTableRecord +100 +AcDbRegAppTableRecord + 2 +ACAD + 70 + 0 + 0 +APPID + 5 +85 +330 +9 +100 +AcDbSymbolTableRecord +100 +AcDbRegAppTableRecord + 2 +ACAD_MLEADERVER + 70 + 0 + 0 +ENDTAB + 0 +TABLE + 2 +DIMSTYLE + 5 +A +330 +0 +100 +AcDbSymbolTable + 70 + 1 + 0 +DIMSTYLE +105 +27 +330 +A +100 +AcDbSymbolTableRecord +100 +AcDbDimStyleTableRecord + 2 +STANDARD + 70 + 0 + 3 + + 4 + + 5 + + 6 + + 7 + + 40 +1.0 + 41 +0.18 + 42 +0.0625 + 43 +0.38 + 44 +0.18 + 45 +0.0 + 46 +0.0 + 47 +0.0 + 48 +0.0 +140 +0.18 +141 +0.09 +142 +0.0 +143 +25.4 +144 +1.0 +145 +0.0 +146 +1.0 +147 +0.09 + 71 + 0 + 72 + 0 + 73 + 1 + 74 + 1 + 75 + 0 + 76 + 0 + 77 + 0 + 78 + 0 +170 + 0 +171 + 2 +172 + 0 +173 + 0 +174 + 0 +175 + 0 +176 + 0 +177 + 0 +178 + 0 +270 + 2 +271 + 4 +272 + 4 +273 + 2 +274 + 2 +340 +11 +275 + 0 +280 + 0 +281 + 0 +282 + 0 +283 + 1 +284 + 0 +285 + 0 +286 + 0 +287 + 3 +288 + 0 + 0 +ENDTAB + 0 +TABLE + 2 +BLOCK_RECORD + 5 +1 +330 +0 +100 +AcDbSymbolTable + 70 + 0 + 0 +BLOCK_RECORD + 5 +1F +330 +1 +100 +AcDbSymbolTableRecord +100 +AcDbBlockTableRecord + 2 +*MODEL_SPACE + 0 +BLOCK_RECORD + 5 +1B +330 +1 +100 +AcDbSymbolTableRecord +100 +AcDbBlockTableRecord + 2 +*PAPER_SPACE + 0 +ENDTAB + 0 +ENDSEC + 0 +SECTION + 2 +BLOCKS + 0 +BLOCK + 5 +20 +330 +1F +100 +AcDbEntity + 8 +0 +100 +AcDbBlockBegin + 2 +*MODEL_SPACE + 70 + 0 + 10 +0.0 + 20 +0.0 + 30 +0.0 + 3 +*MODEL_SPACE + 1 + + 0 +ENDBLK + 5 +21 +330 +1F +100 +AcDbEntity + 8 +0 +100 +AcDbBlockEnd + 0 +BLOCK + 5 +1C +330 +1B +100 +AcDbEntity + 67 + 1 + 8 +0 +100 +AcDbBlockBegin + 2 +*PAPER_SPACE + 70 + 0 + 10 +0.0 + 20 +0.0 + 30 +0.0 + 3 +*PAPER_SPACE + 1 + + 0 +ENDBLK + 5 +1D +330 +1B +100 +AcDbEntity + 67 + 1 + 8 +0 +100 +AcDbBlockEnd + 0 +ENDSEC + 0 +SECTION + 2 +ENTITIES + 0 +POLYLINE + 5 +6F +330 +1F +100 +AcDbEntity + 8 +LAYER_1 +100 +AcDb2dPolyline + 66 + 1 + 10 +0.0 + 20 +0.0 + 30 +0.0 + 70 + 1 + 0 +VERTEX + 5 +70 +330 +6F +100 +AcDbEntity + 8 +0 +100 +AcDbVertex +100 +AcDb2dVertex + 10 +-0.6000000000000001 + 20 +1.0 + 30 +0.0 + 0 +VERTEX + 5 +71 +330 +6F +100 +AcDbEntity + 8 +0 +100 +AcDbVertex +100 +AcDb2dVertex + 10 +-0.6000000000000001 + 20 +-0.8 + 30 +0.0 + 0 +VERTEX + 5 +72 +330 +6F +100 +AcDbEntity + 8 +0 +100 +AcDbVertex +100 +AcDb2dVertex + 10 +0.9999999999999998 + 20 +-0.8 + 30 +0.0 + 0 +VERTEX + 5 +73 +330 +6F +100 +AcDbEntity + 8 +0 +100 +AcDbVertex +100 +AcDb2dVertex + 10 +0.9999999999999998 + 20 +1.0 + 30 +0.0 + 0 +VERTEX + 5 +74 +330 +6F +100 +AcDbEntity + 8 +0 +100 +AcDbVertex +100 +AcDb2dVertex + 10 +-0.6000000000000001 + 20 +1.0 + 30 +0.0 + 0 +SEQEND + 5 +75 +330 +6F +100 +AcDbEntity + 8 +LAYER_1 + 0 +ENDSEC + 0 +SECTION + 2 +OBJECTS + 0 +DICTIONARY + 5 +C +330 +0 +100 +AcDbDictionary + 3 +ACAD_GROUP +350 +D + 3 +ACAD_LAYOUT +350 +1A + 3 +ACAD_MATERIAL +350 +43 + 3 +ACAD_MLEADERSTYLE +350 +6B + 3 +ACAD_MLINESTYLE +350 +17 + 3 +ACAD_PLOTSETTINGS +350 +19 + 3 +ACAD_SCALELIST +350 +47 + 3 +ACAD_VISUALSTYLE +350 +2A + 3 +ACDBVARIABLEDICTIONARY +350 +76 +1001 +ACAD +1000 +TREAT_AS_HARD +1070 + 0 + 0 +DICTIONARY + 5 +D +102 +{ACAD_REACTORS +330 +C +102 +} +330 +C +100 +AcDbDictionary +1001 +ACAD +1000 +TREAT_AS_HARD +1070 + 0 + 0 +DICTIONARY + 5 +1A +102 +{ACAD_REACTORS +330 +C +102 +} +330 +C +100 +AcDbDictionary +1001 +ACAD +1000 +TREAT_AS_HARD +1070 + 0 + 0 +DICTIONARY + 5 +43 +102 +{ACAD_REACTORS +330 +C +102 +} +330 +C +100 +AcDbDictionary + 3 +BYBLOCK +350 +45 + 3 +BYLAYER +350 +44 + 3 +GLOBAL +350 +46 +1001 +ACAD +1000 +TREAT_AS_HARD +1070 + 0 + 0 +DICTIONARY + 5 +6B +102 +{ACAD_REACTORS +330 +C +102 +} +330 +C +100 +AcDbDictionary + 3 +STANDARD +350 +6C +1001 +ACAD +1000 +TREAT_AS_HARD +1070 + 0 + 0 +DICTIONARY + 5 +17 +102 +{ACAD_REACTORS +330 +C +102 +} +330 +C +100 +AcDbDictionary + 3 +STANDARD +350 +18 +1001 +ACAD +1000 +TREAT_AS_HARD +1070 + 0 + 0 +DICTIONARY + 5 +19 +102 +{ACAD_REACTORS +330 +C +102 +} +330 +C +100 +AcDbDictionary +1001 +ACAD +1000 +TREAT_AS_HARD +1070 + 0 + 0 +DICTIONARY + 5 +47 +102 +{ACAD_REACTORS +330 +C +102 +} +330 +C +100 +AcDbDictionary + 3 +A0 +350 +48 + 3 +A1 +350 +49 + 3 +A2 +350 +4A + 3 +A3 +350 +4B + 3 +A4 +350 +4C + 3 +A5 +350 +4D + 3 +A6 +350 +4E + 3 +A7 +350 +4F + 3 +A8 +350 +50 + 3 +A9 +350 +51 + 3 +B0 +350 +52 + 3 +B1 +350 +53 + 3 +B2 +350 +54 + 3 +B3 +350 +55 + 3 +B4 +350 +56 + 3 +B5 +350 +57 + 3 +B6 +350 +58 + 3 +B7 +350 +59 + 3 +B8 +350 +5A + 3 +B9 +350 +5B + 3 +C0 +350 +5C + 3 +C1 +350 +5D + 3 +C2 +350 +5E + 3 +C3 +350 +5F + 3 +C4 +350 +60 + 3 +C5 +350 +61 + 3 +C6 +350 +62 + 3 +C7 +350 +63 + 3 +C8 +350 +64 + 3 +C9 +350 +65 + 3 +D0 +350 +66 + 3 +D1 +350 +67 + 3 +D2 +350 +68 +1001 +ACAD +1000 +TREAT_AS_HARD +1070 + 0 + 0 +DICTIONARY + 5 +2A +102 +{ACAD_REACTORS +330 +C +102 +} +330 +C +100 +AcDbDictionary + 3 +2DWIREFRAME +350 +2F + 3 +BASIC +350 +32 + 3 +BRIGHTEN +350 +36 + 3 +COLORCHANGE +350 +3A + 3 +CONCEPTUAL +350 +34 + 3 +DIM +350 +35 + 3 +EDGECOLOROFF +350 +3D + 3 +FACEPATTERN +350 +39 + 3 +FLAT +350 +2B + 3 +FLATWITHEDGES +350 +2C + 3 +GOURAUD +350 +2D + 3 +GOURAUDWITHEDGES +350 +2E + 3 +HIDDEN +350 +31 + 3 +JITTEROFF +350 +3B + 3 +LINEPATTERN +350 +38 + 3 +OVERHANGOFF +350 +3C + 3 +REALISTIC +350 +33 + 3 +SHADED +350 +42 + 3 +SHADED_WITH_EDGES +350 +41 + 3 +SHADES_OF_GRAY +350 +3E + 3 +SKETCHY +350 +3F + 3 +THICKEN +350 +37 + 3 +WIREFRAME +350 +30 + 3 +X-RAY +350 +40 +1001 +ACAD +1000 +TREAT_AS_HARD +1070 + 0 + 0 +DICTIONARY + 5 +76 +102 +{ACAD_REACTORS +330 +C +102 +} +330 +C +100 +AcDbDictionary + 3 +CANNOSCALE +350 +7D + 3 +CMLEADERSTYLE +350 +78 + 3 +CTABLESTYLE +350 +77 + 3 +DIMASSOC +350 +7B + 3 +HIDETEXT +350 +7C + 3 +MSLTSCALE +350 +7E +1001 +ACAD +1000 +TREAT_AS_HARD +1070 + 0 + 0 +MATERIAL + 5 +45 +102 +{ACAD_REACTORS +330 +43 +102 +} +102 +{ACAD_XDICTIONARY +360 +81 +102 +} +330 +43 +100 +AcDbMaterial + 1 +BYBLOCK + 0 +MATERIAL + 5 +44 +102 +{ACAD_REACTORS +330 +43 +102 +} +102 +{ACAD_XDICTIONARY +360 +7F +102 +} +330 +43 +100 +AcDbMaterial + 1 +BYLAYER + 0 +MATERIAL + 5 +46 +102 +{ACAD_REACTORS +330 +43 +102 +} +102 +{ACAD_XDICTIONARY +360 +83 +102 +} +330 +43 +100 +AcDbMaterial + 1 +GLOBAL + 0 +ACAD_PROXY_OBJECT + 5 +6C +102 +{ACAD_REACTORS +330 +6B +102 +} +330 +6B +100 +AcDbZombieObject + 90 + 499 + 91 + 505 + 93 + 610 +310 +40901902A4063FBFFFFFE056BD1B81E855B9FC0AD7A3703D0AD73F4214DD185B99185C9900AD7A3703D0AC73F90141901A02B5E8DC0F42B1CFC02B5E8DC0F42B1CFE5764000000000000300FC0 +340 +14 +340 +0 +340 +11 +340 +0 + 94 + 0 +1001 +ACAD_MLEADERVER +1070 + 2 + 0 +MLINESTYLE + 5 +18 +102 +{ACAD_REACTORS +330 +17 +102 +} +330 +17 +100 +AcDbMlineStyle + 2 +Standard + 70 + 0 + 3 + + 62 + 256 + 51 +90.0 + 52 +90.0 + 71 + 2 + 49 +0.5 + 62 + 256 + 6 +BYLAYER + 49 +-0.5 + 62 + 256 + 6 +BYLAYER + 0 +ACAD_PROXY_OBJECT + 5 +48 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 41 +310 +903313A31580 + 0 +ACAD_PROXY_OBJECT + 5 +49 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 105 +310 +903313A324000000000000004000 + 0 +ACAD_PROXY_OBJECT + 5 +4A +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 105 +310 +903313A344000000000000104000 + 0 +ACAD_PROXY_OBJECT + 5 +4B +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 105 +310 +903313A354000000000000144000 + 0 +ACAD_PROXY_OBJECT + 5 +4C +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 105 +310 +903313A384000000000000204000 + 0 +ACAD_PROXY_OBJECT + 5 +4D +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 113 +310 +904313A31304000000000000244000 + 0 +ACAD_PROXY_OBJECT + 5 +4E +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 113 +310 +904313A31364000000000000304000 + 0 +ACAD_PROXY_OBJECT + 5 +4F +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 113 +310 +904313A32304000000000000344000 + 0 +ACAD_PROXY_OBJECT + 5 +50 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 113 +310 +904313A333040000000000003E4000 + 0 +ACAD_PROXY_OBJECT + 5 +51 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 113 +310 +904313A34304000000000000444000 + 0 +ACAD_PROXY_OBJECT + 5 +52 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 113 +310 +904313A35304000000000000494000 + 0 +ACAD_PROXY_OBJECT + 5 +53 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 121 +310 +905313A3130304000000000000594000 + 0 +ACAD_PROXY_OBJECT + 5 +54 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 105 +310 +903323A310000000000000010100 + 0 +ACAD_PROXY_OBJECT + 5 +55 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 105 +310 +903343A310000000000000410100 + 0 +ACAD_PROXY_OBJECT + 5 +56 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 105 +310 +903383A310000000000000810100 + 0 +ACAD_PROXY_OBJECT + 5 +57 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 113 +310 +90431303A310000000000000910100 + 0 +ACAD_PROXY_OBJECT + 5 +58 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 121 +310 +9053130303A310000000000001650100 + 0 +ACAD_PROXY_OBJECT + 5 +59 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 257 +310 +90E312F31323822203D2031272D3022000000000000200FC000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +5A +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 249 +310 +90D312F363422203D2031272D3022000000000000240FC000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +5B +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 249 +310 +90D312F333222203D2031272D3022000000000000280FC000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +5C +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 249 +310 +90D312F313622203D2031272D30220000000000002C0FC000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +5D +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 249 +310 +90D332F333222203D2031272D30220000000000002E0FC000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +5E +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 241 +310 +90C312F3822203D2031272D3022000000000000300FC000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +5F +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 249 +310 +90D332F313622203D2031272D3022000000000000320FC000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +60 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 241 +310 +90C312F3422203D2031272D3022000000000000340FC000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +61 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 241 +310 +90C332F3822203D2031272D3022000000000000360FC000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +62 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 241 +310 +90C312F3222203D2031272D3022000000000000380FC000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +63 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 241 +310 +90C332F3422203D2031272D30220000000000003A0FC000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +64 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 161 +310 +90A3122203D2031272D30224000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +65 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 257 +310 +90E312D312F3222203D2031272D30220000000000003E0FC000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +66 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 225 +310 +90A3322203D2031272D302200000000000002100000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +67 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 225 +310 +90A3622203D2031272D302200000000000006100000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +68 +102 +{ACAD_REACTORS +330 +47 +102 +} +330 +47 +100 +AcDbZombieObject + 90 + 499 + 91 + 503 + 93 + 249 +310 +90D31272D3022203D2031272D30220000000000000A100000000000000284000 + 0 +ACAD_PROXY_OBJECT + 5 +2F +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 436 +310 +42CC9915DA5C99599C985B595049028333333333333E33F0000000000000F90107901411070040501600405405064090741402480A0340 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +32 +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 388 +310 +4150985CDA58D07406404333333333333E33F0000000000000F90107A41107004050150841D405064090741402480A0350 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +36 +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 428 +310 +42109C9A59DA1D195B90C409028333333333333E33F0000000000000F9010790141107004050150841D405064090741402480A029950 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +3A +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 452 +310 +42D0DBDB1BDC90DA185B99D95104090240C333333333333E33F0000000000000F90108901411070040501508421405064090741402480A0350 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +34 +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 500 +310 +4290DBDB98D95C1D1D585B10940D028333333333333E33F0000000000000F90107902409070040501000000000018199010841D405064090740C02480A0340 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +35 +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 412 +310 +40D11A5B50B409028333333333333E33F0000000000000F9010790141107004050150841D405064090741402480A02677FFFFFD0 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +3D +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 452 +310 +43115919D950DBDB1BDC93D999916409028333333333333E33F0000000000000F9010790141107004050150841D405064090741402480A0350 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +39 +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 444 +310 +42D19858D95C185D1D195C9B90F409028333333333333E33F0000000000000F9010790141107004050150841D405064090741402480A0350 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +2B +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 380 +310 +41119B185D240901404333333333333E33F0000000000000F9010740A907004050150841D405064090741402480A1B50 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +2C +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 468 +310 +43519B185D15DA5D1A115919D95CD0140901404333333333333E33F0000000000000F90107409019070040501600405405064090741402480A1B50 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +2D +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 404 +310 +41D1DBDD5C985D5910240902404333333333333E33F0000000000000F9010740A9070040501641D405064090741402480A1B50 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +2E +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 492 +310 +4411DBDD5C985D5915DA5D1A115919D95CD0340902404333333333333E33F0000000000000F90107409019070040501600405405064090741402480A1B50 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +31 +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 476 +310 +41921A5919195B90640502408333333333333E33F0000000000000F901079024090700405020000000000001110200405405064090740C02480A0340 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +3B +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 428 +310 +42529A5D1D195C93D999914409028333333333333E33F0000000000000F9010790141107004050150A41D405064090741402480A0350 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +38 +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 444 +310 +42D31A5B995C185D1D195C9B90E409028333333333333E33F0000000000000F9010790141107004050750841D405064090741402483A0350 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +3C +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 444 +310 +42D3DD995C9A185B99D3D999915409028333333333333E33F0000000000000F9010790141107004050150941D405064090741402480A0350 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +33 +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 428 +310 +425499585B1A5CDD1A58D08409038333333333333E33F0000000000000F9010740A907004050150800405405064090740C02480A1B40 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +42 +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 420 +310 +4194DA1859195911B40902404333333333333E33F0000000000000F9010740A41107004050150800405405064090840C02480A0B40 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +41 +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 516 +310 +4454DA18591959081DDA5D1A08195919D95CD1A40902404333333333333E33F0000000000000F901074090142907004050250800405405064090740C02480A0B40 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +3E +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 532 +310 +4394DA1859195CC81BD98811DC985E5174090240C333333333333E33F0000000000000F901079024090741D01000000000000111010841D405064090740C02480A0340 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +3F +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 476 +310 +41D4DAD95D18DA1E51840502408333333333333E33F0000000000000F901079024090741D01000000000000111010B41D405064090741802480A0340 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +37 +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 412 +310 +41D51A1A58DAD95B90D409028333333333333E33F0000000000000F9010790141107004050150C41D405064090741402480A0350 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +30 +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 420 +310 +4255DA5C99599C985B595059028333333333333E33F0000000000000F90107901411070040501600405405064090740C02480A0340 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +ACAD_PROXY_OBJECT + 5 +40 +102 +{ACAD_REACTORS +330 +2A +102 +} +330 +2A +100 +AcDbZombieObject + 90 + 499 + 91 + 501 + 93 + 404 +310 +41560B54985E51940902404000000000000E03F0000000000000F9010740501907004050150841D405064090740C02480A1B40 +1001 +ACAD +1000 +AcDbSavedByObjectVersion +1070 + 0 + 0 +DICTIONARYVAR + 5 +7D +102 +{ACAD_REACTORS +330 +76 +102 +} +330 +76 +100 +DictionaryVariables +280 + 0 + 1 +1:1 + 0 +DICTIONARYVAR + 5 +78 +102 +{ACAD_REACTORS +330 +76 +102 +} +330 +76 +100 +DictionaryVariables +280 + 0 + 1 +Standard + 0 +DICTIONARYVAR + 5 +77 +102 +{ACAD_REACTORS +330 +76 +102 +} +330 +76 +100 +DictionaryVariables +280 + 0 + 1 +Standard + 0 +DICTIONARYVAR + 5 +7B +102 +{ACAD_REACTORS +330 +76 +102 +} +330 +76 +100 +DictionaryVariables +280 + 0 + 1 +2 + 0 +DICTIONARYVAR + 5 +7C +102 +{ACAD_REACTORS +330 +76 +102 +} +330 +76 +100 +DictionaryVariables +280 + 0 + 1 +1 + 0 +DICTIONARYVAR + 5 +7E +102 +{ACAD_REACTORS +330 +76 +102 +} +330 +76 +100 +DictionaryVariables +280 + 0 + 1 +1 + 0 +DICTIONARY + 5 +81 +330 +45 +100 +AcDbDictionary + 3 +ACAD_XREC_ROUNDTRIP +360 +82 +1001 +ACAD +1000 +TREAT_AS_HARD +1070 + 1 + 0 +DICTIONARY + 5 +7F +330 +44 +100 +AcDbDictionary + 3 +ACAD_XREC_ROUNDTRIP +360 +80 +1001 +ACAD +1000 +TREAT_AS_HARD +1070 + 1 + 0 +DICTIONARY + 5 +83 +330 +46 +100 +AcDbDictionary + 3 +ACAD_XREC_ROUNDTRIP +360 +84 +1001 +ACAD +1000 +TREAT_AS_HARD +1070 + 1 + 0 +XRECORD + 5 +82 +102 +{ACAD_REACTORS +330 +81 +102 +} +330 +81 +100 +AcDbXrecord +102 +MATERIAL +148 +0.0 +149 +0.0 +149 +0.0 + 93 + 0 + 94 + 127 +282 + 0 + 72 + 1 + 77 + 1 +171 + 1 +175 + 1 +179 + 1 +273 + 0 + 0 +XRECORD + 5 +80 +102 +{ACAD_REACTORS +330 +7F +102 +} +330 +7F +100 +AcDbXrecord +102 +MATERIAL +148 +0.0 +149 +0.0 +149 +0.0 + 93 + 0 + 94 + 127 +282 + 0 + 72 + 1 + 77 + 1 +171 + 1 +175 + 1 +179 + 1 +273 + 0 + 0 +XRECORD + 5 +84 +102 +{ACAD_REACTORS +330 +83 +102 +} +330 +83 +100 +AcDbXrecord +102 +MATERIAL +148 +0.0 +149 +0.0 +149 +0.0 + 93 + 0 + 94 + 127 +282 + 0 + 72 + 1 + 77 + 1 +171 + 1 +175 + 1 +179 + 1 +273 + 0 + 0 +ENDSEC + 0 +EOF diff --git a/_unittest/test_20_HFSS.py b/_unittest/test_20_HFSS.py index 40b54150ac8..2edba828e93 100644 --- a/_unittest/test_20_HFSS.py +++ b/_unittest/test_20_HFSS.py @@ -1529,3 +1529,10 @@ def test_63_set_phase_center_per_port(self): assert self.aedtapp.set_phase_center_per_port(["Global", "Global"]) assert not self.aedtapp.set_phase_center_per_port(["Global"]) assert not self.aedtapp.set_phase_center_per_port("Global") + + def test_64_import_dxf(self): + self.aedtapp.insert_design("dxf") + dxf_file = os.path.join(local_path, "example_models", "cad", "DXF", "dxf2.dxf") + dxf_layers = self.aedtapp.get_dxf_layers(dxf_file) + assert isinstance(dxf_layers, list) + assert self.aedtapp.import_dxf(dxf_file, dxf_layers) diff --git a/_unittest/test_27_Maxwell2D.py b/_unittest/test_27_Maxwell2D.py index bd15edf44cc..7b066c669ee 100644 --- a/_unittest/test_27_Maxwell2D.py +++ b/_unittest/test_27_Maxwell2D.py @@ -452,6 +452,7 @@ def test_32_control_program(self): def test_33_import_dxf(self): self.aedtapp.insert_design("dxf") - dxf_file = os.path.join(local_path, "example_models", "cad", "DXF", "dxf1.dxf") + dxf_file = os.path.join(local_path, "example_models", "cad", "DXF", "dxf2.dxf") dxf_layers = self.aedtapp.get_dxf_layers(dxf_file) assert isinstance(dxf_layers, list) + assert self.aedtapp.import_dxf(dxf_file, dxf_layers) diff --git a/_unittest/test_28_Maxwell3D.py b/_unittest/test_28_Maxwell3D.py index 6fd2576a7f2..d16b0360582 100644 --- a/_unittest/test_28_Maxwell3D.py +++ b/_unittest/test_28_Maxwell3D.py @@ -850,9 +850,10 @@ def test_50_objects_segmentation(self, cyl_gap): def test_51_import_dxf(self): self.aedtapp.insert_design("dxf") - dxf_file = os.path.join(local_path, "example_models", "cad", "DXF", "dxf1.dxf") + dxf_file = os.path.join(local_path, "example_models", "cad", "DXF", "dxf2.dxf") dxf_layers = self.aedtapp.get_dxf_layers(dxf_file) assert isinstance(dxf_layers, list) + assert self.aedtapp.import_dxf(dxf_file, dxf_layers) def test_52_assign_flux_tangential(self): self.aedtapp.insert_design("flux_tangential") diff --git a/_unittest/test_30_Q2D.py b/_unittest/test_30_Q2D.py index 928ac779df7..61311a9329d 100644 --- a/_unittest/test_30_Q2D.py +++ b/_unittest/test_30_Q2D.py @@ -286,3 +286,10 @@ def test_17_set_variable(self): self.aedtapp["var_test"] = "234" assert "var_test" in self.aedtapp.variable_manager.design_variable_names assert self.aedtapp.variable_manager.design_variables["var_test"].expression == "234" + + def test_18_import_dxf(self): + self.aedtapp.insert_design("dxf") + dxf_file = os.path.join(local_path, "example_models", "cad", "DXF", "dxf2.dxf") + dxf_layers = self.aedtapp.get_dxf_layers(dxf_file) + assert isinstance(dxf_layers, list) + assert self.aedtapp.import_dxf(dxf_file, dxf_layers) diff --git a/_unittest/test_98_Icepak.py b/_unittest/test_98_Icepak.py index f5f84481aff..b302c7b654b 100644 --- a/_unittest/test_98_Icepak.py +++ b/_unittest/test_98_Icepak.py @@ -1295,3 +1295,10 @@ def test_66_update_3d_component(self): comp.modeler.create_3dcomponent(component_filepath) comp.close_project() assert self.aedtapp.modeler.user_defined_components["test"].update_definition() + + def test_67_import_dxf(self): + self.aedtapp.insert_design("dxf") + dxf_file = os.path.join(local_path, "example_models", "cad", "DXF", "dxf2.dxf") + dxf_layers = self.aedtapp.get_dxf_layers(dxf_file) + assert isinstance(dxf_layers, list) + assert self.aedtapp.import_dxf(dxf_file, dxf_layers) diff --git a/pyaedt/application/Analysis3D.py b/pyaedt/application/Analysis3D.py index 13053191296..59ce08275d0 100644 --- a/pyaedt/application/Analysis3D.py +++ b/pyaedt/application/Analysis3D.py @@ -1231,7 +1231,9 @@ def import_dxf( self.logger.error("{} does not exist in specified dxf.".format(layer)) return False - if self.is3d: + if self.design_type not in ["Maxwell3d", "Q3d"]: + sheet_bodies_2d = True + else: sheet_bodies_2d = False vArg1 = ["NAME:options"] From 323613978edfdc1fd2128c086188027b71881157 Mon Sep 17 00:00:00 2001 From: Giulia Malinverno Date: Tue, 19 Sep 2023 10:08:54 +0200 Subject: [PATCH 2/4] fix import_dxf --- pyaedt/application/Analysis3D.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyaedt/application/Analysis3D.py b/pyaedt/application/Analysis3D.py index 59ce08275d0..93ed1c4fac2 100644 --- a/pyaedt/application/Analysis3D.py +++ b/pyaedt/application/Analysis3D.py @@ -1231,10 +1231,10 @@ def import_dxf( self.logger.error("{} does not exist in specified dxf.".format(layer)) return False - if self.design_type not in ["Maxwell3d", "Q3d"]: - sheet_bodies_2d = True - else: + if hasattr(self, "is3d") and self.is3d: sheet_bodies_2d = False + else: + sheet_bodies_2d = True vArg1 = ["NAME:options"] vArg1.append("FileName:="), vArg1.append(file_path.replace(os.sep, "/")) From d6260e33407a37f392eaf8d609bc9ae391ba6d10 Mon Sep 17 00:00:00 2001 From: Giulia Malinverno Date: Tue, 19 Sep 2023 14:00:43 +0200 Subject: [PATCH 3/4] skipif in tests --- _unittest/test_20_HFSS.py | 1 + _unittest/test_27_Maxwell2D.py | 1 + _unittest/test_28_Maxwell3D.py | 1 + _unittest/test_30_Q2D.py | 2 ++ _unittest/test_98_Icepak.py | 1 + 5 files changed, 6 insertions(+) diff --git a/_unittest/test_20_HFSS.py b/_unittest/test_20_HFSS.py index 2edba828e93..4085f485203 100644 --- a/_unittest/test_20_HFSS.py +++ b/_unittest/test_20_HFSS.py @@ -1530,6 +1530,7 @@ def test_63_set_phase_center_per_port(self): assert not self.aedtapp.set_phase_center_per_port(["Global"]) assert not self.aedtapp.set_phase_center_per_port("Global") + @pytest.mark.skipif(config["NonGraphical"], reason="Test fails on build machine") def test_64_import_dxf(self): self.aedtapp.insert_design("dxf") dxf_file = os.path.join(local_path, "example_models", "cad", "DXF", "dxf2.dxf") diff --git a/_unittest/test_27_Maxwell2D.py b/_unittest/test_27_Maxwell2D.py index 7b066c669ee..cc4ceecdb44 100644 --- a/_unittest/test_27_Maxwell2D.py +++ b/_unittest/test_27_Maxwell2D.py @@ -450,6 +450,7 @@ def test_32_control_program(self): if os.path.exists(user_ctl_path): os.unlink(user_ctl_path) + @pytest.mark.skipif(config["NonGraphical"], reason="Test fails on build machine") def test_33_import_dxf(self): self.aedtapp.insert_design("dxf") dxf_file = os.path.join(local_path, "example_models", "cad", "DXF", "dxf2.dxf") diff --git a/_unittest/test_28_Maxwell3D.py b/_unittest/test_28_Maxwell3D.py index d16b0360582..cba49759cfc 100644 --- a/_unittest/test_28_Maxwell3D.py +++ b/_unittest/test_28_Maxwell3D.py @@ -848,6 +848,7 @@ def test_50_objects_segmentation(self, cyl_gap): assert isinstance(sheets[object_name], list) assert len(sheets[object_name]) == segments_number - 1 + @pytest.mark.skipif(config["NonGraphical"], reason="Test fails on build machine") def test_51_import_dxf(self): self.aedtapp.insert_design("dxf") dxf_file = os.path.join(local_path, "example_models", "cad", "DXF", "dxf2.dxf") diff --git a/_unittest/test_30_Q2D.py b/_unittest/test_30_Q2D.py index 61311a9329d..fc6bd560c0c 100644 --- a/_unittest/test_30_Q2D.py +++ b/_unittest/test_30_Q2D.py @@ -1,5 +1,6 @@ import os +from _unittest.conftest import config from _unittest.conftest import desktop_version from _unittest.conftest import local_path import pytest @@ -287,6 +288,7 @@ def test_17_set_variable(self): assert "var_test" in self.aedtapp.variable_manager.design_variable_names assert self.aedtapp.variable_manager.design_variables["var_test"].expression == "234" + @pytest.mark.skipif(config["NonGraphical"], reason="Test fails on build machine") def test_18_import_dxf(self): self.aedtapp.insert_design("dxf") dxf_file = os.path.join(local_path, "example_models", "cad", "DXF", "dxf2.dxf") diff --git a/_unittest/test_98_Icepak.py b/_unittest/test_98_Icepak.py index b302c7b654b..9d05d870885 100644 --- a/_unittest/test_98_Icepak.py +++ b/_unittest/test_98_Icepak.py @@ -1296,6 +1296,7 @@ def test_66_update_3d_component(self): comp.close_project() assert self.aedtapp.modeler.user_defined_components["test"].update_definition() + @pytest.mark.skipif(config["NonGraphical"], reason="Test fails on build machine") def test_67_import_dxf(self): self.aedtapp.insert_design("dxf") dxf_file = os.path.join(local_path, "example_models", "cad", "DXF", "dxf2.dxf") From a84d9c946d019728fafcacc60eb1f5abaf30f180 Mon Sep 17 00:00:00 2001 From: Samuel Lopez Date: Tue, 19 Sep 2023 15:49:51 +0200 Subject: [PATCH 4/4] Remove non graphical hardcoded --- _unittest/test_44_TouchstoneParser.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/_unittest/test_44_TouchstoneParser.py b/_unittest/test_44_TouchstoneParser.py index 2f5872f0383..5852b3fb7dc 100644 --- a/_unittest/test_44_TouchstoneParser.py +++ b/_unittest/test_44_TouchstoneParser.py @@ -1,12 +1,10 @@ import os -from _unittest.conftest import config from _unittest.conftest import local_path import pytest from pyaedt import Hfss3dLayout -config["NonGraphical"] = False test_subfolder = "T44" test_T44_dir = os.path.join(local_path, "example_models", test_subfolder)