OcdFileExport/Import: Handle V12 area clipping

Resolves GH-1424.

Author: dg0yt

src/fileformats/ocd_file_export.cpp

@@ -1256,6 +1256,8 @@ quint8 OcdFileExport::exportAreaSymbolCommon(const AreaSymbol* area_symbol, OcdA
 		ocd_area_common.fill_color = convertColor(area_symbol->getColor());
 	}
 
+	ocd_area_common.structure_draw_V12 = 0;
+	
 	quint8 flags = 0;
 	// Hatch
 	// ocd_area_common.hatch_mode = Ocd::HatchNone; // 0
@@ -1333,7 +1335,28 @@ quint8 OcdFileExport::exportAreaSymbolCommon(const AreaSymbol* area_symbol, OcdA
 				addWarning(tr("In area symbol \"%1\", skipping a fill pattern.").arg(area_symbol->getPlainTextName()));
 			}
 		}
+		
+		if (ocd_version >= 12
+		    && ocd_area_common.structure_mode != Ocd::StructureNone)
+		{
+			switch (pattern.clipping())
+			{
+			case AreaSymbol::FillPattern::NoClippingIfCompletelyInside:
+				ocd_area_common.structure_draw_V12 = 1;
+				break;
+			case AreaSymbol::FillPattern::NoClippingIfCenterInside:
+				ocd_area_common.structure_draw_V12 = 2;
+				break;
+			case AreaSymbol::FillPattern::NoClippingIfPartiallyInside:
+				ocd_area_common.structure_draw_V12 = 3;
+				break;
+			default:
+				// no change
+				break;
+			}
+		}
 	}
+	
 	return flags;
 }
 

src/fileformats/ocd_file_import.cpp

@@ -1659,6 +1659,25 @@ void OcdFileImport::setupAreaSymbolCommon(OcdImportedAreaSymbol* symbol, bool fi
 			pattern.offset_along_line = pattern.point_distance / 2;
 			pattern.point = duplicate(*pattern.point).release();
 		}
+		
+		if (ocd_version >= 12)
+		{
+			switch (ocd_symbol.structure_draw_V12)
+			{
+			case 0:
+				pattern.setClipping(AreaSymbol::FillPattern::Default);
+				break;
+			case 1:
+				pattern.setClipping(AreaSymbol::FillPattern::NoClippingIfCompletelyInside);
+				break;
+			case 2:
+				pattern.setClipping(AreaSymbol::FillPattern::NoClippingIfCenterInside);
+				break;
+			case 3:
+				pattern.setClipping(AreaSymbol::FillPattern::NoClippingIfPartiallyInside);
+				break;
+			}
+		}
 		symbol->patterns.push_back(pattern);
 	}
 }